Merge pull request #5951 from IntersectMBO/mgalazyn/chore/upgrade-car…

…dano-api-cli Upgrade cardano-cli-9.3 cardano-api-9.2
IntersectMBO · Aug 21, 2024 · e9ab511 · e9ab511
2 parents 6aa375c + 42b783f
commit e9ab511
Show file tree

Hide file tree

Showing 12 changed files with 48 additions and 38 deletions.
diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
@@ -36,7 +36,9 @@ jobs:
       fail-fast: false
       matrix:
         # If you edit these versions, make sure the version in the lonely macos-latest job below is updated accordingly
-        ghc: ["9.6", "9.8"]
+        # TODO add 9.8 again to the versions list when GHC-9.8 gets released with stm > 2.5.2,
+        # see https://github.com/haskell/stm/issues/76
+        ghc: ["9.6"]
         cabal: ["3.12"]
         sys:
           - { os: windows-latest, shell: 'C:/msys64/usr/bin/bash.exe -e {0}' }

diff --git a/bench/plutus-scripts-bench/plutus-scripts-bench.cabal b/bench/plutus-scripts-bench/plutus-scripts-bench.cabal
@@ -80,10 +80,10 @@ library
   -- IOG dependencies
   --------------------------
   build-depends:
-    , cardano-api             ^>=9.1
-    , plutus-ledger-api       ^>=1.30
-    , plutus-tx               ^>=1.30
-    , plutus-tx-plugin        ^>=1.30
+    , cardano-api             ^>=9.2
+    , plutus-ledger-api       ^>=1.31
+    , plutus-tx               ^>=1.31
+    , plutus-tx-plugin        ^>=1.31
 
   ------------------------
   -- Non-IOG dependencies

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 ^>= 9.1
+                      , cardano-api ^>= 9.2
                       , cardano-binary
-                      , cardano-cli ^>= 9.2.1
+                      , cardano-cli ^>= 9.3
                       , cardano-crypto-class
                       , cardano-crypto-wrapper
                       , cardano-data

diff --git a/cabal.project b/cabal.project
@@ -13,8 +13,8 @@ repository cardano-haskell-packages
 -- See CONTRIBUTING for information about these, including some Nix commands
 -- you need to run if you change them
 index-state:
-  , hackage.haskell.org 2024-06-23T23:01:13Z
-  , cardano-haskell-packages 2024-07-24T14:16:32Z
+  , hackage.haskell.org 2024-08-15T08:53:32Z
+  , cardano-haskell-packages 2024-08-15T10:40:33Z
 
 packages:
   cardano-node
@@ -60,7 +60,8 @@ package plutus-scripts-bench
 constraints:
   wai-extra < 3.1.15,
 
-allow-newer: katip:Win32
+allow-newer:
+    katip:Win32
 
 -- IMPORTANT
 -- Do NOT add more source-repository-package stanzas here unless they are strictly

diff --git a/cardano-node-chairman/cardano-node-chairman.cabal b/cardano-node-chairman/cardano-node-chairman.cabal
@@ -43,7 +43,7 @@ executable cardano-node-chairman
                         "-with-rtsopts=-T"
   build-depends:        cardano-api
                       , cardano-crypto-class
-                      , cardano-git-rev ^>=0.2.2
+                      , cardano-git-rev ^>= 0.2.2
                       , cardano-node ^>= 9.1
                       , cardano-prelude
                       , containers
@@ -88,5 +88,5 @@ test-suite chairman-tests
   ghc-options:          -threaded -rtsopts "-with-rtsopts=-N -T"
 
   build-tool-depends:   cardano-node:cardano-node
-                      , cardano-cli:cardano-cli ^>= 9.2.1
+                      , cardano-cli:cardano-cli ^>= 9.3
                       , 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 ^>= 9.1
+                      , cardano-api ^>= 9.2
                       , cardano-crypto-class
                       , cardano-crypto-wrapper
                       , cardano-git-rev ^>=0.2.2
@@ -201,7 +201,8 @@ library
                       , scientific
                       , si-timers
                       , sop-core
-                      , stm
+                      -- avoid stm-2.5.2 https://github.com/haskell/stm/issues/76
+                      , stm <2.5.2 || >=2.5.3
                       , strict-sop-core
                       , strict-stm
                       , time

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 ^>= 9.1
+                      , cardano-api ^>= 9.2
                       , cardano-binary
-                      , cardano-cli ^>= 9.2.1
+                      , cardano-cli ^>= 9.3
                       , 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 ^>= 9.1
-                      , cardano-cli ^>= 9.2.1
+                      , cardano-api ^>= 9.2
+                      , cardano-cli ^>= 9.3
                       , cardano-crypto-class
                       , cardano-crypto-wrapper
                       , cardano-git-rev ^>= 0.2.2

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
@@ -40,10 +40,10 @@ import qualified Data.Aeson.Encode.Pretty as Aeson
 import qualified Data.Aeson.Key as Aeson
 import qualified Data.Aeson.KeyMap as Aeson
 import           Data.Bifunctor (bimap)
+import qualified Data.ByteString.Lazy as LBS
 import           Data.Data (type (:~:) (Refl))
 import qualified Data.Map as Map
 import           Data.String
-import qualified Data.ByteString.Lazy as LBS
 import           Data.Text (Text)
 import qualified Data.Text as T
 import qualified Data.Text.Lazy as TL
@@ -56,11 +56,11 @@ import           Lens.Micro ((^.))
 import           System.Directory (makeAbsolute)
 import           System.FilePath ((</>))
 
-import           Testnet.Components.Query (checkDRepsNumber, getEpochStateView,
-                   watchEpochStateUpdate, EpochStateView)
+import           Testnet.Components.Query (EpochStateView, checkDRepsNumber, getEpochStateView,
+                   watchEpochStateUpdate)
 import qualified Testnet.Defaults as Defaults
 import           Testnet.Process.Cli.Transaction (TxOutAddress (ReferenceScriptAddress),
-                   retrieveTransactionId, signTx, mkSimpleSpendOutputsOnlyTx, mkSpendOutputsOnlyTx,
+                   mkSimpleSpendOutputsOnlyTx, mkSpendOutputsOnlyTx, retrieveTransactionId, signTx,
                    submitTx)
 import           Testnet.Process.Run (execCli', execCliStdoutToJson, mkExecConfig)
 import           Testnet.Property.Assert (assertErasEqual)
@@ -71,7 +71,7 @@ import           Testnet.Types
 
 import           Hedgehog
 import qualified Hedgehog as H
-import           Hedgehog.Extras (readJsonFile, MonadAssertion)
+import           Hedgehog.Extras (MonadAssertion, readJsonFile)
 import qualified Hedgehog.Extras as H
 import qualified Hedgehog.Extras.Test.Golden as H
 
@@ -362,6 +362,9 @@ hprop_cli_queries = integrationWorkspace "cli-queries" $ \tempAbsBasePath' -> H.
       -- treasury
       H.noteM_ $ execCli' execConfig [ eraName, "query", "treasury" ]
 
+    TestQuerySPOStakeDistributionCmd -> do
+      pure () -- FIXME: https://github.com/IntersectMBO/cardano-node/pull/5932
+
   where
   -- | Wait for the part of the epoch when futurePParams are known
   waitForFuturePParamsToStabilise

diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/TreasuryDonation.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/TreasuryDonation.hs
@@ -17,8 +17,8 @@ import           Cardano.Testnet
 
 import           Prelude
 
-import           Control.Monad.Catch (MonadCatch)
 import           Control.Monad (unless, void)
+import           Control.Monad.Catch (MonadCatch)
 import qualified Data.Text as Text
 import           GHC.Stack (HasCallStack)
 import           System.Exit
@@ -95,7 +95,7 @@ doTreasuryDonation :: ()
   -> Int -- ^ The amount to donate
   -> m ()
 doTreasuryDonation sbe execConfig work epochStateView wallet0 idx currentTreasury' treasuryDonation = do
-  currentTreasury <- 
+  currentTreasury <-
     case currentTreasury' of
       Nothing -> do
         v <- unCoin <$> getTreasuryValue epochStateView
@@ -133,24 +133,24 @@ doTreasuryDonation sbe execConfig work epochStateView wallet0 idx currentTreasur
         -- greater or equal to zero.
         ct >= 0 && td >= 0
       H.noteM_ $ execCli' execConfig
-        [ "conway", "transaction", "view" , "--tx-file", txBodyFp
+        [ "debug", "transaction", "view" , "--tx-file", txBodyFp
         , "--output-json", "--out-file", txViewFp]
-    
+
       H.noteM_ $ execCli' execConfig
         [ "conway", "transaction", "sign"
         , "--tx-body-file", txBodyFp
         , "--signing-key-file", signingKeyFp $ paymentKeyInfoPair wallet0
         , "--out-file", signedTxFp
         ]
-    
+
       H.noteM_ $ execCli' execConfig
-        [ "conway", "transaction", "view" , "--tx-file", signedTxFp ]
-    
+        [ "debug", "transaction", "view" , "--tx-file", signedTxFp ]
+
       H.noteM_ $ execCli' execConfig
         [ "conway", "transaction", "submit" , "--tx-file", signedTxFp ]
-    
+
       void $ waitForEpochs epochStateView (EpochInterval 3)
-    
+
       L.Coin finalTreasury <- getTreasuryValue epochStateView
       H.note_ $ "finalTreasury: " <> show finalTreasury
       finalTreasury H.=== (currentTreasury + toInteger treasuryDonation)
diff --git a/flake.lock b/flake.lock
diff --git a/nix/pkgs.nix b/nix/pkgs.nix
@@ -111,6 +111,9 @@ in with final;
   };
 
   cabal-plan = haskell-nix.tool compiler-nix-name "cabal-plan" {
+    cabalProjectLocal = ''
+      flags: +exe
+    '';
   };
 
   cardanolib-py = callPackage ./cardanolib-py { };