Skip to content

Commit 0f6b522

Browse files
authored
Merge pull request #6327 from IntersectMBO/test-cardano-cli-10.12.0.0
Bump `cardano-cli-10.12.0.0` and `cardano-api-10.18.0.0`
2 parents 5ea4115 + b35d453 commit 0f6b522

File tree

10 files changed

+19
-17
lines changed

10 files changed

+19
-17
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ library
8282
-- IOG dependencies
8383
--------------------------
8484
build-depends:
85-
, cardano-api ^>=10.17
85+
, cardano-api ^>=10.18
8686
, plutus-ledger-api ^>=1.45
8787
, plutus-tx ^>=1.45
8888
, plutus-tx-plugin ^>=1.45

bench/tx-generator/src/Cardano/TxGenerator/Setup/Plutus.hs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
{-# LANGUAGE NamedFieldPuns #-}
44
{-# LANGUAGE RankNTypes #-}
55
{-# LANGUAGE ScopedTypeVariables #-}
6+
{-# LANGUAGE TypeApplications #-}
67

78
{-|
89
Module : Cardano.TxGenerator.Setup.Plutus
@@ -23,7 +24,7 @@ import Control.Monad.Trans.Except
2324
import Control.Monad.Trans.Except.Extra
2425
import Control.Monad.Writer (runWriter)
2526

26-
import Cardano.CLI.Read (readFileScriptInAnyLang)
27+
import Cardano.CLI.Read (readFileScriptInAnyLang, ScriptDecodeError)
2728

2829
import Cardano.Api
2930
import Cardano.Ledger.Plutus.TxInfo (exBudgetToExUnits)
@@ -71,7 +72,7 @@ readPlutusScript (Left s)
7172
doLoad fp = second (second (const $ ResolvedToFallback asFileName)) <$> readPlutusScript (Right fp)
7273
readPlutusScript (Right fp)
7374
= runExceptT $ do
74-
script <- firstExceptT ApiError $
75+
script <- firstExceptT (ApiError @ScriptDecodeError) $
7576
readFileScriptInAnyLang fp
7677
case script of
7778
ScriptInAnyLang (PlutusScriptLanguage _) _ -> pure (script, ResolvedToFileName fp)

bench/tx-generator/tx-generator.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,9 @@ library
113113
, attoparsec-aeson
114114
, base16-bytestring
115115
, bytestring
116-
, cardano-api ^>= 10.17
116+
, cardano-api ^>= 10.18
117117
, cardano-binary
118-
, cardano-cli ^>= 10.11
118+
, cardano-cli ^>= 10.12
119119
, cardano-crypto-class
120120
, cardano-crypto-wrapper
121121
, cardano-data

cabal.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ repository cardano-haskell-packages
1414
-- you need to run if you change them
1515
index-state:
1616
, hackage.haskell.org 2025-06-24T21:06:59Z
17-
, cardano-haskell-packages 2025-07-01T09:22:51Z
17+
, cardano-haskell-packages 2025-09-18T12:21:32Z
1818

1919
packages:
2020
cardano-node

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,5 +90,5 @@ test-suite chairman-tests
9090
ghc-options: -threaded -rtsopts "-with-rtsopts=-N -T"
9191

9292
build-tool-depends: cardano-node:cardano-node
93-
, cardano-cli:cardano-cli ^>= 10.11
93+
, cardano-cli:cardano-cli ^>= 10.12
9494
, cardano-node-chairman:cardano-node-chairman

cardano-node/cardano-node.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ library
142142
, async
143143
, base16-bytestring
144144
, bytestring
145-
, cardano-api ^>= 10.17.1
145+
, cardano-api ^>= 10.18
146146
, cardano-crypto-class
147147
, cardano-crypto-wrapper
148148
, cardano-git-rev ^>=0.2.2

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 ^>= 10.17
42+
, cardano-api ^>= 10.18
4343
, cardano-binary
44-
, cardano-cli ^>= 10.11.1
44+
, cardano-cli ^>= 10.12
4545
, cardano-crypto-class ^>= 2.2
4646
, http-media
4747
, iohk-monitoring

cardano-testnet/cardano-testnet.cabal

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ library
4040
, aeson-pretty
4141
, ansi-terminal
4242
, bytestring
43-
, cardano-api ^>= 10.17
44-
, cardano-cli:{cardano-cli, cardano-cli-test-lib} ^>= 10.11.1
43+
, cardano-api ^>= 10.18
44+
, cardano-cli:{cardano-cli, cardano-cli-test-lib} ^>= 10.12
4545
, cardano-crypto-class
4646
, cardano-crypto-wrapper
4747
, cardano-git-rev ^>= 0.2.2
@@ -266,6 +266,7 @@ test-suite cardano-testnet-test
266266
, mtl
267267
, process
268268
, regex-compat
269+
, rio
269270
, tasty ^>= 1.5
270271
, text
271272
, time

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ import Testnet.Property.Util (integrationWorkspace)
6262
import Testnet.Start.Types (GenesisOptions (..), NumPools (..), cardanoNumPools)
6363
import Testnet.TestQueryCmds (TestQueryCmds (..), forallQueryCommands)
6464
import Testnet.Types
65+
import RIO (runRIO)
6566

6667
import Hedgehog
6768
import qualified Hedgehog as H
@@ -481,7 +482,6 @@ hprop_cli_queries = integrationWorkspace "cli-queries" $ \tempAbsBasePath' -> H.
481482
readVerificationKeyFromFile
482483
:: ( HasCallStack
483484
, MonadIO m
484-
, MonadCatch m
485485
, MonadTest m
486486
, HasTextEnvelope (VerificationKey keyrole)
487487
, SerialiseAsBech32 (VerificationKey keyrole)
@@ -490,7 +490,7 @@ hprop_cli_queries = integrationWorkspace "cli-queries" $ \tempAbsBasePath' -> H.
490490
-> File content direction
491491
-> m (VerificationKey keyrole)
492492
readVerificationKeyFromFile work =
493-
H.evalEitherM . liftIO . runExceptT . readVerificationKeyOrFile . VerificationKeyFilePath . File . (work </>) . unFile
493+
H.evalIO . runRIO () . readVerificationKeyOrFile . VerificationKeyFilePath . File . (work </>) . unFile
494494

495495
_verificationStakeKeyToStakeAddress :: Int -> VerificationKey StakeKey -> StakeAddress
496496
_verificationStakeKeyToStakeAddress testnetMagic delegatorVKey =

flake.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)