fixes around message router
This commit is contained in:
parent
3a6593647c
commit
d71edad9c0
|
@ -200,36 +200,36 @@ proc routeSignedBeaconBlock*(
|
|||
for dc in data_columns:
|
||||
if dc.index in custody_columns:
|
||||
dataColumnRefs = Opt.some(dataColumnsOpt[].get().mapIt(newClone(it)))
|
||||
|
||||
let added = await router[].blockProcessor[].addBlock(
|
||||
MsgSource.api, ForkedSignedBeaconBlock.init(blck), blobRefs, dataColumnRefs)
|
||||
|
||||
# The boolean we return tells the caller whether the block was integrated
|
||||
# into the chain
|
||||
if added.isErr():
|
||||
return if added.error() != VerifierError.Duplicate:
|
||||
warn "Unable to add routed block to block pool",
|
||||
blockRoot = shortLog(blck.root), blck = shortLog(blck.message),
|
||||
signature = shortLog(blck.signature), err = added.error()
|
||||
ok(Opt.none(BlockRef))
|
||||
else:
|
||||
# If it's duplicate, there's an existing BlockRef to return. The block
|
||||
# shouldn't be finalized already because that requires a couple epochs
|
||||
# before occurring, so only check non-finalized resolved blockrefs.
|
||||
let blockRef = router[].dag.getBlockRef(blck.root)
|
||||
if blockRef.isErr:
|
||||
warn "Unable to add routed duplicate block to block pool",
|
||||
let added = await router[].blockProcessor[].addBlock(
|
||||
MsgSource.api, ForkedSignedBeaconBlock.init(blck), blobRefs, dataColumnRefs)
|
||||
|
||||
# The boolean we return tells the caller whether the block was integrated
|
||||
# into the chain
|
||||
if added.isErr():
|
||||
return if added.error() != VerifierError.Duplicate:
|
||||
warn "Unable to add routed block to block pool",
|
||||
blockRoot = shortLog(blck.root), blck = shortLog(blck.message),
|
||||
signature = shortLog(blck.signature), err = added.error()
|
||||
ok(blockRef)
|
||||
ok(Opt.none(BlockRef))
|
||||
else:
|
||||
# If it's duplicate, there's an existing BlockRef to return. The block
|
||||
# shouldn't be finalized already because that requires a couple epochs
|
||||
# before occurring, so only check non-finalized resolved blockrefs.
|
||||
let blockRef = router[].dag.getBlockRef(blck.root)
|
||||
if blockRef.isErr:
|
||||
warn "Unable to add routed duplicate block to block pool",
|
||||
blockRoot = shortLog(blck.root), blck = shortLog(blck.message),
|
||||
signature = shortLog(blck.signature), err = added.error()
|
||||
ok(blockRef)
|
||||
|
||||
|
||||
let blockRef = router[].dag.getBlockRef(blck.root)
|
||||
if blockRef.isErr:
|
||||
warn "Block finalised while waiting for block processor",
|
||||
blockRoot = shortLog(blck.root), blck = shortLog(blck.message),
|
||||
signature = shortLog(blck.signature)
|
||||
ok(blockRef)
|
||||
let blockRef = router[].dag.getBlockRef(blck.root)
|
||||
if blockRef.isErr:
|
||||
warn "Block finalised while waiting for block processor",
|
||||
blockRoot = shortLog(blck.root), blck = shortLog(blck.message),
|
||||
signature = shortLog(blck.signature)
|
||||
ok(blockRef)
|
||||
|
||||
proc routeAttestation*(
|
||||
router: ref MessageRouter,
|
||||
|
|
Loading…
Reference in New Issue