bump nim-web3 and use engine API v1.0.0.alpha.9 (#3663)

status-im · May 25, 2022 · dfd8cd2 · dfd8cd2
1 parent 92c1e75
commit dfd8cd2
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
+0 −14		web3/builder_api.nim
+0 −10		web3/builder_api_callsigs.nim
+0 −57		web3/builder_api_types.nim
+9 −8		web3/engine_api_types.nim
+1 −1		web3/ethtypes.nim