From 400e42cc2d354c49aa884f96be40530c46d494bc Mon Sep 17 00:00:00 2001 From: terence tsao Date: Fri, 16 Apr 2021 10:18:59 -0700 Subject: [PATCH] Reuse ProcessBlockForStateRoot (#8781) --- .../core/state/transition_no_verify_sig.go | 26 ++----------------- 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/beacon-chain/core/state/transition_no_verify_sig.go b/beacon-chain/core/state/transition_no_verify_sig.go index 88cb5b8024..b989d1dbec 100644 --- a/beacon-chain/core/state/transition_no_verify_sig.go +++ b/beacon-chain/core/state/transition_no_verify_sig.go @@ -174,16 +174,11 @@ func ProcessBlockNoVerifyAnySig( } blk := signed.Block - body := blk.Body - bodyRoot, err := body.HashTreeRoot() + state, err := ProcessBlockForStateRoot(ctx, state, signed) if err != nil { return nil, nil, err } - state, err = b.ProcessBlockHeaderNoVerify(state, blk.Slot, blk.ProposerIndex, blk.ParentRoot, bodyRoot[:]) - if err != nil { - traceutil.AnnotateError(span, err) - return nil, nil, errors.Wrap(err, "could not process block header") - } + bSet, err := b.BlockSignatureSet(state, blk.ProposerIndex, signed.Signature, blk.HashTreeRoot) if err != nil { traceutil.AnnotateError(span, err) @@ -194,23 +189,6 @@ func ProcessBlockNoVerifyAnySig( traceutil.AnnotateError(span, err) return nil, nil, errors.Wrap(err, "could not retrieve randao signature set") } - state, err = b.ProcessRandaoNoVerify(state, signed.Block.Body.RandaoReveal) - if err != nil { - traceutil.AnnotateError(span, err) - return nil, nil, errors.Wrap(err, "could not verify and process randao") - } - - state, err = b.ProcessEth1DataInBlock(ctx, state, signed.Block.Body.Eth1Data) - if err != nil { - traceutil.AnnotateError(span, err) - return nil, nil, errors.Wrap(err, "could not process eth1 data") - } - - state, err = ProcessOperationsNoVerifyAttsSigs(ctx, state, signed) - if err != nil { - traceutil.AnnotateError(span, err) - return nil, nil, errors.Wrap(err, "could not process block operation") - } aSet, err := b.AttestationSignatureSet(ctx, state, signed.Block.Body.Attestations) if err != nil { return nil, nil, errors.Wrap(err, "could not retrieve attestation signature set")