Skip to content

Commit e9ab511

Browse files
carbolymercarbolymer
authored
Merge pull request #5951 from IntersectMBO/mgalazyn/chore/upgrade-cardano-api-cli
Upgrade cardano-cli-9.3 cardano-api-9.2
2 parents 6aa375c + 42b783f commit e9ab511

File tree

12 files changed

+48
-38
lines changed

12 files changed

+48
-38
lines changed

‎.github/workflows/haskell.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ jobs:
3636
fail-fast: false
3737
matrix:
3838
# If you edit these versions, make sure the version in the lonely macos-latest job below is updated accordingly
39-
ghc: ["9.6", "9.8"]
39+
# TODO add 9.8 again to the versions list when GHC-9.8 gets released with stm > 2.5.2,
40+
# see https://github.com/haskell/stm/issues/76
41+
ghc: ["9.6"]
4042
cabal: ["3.12"]
4143
sys:
4244
- { os: windows-latest, shell: 'C:/msys64/usr/bin/bash.exe -e {0}' }

‎bench/plutus-scripts-bench/plutus-scripts-bench.cabal‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ library
8080
-- IOG dependencies
8181
--------------------------
8282
build-depends:
83-
, cardano-api ^>=9.1
84-
, plutus-ledger-api ^>=1.30
85-
, plutus-tx ^>=1.30
86-
, plutus-tx-plugin ^>=1.30
83+
, cardano-api ^>=9.2
84+
, plutus-ledger-api ^>=1.31
85+
, plutus-tx ^>=1.31
86+
, plutus-tx-plugin ^>=1.31
8787

8888
------------------------
8989
-- Non-IOG dependencies

‎bench/tx-generator/tx-generator.cabal‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@ library
106106
, attoparsec-aeson
107107
, base16-bytestring
108108
, bytestring
109-
, cardano-api ^>= 9.1
109+
, cardano-api ^>= 9.2
110110
, cardano-binary
111-
, cardano-cli ^>= 9.2.1
111+
, cardano-cli ^>= 9.3
112112
, cardano-crypto-class
113113
, cardano-crypto-wrapper
114114
, cardano-data

‎cabal.project‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ repository cardano-haskell-packages
1313
-- See CONTRIBUTING for information about these, including some Nix commands
1414
-- you need to run if you change them
1515
index-state:
16-
, hackage.haskell.org 2024-06-23T23:01:13Z
17-
, cardano-haskell-packages 2024-07-24T14:16:32Z
16+
, hackage.haskell.org 2024-08-15T08:53:32Z
17+
, cardano-haskell-packages 2024-08-15T10:40:33Z
1818

1919
packages:
2020
cardano-node
@@ -60,7 +60,8 @@ package plutus-scripts-bench
6060
constraints:
6161
wai-extra < 3.1.15,
6262

63-
allow-newer: katip:Win32
63+
allow-newer:
64+
katip:Win32
6465

6566
-- IMPORTANT
6667
-- Do NOT add more source-repository-package stanzas here unless they are strictly

‎cardano-node-chairman/cardano-node-chairman.cabal‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ executable cardano-node-chairman
4343
"-with-rtsopts=-T"
4444
build-depends: cardano-api
4545
, cardano-crypto-class
46-
, cardano-git-rev ^>=0.2.2
46+
, cardano-git-rev ^>= 0.2.2
4747
, cardano-node ^>= 9.1
4848
, cardano-prelude
4949
, containers
@@ -88,5 +88,5 @@ test-suite chairman-tests
8888
ghc-options: -threaded -rtsopts "-with-rtsopts=-N -T"
8989

9090
build-tool-depends: cardano-node:cardano-node
91-
, cardano-cli:cardano-cli ^>= 9.2.1
91+
, cardano-cli:cardano-cli ^>= 9.3
9292
, cardano-node-chairman:cardano-node-chairman

‎cardano-node/cardano-node.cabal‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ library
145145
, async
146146
, base16-bytestring
147147
, bytestring
148-
, cardano-api ^>= 9.1
148+
, cardano-api ^>= 9.2
149149
, cardano-crypto-class
150150
, cardano-crypto-wrapper
151151
, cardano-git-rev ^>=0.2.2
@@ -201,7 +201,8 @@ library
201201
, scientific
202202
, si-timers
203203
, sop-core
204-
, stm
204+
-- avoid stm-2.5.2 https://github.com/haskell/stm/issues/76
205+
, stm <2.5.2 || >=2.5.3
205206
, strict-sop-core
206207
, strict-stm
207208
, time

‎cardano-submit-api/cardano-submit-api.cabal‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ library
3939
, aeson
4040
, async
4141
, bytestring
42-
, cardano-api ^>= 9.1
42+
, cardano-api ^>= 9.2
4343
, cardano-binary
44-
, cardano-cli ^>= 9.2.1
44+
, cardano-cli ^>= 9.3
4545
, cardano-crypto-class ^>= 2.1.2
4646
, http-media
4747
, iohk-monitoring

‎cardano-testnet/cardano-testnet.cabal‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ library
3535
, aeson-pretty
3636
, ansi-terminal
3737
, bytestring
38-
, cardano-api ^>= 9.1
39-
, cardano-cli ^>= 9.2.1
38+
, cardano-api ^>= 9.2
39+
, cardano-cli ^>= 9.3
4040
, cardano-crypto-class
4141
, cardano-crypto-wrapper
4242
, cardano-git-rev ^>= 0.2.2

‎cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Query.hs‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ import qualified Data.Aeson.Encode.Pretty as Aeson
4040
import qualified Data.Aeson.Key as Aeson
4141
import qualified Data.Aeson.KeyMap as Aeson
4242
import Data.Bifunctor (bimap)
43+
import qualified Data.ByteString.Lazy as LBS
4344
import Data.Data (type (:~:) (Refl))
4445
import qualified Data.Map as Map
4546
import Data.String
46-
import qualified Data.ByteString.Lazy as LBS
4747
import Data.Text (Text)
4848
import qualified Data.Text as T
4949
import qualified Data.Text.Lazy as TL
@@ -56,11 +56,11 @@ import Lens.Micro ((^.))
5656
import System.Directory (makeAbsolute)
5757
import System.FilePath ((</>))
5858

59-
import Testnet.Components.Query (checkDRepsNumber, getEpochStateView,
60-
watchEpochStateUpdate, EpochStateView)
59+
import Testnet.Components.Query (EpochStateView, checkDRepsNumber, getEpochStateView,
60+
watchEpochStateUpdate)
6161
import qualified Testnet.Defaults as Defaults
6262
import Testnet.Process.Cli.Transaction (TxOutAddress (ReferenceScriptAddress),
63-
retrieveTransactionId, signTx, mkSimpleSpendOutputsOnlyTx, mkSpendOutputsOnlyTx,
63+
mkSimpleSpendOutputsOnlyTx, mkSpendOutputsOnlyTx, retrieveTransactionId, signTx,
6464
submitTx)
6565
import Testnet.Process.Run (execCli', execCliStdoutToJson, mkExecConfig)
6666
import Testnet.Property.Assert (assertErasEqual)
@@ -71,7 +71,7 @@ import Testnet.Types
7171

7272
import Hedgehog
7373
import qualified Hedgehog as H
74-
import Hedgehog.Extras (readJsonFile, MonadAssertion)
74+
import Hedgehog.Extras (MonadAssertion, readJsonFile)
7575
import qualified Hedgehog.Extras as H
7676
import qualified Hedgehog.Extras.Test.Golden as H
7777

@@ -362,6 +362,9 @@ hprop_cli_queries = integrationWorkspace "cli-queries" $ \tempAbsBasePath' -> H.
362362
-- treasury
363363
H.noteM_ $ execCli' execConfig [ eraName, "query", "treasury" ]
364364

365+
TestQuerySPOStakeDistributionCmd -> do
366+
pure () -- FIXME: https://github.com/IntersectMBO/cardano-node/pull/5932
367+
365368
where
366369
-- | Wait for the part of the epoch when futurePParams are known
367370
waitForFuturePParamsToStabilise

‎cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/TreasuryDonation.hs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import Cardano.Testnet
1717

1818
import Prelude
1919

20-
import Control.Monad.Catch (MonadCatch)
2120
import Control.Monad (unless, void)
21+
import Control.Monad.Catch (MonadCatch)
2222
import qualified Data.Text as Text
2323
import GHC.Stack (HasCallStack)
2424
import System.Exit
@@ -95,7 +95,7 @@ doTreasuryDonation :: ()
9595
-> Int -- ^ The amount to donate
9696
-> m ()
9797
doTreasuryDonation sbe execConfig work epochStateView wallet0 idx currentTreasury' treasuryDonation = do
98-
currentTreasury <-
98+
currentTreasury <-
9999
case currentTreasury' of
100100
Nothing -> do
101101
v <- unCoin <$> getTreasuryValue epochStateView
@@ -133,24 +133,24 @@ doTreasuryDonation sbe execConfig work epochStateView wallet0 idx currentTreasur
133133
-- greater or equal to zero.
134134
ct >= 0 && td >= 0
135135
H.noteM_ $ execCli' execConfig
136-
[ "conway", "transaction", "view" , "--tx-file", txBodyFp
136+
[ "debug", "transaction", "view" , "--tx-file", txBodyFp
137137
, "--output-json", "--out-file", txViewFp]
138-
138+
139139
H.noteM_ $ execCli' execConfig
140140
[ "conway", "transaction", "sign"
141141
, "--tx-body-file", txBodyFp
142142
, "--signing-key-file", signingKeyFp $ paymentKeyInfoPair wallet0
143143
, "--out-file", signedTxFp
144144
]
145-
145+
146146
H.noteM_ $ execCli' execConfig
147-
[ "conway", "transaction", "view" , "--tx-file", signedTxFp ]
148-
147+
[ "debug", "transaction", "view" , "--tx-file", signedTxFp ]
148+
149149
H.noteM_ $ execCli' execConfig
150150
[ "conway", "transaction", "submit" , "--tx-file", signedTxFp ]
151-
151+
152152
void $ waitForEpochs epochStateView (EpochInterval 3)
153-
153+
154154
L.Coin finalTreasury <- getTreasuryValue epochStateView
155155
H.note_ $ "finalTreasury: " <> show finalTreasury
156156
finalTreasury H.=== (currentTreasury + toInteger treasuryDonation)

0 commit comments

Comments
 (0)