Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Split Global_slot.t into since-genesis and since-hard-fork types #13143

Merged
merged 51 commits into from
Jun 1, 2023
Merged

Split Global_slot.t into since-genesis and since-hard-fork types #13143

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
c27a3d7
Split Global_slot.t into since-genesis and since-hard-fork types
psteckler May 2, 2023
cb6af6e
rm unused open
psteckler May 2, 2023
05a198c
fix client SDK build
psteckler May 2, 2023
2425f78
fix Rosetta build
psteckler May 2, 2023
1845601
fix heap usage app
psteckler May 3, 2023
a54e4b8
rm unused open
psteckler May 3, 2023
48177be
Fix wire types test
psteckler May 3, 2023
c199f48
fix account tests
psteckler May 3, 2023
079fa51
fix zkapp fuzzy build
psteckler May 3, 2023
a2dd747
Fix snarkyjs_bindings/lib build
psteckler May 3, 2023
3eb77b6
fix account_timing, transaction union tests
psteckler May 3, 2023
9ecb0df
Merge branch 'berkeley' into fix/ctors-for-global-slot-types
psteckler May 3, 2023
38532fc
Add to interfaces
psteckler May 3, 2023
b1a5654
fix extract_blocks build
psteckler May 3, 2023
a93beb3
fix sexp, json in precomputed block
psteckler May 3, 2023
29f5c0d
add global slot legacy type; fix txn hash tests
psteckler May 3, 2023
91165b2
temp debug logging
psteckler May 3, 2023
5cf27b3
revert debug code
psteckler May 4, 2023
2eea26b
add constructors to cliff time, vesting period
psteckler May 4, 2023
3258e61
Merge branch 'berkeley' into fix/ctors-for-global-slot-types
psteckler May 4, 2023
6e43acb
Merge branch 'berkeley' into fix/ctors-for-global-slot-types
psteckler May 4, 2023
59b1fef
rm commented code
psteckler May 4, 2023
cf122b4
Merge branch 'berkeley' into fix/ctors-for-global-slot-types
psteckler May 4, 2023
e480a6c
bump snarkyjs
mitschabaude May 5, 2023
4be9a56
Merge branch 'berkeley' into fix/ctors-for-global-slot-types
psteckler May 5, 2023
0487959
Update versioned types
psteckler May 5, 2023
a7d98c9
Change Span constructor to Global_slot_span
psteckler May 7, 2023
eb09416
Merge branch 'berkeley' into fix/ctors-for-global-slot-types
psteckler May 8, 2023
66c125a
change slots to since-hard-fork per PR comments
psteckler May 8, 2023
35f6ba5
Merge branch 'berkeley' into fix/ctors-for-global-slot-types
psteckler May 8, 2023
7ffbacb
dummy_advance takes a slot since genesis
psteckler May 8, 2023
03e2040
fix heap usage app
psteckler May 9, 2023
715adfe
fix sample precomputed blocks
psteckler May 9, 2023
ee56a0f
snarkyjs
mitschabaude May 9, 2023
ab61bb2
Merge branch 'berkeley' of github.com:MinaProtocol/mina into fix/ctor…
May 9, 2023
9797ad4
add logs for update network state
May 10, 2023
f5c9334
fix parser for global slot
May 10, 2023
24884a9
add unit test for parser
May 10, 2023
f50edec
snarkyjs
mitschabaude May 10, 2023
bee90eb
snarkyjs
mitschabaude May 11, 2023
08adb70
snarkyjs
mitschabaude May 11, 2023
490c6a4
Merge branch 'berkeley' into fix/ctors-for-global-slot-types
deepthiskumar May 16, 2023
f34a2b5
update extensional command types
psteckler May 24, 2023
7e68bfb
Merge branch 'berkeley' into fix/ctors-for-global-slot-types
psteckler May 31, 2023
69f29ea
post-merge cleanup
psteckler May 31, 2023
4800064
fix test, span, not slot
psteckler May 31, 2023
e2ff5f9
bump snarkyjs
psteckler May 31, 2023
516504a
reformat
psteckler May 31, 2023
27c9732
snarkyjs
mitschabaude Jun 1, 2023
23c1777
snarkyjs
mitschabaude Jun 1, 2023
08c9dc7
Merge branch 'berkeley' into fix/ctors-for-global-slot-types
psteckler Jun 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 69 additions & 37 deletions graphql_schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,7 +727,11 @@
"name": "validUntil",
"description": null,
"args": [],
"type": { "kind": "SCALAR", "name": "UInt32", "ofType": null },
"type": {
"kind": "SCALAR",
"name": "GlobalSlotSinceGenesis",
"ofType": null
},
"isDeprecated": false,
"deprecationReason": null
},
Expand Down Expand Up @@ -776,7 +780,11 @@
{
"name": "validUntil",
"description": null,
"type": { "kind": "SCALAR", "name": "UInt32", "ofType": null },
"type": {
"kind": "SCALAR",
"name": "GlobalSlotSinceGenesis",
"ofType": null
},
"defaultValue": null
},
{
Expand Down Expand Up @@ -1374,7 +1382,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "GlobalSlot",
"name": "GlobalSlotSinceGenesis",
"ofType": null
}
},
Expand Down Expand Up @@ -1406,7 +1414,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "GlobalSlot",
"name": "GlobalSlotSpan",
"ofType": null
}
},
Expand Down Expand Up @@ -1453,7 +1461,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "GlobalSlot",
"name": "GlobalSlotSinceGenesis",
"ofType": null
}
},
Expand Down Expand Up @@ -1481,7 +1489,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "GlobalSlot",
"name": "GlobalSlotSpan",
"ofType": null
}
},
Expand Down Expand Up @@ -2119,7 +2127,7 @@
"args": [],
"type": {
"kind": "INPUT_OBJECT",
"name": "GlobalSlotIntervalInput",
"name": "GlobalSlotSinceGenesisIntervalInput",
"ofType": null
},
"isDeprecated": false,
Expand Down Expand Up @@ -2200,7 +2208,7 @@
"description": null,
"type": {
"kind": "INPUT_OBJECT",
"name": "GlobalSlotIntervalInput",
"name": "GlobalSlotSinceGenesisIntervalInput",
"ofType": null
},
"defaultValue": null
Expand Down Expand Up @@ -2556,7 +2564,7 @@
},
{
"kind": "INPUT_OBJECT",
"name": "GlobalSlotIntervalInput",
"name": "GlobalSlotSinceGenesisIntervalInput",
"description": null,
"fields": [
{
Expand All @@ -2568,7 +2576,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "UInt32",
"name": "GlobalSlotSinceGenesis",
"ofType": null
}
},
Expand All @@ -2584,7 +2592,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "UInt32",
"name": "GlobalSlotSinceGenesis",
"ofType": null
}
},
Expand All @@ -2601,7 +2609,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "UInt32",
"name": "GlobalSlotSinceGenesis",
"ofType": null
}
},
Expand All @@ -2615,7 +2623,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "UInt32",
"name": "GlobalSlotSinceGenesis",
"ofType": null
}
},
Expand Down Expand Up @@ -2669,7 +2677,7 @@
"args": [],
"type": {
"kind": "INPUT_OBJECT",
"name": "GlobalSlotIntervalInput",
"name": "GlobalSlotSinceGenesisIntervalInput",
"ofType": null
},
"isDeprecated": false,
Expand Down Expand Up @@ -2710,7 +2718,7 @@
"description": null,
"type": {
"kind": "INPUT_OBJECT",
"name": "GlobalSlotIntervalInput",
"name": "GlobalSlotSinceGenesisIntervalInput",
"ofType": null
},
"defaultValue": null
Expand Down Expand Up @@ -5830,7 +5838,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "Globalslot",
"name": "GlobalslotSinceGenesis",
"ofType": null
}
},
Expand Down Expand Up @@ -7290,7 +7298,7 @@
},
{
"kind": "OBJECT",
"name": "GlobalSlotInterval",
"name": "GlobalSlotSinceGenesisInterval",
"description": null,
"fields": [
{
Expand All @@ -7302,7 +7310,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "UInt32",
"name": "GlobalSlotSinceGenesis",
"ofType": null
}
},
Expand All @@ -7318,7 +7326,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "UInt32",
"name": "GlobalSlotSinceGenesis",
"ofType": null
}
},
Expand Down Expand Up @@ -7472,7 +7480,7 @@
"args": [],
"type": {
"kind": "OBJECT",
"name": "GlobalSlotInterval",
"name": "GlobalSlotSinceGenesisInterval",
"ofType": null
},
"isDeprecated": false,
Expand Down Expand Up @@ -7559,7 +7567,7 @@
"args": [],
"type": {
"kind": "OBJECT",
"name": "GlobalSlotInterval",
"name": "GlobalSlotSinceGenesisInterval",
"ofType": null
},
"isDeprecated": false,
Expand Down Expand Up @@ -7626,7 +7634,7 @@
},
{
"kind": "SCALAR",
"name": "CurrencyAmount",
"name": "GlobalSlotSpan",
"description": null,
"fields": null,
"inputFields": null,
Expand All @@ -7636,7 +7644,7 @@
},
{
"kind": "SCALAR",
"name": "GlobalSlot",
"name": "CurrencyAmount",
"description": null,
"fields": null,
"inputFields": null,
Expand Down Expand Up @@ -7674,7 +7682,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "GlobalSlot",
"name": "GlobalSlotSinceGenesis",
"ofType": null
}
},
Expand Down Expand Up @@ -7706,7 +7714,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "GlobalSlot",
"name": "GlobalSlotSpan",
"ofType": null
}
},
Expand Down Expand Up @@ -8436,6 +8444,16 @@
"enumValues": null,
"possibleTypes": null
},
{
"kind": "SCALAR",
"name": "GlobalSlotSinceGenesis",
"description": null,
"fields": null,
"inputFields": null,
"interfaces": null,
"enumValues": null,
"possibleTypes": null
},
{
"kind": "OBJECT",
"name": "FeePayerBody",
Expand Down Expand Up @@ -8473,7 +8491,11 @@
"name": "validUntil",
"description": null,
"args": [],
"type": { "kind": "SCALAR", "name": "UInt32", "ofType": null },
"type": {
"kind": "SCALAR",
"name": "GlobalSlotSinceGenesis",
"ofType": null
},
"isDeprecated": false,
"deprecationReason": null
},
Expand Down Expand Up @@ -8809,7 +8831,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "Globalslot",
"name": "GlobalslotSinceGenesis",
"ofType": null
}
},
Expand Down Expand Up @@ -9193,7 +9215,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "Globalslot",
"name": "GlobalslotSinceGenesis",
"ofType": null
}
},
Expand Down Expand Up @@ -9505,7 +9527,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "Globalslot",
"name": "GlobalslotSinceGenesis",
"ofType": null
}
},
Expand Down Expand Up @@ -10291,7 +10313,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "Globalslot",
"name": "GlobalslotSinceGenesis",
"ofType": null
}
},
Expand Down Expand Up @@ -11579,6 +11601,16 @@
"enumValues": null,
"possibleTypes": null
},
{
"kind": "SCALAR",
"name": "GlobalslotSpan",
"description": "globalslotspan",
"fields": null,
"inputFields": null,
"interfaces": null,
"enumValues": null,
"possibleTypes": null
},
{
"kind": "SCALAR",
"name": "Amount",
Expand Down Expand Up @@ -11619,7 +11651,7 @@
"args": [],
"type": {
"kind": "SCALAR",
"name": "Globalslot",
"name": "GlobalslotSinceGenesis",
"ofType": null
},
"isDeprecated": false,
Expand All @@ -11639,7 +11671,7 @@
"args": [],
"type": {
"kind": "SCALAR",
"name": "Globalslot",
"name": "GlobalslotSpan",
"ofType": null
},
"isDeprecated": false,
Expand Down Expand Up @@ -12373,7 +12405,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "Globalslot",
"name": "GlobalslotSinceGenesis",
"ofType": null
}
},
Expand Down Expand Up @@ -12431,7 +12463,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "Globalslot",
"name": "GlobalslotSinceGenesis",
"ofType": null
}
}
Expand Down Expand Up @@ -12475,8 +12507,8 @@
},
{
"kind": "SCALAR",
"name": "Globalslot",
"description": "globalslot",
"name": "GlobalslotSinceGenesis",
"description": "globalslotsincegenesis",
"fields": null,
"inputFields": null,
"interfaces": null,
Expand Down Expand Up @@ -12539,7 +12571,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "Globalslot",
"name": "GlobalslotSinceGenesis",
"ofType": null
}
},
Expand Down
9 changes: 6 additions & 3 deletions src/app/archive/lib/extensional.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ module User_command = struct
; nonce : Account.Nonce.Stable.V1.t
; amount : Currency.Amount.Stable.V1.t option
; fee : Currency.Fee.Stable.V1.t
; valid_until : Mina_numbers.Global_slot.Stable.V1.t option
; valid_until :
Mina_numbers.Global_slot_since_genesis.Stable.V1.t option
; memo : Signed_command_memo.Stable.V1.t
; hash : Transaction_hash.Stable.V1.t
[@to_yojson Transaction_hash.to_yojson]
Expand Down Expand Up @@ -119,8 +120,10 @@ module Block = struct
; sub_window_densities : Mina_numbers.Length.Stable.V1.t list
; ledger_hash : Ledger_hash.Stable.V1.t
; height : Unsigned_extended.UInt32.Stable.V1.t
; global_slot_since_hard_fork : Mina_numbers.Global_slot.Stable.V1.t
; global_slot_since_genesis : Mina_numbers.Global_slot.Stable.V1.t
; global_slot_since_hard_fork :
Mina_numbers.Global_slot_since_genesis.Stable.V1.t
; global_slot_since_genesis :
Mina_numbers.Global_slot_since_genesis.Stable.V1.t
; timestamp : Block_time.Stable.V1.t
; user_cmds : User_command.Stable.V1.t list
; internal_cmds : Internal_command.Stable.V1.t list
Expand Down
Loading