seperating optimistic sync, fixing and testing the transaction submis…

…sion/execution
ChainSafe · Nov 15, 2021 · c15bf07 · c15bf07
1 parent a1c6635
commit c15bf07
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 23 deletions.
diff --git a/packages/fork-choice/src/forkChoice/forkChoice.ts b/packages/fork-choice/src/forkChoice/forkChoice.ts
@@ -920,19 +920,17 @@ function assertValidTerminalPowBlock(
           block.body.executionPayload.parentHash
         )}`
       );
-
-    // TERMINAL_BLOCK_HASH override skips ttd checks
-    return;
+  } else {
+    // If no TERMINAL_BLOCK_HASH override, check ttd
+    const {powBlock, powBlockParent} = preCachedData || {};
+    if (!powBlock) throw Error("onBlock preCachedData must include powBlock");
+    if (!powBlockParent) throw Error("onBlock preCachedData must include powBlock");
+
+    const isTotalDifficultyReached = powBlock.totalDifficulty >= config.TERMINAL_TOTAL_DIFFICULTY;
+    const isParentTotalDifficultyValid = powBlockParent.totalDifficulty < config.TERMINAL_TOTAL_DIFFICULTY;
+    if (!isTotalDifficultyReached || !isParentTotalDifficultyValid)
+      throw Error(
+        `Invalid terminal POW block: total difficulty not reached ${powBlockParent.totalDifficulty} < ${powBlock.totalDifficulty}`
+      );
   }
-
-  const {powBlock, powBlockParent} = preCachedData || {};
-  if (!powBlock) throw Error("onBlock preCachedData must include powBlock");
-  if (!powBlockParent) throw Error("onBlock preCachedData must include powBlock");
-
-  const isTotalDifficultyReached = powBlock.totalDifficulty >= config.TERMINAL_TOTAL_DIFFICULTY;
-  const isParentTotalDifficultyValid = powBlockParent.totalDifficulty < config.TERMINAL_TOTAL_DIFFICULTY;
-  if (!isTotalDifficultyReached || !isParentTotalDifficultyValid)
-    throw Error(
-      `Invalid terminal POW block: total difficulty not reached ${powBlockParent.totalDifficulty} < ${powBlock.totalDifficulty}`
-    );
 }
diff --git a/packages/lodestar/src/executionEngine/http.ts b/packages/lodestar/src/executionEngine/http.ts
@@ -221,7 +221,7 @@ export function serializeExecutionPayload(data: merge.ExecutionPayload): Executi
     extraData: bytesToData(data.extraData),
     baseFeePerGas: numToQuantity(data.baseFeePerGas),
     blockHash: bytesToData(data.blockHash),
-    transactions: data.transactions.map((tran) => bytesToData(tran.value)),
+    transactions: data.transactions.map((tran) => bytesToData(tran)),
   };
 }
 
@@ -240,6 +240,6 @@ export function parseExecutionPayload(data: ExecutionPayloadRpc): merge.Executio
     extraData: dataToBytes(data.extraData),
     baseFeePerGas: quantityToBigint(data.baseFeePerGas),
     blockHash: dataToBytes(data.blockHash, 32),
-    transactions: data.transactions.map((tran) => ({selector: 0, value: dataToBytes(tran)})),
+    transactions: data.transactions.map((tran) => dataToBytes(tran)),
   };
 }
diff --git a/packages/lodestar/src/executionEngine/mock.ts b/packages/lodestar/src/executionEngine/mock.ts
@@ -107,7 +107,7 @@ export class ExecutionEngineMock implements IExecutionEngine {
       extraData: ZERO_HASH,
       baseFeePerGas: BigInt(0),
       blockHash: crypto.randomBytes(32),
-      transactions: [{selector: 0, value: crypto.randomBytes(512)}],
+      transactions: [crypto.randomBytes(512)],
     };
     this.preparingPayloads.set(payloadId, payload);
 

diff --git a/packages/types/src/merge/types.ts b/packages/types/src/merge/types.ts
@@ -1,12 +1,7 @@
 import * as altair from "../altair/types";
 import {Root, Bytes32, Number64, ExecutionAddress, Uint256} from "../primitive/types";
 
-export type OpaqueTransaction = Uint8Array;
-
-export type Transaction = {
-  selector: number;
-  value: OpaqueTransaction;
-};
+export type Transaction = Uint8Array;
 
 type ExecutionPayloadFields = {
   // Execution block header fields