status-im · jangko · Jul 8, 2026 · Jun 17, 2026 · Jun 17, 2026 · Jun 22, 2026
diff --git a/Makefile b/Makefile
@@ -137,8 +137,9 @@ endif
 	eest_blockchain \
 	eest_blockchain_test \
 	eest_stateless_execution_test \
+	eest_txpool_test \
 	eest_full_test \
-  eest_tool_test \
+	eest_tool_test \
 	t8n \
 	t8n_test \
 	evmstate \
@@ -438,6 +439,9 @@ eest_blockchain: | build deps
 eest_engine_test: | build deps eest
 	$(ENV_SCRIPT) nim c -r $(NIM_PARAMS) -d:chronicles_enabled:off -o:build/$@ "tests/eest/$@.nim"
 
+eest_txpool_test: | build deps eest
+	$(ENV_SCRIPT) nim c -r $(NIM_PARAMS) -d:chronicles_enabled:off -o:build/$@ "tests/eest/$@.nim"
+
 eest_blockchain_test: | build deps eest
 	$(ENV_SCRIPT) nim c -r $(NIM_PARAMS) -d:chronicles_enabled:off -o:build/$@ "tests/eest/$@.nim"
 
@@ -451,6 +455,7 @@ eest_full_test: | build deps eest
 eest_tool_test: | build deps eest
 	$(ENV_SCRIPT) nim c $(NIM_PARAMS) -d:chronicles_enabled:off -o:build/$@ "tests/eest/eest_tool_tests.nim"
 	build/$@
+
 # builds transition tool
 t8n: | build deps
 	$(ENV_SCRIPT) nim c $(NIM_PARAMS) $(T8N_PARAMS) "tools/t8n/$@.nim"

diff --git a/execution_chain/beacon/api_handler/api_forkchoice.nim b/execution_chain/beacon/api_handler/api_forkchoice.nim
@@ -214,7 +214,7 @@ proc forkchoiceUpdated*(ben: BeaconEngineRef,
     let attrs = attrsOpt.value
     validateVersion(attrs, com, apiVersion)
 
-    let bundle = ben.generateExecutionBundle(attrs).valueOr:
+    let bundle = ben.generateExecutionBundle(headHash, attrs).valueOr:
       error "Failed to create sealing payload", err = error
       raise invalidAttr(error)
 

diff --git a/execution_chain/beacon/api_handler/api_newpayload.nim b/execution_chain/beacon/api_handler/api_newpayload.nim
@@ -127,11 +127,22 @@ func validateExecutionRequest(blockHash: Hash32,
       raise invalidParams("newPayload" & $apiVersion &
         ": " & "Empty data for request type " & $requestType)
 
-    if requestType notin [
-       DEPOSIT_REQUEST_TYPE,
-       WITHDRAWAL_REQUEST_TYPE,
-       CONSOLIDATION_REQUEST_TYPE]:
-      return Opt.some(invalidStatus(blockHash, "Invalid execution request type" & $requestType))
+    if apiVersion >= Version.V5:
+      if requestType notin [
+        DEPOSIT_REQUEST_TYPE,
+        WITHDRAWAL_REQUEST_TYPE,
+        CONSOLIDATION_REQUEST_TYPE,
+        BUILDER_DEPOSIT_REQUEST_TYPE,
+        BUILDER_EXIT_REQUEST_TYPE]:
+        return Opt.some(invalidStatus(blockHash,
+          "newPayload" & $apiVersion & ": Invalid execution request type" & $requestType))
+    else:
+      if requestType notin [
+        DEPOSIT_REQUEST_TYPE,
+        WITHDRAWAL_REQUEST_TYPE,
+        CONSOLIDATION_REQUEST_TYPE]:
+        return Opt.some(invalidStatus(blockHash,
+          "newPayload" & $apiVersion & ": Invalid execution request type" & $requestType))
 
     previousRequestType = requestType.int
   err()

diff --git a/execution_chain/beacon/beacon_engine.nim b/execution_chain/beacon/beacon_engine.nim
@@ -85,10 +85,12 @@ const
 
 func setWithdrawals(xp: TxPoolRef, attrs: PayloadAttributes) =
   case attrs.version
-  of Version.V2, Version.V3:
-    xp.withdrawals = ethWithdrawals attrs.withdrawals.get
-  else:
+  of Version.V1:
     xp.withdrawals = @[]
+  of Version.V2 .. Version.V4:
+    xp.withdrawals = ethWithdrawals attrs.withdrawals.get
+  of Version.V5, Version.V6:
+    raiseAssert "unreachable: PayloadAttributes has no V5/V6 variant"
 
 template wrapException(body: untyped): auto =
   try:
@@ -148,17 +150,23 @@ func getPayloadBundle*(ben: BeaconEngineRef, id: Bytes8): Opt[ExecutionBundle] =
 # ------------------------------------------------------------------------------
 proc generateExecutionBundle*(
   ben: BeaconEngineRef,
+  headHash: Hash32,
   attrs: PayloadAttributes
 ): Result[ExecutionBundle, string] =
 
   wrapException:
     let
       xp  = ben.txPool
-      headBlock = ben.chain.latestHeader
+      # Build on the forkchoiceUpdated headBlockHash: `chain.latest` tracks the
+      # most recently imported block, which may be a sibling of the requested
+      # head when multiple valid payloads exist at the same height.
+      headBlock = ben.chain.headerByHash(headHash).valueOr:
+        return err("payload build parent not found: " & headHash.short)
 
     xp.prevRandao   = attrs.prevRandao
     xp.timestamp    = ethTime attrs.timestamp
     xp.feeRecipient = attrs.suggestedFeeRecipient
+    xp.targetGasLimit = u64 attrs.targetGasLimit
 
     if attrs.parentBeaconBlockRoot.isSome:
       xp.parentBeaconBlockRoot = attrs.parentBeaconBlockRoot.get
@@ -173,7 +181,8 @@ proc generateExecutionBundle*(
 
     # someBaseFee = true: make sure bundle.blk.header
     # have the same blockHash with generated payload
-    let bundle = xp.assembleBlock(someBaseFee = true).valueOr:
+    let bundle = xp.assembleBlock(someBaseFee = true,
+                                  parentHash = headHash).valueOr:
       return err(error)
 
     if bundle.blk.header.extraData.len > 32:

diff --git a/execution_chain/block_access_list/bal_tracker.nim b/execution_chain/block_access_list/bal_tracker.nim
@@ -434,11 +434,11 @@ proc handleInTransactionSelfDestruct*(
     tracker.pendingCallFrame.storageReads.incl(storageKey)
     tracker.pendingCallFrame.storageChanges.del(storageKey)
 
-  tracker.pendingCallFrame.balanceChanges.del(address)
   tracker.pendingCallFrame.nonceChanges.del(address)
   tracker.pendingCallFrame.codeChanges.del(address)
-
-  tracker.trackBalanceChange(address, 0.u256)
+
+  tracker.trackNonceChange(address, 0)
+  tracker.trackCodeChange(address, @[])
 
 proc normalizePendingCallFrameChanges*(tracker: BlockAccessListTrackerRef) =
   ## Normalize balance, nonce, code and storage changes for the current

diff --git a/execution_chain/common/common.nim b/execution_chain/common/common.nim
@@ -444,6 +444,11 @@ func isOsakaOrLater*(com: CommonRef, t: EthTime): bool =
 func isAmsterdamOrLater*(com: CommonRef, t: EthTime): bool =
   com.config.amsterdamTime.isSome and t >= com.config.amsterdamTime.value
 
+func amsterdamTransition*(com: CommonRef, parentTime, t: EthTime): bool =
+  com.config.amsterdamTime.isSome and
+    t >= com.config.amsterdamTime.value and
+    parentTime < com.config.amsterdamTime.value
+
 func isBogotaOrLater*(com: CommonRef, t: EthTime): bool =
   com.config.bogotaTime.isSome and t >= com.config.bogotaTime.value
 

diff --git a/execution_chain/common/genesis.nim b/execution_chain/common/genesis.nim
@@ -15,6 +15,7 @@ import
   eth/eip1559,
   eth/common/[blocks, hashes, accounts, headers, addresses],
   ../db/[ledger, core_db],
+  ../core/eip7997,
   ../constants,
   ../utils/utils,
   ./chain_config
@@ -23,7 +24,7 @@ import
 # Public functions
 # ------------------------------------------------------------------------------
 
-proc writeGenesisAlloc*(alloc: GenesisAlloc, db: CoreDbTxRef): Hash32 =
+proc writeGenesisAlloc*(alloc: GenesisAlloc, db: CoreDbTxRef, enableEIP7997: bool = false): Hash32 =
   let ledger = LedgerRef.init(db)
 
   for address, account in alloc:
@@ -34,6 +35,9 @@ proc writeGenesisAlloc*(alloc: GenesisAlloc, db: CoreDbTxRef): Hash32 =
     for k, v in account.storage:
       ledger.setStorage(address, k, v)
 
+  if enableEIP7997:
+    ledger.applyEip7997()
+
   ledger.persist()
   ledger.getStateRoot()
 
@@ -43,7 +47,7 @@ proc writeGenesis*(g: Genesis, db: CoreDbTxRef, fork: HardFork): Header =
   ##
   ## The function returns the `Genesis` block header.
   ##
-  let stateRoot = writeGenesisAlloc(g.alloc, db)
+  let stateRoot = writeGenesisAlloc(g.alloc, db, fork >= Amsterdam)
 
   result = Header(
     nonce: g.nonce,
@@ -53,7 +57,7 @@ proc writeGenesis*(g: Genesis, db: CoreDbTxRef, fork: HardFork): Header =
     difficulty: g.difficulty,
     mixHash: g.mixHash,
     coinbase: g.coinbase,
-    stateRoot:stateRoot,
+    stateRoot: stateRoot,
     parentHash: GENESIS_PARENT_HASH,
     transactionsRoot: EMPTY_ROOT_HASH,
     receiptsRoot: EMPTY_ROOT_HASH,

diff --git a/execution_chain/conf.nim b/execution_chain/conf.nim
@@ -132,8 +132,8 @@ type
 
     gasLimit* {.
       desc: "Desired gas limit when building an execution payload"
-      defaultValue: DEFAULT_GAS_LIMIT
-      name: "gas-limit" .}: uint64
+      defaultValue: none(uint64)
+      name: "gas-limit" .}: Option[uint64]
 
     # https://eips.ethereum.org/EIPS/eip-7872
     maxBlobs* {.

diff --git a/execution_chain/constants.nim b/execution_chain/constants.nim
@@ -66,18 +66,18 @@ const
   # size when creating a new contract.
   EIP3860_MAX_INITCODE_SIZE* =              2 * EIP170_MAX_CODE_SIZE
 
-  # See https://eips.ethereum.org/EIPS/eip-7954. 
-  # - Update contract code size limit of 24KiB(0x6000 bytes) to 32KiB(0x8000 bytes).
-  # - Update initcode size limit of 48KiB(0xC000 bytes) to 64KiB(0x10000 bytes).
-  EIP7954_MAX_CODE_SIZE* =                  0x8000
-  EIP7954_MAX_INITCODE_SIZE* =              0x10000
+  # See https://eips.ethereum.org/EIPS/eip-7954.
+  # - Update contract code size limit of 24KiB(0x6000 bytes) to 64KiB(0x10000 bytes).
+  # - Update initcode size limit of 48KiB(0xC000 bytes) to 128KiB(0x20000 bytes).
+  EIP7954_MAX_CODE_SIZE* =                  0x10000
+  EIP7954_MAX_INITCODE_SIZE* =              2 * EIP7954_MAX_CODE_SIZE
 
   # See EIP-7702 (https://eips.ethereum.org/EIPS/eip-7702). When an EOA delegates
   # via a SETCODE transaction its code is set to a "delegation designator": the
   # 3-byte prefix 0xef0100 followed by the 20-byte delegate address (23 bytes).
   EIP7702_DELEGATION_PREFIX* =              [0xEF.byte, 0x01, 0x00]
   EIP7702_DELEGATION_SIZE* =                23
-  
+
   # EIP
   MaxPrecompilesAddr* =                     0xFFFF
 
@@ -118,6 +118,8 @@ const
   HISTORY_STORAGE_ADDRESS* = address"0x0000F90827F1C53a10cb7A02335B175320002935"
   WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS* = address"0x00000961Ef480Eb55e80D19ad83579A64c007002"
   CONSOLIDATION_REQUEST_PREDEPLOY_ADDRESS* = address"0x0000BBdDc7CE488642fb579F8B00f3a590007251"
+  BUILDER_DEPOSIT_CONTRACT_ADDRESS* = address"0x0000884D2AA32EAA155F59A2F24EFA73D9008282"
+  BUILDER_EXIT_CONTRACT_ADDRESS* = address"0x000014574A74C805590AFF9499FC7A690F008282"
 
   MAX_BLOCK_SIZE* = 10_485_760  # 10 MiB
   SAFETY_MARGIN* = 2_097_152  # 2 MiB

diff --git a/execution_chain/core/eip7997.nim b/execution_chain/core/eip7997.nim
@@ -0,0 +1,34 @@
+# Nimbus
+# Copyright (c) 2026 Status Research & Development GmbH
+# Licensed under either of
+#  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
+#    http://www.apache.org/licenses/LICENSE-2.0)
+#  * MIT license ([LICENSE-MIT](LICENSE-MIT) or
+#    http://opensource.org/licenses/MIT)
+# at your option. This file may not be copied, modified, or distributed except
+# according to those terms.
+
+{.push raises: [], gcsafe.}
+
+import
+  eth/common/[addresses, hashes],
+  stew/byteutils,
+  ../db/ledger
+
+const
+  FactoryAddress = address"0x4e59b44847b379578588920cA78FbF26c0B4956C"
+  FactoryCode = hexToSeqByte"0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03601600081602082378035828234f58015156039578182fd5b8082525050506014600cf3"
+  FactoryCodeHash = hashes.keccak256(FactoryCode)
+
+proc applyEip7997*(ledger: LedgerRef) =
+  let codeHash = ledger.getCodeHash(FactoryAddress)
+  if codeHash == FactoryCodeHash:
+    # It's a no-op on chain that already have factory at the FactoryAddress.
+    return
+
+  # Although this code only called once during fork transition,
+  # if using the constant above, sometimes it will crash
+  # when interacting with CodeBytesRef sink in test environment.
+  let factoryCode = FactoryCode
+  ledger.setCode(FactoryAddress, factoryCode)
+  ledger.setNonce(FactoryAddress, 1)
diff --git a/execution_chain/core/eip8037.nim b/execution_chain/core/eip8037.nim
@@ -12,10 +12,11 @@
 const
   STATE_BYTES_PER_NEW_ACCOUNT* = 120
   STATE_BYTES_PER_AUTH_BASE* = 23
-  REGULAR_PER_AUTH_BASE_COST* = 7500
+  REGULAR_PER_AUTH_BASE_COST* = 7816
   STATE_BYTES_PER_STORAGE_SET* = 64
   COST_PER_STATE_BYTE* = 1530
   CREATE_ACCOUNT_STATE_GAS* = COST_PER_STATE_BYTE * STATE_BYTES_PER_NEW_ACCOUNT
   STATE_GAS_STORAGE_SET* = COST_PER_STATE_BYTE * STATE_BYTES_PER_STORAGE_SET
   SYSTEM_MAX_SSTORES_PER_CALL = 16
   SYSTEM_STATE_GAS_RESERVOIR* = STATE_BYTES_PER_STORAGE_SET * COST_PER_STATE_BYTE * SYSTEM_MAX_SSTORES_PER_CALL
+  AUTH_BASE_STATE_GAS* = STATE_BYTES_PER_AUTH_BASE * COST_PER_STATE_BYTE