diff --git a/packages/client/lib/net/server/rlpxserver.ts b/packages/client/lib/net/server/rlpxserver.ts index 949ccc4e41f..8c2f8cd99d0 100644 --- a/packages/client/lib/net/server/rlpxserver.ts +++ b/packages/client/lib/net/server/rlpxserver.ts @@ -13,18 +13,28 @@ export interface RlpxServerOptions extends ServerOptions { const ignoredErrors = new RegExp( [ + // Peer socket connection 'ECONNRESET', - 'EPIPE', - 'ETIMEDOUT', + 'EPIPE', // (?) + 'ETIMEDOUT', // (?) + + // ETH status handling 'Genesis block mismatch', - 'Handshake timed out', + 'NetworkId mismatch', + 'Unknown fork hash', + + // DPT message decoding 'Hash verification failed', 'Invalid address buffer', - 'Invalid MAC', 'Invalid timestamp buffer', - 'NetworkId mismatch', - 'Timeout error: ping', - 'Unknown fork hash', + 'Invalid type', + 'Timeout error: ping', // connection + + // ECIES message encryption + 'Invalid MAC', + + // Client + 'Handshake timed out', // Protocol handshake ].join('|') ) diff --git a/packages/client/lib/sync/execution/vmexecution.ts b/packages/client/lib/sync/execution/vmexecution.ts index 6a362292d93..4ca3021f9cc 100644 --- a/packages/client/lib/sync/execution/vmexecution.ts +++ b/packages/client/lib/sync/execution/vmexecution.ts @@ -44,7 +44,7 @@ export class VMExecution extends Execution { * Initializes VM execution. Must be called before run() is called */ async open(): Promise { - const headBlock = await this.vm.blockchain.getHead() + const headBlock = await this.vm.blockchain.getIteratorHead() const blockNumber = headBlock.header.number.toNumber() this.config.execCommon.setHardforkByBlockNumber(blockNumber) this.hardfork = this.config.execCommon.hardfork()