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

Remove the null bls actor from the init actor state

Browse Source
This commit is contained in:
Aayush Rajasekaran 2021-02-18 17:16:32 -05:00
parent a0fedf8bdb
commit 96b4b828f7
1 changed files with 48 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
chain/stmgr/forks.go
View File

@ -9,6 +9,11 @@ import (
"sync" "sync"
"time" "time"
builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin"
adt3 "github.com/filecoin-project/specs-actors/v3/actors/util/adt"
init3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/init"
"github.com/filecoin-project/go-state-types/rt" "github.com/filecoin-project/go-state-types/rt"
"github.com/filecoin-project/go-address" "github.com/filecoin-project/go-address"
@ -900,7 +905,7 @@ func UpgradeCalico(ctx context.Context, sm *StateManager, _ MigrationCache, cb E
return newRoot, nil return newRoot, nil
} }
func terminateActor(tree *state.StateTree, addr address.Address, cb ExecCallback, epoch abi.ChainEpoch) error { func terminateActor(ctx context.Context, tree *state.StateTree, addr address.Address, cb ExecCallback, epoch abi.ChainEpoch) error {
a, err := tree.GetActor(addr) a, err := tree.GetActor(addr)
if xerrors.Is(err, types.ErrActorNotFound) { if xerrors.Is(err, types.ErrActorNotFound) {
return types.ErrActorNotFound return types.ErrActorNotFound
@ -929,7 +934,47 @@ func terminateActor(tree *state.StateTree, addr address.Address, cb ExecCallback
} }
} }
return tree.DeleteActor(addr) err = tree.DeleteActor(addr)
if err != nil {
return xerrors.Errorf("deleting actor from tree: %w", err)
}
ia, err := tree.GetActor(init_.Address)
if err != nil {
return xerrors.Errorf("loading init actor: %w", err)
}
var ias init3.State
err = tree.Store.Get(ctx, ia.Head, &ias)
if err != nil {
return xerrors.Errorf("loading init actor state: %w", err)
}
am, err := adt3.AsMap(adt.WrapStore(ctx, tree.Store), ias.AddressMap, builtin3.DefaultHamtBitwidth)
if err != nil {
return xerrors.Errorf("loading address map: %w", err)
}
err = am.Delete(abi.AddrKey(addr))
if err != nil {
return xerrors.Errorf("deleting entry from address map: %w", err)
}
amr, err := am.Root()
if err != nil {
return xerrors.Errorf("failed to get new address map root: %w", err)
}
ias.AddressMap = amr
nih, err := tree.Store.Put(ctx, &ias)
if err != nil {
return xerrors.Errorf("writing new init actor state: %w", err)
}
ia.Head = nih
return tree.SetActor(init_.Address, ia)
} }
func UpgradeActorsV3(ctx context.Context, sm *StateManager, cache MigrationCache, cb ExecCallback, root cid.Cid, epoch abi.ChainEpoch, ts *types.TipSet) (cid.Cid, error) { func UpgradeActorsV3(ctx context.Context, sm *StateManager, cache MigrationCache, cb ExecCallback, root cid.Cid, epoch abi.ChainEpoch, ts *types.TipSet) (cid.Cid, error) {
@ -968,7 +1013,7 @@ func UpgradeActorsV3(ctx context.Context, sm *StateManager, cache MigrationCache
} }
if build.BuildType == build.BuildMainnet { if build.BuildType == build.BuildMainnet {
err := terminateActor(tree, build.ZeroAddress, cb, epoch) err := terminateActor(ctx, tree, build.ZeroAddress, cb, epoch)
if err != nil && !xerrors.Is(err, types.ErrActorNotFound) { if err != nil && !xerrors.Is(err, types.ErrActorNotFound) {
return cid.Undef, xerrors.Errorf("deleting zero bls actor: %w", err) return cid.Undef, xerrors.Errorf("deleting zero bls actor: %w", err)
} }