Upgrade cardano-api-10.1 cardano-cli-10.1

(cherry picked from commit 8aae61c)
IntersectMBO · Oct 22, 2024 · 8fd9b7f · 8fd9b7f
1 parent 06b0c40
commit 8fd9b7f
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 17 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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