status-im
/
nimbus-eth2
mirror of https://github.com/status-im/nimbus-eth2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update nim-web3 (#4875) 

Update to new version of nim-web3 incorporating the execution API
change that merges getPayloadV3 and getBlobsBundleV1.
This commit is contained in:
henridf 2023-04-28 21:20:25 +02:00 committed by GitHub
parent 8ef6223026
commit cf202fb928
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
beacon_chain/eth1/eth1_monitor.nim
View File

@ -240,16 +240,10 @@ type
executionPayload*: ExecutionPayloadV1 executionPayload*: ExecutionPayloadV1
blockValue*: UInt256 blockValue*: UInt256
CancunExecutionPayloadAndBlobs* = object
executionPayload*: ExecutionPayloadV3
blockValue*: UInt256
kzgs*: seq[engine_api.KZGCommitment]
blobs*: seq[engine_api.Blob]
SomeEnginePayloadWithValue = SomeEnginePayloadWithValue =
BellatrixExecutionPayloadWithValue | BellatrixExecutionPayloadWithValue |
GetPayloadV2Response | GetPayloadV2Response |
CancunExecutionPayloadAndBlobs GetPayloadV3Response
declareCounter failed_web3_requests, declareCounter failed_web3_requests,
"Failed web3 requests" "Failed web3 requests"
@ -524,17 +518,17 @@ func asConsensusType*(rpcExecutionPayload: ExecutionPayloadV3):
withdrawals: List[capella.Withdrawal, MAX_WITHDRAWALS_PER_PAYLOAD].init( withdrawals: List[capella.Withdrawal, MAX_WITHDRAWALS_PER_PAYLOAD].init(
mapIt(rpcExecutionPayload.withdrawals, it.asConsensusWithdrawal))) mapIt(rpcExecutionPayload.withdrawals, it.asConsensusWithdrawal)))
func asConsensusType*(cancunPayload: CancunExecutionPayloadAndBlobs): func asConsensusType*(payload: engine_api.GetPayloadV3Response):
deneb.ExecutionPayloadForSigning = deneb.ExecutionPayloadForSigning =
deneb.ExecutionPayloadForSigning( deneb.ExecutionPayloadForSigning(
executionPayload: cancunPayload.executionPayload.asConsensusType, executionPayload: payload.executionPayload.asConsensusType,
blockValue: cancunPayload.blockValue, blockValue: payload.blockValue,
# TODO # TODO
# The `mapIt` calls below are necessary only because we use different distinct # The `mapIt` calls below are necessary only because we use different distinct
# types for KZG commitments and Blobs in the `web3` and the `deneb` spec types. # types for KZG commitments and Blobs in the `web3` and the `deneb` spec types.
# Both are defined as `array[N, byte]` under the hood. # Both are defined as `array[N, byte]` under the hood.
kzgs: KZGCommitments cancunPayload.kzgs.mapIt(it.bytes), kzgs: KZGCommitments payload.blobsBundle.commitments.mapIt(it.bytes),
blobs: Blobs cancunPayload.blobs.mapIt(it.bytes) blobs: Blobs payload.blobsBundle.blobs.mapIt(it.bytes)
) )
func asEngineExecutionPayload*(executionPayload: bellatrix.ExecutionPayload): func asEngineExecutionPayload*(executionPayload: bellatrix.ExecutionPayload):
@ -800,7 +794,8 @@ proc getPayloadFromSingleEL(
timestamp: Quantity timestamp, timestamp: Quantity timestamp,
prevRandao: FixedBytes[32] randomData.data, prevRandao: FixedBytes[32] randomData.data,
suggestedFeeRecipient: suggestedFeeRecipient)) suggestedFeeRecipient: suggestedFeeRecipient))
elif GetPayloadResponseType is engine_api.GetPayloadV2Response or GetPayloadResponseType is CancunExecutionPayloadAndBlobs: elif GetPayloadResponseType is engine_api.GetPayloadV2Response or
GetPayloadResponseType is engine_api.GetPayloadV3Response:
let response = await rpcClient.forkchoiceUpdated( let response = await rpcClient.forkchoiceUpdated(
ForkchoiceStateV1( ForkchoiceStateV1(
headBlockHash: headBlock.asBlockHash, headBlockHash: headBlock.asBlockHash,
@ -825,19 +820,7 @@ proc getPayloadFromSingleEL(
else: else:
raise newException(CatchableError, "No confirmed execution head yet") raise newException(CatchableError, "No confirmed execution head yet")
when GetPayloadResponseType is CancunExecutionPayloadAndBlobs: when GetPayloadResponseType is BellatrixExecutionPayloadWithValue:
let
response = await engine_api.getPayload(rpcClient,
GetPayloadV3Response,
payloadId)
blobsBundle = await engine_getBlobsBundleV1(rpcClient, payloadId)
# TODO validate the blobs bundle
return CancunExecutionPayloadAndBlobs(
executionPayload: response.executionPayload,
blockValue: response.blockValue,
kzgs: blobsBundle.kzgs, # TODO Avoid the copies here with `move`
blobs: blobsBundle.blobs)
elif GetPayloadResponseType is BellatrixExecutionPayloadWithValue:
let payload= await engine_api.getPayload(rpcClient, ExecutionPayloadV1, payloadId) let payload= await engine_api.getPayload(rpcClient, ExecutionPayloadV1, payloadId)
return BellatrixExecutionPayloadWithValue( return BellatrixExecutionPayloadWithValue(
executionPayload: payload, executionPayload: payload,
@ -855,7 +838,7 @@ template EngineApiResponseType*(T: type capella.ExecutionPayloadForSigning): typ
engine_api.GetPayloadV2Response engine_api.GetPayloadV2Response
template EngineApiResponseType*(T: type deneb.ExecutionPayloadForSigning): type = template EngineApiResponseType*(T: type deneb.ExecutionPayloadForSigning): type =
CancunExecutionPayloadAndBlobs engine_api.GetPayloadV3Response
template payload(response: engine_api.ExecutionPayloadV1): engine_api.ExecutionPayloadV1 = template payload(response: engine_api.ExecutionPayloadV1): engine_api.ExecutionPayloadV1 =
response response

2
vendor/nim-web3 vendored

@ -1 +1 @@
Subproject commit 4c377e6e298ff5391c3f33372d1be0ce340f23ab Subproject commit 76a623ef9300d466bd16ffb1cfca1b1c77144e4c