merge master into evm/main #2278

Author: larskuhtz

CHANGELOG.md

@@ -1,3 +1,33 @@
+## 2.23.2 (2025-10-22)
+This is a minor point release. Upgrading is **strongly recommended**.
+
+To upgrade, pull the latest docker image, or download the binary and
+restart the node with the same configuration file as before.
+
+### Changes
+- Limit sizes of response bodies coming from peers [`a07cc75`](https://github.com/kadena-io/chainweb-node/commit/a07cc756167340b2ee6362d42da21a5a64b83070)
+- Add more logging to the mempool [`f864fa1`](https://github.com/kadena-io/chainweb-node/commit/f864fa1a8af4c3d6a55a5b52f142afd91c2ddf9f)
+
+## 2.31.1 (2025-10-09)
+This is a minor point release. Upgrading is **strongly recommended**.
+
+To upgrade, pull the latest docker image, or download the binary and
+restart the node with the same configuration file as before.
+
+### Changes
+- Properly update service date in mainnet and testnet. [`0abf6e3`](https://github.com/kadena-io/chainweb-node/commit/0abf6e3df6f8c02ff084a4f07cf6f8f09e5d64e4)
+
+## 2.31 (2025-10-06)
+This is a major version update. This release replaces all previous versions.
+
+Any prior version will stop working on **2025-10-15T00:00:00Z**. Node administrators must
+upgrade to this version before that date. The 2.31 feature upgrade will
+occur at block height 6269344 which is estimated to be mined at **2025-10-16T00-00-00Z**.
+
+### Changes
+- Upgrade to Pact 5.4 [`937b13a`](https://github.com/kadena-io/chainweb-node/commit/937b13ae8b9624df03b8f850baab3bbfaf35a598)
+- SPV Proof roots now expire after 20,000 blocks. [`138578c`](https://github.com/kadena-io/chainweb-node/commit/138578cf9a40b0593ee15fb2adc74500991eafd6)
+
 ## 2.30 (2025-07-07)
 This is a major version update. This release replaces all previous versions.
 

cabal.project

@@ -119,8 +119,8 @@ source-repository-package
 source-repository-package
     type: git
     location: https://github.com/kadena-io/kadena-ethereum-bridge.git
-    tag: 7e0adf227b5a9c335c3c3840aba36252356c7225
-    --sha256: 1knhscph2g3saz0pjd1d5a32mr281msapccfrillgd2qk4pj7xjc
+    tag: 96bff6b35b2a2b6bf63f9d19b536f0c61102be36
+    --sha256: 0czl48hhlk8fl63jprg719x3ngrinhj6xs5rqm9cfzpcygp4wz4q
 
 source-repository-package
     type: git

cabal.project.freeze

@@ -93,7 +93,7 @@ constraints: any.Cabal ==3.12.1.0 || ==3.14.2.0,
              any.character-ps ==0.1,
              any.charset ==0.3.12,
              any.chronos ==1.1.7.0,
-             any.citeproc ==0.10,
+             any.citeproc ==0.11,
              citeproc -executable -icu,
              any.clock ==0.8.4,
              clock -llvm,
@@ -132,11 +132,9 @@ constraints: any.Cabal ==3.12.1.0 || ==3.14.2.0,
              any.crypton-socks ==0.6.2,
              crypton-socks -example +network-3-0-0-0,
              any.crypton-x509 ==1.7.7,
-             any.crypton-x509-store ==1.6.11,
+             any.crypton-x509-store ==1.6.12,
              any.crypton-x509-system ==1.6.7,
              any.crypton-x509-validation ==1.6.14,
-             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,
              cwtools -debug -ed25519 -ghc-flags -remote-db,
              any.data-bword ==0.1.0.2,
              any.data-default ==0.8.0.1,
@@ -170,7 +168,7 @@ constraints: any.Cabal ==3.12.1.0 || ==3.14.2.0,
              entropy -donotgetentropy,
              any.erf ==2.0.0.0,
              any.errors ==2.3.0,
-             any.ethereum ==0.1.0.2,
+             any.ethereum ==0.1.1,
              ethereum -ethhash -openssl-use-pkg-config,
              any.exceptions ==0.10.9,
              any.extra ==1.8,
@@ -299,10 +297,10 @@ 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.8.2,
+             any.pandoc ==3.8.2.1,
              pandoc -embed_data_files,
              any.pandoc-types ==1.23.1,
-             any.parallel ==3.2.2.0,
+             any.parallel ==3.3.0.0,
              any.parsec ==3.1.18.0,
              any.parser-combinators ==1.3.0,
              parser-combinators -dev,
@@ -314,7 +312,7 @@ constraints: any.Cabal ==3.12.1.0 || ==3.14.2.0,
              poly +sparse,
              any.pretty ==1.1.3.6,
              any.pretty-show ==1.10,
-             any.pretty-simple ==4.1.3.0,
+             any.pretty-simple ==4.1.4.0,
              pretty-simple -buildexample +buildexe,
              any.prettyprinter ==1.7.1,
              prettyprinter -buildreadme +text,
@@ -393,14 +391,14 @@ constraints: any.Cabal ==3.12.1.0 || ==3.14.2.0,
              any.split ==0.2.5,
              any.splitmix ==0.1.3.1,
              splitmix -optimised-mixer,
-             any.statistics ==0.16.3.0,
+             any.statistics ==0.16.4.0,
              statistics -benchpapi,
              any.stm ==2.5.3.1,
              any.stm-chans ==3.0.0.9,
              any.stopwatch ==0.1.0.7,
              stopwatch -test_delay_upper_bound -test_threaded,
              any.streaming ==0.2.4.0,
-             any.streaming-commons ==0.2.3.0,
+             any.streaming-commons ==0.2.3.1,
              streaming-commons -use-bytestring-builder,
              any.strict ==0.5.1,
              any.syb ==0.7.3,
@@ -442,7 +440,7 @@ constraints: any.Cabal ==3.12.1.0 || ==3.14.2.0,
              any.time-locale-compat ==0.1.1.5,
              time-locale-compat +old-locale,
              any.time-manager ==0.2.3,
-             any.tls ==2.1.11,
+             any.tls ==2.1.12,
              tls -devel,
              any.tls-session-manager ==0.0.8,
              any.token-bucket ==0.1.0.1,
@@ -462,7 +460,7 @@ constraints: any.Cabal ==3.12.1.0 || ==3.14.2.0,
              any.typst-symbols ==0.1.8.1,
              any.unicode-collation ==0.1.3.6,
              unicode-collation -doctests -executable,
-             any.unicode-data ==0.6.0,
+             any.unicode-data ==0.8.0,
              unicode-data -dev-has-icu,
              any.unicode-transforms ==0.4.0.1,
              unicode-transforms -bench-show -dev -has-icu -has-llvm -use-gauge,
@@ -521,4 +519,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 2025-10-09T04:46:48Z
+index-state: hackage.haskell.org 2025-10-28T19:25:40Z

chainweb.cabal

@@ -1,7 +1,7 @@
 cabal-version: 3.8
 
 name:         chainweb
-version:      2.30
+version:      2.31.2
 synopsis:     A Proof-of-Work Parallel-Chain Architecture for Massive Throughput
 description:  A Proof-of-Work Parallel-Chain Architecture for Massive Throughput.
 homepage:     https://github.com/kadena-io/chainweb
@@ -159,6 +159,7 @@ library
         , Chainweb.BlockHeader.Genesis.Mainnet10to19Payload
         , Chainweb.BlockHeader.Validation
         , Chainweb.BlockHeaderDB
+        , Chainweb.BlockHeaderDB.HeaderOracle
         , Chainweb.BlockHeaderDB.Internal
         , Chainweb.BlockHeaderDB.PruneForks
         , Chainweb.BlockHeaderDB.RemoteDB
@@ -290,6 +291,7 @@ library
         , Chainweb.VerifierPlugin.Hyperlane.Message.After225
         , Chainweb.VerifierPlugin.Hyperlane.Message.Before225
         , Chainweb.VerifierPlugin.Hyperlane.Utils
+        , Chainweb.VerifierPlugin.SignedList
         , Chainweb.Version
         , Chainweb.Version.Development
         , Chainweb.Version.EvmDevelopment
@@ -581,7 +583,7 @@ library chainweb-test-utils
         , pact-time:numeric >=0.3.0.1
         , pact-tng >=5.0
         , pact-tng:pact-request-api >=5.0
-        , property-matchers ^>= 0.7
+        , property-matchers
         , quickcheck-instances >= 0.3
         , random >= 1.3
         , resourcet >= 1.3
@@ -673,6 +675,8 @@ test-suite chainweb-tests
         Chainweb.Test.Pact4.SQLite
         Chainweb.Test.Pact4.TransactionTests
         Chainweb.Test.Pact4.VerifierPluginTest
+        Chainweb.Test.Pact.SignedListPluginTests
+        Chainweb.Test.ResponseSizeLimiter
         Chainweb.Test.RestAPI
         Chainweb.Test.Roundtrips
         -- Chainweb.Test.SPV
@@ -738,7 +742,8 @@ test-suite chainweb-tests
         , pact-tng:test-utils
         , pact-tng:pact-repl
         , prettyprinter
-        , property-matchers ^>= 0.7
+        , property-matchers
+        , pretty-show
         , quickcheck-instances >= 0.3
         , random >= 1.3
         , random-shuffle >= 0.0.4
@@ -763,6 +768,7 @@ test-suite chainweb-tests
         , unordered-containers >= 0.2.20
         , vector >= 0.12.2
         , wai >= 3.2
+        , wai-extra >= 3.1
         , warp >= 3.3.6
         , warp-tls >= 3.4
     if flag(ed25519)
@@ -926,6 +932,7 @@ benchmark bench
         , property-matchers >= 0.7
         , text >= 2.0
         , vector >= 0.12.2
+        , yaml >= 0.11
 
         -- The build of all Pact related benchmarks is currently broken in the
         -- evm branch and the build of the respective modules is disable. The
@@ -948,4 +955,3 @@ benchmark bench
         -- , tasty-hunit
         -- , unordered-containers
         -- , yaml >= 0.11
-

cwtools/cwtools.cabal

@@ -1,7 +1,7 @@
 cabal-version: 3.8
 
 name:         cwtools
-version:      2.30
+version:      2.31.2
 synopsis:     A collection of various tools for Chainweb users and developers.
 description:  A collection of various tools for Chainweb users and developers.
 homepage:     https://github.com/kadena-io/chainweb

default.nix

@@ -77,6 +77,8 @@ let haskellSrc = with nix-filter.lib; filter {
         zlib
         pkg-config
         sqlite
+      ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [
+         pkgs.darwin.apple_sdk.frameworks.Security
       ];
       modules = [
         {

node/chainweb-node.cabal

@@ -1,7 +1,7 @@
 cabal-version: 3.8
 
 name:         chainweb-node
-version:      2.30
+version:      2.31.2
 synopsis:     A Proof-of-Work Parallel-Chain Architecture for Massive Throughput
 description:  A Proof-of-Work Parallel-Chain Architecture for Massive Throughput.
 homepage:     https://github.com/kadena-io/chainweb

src/Chainweb/BlockHeaderDB/HeaderOracle.hs

@@ -0,0 +1,129 @@
+{-# language
+    DerivingStrategies
+    , ImportQualifiedPost
+    , LambdaCase
+    , OverloadedRecordDot
+    , RecordWildCards
+    , ScopedTypeVariables
+    , TypeApplications
+#-}
+
+module Chainweb.BlockHeaderDB.HeaderOracle
+    (
+        -- * Oracle type
+        HeaderOracle
+        -- ** Accessors
+        , lowerBound
+        , upperBound
+
+        -- * Oracle creation
+        , create
+        , createSpv
+        -- ** Oracle creation Exceptions
+        , InvalidHeaderOracleBounds(..)
+
+        -- * Oracle querying
+        , query
+        , HeaderOracleResponse(..)
+    )
+    where
+
+import Chainweb.BlockHash (BlockHash)
+import Chainweb.BlockHeader (BlockHeader, blockHash, blockHeight, genesisBlockHeader)
+import Chainweb.BlockHeaderDB (BlockHeaderDb)
+import Chainweb.TreeDB (seekAncestor)
+import Chainweb.TreeDB qualified as TreeDB
+import Chainweb.Version
+import Chainweb.Version.Guards (minimumBlockHeaderHistory)
+import Control.Exception (Exception(..), throwIO)
+import Control.Lens (view)
+import Numeric.Natural (Natural)
+
+-- | A 'HeaderOracle' is a 'BlockHeaderDb' with a lower and upper bound, and the only
+--   query on it is whether a given block is within those bounds.
+data HeaderOracle = HeaderOracle
+    { lowerBound :: !BlockHeader
+    , upperBound :: !BlockHeader
+    , db :: !BlockHeaderDb
+    }
+
+-- | Create a new 'HeaderOracle' specifically for SPV verification, with the given upper bound.
+--
+--   The lower bound of the oracle is determined by the 'spvProofExpirationWindow'.
+createSpv :: HasVersion => BlockHeaderDb -> BlockHeader -> IO HeaderOracle
+createSpv db upperBound = do
+    let mWindow = minimumBlockHeaderHistory (view blockHeight upperBound)
+    let gh = genesisBlockHeader upperBound
+    let defaultOracle = create db gh upperBound
+
+    case mWindow of
+        Nothing -> do
+            defaultOracle
+        Just window -> do
+            mWindowthAncestor <- do
+                let w = fromIntegral @_ @Natural window
+                let ur = TreeDB.rank upperBound
+                let gr = TreeDB.rank gh
+                -- Saturated subtraction with the genesis rank as origin
+                if w + gr <= ur
+                then do
+                    seekAncestor db upperBound (ur - w)
+                else do
+                    return Nothing
+            case mWindowthAncestor of
+                Nothing -> do
+                    defaultOracle
+                Just windowthAncestor -> do
+                    create db windowthAncestor upperBound
+
+-- | Exception thrown when creating a new 'HeaderOracle' with invalid bounds.
+data InvalidHeaderOracleBounds = InvalidHeaderOracleBounds !BlockHash !BlockHash
+    deriving stock (Eq, Show)
+
+instance Exception InvalidHeaderOracleBounds where
+    displayException (InvalidHeaderOracleBounds l u) = "Header Oracle `create` called with a (lower, upper) pair, where `lower` is not an ancestor of `upper`: " ++ show (l, u)
+
+-- | Create a new 'HeaderOracle' with the given lower and upper bounds.
+--
+--   Throws an 'InvalidHeaderOracleBounds' exception if the lower bound is not an ancestor of the upper bound.
+create :: HasVersion => BlockHeaderDb -> BlockHeader -> BlockHeader -> IO HeaderOracle
+create db lowerBound upperBound = do
+    valid <- TreeDB.ancestorOf db (view blockHash lowerBound) (view blockHash upperBound)
+    if valid
+    then do
+        return HeaderOracle
+            { ..
+            }
+    else do
+        throwIO $ InvalidHeaderOracleBounds (view blockHash lowerBound) (view blockHash upperBound)
+
+-- | The response from the oracle when querying a block.
+--
+--   We would ideally like something like
+--   @
+--   data Response = TooLate | OutOfBounds | InBounds
+--   @
+--   but shallow nodes can't determine the difference between something
+--   that is too late and something that is out of bounds.
+data HeaderOracleResponse
+    = OutOfBounds
+        -- ^ The block is not within the oracle's bounds.
+    | InBounds
+        -- ^ The block is within the oracle's bounds.
+    deriving stock (Eq)
+
+-- | Query the oracle, asking if the block is within its bounds.
+query
+    :: HasVersion
+    => HeaderOracle
+    -> BlockHash
+    -> IO HeaderOracleResponse
+query oracle subject = do
+    -- Check if the lower bound is an ancestor of the header
+    -- Check if the header is an ancestor of the upper bound
+    r <- (&&)
+        <$> TreeDB.ancestorOf oracle.db (view blockHash oracle.lowerBound) subject
+        <*> TreeDB.ancestorOf oracle.db subject (view blockHash oracle.upperBound)
+    return $ if r
+        then InBounds
+        else OutOfBounds

src/Chainweb/BlockHeaderDB/PruneForks.hs

@@ -80,7 +80,7 @@ import Chainweb.Cut
 import Chainweb.CutDB
 import Control.Monad.Cont
 import Data.Void (Void)
-import Data.Foldable (toList)
+import Data.Foldable
 import Data.Functor ((<&>))
 import Data.Ord
 import Control.Concurrent