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

engine API alpha.7 -> alpha.8 and a few remaining v1.1.9 to v1.1.0 CL spec URL updates (#3519)

This commit is contained in:
tersec 2022-03-18 11:46:39 +00:00 committed by GitHub
parent 0db1e768e4
commit d11d61c745
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
beacon_chain/conf.nim
View File

@ -501,15 +501,15 @@ type
defaultValue: false defaultValue: false
name: "proposer-boosting-debug" }: bool name: "proposer-boosting-debug" }: bool
# https://github.com/ethereum/consensus-specs/blob/v1.1.9/sync/optimistic.md#fork-choice-poisoning # https://github.com/ethereum/consensus-specs/blob/v1.1.10/sync/optimistic.md#fork-choice-poisoning
safeSlotsToImportOptimistically* {. safeSlotsToImportOptimistically* {.
hidden hidden
desc: "Modify SAFE_SLOTS_TO_IMPORT_OPTIMISTICALLY" desc: "Modify SAFE_SLOTS_TO_IMPORT_OPTIMISTICALLY"
# https://github.com/ethereum/consensus-specs/blob/v1.1.9/sync/optimistic.md#constants # https://github.com/ethereum/consensus-specs/blob/v1.1.10/sync/optimistic.md#constants
defaultValue: 128 defaultValue: 128
name: "safe-slots-to-import-optimistically" }: uint64 name: "safe-slots-to-import-optimistically" }: uint64
# https://github.com/ethereum/execution-apis/blob/v1.0.0-alpha.7/src/engine/authentication.md#key-distribution # https://github.com/ethereum/execution-apis/blob/v1.0.0-alpha.8/src/engine/authentication.md#key-distribution
jwtSecret* {. jwtSecret* {.
hidden hidden
desc: "A file containing the hex-encoded 256 bit secret key to be used for verifying/generating jwt tokens" desc: "A file containing the hex-encoded 256 bit secret key to be used for verifying/generating jwt tokens"

2
beacon_chain/spec/datatypes/bellatrix.nim
View File

@ -78,7 +78,7 @@ type
ExecutePayload* = proc( ExecutePayload* = proc(
execution_payload: ExecutionPayload): bool {.gcsafe, raises: [Defect].} execution_payload: ExecutionPayload): bool {.gcsafe, raises: [Defect].}
# https://github.com/ethereum/consensus-specs/blob/v1.1.9/specs/bellatrix/fork-choice.md#powblock # https://github.com/ethereum/consensus-specs/blob/v1.1.10/specs/bellatrix/fork-choice.md#powblock
PowBlock* = object PowBlock* = object
block_hash*: Eth2Digest block_hash*: Eth2Digest
parent_hash*: Eth2Digest parent_hash*: Eth2Digest

6
beacon_chain/spec/engine_authentication.nim
View File

@ -20,7 +20,7 @@ proc base64urlEncode(x: auto): string =
base64.encode(x, safe = true).replace("=", "") base64.encode(x, safe = true).replace("=", "")
func getIatToken*(time: uint64): JsonNode = func getIatToken*(time: uint64): JsonNode =
# https://github.com/ethereum/execution-apis/blob/v1.0.0-alpha.7/src/engine/authentication.md#jwt-claims # https://github.com/ethereum/execution-apis/blob/v1.0.0-alpha.8/src/engine/authentication.md#jwt-claims
# "Required: iat (issued-at) claim. The EL SHOULD only accept iat timestamps # "Required: iat (issued-at) claim. The EL SHOULD only accept iat timestamps
# which are within +-5 seconds from the current time." # which are within +-5 seconds from the current time."
# #
@ -32,7 +32,7 @@ func getIatToken*(time: uint64): JsonNode =
%* {"iat": time} %* {"iat": time}
proc getSignedToken*(key: openArray[byte], payload: string): string = proc getSignedToken*(key: openArray[byte], payload: string): string =
# https://github.com/ethereum/execution-apis/blob/v1.0.0-alpha.7/src/engine/authentication.md#jwt-specifications # https://github.com/ethereum/execution-apis/blob/v1.0.0-alpha.8/src/engine/authentication.md#jwt-specifications
# "The EL MUST support at least the following alg: HMAC + SHA256 (HS256)" # "The EL MUST support at least the following alg: HMAC + SHA256 (HS256)"
# https://datatracker.ietf.org/doc/html/rfc7515#appendix-A.1.1 # https://datatracker.ietf.org/doc/html/rfc7515#appendix-A.1.1
@ -65,7 +65,7 @@ proc checkJwtSecret*(
# hex-encoded secret as a jwt.hex file on the filesystem. This file can # hex-encoded secret as a jwt.hex file on the filesystem. This file can
# then be used to provision the counterpart client. # then be used to provision the counterpart client.
# #
# https://github.com/ethereum/execution-apis/blob/v1.0.0-alpha.7/src/engine/authentication.md#key-distribution # https://github.com/ethereum/execution-apis/blob/v1.0.0-alpha.8/src/engine/authentication.md#key-distribution
const jwtSecretFilename = "jwt.hex" const jwtSecretFilename = "jwt.hex"
let jwtSecretPath = dataDir / jwtSecretFilename let jwtSecretPath = dataDir / jwtSecretFilename

2
tests/mocking/mock_blocks.nim
View File

@ -43,7 +43,7 @@ func sign_block(state: ForkyBeaconState, blck: var ForkySignedBeaconBlock) =
blck.root, blck.root,
privkey).toValidatorSig() privkey).toValidatorSig()
# https://github.com/ethereum/consensus-specs/blob/v1.1.9/tests/core/pyspec/eth2spec/test/helpers/execution_payload.py#L1-L31 # https://github.com/ethereum/consensus-specs/blob/v1.1.10/tests/core/pyspec/eth2spec/test/helpers/execution_payload.py#L1-L31
func build_empty_execution_payload(state: bellatrix.BeaconState): ExecutionPayload = func build_empty_execution_payload(state: bellatrix.BeaconState): ExecutionPayload =
## Assuming a pre-state of the same slot, build a valid ExecutionPayload ## Assuming a pre-state of the same slot, build a valid ExecutionPayload
## without any transactions. ## without any transactions.