cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Merge pull request #153 from filecoin-project/fix/sync-bls-receipt

Browse Source 
fix putting the wrong items into the receipts tree for verification
This commit is contained in:
Whyrusleeping 2019-08-21 12:10:02 -07:00 committed by GitHub
commit f63089965d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
chain/sync.go
View File

@ -405,7 +405,7 @@ func (syncer *Syncer) ValidateBlock(ctx context.Context, b *types.FullBlock) err
baseTs, err := syncer.store.LoadTipSet(h.Parents) baseTs, err := syncer.store.LoadTipSet(h.Parents)
if err != nil { if err != nil {
return err return xerrors.Errorf("load tipset failed: %w", err)
} }
if err := syncer.minerIsValid(ctx, h.Miner, baseTs); err != nil { if err := syncer.minerIsValid(ctx, h.Miner, baseTs); err != nil {
@ -423,11 +423,11 @@ func (syncer *Syncer) ValidateBlock(ctx context.Context, b *types.FullBlock) err
vmi, err := vm.NewVM(stateroot, h.Height, h.Miner, syncer.store) vmi, err := vm.NewVM(stateroot, h.Height, h.Miner, syncer.store)
if err != nil { if err != nil {
return err return xerrors.Errorf("failed to instantiate VM: %w", err)
} }
if err := vmi.TransferFunds(actors.NetworkAddress, b.Header.Miner, vm.MiningRewardForBlock(baseTs)); err != nil { if err := vmi.TransferFunds(actors.NetworkAddress, b.Header.Miner, vm.MiningRewardForBlock(baseTs)); err != nil {
return err return xerrors.Errorf("fund transfer failed: %w", err)
} }
var receipts []interface{} var receipts []interface{}
@ -437,7 +437,7 @@ func (syncer *Syncer) ValidateBlock(ctx context.Context, b *types.FullBlock) err
return xerrors.Errorf("failed executing bls message %d in block %s: %w", i, b.Header.Cid(), err) return xerrors.Errorf("failed executing bls message %d in block %s: %w", i, b.Header.Cid(), err)
} }
receipts = append(receipts, receipt) receipts = append(receipts, receipt.MessageReceipt)
} }
for i, m := range b.SecpkMessages { for i, m := range b.SecpkMessages {
@ -452,7 +452,7 @@ func (syncer *Syncer) ValidateBlock(ctx context.Context, b *types.FullBlock) err
cst := hamt.CSTFromBstore(syncer.store.Blockstore()) cst := hamt.CSTFromBstore(syncer.store.Blockstore())
recptRoot, err := sharray.Build(context.TODO(), 4, receipts, cst) recptRoot, err := sharray.Build(context.TODO(), 4, receipts, cst)
if err != nil { if err != nil {
return err return xerrors.Errorf("building receipts sharray failed: %w", err)
} }
if recptRoot != b.Header.MessageReceipts { if recptRoot != b.Header.MessageReceipts {
return fmt.Errorf("receipts mismatched") return fmt.Errorf("receipts mismatched")
@ -460,7 +460,7 @@ func (syncer *Syncer) ValidateBlock(ctx context.Context, b *types.FullBlock) err
final, err := vmi.Flush(context.TODO()) final, err := vmi.Flush(context.TODO())
if err != nil { if err != nil {
return err return xerrors.Errorf("failed to flush VM state: %w", err)
} }
if b.Header.StateRoot != final { if b.Header.StateRoot != final {