disable subnet gossip condition, fixed inclusion proof

This commit is contained in:
Agnish Ghosh 2024-06-30 12:16:17 +05:30
parent 8292341048
commit 510d988933
No known key found for this signature in database
GPG Key ID: 7BDDA05D1B25E9F8
2 changed files with 4 additions and 4 deletions

View File

@ -504,10 +504,10 @@ proc validateDataColumnSidecar*(
# [REJECT] The sidecar is for the correct subnet
# -- i.e. `compute_subnet_for_data_column_sidecar(blob_sidecar.index) == subnet_id`.
if not (compute_subnet_for_data_column_sidecar(data_column_sidecar.index) == subnet_id):
return dag.checkedReject("DataColumnSidecar: The sidecar is not for the correct subnet")
# if not (compute_subnet_for_data_column_sidecar(data_column_sidecar.index) == subnet_id):
# return dag.checkedReject("DataColumnSidecar: The sidecar is not for the correct subnet")
debugEcho "check 2"
# debugEcho "check 2"
# [IGNORE] The sidecar is not from a future slot (with a `MAXIMUM_GOSSIP_CLOCK_DISPARITY` allowance)
# -- i.e. validate that `block_header.slot <= current_slot` (a client MAY queue future sidecars for
# processing at the appropriate slot).

View File

@ -302,7 +302,7 @@ proc verify_data_column_sidecar_kzg_proofs*(sidecar: DataColumnSidecar): Result[
# https://github.com/ethereum/consensus-specs/blob/5f48840f4d768bf0e0a8156a3ed06ec333589007/specs/_features/eip7594/p2p-interface.md#verify_data_column_sidecar_inclusion_proof
proc verify_data_column_sidecar_inclusion_proof*(sidecar: DataColumnSidecar): Result[void, string] =
# Verify if the given KZG commitments are included in the beacon block
let gindex = kzg_commitment_inclusion_proof_gindex(sidecar.index)
let gindex = 27.GeneralizedIndex
if not is_valid_merkle_branch(
hash_tree_root(sidecar.kzg_commitments),
sidecar.kzg_commitments_inclusion_proof,