From 0b35ed7fb89f87935de48d222926510537e276e9 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Mon, 21 Oct 2024 21:52:34 -0400 Subject: [PATCH 1/3] cardano-ledger-conway: require 1.17.1 --- cabal.project | 2 +- cardano-node/cardano-node.cabal | 3 ++- flake.lock | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/cabal.project b/cabal.project index f8074c50423..d17b39c7b3d 100644 --- a/cabal.project +++ b/cabal.project @@ -14,7 +14,7 @@ repository cardano-haskell-packages -- you need to run if you change them index-state: , hackage.haskell.org 2024-10-10T00:52:24Z - , cardano-haskell-packages 2024-10-17T12:07:57Z + , cardano-haskell-packages 2024-10-21T23:08:22Z packages: cardano-node diff --git a/cardano-node/cardano-node.cabal b/cardano-node/cardano-node.cabal index 29e807923a1..53f5c172050 100644 --- a/cardano-node/cardano-node.cabal +++ b/cardano-node/cardano-node.cabal @@ -155,7 +155,8 @@ library , cardano-ledger-babbage , cardano-ledger-binary , cardano-ledger-byron - , cardano-ledger-conway + -- TODO: remove constraint at next ledger bump + , cardano-ledger-conway ^>= 1.17.1 , cardano-ledger-core , cardano-ledger-shelley , cardano-prelude diff --git a/flake.lock b/flake.lock index e5079d846d8..4819ff6e9fd 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1729171858, - "narHash": "sha256-Frktcy6z3/CeT5I0S/SdQWia+yOXm1DMTxlwVtxLh2o=", + "lastModified": 1729560667, + "narHash": "sha256-tHDAxN8erb23MIy7zH6VV6mCspKBstj2R1LkeBgZt28=", "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "caf870b8abb957eaebf5db28da3181a3487fbbec", + "rev": "7f24768c3a2f42a15fef889d5b415100d8082c16", "type": "github" }, "original": { From 06b0c4016df00ac33ec71388c6f09fa41f10e810 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Mon, 21 Oct 2024 23:09:19 -0400 Subject: [PATCH 2/3] 10.1.0: release node and submit-api --- cardano-node/cardano-node.cabal | 2 +- cardano-submit-api/cardano-submit-api.cabal | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cardano-node/cardano-node.cabal b/cardano-node/cardano-node.cabal index 53f5c172050..3b7cb22c2c6 100644 --- a/cardano-node/cardano-node.cabal +++ b/cardano-node/cardano-node.cabal @@ -1,7 +1,7 @@ cabal-version: 3.0 name: cardano-node -version: 10.0 +version: 10.1.0 synopsis: The cardano full node description: The cardano full node. category: Cardano, diff --git a/cardano-submit-api/cardano-submit-api.cabal b/cardano-submit-api/cardano-submit-api.cabal index d75fae9b14f..eb51bfa6961 100644 --- a/cardano-submit-api/cardano-submit-api.cabal +++ b/cardano-submit-api/cardano-submit-api.cabal @@ -1,7 +1,7 @@ cabal-version: 3.0 name: cardano-submit-api -version: 10.0 +version: 10.1.0 synopsis: A web server that allows transactions to be POSTed to the cardano chain description: A web server that allows transactions to be POSTed to the cardano chain. homepage: https://github.com/intersectmbo/cardano-node From 8fd9b7f39b5452bb3038d7697ae38491e53d7e56 Mon Sep 17 00:00:00 2001 From: Mateusz Galazyn Date: Tue, 22 Oct 2024 16:21:19 +0200 Subject: [PATCH 3/3] Upgrade cardano-api-10.1 cardano-cli-10.1 (cherry picked from commit 8aae61c4cbdfd527a4f86e6ed374b68ee5b216d3) --- bench/plutus-scripts-bench/plutus-scripts-bench.cabal | 2 +- bench/tx-generator/tx-generator.cabal | 4 ++-- cabal.project | 2 +- cardano-node-chairman/cardano-node-chairman.cabal | 4 ++-- cardano-node/cardano-node.cabal | 2 +- cardano-submit-api/cardano-submit-api.cabal | 4 ++-- cardano-testnet/cardano-testnet.cabal | 4 ++-- cardano-testnet/src/Testnet/Defaults.hs | 4 +++- cardano-testnet/src/Testnet/EpochStateProcessing.hs | 1 - .../cardano-testnet-test/Cardano/Testnet/Test/Cli/Query.hs | 1 - flake.lock | 6 +++--- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bench/plutus-scripts-bench/plutus-scripts-bench.cabal b/bench/plutus-scripts-bench/plutus-scripts-bench.cabal index 59d9f7f28a6..a0028b5ef1d 100644 --- a/bench/plutus-scripts-bench/plutus-scripts-bench.cabal +++ b/bench/plutus-scripts-bench/plutus-scripts-bench.cabal @@ -80,7 +80,7 @@ library -- IOG dependencies -------------------------- build-depends: - , cardano-api ^>=10.0 + , cardano-api ^>=10.1 , plutus-ledger-api ^>=1.36 , plutus-tx ^>=1.36 , plutus-tx-plugin ^>=1.36 diff --git a/bench/tx-generator/tx-generator.cabal b/bench/tx-generator/tx-generator.cabal index c53de32d79d..b8275a8da51 100644 --- a/bench/tx-generator/tx-generator.cabal +++ b/bench/tx-generator/tx-generator.cabal @@ -106,9 +106,9 @@ library , attoparsec-aeson , base16-bytestring , bytestring - , cardano-api ^>= 10.0 + , cardano-api ^>= 10.1 , cardano-binary - , cardano-cli ^>= 10.0 + , cardano-cli ^>= 10.1 , cardano-crypto-class , cardano-crypto-wrapper , cardano-data diff --git a/cabal.project b/cabal.project index d17b39c7b3d..5e92a784ab2 100644 --- a/cabal.project +++ b/cabal.project @@ -14,7 +14,7 @@ repository cardano-haskell-packages -- you need to run if you change them index-state: , hackage.haskell.org 2024-10-10T00:52:24Z - , cardano-haskell-packages 2024-10-21T23:08:22Z + , cardano-haskell-packages 2024-10-22T13:53:49Z packages: cardano-node diff --git a/cardano-node-chairman/cardano-node-chairman.cabal b/cardano-node-chairman/cardano-node-chairman.cabal index b4f539efd9f..2aa8deea1e3 100644 --- a/cardano-node-chairman/cardano-node-chairman.cabal +++ b/cardano-node-chairman/cardano-node-chairman.cabal @@ -44,7 +44,7 @@ executable cardano-node-chairman build-depends: cardano-api , cardano-crypto-class , cardano-git-rev ^>= 0.2.2 - , cardano-node ^>= 10.0 + , cardano-node ^>= 10.1 , cardano-prelude , containers , contra-tracer @@ -89,5 +89,5 @@ test-suite chairman-tests ghc-options: -threaded -rtsopts "-with-rtsopts=-N -T" build-tool-depends: cardano-node:cardano-node - , cardano-cli:cardano-cli ^>= 10.0 + , cardano-cli:cardano-cli ^>= 10.1 , cardano-node-chairman:cardano-node-chairman diff --git a/cardano-node/cardano-node.cabal b/cardano-node/cardano-node.cabal index 3b7cb22c2c6..16aefc5af15 100644 --- a/cardano-node/cardano-node.cabal +++ b/cardano-node/cardano-node.cabal @@ -145,7 +145,7 @@ library , async , base16-bytestring , bytestring - , cardano-api ^>= 10.0 + , cardano-api ^>= 10.1 , cardano-crypto-class , cardano-crypto-wrapper , cardano-git-rev ^>=0.2.2 diff --git a/cardano-submit-api/cardano-submit-api.cabal b/cardano-submit-api/cardano-submit-api.cabal index eb51bfa6961..c5032f24142 100644 --- a/cardano-submit-api/cardano-submit-api.cabal +++ b/cardano-submit-api/cardano-submit-api.cabal @@ -39,9 +39,9 @@ library , aeson , async , bytestring - , cardano-api ^>= 10.0 + , cardano-api ^>= 10.1 , cardano-binary - , cardano-cli ^>= 10.0 + , cardano-cli ^>= 10.1 , cardano-crypto-class ^>= 2.1.2 , http-media , iohk-monitoring diff --git a/cardano-testnet/cardano-testnet.cabal b/cardano-testnet/cardano-testnet.cabal index c076da89ee4..e180f6645c6 100644 --- a/cardano-testnet/cardano-testnet.cabal +++ b/cardano-testnet/cardano-testnet.cabal @@ -35,8 +35,8 @@ library , aeson-pretty , ansi-terminal , bytestring - , cardano-api ^>= 10.0 - , cardano-cli ^>= 10.0 + , cardano-api ^>= 10.1 + , cardano-cli ^>= 10.1 , cardano-crypto-class , cardano-crypto-wrapper , cardano-git-rev ^>= 0.2.2 diff --git a/cardano-testnet/src/Testnet/Defaults.hs b/cardano-testnet/src/Testnet/Defaults.hs index 0511cd77417..0c7176abcce 100644 --- a/cardano-testnet/src/Testnet/Defaults.hs +++ b/cardano-testnet/src/Testnet/Defaults.hs @@ -44,6 +44,7 @@ import qualified Cardano.Api.Shelley as Api import Cardano.Ledger.Alonzo.Core (PParams (..)) import Cardano.Ledger.Alonzo.Genesis (AlonzoGenesis) import qualified Cardano.Ledger.Alonzo.Genesis as Ledger +import qualified Cardano.Ledger.Api as L import Cardano.Ledger.BaseTypes import qualified Cardano.Ledger.BaseTypes as Ledger import Cardano.Ledger.Binary.Version () @@ -387,7 +388,8 @@ defaultShelleyGenesis asbe startTime maxSupply options = do -- TODO: find out why this actually degrates network stability - turned off for now -- securityParam = ceiling $ fromIntegral epochLength * cardanoActiveSlotsCoeff / 10 pVer = eraToProtocolVersion asbe - protocolParams = Api.sgProtocolParams Api.shelleyGenesisDefaults + -- TODO: Remove after merging https://github.com/IntersectMBO/cardano-node/pull/6017 + protocolParams = Api.sgProtocolParams Api.shelleyGenesisDefaults & L.ppKeyDepositL .~ 0 protocolParamsWithPVer = protocolParams & ppProtocolVersionL' .~ pVer Api.shelleyGenesisDefaults { Api.sgActiveSlotsCoeff = unsafeBoundedRational activeSlotsCoeff diff --git a/cardano-testnet/src/Testnet/EpochStateProcessing.hs b/cardano-testnet/src/Testnet/EpochStateProcessing.hs index e75cf72dff8..762a543ea96 100644 --- a/cardano-testnet/src/Testnet/EpochStateProcessing.hs +++ b/cardano-testnet/src/Testnet/EpochStateProcessing.hs @@ -12,7 +12,6 @@ import Cardano.Api.Ledger (EpochInterval (..), GovActionId (..)) import qualified Cardano.Api.Ledger as L import qualified Cardano.Ledger.Conway.Governance as L -import qualified Cardano.Ledger.Shelley.API as L import Cardano.Ledger.Shelley.LedgerState (newEpochStateGovStateL) import qualified Cardano.Ledger.Shelley.LedgerState as L diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Query.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Query.hs index 40e298d0b91..a30b2499086 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Query.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Query.hs @@ -28,7 +28,6 @@ import qualified Cardano.Ledger.BaseTypes as L import Cardano.Ledger.Core (valueTxOutL) import Cardano.Ledger.Shelley.LedgerState (esLStateL, lsUTxOStateL, nesEpochStateL, utxosUtxoL) -import qualified Cardano.Ledger.TxIn as L import qualified Cardano.Ledger.UTxO as L import Cardano.Testnet diff --git a/flake.lock b/flake.lock index 4819ff6e9fd..b3660f88b3d 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1729560667, - "narHash": "sha256-tHDAxN8erb23MIy7zH6VV6mCspKBstj2R1LkeBgZt28=", + "lastModified": 1729606144, + "narHash": "sha256-LhKDonlXqVtRArtg0RHgTkze0KZV+dQ/Xop/3dylUR8=", "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "7f24768c3a2f42a15fef889d5b415100d8082c16", + "rev": "05b6965b007cbcb275ff236416f14545ef991899", "type": "github" }, "original": {