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

Merge branch 'dev/etan/df-forkedblobs' into feat_eip-7688

This commit is contained in:
Etan Kissling 2024-07-25 23:05:06 +02:00
parent 2938aa40bf 9c9f2df0ca
commit 3ef3db5fb1
No known key found for this signature in database
GPG Key ID: B21DA824C5A3D03D
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
beacon_chain/spec/forks.nim
View File

@ -280,6 +280,9 @@ type
ForkyBlobSidecar* = ForkyBlobSidecar* =
deneb.BlobSidecar deneb.BlobSidecar
OptSeqForkyBlobSidecar* =
Opt[seq[deneb.BlobSidecar]]
ForkyBlobSidecars* = ForkyBlobSidecars* =
deneb.BlobSidecars deneb.BlobSidecars

2
beacon_chain/validators/beacon_validators.nim
View File

@ -1292,7 +1292,7 @@ proc proposeBlockAux(
Opt.some(signedBlock.create_blob_sidecars( Opt.some(signedBlock.create_blob_sidecars(
blobsBundle.proofs, blobsBundle.blobs)) blobsBundle.proofs, blobsBundle.blobs))
else: else:
Opt.none(seq[BlobSidecar]) Opt.none(seq[deneb.BlobSidecar])
newBlockRef = ( newBlockRef = (
await node.router.routeSignedBeaconBlock(signedBlock, blobsOpt, await node.router.routeSignedBeaconBlock(signedBlock, blobsOpt,
checkValidator = false) checkValidator = false)

2
beacon_chain/validators/message_router.nim
View File

@ -84,7 +84,7 @@ template getCurrentBeaconTime(router: MessageRouter): BeaconTime =
type RouteBlockResult = Result[Opt[BlockRef], string] type RouteBlockResult = Result[Opt[BlockRef], string]
proc routeSignedBeaconBlock*( proc routeSignedBeaconBlock*(
router: ref MessageRouter, blck: ForkySignedBeaconBlock, router: ref MessageRouter, blck: ForkySignedBeaconBlock,
blobsOpt: Opt[seq[ForkyBlobSidecar]], checkValidator: bool): blobsOpt: OptSeqForkyBlobSidecar, checkValidator: bool):
Future[RouteBlockResult] {.async: (raises: [CancelledError]).} = Future[RouteBlockResult] {.async: (raises: [CancelledError]).} =
## Validate and broadcast beacon block, then add it to the block database ## Validate and broadcast beacon block, then add it to the block database
## Returns the new Head when block is added successfully to dag, none when ## Returns the new Head when block is added successfully to dag, none when

2
beacon_chain/validators/message_router_mev.nim
View File

@ -138,7 +138,7 @@ proc unblindAndRouteBlockMEV*(
Opt.some(signedBlock.create_blob_sidecars( Opt.some(signedBlock.create_blob_sidecars(
blobs_bundle.proofs, blobs_bundle.blobs)) blobs_bundle.proofs, blobs_bundle.blobs))
else: else:
Opt.none(seq[BlobSidecar]) Opt.none(seq[deneb.BlobSidecar])
debug "unblindAndRouteBlockMEV: proposing unblinded block", debug "unblindAndRouteBlockMEV: proposing unblinded block",
blck = shortLog(signedBlock) blck = shortLog(signedBlock)