From 7eea51a5ad7b3f15abd6e24a6a6ea36f9868b688 Mon Sep 17 00:00:00 2001 From: Dmitry <98899785+mdqst@users.noreply.github.com> Date: Tue, 12 Nov 2024 20:03:15 +0300 Subject: [PATCH 1/6] Typos Update README.md (#2032) "inquires" Error: Incorrect word usage. Correction: "inquiries" "IMPORTANT NODE" Error: Typo. Correction: "IMPORTANT NOTE" --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a71f122cfc..0e36cab7d1 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Read our [whitepapers](https://www.kadena.io/whitepapers): - [Chainweb: A Proof-of-Work Parallel-Chain Architecture for Massive Throughput](https://d31d887a-c1e0-47c2-aa51-c69f9f998b07.filesusr.com/ugd/86a16f_029c9991469e4565a7c334dd716345f4.pdf) - [Agent-based Simulations of Blockchain Protocols illustrated via Kadena's *Chainweb*](https://d31d887a-c1e0-47c2-aa51-c69f9f998b07.filesusr.com/ugd/86a16f_3b2d0c58179d4edd9df6df4d55d61dda.pdf) -For additional information, press, and development inquires, please refer to the Kadena [website](https://kadena.io) +For additional information, press, and development inquiries, please refer to the Kadena [website](https://kadena.io) ## Table of Contents @@ -103,7 +103,7 @@ At this point, you are ready to [run a Chainweb node](#configuring-running-and-m ## Building from Source -*IMPORTANT NODE: We recommend the use of officially released chainweb-node +*IMPORTANT NOTE: We recommend the use of officially released chainweb-node binaries or docker images, which can be found in the [release section of this repository](https://github.com/kadena-io/chainweb-node/releases). From e3447f2aaf5d1d1fc40348d6183d84d94400ef9c Mon Sep 17 00:00:00 2001 From: Lars Kuhtz Date: Sat, 2 Nov 2024 22:03:13 -0700 Subject: [PATCH 2/6] Revert "revert rosetta test changes based on hashable update" This reverts commit 9c1d9460d89703a3b3a041f13462f80c813ac004. --- test/unit/Chainweb/Test/Rosetta/RestAPI.hs | 45 ++++++++++++++++++---- 1 file changed, 37 insertions(+), 8 deletions(-) diff --git a/test/unit/Chainweb/Test/Rosetta/RestAPI.hs b/test/unit/Chainweb/Test/Rosetta/RestAPI.hs index 1c6c46ffd1..f4a4bd8b58 100644 --- a/test/unit/Chainweb/Test/Rosetta/RestAPI.hs +++ b/test/unit/Chainweb/Test/Rosetta/RestAPI.hs @@ -217,20 +217,35 @@ blockTransactionTests tio envIo = step "send in block tx request" resp <- blockTransaction v cenv req - (fundtx,cred,deb,redeem,reward) <- + (fundtx,deb,cred,redeem,reward) <- case _transaction_operations $ _blockTransactionResp_transaction resp of [a,b,c,d,e] -> return (a,b,c,d,e) _ -> assertFailure "transfer should have resulted in 5 transactions" + -- The order in which operations are returned is flaky and may break. Use + -- the following to double check the order in case this test fails. + -- + -- print "fundtx: ----------------------" + -- print fundtx + -- print "cred: ----------------------" + -- print cred + -- print "deb: ----------------------" + -- print deb + -- print "redeem: ----------------------" + -- print redeem + -- print "reward: ----------------------" + -- print reward + -- print "----------------------" + step "validate initial gas buy at op index 0" validateOp 0 "FundTx" sender00ks Successful (negate defFundGas) fundtx - step "validate sender01 credit at op index 1" - validateOp 1 "TransferOrCreateAcct" sender01ks Successful 1.0 cred + step "validate sender00 debit at op index 1" + validateOp 1 "TransferOrCreateAcct" sender00ks Successful (negate 1.0) deb - step "validate sender00 debit at op index 2" - validateOp 2 "TransferOrCreateAcct" sender00ks Successful (negate 1.0) deb + step "validate sender01 credit at op index 2" + validateOp 2 "TransferOrCreateAcct" sender01ks Successful 1.0 cred step "validate sender00 gas redemption at op index 3" validateOp 3 "GasPayment" sender00ks Successful (defFundGas - transferGasCost) redeem @@ -295,7 +310,21 @@ blockTests testname tio envIo = testCaseSteps testname $ \step -> do validateBlock $ _blockResp_block resp - validateTxs remeds cbase fundtx cred deb gasRedeem gasReward = do + validateTxs remeds cbase fundtx deb cred gasRedeem gasReward = do + -- The order in which operations are returned is flaky and may break. Use + -- the following to double check the order in case this test fails. + -- + -- step $ "fundtx: ----------------------" + -- step $ debugShowOperation fundtx + -- step $ "deb: ----------------------" + -- step $ debugShowOperation deb + -- step $ "cred: ----------------------" + -- step $ debugShowOperation cred + -- step $ "redeem: ----------------------" + -- step $ debugShowOperation gasRedeem + -- step $ "reward: ----------------------" + -- step $ debugShowOperation gasReward + -- step $ "----------------------" -- coinbase is considered a separate tx list validateOp 0 "CoinbaseReward" noMinerks Successful defMiningReward cbase @@ -307,8 +336,8 @@ blockTests testname tio envIo = testCaseSteps testname $ \step -> do -- rest txs (i.e. transfer transaction) validateOp 0 "FundTx" sender00ks Successful (negate defFundGas) fundtx - validateOp 1 "TransferOrCreateAcct" sender01ks Successful 1.0 cred - validateOp 2 "TransferOrCreateAcct" sender00ks Successful (negate 1.0) deb + validateOp 1 "TransferOrCreateAcct" sender00ks Successful (negate 1.0) deb + validateOp 2 "TransferOrCreateAcct" sender01ks Successful 1.0 cred validateOp 3 "GasPayment" sender00ks Successful (defFundGas - transferGasCost) gasRedeem validateOp 4 "GasPayment" noMinerks Successful transferGasCost gasReward From e5a05c66201a841d20f50babf0b953b9d00594a4 Mon Sep 17 00:00:00 2001 From: Lars Kuhtz Date: Sat, 2 Nov 2024 22:16:12 -0700 Subject: [PATCH 3/6] pact version that support hashable-1.5 --- cabal.project | 7 +- cabal.project.freeze | 189 +++++++++++++----- src/Chainweb/Pact/Service/Types.hs | 10 +- src/Chainweb/Pact/TransactionExec.hs | 4 +- test/unit/Chainweb/Test/Pact/Checkpointer.hs | 4 +- .../Test/Pact/ModuleCacheOnRestart.hs | 14 +- 6 files changed, 162 insertions(+), 66 deletions(-) diff --git a/cabal.project b/cabal.project index a6f312e768..a092a70f46 100644 --- a/cabal.project +++ b/cabal.project @@ -80,8 +80,8 @@ package yet-another-logger source-repository-package type: git location: https://github.com/kadena-io/pact.git - tag: 058da315f7b427ad5dcaa334683600a1f7fd9588 - --sha256: 105jbsvrjv2zxsazd3vcbkml99w26xqimwjybfiznkg21456d6hn + tag: 8d51f4b251c22ecf623a2a49d26016c75bc728fd + --sha256: 18xgvzb3p8chch85747ln9a2191df09vwwrv9v3njr2h69n3rhxj source-repository-package type: git @@ -206,11 +206,10 @@ allow-newer: base-compat-batteries:* allow-newer: webauthn:* -- many packages use an spurious <1.5 upper bound on hashable --- allow-newer: *:hashable +allow-newer: *:hashable -- -------------------------------------------------------------------------- -- -- Upper Bounds -- remove when crypton-connection >0.4.1 got released constraints: http-client-tls <0.3.6.4 -constraints: hashable < 1.4.5 \ No newline at end of file diff --git a/cabal.project.freeze b/cabal.project.freeze index 8065484974..7987ad3ebb 100644 --- a/cabal.project.freeze +++ b/cabal.project.freeze @@ -7,58 +7,80 @@ constraints: any.Cabal ==3.10.2.0, any.OneTuple ==0.4.2, any.Only ==0.1, any.QuickCheck ==2.15.0.1, + QuickCheck -old-random +templatehaskell, any.RSA ==2.4.1, any.SHA ==1.6.4.4, + SHA -exe, any.StateVar ==1.2.2, any.adjunctions ==4.4.2, - any.aeson ==2.2.2.0, + any.aeson ==2.2.3.0, + aeson +ordered-keymap, any.aeson-pretty ==0.8.10, + aeson-pretty -lib-only, any.ansi-terminal ==1.1.1, + ansi-terminal -example, any.ansi-terminal-types ==1.1, any.ap-normalize ==0.1.0.1, + ap-normalize -test-with-clang, any.appar ==0.1.8, any.array ==0.5.6.0, any.asn1-encoding ==0.9.6, any.asn1-parse ==0.9.5, any.asn1-types ==0.3.4, any.assoc ==1.1.1, + assoc -tagged, any.async ==2.2.5, + async -bench, any.atomic-primops ==0.8.8, + atomic-primops -debug, any.attoparsec ==0.14.4, + attoparsec -developer, + any.attoparsec-aeson ==2.2.2.0, any.authenticate-oauth ==1.7, - any.auto-update ==0.2.1, + any.auto-update ==0.2.2, any.base ==4.19.1.0, any.base-compat ==0.14.0, any.base-compat-batteries ==0.14.0, any.base-orphans ==0.9.2, any.base-unicode-symbols ==0.2.4.2, + base-unicode-symbols +base-4-8 -old-base, any.base16-bytestring ==1.0.2.0, any.base64-bytestring ==1.2.1.0, any.base64-bytestring-kadena ==0.1, any.basement ==0.0.16, any.bifunctors ==5.6.2, + bifunctors +tagged, any.binary ==0.8.9.1, any.binary-orphans ==1.0.5, any.bitvec ==1.1.5.0, + bitvec +simd, any.blaze-builder ==0.4.2.3, any.blaze-html ==0.9.2.0, any.blaze-markup ==0.8.3.0, any.boring ==0.2.2, + boring +tagged, any.bound ==2.0.7, + bound +template-haskell, any.bsb-http-chunked ==0.0.0.4, any.bytebuild ==0.3.16.2, + bytebuild -checked, any.byteorder ==1.0.4, any.bytes ==0.17.3, any.byteslice ==0.2.13.2, + byteslice +avoid-rawmemchr, any.bytesmith ==0.3.11.1, any.bytestring ==0.12.1.0, any.bytestring-builder ==0.10.8.2.0, + bytestring-builder +bytestring_has_builder, + any.cabal-doctest ==1.0.10, any.cache ==0.1.3.0, any.call-stack ==0.4.0, any.case-insensitive ==1.2.1.0, - any.cassava ==0.5.3.1, + any.cassava ==0.5.3.2, any.cborg ==0.2.10.0, + cborg +optimize-gmp, any.cereal ==0.5.8.3, + cereal -bytestring-builder, chainweb -debug -ed25519 -ghc-flags, chainweb-node -debug -ed25519 -ghc-flags, any.chainweb-storage ==0.1.0.0, @@ -66,37 +88,46 @@ constraints: any.Cabal ==3.10.2.0, any.charset ==0.3.10, any.chronos ==1.1.6.1, any.clock ==0.8.4, + clock -llvm, + any.cmdargs ==0.10.22, + cmdargs +quotation -testprog, any.code-page ==0.2.1, any.colour ==2.3.6, any.comonad ==5.0.8, - any.conduit ==1.3.5, + comonad +containers +distributive +indexed-traversable, + any.conduit ==1.3.6, any.configuration-tools ==0.7.0, + configuration-tools -remote-configs, any.constraints ==0.14.2, any.containers ==0.6.8, any.contiguous ==0.6.4.2, any.contravariant ==1.5.5, + contravariant +semigroups +statevar +tagged, any.cookie ==0.5.0, - any.criterion ==1.6.3.0, - any.criterion-measurement ==0.2.2.0, + any.criterion ==1.6.4.0, + criterion -embed-data-files -fast, + any.criterion-measurement ==0.2.3.0, + criterion-measurement -fast, any.crypto-api ==0.13.3, + crypto-api -all_cpolys, any.crypto-pubkey-types ==0.4.3, - any.crypto-token ==0.1.1, + any.crypto-token ==0.1.2, any.cryptohash-md5 ==0.11.101.0, any.cryptohash-sha1 ==0.11.101.0, - any.crypton ==1.0.0, + any.crypton ==1.0.1, + crypton -check_alignment +integer-gmp -old_toolchain_inliner +support_aesni +support_deepseq +support_pclmuldq +support_rdrand -support_sse +use_target_attributes, any.crypton-connection ==0.4.1, any.crypton-x509 ==1.7.7, any.crypton-x509-store ==1.6.9, any.crypton-x509-system ==1.6.7, any.crypton-x509-validation ==1.6.12, 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, + cuckoo -mwc-random -pcg-random, any.data-bword ==0.1.0.2, - any.data-default ==0.7.1.1, - any.data-default-class ==0.1.2.0, - any.data-default-instances-containers ==0.0.1, - any.data-default-instances-dlist ==0.0.1, - any.data-default-instances-old-locale ==0.0.1, + any.data-default ==0.8.0.0, + any.data-default-class ==0.2.0.0, any.data-dword ==0.3.2.1, any.data-fix ==0.3.4, any.data-ordlist ==0.4.7.0, @@ -104,25 +135,31 @@ constraints: any.Cabal ==3.10.2.0, any.deepseq ==1.5.0.0, any.dense-linear-algebra ==0.1.0.0, any.deriving-compat ==0.6.6, + deriving-compat +base-4-9 +new-functor-classes +template-haskell-2-11, any.digraph ==0.3.0, any.direct-sqlite ==2.3.29, + direct-sqlite +dbstat +fulltextsearch +haveusleep +json1 -mathfunctions -systemlib +urifilenames, any.directory ==1.3.8.1, any.distributive ==0.6.2.1, + distributive +semigroups +tagged, any.dlist ==1.0, + dlist -werror, any.easy-file ==0.2.5, any.enclosed-exceptions ==1.0.3, any.entropy ==0.4.1.10, + entropy -donotgetentropy, any.errors ==2.3.0, any.ethereum ==0.1.0.2, ethereum -ethhash -openssl-use-pkg-config, any.exceptions ==0.10.7, - any.fast-logger ==3.2.3, + any.fast-logger ==3.2.5, any.file-embed ==0.0.16.0, any.filepath ==1.4.200.1, any.fingertree ==0.1.5.0, - any.finite-typelits ==0.2.0.1, + any.finite-typelits ==0.2.1.0, any.free ==5.2, - any.generic-data ==1.1.0.0, + any.generic-data ==1.1.0.1, + generic-data -enable-inspect, any.generically ==0.1.1, any.ghc-bignum ==1.3, any.ghc-boot-th ==9.8.2, @@ -132,66 +169,89 @@ constraints: any.Cabal ==3.10.2.0, any.groups ==0.5.3, any.growable-vector ==0.1, any.half ==0.3.1, - any.hashable ==1.4.4.0, - any.hashes ==0.3.0, - any.haskell-lexer ==1.1.1, + any.happy ==2.1.2, + any.happy-lib ==2.1.2, + any.hashable ==1.5.0.0, + hashable -arch-native -random-initial-seed, + any.hashes ==0.3.0.1, + hashes -benchmark-cryptonite -openssl-use-pkg-config -test-cryptonite +with-openssl, + any.haskell-lexer ==1.1.2, any.haskell-src-exts ==1.23.1, any.haskell-src-meta ==0.8.14, any.heaps ==0.4, any.hourglass ==0.2.12, + any.hsc2hs ==0.68.10, + hsc2hs -in-ghc-tree, any.http-api-data ==0.6.1, + http-api-data -use-text-show, any.http-client ==0.7.17, + http-client +network-uri, any.http-client-tls ==0.3.6.3, any.http-date ==0.0.11, any.http-media ==0.8.1.1, - any.http-semantics ==0.2.0, + any.http-semantics ==0.2.1, any.http-types ==0.12.4, - any.http2 ==5.3.1, + any.http2 ==5.3.4, + http2 -devel -h2spec, any.indexed-list-literals ==0.2.1.3, any.indexed-traversable ==0.1.4, any.indexed-traversable-instances ==0.1.2, any.integer-conversion ==0.1.1, any.integer-gmp ==1.1, any.integer-logarithms ==1.0.3.1, + integer-logarithms -check-bounds +integer-gmp, any.invariant ==0.6.3, - any.iproute ==1.7.14, + any.iproute ==1.7.15, any.ixset-typed ==0.5, any.js-chart ==2.9.4.1, any.kan-extensions ==5.2.6, any.lens ==5.3.2, + lens -benchmark-uniplate -dump-splices +inlining -j +test-hunit +test-properties +test-templates +trustworthy, any.lens-aeson ==1.2.3, any.libBF ==0.6.8, + libBF -system-libbf, any.libyaml ==0.1.4, + libyaml -no-unicode -system-libyaml, any.libyaml-clib ==0.2.5, any.lifted-base ==0.2.3.12, any.loglevel ==0.1.0.0, any.managed ==1.0.10, any.massiv ==1.0.4.0, + massiv -unsafe-checks, any.math-functions ==0.3.4.4, + math-functions +system-erf +system-expm1, any.megaparsec ==9.6.1, + megaparsec -dev, any.memory ==0.18.0, + memory +support_bytestring +support_deepseq, any.merkle-log ==0.2.0, any.microlens ==0.4.13.1, any.microstache ==1.0.3, any.mime-types ==0.1.2.0, any.mmorph ==1.2.0, any.mod ==0.2.0.1, + mod +semirings +vector, any.monad-control ==1.0.3.1, - any.mono-traversable ==1.0.17.0, + any.mono-traversable ==1.0.20.0, any.mtl ==2.3.1, any.mtl-compat ==0.2.2, + mtl-compat -two-point-one -two-point-two, any.mwc-probability ==2.3.1, any.mwc-random ==0.15.1.0, + mwc-random -benchpapi, any.natural-arithmetic ==0.2.1.0, - any.network ==3.1.4.0, + any.network ==3.2.4.0, + network -devel, any.network-byte-order ==0.1.7, any.network-control ==0.1.3, any.network-info ==0.2.1, any.network-uri ==2.6.4.2, - any.nothunks ==0.2.1.1, + any.nothunks ==0.3.0.0, + nothunks +bytestring +text +vector, any.old-locale ==1.0.0.7, any.old-time ==1.1.0.4, any.optparse-applicative ==0.18.1.0, + optparse-applicative +process, any.os-string ==2.0.6, any.pact ==4.13.1, pact -build-tool +cryptonite-ed25519 -tests-in-lib, @@ -201,13 +261,17 @@ constraints: any.Cabal ==3.10.2.0, any.parallel ==3.2.2.0, any.parsec ==3.1.17.0, any.parser-combinators ==1.3.0, - any.parsers ==0.12.11, + parser-combinators -dev, + any.parsers ==0.12.12, + parsers +attoparsec +binary +parsec, any.patience ==0.3, any.pem ==0.2.4, any.poly ==0.5.1.0, + poly +sparse, any.pretty ==1.1.3.6, any.pretty-show ==1.10, any.prettyprinter ==1.7.1, + prettyprinter -buildreadme +text, any.prettyprinter-ansi-terminal ==1.1.3, any.primitive ==0.9.0.0, any.primitive-addr ==0.1.0.3, @@ -222,11 +286,14 @@ constraints: any.Cabal ==3.10.2.0, any.recv ==0.1.0, any.reducers ==3.12.4, any.reflection ==2.1.8, + reflection -slow +template-haskell, any.regex-base ==0.94.0.2, any.regex-tdfa ==1.3.2.2, + regex-tdfa +doctest -force-o2, any.resource-pool ==0.4.0.0, any.resourcet ==1.3.0, any.retry ==0.9.3.1, + retry -lib-werror, any.rocksdb-haskell-kadena ==1.1.0, rocksdb-haskell-kadena -with-tbb, any.rosetta ==1.0.1, @@ -238,38 +305,50 @@ constraints: any.Cabal ==3.10.2.0, any.sbv ==9.2, any.scheduler ==2.0.0.1, any.scientific ==0.3.8.0, + scientific -integer-simple, any.semialign ==1.3.1, + semialign +semigroupoids, any.semigroupoids ==6.0.1, + semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers, any.semigroups ==0.20, + semigroups +binary +bytestring -bytestring-builder +containers +deepseq +hashable +tagged +template-haskell +text +transformers +unordered-containers, any.semirings ==0.7, + semirings +containers +unordered-containers, any.serialise ==0.2.6.1, - any.servant ==0.20.1, - any.servant-client ==0.20, - any.servant-client-core ==0.20, - any.servant-server ==0.20, + serialise +newtime15, + any.servant ==0.20.2, + any.servant-client ==0.20.2, + any.servant-client-core ==0.20.2, + any.servant-server ==0.20.2, any.sha-validation ==0.1.0.1, any.show-combinators ==0.2.0.0, any.simple-sendfile ==0.2.32, + simple-sendfile +allow-bsd -fallback, any.singleton-bool ==0.1.8, any.socks ==0.6.1, any.some ==1.0.6, + some +newtype-unsafe, any.sop-core ==0.5.0.2, any.split ==0.2.5, any.splitmix ==0.1.0.5, + splitmix -optimised-mixer, any.statistics ==0.16.2.1, any.stm ==2.5.2.1, any.stm-chans ==3.0.0.9, any.stopwatch ==0.1.0.6, + stopwatch -test_delay_upper_bound -test_threaded, any.streaming ==0.2.4.0, any.streaming-commons ==0.2.2.6, - any.strict ==0.5, + streaming-commons -use-bytestring-builder, + any.strict ==0.5.1, any.strict-concurrency ==0.2.4.3, - any.string-conversions ==0.4.0.1, any.syb ==0.7.2.4, - any.system-cxx-std-lib ==1.0, any.tagged ==0.8.8, + tagged +deepseq +transformers, any.tasty ==1.5, + tasty +unix, any.tasty-golden ==2.3.5, + tasty-golden -build-example, any.tasty-hunit ==0.10.2, any.tasty-json ==0.1.0.0, any.tasty-quickcheck ==0.11, @@ -278,63 +357,81 @@ constraints: any.Cabal ==3.10.2.0, any.text ==2.1.1, any.text-iso8601 ==0.1.1, any.text-short ==0.1.6, + text-short -asserts, any.th-abstraction ==0.7.0.0, any.th-compat ==0.1.5, any.th-expand-syns ==0.4.11.0, - any.th-lift ==0.8.4, - any.th-orphans ==0.13.14, + any.th-lift ==0.8.5, + any.th-orphans ==0.13.15, any.th-reify-many ==0.1.10, any.these ==1.2.1, any.time ==1.12.2, any.time-compat ==1.9.7, any.time-locale-compat ==0.1.1.5, + time-locale-compat +old-locale, any.time-manager ==0.1.0, - any.tls ==2.1.0, - any.tls-session-manager ==0.0.6, + any.tls ==2.1.2, + tls -devel, + any.tls-session-manager ==0.0.7, any.token-bucket ==0.1.0.1, + token-bucket +use-cbits, any.torsor ==0.1.0.1, any.transformers ==0.6.1.0, any.transformers-base ==0.4.6, + 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.11.1, + any.typed-process ==0.2.12.0, any.uniplate ==1.6.13, any.unix ==2.8.4.0, - any.unix-compat ==0.7.2, - any.unix-time ==0.4.15, + any.unix-compat ==0.7.3, + any.unix-time ==0.4.16, any.unlifted ==0.2.2.0, any.unliftio ==0.2.25.0, any.unliftio-core ==0.2.1.0, any.unordered-containers ==0.2.20, + unordered-containers -debug, any.utf8-string ==1.0.2, any.uuid ==1.3.16, any.uuid-types ==1.0.6, any.validation ==1.1.3, any.vault ==0.3.1.5, - any.vector ==0.13.1.0, + vault +useghc, + any.vector ==0.13.2.0, + vector +boundschecks -internalchecks -unsafechecks -wall, any.vector-algorithms ==0.9.0.2, + vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks, any.vector-binary-instances ==0.2.5.2, any.vector-sized ==1.6.1, any.vector-stream ==0.1.0.1, any.vector-th-unbox ==0.2.2, any.void ==0.7.3, + void -safe, any.wai ==3.2.4, any.wai-app-static ==3.1.9, + wai-app-static +crypton -print, any.wai-cors ==0.2.7, any.wai-extra ==3.1.15, - any.wai-logger ==2.4.1, + wai-extra -build-example, + any.wai-logger ==2.5.0, any.wai-middleware-throttle ==0.3.0.1, any.wai-middleware-validation ==0.1.0.2, - any.warp ==3.4.1, - any.warp-tls ==3.4.6, + any.warp ==3.4.3, + warp +allow-sendfilefd -network-bytestring -warp-debug +x509, + any.warp-tls ==3.4.7, any.wherefrom-compat ==0.1.1.1, any.wide-word ==0.1.6.0, any.witherable ==0.5, any.word8 ==0.1.3, any.wreq ==0.5.4.3, + wreq -aws -developer +doctest -httpbin, any.yaml ==0.11.11.2, + yaml +no-examples +no-exe, any.yet-another-logger ==0.4.2, + yet-another-logger -tbmqueue, any.zigzag ==0.1.0.0, - any.zlib ==0.7.1.0 -index-state: hackage.haskell.org 2024-10-31T14:36:55Z + any.zlib ==0.7.1.0, + zlib -bundled-c-zlib +non-blocking-ffi +pkg-config +index-state: hackage.haskell.org 2024-11-02T14:34:14Z diff --git a/src/Chainweb/Pact/Service/Types.hs b/src/Chainweb/Pact/Service/Types.hs index 916e83bc96..ea5edb8f9f 100644 --- a/src/Chainweb/Pact/Service/Types.hs +++ b/src/Chainweb/Pact/Service/Types.hs @@ -101,7 +101,6 @@ import Control.Applicative import Data.Aeson import qualified Data.ByteString.Short as SB import Data.HashMap.Strict (HashMap) -import qualified Data.HashMap.Strict as HM import qualified Data.List.NonEmpty as NE import Data.Text (Text, unpack) import qualified Data.Text.Encoding as T @@ -123,6 +122,7 @@ import Pact.Types.RowData import Pact.Types.Runtime hiding (ChainId) import qualified Pact.JSON.Encode as J import qualified Pact.JSON.Legacy.HashMap as LHM +import qualified Pact.Utils.StableHashMap as SHM -- internal chainweb modules @@ -523,14 +523,14 @@ filterModuleCacheByKey f (ModuleCache c) = ModuleCache $ moduleCacheToHashMap :: ModuleCache - -> HM.HashMap ModuleName (ModuleData Ref, Bool) -moduleCacheToHashMap (ModuleCache c) = HM.fromList $ LHM.toList c + -> SHM.StableHashMap ModuleName (ModuleData Ref, Bool) +moduleCacheToHashMap (ModuleCache c) = SHM.fromList $ LHM.toList c {-# INLINE moduleCacheToHashMap #-} moduleCacheFromHashMap - :: HM.HashMap ModuleName (ModuleData Ref, Bool) + :: SHM.StableHashMap ModuleName (ModuleData Ref, Bool) -> ModuleCache -moduleCacheFromHashMap = ModuleCache . LHM.fromList . HM.toList +moduleCacheFromHashMap = ModuleCache . LHM.fromList . SHM.toList {-# INLINE moduleCacheFromHashMap #-} moduleCacheKeys :: ModuleCache -> [ModuleName] diff --git a/src/Chainweb/Pact/TransactionExec.hs b/src/Chainweb/Pact/TransactionExec.hs index 27eb1c666d..00ceae4949 100644 --- a/src/Chainweb/Pact/TransactionExec.hs +++ b/src/Chainweb/Pact/TransactionExec.hs @@ -70,7 +70,6 @@ import qualified Data.ByteString.Short as SB import Data.Decimal (Decimal, roundTo) import Data.Foldable (fold, for_, traverse_) import Data.IORef -import qualified Data.HashMap.Strict as HM import qualified Data.List as List import qualified Data.Map.Strict as M import Data.Maybe @@ -105,6 +104,7 @@ import Pact.Types.SPV import Pact.Types.Verifier import Pact.Types.Util as PU +import qualified Pact.Utils.StableHashMap as SHM -- internal Chainweb modules @@ -1040,7 +1040,7 @@ findPayer txCtx cmd = runMaybeT $ do gasPayerIface = ModuleName "gas-payer-v1" Nothing lookupIfaceModRef (QualifiedName _ n _) (ModuleData (MDModule Module{..}) refs _) - | gasPayerIface `elem` _mInterfaces = HM.lookup n refs + | gasPayerIface `elem` _mInterfaces = SHM.lookup n refs lookupIfaceModRef _ _ = Nothing mkApp i r as = App (TVar r i) (map (liftTerm . fromPactValue) as) i diff --git a/test/unit/Chainweb/Test/Pact/Checkpointer.hs b/test/unit/Chainweb/Test/Pact/Checkpointer.hs index 573cc5bffe..b8bb098fd4 100644 --- a/test/unit/Chainweb/Test/Pact/Checkpointer.hs +++ b/test/unit/Chainweb/Test/Pact/Checkpointer.hs @@ -19,7 +19,6 @@ import Control.Monad.Reader import Data.Aeson (Value(..), object, (.=), Key) import Data.Function -import qualified Data.HashMap.Strict as HM import qualified Data.Map.Strict as M import Data.Text (Text) import qualified Data.Text as T @@ -40,6 +39,7 @@ import Pact.Types.Runtime hiding (ChainId) import Pact.Types.SPV (noSPVSupport) import Pact.Types.SQLite import qualified Pact.JSON.Encode as J +import qualified Pact.Utils.StableHashMap as SHM import Test.Tasty import Test.Tasty.HUnit @@ -785,7 +785,7 @@ loadModule = do fn = "test/pact/simple.repl" nativeLookup :: NativeDefName -> Maybe (Term Name) -nativeLookup (NativeDefName n) = case HM.lookup n nativeDefs of +nativeLookup (NativeDefName n) = case SHM.lookup n nativeDefs of Just (Direct t) -> Just t _ -> Nothing diff --git a/test/unit/Chainweb/Test/Pact/ModuleCacheOnRestart.hs b/test/unit/Chainweb/Test/Pact/ModuleCacheOnRestart.hs index 3576ce752c..613baa9d9d 100644 --- a/test/unit/Chainweb/Test/Pact/ModuleCacheOnRestart.hs +++ b/test/unit/Chainweb/Test/Pact/ModuleCacheOnRestart.hs @@ -16,7 +16,6 @@ import Control.Lens import Control.Monad import Control.Monad.IO.Class -import qualified Data.HashMap.Strict as HM import qualified Data.Map.Strict as M import Data.List (intercalate) import qualified Data.Text as T @@ -32,6 +31,7 @@ import System.LogLevel import Pact.Types.Runtime (mdModule) import Pact.Types.Term +import qualified Pact.Utils.StableHashMap as SHM -- chainweb imports @@ -69,7 +69,7 @@ type RewindPoint = (BlockHeader, PayloadWithOutputs) data RewindData = RewindData { afterV4 :: RewindPoint , beforeV4 :: RewindPoint - , v3Cache :: HM.HashMap ModuleName (Maybe ModuleHash) + , v3Cache :: SHM.StableHashMap ModuleName (Maybe ModuleHash) } deriving Generic instance NFData RewindData @@ -226,12 +226,12 @@ testCw217CoinOnly iobdb _rewindM = (go, go') Nothing -> assertFailure "failed to lookup block at 20" assertNoCacheMismatch - :: HM.HashMap ModuleName (Maybe ModuleHash) - -> HM.HashMap ModuleName (Maybe ModuleHash) + :: SHM.StableHashMap ModuleName (Maybe ModuleHash) + -> SHM.StableHashMap ModuleName (Maybe ModuleHash) -> Assertion assertNoCacheMismatch c1 c2 = assertBool msg $ c1 == c2 where - showCache = intercalate "\n" . map show . HM.toList + showCache = intercalate "\n" . map show . SHM.toList msg = mconcat [ "Module cache mismatch, found: \n" @@ -268,10 +268,10 @@ doNextCoinbaseN_ doNextCoinbaseN_ n iobdb = fmap last $ replicateM n $ doNextCoinbase iobdb -- | Interfaces can't be upgraded, but modules can, so verify hash in that case. -justModuleHashes :: ModuleInitCache -> HM.HashMap ModuleName (Maybe ModuleHash) +justModuleHashes :: ModuleInitCache -> SHM.StableHashMap ModuleName (Maybe ModuleHash) justModuleHashes = justModuleHashes' . snd . last . M.toList -justModuleHashes' :: ModuleCache -> HM.HashMap ModuleName (Maybe ModuleHash) +justModuleHashes' :: ModuleCache -> SHM.StableHashMap ModuleName (Maybe ModuleHash) justModuleHashes' = fmap (preview (_1 . mdModule . _MDModule . mHash)) . moduleCacheToHashMap From 3686deae7b0f651239c5841739fc47a3be4ff455 Mon Sep 17 00:00:00 2001 From: chessai Date: Mon, 4 Nov 2024 10:29:48 -0600 Subject: [PATCH 4/6] update cabal.project.freeze Change-Id: I53d40fc38a8b7cddeab3bb608ffc651dd8099ea4 --- cabal.project.freeze | 183 ++++++++++--------------------------------- 1 file changed, 43 insertions(+), 140 deletions(-) diff --git a/cabal.project.freeze b/cabal.project.freeze index 7987ad3ebb..84b4cdf658 100644 --- a/cabal.project.freeze +++ b/cabal.project.freeze @@ -7,80 +7,58 @@ constraints: any.Cabal ==3.10.2.0, any.OneTuple ==0.4.2, any.Only ==0.1, any.QuickCheck ==2.15.0.1, - QuickCheck -old-random +templatehaskell, any.RSA ==2.4.1, any.SHA ==1.6.4.4, - SHA -exe, any.StateVar ==1.2.2, any.adjunctions ==4.4.2, any.aeson ==2.2.3.0, - aeson +ordered-keymap, any.aeson-pretty ==0.8.10, - aeson-pretty -lib-only, any.ansi-terminal ==1.1.1, - ansi-terminal -example, any.ansi-terminal-types ==1.1, any.ap-normalize ==0.1.0.1, - ap-normalize -test-with-clang, any.appar ==0.1.8, any.array ==0.5.6.0, any.asn1-encoding ==0.9.6, any.asn1-parse ==0.9.5, any.asn1-types ==0.3.4, any.assoc ==1.1.1, - assoc -tagged, any.async ==2.2.5, - async -bench, any.atomic-primops ==0.8.8, - atomic-primops -debug, any.attoparsec ==0.14.4, - attoparsec -developer, - any.attoparsec-aeson ==2.2.2.0, any.authenticate-oauth ==1.7, - any.auto-update ==0.2.2, + any.auto-update ==0.2.1, any.base ==4.19.1.0, any.base-compat ==0.14.0, any.base-compat-batteries ==0.14.0, any.base-orphans ==0.9.2, any.base-unicode-symbols ==0.2.4.2, - base-unicode-symbols +base-4-8 -old-base, any.base16-bytestring ==1.0.2.0, any.base64-bytestring ==1.2.1.0, any.base64-bytestring-kadena ==0.1, any.basement ==0.0.16, any.bifunctors ==5.6.2, - bifunctors +tagged, any.binary ==0.8.9.1, any.binary-orphans ==1.0.5, any.bitvec ==1.1.5.0, - bitvec +simd, any.blaze-builder ==0.4.2.3, any.blaze-html ==0.9.2.0, any.blaze-markup ==0.8.3.0, any.boring ==0.2.2, - boring +tagged, any.bound ==2.0.7, - bound +template-haskell, any.bsb-http-chunked ==0.0.0.4, any.bytebuild ==0.3.16.2, - bytebuild -checked, any.byteorder ==1.0.4, any.bytes ==0.17.3, any.byteslice ==0.2.13.2, - byteslice +avoid-rawmemchr, any.bytesmith ==0.3.11.1, any.bytestring ==0.12.1.0, any.bytestring-builder ==0.10.8.2.0, - bytestring-builder +bytestring_has_builder, - any.cabal-doctest ==1.0.10, any.cache ==0.1.3.0, any.call-stack ==0.4.0, any.case-insensitive ==1.2.1.0, - any.cassava ==0.5.3.2, + any.cassava ==0.5.3.1, any.cborg ==0.2.10.0, - cborg +optimize-gmp, any.cereal ==0.5.8.3, - cereal -bytestring-builder, chainweb -debug -ed25519 -ghc-flags, chainweb-node -debug -ed25519 -ghc-flags, any.chainweb-storage ==0.1.0.0, @@ -88,46 +66,37 @@ constraints: any.Cabal ==3.10.2.0, any.charset ==0.3.10, any.chronos ==1.1.6.1, any.clock ==0.8.4, - clock -llvm, - any.cmdargs ==0.10.22, - cmdargs +quotation -testprog, any.code-page ==0.2.1, any.colour ==2.3.6, any.comonad ==5.0.8, - comonad +containers +distributive +indexed-traversable, - any.conduit ==1.3.6, + any.conduit ==1.3.5, any.configuration-tools ==0.7.0, - configuration-tools -remote-configs, any.constraints ==0.14.2, any.containers ==0.6.8, any.contiguous ==0.6.4.2, any.contravariant ==1.5.5, - contravariant +semigroups +statevar +tagged, any.cookie ==0.5.0, - any.criterion ==1.6.4.0, - criterion -embed-data-files -fast, - any.criterion-measurement ==0.2.3.0, - criterion-measurement -fast, + any.criterion ==1.6.3.0, + any.criterion-measurement ==0.2.2.0, any.crypto-api ==0.13.3, - crypto-api -all_cpolys, any.crypto-pubkey-types ==0.4.3, - any.crypto-token ==0.1.2, + any.crypto-token ==0.1.1, any.cryptohash-md5 ==0.11.101.0, any.cryptohash-sha1 ==0.11.101.0, - any.crypton ==1.0.1, - crypton -check_alignment +integer-gmp -old_toolchain_inliner +support_aesni +support_deepseq +support_pclmuldq +support_rdrand -support_sse +use_target_attributes, + any.crypton ==1.0.0, any.crypton-connection ==0.4.1, any.crypton-x509 ==1.7.7, any.crypton-x509-store ==1.6.9, any.crypton-x509-system ==1.6.7, any.crypton-x509-validation ==1.6.12, 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, - cuckoo -mwc-random -pcg-random, any.data-bword ==0.1.0.2, - any.data-default ==0.8.0.0, - any.data-default-class ==0.2.0.0, + any.data-default ==0.7.1.1, + any.data-default-class ==0.1.2.0, + any.data-default-instances-containers ==0.0.1, + any.data-default-instances-dlist ==0.0.1, + any.data-default-instances-old-locale ==0.0.1, any.data-dword ==0.3.2.1, any.data-fix ==0.3.4, any.data-ordlist ==0.4.7.0, @@ -135,31 +104,25 @@ constraints: any.Cabal ==3.10.2.0, any.deepseq ==1.5.0.0, any.dense-linear-algebra ==0.1.0.0, any.deriving-compat ==0.6.6, - deriving-compat +base-4-9 +new-functor-classes +template-haskell-2-11, any.digraph ==0.3.0, any.direct-sqlite ==2.3.29, - direct-sqlite +dbstat +fulltextsearch +haveusleep +json1 -mathfunctions -systemlib +urifilenames, any.directory ==1.3.8.1, any.distributive ==0.6.2.1, - distributive +semigroups +tagged, any.dlist ==1.0, - dlist -werror, any.easy-file ==0.2.5, any.enclosed-exceptions ==1.0.3, any.entropy ==0.4.1.10, - entropy -donotgetentropy, any.errors ==2.3.0, any.ethereum ==0.1.0.2, ethereum -ethhash -openssl-use-pkg-config, any.exceptions ==0.10.7, - any.fast-logger ==3.2.5, + any.fast-logger ==3.2.3, any.file-embed ==0.0.16.0, any.filepath ==1.4.200.1, any.fingertree ==0.1.5.0, - any.finite-typelits ==0.2.1.0, + any.finite-typelits ==0.2.0.1, any.free ==5.2, - any.generic-data ==1.1.0.1, - generic-data -enable-inspect, + any.generic-data ==1.1.0.0, any.generically ==0.1.1, any.ghc-bignum ==1.3, any.ghc-boot-th ==9.8.2, @@ -169,89 +132,66 @@ constraints: any.Cabal ==3.10.2.0, any.groups ==0.5.3, any.growable-vector ==0.1, any.half ==0.3.1, - any.happy ==2.1.2, - any.happy-lib ==2.1.2, any.hashable ==1.5.0.0, - hashable -arch-native -random-initial-seed, - any.hashes ==0.3.0.1, - hashes -benchmark-cryptonite -openssl-use-pkg-config -test-cryptonite +with-openssl, - any.haskell-lexer ==1.1.2, + any.hashes ==0.3.0, + any.haskell-lexer ==1.1.1, any.haskell-src-exts ==1.23.1, any.haskell-src-meta ==0.8.14, any.heaps ==0.4, any.hourglass ==0.2.12, - any.hsc2hs ==0.68.10, - hsc2hs -in-ghc-tree, any.http-api-data ==0.6.1, - http-api-data -use-text-show, any.http-client ==0.7.17, - http-client +network-uri, any.http-client-tls ==0.3.6.3, any.http-date ==0.0.11, any.http-media ==0.8.1.1, - any.http-semantics ==0.2.1, + any.http-semantics ==0.2.0, any.http-types ==0.12.4, - any.http2 ==5.3.4, - http2 -devel -h2spec, + any.http2 ==5.3.1, any.indexed-list-literals ==0.2.1.3, any.indexed-traversable ==0.1.4, any.indexed-traversable-instances ==0.1.2, any.integer-conversion ==0.1.1, any.integer-gmp ==1.1, any.integer-logarithms ==1.0.3.1, - integer-logarithms -check-bounds +integer-gmp, any.invariant ==0.6.3, - any.iproute ==1.7.15, + any.iproute ==1.7.14, any.ixset-typed ==0.5, any.js-chart ==2.9.4.1, any.kan-extensions ==5.2.6, any.lens ==5.3.2, - lens -benchmark-uniplate -dump-splices +inlining -j +test-hunit +test-properties +test-templates +trustworthy, any.lens-aeson ==1.2.3, any.libBF ==0.6.8, - libBF -system-libbf, any.libyaml ==0.1.4, - libyaml -no-unicode -system-libyaml, any.libyaml-clib ==0.2.5, any.lifted-base ==0.2.3.12, any.loglevel ==0.1.0.0, any.managed ==1.0.10, any.massiv ==1.0.4.0, - massiv -unsafe-checks, any.math-functions ==0.3.4.4, - math-functions +system-erf +system-expm1, any.megaparsec ==9.6.1, - megaparsec -dev, any.memory ==0.18.0, - memory +support_bytestring +support_deepseq, any.merkle-log ==0.2.0, any.microlens ==0.4.13.1, any.microstache ==1.0.3, any.mime-types ==0.1.2.0, any.mmorph ==1.2.0, any.mod ==0.2.0.1, - mod +semirings +vector, any.monad-control ==1.0.3.1, - any.mono-traversable ==1.0.20.0, + any.mono-traversable ==1.0.17.0, any.mtl ==2.3.1, any.mtl-compat ==0.2.2, - mtl-compat -two-point-one -two-point-two, any.mwc-probability ==2.3.1, any.mwc-random ==0.15.1.0, - mwc-random -benchpapi, any.natural-arithmetic ==0.2.1.0, - any.network ==3.2.4.0, - network -devel, + any.network ==3.1.4.0, any.network-byte-order ==0.1.7, any.network-control ==0.1.3, any.network-info ==0.2.1, any.network-uri ==2.6.4.2, - any.nothunks ==0.3.0.0, - nothunks +bytestring +text +vector, + any.nothunks ==0.2.1.1, any.old-locale ==1.0.0.7, any.old-time ==1.1.0.4, any.optparse-applicative ==0.18.1.0, - optparse-applicative +process, any.os-string ==2.0.6, any.pact ==4.13.1, pact -build-tool +cryptonite-ed25519 -tests-in-lib, @@ -261,17 +201,13 @@ constraints: any.Cabal ==3.10.2.0, any.parallel ==3.2.2.0, any.parsec ==3.1.17.0, any.parser-combinators ==1.3.0, - parser-combinators -dev, - any.parsers ==0.12.12, - parsers +attoparsec +binary +parsec, + any.parsers ==0.12.11, any.patience ==0.3, any.pem ==0.2.4, any.poly ==0.5.1.0, - poly +sparse, any.pretty ==1.1.3.6, any.pretty-show ==1.10, any.prettyprinter ==1.7.1, - prettyprinter -buildreadme +text, any.prettyprinter-ansi-terminal ==1.1.3, any.primitive ==0.9.0.0, any.primitive-addr ==0.1.0.3, @@ -286,14 +222,11 @@ constraints: any.Cabal ==3.10.2.0, any.recv ==0.1.0, any.reducers ==3.12.4, any.reflection ==2.1.8, - reflection -slow +template-haskell, any.regex-base ==0.94.0.2, any.regex-tdfa ==1.3.2.2, - regex-tdfa +doctest -force-o2, any.resource-pool ==0.4.0.0, any.resourcet ==1.3.0, any.retry ==0.9.3.1, - retry -lib-werror, any.rocksdb-haskell-kadena ==1.1.0, rocksdb-haskell-kadena -with-tbb, any.rosetta ==1.0.1, @@ -305,50 +238,38 @@ constraints: any.Cabal ==3.10.2.0, any.sbv ==9.2, any.scheduler ==2.0.0.1, any.scientific ==0.3.8.0, - scientific -integer-simple, any.semialign ==1.3.1, - semialign +semigroupoids, any.semigroupoids ==6.0.1, - semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers, any.semigroups ==0.20, - semigroups +binary +bytestring -bytestring-builder +containers +deepseq +hashable +tagged +template-haskell +text +transformers +unordered-containers, any.semirings ==0.7, - semirings +containers +unordered-containers, any.serialise ==0.2.6.1, - serialise +newtime15, - any.servant ==0.20.2, - any.servant-client ==0.20.2, - any.servant-client-core ==0.20.2, - any.servant-server ==0.20.2, + any.servant ==0.20.1, + any.servant-client ==0.20, + any.servant-client-core ==0.20, + any.servant-server ==0.20, any.sha-validation ==0.1.0.1, any.show-combinators ==0.2.0.0, any.simple-sendfile ==0.2.32, - simple-sendfile +allow-bsd -fallback, any.singleton-bool ==0.1.8, any.socks ==0.6.1, any.some ==1.0.6, - some +newtype-unsafe, any.sop-core ==0.5.0.2, any.split ==0.2.5, any.splitmix ==0.1.0.5, - splitmix -optimised-mixer, any.statistics ==0.16.2.1, any.stm ==2.5.2.1, any.stm-chans ==3.0.0.9, any.stopwatch ==0.1.0.6, - stopwatch -test_delay_upper_bound -test_threaded, any.streaming ==0.2.4.0, any.streaming-commons ==0.2.2.6, - streaming-commons -use-bytestring-builder, any.strict ==0.5.1, any.strict-concurrency ==0.2.4.3, + any.string-conversions ==0.4.0.1, any.syb ==0.7.2.4, + any.system-cxx-std-lib ==1.0, any.tagged ==0.8.8, - tagged +deepseq +transformers, any.tasty ==1.5, - tasty +unix, any.tasty-golden ==2.3.5, - tasty-golden -build-example, any.tasty-hunit ==0.10.2, any.tasty-json ==0.1.0.0, any.tasty-quickcheck ==0.11, @@ -357,81 +278,63 @@ constraints: any.Cabal ==3.10.2.0, any.text ==2.1.1, any.text-iso8601 ==0.1.1, any.text-short ==0.1.6, - text-short -asserts, any.th-abstraction ==0.7.0.0, any.th-compat ==0.1.5, any.th-expand-syns ==0.4.11.0, - any.th-lift ==0.8.5, - any.th-orphans ==0.13.15, + any.th-lift ==0.8.4, + any.th-orphans ==0.13.14, any.th-reify-many ==0.1.10, any.these ==1.2.1, any.time ==1.12.2, any.time-compat ==1.9.7, any.time-locale-compat ==0.1.1.5, - time-locale-compat +old-locale, any.time-manager ==0.1.0, - any.tls ==2.1.2, - tls -devel, - any.tls-session-manager ==0.0.7, + any.tls ==2.1.0, + any.tls-session-manager ==0.0.6, any.token-bucket ==0.1.0.1, - token-bucket +use-cbits, any.torsor ==0.1.0.1, any.transformers ==0.6.1.0, any.transformers-base ==0.4.6, - 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.12.0, + any.typed-process ==0.2.11.1, any.uniplate ==1.6.13, any.unix ==2.8.4.0, - any.unix-compat ==0.7.3, - any.unix-time ==0.4.16, + any.unix-compat ==0.7.2, + any.unix-time ==0.4.15, any.unlifted ==0.2.2.0, any.unliftio ==0.2.25.0, any.unliftio-core ==0.2.1.0, any.unordered-containers ==0.2.20, - unordered-containers -debug, any.utf8-string ==1.0.2, any.uuid ==1.3.16, any.uuid-types ==1.0.6, any.validation ==1.1.3, any.vault ==0.3.1.5, - vault +useghc, - any.vector ==0.13.2.0, - vector +boundschecks -internalchecks -unsafechecks -wall, + any.vector ==0.13.1.0, any.vector-algorithms ==0.9.0.2, - vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks, any.vector-binary-instances ==0.2.5.2, any.vector-sized ==1.6.1, any.vector-stream ==0.1.0.1, any.vector-th-unbox ==0.2.2, any.void ==0.7.3, - void -safe, any.wai ==3.2.4, any.wai-app-static ==3.1.9, - wai-app-static +crypton -print, any.wai-cors ==0.2.7, any.wai-extra ==3.1.15, - wai-extra -build-example, - any.wai-logger ==2.5.0, + any.wai-logger ==2.4.1, any.wai-middleware-throttle ==0.3.0.1, any.wai-middleware-validation ==0.1.0.2, - any.warp ==3.4.3, - warp +allow-sendfilefd -network-bytestring -warp-debug +x509, - any.warp-tls ==3.4.7, + any.warp ==3.4.1, + any.warp-tls ==3.4.6, any.wherefrom-compat ==0.1.1.1, any.wide-word ==0.1.6.0, any.witherable ==0.5, any.word8 ==0.1.3, any.wreq ==0.5.4.3, - wreq -aws -developer +doctest -httpbin, any.yaml ==0.11.11.2, - yaml +no-examples +no-exe, any.yet-another-logger ==0.4.2, - yet-another-logger -tbmqueue, any.zigzag ==0.1.0.0, - any.zlib ==0.7.1.0, - zlib -bundled-c-zlib +non-blocking-ffi +pkg-config -index-state: hackage.haskell.org 2024-11-02T14:34:14Z + any.zlib ==0.7.1.0 +index-state: hackage.haskell.org 2024-11-04T15:41:43Z From 343b6e3d9b2c771bb6a9b757a337fca1ec824e91 Mon Sep 17 00:00:00 2001 From: Lars Kuhtz Date: Mon, 4 Nov 2024 08:49:44 -0800 Subject: [PATCH 5/6] update pact pin --- cabal.project | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cabal.project b/cabal.project index a092a70f46..24684c045b 100644 --- a/cabal.project +++ b/cabal.project @@ -80,7 +80,7 @@ package yet-another-logger source-repository-package type: git location: https://github.com/kadena-io/pact.git - tag: 8d51f4b251c22ecf623a2a49d26016c75bc728fd + tag: 1027a1f5fd0439c58522921e3a0532c4f5867a24 --sha256: 18xgvzb3p8chch85747ln9a2191df09vwwrv9v3njr2h69n3rhxj source-repository-package From cd7b4dc189ea080c71f8e97fe8afff719ecea8ab Mon Sep 17 00:00:00 2001 From: chessai Date: Mon, 4 Nov 2024 10:56:49 -0600 Subject: [PATCH 6/6] update nix hackage index Change-Id: I1f311862b5f2e66d659a17ac40b3d2844218b422 --- cabal.project.freeze | 78 +++++++++++++++++++++----------------------- flake.lock | 6 ++-- 2 files changed, 40 insertions(+), 44 deletions(-) diff --git a/cabal.project.freeze b/cabal.project.freeze index 84b4cdf658..235fa252f3 100644 --- a/cabal.project.freeze +++ b/cabal.project.freeze @@ -26,7 +26,7 @@ constraints: any.Cabal ==3.10.2.0, any.atomic-primops ==0.8.8, any.attoparsec ==0.14.4, any.authenticate-oauth ==1.7, - any.auto-update ==0.2.1, + any.auto-update ==0.2.2, any.base ==4.19.1.0, any.base-compat ==0.14.0, any.base-compat-batteries ==0.14.0, @@ -56,7 +56,7 @@ constraints: any.Cabal ==3.10.2.0, any.cache ==0.1.3.0, any.call-stack ==0.4.0, any.case-insensitive ==1.2.1.0, - any.cassava ==0.5.3.1, + any.cassava ==0.5.3.2, any.cborg ==0.2.10.0, any.cereal ==0.5.8.3, chainweb -debug -ed25519 -ghc-flags, @@ -69,21 +69,21 @@ constraints: any.Cabal ==3.10.2.0, any.code-page ==0.2.1, any.colour ==2.3.6, any.comonad ==5.0.8, - any.conduit ==1.3.5, + any.conduit ==1.3.6, any.configuration-tools ==0.7.0, any.constraints ==0.14.2, any.containers ==0.6.8, any.contiguous ==0.6.4.2, any.contravariant ==1.5.5, any.cookie ==0.5.0, - any.criterion ==1.6.3.0, - any.criterion-measurement ==0.2.2.0, + any.criterion ==1.6.4.0, + any.criterion-measurement ==0.2.3.0, any.crypto-api ==0.13.3, any.crypto-pubkey-types ==0.4.3, - any.crypto-token ==0.1.1, + any.crypto-token ==0.1.2, any.cryptohash-md5 ==0.11.101.0, any.cryptohash-sha1 ==0.11.101.0, - any.crypton ==1.0.0, + any.crypton ==1.0.1, any.crypton-connection ==0.4.1, any.crypton-x509 ==1.7.7, any.crypton-x509-store ==1.6.9, @@ -92,11 +92,8 @@ constraints: any.Cabal ==3.10.2.0, any.cryptonite ==0.30, any.cuckoo ==0.3.1, any.data-bword ==0.1.0.2, - any.data-default ==0.7.1.1, - any.data-default-class ==0.1.2.0, - any.data-default-instances-containers ==0.0.1, - any.data-default-instances-dlist ==0.0.1, - any.data-default-instances-old-locale ==0.0.1, + any.data-default ==0.8.0.0, + any.data-default-class ==0.2.0.0, any.data-dword ==0.3.2.1, any.data-fix ==0.3.4, any.data-ordlist ==0.4.7.0, @@ -116,13 +113,13 @@ constraints: any.Cabal ==3.10.2.0, any.ethereum ==0.1.0.2, ethereum -ethhash -openssl-use-pkg-config, any.exceptions ==0.10.7, - any.fast-logger ==3.2.3, + any.fast-logger ==3.2.5, any.file-embed ==0.0.16.0, any.filepath ==1.4.200.1, any.fingertree ==0.1.5.0, - any.finite-typelits ==0.2.0.1, + any.finite-typelits ==0.2.1.0, any.free ==5.2, - any.generic-data ==1.1.0.0, + any.generic-data ==1.1.0.1, any.generically ==0.1.1, any.ghc-bignum ==1.3, any.ghc-boot-th ==9.8.2, @@ -133,8 +130,8 @@ constraints: any.Cabal ==3.10.2.0, any.growable-vector ==0.1, any.half ==0.3.1, any.hashable ==1.5.0.0, - any.hashes ==0.3.0, - any.haskell-lexer ==1.1.1, + any.hashes ==0.3.0.1, + any.haskell-lexer ==1.1.2, any.haskell-src-exts ==1.23.1, any.haskell-src-meta ==0.8.14, any.heaps ==0.4, @@ -144,9 +141,9 @@ constraints: any.Cabal ==3.10.2.0, any.http-client-tls ==0.3.6.3, any.http-date ==0.0.11, any.http-media ==0.8.1.1, - any.http-semantics ==0.2.0, + any.http-semantics ==0.2.1, any.http-types ==0.12.4, - any.http2 ==5.3.1, + any.http2 ==5.3.4, any.indexed-list-literals ==0.2.1.3, any.indexed-traversable ==0.1.4, any.indexed-traversable-instances ==0.1.2, @@ -154,7 +151,7 @@ constraints: any.Cabal ==3.10.2.0, any.integer-gmp ==1.1, any.integer-logarithms ==1.0.3.1, any.invariant ==0.6.3, - any.iproute ==1.7.14, + any.iproute ==1.7.15, any.ixset-typed ==0.5, any.js-chart ==2.9.4.1, any.kan-extensions ==5.2.6, @@ -177,18 +174,18 @@ constraints: any.Cabal ==3.10.2.0, any.mmorph ==1.2.0, any.mod ==0.2.0.1, any.monad-control ==1.0.3.1, - any.mono-traversable ==1.0.17.0, + any.mono-traversable ==1.0.20.0, any.mtl ==2.3.1, any.mtl-compat ==0.2.2, any.mwc-probability ==2.3.1, any.mwc-random ==0.15.1.0, any.natural-arithmetic ==0.2.1.0, - any.network ==3.1.4.0, + any.network ==3.2.4.0, any.network-byte-order ==0.1.7, any.network-control ==0.1.3, any.network-info ==0.2.1, any.network-uri ==2.6.4.2, - any.nothunks ==0.2.1.1, + any.nothunks ==0.3.0.0, any.old-locale ==1.0.0.7, any.old-time ==1.1.0.4, any.optparse-applicative ==0.18.1.0, @@ -201,7 +198,7 @@ constraints: any.Cabal ==3.10.2.0, any.parallel ==3.2.2.0, any.parsec ==3.1.17.0, any.parser-combinators ==1.3.0, - any.parsers ==0.12.11, + any.parsers ==0.12.12, any.patience ==0.3, any.pem ==0.2.4, any.poly ==0.5.1.0, @@ -243,10 +240,10 @@ constraints: any.Cabal ==3.10.2.0, any.semigroups ==0.20, any.semirings ==0.7, any.serialise ==0.2.6.1, - any.servant ==0.20.1, - any.servant-client ==0.20, - any.servant-client-core ==0.20, - any.servant-server ==0.20, + any.servant ==0.20.2, + any.servant-client ==0.20.2, + any.servant-client-core ==0.20.2, + any.servant-server ==0.20.2, any.sha-validation ==0.1.0.1, any.show-combinators ==0.2.0.0, any.simple-sendfile ==0.2.32, @@ -264,11 +261,10 @@ constraints: any.Cabal ==3.10.2.0, any.streaming-commons ==0.2.2.6, any.strict ==0.5.1, any.strict-concurrency ==0.2.4.3, - any.string-conversions ==0.4.0.1, any.syb ==0.7.2.4, any.system-cxx-std-lib ==1.0, any.tagged ==0.8.8, - any.tasty ==1.5, + any.tasty ==1.5.2, any.tasty-golden ==2.3.5, any.tasty-hunit ==0.10.2, any.tasty-json ==0.1.0.0, @@ -281,16 +277,16 @@ constraints: any.Cabal ==3.10.2.0, any.th-abstraction ==0.7.0.0, any.th-compat ==0.1.5, any.th-expand-syns ==0.4.11.0, - any.th-lift ==0.8.4, - any.th-orphans ==0.13.14, + any.th-lift ==0.8.5, + any.th-orphans ==0.13.15, any.th-reify-many ==0.1.10, any.these ==1.2.1, any.time ==1.12.2, any.time-compat ==1.9.7, any.time-locale-compat ==0.1.1.5, any.time-manager ==0.1.0, - any.tls ==2.1.0, - any.tls-session-manager ==0.0.6, + any.tls ==2.1.3, + any.tls-session-manager ==0.0.7, any.token-bucket ==0.1.0.1, any.torsor ==0.1.0.1, any.transformers ==0.6.1.0, @@ -298,11 +294,11 @@ constraints: any.Cabal ==3.10.2.0, any.transformers-compat ==0.7.2, any.trifecta ==2.1.4, any.tuples ==0.1.0.0, - any.typed-process ==0.2.11.1, + any.typed-process ==0.2.12.0, any.uniplate ==1.6.13, any.unix ==2.8.4.0, - any.unix-compat ==0.7.2, - any.unix-time ==0.4.15, + any.unix-compat ==0.7.3, + any.unix-time ==0.4.16, any.unlifted ==0.2.2.0, any.unliftio ==0.2.25.0, any.unliftio-core ==0.2.1.0, @@ -312,7 +308,7 @@ constraints: any.Cabal ==3.10.2.0, any.uuid-types ==1.0.6, any.validation ==1.1.3, any.vault ==0.3.1.5, - any.vector ==0.13.1.0, + any.vector ==0.13.2.0, any.vector-algorithms ==0.9.0.2, any.vector-binary-instances ==0.2.5.2, any.vector-sized ==1.6.1, @@ -323,11 +319,11 @@ constraints: any.Cabal ==3.10.2.0, any.wai-app-static ==3.1.9, any.wai-cors ==0.2.7, any.wai-extra ==3.1.15, - any.wai-logger ==2.4.1, + any.wai-logger ==2.5.0, any.wai-middleware-throttle ==0.3.0.1, any.wai-middleware-validation ==0.1.0.2, - any.warp ==3.4.1, - any.warp-tls ==3.4.6, + any.warp ==3.4.3, + any.warp-tls ==3.4.7, any.wherefrom-compat ==0.1.1.1, any.wide-word ==0.1.6.0, any.witherable ==0.5, diff --git a/flake.lock b/flake.lock index af40055c27..5a719104cd 100644 --- a/flake.lock +++ b/flake.lock @@ -85,11 +85,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1722385397, - "narHash": "sha256-rccC2HsYG7SUEo5dhLRhwx7RWRotvlzeF/TZ3IU4mZY=", + "lastModified": 1730680170, + "narHash": "sha256-CUPGIJ4PMrGKVC30bZfCrlzvTvlAjvz2bQ091DKqNNk=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "cb8f6dc140b3bcfe14589f5a191fa912bef2464f", + "rev": "3f9db9843a52f45de2e9884838de31fe7c526c75", "type": "github" }, "original": {