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

rework reconstruction publishing strategy

This commit is contained in:
Agnish Ghosh 2024-09-12 11:59:59 +05:30
parent dc4a1df2d7
commit ee33ec0683
4 changed files with 25 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
beacon_chain/networking/eth2_discovery.nim
View File

@ -161,12 +161,6 @@ proc queryRandom*(
debug "Could not decode the csc count ENR bitfield of peer", debug "Could not decode the csc count ENR bitfield of peer",
peer = n.record.toURI(), exception = e.name, msg = e.msg peer = n.record.toURI(), exception = e.name, msg = e.msg
continue continue
if wantedCscnets == cscnetsNode:
score += 1
else:
debug "Wanted csc count and decode csc from enr does not match!",
wantedCsc = wantedCscnets, cscNets = cscnetsNode
let attnetsBytes = n.record.get(enrAttestationSubnetsField, seq[byte]) let attnetsBytes = n.record.get(enrAttestationSubnetsField, seq[byte])
if attnetsBytes.isOk(): if attnetsBytes.isOk():

4
beacon_chain/nimbus_beacon_node.nim
View File

@ -1533,7 +1533,7 @@ proc tryReconstructingDataColumns* (self: BeaconNode,
# then reconstruction is not possible, and if all the data columns # then reconstruction is not possible, and if all the data columns
# are already stored then we do not need to reconstruct at all # are already stored then we do not need to reconstruct at all
if storedColumns.len < NUMBER_OF_COLUMNS div 2 or storedColumns.len == NUMBER_OF_COLUMNS: if storedColumns.len < NUMBER_OF_COLUMNS div 2 or storedColumns.len == NUMBER_OF_COLUMNS:
ok(data_column_sidecars) ok(finalisedDataColumns)
else: else:
# Recover blobs from saved data column sidecars # Recover blobs from saved data column sidecars
let recovered_cps = recover_cells_and_proofs(data_column_sidecars, storedColumns.len, signed_block) let recovered_cps = recover_cells_and_proofs(data_column_sidecars, storedColumns.len, signed_block)
@ -1563,6 +1563,8 @@ proc reconstructAndSendDataColumns*(node: BeaconNode) {.async.} =
if not data_column_sidecars.isOk(): if not data_column_sidecars.isOk():
return return
notice "Data Column Reconstructed and Saved Successfully" notice "Data Column Reconstructed and Saved Successfully"
if node.config.subscribeAllSubnets:
notice "Attempting to publish reconstructed columns"
let dc = data_column_sidecars.get let dc = data_column_sidecars.get
var var
worker_count = len(dc) worker_count = len(dc)

3
beacon_chain/spec/eip7594_helpers.nim
View File

@ -275,9 +275,6 @@ proc get_data_column_sidecars*(signed_block: deneb.TrustedSignedBeaconBlock |
discard column_cells.add(cellsAndProofs[i].cells) discard column_cells.add(cellsAndProofs[i].cells)
discard column_proofs.add(cellsAndProofs[i].proofs) discard column_proofs.add(cellsAndProofs[i].proofs)
debugEcho "column cells len"
debugEcho column_cells.len
var sidecar = DataColumnSidecar( var sidecar = DataColumnSidecar(
index: ColumnIndex(column_index), index: ColumnIndex(column_index),
column: column_cells, column: column_cells,

8
tests/test_eip7594_helpers.nim
View File

@ -35,7 +35,7 @@ block:
const MAX_TOP_BYTE = 114 const MAX_TOP_BYTE = 114
proc createSampleKzgBlobs(n: int): Result[seq[KzgBlob], cstring] = proc createSampleKzgBlobs(n: int): seq[KzgBlob] =
var blob: array[BYTES_PER_BLOB, byte] var blob: array[BYTES_PER_BLOB, byte]
var blobs: seq[KzgBlob] var blobs: seq[KzgBlob]
for i in 0..<n: for i in 0..<n:
@ -45,7 +45,7 @@ proc createSampleKzgBlobs(n: int): Result[seq[KzgBlob], cstring] =
blob[i] = MAX_TOP_BYTE blob[i] = MAX_TOP_BYTE
blobs.add(KzgBlob(bytes: blob)) blobs.add(KzgBlob(bytes: blob))
ok(blobs) blobs
proc chunks[T](lst: seq[T], n: int): seq[seq[T]] = proc chunks[T](lst: seq[T], n: int): seq[seq[T]] =
## Helper that splits a list into N sized chunks. ## Helper that splits a list into N sized chunks.
@ -59,7 +59,7 @@ suite "EIP-7594 Unit Tests":
let let
blob_count = 2 blob_count = 2
input_blobs = createSampleKzgBlobs(blob_count) input_blobs = createSampleKzgBlobs(blob_count)
extended_matrix = compute_extended_matrix(input_blobs.get) extended_matrix = compute_extended_matrix(input_blobs)
doAssert extended_matrix.get.len == kzg_abi.CELLS_PER_EXT_BLOB * blob_count doAssert extended_matrix.get.len == kzg_abi.CELLS_PER_EXT_BLOB * blob_count
let let
chunkSize = kzg_abi.CELLS_PER_EXT_BLOB chunkSize = kzg_abi.CELLS_PER_EXT_BLOB
@ -79,7 +79,7 @@ suite "EIP-7594 Unit Tests":
let let
blob_count = 2 blob_count = 2
blobs = createSampleKzgBlobs(blob_count) blobs = createSampleKzgBlobs(blob_count)
extended_matrix = compute_extended_matrix(blobs.get) extended_matrix = compute_extended_matrix(blobs)
# Construct a matrix with some entries missing # Construct a matrix with some entries missing
var partial_matrix: seq[MatrixEntry] var partial_matrix: seq[MatrixEntry]