From ebd062ef5ce4a4f040a09d6564a4899e989c22a7 Mon Sep 17 00:00:00 2001 From: Alexander Esgen Date: Tue, 23 May 2023 21:53:56 +0200 Subject: [PATCH] Bump ledger to 1.2.1.0, which changes `PParams` encoding --- cabal.project | 2 +- flake.lock | 6 ++-- ...925_alexander.esgen_bump_ledger_1_2_1_0.md | 3 ++ .../Result_Alonzo_EmptyPParams | Bin 64 -> 63 bytes .../Result_Babbage_EmptyPParams | Bin 56 -> 55 bytes .../Result_Alonzo_EmptyPParams | Bin 64 -> 63 bytes .../Result_Babbage_EmptyPParams | Bin 56 -> 55 bytes .../Result_Conway_EmptyPParams | Bin 56 -> 55 bytes .../golden/cardano/disk/ExtLedgerState_Alonzo | Bin 1012 -> 1010 bytes .../cardano/disk/ExtLedgerState_Babbage | Bin 1057 -> 1055 bytes .../golden/cardano/disk/ExtLedgerState_Conway | Bin 1219 -> 1216 bytes .../golden/cardano/disk/LedgerState_Alonzo | Bin 665 -> 663 bytes .../golden/cardano/disk/LedgerState_Babbage | Bin 682 -> 680 bytes .../golden/cardano/disk/LedgerState_Conway | Bin 813 -> 810 bytes .../ouroboros-consensus-cardano.cabal | 28 +++++++++--------- 15 files changed, 21 insertions(+), 18 deletions(-) create mode 100644 ouroboros-consensus-cardano/changelog.d/20230523_214925_alexander.esgen_bump_ledger_1_2_1_0.md diff --git a/cabal.project b/cabal.project index 8b386ce10b..4216599074 100644 --- a/cabal.project +++ b/cabal.project @@ -16,7 +16,7 @@ index-state: -- Bump this if you need newer packages from Hackage , hackage.haskell.org 2023-04-26T22:25:13Z -- Bump this if you need newer packages from CHaP - , cardano-haskell-packages 2023-05-17T06:53:34Z + , cardano-haskell-packages 2023-05-23T16:25:08Z packages: ./ouroboros-consensus diff --git a/flake.lock b/flake.lock index c54f556641..f6157bc959 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1684312813, - "narHash": "sha256-vBPieIBdVYghS+j3o/ixgCM/mh+u6Uh3UG4YZsOswnA=", + "lastModified": 1684870331, + "narHash": "sha256-dXieDJiz8Xwh5bg0l/5ZErEA3bSrrPGq3X2oHcrCAWY=", "owner": "input-output-hk", "repo": "cardano-haskell-packages", - "rev": "65d952636455564944f0a29bbc9bf7ff09c345a1", + "rev": "7501da00263b224c5ec8dcdf998b3c8d7876015d", "type": "github" }, "original": { diff --git a/ouroboros-consensus-cardano/changelog.d/20230523_214925_alexander.esgen_bump_ledger_1_2_1_0.md b/ouroboros-consensus-cardano/changelog.d/20230523_214925_alexander.esgen_bump_ledger_1_2_1_0.md new file mode 100644 index 0000000000..8a0209c1a0 --- /dev/null +++ b/ouroboros-consensus-cardano/changelog.d/20230523_214925_alexander.esgen_bump_ledger_1_2_1_0.md @@ -0,0 +1,3 @@ +### Non-Breaking + +- Bump `cardano-ledger-{alonzo,babbage}` to 1.2.1.0, which changes the corresponding `PParams` serialisation. This affects the ledger snapshots and the `GetCurrentPParams` query for `NodeToClientVersion >= 15`. diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/Result_Alonzo_EmptyPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/Result_Alonzo_EmptyPParams index 4759359364c36d26c2a7d0290a96fcd8d3a7336a..9e750e26883f4da621d2d29754142e8e40dba30a 100644 GIT binary patch delta 36 mcmZ>;XKtJ!IgwdOij{$ZVL{Ukxh4iiFww-o07MKD(^vtd;0RR! delta 37 ncmcC_U~ZftF_BqGx`~y6fnh<@4Y?);MljLDzyL%H64O`#wH651 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/Result_Babbage_EmptyPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/Result_Babbage_EmptyPParams index 7bf204b84a26a2748e653f31d4c0ba838aecf0c8..edc6f118879e20b92158ee19e3a1b8c86f2a5aca 100644 GIT binary patch literal 55 qcmZpi&cMJR$pIu77$j0|$TcxAA_#V%;DROuzlnhXh!`ZMu>t@_#S8NQ literal 56 pcmZpi#=yWJ$pIu77$j0|$TcxAB8Vn-py+}oBmoA7CXm8utN>bN40Heh diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/Result_Alonzo_EmptyPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/Result_Alonzo_EmptyPParams index 4759359364c36d26c2a7d0290a96fcd8d3a7336a..9e750e26883f4da621d2d29754142e8e40dba30a 100644 GIT binary patch delta 36 mcmZ>;XKtJ!IgwdOij{$ZVL{Ukxh4iiFww-o07MKD(^vtd;0RR! delta 37 ncmcC_U~ZftF_BqGx`~y6fnh<@4Y?);MljLDzyL%H64O`#wH651 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/Result_Babbage_EmptyPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/Result_Babbage_EmptyPParams index 7bf204b84a26a2748e653f31d4c0ba838aecf0c8..edc6f118879e20b92158ee19e3a1b8c86f2a5aca 100644 GIT binary patch literal 55 qcmZpi&cMJR$pIu77$j0|$TcxAA_#V%;DROuzlnhXh!`ZMu>t@_#S8NQ literal 56 pcmZpi#=yWJ$pIu77$j0|$TcxAB8Vn-py+}oBmoA7CXm8utN>bN40Heh diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/Result_Conway_EmptyPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/Result_Conway_EmptyPParams index 379125e913826a4130e8d9bd8a47206b02ece409..a56247b3ad2843a6ad49dbb68d97a18d1f3c880d 100644 GIT binary patch literal 55 qcmZpi&cMJR$pIu77$j0|$TcxAA_z{P;DROuzlnhXh!`ZMu>t@_`3v;` literal 56 pcmZpi#=yWJ$pIu77$j0|$TcxAB8VnVpy+}oBmoA7CXm8utN>b>40Zqj diff --git a/ouroboros-consensus-cardano/golden/cardano/disk/ExtLedgerState_Alonzo b/ouroboros-consensus-cardano/golden/cardano/disk/ExtLedgerState_Alonzo index 28c1fe3477226bc2af8f4e3bb4b44145cff30fcb..1e623b856bfede1c531d972b727a17f3552bc7b2 100644 GIT binary patch delta 51 zcmeyu{)v6VW=2NI$y*qeWLOy(7#1|$kZWRK1QSgR3_!#nF^zQwSixp7rhAM4l0*)U delta 54 zcmeyw{)K(RW=2Md$y*qeWSdwS7#J2b-H>ZyU<4CQ3=BZTATf<~23Q4S(`FH-dyD|c COAn9$ diff --git a/ouroboros-consensus-cardano/golden/cardano/disk/ExtLedgerState_Babbage b/ouroboros-consensus-cardano/golden/cardano/disk/ExtLedgerState_Babbage index 31ecea1aaae2a257c4df16d9fe334198f57758d6..ff02c04233934067c7ed0b095eef2916e98ce70a 100644 GIT binary patch delta 28 gcmZ3;F`r|@Wk$y7lew9sCx2j+g0MELGyP%&0Ewpv@Bjb+ delta 32 icmbQwv5;fKWk$wnlew6r8Ji}*XOx1mH>)!JVgvxJ6AAAC diff --git a/ouroboros-consensus-cardano/golden/cardano/disk/ExtLedgerState_Conway b/ouroboros-consensus-cardano/golden/cardano/disk/ExtLedgerState_Conway index 74736c5ffc6512bddeec91bb80a2be887594afaf..11c77255ca3d962a31678f1dde32fb5d59d679cd 100644 GIT binary patch delta 42 lcmX@id4O{R2NUD;$vsTclM9)oCfhTKB6twi<`qoROaK?z3~vAc delta 48 ncmX@Wd6;tp2NUD8$z4p+j7^jCnWQG$F^MAcVeHLInWUKjVpt95 diff --git a/ouroboros-consensus-cardano/golden/cardano/disk/LedgerState_Alonzo b/ouroboros-consensus-cardano/golden/cardano/disk/LedgerState_Alonzo index e4d471c2cb4e3b5ea8169eb0cbb87074607fe6dc..4a648056cf5768541c304d0c6feed44a4c42214f 100644 GIT binary patch delta 50 ycmbQqI-PaHCPqfd$(tFKWLOy(7#1|$kZWRK1QSgR3_!#nF^zQwSixjbrWOER=M7Z= delta 53 zcmbQvI+Jz7CPqey$sZY&WSdwS7#J2b-H>ZyU<4CQ3=BZTATf<~23Q4S(_~?$766`3 B4$}Yt diff --git a/ouroboros-consensus-cardano/golden/cardano/disk/LedgerState_Babbage b/ouroboros-consensus-cardano/golden/cardano/disk/LedgerState_Babbage index 076be39f9021048d281aae5c76d6b0da57d574b6..66cd526fec177ba7ada14271a7bd532f5c5491c4 100644 GIT binary patch delta 27 dcmZ3*x`K7XB}T^Slew6rC%wu)^7I}_vd$=yuSlM9%nCfhNIB6v{Na;7!_0`3fc delta 47 lcmZ3*ww7%JI}_uy$(>Bnj7^jCn4~7#GKnJd;p`<$Z2(HG4fX&4 diff --git a/ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal b/ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal index 3d79d82b16..fa4522f9fd 100644 --- a/ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal +++ b/ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal @@ -114,17 +114,17 @@ library Ouroboros.Consensus.Shelley.Ledger.Query.PParamsLegacyEncoder build-depends: - , base >=4.14 && <4.17 + , base >=4.14 && <4.17 , base-deriving-via - , bytestring >=0.10 && <0.12 + , bytestring >=0.10 && <0.12 , cardano-binary , cardano-crypto , cardano-crypto-class , cardano-crypto-wrapper , cardano-data , cardano-ledger-allegra - , cardano-ledger-alonzo - , cardano-ledger-babbage + , cardano-ledger-alonzo ^>=1.2.1 + , cardano-ledger-babbage ^>=1.2.1 , cardano-ledger-binary , cardano-ledger-byron , cardano-ledger-conway @@ -132,25 +132,25 @@ library , cardano-ledger-mary , cardano-ledger-shelley , cardano-prelude - , cardano-protocol-tpraos >=1.0.1 && <1.1 + , cardano-protocol-tpraos >=1.0.1 && <1.1 , cardano-slotting , cardano-strict-containers - , cborg >=0.2.2 && <0.3 - , containers >=0.5 && <0.7 - , cryptonite >=0.25 && <0.31 + , cborg >=0.2.2 && <0.3 + , containers >=0.5 && <0.7 + , cryptonite >=0.25 && <0.31 , deepseq - , formatting >=6.3 && <7.2 + , formatting >=6.3 && <7.2 , measures , microlens - , mtl >=2.2 && <2.3 + , mtl >=2.2 && <2.3 , nothunks - , ouroboros-consensus >=0.5 && <0.7 + , ouroboros-consensus >=0.5 && <0.7 , ouroboros-consensus-protocol ^>=0.5 , ouroboros-network-api ^>=0.5 - , serialise >=0.2 && <0.3 + , serialise >=0.2 && <0.3 , small-steps - , text >=1.2 && <1.3 - , these >=1.1 && <1.2 + , text >=1.2 && <1.3 + , these >=1.1 && <1.2 , vector-map library byronspec