From 2dadedf75192af353e66507acfb4a04b521eba85 Mon Sep 17 00:00:00 2001 From: KadenaFriend <241389759+kdafriend@users.noreply.github.com> Date: Sun, 5 Apr 2026 21:23:01 +0000 Subject: [PATCH 1/5] Bump crypton, pact-5, pact, and merkle log. memory-> ram --- cabal.project | 11 +++++++---- chainweb.cabal | 16 ++++++++-------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/cabal.project b/cabal.project index 9ea31d9dfa..78877e2236 100644 --- a/cabal.project +++ b/cabal.project @@ -95,14 +95,17 @@ package yet-another-logger source-repository-package type: git location: https://github.com/kda-community/pact.git - tag: 4208012e3f2fdf1721c24cdcb97de5f64fd5f58a - --sha256: 1al11csqr291avfwbb7hcrfxapz9sx0iclv3j5ipnli287h52cvs + tag: ef859d8b7992b8f91bd4864f55a16080c8ae2b2a source-repository-package type: git location: https://github.com/kda-community/pact-5.git - tag: bfc5310c462aaefabe7c512407ac6dab87fc8c42 - --sha256: 05xp1vwxkvjxrn8pij9z4g1hadbkb8hrgziwzs408yxxxmkcv6kq + tag: 7feeab02fe28bb9bfb0f1792f3ca9adffbcd2576 + +source-repository-package + type: git + location: https://github.com/kda-community/merkle-log + tag: c502176643de644dec624001096342b1f0cd0f45 source-repository-package type: git diff --git a/chainweb.cabal b/chainweb.cabal index c2250b3d64..43581c5405 100644 --- a/chainweb.cabal +++ b/chainweb.cabal @@ -386,7 +386,7 @@ library , clock >= 0.7 , configuration-tools >= 0.6 , containers >= 0.5 - , crypton >= 0.31 + , crypton >= 1.1.2 , crypton-connection >= 0.4.2 , crypton-asn1-types >= 0.4.1 , crypton-asn1-encoding >= 0.10.0 @@ -419,8 +419,8 @@ library , ixset-typed >= 0.4 , lens >= 4.17 , loglevel >= 0.1 - , memory >=0.14 - , merkle-log >=0.2 + , ram >=0.2.2 + , merkle-log >=0.2.1 , mmorph >= 1.1 , monad-control >= 1.0 , mtl >= 2.3 @@ -540,7 +540,7 @@ library chainweb-test-utils , chainweb-storage >= 0.1 , chronos >= 1.1 , containers >= 0.5 - , crypton >= 0.31 + , crypton >= 1.1.2 , crypton-connection >=0.4 , data-dword >= 0.3 , deepseq >= 1.4 @@ -553,7 +553,7 @@ library chainweb-test-utils , http-types >= 0.12 , lens >= 4.17 , loglevel >= 0.1 - , merkle-log >=0.2 + , merkle-log >=0.2.1 , mtl >= 2.3 , network >= 3.1.2 , patience >= 0.3 @@ -700,7 +700,7 @@ test-suite chainweb-tests , cassava >= 0.5.1 , chainweb-storage >= 0.1 , containers >= 0.5 - , crypton >= 0.31 + , crypton >= 1.1.2 , crypton-connection >=0.4 , data-dword >= 0.3 , data-ordlist >= 0.4.7 @@ -718,8 +718,8 @@ test-suite chainweb-tests , lens >= 4.17 , lens-aeson >= 1.2.2 , loglevel >= 0.1 - , memory >=0.14 - , merkle-log >=0.2 + , ram >=0.2.2 + , merkle-log >=0.2.1 , mtl >= 2.3 , network >= 3.1.2 , pact From 5500e40ffb4194248301b3124ecd4f7ff91f569b Mon Sep 17 00:00:00 2001 From: KadenaFriend <241389759+kdafriend@users.noreply.github.com> Date: Sun, 5 Apr 2026 21:23:24 +0000 Subject: [PATCH 2/5] Fix tasty depreaction warning --- test/unit/Chainweb/Test/Pact5/RemotePactTest.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit/Chainweb/Test/Pact5/RemotePactTest.hs b/test/unit/Chainweb/Test/Pact5/RemotePactTest.hs index c6db34af54..84c85061ab 100644 --- a/test/unit/Chainweb/Test/Pact5/RemotePactTest.hs +++ b/test/unit/Chainweb/Test/Pact5/RemotePactTest.hs @@ -432,7 +432,7 @@ spvExpirationTest v baseRdb prop = runResourceT $ do -- this test suite really wants you not to put any transactions into the final block. sendInvalidTxsTest :: RocksDb -> TestTree sendInvalidTxsTest rdb = withResourceT (mkFixture v rdb) $ \fx -> - sequentialTestGroup "invalid txs in /send" AllFinish + dependentTestGroup "invalid txs in /send" AllFinish [ testGroup "send txs" [ testCase "syntax error" $ do cmdParseFailure <- buildTextCmd v From b40766e5604d275dd21ebb144b6c6d3c75443cca Mon Sep 17 00:00:00 2001 From: KadenaFriend <241389759+kdafriend@users.noreply.github.com> Date: Sun, 5 Apr 2026 21:29:46 +0000 Subject: [PATCH 3/5] Update freeze file --- cabal.project.freeze | 82 ++++++++++++++++++++++++-------------------- 1 file changed, 45 insertions(+), 37 deletions(-) diff --git a/cabal.project.freeze b/cabal.project.freeze index e4c3dccc5d..b430ef11f2 100644 --- a/cabal.project.freeze +++ b/cabal.project.freeze @@ -11,13 +11,15 @@ constraints: any.Cabal ==3.12.1.0 || ==3.14.2.0, any.Only ==0.1, any.QuickCheck ==2.16.0.0, QuickCheck -old-random +templatehaskell, + any.SHA ==1.6.4.4, + SHA -exe, any.StateVar ==1.2.2, any.adjunctions ==4.4.4, any.aeson ==2.2.3.0, aeson +ordered-keymap, any.aeson-pretty ==0.8.10, aeson-pretty -lib-only, - any.alex ==3.5.4.0, + any.alex ==3.5.4.2, any.ansi-terminal ==1.1.5, ansi-terminal -example, any.ansi-terminal-types ==1.1.3, @@ -25,7 +27,7 @@ constraints: any.Cabal ==3.12.1.0 || ==3.14.2.0, ap-normalize -test-with-clang, any.appar ==0.1.8, any.array ==0.5.8.0, - any.asciidoc ==0.1.0.1, + any.asciidoc ==0.1.0.2, any.asn1-encoding ==0.9.6, any.asn1-types ==0.3.4, any.assoc ==1.1.1, @@ -55,7 +57,7 @@ constraints: any.Cabal ==3.12.1.0 || ==3.14.2.0, bifunctors +tagged, any.binary ==0.8.9.3, any.binary-orphans ==1.0.5, - any.bitvec ==1.1.5.0, + any.bitvec ==1.1.6.0, bitvec +simd, any.blaze-builder ==0.4.4.1, any.blaze-html ==0.9.2.0, @@ -97,7 +99,7 @@ constraints: any.Cabal ==3.12.1.0 || ==3.14.2.0, cmdargs +quotation -testprog, any.co-log-core ==0.3.2.6, any.code-page ==0.2.1, - any.colour ==2.3.6, + any.colour ==2.3.7, any.commonmark ==0.2.6.1, any.commonmark-extensions ==0.2.6, any.commonmark-pandoc ==0.2.3, @@ -114,26 +116,26 @@ constraints: any.Cabal ==3.12.1.0 || ==3.14.2.0, any.contravariant ==1.5.6, contravariant +statevar, any.cookie ==0.5.1, - any.criterion ==1.6.4.1, + any.criterion ==1.6.5.0, criterion -embed-data-files -fast, - any.criterion-measurement ==0.2.3.0, + any.criterion-measurement ==0.2.4.0, criterion-measurement -fast, - any.crypto-token ==0.1.2, + any.crypto-token ==0.2.0, any.cryptohash-md5 ==0.11.101.0, any.cryptohash-sha1 ==0.11.101.0, - any.crypton ==1.0.6, + any.crypton ==1.1.2, crypton -check_alignment +integer-gmp -old_toolchain_inliner +support_aesni +support_deepseq +support_pclmuldq +support_rdrand -support_sse +use_target_attributes, any.crypton-asn1-encoding ==0.10.0, any.crypton-asn1-parse ==0.10.0, any.crypton-asn1-types ==0.4.1, - any.crypton-connection ==0.4.5, + any.crypton-connection ==0.4.6, any.crypton-pem ==0.3.0, any.crypton-socks ==0.6.2, crypton-socks -example +network-3-0-0-0, - any.crypton-x509 ==1.8.0, - any.crypton-x509-store ==1.8.0, - any.crypton-x509-system ==1.8.0, - any.crypton-x509-validation ==1.8.0, + any.crypton-x509 ==1.9.0, + any.crypton-x509-store ==1.9.0, + any.crypton-x509-system ==1.9.0, + any.crypton-x509-validation ==1.9.0, any.cryptonite ==0.30, cryptonite -check_alignment +integer-gmp -old_toolchain_inliner +support_aesni +support_deepseq -support_pclmuldq +support_rdrand -support_sse +use_target_attributes, any.cuckoo ==0.3.1, @@ -157,7 +159,7 @@ constraints: any.Cabal ==3.12.1.0 || ==3.14.2.0, any.directory ==1.3.8.5, any.distributive ==0.6.3, distributive +tagged, - any.djot ==0.1.3, + any.djot ==0.1.4, any.dlist ==1.0, dlist -werror, any.doclayout ==0.5.0.1, @@ -212,14 +214,14 @@ constraints: any.Cabal ==3.12.1.0 || ==3.14.2.0, any.heaps ==0.4.1, any.hedgehog ==1.7, any.hourglass ==0.2.12, - any.hpke ==0.0.0, + any.hpke ==0.1.0, any.hsc2hs ==0.68.10, hsc2hs -in-ghc-tree, any.http-api-data ==0.7, http-api-data -use-text-show, any.http-client ==0.7.19, http-client +network-uri, - any.http-client-tls ==0.3.6.4, + any.http-client-tls ==0.4.0, any.http-date ==0.0.11, any.http-media ==0.8.1.1, any.http-semantics ==0.4.0, @@ -251,9 +253,9 @@ constraints: any.Cabal ==3.12.1.0 || ==3.14.2.0, any.lifted-base ==0.2.3.12, any.loglevel ==0.1.0.0, any.lrucaching ==0.3.5, - any.lsp ==2.7.0.1, + any.lsp ==2.8.0.0, lsp -demo, - any.lsp-types ==2.3.0.1, + any.lsp-types ==2.4.0.0, lsp-types -force-ospath, any.managed ==1.0.11, any.massiv ==1.0.5.0, @@ -264,10 +266,12 @@ constraints: any.Cabal ==3.12.1.0 || ==3.14.2.0, megaparsec -dev, any.memory ==0.18.0, memory +support_bytestring +support_deepseq, - any.merkle-log ==0.2.0, + any.merkle-log ==0.2.1, any.microlens ==0.5.0.0, any.microstache ==1.0.3, - any.mime-types ==0.1.2.1, + any.mime-types ==0.1.2.2, + any.mlkem ==0.2.0.0, + mlkem +use_crypton, any.mmorph ==1.2.2, any.mod ==0.2.1.0, mod +semirings +vector, @@ -283,14 +287,14 @@ constraints: any.Cabal ==3.12.1.0 || ==3.14.2.0, any.neat-interpolation ==0.5.1.4, any.network ==3.2.8.0, network -devel, - any.network-byte-order ==0.1.7, + any.network-byte-order ==0.1.8, any.network-control ==0.1.7, any.network-info ==0.2.1, any.network-uri ==2.6.4.2, any.nothunks ==0.3.1, nothunks +bytestring +text +vector, any.old-locale ==1.0.0.7, - any.old-time ==1.1.0.5, + any.old-time ==1.1.1.0, any.optparse-applicative ==0.19.0.0, optparse-applicative +process, any.ordered-containers ==0.2.4, @@ -302,7 +306,7 @@ constraints: any.Cabal ==3.12.1.0 || ==3.14.2.0, pact-time -with-time, any.pact-tng ==5.4, pact-tng +with-crypto +with-funcall-tracing +with-native-tracing, - any.pandoc ==3.9, + any.pandoc ==3.9.0.2, pandoc -embed_data_files -http, any.pandoc-types ==1.23.1.1, any.parallel ==3.3.0.0, @@ -332,7 +336,8 @@ constraints: any.Cabal ==3.12.1.0 || ==3.14.2.0, any.psqueues ==0.2.8.3, any.pvar ==1.0.0.0, any.quickcheck-instances ==0.3.33, - any.ralist ==0.4.0.0, + any.ralist ==0.4.1.0, + any.ram ==0.22.0, any.random ==1.3.1, any.recover-rtti ==0.5.3, any.recv ==0.1.1, @@ -359,6 +364,7 @@ constraints: any.Cabal ==3.12.1.0 || ==3.14.2.0, any.scheduler ==2.0.1.0, any.scientific ==0.3.8.1, scientific -integer-simple, + any.selective ==0.7.0.1, any.semialign ==1.3.1, semialign +semigroupoids, any.semigroupoids ==6.0.2, @@ -396,7 +402,7 @@ constraints: any.Cabal ==3.12.1.0 || ==3.14.2.0, any.statistics ==0.16.5.0, statistics -benchpapi, any.stm ==2.5.3.1, - any.stm-chans ==3.0.0.9, + any.stm-chans ==3.0.0.11, any.stopwatch ==0.1.0.7, stopwatch -test_delay_upper_bound -test_threaded, any.streaming ==0.2.4.0, @@ -404,11 +410,11 @@ constraints: any.Cabal ==3.12.1.0 || ==3.14.2.0, streaming-commons -use-bytestring-builder, any.strict ==0.5.1, any.strict-concurrency ==0.2.4.3, - any.syb ==0.7.3, + any.syb ==0.7.4, any.tagged ==0.8.10, tagged +deepseq +template-haskell, any.tagsoup ==0.14.8, - any.tasty ==1.5.3, + any.tasty ==1.5.4, tasty +unix, any.tasty-golden ==2.3.6, tasty-golden -build-example, @@ -421,7 +427,7 @@ constraints: any.Cabal ==3.12.1.0 || ==3.14.2.0, any.terminal-progress-bar ==0.4.2, any.terminal-size ==0.3.4, any.terminfo ==0.4.1.7, - any.texmath ==0.13.1, + any.texmath ==0.13.1.1, texmath -executable -server, any.text ==2.1.2, any.text-conversions ==0.3.1.1, @@ -439,27 +445,27 @@ constraints: any.Cabal ==3.12.1.0 || ==3.14.2.0, any.th-reify-many ==0.1.10, any.these ==1.2.1, any.time ==1.12.2, - any.time-compat ==1.9.8, + any.time-compat ==1.9.9, any.time-hourglass ==0.3.0, any.time-locale-compat ==0.1.1.5, time-locale-compat +old-locale, any.time-manager ==0.3.1.1, - any.tls ==2.2.2, + any.tls ==2.4.0, tls -devel, - any.tls-session-manager ==0.0.8, + any.tls-session-manager ==0.1.0, any.token-bucket ==0.1.0.1, token-bucket +use-cbits, any.toml-parser ==2.0.2.0, any.torsor ==0.1.0.1, any.transformers ==0.6.1.1, - any.transformers-base ==0.4.6, + any.transformers-base ==0.4.6.1, transformers-base +orphaninstances, any.transformers-compat ==0.7.2, transformers-compat -five +five-three -four +generic-deriving +mtl -three -two, any.trifecta ==2.1.4, any.tuples ==0.1.0.0, any.typed-process ==0.2.13.0, - any.typst ==0.9, + any.typst ==0.9.0.1, typst -executable, any.typst-symbols ==0.1.9.1, any.unicode-collation ==0.1.3.6, @@ -480,7 +486,7 @@ constraints: any.Cabal ==3.12.1.0 || ==3.14.2.0, any.utf8-string ==1.0.2, any.uuid ==1.3.16, any.uuid-types ==1.0.6, - any.validation ==1.1.3, + any.validation ==1.1.5, any.vault ==0.3.1.6, vault +useghc, any.vector ==0.13.2.0, @@ -494,8 +500,8 @@ constraints: any.Cabal ==3.12.1.0 || ==3.14.2.0, any.void ==0.7.4, void -safe, any.wai ==3.2.4, - any.wai-app-static ==3.1.9, - wai-app-static +crypton -print, + any.wai-app-static ==3.2.1, + wai-app-static -print, any.wai-cors ==0.2.7, any.wai-extra ==3.1.18, wai-extra -build-example, @@ -505,6 +511,8 @@ constraints: any.Cabal ==3.12.1.0 || ==3.14.2.0, any.warp ==3.4.12, warp +allow-sendfilefd +include-warp-version -network-bytestring -warp-debug +x509, any.warp-tls ==3.4.13, + any.websockets ==0.13.0.0, + websockets -example, any.wherefrom-compat ==0.2.0.0, any.wide-word ==0.1.9.0, any.witherable ==0.5, @@ -522,4 +530,4 @@ constraints: any.Cabal ==3.12.1.0 || ==3.14.2.0, zip-archive -executable, any.zlib ==0.7.1.1, zlib -bundled-c-zlib +non-blocking-ffi +pkg-config -index-state: hackage.haskell.org 2026-02-04T13:26:21Z +index-state: hackage.haskell.org 2026-04-05T10:57:32Z From 336aa4c5f3450978d1e1aa61033421ef71324f8c Mon Sep 17 00:00:00 2001 From: KadenaFriend <241389759+kdafriend@users.noreply.github.com> Date: Mon, 6 Apr 2026 06:27:15 +0000 Subject: [PATCH 4/5] Bump crypton memory-> ram for cwtools --- cwtools/cwtools.cabal | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cwtools/cwtools.cabal b/cwtools/cwtools.cabal index 5056b6514b..82e7e597cf 100644 --- a/cwtools/cwtools.cabal +++ b/cwtools/cwtools.cabal @@ -127,10 +127,10 @@ executable db-checksum , cereal >= 0.5 , configuration-tools , containers - , crypton + , crypton >= 1.1.2 , direct-sqlite , directory - , memory + , ram >=0.2.2 , mtl , pact , safe-exceptions From 9598bdb2afa34378005587992b16c736f34c378d Mon Sep 17 00:00:00 2001 From: KadenaFriend <241389759+kdafriend@users.noreply.github.com> Date: Mon, 6 Apr 2026 06:28:00 +0000 Subject: [PATCH 5/5] Bump crypton memory-> ram for chainweb-storage --- libs/chainweb-storage/chainweb-storage.cabal | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/chainweb-storage/chainweb-storage.cabal b/libs/chainweb-storage/chainweb-storage.cabal index 1614be447e..bb40642032 100644 --- a/libs/chainweb-storage/chainweb-storage.cabal +++ b/libs/chainweb-storage/chainweb-storage.cabal @@ -37,14 +37,14 @@ library , base >=4.10 && <5 , bytestring >=0.10 , containers >=0.5 - , cryptonite >= 0.25 + , crypton >= 1.1.2 , directory >=1.3 , filepath , deepseq >=1.4 , exceptions >=0.10 , hashable >=1.2 , lens >=4.16 - , memory >=0.14 + , ram >=0.2.2 , mtl >= 2.2 , nothunks >= 0.1.0.0 , rocksdb-haskell-kadena >=1.1.0