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

fix bellatrix web3signer client-side beacon block signing requests (#4407)

This commit is contained in:
tersec 2022-12-08 21:57:47 +00:00 committed by GitHub
parent bbf1d6030c
commit 94653b0b71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
beacon_chain/spec/eth2_apis/eth2_rest_serialization.nim
View File

@ -1107,9 +1107,35 @@ proc readValue*[BlockType: Web3SignerForkedBeaconBlock](
of BeaconBlockFork.EIP4844: of BeaconBlockFork.EIP4844:
reader.raiseUnexpectedValue($eip4844ImplementationMissing) reader.raiseUnexpectedValue($eip4844ImplementationMissing)
proc writeValue*[
BlockType: Web3SignerForkedBeaconBlock](
writer: var JsonWriter[RestJson],
value: BlockType) {.raises: [IOError, Defect].} =
template forkIdentifier(id: string): auto = (static toUpperAscii id)
# https://consensys.github.io/web3signer/web3signer-eth2.html#tag/Signing/operation/ETH2_SIGN
# https://github.com/ConsenSys/web3signer/blob/d51337e96ba5ce410222943556bed7c4856b8e57/core/src/main/java/tech/pegasys/web3signer/core/service/http/handlers/signing/eth2/json/BlockRequestDeserializer.java#L42-L58
writer.beginRecord()
case value.kind
of BeaconBlockFork.Phase0:
writer.writeField("version", forkIdentifier "phase0")
writer.writeField("block", value.phase0Data)
of BeaconBlockFork.Altair:
writer.writeField("version", forkIdentifier "altair")
writer.writeField("block", value.altairData)
of BeaconBlockFork.Bellatrix:
writer.writeField("version", forkIdentifier "bellatrix")
writer.writeField("block_header", value.bellatrixData)
of BeaconBlockFork.Capella:
writer.writeField("version", forkIdentifier "capella")
writer.writeField("block_header", value.capellaData)
of BeaconBlockFork.EIP4844:
writer.writeField("version", forkIdentifier "eip4844")
writer.writeField("block_header", value.eip4844Data)
writer.endRecord()
proc writeValue*[ proc writeValue*[
BlockType: Web3SignerForkedBeaconBlock|ForkedBeaconBlock|ForkedBlindedBeaconBlock]( BlockType: ForkedBeaconBlock|ForkedBlindedBeaconBlock](
writer: var JsonWriter[RestJson], writer: var JsonWriter[RestJson],
value: BlockType) {.raises: [IOError, Defect].} = value: BlockType) {.raises: [IOError, Defect].} =
@ -1737,9 +1763,9 @@ proc writeValue*(writer: var JsonWriter[RestJson],
if isSome(value.signingRoot): if isSome(value.signingRoot):
writer.writeField("signingRoot", value.signingRoot) writer.writeField("signingRoot", value.signingRoot)
# https://github.com/ConsenSys/web3signer/blob/41834a927088f1bde7a097e17d19e954d0058e54/core/src/main/resources/openapi-specs/eth2/signing/schemas.yaml#L421-L425 (branch v22.7.0) # https://github.com/ConsenSys/web3signer/blob/41c0cbfabcb1fca9587b59e058b7eb29f152c60c/core/src/main/resources/openapi-specs/eth2/signing/schemas.yaml#L418-L497
# It's the "beacon_block" field even when it's not a block, but a header
writer.writeField("beacon_block", value.beaconBlock) writer.writeField("beacon_block", value.beaconBlock)
of Web3SignerRequestKind.Deposit: of Web3SignerRequestKind.Deposit:
writer.writeField("type", "DEPOSIT") writer.writeField("type", "DEPOSIT")
if isSome(value.signingRoot): if isSome(value.signingRoot):
@ -3117,6 +3143,7 @@ proc decodeString*(t: typedesc[BeaconBlockFork],
of "altair": ok(BeaconBlockFork.Altair) of "altair": ok(BeaconBlockFork.Altair)
of "bellatrix": ok(BeaconBlockFork.Bellatrix) of "bellatrix": ok(BeaconBlockFork.Bellatrix)
of "capella": ok(BeaconBlockFork.Capella) of "capella": ok(BeaconBlockFork.Capella)
of "eip4844": ok(BeaconBlockFork.EIP4844)
else: err("Unsupported or invalid beacon block fork version") else: err("Unsupported or invalid beacon block fork version")
proc decodeString*(t: typedesc[BeaconStateFork], proc decodeString*(t: typedesc[BeaconStateFork],
@ -3126,4 +3153,5 @@ proc decodeString*(t: typedesc[BeaconStateFork],
of "altair": ok(BeaconStateFork.Altair) of "altair": ok(BeaconStateFork.Altair)
of "bellatrix": ok(BeaconStateFork.Bellatrix) of "bellatrix": ok(BeaconStateFork.Bellatrix)
of "capella": ok(BeaconStateFork.Capella) of "capella": ok(BeaconStateFork.Capella)
of "eip4844": ok(BeaconStateFork.EIP4844)
else: err("Unsupported or invalid beacon state fork version") else: err("Unsupported or invalid beacon state fork version")