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

Merge pull request #3252 from filecoin-project/fix/burnt-funds-state

Browse Source 
fix setup of burnt funds actor state
This commit is contained in:
Whyrusleeping 2020-08-24 11:43:34 -07:00 committed by GitHub
commit f200ac6287
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
chain/gen/genesis/genesis.go
View File

@ -118,11 +118,6 @@ func MakeInitialStateTree(ctx context.Context, bs bstore.Blockstore, template ge
return nil, nil, xerrors.Errorf("making new state tree: %w", err) return nil, nil, xerrors.Errorf("making new state tree: %w", err)
} }
emptyobject, err := cst.Put(context.TODO(), []struct{}{})
if err != nil {
return nil, nil, xerrors.Errorf("failed putting empty object: %w", err)
}
// Create system actor // Create system actor
sysact, err := SetupSystemActor(bs) sysact, err := SetupSystemActor(bs)
@ -191,11 +186,18 @@ func MakeInitialStateTree(ctx context.Context, bs bstore.Blockstore, template ge
return nil, nil, xerrors.Errorf("set market actor: %w", err) return nil, nil, xerrors.Errorf("set market actor: %w", err)
} }
burntRoot, err := cst.Put(ctx, &account.State{
Address: builtin.BurntFundsActorAddr,
})
if err != nil {
return nil, nil, xerrors.Errorf("failed to setup burnt funds actor state: %w", err)
}
// Setup burnt-funds // Setup burnt-funds
err = state.SetActor(builtin.BurntFundsActorAddr, &types.Actor{ err = state.SetActor(builtin.BurntFundsActorAddr, &types.Actor{
Code: builtin.AccountActorCodeID, Code: builtin.AccountActorCodeID,
Balance: types.NewInt(0), Balance: types.NewInt(0),
Head: emptyobject, Head: burntRoot,
}) })
if err != nil { if err != nil {
return nil, nil, xerrors.Errorf("set burnt funds account actor: %w", err) return nil, nil, xerrors.Errorf("set burnt funds account actor: %w", err)