Merge branch 'master' into chessai/undo-pretty-json-in-logs

CHANGELOG.md

@@ -1,3 +1,30 @@
+## 2.26.1 (2024-12-03)
+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
+- Update to Pact 4.13.2 [`343b6e3`](https://github.com/kadena-io/chainweb-node/commit/343b6e3d9b2c771bb6a9b757a337fca1ec824e91)
+- Add informative error messages to pact /send API [`bd5d6af`](https://github.com/kadena-io/chainweb-node/commit/bd5d6af959a986cc3cf690e0eb2180d62f78e51e)
+- Increase P2P network resiliency to unreliable nodes [`f784622`](https://github.com/kadena-io/chainweb-node/commit/f7846228795ec93be82ae08ffce60ce4999e19f5)
+- Compute P2P session count in O(1) [`cab1674`](https://github.com/kadena-io/chainweb-node/commit/cab1674ce9e25c2aba3690c219351eb7c049988a)
+- Order P2P peer list by reliability [`c3130c9`](https://github.com/kadena-io/chainweb-node/commit/c3130c995dcb4cd3923d8d6771acd892cf5d18b1)
+- Remove unnecessary performance optimisation in P2P Peer DB update [`b4a4db0`](https://github.com/kadena-io/chainweb-node/commit/b4a4db043fb2a7e1c7665e30f3e31d4f56f7e3ea)
+- Compute P2P peer count using faster monomorphic function [`9a95738`](https://github.com/kadena-io/chainweb-node/commit/9a957388a0fac736abdb45c1cbd0d29694731247)
+- Randomize P2P peer ordering [`a1198fc`](https://github.com/kadena-io/chainweb-node/commit/a1198fc61f6f50ccf8951be4e61d1967b340ed6c)
+- Optimize P2P peer pruning algorithm via set deletion instead of set union [`75ab5b5`](https://github.com/kadena-io/chainweb-node/commit/75ab5b5adc4843084623cfcbba6cb6683a71ac6d)
+- Delete unnecessary indices in the P2P peer db [`5f67ad3`](https://github.com/kadena-io/chainweb-node/commit/5f67ad35a44db0ef05ad77e5d705b3f964ee8b69)
+- Set the HTTP Server header to distinguish between the P2P and Service REST APIs [`4ecc5a9`](https://github.com/kadena-io/chainweb-node/commit/4ecc5a999742e55d61c15d1c42af37362b4d4a23)
+- Support dependency `hashable-1.5.*` [`e5a05c6`](https://github.com/kadena-io/chainweb-node/commit/e5a05c66201a841d20f50babf0b953b9d00594a4)
+- Correct node shutdown message due to old Chainweb version [`c0312c1`](https://github.com/kadena-io/chainweb-node/commit/c0312c13a731b0cf8ac8227e9d18ee51442ac326)
+- Remove redundant dependency on `sbv` [`8d00677`](https://github.com/kadena-io/chainweb-node/commit/8d00677d9f34107849b010d5cd27becdf2dc0852)
+- Split `ea` out into its own executable [`0865649`](https://github.com/kadena-io/chainweb-node/commit/0865649fe6bf68e3ae213dbed522dd14b56ff39b)
+- Split up all `cwtool` subcommands into their own executables. Only include necessary executables into the release. [`0cf12a2`](https://github.com/kadena-io/chainweb-node/commit/0cf12a2975d2b82bd26473d5ddf2dca014c4f5c7)
+- Stop going through PactService to pre-insert check an empty tx batch [`19f7d63`](https://github.com/kadena-io/chainweb-node/commit/19f7d63cce2c5eed0d473047d4169417e61e1735)
+- Update location of `base64-bytestring` dependency to Kadena's fork [`5290cf1`](https://github.com/kadena-io/chainweb-node/commit/5290cf1bc1144524789ce96988428d491090620b)
+- Fix some typos in README.md [`7eea51a`](https://github.com/kadena-io/chainweb-node/commit/7eea51a5ad7b3f15abd6e24a6a6ea36f9868b688)
+
 ## 2.26 (2024-11-13)
 This is a major version update. This release replaces all previous versions.
 

cabal.project

@@ -132,14 +132,6 @@ source-repository-package
     tag: 8b3227c59305f7e5ca6af7c0b9bc5435e78875a0
     --sha256: 08xpx3vwl8w7gn6z9s5smc383b962mxal3nav0fd5qh55yxqsp97
 
--- Patch merged into master (upcoming verison 10.0). We are currently using 9.2.
--- This fork contains additional fixes for using 9.2 with recent compilers.
-source-repository-package
-    type: git
-    location: https://github.com/larskuhtz/sbv
-    tag: 1f2d042718fcf9a140398bd3dedac77c207cce27
-    --sha256: 0l3nhsdxsyx17i29dw691d6bbqz26af6lg6pi1c2kb34v59m2rk3
-
 -- Required for non-canonical decode in base64-bytestring (remove after 2.20 fork)
 source-repository-package
     type: git

cabal.project.freeze

@@ -91,6 +91,7 @@ constraints: any.Cabal ==3.10.2.0,
              any.crypton-x509-validation ==1.6.12,
              any.cryptonite ==0.30,
              any.cuckoo ==0.3.1,
+             cwtools -debug -ed25519 -ghc-flags -remote-db,
              any.data-bword ==0.1.0.2,
              any.data-default ==0.8.0.0,
              any.data-default-class ==0.2.0.0,
@@ -157,7 +158,6 @@ constraints: any.Cabal ==3.10.2.0,
              any.kan-extensions ==5.2.6,
              any.lens ==5.3.2,
              any.lens-aeson ==1.2.3,
-             any.libBF ==0.6.8,
              any.libyaml ==0.1.4,
              any.libyaml-clib ==0.2.5,
              any.lifted-base ==0.2.3.12,
@@ -232,7 +232,6 @@ constraints: any.Cabal ==3.10.2.0,
              any.safe ==0.3.21,
              any.safe-exceptions ==0.1.7.4,
              any.safecopy ==0.10.4.2,
-             any.sbv ==9.2,
              any.scheduler ==2.0.0.1,
              any.scientific ==0.3.8.0,
              any.semialign ==1.3.1,
@@ -295,7 +294,6 @@ constraints: any.Cabal ==3.10.2.0,
              any.trifecta ==2.1.4,
              any.tuples ==0.1.0.0,
              any.typed-process ==0.2.12.0,
-             any.uniplate ==1.6.13,
              any.unix ==2.8.4.0,
              any.unix-compat ==0.7.3,
              any.unix-time ==0.4.16,
@@ -333,4 +331,4 @@ constraints: any.Cabal ==3.10.2.0,
              any.yet-another-logger ==0.4.2,
              any.zigzag ==0.1.0.0,
              any.zlib ==0.7.1.0
-index-state: hackage.haskell.org 2024-11-04T15:41:43Z
+index-state: hackage.haskell.org 2024-12-02T18:43:49Z

chainweb.cabal

@@ -1,7 +1,7 @@
 cabal-version: 3.8
 
 name:         chainweb
-version:      2.26
+version:      2.26.1
 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

cwtools/cwtools.cabal

@@ -1,7 +1,7 @@
 cabal-version: 3.8
 
 name:         cwtools
-version:      2.26
+version:      2.26.1
 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

node/chainweb-node.cabal

@@ -1,7 +1,7 @@
 cabal-version: 3.8
 
 name:         chainweb-node
-version:      2.26
+version:      2.26.1
 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/Sync/WebBlockHeaderStore.hs

@@ -252,11 +252,11 @@ getBlockPayload s candidateStore priority maybeOrigin h = do
     pullOrigin _ k Nothing = do
         logfun Debug $ taskMsg k "no origin"
         return Nothing
-    pullOrigin _ k (Just origin) = do
+    pullOrigin bh k (Just origin) = do
         let originEnv = setResponseTimeout pullOriginResponseTimeout $ peerInfoClientEnv mgr origin
         logfun Debug $ taskMsg k "lookup origin"
         !r <- trace traceLogfun (traceLabel "pullOrigin") k 0
-            $ runClientM (payloadClient v cid k Nothing) originEnv
+            $ runClientM (payloadClient v cid k (Just bh)) originEnv
         case r of
             (Right !x) -> do
                 logfun Debug $ taskMsg k "received from origin"
@@ -268,11 +268,11 @@ getBlockPayload s candidateStore priority maybeOrigin h = do
     -- | Query a block payload via the task queue
     --
     queryPayloadTask :: BlockHeight -> BlockPayloadHash -> IO (Task ClientEnv PayloadData)
-    queryPayloadTask _ k = newTask (sshow k) priority $ \logg env -> do
+    queryPayloadTask bh k = newTask (sshow k) priority $ \logg env -> do
         logg @T.Text Debug $ taskMsg k "query remote block payload"
         let taskEnv = setResponseTimeout taskResponseTimeout env
         !r <- trace traceLogfun (traceLabel "queryPayloadTask") k (let Priority i = priority in i)
-            $ runClientM (payloadClient v cid k Nothing) taskEnv
+            $ runClientM (payloadClient v cid k (Just bh)) taskEnv
         case r of
             (Right !x) -> do
                 logg @T.Text Debug $ taskMsg k "received remote block payload"