Skip to content

Commit 84eed2d

Browse files
KtorZKtorZ
committed
Upgrade to cardano-ledger-conway == 1.9.0.0
 This was supposed to happen for `-rc3` but a missing system dependency (libblst) caused the constraint solver to pick a much older ledger version. This is WIP as some of the JSON encoders have been left TODO, and the specification hasn't been updated. However, this should be sufficient to get a working build and have the cache populated on the CI pipeline.
1 parent 78fe1a5 commit 84eed2d

File tree

19 files changed

+964
-227
lines changed

19 files changed

+964
-227
lines changed

‎clients/TypeScript/packages/client/test/LedgerStateQuery.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ describe('Local state queries', () => {
108108
expect((shelleyGenesis as GenesisShelley).startTime).toBeDefined()
109109

110110
const alonzoGenesis = await client.genesisConfiguration('alonzo')
111-
expect((alonzoGenesis as GenesisAlonzo).initialParameters.minUtxoDepositCoefficient).toBeDefined()
111+
expect((alonzoGenesis as GenesisAlonzo).updatableParameters.minUtxoDepositCoefficient).toBeDefined()
112112

113113
const point = await client.ledgerTip() as { slot: Slot, id: DigestBlake2B256 }
114114
expect(point.slot).toBeDefined()

‎docs/static/cardano.json‎

Lines changed: 212 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,12 @@
487487
, "enum": [ "constitutionalCommitteeHotKeyRegistration" ]
488488
}
489489
, "member":
490-
{ "$ref": "cardano.json#/definitions/ConstitutionalCommitteeMember"
490+
{ "type": "object"
491+
, "additionalProperties": false
492+
, "required": [ "id" ]
493+
, "properties":
494+
{ "id": { "$ref": "cardano.json#/definitions/Digest<Blake2b, 224>" }
495+
}
491496
}
492497
, "hotKey":
493498
{ "$ref": "cardano.json#/definitions/Digest<Blake2b, 224>"
@@ -505,7 +510,12 @@
505510
, "enum": [ "constitutionalCommitteeRetirement" ]
506511
}
507512
, "member":
508-
{ "$ref": "cardano.json#/definitions/ConstitutionalCommitteeMember"
513+
{ "type": "object"
514+
, "additionalProperties": false
515+
, "required": [ "id" ]
516+
, "properties":
517+
{ "id": { "$ref": "cardano.json#/definitions/Digest<Blake2b, 224>" }
518+
}
509519
}
510520
}
511521
}
@@ -525,6 +535,30 @@
525535
, "deposit":
526536
{ "$ref": "cardano.json#/definitions/Lovelace"
527537
}
538+
, "anchor":
539+
{ "$ref": "cardano.json#/definitions/Anchor"
540+
}
541+
}
542+
}
543+
, { "type": "object"
544+
, "description": ""
545+
, "title": "DelegateRepresentativeUpdate"
546+
, "additionalProperties": false
547+
, "required": [ "type", "delegateRepresentative", "anchor" ]
548+
, "properties":
549+
{ "type":
550+
{ "type": "string"
551+
, "enum": [ "delegateRepresentativeUpdate" ]
552+
}
553+
, "delegateRepresentative":
554+
{ "$ref": "cardano.json#/definitions/DelegateRepresentative"
555+
}
556+
, "anchor":
557+
{ "oneOf":
558+
[ { "type": "null", "title": "None" }
559+
, { "$ref": "cardano.json#/definitions/Anchor" }
560+
]
561+
}
528562
}
529563
}
530564
, { "type": "object"
@@ -566,11 +600,20 @@
566600
}
567601

568602
, "ConstitutionalCommitteeMember":
569-
{ "type": "object"
603+
{ "title": "ConstitutionalCommitteeMember"
604+
, "type": "object"
570605
, "additionalProperties": false
571-
, "required": [ "id" ]
606+
, "required": [ "id", "mandate" ]
572607
, "properties":
573608
{ "id": { "$ref": "cardano.json#/definitions/Digest<Blake2b, 224>" }
609+
, "mandate":
610+
{ "type": "object"
611+
, "additionalProperties": false
612+
, "required": [ "epoch" ]
613+
, "properties":
614+
{ "epoch": { "$ref": "cardano.json#/definitions/Epoch" }
615+
}
616+
}
574617
}
575618
}
576619

@@ -598,6 +641,46 @@
598641
, "contentEncoding": "base16"
599642
}
600643

644+
, "DelegateRepresentativeVotingThresholds":
645+
{ "title": "DelegateRepresentativeVotingThresholds"
646+
, "type": "object"
647+
, "additionalProperties": false
648+
, "required":
649+
[ "noConfidence"
650+
, "constitutionalCommittee"
651+
, "constitution"
652+
, "hardForkInitiation"
653+
, "protocolParametersUpdate"
654+
, "treasuryWithdrawals"
655+
]
656+
, "properties":
657+
{ "noConfidence": { "$ref": "cardano.json#/definitions/Ratio" }
658+
, "constitution": { "$ref": "cardano.json#/definitions/Ratio" }
659+
, "constitutionalCommittee":
660+
{ "type": "object"
661+
, "additionalProperties": false
662+
, "required": [ "default", "stateOfNoConfidence" ]
663+
, "properties":
664+
{ "default": { "$ref": "cardano.json#/definitions/Ratio" }
665+
, "stateOfNoConfidence": { "$ref": "cardano.json#/definitions/Ratio" }
666+
}
667+
}
668+
, "hardForkInitiation": { "$ref": "cardano.json#/definitions/Ratio" }
669+
, "protocolParametersUpdate":
670+
{ "type": "object"
671+
, "additionalProperties": false
672+
, "required": [ "network", "economic", "technical", "governance" ]
673+
, "properties":
674+
{ "network": { "$ref": "cardano.json#/definitions/Ratio" }
675+
, "economic": { "$ref": "cardano.json#/definitions/Ratio" }
676+
, "technical": { "$ref": "cardano.json#/definitions/Ratio" }
677+
, "governance": { "$ref": "cardano.json#/definitions/Ratio" }
678+
}
679+
}
680+
, "treasuryWithdrawals": { "$ref": "cardano.json#/definitions/Ratio" }
681+
}
682+
}
683+
601684
, "Digest<Any>":
602685
{ "title": "Digest<Any>"
603686
, "type": "string"
@@ -843,14 +926,14 @@
843926
, "additionalProperties": false
844927
, "required":
845928
[ "era"
846-
, "initialParameters"
929+
, "updatableParameters"
847930
]
848931
, "properties":
849932
{ "era":
850933
{ "type": "string"
851934
, "enum": [ "alonzo" ]
852935
}
853-
, "initialParameters":
936+
, "updatableParameters":
854937
{ "type": "object"
855938
, "additionalProperties": false
856939
, "required":
@@ -884,15 +967,65 @@
884967
, "additionalProperties": false
885968
, "required":
886969
[ "era"
887-
, "initialDelegates"
970+
, "constitution"
971+
, "constitutionalCommittee"
972+
, "updatableParameters"
888973
]
889974
, "properties":
890975
{ "era":
891976
{ "type": "string"
892977
, "enum": [ "conway" ]
893978
}
894-
, "initialDelegates":
895-
{ "$ref": "cardano.json#/definitions/InitialDelegates"
979+
, "constitution":
980+
{ "type": "object"
981+
, "additionalProperties": false
982+
, "required": [ "anchor" ]
983+
, "properties":
984+
{ "hash":
985+
{ "$ref": "cardano.json#/definitions/Digest<Blake2b, 224>"
986+
}
987+
, "anchor":
988+
{ "$ref": "cardano.json#/definitions/Anchor"
989+
}
990+
}
991+
}
992+
, "constitutionalCommittee":
993+
{ "type": "object"
994+
, "additionalProperties": false
995+
, "required": [ "members", "quorum" ]
996+
, "properties":
997+
{ "members":
998+
{ "type": "array"
999+
, "items": { "$ref": "cardano.json#/definitions/ConstitutionalCommitteeMember" }
1000+
}
1001+
, "quorum":
1002+
{ "$ref": "cardano.json#/definitions/Ratio"
1003+
}
1004+
}
1005+
}
1006+
, "updatableParameters":
1007+
{ "type": "object"
1008+
, "additionalProperties": false
1009+
, "required":
1010+
[ "stakePoolVotingThresholds"
1011+
, "constitutionalCommitteeMinSize"
1012+
, "constitutionalCommitteeMaxTermLength"
1013+
, "governanceActionLifetime"
1014+
, "governanceActionDeposit"
1015+
, "delegateRepresentativeVotingThresholds"
1016+
, "delegateRepresentativeDeposit"
1017+
, "delegateRepresentativeMaxIdleTime"
1018+
]
1019+
, "properties":
1020+
{ "stakePoolVotingThresholds": { "$ref": "cardano.json#/definitions/StakePoolVotingThresholds" }
1021+
, "constitutionalCommitteeMinSize": { "$ref": "cardano.json#/definitions/UInt64" }
1022+
, "constitutionalCommitteeMaxTermLength": { "$ref": "cardano.json#/definitions/UInt64" }
1023+
, "governanceActionLifetime": { "$ref": "cardano.json#/definitions/Epoch" }
1024+
, "governanceActionDeposit": { "$ref": "cardano.json#/definitions/Lovelace" }
1025+
, "delegateRepresentativeVotingThresholds": { "$ref": "cardano.json#/definitions/DelegateRepresentativeVotingThresholds" }
1026+
, "delegateRepresentativeDeposit": { "$ref": "cardano.json#/definitions/Lovelace" }
1027+
, "delegateRepresentativeMaxIdleTime": { "$ref": "cardano.json#/definitions/Epoch" }
1028+
}
8961029
}
8971030
}
8981031
}
@@ -1014,7 +1147,28 @@
10141147
, "enum": [ "constitutionalCommittee" ]
10151148
}
10161149
, "members":
1017-
{ "$ref": "cardano.json#/definitions/ConstitutionalCommitteeMember"
1150+
{ "type": "object"
1151+
, "additionalProperties": false
1152+
, "required": [ "added", "removed" ]
1153+
, "properties":
1154+
{ "added":
1155+
{ "type": "array"
1156+
, "items":
1157+
{ "$ref": "cardano.json#/definitions/ConstitutionalCommitteeMember"
1158+
}
1159+
}
1160+
, "removed":
1161+
{ "type": "array"
1162+
, "items":
1163+
{ "type": "object"
1164+
, "additionalProperties": false
1165+
, "required": [ "id" ]
1166+
, "properties":
1167+
{ "id": { "$ref": "cardano.json#/definitions/Digest<Blake2b, 224>" }
1168+
}
1169+
}
1170+
}
1171+
}
10181172
}
10191173
, "quorum":
10201174
{ "$ref": "cardano.json#/definitions/Ratio"
@@ -1025,14 +1179,17 @@
10251179
, "title": "GovernanceAction<Constitution>"
10261180
, "description": "A change in the constitution. Only its hash is recorded on-chain."
10271181
, "additionalProperties": false
1028-
, "required": [ "type", "hash" ]
1182+
, "required": [ "type", "anchor" ]
10291183
, "properties":
10301184
{ "type":
10311185
{ "type": "string"
10321186
, "enum": [ "constitution" ]
10331187
}
10341188
, "hash":
1035-
{ "$ref": "cardano.json#/definitions/Digest<Blake2b, 256>"
1189+
{ "$ref": "cardano.json#/definitions/Digest<Blake2b, 224>"
1190+
}
1191+
, "anchor":
1192+
{ "$ref": "cardano.json#/definitions/Anchor"
10361193
}
10371194
}
10381195
}
@@ -1073,7 +1230,7 @@
10731230
{ "$ref": "cardano.json#/definitions/Lovelace"
10741231
}
10751232
, "returnAccount":
1076-
{ "$ref": "cardano.json#/definitions/Digest<Blake2b, 224>"
1233+
{ "$ref": "cardano.json#/definitions/RewardAccount"
10771234
}
10781235
, "anchor":
10791236
{ "$ref": "cardano.json#/definitions/Anchor"
@@ -1453,6 +1610,30 @@
14531610
]
14541611
}
14551612

1613+
, "StakePoolVotingThresholds":
1614+
{ "title": "StakePoolVotingThresholds"
1615+
, "type": "object"
1616+
, "additionalProperties": false
1617+
, "required":
1618+
[ "noConfidence"
1619+
, "constitutionalCommittee"
1620+
, "hardForkInitiation"
1621+
]
1622+
, "properties":
1623+
{ "noConfidence": { "$ref": "cardano.json#/definitions/Ratio" }
1624+
, "constitutionalCommittee":
1625+
{ "type": "object"
1626+
, "additionalProperties": false
1627+
, "required": [ "default", "stateOfNoConfidence" ]
1628+
, "properties":
1629+
{ "default": { "$ref": "cardano.json#/definitions/Ratio" }
1630+
, "stateOfNoConfidence": { "$ref": "cardano.json#/definitions/Ratio" }
1631+
}
1632+
}
1633+
, "hardForkInitiation": { "$ref": "cardano.json#/definitions/Ratio" }
1634+
}
1635+
}
1636+
14561637
, "ProposedProtocolParameters":
14571638
{ "title": "ProposedProtocolParameters"
14581639
, "type": "object"
@@ -1482,6 +1663,14 @@
14821663
, "scriptExecutionPrices": { "$ref": "cardano.json#/definitions/ScriptExecutionPrices" }
14831664
, "maxExecutionUnitsPerTransaction": { "$ref": "cardano.json#/definitions/ExecutionUnits" }
14841665
, "maxExecutionUnitsPerBlock": { "$ref": "cardano.json#/definitions/ExecutionUnits" }
1666+
, "stakePoolVotingThresholds": { "$ref": "cardano.json#/definitions/StakePoolVotingThresholds" }
1667+
, "constitutionalCommitteeMinSize": { "$ref": "cardano.json#/definitions/UInt64" }
1668+
, "constitutionalCommitteeMaxTermLength": { "$ref": "cardano.json#/definitions/UInt64" }
1669+
, "governanceActionLifetime": { "$ref": "cardano.json#/definitions/Epoch" }
1670+
, "governanceActionDeposit": { "$ref": "cardano.json#/definitions/Lovelace" }
1671+
, "delegateRepresentativeVotingThresholds": { "$ref": "cardano.json#/definitions/DelegateRepresentativeVotingThresholds" }
1672+
, "delegateRepresentativeDeposit": { "$ref": "cardano.json#/definitions/Lovelace" }
1673+
, "delegateRepresentativeMaxIdleTime": { "$ref": "cardano.json#/definitions/Epoch" }
14851674
, "version": { "$ref": "cardano.json#/definitions/ProtocolVersion" }
14861675
}
14871676
}
@@ -1532,6 +1721,14 @@
15321721
, "scriptExecutionPrices": { "$ref": "cardano.json#/definitions/ScriptExecutionPrices" }
15331722
, "maxExecutionUnitsPerTransaction": { "$ref": "cardano.json#/definitions/ExecutionUnits" }
15341723
, "maxExecutionUnitsPerBlock": { "$ref": "cardano.json#/definitions/ExecutionUnits" }
1724+
, "stakePoolVotingThresholds": { "$ref": "cardano.json#/definitions/StakePoolVotingThresholds" }
1725+
, "constitutionalCommitteeMinSize": { "$ref": "cardano.json#/definitions/UInt64" }
1726+
, "constitutionalCommitteeMaxTermLength": { "$ref": "cardano.json#/definitions/UInt64" }
1727+
, "governanceActionLifetime": { "$ref": "cardano.json#/definitions/Epoch" }
1728+
, "governanceActionDeposit": { "$ref": "cardano.json#/definitions/Lovelace" }
1729+
, "delegateRepresentativeVotingThresholds": { "$ref": "cardano.json#/definitions/DelegateRepresentativeVotingThresholds" }
1730+
, "delegateRepresentativeDeposit": { "$ref": "cardano.json#/definitions/Lovelace" }
1731+
, "delegateRepresentativeMaxIdleTime": { "$ref": "cardano.json#/definitions/Epoch" }
15351732
, "version": { "$ref": "cardano.json#/definitions/ProtocolVersion" }
15361733
}
15371734
}
@@ -2213,10 +2410,10 @@
22132410
, "Value":
22142411
{ "title": "Value"
22152412
, "type": "object"
2216-
, "propertyNames": { "pattern": "^[0-9a-z]{56}$" }
2413+
, "propertyNames": { "pattern": "^[0-9a-f]{56}$" }
22172414
, "additionalProperties":
22182415
{ "type": "object"
2219-
, "propertyNames": { "pattern": "^[0-9a-z]{0,64}$" }
2416+
, "propertyNames": { "pattern": "^[0-9a-f]{0,64}$" }
22202417
, "additionalProperties": { "$ref": "cardano.json#/definitions/AssetQuantity" }
22212418
}
22222419
, "required": [ "ada" ]

0 commit comments

Comments
 (0)