Skip to content

Commit

Permalink
cardano-node 10.1.1, cardano-api 10.1.0.0 (#229)
Browse files Browse the repository at this point in the history
* cardano-node 10.1.1, cardano-api 10.1.0.0
* Fix hash computation with cardano-cli
  • Loading branch information
j-mueller authored Oct 31, 2024
1 parent 22db72c commit ea34b30
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- name: Build dependencies for integration test
run: |
cabal update
cabal install -j cardano-node-9.2.1 cardano-cli-9.4.1.0 --overwrite-policy=always
cabal install -j cardano-node-10.1.1 cardano-cli-10.1.0.0 --overwrite-policy=always
cabal install -j convex-wallet --overwrite-policy=always
echo "/home/runner/.cabal/bin" >> $GITHUB_PATH
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ The `main` branch uses the following versions of its major dependencies:

|Name|Version|
|--|--|
|`cardano-node`|[9.2.1](https://github.com/IntersectMBO/cardano-node/releases/tag/9.2.1)|
|`cardano-api`|[10.0.0.0](https://chap.intersectmbo.org/package/cardano-api-10.0.0.0/)|
|`cardano-node`|[10.1.1](https://github.com/IntersectMBO/cardano-node/releases/tag/10.1.1)|
|`cardano-api`|[10.1.0.0](https://chap.intersectmbo.org/package/cardano-api-10.1.0.0/)|
|`ghc`|9.6.6|
|`cabal`|3.10.3.0|

Expand Down
4 changes: 2 additions & 2 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ repository cardano-haskell-packages

with-compiler: ghc-9.6.6
index-state:
, hackage.haskell.org 2024-10-16T12:44:42Z
, cardano-haskell-packages 2024-10-16T12:44:42Z
, hackage.haskell.org 2024-10-10T00:52:24Z
, cardano-haskell-packages 2024-10-24T10:49:32Z

multi-repl: true

Expand Down
2 changes: 1 addition & 1 deletion src/base/convex-base.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ library
build-depends:
convex-optics,

cardano-api == 10.0.0.0,
cardano-api == 10.1.0.0,
cardano-ledger-core,
cardano-crypto-wrapper,

Expand Down
3 changes: 2 additions & 1 deletion src/coin-selection/test/Spec.hs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
module Main(main) where

import qualified Cardano.Api as C
import qualified Cardano.Api.Ledger as C
import qualified Cardano.Api.Ledger as C hiding (PlutusScript, TxId,
TxIn)
import qualified Cardano.Api.Shelley as C
import qualified Cardano.Ledger.Api as Ledger
import qualified Cardano.Ledger.Conway.Rules as Rules
Expand Down
2 changes: 1 addition & 1 deletion src/devnet/lib/Convex/Devnet/CardanoNode.hs
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ withObject fn = \case
computeGenesisHash :: FilePath -> IO String
computeGenesisHash fp =
-- drop the last character (newline)
take 64 <$> readProcess "cardano-cli" ["genesis", "hash", "--genesis", fp] ""
take 64 <$> readProcess "cardano-cli" ["hash", "anchor-data", "--file-text", fp] ""

-- | Launch a Cardano stake pool node with predefined node configuration, port and topology.
withCardanoStakePoolNodeDevnetConfig ::
Expand Down
2 changes: 1 addition & 1 deletion src/devnet/test/Spec.hs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ main = do

checkCardanoNode :: IO ()
checkCardanoNode = do
let expectedVersion = "9.2.1"
let expectedVersion = "10.1.1"
version <- getCardanoNodeVersion
let isExpected = expectedVersion `isInfixOf` version
unless isExpected (putStrLn version)
Expand Down
2 changes: 1 addition & 1 deletion src/optics/convex-optics.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ library
hs-source-dirs: lib
build-depends:
base >= 4.14 && < 4.20,
cardano-api == 10.0.0.0,
cardano-api == 10.1.0.0,
cardano-ledger-core,
cardano-ledger-shelley,
containers,
Expand Down

0 comments on commit ea34b30

Please sign in to comment.