diff --git a/cabal.project b/cabal.project index 3f7ef26e1f..d725699091 100644 --- a/cabal.project +++ b/cabal.project @@ -58,8 +58,8 @@ if impl (ghc >= 9.10) source-repository-package type: git location: https://github.com/IntersectMBO/cardano-ledger - tag: fb09078fa55015c881303a2ddb609c024cec258f - --sha256: sha256-9Y9CRiyMn0AWD+C4aNVMaJgrj3FDAYfCX4VrLvtoMaI= + tag: f776625c3ddf1bd0a3873d1683265b97e6733953 + --sha256: sha256-+H0NVjks/Jtc2Yk6qQ6GZ5h2t94on0Tc+nu2WfPfie4= subdir: eras/allegra/impl eras/alonzo/impl diff --git a/ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal b/ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal index 78fd3c6786..b1bb044433 100644 --- a/ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal +++ b/ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal @@ -143,8 +143,8 @@ library cardano-ledger-alonzo ^>=1.15, cardano-ledger-api ^>=1.13, cardano-ledger-babbage ^>=1.12, - cardano-ledger-binary ^>=1.7, - cardano-ledger-byron ^>=1.2, + cardano-ledger-binary ^>=1.8, + cardano-ledger-byron ^>=1.3, cardano-ledger-conway ^>=1.21, cardano-ledger-core ^>=1.19, cardano-ledger-dijkstra ^>=0.2, @@ -238,8 +238,7 @@ library unstable-byron-testlib cardano-binary, cardano-crypto, cardano-crypto-class, - cardano-crypto-test, - cardano-crypto-wrapper, + cardano-crypto-wrapper:{cardano-crypto-wrapper, testlib}, cardano-ledger-binary:{cardano-ledger-binary, testlib}, cardano-ledger-byron:{cardano-ledger-byron, testlib}, cardano-ledger-core, diff --git a/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/Mempool.hs b/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/Mempool.hs index 8871e22df7..124d33b7e1 100644 --- a/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/Mempool.hs +++ b/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/Mempool.hs @@ -202,7 +202,7 @@ newtype instance TxId (GenTx (ShelleyBlock proto era)) = ShelleyTxId SL.TxId deriving newtype (Eq, Ord, NoThunks) deriving newtype instance - (Typeable era, Typeable proto, Crypto (ProtoCrypto proto)) => + Crypto (ProtoCrypto proto) => EncCBOR (TxId (GenTx (ShelleyBlock proto era))) deriving newtype instance (Typeable era, Typeable proto, Crypto (ProtoCrypto proto)) => diff --git a/ouroboros-consensus-protocol/src/ouroboros-consensus-protocol/Ouroboros/Consensus/Protocol/Praos/Header.hs b/ouroboros-consensus-protocol/src/ouroboros-consensus-protocol/Ouroboros/Consensus/Protocol/Praos/Header.hs index 00e6bf205c..8f1aa4ade4 100644 --- a/ouroboros-consensus-protocol/src/ouroboros-consensus-protocol/Ouroboros/Consensus/Protocol/Praos/Header.hs +++ b/ouroboros-consensus-protocol/src/ouroboros-consensus-protocol/Ouroboros/Consensus/Protocol/Praos/Header.hs @@ -42,7 +42,6 @@ import Cardano.Ledger.Binary , DecCBOR (decCBOR) , EncCBOR (..) , ToCBOR (..) - , encodedSigKESSizeExpr , serialize' , unCBORGroup ) @@ -225,11 +224,9 @@ instance Crypto crypto => DecCBOR (HeaderRaw crypto) where instance Crypto crypto => DecCBOR (Annotator (HeaderRaw crypto)) where decCBOR = pure <$> decCBOR -instance Crypto c => EncCBOR (Header c) where - encodedSizeExpr size proxy = - 1 - + encodedSizeExpr size (headerBody <$> proxy) - + encodedSigKESSizeExpr (KES.getSig . headerSig <$> proxy) +-- TODO(geo2a): can we derive this instance? +-- previously, it had an additional method defined, which was removed +instance Crypto c => EncCBOR (Header c) deriving via Mem (HeaderRaw crypto)