run with withdrawals include

ChainSafe · Dec 8, 2022 · af4c0c5 · af4c0c5
1 parent d5f4136
commit af4c0c5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/.github/workflows/test-sim-merge.yml b/.github/workflows/test-sim-merge.yml
@@ -14,7 +14,7 @@ env:
   GETH_WITHDRAWALS_IMAGE: g11tech/geth:withdrawals-fix
   ETHEREUMJS_WITHDRAWALS_IMAGE: g11tech/ethereumjs:withdrawals
   NETHERMIND_WITHDRAWALS_IMAGE: nethermindeth/nethermind:withdrawals_yolo
-  GETH_4844_IMAGE: g11tech/geth:4844
+  GETH_4844_IMAGE: g11tech/geth:4844-new
 
 jobs:
   sim-merge-tests:

diff --git a/packages/beacon-node/src/chain/produceBlock/produceBlockBody.ts b/packages/beacon-node/src/chain/produceBlock/produceBlockBody.ts
@@ -222,12 +222,6 @@ export async function produceBlockBody<T extends BlockType>(
             this.metrics?.blockPayload.emptyPayloads.inc({prepType});
           }
 
-          // Capella and later forks have withdrawals on their ExecutionPayload
-          if (fork === ForkName.capella || fork === ForkName.eip4844) {
-            // TODO EIP-4844 Remove this when the EC includes `withdrawals`
-            (blockBody as capella.BeaconBlockBody).executionPayload.withdrawals = [];
-          }
-
           if (fork === ForkName.eip4844) {
             // SPEC: https://github.com/ethereum/consensus-specs/blob/dev/specs/eip4844/validator.md#blob-kzg-commitments
             // After retrieving the execution payload from the execution engine as specified in Bellatrix, use the

diff --git a/packages/beacon-node/test/scripts/el-interop/gethdocker/4844Post.tmpl b/packages/beacon-node/test/scripts/el-interop/gethdocker/4844Post.tmpl
@@ -13,7 +13,8 @@
     "muirGlacierBlock": 0,
     "berlinBlock": 0,
     "londonBlock": 0,
-    "shardingForkBlock": 0,
+    "shanghaiTime": 0,
+    "shardingForkTime": 0,
     "clique": {
       "period": 5,
       "epoch": 30000