Adopt latest changes to requests hash computation

status-im · Nov 22, 2024 · 213c6d3 · 213c6d3
1 parent 7b2b59a
commit 213c6d3
Show file tree

Hide file tree

Showing 8 changed files with 955 additions and 6 deletions.
diff --git a/nimbus/common/chain_config_hash.nim b/nimbus/common/chain_config_hash.nim
@@ -1,5 +1,5 @@
 # Nimbus
-# Copyright (c) 2021-2024 Status Research & Development GmbH
+# Copyright (c) 2024 Status Research & Development GmbH
 # Licensed under either of
 #  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
 #  * MIT license ([LICENSE-MIT](LICENSE-MIT))

diff --git a/nimbus/common/genesis.nim b/nimbus/common/genesis.nim
@@ -16,6 +16,7 @@ import
   eth/common/[hashes, accounts, headers, addresses],
   ../db/[ledger, core_db],
   ../constants,
+  ../utils/utils,
   ./chain_config
 
 # ------------------------------------------------------------------------------
@@ -78,6 +79,10 @@ proc toGenesisHeader*(
     result.excessBlobGas         = Opt.some g.excessBlobGas.get(0'u64)
     result.parentBeaconBlockRoot = Opt.some g.parentBeaconBlockRoot.get(default(Hash32))
 
+  if fork >= Prague:
+    const EmptyRequestsHash = calcRequestsHash()
+    result.requestsHash = Opt.some(EmptyRequestsHash)
+
 proc toGenesisHeader*(
     genesis: Genesis;
     fork: HardFork;

diff --git a/nimbus/utils/utils.nim b/nimbus/utils/utils.nim
@@ -40,7 +40,8 @@ func calcRequestsHash*(requests: varargs[seq[byte]]): Hash32 =
   var ctx: sha256
   ctx.init()
   for i, data in requests:
-    ctx.update(calcHash(i.byte, data).data)
+    if data.len > 0:
+      ctx.update(calcHash(i.byte, data).data)
   ctx.finish(result.data)
   ctx.clear()