From 22db72c51fd2fc89fc515f15b50ce8d188649bca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jann=20M=C3=BCller?= Date: Wed, 30 Oct 2024 09:00:02 +0100 Subject: [PATCH] Update cardano-api to 10.0.0.0 (#224) * Update cardano-api to 10.0.0.0 --- .github/workflows/ci-linux.yaml | 2 -- README.md | 2 +- cabal.project | 4 ++-- flake.lock | 24 +++++++++---------- src/base/convex-base.cabal | 2 +- src/mockchain/lib/Convex/MockChain.hs | 1 + .../lib/Convex/MockChain/Defaults.hs | 1 - src/optics/convex-optics.cabal | 2 +- 8 files changed, 18 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci-linux.yaml b/.github/workflows/ci-linux.yaml index 638c0999..96052306 100644 --- a/.github/workflows/ci-linux.yaml +++ b/.github/workflows/ci-linux.yaml @@ -1,8 +1,6 @@ name: ci-linux on: push: - branches: [ "main" ] - tags: [ "*.*.*" ] pull_request: concurrency: diff --git a/README.md b/README.md index e111c87b..aff75e8f 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ 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`|[9.4.0.0](https://chap.intersectmbo.org/package/cardano-api-9.3.0.0/)| +|`cardano-api`|[10.0.0.0](https://chap.intersectmbo.org/package/cardano-api-10.0.0.0/)| |`ghc`|9.6.6| |`cabal`|3.10.3.0| diff --git a/cabal.project b/cabal.project index fc6da5b4..460f0379 100644 --- a/cabal.project +++ b/cabal.project @@ -15,8 +15,8 @@ repository cardano-haskell-packages with-compiler: ghc-9.6.6 index-state: - , hackage.haskell.org 2024-10-11T15:49:11Z - , cardano-haskell-packages 2024-10-11T15:49:11Z + , hackage.haskell.org 2024-10-16T12:44:42Z + , cardano-haskell-packages 2024-10-16T12:44:42Z multi-repl: true diff --git a/flake.lock b/flake.lock index ef40e814..a6ec3877 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1728663083, - "narHash": "sha256-ejmJzPYPKdIwN53Arz3ycNcMO1YnS4k4uSBC7XeBRsQ=", + "lastModified": 1729088390, + "narHash": "sha256-U3zbe5q7SvMHfUvcYfa/e4KXDHFWv6ru7Drwd1PGOx4=", "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "16d7391e69a69b9954acf097ffca3bda61a4faf0", + "rev": "38257ddc6cc3e30a29c93c97cfbc0e1af2bb2db5", "type": "github" }, "original": { @@ -172,11 +172,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1728865757, - "narHash": "sha256-DzxFSTuiXPEDB59v4sS0K57UhR70cxYtj8F52y9Mi4k=", + "lastModified": 1729124899, + "narHash": "sha256-cmb4iMcgk5+jUGMiZGNMzPCAnG17Kz9J6WIitYM17Fc=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "8f2ba6cde8ee8f8eac0593284c3465e39c51a50a", + "rev": "138edf81c8bcc4209e9706966f7feece70c37a96", "type": "github" }, "original": { @@ -227,11 +227,11 @@ "stackage": "stackage" }, "locked": { - "lastModified": 1728867069, - "narHash": "sha256-acQ+3ZTHDKhujhiaCmKJstJlJsRaFgglP3W5FFvZjy8=", + "lastModified": 1729126246, + "narHash": "sha256-OXGwQF3AMERYaVdImhGLlvJgOE8Zr0yURef4J7zlp6k=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "5de65a1fb68cae2a7503eac9f1c314568227d764", + "rev": "c2070f089bf688571c14af77744982c86f0c2e21", "type": "github" }, "original": { @@ -795,11 +795,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1728691846, - "narHash": "sha256-WXPaGfa8D64YjKU31HOIx2cLfYkMfZT9yYO2XdYUerA=", + "lastModified": 1729039017, + "narHash": "sha256-fGExfgG+7UNSOV8YfOrWPpOHWrCjA02gQkeSBhaAzjQ=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "38e3ccb33364353514117c552b7362295ea5b02e", + "rev": "df1d8f0960407551fea7af7af75a9c2f9e18de97", "type": "github" }, "original": { diff --git a/src/base/convex-base.cabal b/src/base/convex-base.cabal index 21b0ff93..c1ab10b4 100644 --- a/src/base/convex-base.cabal +++ b/src/base/convex-base.cabal @@ -59,7 +59,7 @@ library build-depends: convex-optics, - cardano-api == 9.4.0.0, + cardano-api == 10.0.0.0, cardano-ledger-core, cardano-crypto-wrapper, diff --git a/src/mockchain/lib/Convex/MockChain.hs b/src/mockchain/lib/Convex/MockChain.hs index b70a424a..2978851d 100644 --- a/src/mockchain/lib/Convex/MockChain.hs +++ b/src/mockchain/lib/Convex/MockChain.hs @@ -264,6 +264,7 @@ initialStateFor params@NodeParams{npNetworkId} utxos = C.shelleyBasedEraConstrai , ledgerIx = minBound , ledgerPp = Defaults.pParams params , ledgerAccount = AccountState (Coin 0) (Coin 0) + , ledgerMempool = False } , mcsPoolState = LedgerState { lsUTxOState = smartUTxOState (Defaults.pParams params) utxo (Coin 0) (Coin 0) def (Coin 0) diff --git a/src/mockchain/lib/Convex/MockChain/Defaults.hs b/src/mockchain/lib/Convex/MockChain/Defaults.hs index 942497af..d46b8299 100644 --- a/src/mockchain/lib/Convex/MockChain/Defaults.hs +++ b/src/mockchain/lib/Convex/MockChain/Defaults.hs @@ -732,7 +732,6 @@ globals :: C.IsShelleyBasedEra era => NodeParams era -> Globals globals params@NodeParams { npSlotLength } = mkShelleyGlobals (genesisDefaultsFromParams params) (fixedEpochInfo epochSize npSlotLength) - (C.Ledger.pvMajor $ view L.ppProtocolVersionL protocolParameters) protVer :: L.EraPParams (C.ShelleyLedgerEra era) => NodeParams era -> ProtVer protVer = view L.ppProtocolVersionL . C.unLedgerProtocolParameters . npProtocolParameters diff --git a/src/optics/convex-optics.cabal b/src/optics/convex-optics.cabal index d9c66e23..9bdda882 100644 --- a/src/optics/convex-optics.cabal +++ b/src/optics/convex-optics.cabal @@ -34,7 +34,7 @@ library hs-source-dirs: lib build-depends: base >= 4.14 && < 4.20, - cardano-api == 9.4.0.0, + cardano-api == 10.0.0.0, cardano-ledger-core, cardano-ledger-shelley, containers,