Merge 6b04a4e into c50db8f

ChainSafe · Oct 19, 2023 · 3f9a512 · 3f9a512
2 parents c50db8f + 6b04a4e
commit 3f9a512
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 25 deletions.
diff --git a/.github/workflows/test-sim-merge.yml b/.github/workflows/test-sim-merge.yml
@@ -17,9 +17,8 @@ env:
   NETHERMIND_IMAGE: nethermind/nethermind:1.14.3
   MERGEMOCK_IMAGE: g11tech/mergemock:latest
   GETH_WITHDRAWALS_IMAGE: g11tech/geth:withdrawalsfeb8
-  ETHEREUMJS_WITHDRAWALS_IMAGE: g11tech/ethereumjs:blobs-b6b63
+  ETHEREUMJS_BLOBS_IMAGE: ethpandaops/ethereumjs:master-7b4c229
   NETHERMIND_WITHDRAWALS_IMAGE: nethermindeth/nethermind:withdrawals_yolo
-  ETHEREUMJS_BLOBS_IMAGE: g11tech/ethereumjs:blobs-b6b63
 
 jobs:
   sim-merge-tests:
@@ -107,15 +106,16 @@ jobs:
           EL_BINARY_DIR: ${{ env.GETH_WITHDRAWALS_IMAGE }}
           EL_SCRIPT_DIR: gethdocker
 
-      - name: Pull ethereumjs withdrawals
-        run: docker pull $ETHEREUMJS_WITHDRAWALS_IMAGE
+      - name: Pull ethereumjs blobs
+        run: docker pull $ETHEREUMJS_BLOBS_IMAGE
 
-      - name: Test Lodestar <> ethereumjs withdrawals
-        run: yarn test:sim:withdrawals
+      - name: Test Lodestar <> ethereumjs blobs
+        run: yarn test:sim:blobs
         working-directory: packages/beacon-node
         env:
-          EL_BINARY_DIR: ${{ env.ETHEREUMJS_WITHDRAWALS_IMAGE }}
+          EL_BINARY_DIR: ${{ env.ETHEREUMJS_BLOBS_IMAGE }}
           EL_SCRIPT_DIR: ethereumjsdocker
+          DEV_RUN: true
 
       # Disable nethermind build as the withdrawal test config seems to be no
       # longer available, enable after grabbing a build which has one
@@ -130,18 +130,6 @@ jobs:
       #     EL_BINARY_DIR: ${{ env.NETHERMIND_WITHDRAWALS_IMAGE }}
       #     EL_SCRIPT_DIR: netherminddocker
 
-      # Enable the blob sims when stable images
-      # - name: Pull ethereumjs blobs
-      #   run: docker pull $ETHEREUMJS_BLOBS_IMAGE
-
-      # - name: Test Lodestar <> ethereumjs blobs
-      #   run: yarn test:sim:blobs
-      #   working-directory: packages/beacon-node
-      #   env:
-      #     EL_BINARY_DIR: ${{ env.ETHEREUMJS_BLOBS_IMAGE }}
-      #     EL_SCRIPT_DIR: ethereumjsdocker
-      #     DEV_RUN: true
-
       - name: Upload debug log test files
         if: ${{ always() }}
         uses: actions/upload-artifact@v3

diff --git a/packages/beacon-node/test/scripts/el-interop/ethereumjsdocker/post-merge.sh b/packages/beacon-node/test/scripts/el-interop/ethereumjsdocker/post-merge.sh
@@ -5,4 +5,4 @@ currentDir=$(pwd)
 
 . $scriptDir/common-setup.sh
 
-docker run --rm -u $(id -u ${USER}):$(id -g ${USER}) --name custom-execution --network host -v $currentDir/$DATA_DIR:/data $EL_BINARY_DIR --dataDir /data/ethereumjs --gethGenesis /data/genesis.json --rpc --rpcEngine --jwt-secret /data/jwtsecret --logLevel debug --isSingleNode
+docker run --rm -u $(id -u ${USER}):$(id -g ${USER}) --name custom-execution --network host -v $currentDir/$DATA_DIR:/data $EL_BINARY_DIR --dataDir /data/ethereumjs --gethGenesis /data/genesis.json --rpc --rpcEngine --rpcAddr 0.0.0.0 --rpcEngineAddr 0.0.0.0 --jwt-secret /data/jwtsecret --logLevel debug --isSingleNode
diff --git a/packages/beacon-node/test/sim/4844-interop.test.ts b/packages/beacon-node/test/sim/4844-interop.test.ts
@@ -24,7 +24,7 @@ import {logFilesDir} from "./params.js";
 import {shell} from "./shell.js";
 
 // NOTE: How to run
-// DEV_RUN=true EL_BINARY_DIR=g11tech/ethereumjs:devnet6-32aaac EL_SCRIPT_DIR=ethereumjsdocker yarn mocha test/sim/4844-interop.test.ts
+// DEV_RUN=true EL_BINARY_DIR=ethpandaops/ethereumjs:master-7b4c229 EL_SCRIPT_DIR=ethereumjsdocker yarn mocha test/sim/4844-interop.test.ts
 // ```
 
 /* eslint-disable no-console, @typescript-eslint/naming-convention */
@@ -102,7 +102,7 @@ describe("executionEngine / ExecutionEngineHttp", function () {
     // delay a bit so that test is over the startup cpu surge that can cause timeouts
     // somehow this seems to be dependent on the number of the bns we start which calls
     // for some debugging
-    const genesisSlotsDelay = 30;
+    const genesisSlotsDelay = 5;
 
     // On the emprical runs 11 blobs are processed, leaving 3 blobs marging
     const expectedBlobs = 8;
@@ -144,7 +144,7 @@ describe("executionEngine / ExecutionEngineHttp", function () {
       options: {
         api: {rest: {enabled: true} as BeaconRestApiServerOpts},
         sync: {isSingleNode: true},
-        network: {allowPublishToZeroPeers: true, rateLimitMultiplier: 0},
+        network: {allowPublishToZeroPeers: true, rateLimitMultiplier: 0, useWorker: false},
         // Now eth deposit/merge tracker methods directly available on engine endpoints
         eth1: {enabled: false, providerUrls: [engineRpcUrl], jwtSecretHex},
         executionEngine: {urls: [engineRpcUrl], jwtSecretHex},
@@ -203,7 +203,7 @@ describe("executionEngine / ExecutionEngineHttp", function () {
       },
       options: {
         api: {rest: {enabled: false} as BeaconRestApiServerOpts},
-        network: {allowPublishToZeroPeers: true, discv5: null},
+        network: {allowPublishToZeroPeers: true, discv5: null, useWorker: false},
         // Now eth deposit/merge tracker methods directly available on engine endpoints
         eth1: {enabled: false, providerUrls: [engineRpcUrl], jwtSecretHex},
         executionEngine: {urls: [engineRpcUrl], jwtSecretHex},
@@ -237,7 +237,7 @@ describe("executionEngine / ExecutionEngineHttp", function () {
       },
       options: {
         api: {rest: {enabled: false} as BeaconRestApiServerOpts},
-        network: {allowPublishToZeroPeers: true, discv5: null},
+        network: {allowPublishToZeroPeers: true, discv5: null, useWorker: false},
         // Now eth deposit/merge tracker methods directly available on engine endpoints
         eth1: {enabled: false, providerUrls: [engineRpcUrl], jwtSecretHex},
         executionEngine: {urls: [engineRpcUrl], jwtSecretHex},

diff --git a/packages/beacon-node/test/utils/node/beacon.ts b/packages/beacon-node/test/utils/node/beacon.ts
@@ -58,6 +58,7 @@ export async function getDevBeaconNode(
           localMultiaddrs: options.network?.localMultiaddrs || ["/ip4/127.0.0.1/tcp/0"],
           targetPeers: defaultNetworkOptions.targetPeers,
           maxPeers: defaultNetworkOptions.maxPeers,
+          useWorker: options.network?.useWorker ?? defaultNetworkOptions.useWorker,
         },
       } as Partial<IBeaconNodeOptions>,
       options