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 f8074c50423..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-17T12:07:57Z + , 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..6f952181f31 100644 --- a/cardano-node-chairman/cardano-node-chairman.cabal +++ b/cardano-node-chairman/cardano-node-chairman.cabal @@ -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 29e807923a1..44d3c6bb15f 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 d75fae9b14f..ecc7489599c 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 e5079d846d8..b3660f88b3d 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1729171858, - "narHash": "sha256-Frktcy6z3/CeT5I0S/SdQWia+yOXm1DMTxlwVtxLh2o=", + "lastModified": 1729606144, + "narHash": "sha256-LhKDonlXqVtRArtg0RHgTkze0KZV+dQ/Xop/3dylUR8=", "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "caf870b8abb957eaebf5db28da3181a3487fbbec", + "rev": "05b6965b007cbcb275ff236416f14545ef991899", "type": "github" }, "original": {