Skip to content

Integration for cardano-node 10.7 #1721

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −13
Draft

Integration for cardano-node 10.7 #1721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 3 additions & 4 deletions ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/Mempool.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) =>
Expand Down
9 changes: 3 additions & 6 deletions ...us-protocol/src/ouroboros-consensus-protocol/Ouroboros/Consensus/Protocol/Praos/Header.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ import Cardano.Ledger.Binary
, DecCBOR (decCBOR)
, EncCBOR (..)
, ToCBOR (..)
, encodedSigKESSizeExpr
, serialize'
, unCBORGroup
)
Expand Down Expand Up @@ -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)
Expand Down
Loading