diff --git a/beacon_chain/gossip_processing/block_processor.nim b/beacon_chain/gossip_processing/block_processor.nim index f1b8b199f..dca5776ed 100644 --- a/beacon_chain/gossip_processing/block_processor.nim +++ b/beacon_chain/gossip_processing/block_processor.nim @@ -443,8 +443,7 @@ proc runQueueProcessingLoop*(self: ref BlockProcessor) {.async.} = if executionPayloadStatus in [ PayloadExecutionStatus.invalid, - PayloadExecutionStatus.invalid_block_hash, - PayloadExecutionStatus.invalid_terminal_block]: + PayloadExecutionStatus.invalid_block_hash]: debug "runQueueProcessingLoop: execution payload invalid", executionPayloadStatus if not blck.resfut.isNil: diff --git a/beacon_chain/spec/datatypes/bellatrix.nim b/beacon_chain/spec/datatypes/bellatrix.nim index 38fe26664..8c7762ee6 100644 --- a/beacon_chain/spec/datatypes/bellatrix.nim +++ b/beacon_chain/spec/datatypes/bellatrix.nim @@ -28,10 +28,10 @@ const # https://github.com/ethereum/consensus-specs/blob/v1.2.0-rc.1/specs/bellatrix/beacon-chain.md#transition-settings TERMINAL_BLOCK_HASH_ACTIVATION_EPOCH* = FAR_FUTURE_EPOCH - # https://github.com/ethereum/execution-apis/blob/2c3dffa1ad301a5b1d46212e1bd65e918265cd6f/src/engine/specification.md#request-1 + # https://github.com/ethereum/execution-apis/blob/v1.0.0-alpha.9/src/engine/specification.md#request-1 FORKCHOICEUPDATED_TIMEOUT* = 8.seconds - # https://github.com/ethereum/execution-apis/blob/2c3dffa1ad301a5b1d46212e1bd65e918265cd6f/src/engine/specification.md#request + # https://github.com/ethereum/execution-apis/blob/v1.0.0-alpha.9/src/engine/specification.md#request NEWPAYLOAD_TIMEOUT* = 8.seconds type diff --git a/beacon_chain/validators/validator_duties.nim b/beacon_chain/validators/validator_duties.nim index c53c34837..b0300caa1 100644 --- a/beacon_chain/validators/validator_duties.nim +++ b/beacon_chain/validators/validator_duties.nim @@ -528,7 +528,7 @@ proc getExecutionPayload(node: BeaconNode, proposalState: auto): # Minimize window for Eth1 monitor to shut down connection await node.consensusManager.eth1Monitor.ensureDataProvider() - # https://github.com/ethereum/execution-apis/blob/2c3dffa1ad301a5b1d46212e1bd65e918265cd6f/src/engine/specification.md#request-2 + # https://github.com/ethereum/execution-apis/blob/v1.0.0-alpha.9/src/engine/specification.md#request-2 const GETPAYLOAD_TIMEOUT = 1.seconds let diff --git a/ncli/ncli_common.nim b/ncli/ncli_common.nim index e7dc708be..2bed646cc 100644 --- a/ncli/ncli_common.nim +++ b/ncli/ncli_common.nim @@ -6,7 +6,7 @@ # at your option. This file may not be copied, modified, or distributed except according to those terms. import - re, strutils, os, math, + std/[os, re, strutils], stew/bitops2, ../beacon_chain/spec/[ datatypes/base, diff --git a/vendor/nim-web3 b/vendor/nim-web3 index d260915a0..755b6dc92 160000 --- a/vendor/nim-web3 +++ b/vendor/nim-web3 @@ -1 +1 @@ -Subproject commit d260915a0c2111e64ac49b9f75083734c58e5f03 +Subproject commit 755b6dc92b1545d6c9eb242c551e8188e35ffe5d