Skip to content

Commit aec5698

Browse files
carbolymercarbolymer
authored
Merge pull request #6163 from IntersectMBO/mgalazyn/refactor/update-cardano-cli
Update cardano-cli-10.5.0.0
2 parents df91fe8 + 6dc9cd1 commit aec5698

File tree

29 files changed

+72
-72
lines changed

29 files changed

+72
-72
lines changed

‎.github/workflows/haskell.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,12 @@ jobs:
120120
cat dist-newstyle/cache/plan.json | jq -r '."install-plan"[] | select(.style != "local") | .id' | sort | uniq > dependencies.txt
121121
122122
# Use a fresh cache each month
123-
- name: Store month number as environment variable used in cache version
124-
run: echo "MONTHNUM=$(date -u '+%m')" >> $GITHUB_ENV
123+
- name: Store month number and GHC version as environment variables used in cache version
124+
run: |
125+
cat <<EOF >> $GITHUB_ENV
126+
MONTHNUM=$(date -u '+%m')
127+
GHC=$(ghc --numeric-version)
128+
EOF
125129
126130
# From the dependency list we restore the cached dependencies.
127131
# We use the hash of `dependencies.txt` as part of the cache key because that will be stable
@@ -134,10 +138,10 @@ jobs:
134138
${{ steps.setup-haskell.outputs.cabal-store }}
135139
dist-newstyle
136140
key:
137-
cache-${{ env.CABAL_CACHE_VERSION }}-${{ runner.os }}-${{ matrix.ghc }}-${{ env.MONTHNUM }}-${{ hashFiles('dependencies.txt') }}
141+
cache-${{ env.CABAL_CACHE_VERSION }}-${{ runner.os }}-${{ env.GHC }}-${{ env.MONTHNUM }}-${{ hashFiles('dependencies.txt') }}
138142
# try to restore previous cache from this month if there's no cache for the dependencies set
139143
restore-keys: |
140-
cache-${{ env.CABAL_CACHE_VERSION }}-${{ runner.os }}-${{ matrix.ghc }}-${{ env.MONTHNUM }}-
144+
cache-${{ env.CABAL_CACHE_VERSION }}-${{ runner.os }}-${{ env.GHC }}-${{ env.MONTHNUM }}-
141145
142146
# Now we install the dependencies. If the cache was found and restored in the previous step,
143147
# this should be a no-op, but if the cache key was not found we need to build stuff so we can
@@ -180,7 +184,7 @@ jobs:
180184
if: ${{ failure() }}
181185
uses: actions/upload-artifact@v4
182186
with:
183-
name: failed-test-workspaces-${{ matrix.sys.os }}-ghc${{ matrix.ghc }}-cabal${{ matrix.cabal }}.tgz
187+
name: failed-test-workspaces-${{ matrix.sys.os }}-ghc${{ env.GHC }}-cabal${{ matrix.cabal }}.tgz
184188
path: ${{ runner.temp }}/workspaces.tgz
185189

186190
- name: "Tar artifacts"
@@ -211,7 +215,7 @@ jobs:
211215
if: ${{ always() }}
212216
continue-on-error: true
213217
with:
214-
name: chairman-test-artifacts-${{ matrix.sys.os }}-${{ matrix.ghc }}
218+
name: chairman-test-artifacts-${{ matrix.sys.os }}-${{ env.GHC }}
215219
path: ${{ runner.temp }}/chairman/
216220

217221
# Uncomment the following back in for debugging. Remember to launch a `pwsh` from

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@ library
8282
-- IOG dependencies
8383
--------------------------
8484
build-depends:
85-
, cardano-api ^>=10.8
86-
, plutus-ledger-api ^>=1.37
87-
, plutus-tx ^>=1.37
88-
, plutus-tx-plugin ^>=1.37
85+
, cardano-api ^>=10.11
86+
, plutus-ledger-api ^>=1.40
87+
, plutus-tx ^>=1.40
88+
, plutus-tx-plugin ^>=1.40
8989

9090
------------------------
9191
-- Non-IOG dependencies

‎bench/tx-generator/src/Cardano/Benchmarking/OuroborosImports.hs

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,14 @@ module Cardano.Benchmarking.OuroborosImports
2222
, submitTxToNodeLocal
2323
) where
2424

25-
import Prelude
25+
import Cardano.Api (BlockType (..), ConsensusModeParams (..), EpochSlots (..),
26+
LocalNodeConnectInfo (..), NetworkId (..), PaymentKey, SigningKey, SocketPath,
27+
TxInMode, TxValidationErrorInCardanoMode, protocolInfo, submitTxToNodeLocal)
2628

29+
import Cardano.CLI.Type.Common (SigningKeyFile)
30+
import Cardano.Ledger.Shelley.Genesis (ShelleyGenesis)
31+
import Cardano.Node.Configuration.Logging (LoggingLayer)
32+
import Cardano.Node.Protocol.Types (SomeConsensusProtocol (..))
2733
import Ouroboros.Consensus.Block.Abstract
2834
import qualified Ouroboros.Consensus.Cardano as Consensus
2935
import Ouroboros.Consensus.Config (TopLevelConfig, configBlock, configCodec)
@@ -32,15 +38,7 @@ import Ouroboros.Consensus.Node (ProtocolInfo (..))
3238
import Ouroboros.Consensus.Shelley.Eras (StandardCrypto, StandardShelley)
3339
import Ouroboros.Network.Protocol.LocalTxSubmission.Type (SubmitResult (..))
3440

35-
import Cardano.Node.Configuration.Logging (LoggingLayer)
36-
import Cardano.Node.Protocol.Types (SomeConsensusProtocol (..))
37-
38-
import Cardano.CLI.Types.Common (SigningKeyFile)
39-
40-
import Cardano.Api (BlockType (..), ConsensusModeParams (..), EpochSlots (..),
41-
LocalNodeConnectInfo (..), NetworkId (..), PaymentKey, SigningKey, SocketPath,
42-
TxInMode, TxValidationErrorInCardanoMode, protocolInfo, submitTxToNodeLocal)
43-
import Cardano.Ledger.Shelley.Genesis (ShelleyGenesis)
41+
import Prelude
4442

4543
type CardanoBlock = Consensus.CardanoBlock StandardCrypto
4644

‎bench/tx-generator/src/Cardano/Api/Internal/ProtocolParameters.hs renamed to ‎bench/tx-generator/src/Cardano/TxGenerator/ProtocolParameters.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ cardano-api
1818
- - https://github.com/IntersectMBO/cardano-api/pull/729
1919
--}
2020

21-
module Cardano.Api.Internal.ProtocolParameters
21+
module Cardano.TxGenerator.ProtocolParameters
2222
( -- * The updatable protocol parameters
2323
ProtocolParameters (
2424
ProtocolParameters

‎bench/tx-generator/src/Cardano/TxGenerator/Setup/NixService.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ module Cardano.TxGenerator.Setup.NixService
2323

2424
import Cardano.Api (AnyCardanoEra, mapFile)
2525

26-
import Cardano.CLI.Types.Common (FileDirection (..), SigningKeyFile)
26+
import Cardano.CLI.Type.Common (FileDirection (..), SigningKeyFile)
2727
import qualified Cardano.Ledger.Coin as L
2828
import Cardano.Node.Configuration.NodeAddress (NodeAddress' (..),
2929
NodeHostIPv4Address (..), NodeIPv4Address)

‎bench/tx-generator/src/Cardano/TxGenerator/Setup/SigningKey.hs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ module Cardano.TxGenerator.Setup.SigningKey
1111
)
1212
where
1313

14-
import Data.Bifunctor (first)
15-
import qualified Data.ByteString as BS (ByteString)
16-
import Data.ByteString.Base16 as Base16 (decode)
17-
1814
import Cardano.Api
19-
import Cardano.CLI.Types.Common (SigningKeyFile)
2015

16+
import Cardano.CLI.Type.Common (SigningKeyFile)
2117
import Cardano.TxGenerator.Types (TxGenError (..))
2218

19+
import Data.Bifunctor (first)
20+
import qualified Data.ByteString as BS (ByteString)
21+
import Data.ByteString.Base16 as Base16 (decode)
22+
2323

2424
parseSigningKeyTE :: TextEnvelope -> Either TxGenError (SigningKey PaymentKey)
2525
parseSigningKeyTE

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ library
5353
-- TODO: switch back to -Wwarn=deprecations having dropped Cardano.Api.ProtocolParameters.ProtocolParameters in favour of Cardano.Api.Ledger.PParams
5454
-Wno-deprecations
5555

56-
exposed-modules: Cardano.Api.Internal.ProtocolParameters
57-
Cardano.Benchmarking.Command
56+
exposed-modules: Cardano.Benchmarking.Command
5857
Cardano.Benchmarking.Compiler
5958
Cardano.Benchmarking.GeneratorTx
6059
Cardano.Benchmarking.GeneratorTx.NodeToNode
@@ -79,6 +78,7 @@ library
7978
Cardano.TxGenerator.Fund
8079
Cardano.TxGenerator.FundQueue
8180
Cardano.TxGenerator.Genesis
81+
Cardano.TxGenerator.ProtocolParameters
8282
Cardano.TxGenerator.PureExample
8383
Cardano.TxGenerator.Script.Types
8484
Cardano.TxGenerator.Setup.NixService
@@ -107,9 +107,9 @@ library
107107
, attoparsec-aeson
108108
, base16-bytestring
109109
, bytestring
110-
, cardano-api ^>= 10.8
110+
, cardano-api ^>= 10.11
111111
, cardano-binary
112-
, cardano-cli ^>= 10.4
112+
, cardano-cli ^>= 10.5
113113
, cardano-crypto-class
114114
, cardano-crypto-wrapper
115115
, cardano-data

‎cabal.project

Lines changed: 2 additions & 2 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 2025-03-13T00:45:00Z
17-
, cardano-haskell-packages 2025-03-13T02:33:54Z
16+
, hackage.haskell.org 2025-03-18T07:42:38Z
17+
, cardano-haskell-packages 2025-03-24T17:03:41Z
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
@@ -89,5 +89,5 @@ test-suite chairman-tests
8989
ghc-options: -threaded -rtsopts "-with-rtsopts=-N -T"
9090

9191
build-tool-depends: cardano-node:cardano-node
92-
, cardano-cli:cardano-cli ^>= 10.4
92+
, cardano-cli:cardano-cli ^>= 10.5
9393
, cardano-node-chairman:cardano-node-chairman

‎cardano-node/cardano-node.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ library
146146
, async
147147
, base16-bytestring
148148
, bytestring
149-
, cardano-api ^>= 10.8
149+
, cardano-api ^>= 10.11.1
150150
, cardano-crypto-class
151151
, cardano-crypto-wrapper
152152
, cardano-git-rev ^>=0.2.2
@@ -252,7 +252,7 @@ test-suite cardano-node-test
252252
, bytestring
253253
, cardano-crypto-class
254254
, cardano-crypto-wrapper
255-
, cardano-api:{cardano-api, internal}
255+
, cardano-api
256256
, cardano-ledger-core
257257
, cardano-node
258258
, cardano-slotting

0 commit comments

Comments
 (0)