Skip to content

Commit bb03230

Browse files
committed
Bump the s-r-p on Ledger
1 parent 374ef15 commit bb03230

File tree

4 files changed

+10
-13
lines changed

4 files changed

+10
-13
lines changed

cabal.project

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ packages:
2828

2929
-- We want to always build the test-suites and benchmarks
3030
tests: true
31+
3132
benchmarks: true
3233

3334
multi-repl: True
@@ -58,8 +59,8 @@ if impl (ghc >= 9.10)
5859
source-repository-package
5960
type: git
6061
location: https://github.com/IntersectMBO/cardano-ledger
61-
tag: fb09078fa55015c881303a2ddb609c024cec258f
62-
--sha256: sha256-9Y9CRiyMn0AWD+C4aNVMaJgrj3FDAYfCX4VrLvtoMaI=
62+
tag: f776625c3ddf1bd0a3873d1683265b97e6733953
63+
--sha256: sha256-+H0NVjks/Jtc2Yk6qQ6GZ5h2t94on0Tc+nu2WfPfie4=
6364
subdir:
6465
eras/allegra/impl
6566
eras/alonzo/impl

ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ library
143143
cardano-ledger-alonzo ^>=1.15,
144144
cardano-ledger-api ^>=1.13,
145145
cardano-ledger-babbage ^>=1.12,
146-
cardano-ledger-binary ^>=1.7,
147-
cardano-ledger-byron ^>=1.2,
146+
cardano-ledger-binary ^>=1.8,
147+
cardano-ledger-byron ^>=1.3,
148148
cardano-ledger-conway ^>=1.21,
149149
cardano-ledger-core ^>=1.19,
150150
cardano-ledger-dijkstra ^>=0.2,
@@ -238,8 +238,7 @@ library unstable-byron-testlib
238238
cardano-binary,
239239
cardano-crypto,
240240
cardano-crypto-class,
241-
cardano-crypto-test,
242-
cardano-crypto-wrapper,
241+
cardano-crypto-wrapper:{cardano-crypto-wrapper, testlib},
243242
cardano-ledger-binary:{cardano-ledger-binary, testlib},
244243
cardano-ledger-byron:{cardano-ledger-byron, testlib},
245244
cardano-ledger-core,

ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/Mempool.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ newtype instance TxId (GenTx (ShelleyBlock proto era)) = ShelleyTxId SL.TxId
202202
deriving newtype (Eq, Ord, NoThunks)
203203

204204
deriving newtype instance
205-
(Typeable era, Typeable proto, Crypto (ProtoCrypto proto)) =>
205+
Crypto (ProtoCrypto proto) =>
206206
EncCBOR (TxId (GenTx (ShelleyBlock proto era)))
207207
deriving newtype instance
208208
(Typeable era, Typeable proto, Crypto (ProtoCrypto proto)) =>

ouroboros-consensus-protocol/src/ouroboros-consensus-protocol/Ouroboros/Consensus/Protocol/Praos/Header.hs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ import Cardano.Ledger.Binary
4242
, DecCBOR (decCBOR)
4343
, EncCBOR (..)
4444
, ToCBOR (..)
45-
, encodedSigKESSizeExpr
4645
, serialize'
4746
, unCBORGroup
4847
)
@@ -225,11 +224,9 @@ instance Crypto crypto => DecCBOR (HeaderRaw crypto) where
225224
instance Crypto crypto => DecCBOR (Annotator (HeaderRaw crypto)) where
226225
decCBOR = pure <$> decCBOR
227226

228-
instance Crypto c => EncCBOR (Header c) where
229-
encodedSizeExpr size proxy =
230-
1
231-
+ encodedSizeExpr size (headerBody <$> proxy)
232-
+ encodedSigKESSizeExpr (KES.getSig . headerSig <$> proxy)
227+
-- TODO(geo2a): can we derive this instance?
228+
-- previously, it had an additional method defined, which was removed
229+
instance Crypto c => EncCBOR (Header c)
233230

234231
deriving via
235232
Mem (HeaderRaw crypto)

0 commit comments

Comments
 (0)