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

couple of more fixes

This commit is contained in:
Agnish Ghosh 2024-10-01 18:40:50 +05:30
parent b8d03ef913
commit 1b5e9cf891
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
beacon_chain/spec/network.nim
View File

@ -114,6 +114,9 @@ func getBlobSidecarTopic*(forkDigest: ForkDigest,
func compute_subnet_for_blob_sidecar*(blob_index: BlobIndex): BlobId =
BlobId(blob_index mod BLOB_SIDECAR_SUBNET_COUNT)
func compute_subnet_for_data_column_sidecar*(column_index: ColumnIndex): uint64 =
uint64(column_index mod DATA_COLUMN_SIDECAR_SUBNET_COUNT)
# https://github.com/ethereum/consensus-specs/blob/v1.4.0-beta.5/specs/altair/light-client/p2p-interface.md#light_client_finality_update
func getLightClientFinalityUpdateTopic*(forkDigest: ForkDigest): string =
## For broadcasting or obtaining the latest `LightClientFinalityUpdate`.
@ -236,9 +239,6 @@ func getDataColumnSidecarTopic*(forkDigest: ForkDigest,
subnet_id: uint64): string =
eth2Prefix(forkDigest) & "data_column_sidecar_" & $subnet_id & "/ssz_snappy"
func compute_subnet_for_data_column_sidecar*(column_index: ColumnIndex): uint64 =
uint64(column_index mod DATA_COLUMN_SIDECAR_SUBNET_COUNT)
iterator dataColumnSidecarTopics*(forkDigest: ForkDigest, targetSubnetCount: uint64): string =
for subnet_id in 0'u64..<targetSubnetCount:
yield getDataColumnSidecarTopic(forkDigest, subnet_id)

2
beacon_chain/sync/sync_protocol.nim
View File

@ -481,7 +481,7 @@ p2pProtocol BeaconSync(version = 1,
for j in 0..<MAX_REQUEST_DATA_COLUMNS:
if ColumnIndex(j) in reqColumns:
if dag.db.getDataColumnSidecarSZ(blockIds[i].root, ColumnIndex(j), bytes):
if blockIds[i].slot.epoch >= dag.cfg.BELLATRIX_FORK_EPOCH and
if blockIds[i].slot.epoch >= dag.cfg.DENEB_FORK_EPOCH and
not dag.head.executionValid:
continue
let uncompressedLen = uncompressedLenFramed(bytes).valueOr:

1
beacon_chain/validators/message_router.nim
View File

@ -170,7 +170,6 @@ proc routeSignedBeaconBlock*(
when typeof(blck).kind >= ConsensusFork.Deneb:
let blobs = blobsOpt.get()
debugEcho blobs.len
debugEcho blobs.len
if blobs.len != 0:
let dataColumnsOpt =
newClone get_data_column_sidecars(blck, blobs.mapIt(KzgBlob(bytes: it.blob)))