Skip to content

Bump cardano-cli-10.12.0.0 and cardano-api-10.18.0.0 #6327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 26, 2025
Merged

Bump cardano-cli-10.12.0.0 and cardano-api-10.18.0.0 #6327

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b9bc85
Bump `cardano-cli` to `10.12.0.0` and `cardano-api` to `10.18`
palas Sep 17, 2025
b35d453
Fix compilation errors
palas Sep 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix compilation errors
  • Loading branch information
@palas
palas committed Sep 25, 2025
commit b35d453ce4bed788fd879e0cdbcb7aebe4ac9f69
5 changes: 3 additions & 2 deletions bench/tx-generator/src/Cardano/TxGenerator/Setup/Plutus.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
{-# LANGUAGE NamedFieldPuns #-}
{-# LANGUAGE RankNTypes #-}
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE TypeApplications #-}

{-|
Module : Cardano.TxGenerator.Setup.Plutus
Expand All @@ -23,7 +24,7 @@ import Control.Monad.Trans.Except
import Control.Monad.Trans.Except.Extra
import Control.Monad.Writer (runWriter)

import Cardano.CLI.Read (readFileScriptInAnyLang)
import Cardano.CLI.Read (readFileScriptInAnyLang, ScriptDecodeError)

import Cardano.Api
import Cardano.Ledger.Plutus.TxInfo (exBudgetToExUnits)
Expand Down Expand Up @@ -71,7 +72,7 @@ readPlutusScript (Left s)
doLoad fp = second (second (const $ ResolvedToFallback asFileName)) <$> readPlutusScript (Right fp)
readPlutusScript (Right fp)
= runExceptT $ do
script <- firstExceptT ApiError $
script <- firstExceptT (ApiError @ScriptDecodeError) $
readFileScriptInAnyLang fp
case script of
ScriptInAnyLang (PlutusScriptLanguage _) _ -> pure (script, ResolvedToFileName fp)
Expand Down
1 change: 1 addition & 0 deletions cardano-testnet/cardano-testnet.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,7 @@ test-suite cardano-testnet-test
, mtl
, process
, regex-compat
, rio
, tasty ^>= 1.5
, text
, time
Expand Down
4 changes: 2 additions & 2 deletions cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Query.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ import Testnet.Property.Util (integrationWorkspace)
import Testnet.Start.Types (GenesisOptions (..), NumPools (..), cardanoNumPools)
import Testnet.TestQueryCmds (TestQueryCmds (..), forallQueryCommands)
import Testnet.Types
import RIO (runRIO)

import Hedgehog
import qualified Hedgehog as H
Expand Down Expand Up @@ -481,7 +482,6 @@ hprop_cli_queries = integrationWorkspace "cli-queries" $ \tempAbsBasePath' -> H.
readVerificationKeyFromFile
:: ( HasCallStack
, MonadIO m
, MonadCatch m
, MonadTest m
, HasTextEnvelope (VerificationKey keyrole)
, SerialiseAsBech32 (VerificationKey keyrole)
Expand All @@ -490,7 +490,7 @@ hprop_cli_queries = integrationWorkspace "cli-queries" $ \tempAbsBasePath' -> H.
-> File content direction
-> m (VerificationKey keyrole)
readVerificationKeyFromFile work =
H.evalEitherM . liftIO . runExceptT . readVerificationKeyOrFile . VerificationKeyFilePath . File . (work </>) . unFile
H.evalIO . runRIO () . readVerificationKeyOrFile . VerificationKeyFilePath . File . (work </>) . unFile

_verificationStakeKeyToStakeAddress :: Int -> VerificationKey StakeKey -> StakeAddress
_verificationStakeKeyToStakeAddress testnetMagic delegatorVKey =
Expand Down
Loading