Miscellaneous fixes/improvements for evm, client, consensus and crypto (

#2040) * Miscellaneous fixes/improvements for evm, client, consensus and crypto * skip header validation while runBlock if block picked from blockchain * update the ethereum-cryptography to 1.1.2 with 0 msgHash fix
ethereumjs · Jul 15, 2022 · 22a30ae · 22a30ae
1 parent a60b878
commit 22a30ae
Show file tree

Hide file tree

Showing 19 changed files with 84 additions and 64 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/block/package.json b/packages/block/package.json
@@ -33,7 +33,7 @@
     "@ethereumjs/trie": "5.0.0-beta.1",
     "@ethereumjs/tx": "4.0.0-beta.1",
     "@ethereumjs/util": "8.0.0-beta.1",
-    "ethereum-cryptography": "^1.0.3",
+    "ethereum-cryptography": "^1.1.2",
     "rlp": "4.0.0-beta.1"
   },
   "devDependencies": {

diff --git a/packages/blockchain/package.json b/packages/blockchain/package.json
@@ -36,7 +36,7 @@
     "@ethereumjs/util": "8.0.0-beta.1",
     "abstract-level": "^1.0.3",
     "debug": "^4.3.3",
-    "ethereum-cryptography": "^1.0.3",
+    "ethereum-cryptography": "^1.1.2",
     "level": "^8.0.0",
     "lru-cache": "^5.1.1",
     "memory-level": "^1.0.0",

diff --git a/packages/client/bin/cli.ts b/packages/client/bin/cli.ts
@@ -255,6 +255,7 @@ const args = yargs(hideBin(process.argv))
     describe:
       'Save tx receipts and logs in the meta db (warning: may use a large amount of storage). With `--rpc` allows querying via eth_getLogs (max 10000 logs per request) and eth_getTransactionReceipt (within `--txLookupLimit`)',
     boolean: true,
+    default: true,
   })
   .option('disableBeaconSync', {
     describe:

diff --git a/packages/client/bin/startRpc.ts b/packages/client/bin/startRpc.ts
@@ -1,6 +1,6 @@
 import { Server as RPCServer } from 'jayson/promise'
 import { readFileSync, writeFileSync } from 'fs-extra'
-import { RPCManager } from '../lib/rpc'
+import { RPCManager, saveReceiptsMethods } from '../lib/rpc'
 import { EthereumClient } from '../lib/client'
 import {
   MethodConfig,
@@ -83,6 +83,12 @@ export function startRPCServers(client: EthereumClient, args: RPCArgs) {
     rpcEngine && rpcEngineAuth ? parseJwtSecret(config, jwtSecretPath) : Buffer.from([])
   let withEngineMethods = false
 
+  if ((rpc || rpcEngine) && !config.saveReceipts) {
+    logger?.warn(
+      `Starting client without --saveReceipts might lead to interop issues with a CL especially if the CL intends to propose blocks, omitting methods=${saveReceiptsMethods}`
+    )
+  }
+
   if (rpc || ws) {
     let rpcHttpServer
     withEngineMethods = rpcEngine && rpcEnginePort === rpcport && rpcEngineAddr === rpcaddr

diff --git a/packages/client/lib/execution/vmexecution.ts b/packages/client/lib/execution/vmexecution.ts
@@ -183,10 +183,14 @@ export class VMExecution extends Execution {
               // (signer states might have moved on when sync is ahead)
               skipBlockValidation = true
             }
+
+            // we are skipping header validation because the block has been picked from the
+            // blockchain and header should have already been validated while putBlock
             const result = await this.vm.runBlock({
               block,
               root: parentState,
               skipBlockValidation,
+              skipHeaderValidation: true,
             })
             void this.receiptsManager?.saveReceipts(block, result.receipts)
             txCounter += block.transactions.length
@@ -318,7 +322,9 @@ export class VMExecution extends Execution {
       vm._common.setHardforkByBlockNumber(blockNumber, td)
 
       if (txHashes.length === 0) {
-        const res = await vm.runBlock({ block })
+        // we are skipping header validation because the block has been picked from the
+        // blockchain and header should have already been validated while putBlock
+        const res = await vm.runBlock({ block, skipHeaderValidation: true })
         this.config.logger.info(
           `Executed block num=${blockNumber} hash=0x${block.hash().toString('hex')} txs=${
             block.transactions.length

diff --git a/packages/client/lib/rpc/index.ts b/packages/client/lib/rpc/index.ts
@@ -3,6 +3,8 @@ import { EthereumClient } from '../client'
 import * as modules from './modules'
 import { INTERNAL_ERROR } from './error-code'
 
+export const saveReceiptsMethods = ['getLogs', 'getTransactionReceipt', 'getTransactionByHash']
+
 /**
  * @module rpc
  */
@@ -34,12 +36,7 @@ export class RPCManager {
       const mod = new (modules as any)[modName](this._client)
       const rpcMethods = RPCManager.getMethodNames((modules as any)[modName])
       for (const methodName of rpcMethods) {
-        if (
-          !this._config.saveReceipts &&
-          (methodName === 'getLogs' ||
-            methodName === 'getTransactionReceipt' ||
-            methodName === 'getTransactionByHash')
-        ) {
+        if (!this._config.saveReceipts && saveReceiptsMethods.includes(methodName)) {
           continue
         }
         const concatedMethodName = `${modName.toLowerCase()}_${methodName}`

diff --git a/packages/client/package.json b/packages/client/package.json
@@ -67,7 +67,7 @@
     "connect": "^3.7.0",
     "cors": "^2.8.5",
     "debug": "^4.3.3",
-    "ethereum-cryptography": "^1.0.3",
+    "ethereum-cryptography": "^1.1.2",
     "fs-extra": "^10.0.0",
     "it-pipe": "^1.1.0",
     "it-pushable": "^1.4.2",

diff --git a/packages/devp2p/package.json b/packages/devp2p/package.json
@@ -45,7 +45,7 @@
     "bl": "^1.1.2",
     "debug": "^4.3.3",
     "@ethereumjs/util": "8.0.0-beta.1",
-    "ethereum-cryptography": "^1.1.0",
+    "ethereum-cryptography": "^1.1.2",
     "inherits": "^2.0.1",
     "ip": "^1.1.3",
     "k-bucket": "^5.0.0",