From 83561151b1b7cc0487c9a0cccb6d666e5c6b3eb8 Mon Sep 17 00:00:00 2001 From: Georgy Lukyanov Date: Tue, 31 Mar 2026 10:19:30 +0200 Subject: [PATCH 1/6] Bump CHaP --- cabal.project | 2 +- flake.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cabal.project b/cabal.project index 5c19d7033bb..3ebd6095167 100644 --- a/cabal.project +++ b/cabal.project @@ -14,7 +14,7 @@ repository cardano-haskell-packages -- you need to run if you change them index-state: , hackage.haskell.org 2026-03-26T20:21:33Z - , cardano-haskell-packages 2026-03-30T16:24:57Z + , cardano-haskell-packages 2026-04-01T09:04:56Z active-repositories: , :rest diff --git a/flake.lock b/flake.lock index def50f44aca..04b44ca3b2f 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1774891779, - "narHash": "sha256-OLyBLKAKa63yo9Jj3owR+SbN7wkdUHVhs9uMbq0XlHA=", + "lastModified": 1775035666, + "narHash": "sha256-IyVfMOLL4iiJomE2UDncq0PkSAwiMplauB49RZjnMP0=", "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "568bc3e79b882ed5095cdd652d043c03b5f5b82b", + "rev": "c0270a024f09aa2dd84ce48d4a5828e5c0d88a0d", "type": "github" }, "original": { From e3be7a2b14e9d99a4c61bf07c4d5aee3791ffa52 Mon Sep 17 00:00:00 2001 From: Georgy Lukyanov Date: Tue, 31 Mar 2026 11:08:48 +0200 Subject: [PATCH 2/6] cardano-node: fix LedgerDB `selectorToArgs` --- cardano-node/src/Cardano/Node/Configuration/LedgerDB.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cardano-node/src/Cardano/Node/Configuration/LedgerDB.hs b/cardano-node/src/Cardano/Node/Configuration/LedgerDB.hs index 32ea7e9143c..2c60b7e9d87 100644 --- a/cardano-node/src/Cardano/Node/Configuration/LedgerDB.hs +++ b/cardano-node/src/Cardano/Node/Configuration/LedgerDB.hs @@ -148,4 +148,4 @@ selectorToArgs (V1LMDB ff fp l mxReaders) fastStoragePath = ( maybe id (\overrideMaxReaders lim -> lim{LMDB.lmdbMaxReaders = overrideMaxReaders}) mxReaders $ maybe id (\ll lim -> lim{LMDB.lmdbMapSize = toBytes ll}) l defaultLMDBLimits ) -selectorToArgs (V2LSM fp) fastStoragePath = LSM.mkLSMArgs (Proxy @blk) (fromMaybe "lsm" fp) fastStoragePath +selectorToArgs (V2LSM fp) fastStoragePath = LSM.mkLSMArgsIO (Proxy @blk) (fromMaybe "lsm" fp) fastStoragePath From d96689f36b763a86d0689263f8c2beedf88c5148 Mon Sep 17 00:00:00 2001 From: Georgy Lukyanov Date: Thu, 2 Apr 2026 09:26:58 +0200 Subject: [PATCH 3/6] cardano-node: bump `ouroboros-consensus` to 2.0 --- cardano-node/cardano-node.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cardano-node/cardano-node.cabal b/cardano-node/cardano-node.cabal index 51d02fafa5c..84fb944607d 100644 --- a/cardano-node/cardano-node.cabal +++ b/cardano-node/cardano-node.cabal @@ -185,7 +185,7 @@ library , network-mux >= 0.8 , nothunks , optparse-applicative - , ouroboros-consensus:{ouroboros-consensus, lmdb, lsm, cardano, diffusion, protocol} ^>= 1.0 + , ouroboros-consensus:{ouroboros-consensus, lmdb, lsm, cardano, diffusion, protocol} ^>= 2.0 , ouroboros-network:{api, ouroboros-network, orphan-instances, framework, protocols, framework-tracing, tracing} ^>= 1.1 , cardano-diffusion:{api, cardano-diffusion, orphan-instances, tracing} ^>=1.0 , prettyprinter From 904681deb184b07ba14881348e624efe71fa64f5 Mon Sep 17 00:00:00 2001 From: Georgy Lukyanov Date: Thu, 2 Apr 2026 09:27:20 +0200 Subject: [PATCH 4/6] tx-generator: bump `ouroboros-consensus` to 2.0 --- bench/tx-generator/tx-generator.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bench/tx-generator/tx-generator.cabal b/bench/tx-generator/tx-generator.cabal index ad994d1e612..d39ebd23b31 100644 --- a/bench/tx-generator/tx-generator.cabal +++ b/bench/tx-generator/tx-generator.cabal @@ -139,7 +139,7 @@ library , network , network-mux , optparse-applicative - , ouroboros-consensus:{ouroboros-consensus, cardano, diffusion} >= 1.0 + , ouroboros-consensus:{ouroboros-consensus, cardano, diffusion} >= 2.0 , ouroboros-network:{api, framework, framework-tracing, ouroboros-network, protocols} >= 1.1 , plutus-ledger-api , plutus-tx From 443bee4553c83758be85dc9b4d610ff728746c08 Mon Sep 17 00:00:00 2001 From: Georgy Lukyanov Date: Thu, 2 Apr 2026 09:35:03 +0200 Subject: [PATCH 5/6] [wip] add SRP for `cardano-api` --- cabal.project | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cabal.project b/cabal.project index 3ebd6095167..420a1ba1f7b 100644 --- a/cabal.project +++ b/cabal.project @@ -108,3 +108,11 @@ if impl(ghc >= 9.12) proto-lens-tests-dep proto-lens-tests proto-lens + +source-repository-package + type: git + location: https://github.com/IntersectMBO/cardano-api + tag: 526f50bd0f8e56be30cd050979e713cfd3a19afb + --sha256: sha256-KoE0aEHQZzmNzkb/H28C8X6yv7F5+40sC10XcEKZpTQ= + subdir: + cardano-api From 51eba2993c2ced7c87e19781f2d2478bf86383b3 Mon Sep 17 00:00:00 2001 From: Georgy Lukyanov Date: Thu, 2 Apr 2026 10:26:06 +0200 Subject: [PATCH 6/6] [wip] add SRP for `cardano-cli` --- cabal.project | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cabal.project b/cabal.project index 420a1ba1f7b..e3495471241 100644 --- a/cabal.project +++ b/cabal.project @@ -116,3 +116,11 @@ source-repository-package --sha256: sha256-KoE0aEHQZzmNzkb/H28C8X6yv7F5+40sC10XcEKZpTQ= subdir: cardano-api + +source-repository-package + type: git + location: https://github.com/IntersectMBO/cardano-cli + tag: 3ffb75f2c46eafa4aaf271e81b7868c75138579e + --sha256: sha256-6fAqWGFbLM/Rzc/B8jZMteXDfxcKWfaxwLLwhZF999Q= + subdir: + cardano-cli