`KZG(Commitment(s)?|Proof)` > `Kzg$1` (#4917)
Fix style-check by using matching capitalization for `nim-kzg` types.
This commit is contained in:
parent
93899b2e2a
commit
34e7181b0d
|
@ -529,7 +529,7 @@ func asConsensusType*(payload: engine_api.GetPayloadV3Response):
|
||||||
# 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 payload.blobsBundle.commitments.mapIt(it.bytes),
|
kzgs: KzgCommitments payload.blobsBundle.commitments.mapIt(it.bytes),
|
||||||
blobs: Blobs payload.blobsBundle.blobs.mapIt(it.bytes)
|
blobs: Blobs payload.blobsBundle.blobs.mapIt(it.bytes)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@ import
|
||||||
../digest,
|
../digest,
|
||||||
"."/[base, phase0, altair, bellatrix, capella]
|
"."/[base, phase0, altair, bellatrix, capella]
|
||||||
|
|
||||||
from ../../vendor/nim-kzg4844/kzg4844 import KZGCommitment, KZGProof
|
from ../../vendor/nim-kzg4844/kzg4844 import KzgCommitment, KzgProof
|
||||||
|
|
||||||
export json_serialization, base, kzg4844
|
export json_serialization, base, kzg4844
|
||||||
|
|
||||||
|
@ -42,7 +42,7 @@ const
|
||||||
MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS* = 4096'u64
|
MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS* = 4096'u64
|
||||||
|
|
||||||
type
|
type
|
||||||
KZGCommitments* = List[KZGCommitment, Limit MAX_BLOBS_PER_BLOCK]
|
KzgCommitments* = List[KzgCommitment, Limit MAX_BLOBS_PER_BLOCK]
|
||||||
Blobs* = List[Blob, Limit MAX_BLOBS_PER_BLOCK]
|
Blobs* = List[Blob, Limit MAX_BLOBS_PER_BLOCK]
|
||||||
|
|
||||||
# TODO this apparently is suppposed to be SSZ-equivalent to Bytes32, but
|
# TODO this apparently is suppposed to be SSZ-equivalent to Bytes32, but
|
||||||
|
@ -59,7 +59,7 @@ type
|
||||||
beacon_block_root*: Eth2Digest
|
beacon_block_root*: Eth2Digest
|
||||||
beacon_block_slot*: Slot
|
beacon_block_slot*: Slot
|
||||||
blobs*: Blobs
|
blobs*: Blobs
|
||||||
kzg_aggregated_proof*: KZGProof
|
kzg_aggregated_proof*: KzgProof
|
||||||
|
|
||||||
# https://github.com/ethereum/consensus-specs/blob/v1.3.0-rc.5/specs/deneb/p2p-interface.md#blobsidecar
|
# https://github.com/ethereum/consensus-specs/blob/v1.3.0-rc.5/specs/deneb/p2p-interface.md#blobsidecar
|
||||||
BlobSidecar* = object
|
BlobSidecar* = object
|
||||||
|
@ -69,8 +69,8 @@ type
|
||||||
block_parent_root*: Eth2Digest # Proposer shuffling determinant
|
block_parent_root*: Eth2Digest # Proposer shuffling determinant
|
||||||
proposer_index*: uint64
|
proposer_index*: uint64
|
||||||
blob*: Blob
|
blob*: Blob
|
||||||
kzg_commitment*: KZGCommitment
|
kzg_commitment*: KzgCommitment
|
||||||
kzg_proof*: KZGProof # Allows for quick verification of kzg_commitment
|
kzg_proof*: KzgProof # Allows for quick verification of kzg_commitment
|
||||||
|
|
||||||
# https://github.com/ethereum/consensus-specs/blob/v1.3.0-rc.5/specs/deneb/p2p-interface.md#signedblobsidecar
|
# https://github.com/ethereum/consensus-specs/blob/v1.3.0-rc.5/specs/deneb/p2p-interface.md#signedblobsidecar
|
||||||
SignedBlobSidecar* = object
|
SignedBlobSidecar* = object
|
||||||
|
@ -106,7 +106,7 @@ type
|
||||||
ExecutionPayloadForSigning* = object
|
ExecutionPayloadForSigning* = object
|
||||||
executionPayload*: ExecutionPayload
|
executionPayload*: ExecutionPayload
|
||||||
blockValue*: Wei
|
blockValue*: Wei
|
||||||
kzgs*: KZGCommitments
|
kzgs*: KzgCommitments
|
||||||
blobs*: Blobs
|
blobs*: Blobs
|
||||||
|
|
||||||
# https://github.com/ethereum/consensus-specs/blob/v1.3.0-rc.5/specs/deneb/beacon-chain.md#executionpayloadheader
|
# https://github.com/ethereum/consensus-specs/blob/v1.3.0-rc.5/specs/deneb/beacon-chain.md#executionpayloadheader
|
||||||
|
@ -387,7 +387,7 @@ type
|
||||||
# Execution
|
# Execution
|
||||||
execution_payload*: ExecutionPayload # [Modified in Deneb]
|
execution_payload*: ExecutionPayload # [Modified in Deneb]
|
||||||
bls_to_execution_changes*: SignedBLSToExecutionChangeList
|
bls_to_execution_changes*: SignedBLSToExecutionChangeList
|
||||||
blob_kzg_commitments*: KZGCommitments # [New in Deneb]
|
blob_kzg_commitments*: KzgCommitments # [New in Deneb]
|
||||||
|
|
||||||
SigVerifiedBeaconBlockBody* = object
|
SigVerifiedBeaconBlockBody* = object
|
||||||
## A BeaconBlock body with signatures verified
|
## A BeaconBlock body with signatures verified
|
||||||
|
@ -422,7 +422,7 @@ type
|
||||||
# Execution
|
# Execution
|
||||||
execution_payload*: ExecutionPayload # [Modified in Deneb]
|
execution_payload*: ExecutionPayload # [Modified in Deneb]
|
||||||
bls_to_execution_changes*: SignedBLSToExecutionChangeList
|
bls_to_execution_changes*: SignedBLSToExecutionChangeList
|
||||||
blob_kzg_commitments*: List[KZGCommitment, Limit MAX_BLOBS_PER_BLOCK] # [New in Deneb]
|
blob_kzg_commitments*: KzgCommitments # [New in Deneb]
|
||||||
|
|
||||||
TrustedBeaconBlockBody* = object
|
TrustedBeaconBlockBody* = object
|
||||||
## A full verified block
|
## A full verified block
|
||||||
|
@ -445,7 +445,7 @@ type
|
||||||
# Execution
|
# Execution
|
||||||
execution_payload*: ExecutionPayload # [Modified in Deneb]
|
execution_payload*: ExecutionPayload # [Modified in Deneb]
|
||||||
bls_to_execution_changes*: SignedBLSToExecutionChangeList
|
bls_to_execution_changes*: SignedBLSToExecutionChangeList
|
||||||
blob_kzg_commitments*: List[KZGCommitment, Limit MAX_BLOBS_PER_BLOCK] # [New in Deneb]
|
blob_kzg_commitments*: KzgCommitments # [New in Deneb]
|
||||||
|
|
||||||
# https://github.com/ethereum/consensus-specs/blob/v1.3.0-rc.5/specs/phase0/beacon-chain.md#signedbeaconblock
|
# https://github.com/ethereum/consensus-specs/blob/v1.3.0-rc.5/specs/phase0/beacon-chain.md#signedbeaconblock
|
||||||
SignedBeaconBlock* = object
|
SignedBeaconBlock* = object
|
||||||
|
|
|
@ -274,7 +274,7 @@ func findValidatorIndex*(state: ForkyBeaconState, pubkey: ValidatorPubKey):
|
||||||
return Opt[ValidatorIndex].ok(vidx)
|
return Opt[ValidatorIndex].ok(vidx)
|
||||||
|
|
||||||
from ./datatypes/deneb import
|
from ./datatypes/deneb import
|
||||||
BLOB_TX_TYPE, BeaconState, KZGCommitment, VersionedHash
|
BLOB_TX_TYPE, BeaconState, KzgCommitment, VersionedHash
|
||||||
|
|
||||||
proc process_deposit*(cfg: RuntimeConfig,
|
proc process_deposit*(cfg: RuntimeConfig,
|
||||||
state: var ForkyBeaconState,
|
state: var ForkyBeaconState,
|
||||||
|
@ -718,10 +718,10 @@ func tx_peek_blob_versioned_hashes(opaque_tx: Transaction):
|
||||||
res.add versionedHash
|
res.add versionedHash
|
||||||
ok res
|
ok res
|
||||||
|
|
||||||
# https://github.com/ethereum/consensus-specs/blob/v1.3.0-rc.5/specs/deneb/beacon-chain.md#kzg_commitment_to_versioned_hash
|
# https://github.com/ethereum/consensus-specs/blob/v1.3.0/specs/deneb/beacon-chain.md#kzg_commitment_to_versioned_hash
|
||||||
func kzg_commitment_to_versioned_hash(
|
func kzg_commitment_to_versioned_hash(
|
||||||
kzg_commitment: deneb.KZGCommitment): VersionedHash =
|
kzg_commitment: KzgCommitment): VersionedHash =
|
||||||
# https://github.com/ethereum/consensus-specs/blob/v1.3.0-rc.5/specs/deneb/beacon-chain.md#blob
|
# https://github.com/ethereum/consensus-specs/blob/v1.3.0/specs/deneb/beacon-chain.md#blob
|
||||||
const VERSIONED_HASH_VERSION_KZG = 0x01'u8
|
const VERSIONED_HASH_VERSION_KZG = 0x01'u8
|
||||||
|
|
||||||
var res: VersionedHash
|
var res: VersionedHash
|
||||||
|
@ -729,10 +729,10 @@ func kzg_commitment_to_versioned_hash(
|
||||||
res[1 .. 31] = eth2digest(kzg_commitment).data.toOpenArray(1, 31)
|
res[1 .. 31] = eth2digest(kzg_commitment).data.toOpenArray(1, 31)
|
||||||
res
|
res
|
||||||
|
|
||||||
# https://github.com/ethereum/consensus-specs/blob/v1.3.0-rc.5/specs/deneb/beacon-chain.md#verify_kzg_commitments_against_transactions
|
# https://github.com/ethereum/consensus-specs/blob/v1.3.0/specs/deneb/beacon-chain.md#verify_kzg_commitments_against_transactions
|
||||||
func verify_kzg_commitments_against_transactions*(
|
func verify_kzg_commitments_against_transactions*(
|
||||||
transactions: seq[Transaction],
|
transactions: seq[Transaction],
|
||||||
kzg_commitments: seq[deneb.KZGCommitment]): bool =
|
kzg_commitments: seq[KzgCommitment]): bool =
|
||||||
var all_versioned_hashes: seq[VersionedHash]
|
var all_versioned_hashes: seq[VersionedHash]
|
||||||
for tx in transactions:
|
for tx in transactions:
|
||||||
if tx[0] == BLOB_TX_TYPE:
|
if tx[0] == BLOB_TX_TYPE:
|
||||||
|
@ -760,9 +760,9 @@ func process_blob_kzg_commitments(
|
||||||
return err("process_blob_kzg_commitments: verify_kzg_commitments_against_transactions failed")
|
return err("process_blob_kzg_commitments: verify_kzg_commitments_against_transactions failed")
|
||||||
|
|
||||||
# https://github.com/ethereum/consensus-specs/blob/v1.3.0/specs/deneb/fork-choice.md#validate_blobs
|
# https://github.com/ethereum/consensus-specs/blob/v1.3.0/specs/deneb/fork-choice.md#validate_blobs
|
||||||
proc validate_blobs*(expected_kzg_commitments: seq[KZGCommitment],
|
proc validate_blobs*(expected_kzg_commitments: seq[KzgCommitment],
|
||||||
blobs: seq[KzgBlob],
|
blobs: seq[KzgBlob],
|
||||||
proofs: seq[KZGProof]):
|
proofs: seq[KzgProof]):
|
||||||
Result[void, cstring] =
|
Result[void, cstring] =
|
||||||
if expected_kzg_commitments.len != blobs.len:
|
if expected_kzg_commitments.len != blobs.len:
|
||||||
return err("validate_blobs: different commitment and blob lengths")
|
return err("validate_blobs: different commitment and blob lengths")
|
||||||
|
|
Loading…
Reference in New Issue