fix merge tests

ChainSafe · Aug 18, 2023 · 3052790 · 3052790
1 parent df8b3e7
commit 3052790
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/packages/beacon-node/src/execution/engine/types.ts b/packages/beacon-node/src/execution/engine/types.ts
@@ -104,7 +104,8 @@ export type EngineApiRpcReturnTypes = {
 
 type ExecutionPayloadRpcWithValue = {
   executionPayload: ExecutionPayloadRpc;
-  executionPayloadValue: QUANTITY;
+  // even though CL tracks this as executionPayloadValue, EL returns this as blockValue
+  blockValue: QUANTITY;
   blobsBundle?: BlobsBundleRpc;
 };
 type ExecutionPayloadResponse = ExecutionPayloadRpc | ExecutionPayloadRpcWithValue;
@@ -200,7 +201,7 @@ export function serializeVersionedHashes(vHashes: VersionedHashes): VersionedHas
 }
 
 export function hasPayloadValue(response: ExecutionPayloadResponse): response is ExecutionPayloadRpcWithValue {
-  return (response as ExecutionPayloadRpcWithValue).executionPayloadValue !== undefined;
+  return (response as ExecutionPayloadRpcWithValue).blockValue !== undefined;
 }
 
 export function parseExecutionPayload(
@@ -211,7 +212,7 @@ export function parseExecutionPayload(
   let executionPayloadValue: Wei;
   let blobsBundle: BlobsBundle | undefined;
   if (hasPayloadValue(response)) {
-    executionPayloadValue = quantityToBigint(response.executionPayloadValue);
+    executionPayloadValue = quantityToBigint(response.blockValue);
     data = response.executionPayload;
     blobsBundle = response.blobsBundle ? parseBlobsBundle(response.blobsBundle) : undefined;
   } else {

diff --git a/packages/beacon-node/test/sim/withdrawal-interop.test.ts b/packages/beacon-node/test/sim/withdrawal-interop.test.ts
@@ -27,7 +27,7 @@ import {logFilesDir} from "./params.js";
 import {shell} from "./shell.js";
 
 // NOTE: How to run
-// EL_BINARY_DIR=g11tech/geth:withdrawals EL_SCRIPT_DIR=gethdocker yarn mocha test/sim/withdrawal-interop.test.ts
+// EL_BINARY_DIR=g11tech/geth:withdrawalsfeb8 EL_SCRIPT_DIR=gethdocker yarn mocha test/sim/withdrawal-interop.test.ts
 // ```
 
 /* eslint-disable no-console, @typescript-eslint/naming-convention */