Skip to content

Commit

Permalink
Bump plutus and ledger dependencies for cardano-node-9.2 release (#1207)
Browse files Browse the repository at this point in the history
- Bump dependencies in preparation for the cardano-node-9.2 release
- [x] updated Ledger dependencies.
- [x] updated Plutus dependencies
- [x] updated ouroboros-network dependencies,
- Propagate code changes resulting from the dependency bumps
  • Loading branch information
disassembler authored Aug 29, 2024
2 parents 57140a8 + cba804e commit 3da919f
Show file tree
Hide file tree
Showing 198 changed files with 280 additions and 100 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Ouroboros Consensus

[![consensus](https://img.shields.io/badge/ouroboros--consensus-0.20.0.0-blue)](https://chap.intersectmbo.org/package/ouroboros-consensus-0.20.0.0/)
[![diffusion](https://img.shields.io/badge/ouroboros--consensus--diffusion-0.17.0.1-blue)](https://chap.intersectmbo.org/package/ouroboros-consensus-diffusion-0.17.0.1/)
[![consensus](https://img.shields.io/badge/ouroboros--consensus-0.20.1.0-blue)](https://chap.intersectmbo.org/package/ouroboros-consensus-0.20.1.0/)
[![diffusion](https://img.shields.io/badge/ouroboros--consensus--diffusion-0.17.1.0-blue)](https://chap.intersectmbo.org/package/ouroboros-consensus-diffusion-0.17.1.0/)
[![protocol](https://img.shields.io/badge/ouroboros--consensus--protocol-0.9.0.1-blue)](https://chap.intersectmbo.org/package/ouroboros-consensus-protocol-0.9.0.1/)
[![cardano](https://img.shields.io/badge/ouroboros--consensus--cardano-0.18.0.0-blue)](https://chap.intersectmbo.org/package/ouroboros-consensus-cardano-0.18.0.0/)
[![sop-extras](https://img.shields.io/badge/sop--extras-0.2.0.0-blue)](https://chap.intersectmbo.org/package/sop-extras-0.2.0.0/)
[![strict-sop-core](https://img.shields.io/badge/strict--sop--core-0.1.1.0-blue)](https://chap.intersectmbo.org/package/strict-sop-core-0.1.1.0/)
[![cardano](https://img.shields.io/badge/ouroboros--consensus--cardano-0.19.0.0-blue)](https://chap.intersectmbo.org/package/ouroboros-consensus-cardano-0.19.0.0/)
[![sop-extras](https://img.shields.io/badge/sop--extras-0.2.1.0-blue)](https://chap.intersectmbo.org/package/sop-extras-0.2.1.0/)
[![strict-sop-core](https://img.shields.io/badge/strict--sop--core-0.1.2.0-blue)](https://chap.intersectmbo.org/package/strict-sop-core-0.1.2.0/)

[![docs](https://img.shields.io/badge/Documentation-yellow)][webpage]

Expand Down
11 changes: 7 additions & 4 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ index-state:
-- Bump this if you need newer packages from Hackage
, hackage.haskell.org 2024-07-23T00:03:37Z
-- Bump this if you need newer packages from CHaP
, cardano-haskell-packages 2024-08-15T10:40:33Z
, cardano-haskell-packages 2024-08-27T16:28:01Z

packages:
ouroboros-consensus
Expand All @@ -34,6 +34,12 @@ multi-repl: True

import: ./asserts.cabal

package ouroboros-network
-- Certain ThreadNet tests rely on transactions to be submitted promptly after
-- a node (re)start. Therefore, we disable this flag (see
-- https://github.com/IntersectMBO/ouroboros-network/issues/4927 for context).
flags: -txsubmission-delay

-- We need to disable bitvec's SIMD for now, as it breaks during cross compilation.
if(os(windows))
constraints:
Expand All @@ -50,6 +56,3 @@ if impl(ghc >= 9.10)
, cardano-ledger-binary:plutus-ledger-api
, cardano-ledger-conway:plutus-ledger-api

constraints:
-- Earlier versions do not compile with ghc-9.10
, plutus-ledger-api ^>=1.31
6 changes: 3 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions ouroboros-consensus-cardano/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,17 @@

# Changelog entries

<a id='changelog-0.19.0.0'></a>
## 0.18.0.0 — 2024-08-26

### Breaking

- Add `GetProposals` and `GetRatifyState` queries.
- Propagate cardano-ledger's updated `TranslationContext` `NoGenesis`
- Add `NodeToClientV_17` to `supportedNodeToClientVersions`
- Add `CardanoNodeToClientVersion13`
- Replace deprecated `TxSizeInBytes` with `SizeInBytes`

<a id='changelog-0.18.0.0'></a>
## 0.18.0.0 — 2024-07-02

Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 11 additions & 11 deletions ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 3.0
name: ouroboros-consensus-cardano
version: 0.18.0.0
version: 0.19.0.0
synopsis:
The instantation of the Ouroboros consensus layer used by Cardano

Expand Down Expand Up @@ -134,16 +134,16 @@ library
cardano-crypto,
cardano-crypto-class,
cardano-crypto-wrapper,
cardano-ledger-allegra ^>=1.5,
cardano-ledger-alonzo ^>=1.10,
cardano-ledger-api ^>=1.9.2,
cardano-ledger-babbage ^>=1.8.2,
cardano-ledger-binary ^>=1.3.3,
cardano-ledger-allegra ^>=1.6,
cardano-ledger-alonzo ^>=1.10.2,
cardano-ledger-api ^>=1.9.3,
cardano-ledger-babbage ^>=1.9,
cardano-ledger-binary ^>=1.3.4,
cardano-ledger-byron ^>=1.0.1,
cardano-ledger-conway ^>=1.16.0,
cardano-ledger-core ^>=1.13.2,
cardano-ledger-mary ^>=1.6.1,
cardano-ledger-shelley ^>=1.12,
cardano-ledger-conway ^>=1.16,
cardano-ledger-core ^>=1.14,
cardano-ledger-mary ^>=1.7,
cardano-ledger-shelley ^>=1.13,
cardano-prelude,
cardano-protocol-tpraos ^>=1.2,
cardano-slotting,
Expand All @@ -159,7 +159,7 @@ library
nothunks,
ouroboros-consensus ^>=0.20,
ouroboros-consensus-protocol ^>=0.9,
ouroboros-network-api ^>=0.7.3,
ouroboros-network-api ^>=0.9,
serialise ^>=0.2,
small-steps,
sop-core ^>=0.5,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import qualified Cardano.Ledger.BaseTypes as SL
import qualified Cardano.Ledger.Core as Core
import Cardano.Ledger.Crypto (ADDRHASH, Crypto, DSIGN, HASH)
import qualified Cardano.Ledger.Era as SL
import qualified Cardano.Ledger.Genesis as SL
import Cardano.Ledger.Hashes (EraIndependentTxBody)
import Cardano.Ledger.Keys (DSignable, Hash)
import qualified Cardano.Ledger.Shelley.API as SL
Expand Down Expand Up @@ -333,7 +334,7 @@ instance CardanoHardForkConstraints c => CanHardFork (CardanoEras c) where
(translateValidatedTxMaryToAlonzoWrapper ctxt)
)
$ PCons (RequireBoth $ \_cfgAlonzo _cfgBabbage ->
let ctxt = ()
let ctxt = SL.NoGenesis
in
Pair2
(translateTxAlonzoToBabbageWrapper ctxt)
Expand Down Expand Up @@ -526,23 +527,23 @@ translateLedgerStateShelleyToAllegraWrapper ::
translateLedgerStateShelleyToAllegraWrapper =
ignoringBoth $
Translate $ \_epochNo ->
unComp . SL.translateEra' () . Comp
unComp . SL.translateEra' SL.NoGenesis . Comp

translateTxShelleyToAllegraWrapper ::
(PraosCrypto c, DSignable c (Hash c EraIndependentTxBody))
=> InjectTx
(ShelleyBlock (TPraos c) (ShelleyEra c))
(ShelleyBlock (TPraos c) (AllegraEra c))
translateTxShelleyToAllegraWrapper = InjectTx $
fmap unComp . eitherToMaybe . runExcept . SL.translateEra () . Comp
fmap unComp . eitherToMaybe . runExcept . SL.translateEra SL.NoGenesis . Comp

translateValidatedTxShelleyToAllegraWrapper ::
(PraosCrypto c, DSignable c (Hash c EraIndependentTxBody))
=> InjectValidatedTx
(ShelleyBlock (TPraos c) (ShelleyEra c))
(ShelleyBlock (TPraos c) (AllegraEra c))
translateValidatedTxShelleyToAllegraWrapper = InjectValidatedTx $
fmap unComp . eitherToMaybe . runExcept . SL.translateEra () . Comp
fmap unComp . eitherToMaybe . runExcept . SL.translateEra SL.NoGenesis . Comp

{-------------------------------------------------------------------------------
Translation from Allegra to Mary
Expand All @@ -558,23 +559,23 @@ translateLedgerStateAllegraToMaryWrapper ::
translateLedgerStateAllegraToMaryWrapper =
ignoringBoth $
Translate $ \_epochNo ->
unComp . SL.translateEra' () . Comp
unComp . SL.translateEra' SL.NoGenesis . Comp

translateTxAllegraToMaryWrapper ::
(PraosCrypto c, DSignable c (Hash c EraIndependentTxBody))
=> InjectTx
(ShelleyBlock (TPraos c) (AllegraEra c))
(ShelleyBlock (TPraos c) (MaryEra c))
translateTxAllegraToMaryWrapper = InjectTx $
fmap unComp . eitherToMaybe . runExcept . SL.translateEra () . Comp
fmap unComp . eitherToMaybe . runExcept . SL.translateEra SL.NoGenesis . Comp

translateValidatedTxAllegraToMaryWrapper ::
(PraosCrypto c, DSignable c (Hash c EraIndependentTxBody))
=> InjectValidatedTx
(ShelleyBlock (TPraos c) (AllegraEra c))
(ShelleyBlock (TPraos c) (MaryEra c))
translateValidatedTxAllegraToMaryWrapper = InjectValidatedTx $
fmap unComp . eitherToMaybe . runExcept . SL.translateEra () . Comp
fmap unComp . eitherToMaybe . runExcept . SL.translateEra SL.NoGenesis . Comp

{-------------------------------------------------------------------------------
Translation from Mary to Alonzo
Expand Down Expand Up @@ -631,7 +632,7 @@ translateLedgerStateAlonzoToBabbageWrapper ::
translateLedgerStateAlonzoToBabbageWrapper =
RequireBoth $ \_cfgAlonzo _cfgBabbage ->
Translate $ \_epochNo ->
unComp . SL.translateEra' () . Comp . transPraosLS
unComp . SL.translateEra' SL.NoGenesis . Comp . transPraosLS
where
transPraosLS ::
LedgerState (ShelleyBlock (TPraos c) (AlonzoEra c)) ->
Expand Down
Loading

0 comments on commit 3da919f

Please sign in to comment.