Hotfix: Revert a nim-web3 change that interferes with Eth1 deposit syncing

This commit is contained in:
Zahary Karadjov 2021-10-10 13:35:06 +02:00
parent f52efc0cee
commit dbbdbea7da
2 changed files with 2 additions and 34 deletions

View File

@ -12,7 +12,7 @@ import
typetraits, uri, json],
# Nimble packages:
chronos, json, metrics, chronicles/timings,
web3, web3/ethtypes as web3Types, web3/ethhexstrings, web3/engine_api,
web3, web3/ethtypes as web3Types, web3/ethhexstrings,
eth/common/eth_types,
eth/async_utils, stew/byteutils,
# Local modules:
@ -403,38 +403,6 @@ proc getBlockByNumber*(p: Web3DataProviderRef,
except ValueError as exc: raiseAssert exc.msg # Never fails
p.web3.provider.eth_getBlockByNumber(hexNumber, false)
proc preparePayload*(p: Web3DataProviderRef,
parentHash: Eth2Digest,
timestamp: uint64,
randomData: array[32, byte],
feeRecipient: Eth1Address): Future[PreparePayloadResponse] =
p.web3.provider.engine_preparePayload(PayloadAttributes(
parentHash: parentHash.asBlockHash,
timestamp: Quantity timestamp,
random: FixedBytes[32] randomData,
feeRecipient: feeRecipient))
proc getPayload*(p: Web3DataProviderRef,
payloadId: Quantity): Future[engine_api.ExecutionPayload] =
p.web3.provider.engine_getPayload(payloadId)
proc executePayload*(p: Web3DataProviderRef,
payload: engine_api.ExecutionPayload): Future[ExecutePayloadResponse] =
p.web3.provider.engine_executePayload(payload)
proc consensusValidated*(p: Web3DataProviderRef,
blockHash: BlockHash,
status: BlockValidationStatus): Future[JsonNode] =
p.web3.provider.engine_consensusValidated(BlockValidationResult(
blockHash: blockHash,
status: $status))
proc forkchoiceUpdated*(p: Web3DataProviderRef,
headBlock, finalizedBlock: Eth2Digest): Future[JsonNode] =
p.web3.provider.engine_forkchoiceUpdated(ForkChoiceUpdate(
headBlockHash: headBlock.asBlockHash,
finalizedBlockHash: finalizedBlock.asBlockHash))
template readJsonField(j: JsonNode, fieldName: string, ValueType: type): untyped =
var res: ValueType
fromJson(j[fieldName], fieldName, res)

2
vendor/nim-web3 vendored

@ -1 +1 @@
Subproject commit 9a23474afb7e2a14798ec0bf0e69e96cd5895e55
Subproject commit 97e05aea6573d2630e318e7777a54d95db6ec40e