Delete the null-bls actor

chain/stmgr/forks.go

@@ -110,6 +110,12 @@ type UpgradeSchedule []Upgrade
 
 type migrationLogger struct{}
 
+var fakeRct = &types.MessageReceipt{
+	ExitCode: 0,
+	Return:   nil,
+	GasUsed:  0,
+}
+
 func (ml migrationLogger) Log(level rt.LogLevel, msg string, args ...interface{}) {
 	switch level {
 	case rt.DEBUG:
@@ -422,19 +428,8 @@ func doTransfer(tree types.StateTree, from, to address.Address, amt abi.TokenAmo
 	if cb != nil {
 		// record the transfer in execution traces
 
-		fakeMsg := &types.Message{
-			From:  from,
-			To:    to,
-			Value: amt,
-		}
-		fakeRct := &types.MessageReceipt{
-			ExitCode: 0,
-			Return:   nil,
-			GasUsed:  0,
-		}
-
 		cb(types.ExecutionTrace{
-			Msg:        fakeMsg,
+			Msg:        makeFakeMsg(from, to, amt, 0),
 			MsgRct:     fakeRct,
 			Error:      "",
 			Duration:   0,
@@ -699,17 +694,7 @@ func UpgradeFaucetBurnRecovery(ctx context.Context, sm *StateManager, _ Migratio
 	if cb != nil {
 		// record the transfer in execution traces
 
-		fakeMsg := &types.Message{
-			From:  builtin.SystemActorAddr,
-			To:    builtin.SystemActorAddr,
-			Value: big.Zero(),
-			Nonce: uint64(epoch),
-		}
-		fakeRct := &types.MessageReceipt{
-			ExitCode: 0,
-			Return:   nil,
-			GasUsed:  0,
-		}
+		fakeMsg := makeFakeMsg(builtin.SystemActorAddr, builtin.SystemActorAddr, big.Zero(), uint64(epoch))
 
 		if err := cb(fakeMsg.Cid(), fakeMsg, &vm.ApplyRet{
 			MessageReceipt: *fakeRct,
@@ -915,6 +900,38 @@ func UpgradeCalico(ctx context.Context, sm *StateManager, _ MigrationCache, cb E
 	return newRoot, nil
 }
 
+func terminateActor(tree *state.StateTree, addr address.Address, cb ExecCallback, epoch abi.ChainEpoch) error {
+	a, err := tree.GetActor(addr)
+	if xerrors.Is(err, types.ErrActorNotFound) {
+		return types.ErrActorNotFound
+	}
+
+	var trace types.ExecutionTrace
+	if err := doTransfer(tree, addr, builtin.BurntFundsActorAddr, a.Balance, func(t types.ExecutionTrace) {
+		trace = t
+	}); err != nil {
+		return xerrors.Errorf("transferring terminated actor's balance: %w", err)
+	}
+
+	if cb != nil {
+		// record the transfer in execution traces
+
+		fakeMsg := makeFakeMsg(builtin.SystemActorAddr, addr, big.Zero(), uint64(epoch))
+
+		if err := cb(fakeMsg.Cid(), fakeMsg, &vm.ApplyRet{
+			MessageReceipt: *fakeRct,
+			ActorErr:       nil,
+			ExecutionTrace: trace,
+			Duration:       0,
+			GasCosts:       nil,
+		}); err != nil {
+			return xerrors.Errorf("recording transfers: %w", err)
+		}
+	}
+
+	return tree.DeleteActor(addr)
+}
+
 func UpgradeActorsV3(ctx context.Context, sm *StateManager, cache MigrationCache, cb ExecCallback, root cid.Cid, epoch abi.ChainEpoch, ts *types.TipSet) (cid.Cid, error) {
 	// Use all the CPUs except 3.
 	workerCount := runtime.NumCPU() - 3
@@ -945,6 +962,21 @@ func UpgradeActorsV3(ctx context.Context, sm *StateManager, cache MigrationCache
 		return cid.Undef, xerrors.Errorf("failed to load init actor after upgrade: %w", err)
 	}
 
+	tree, err := sm.StateTree(newRoot)
+	if err != nil {
+		return cid.Undef, xerrors.Errorf("getting state tree: %w", err)
+	}
+
+	err = terminateActor(tree, build.ZeroAddress, cb, epoch)
+	if err != nil && !xerrors.Is(err, types.ErrActorNotFound) {
+		return cid.Undef, xerrors.Errorf("deleting zero bls actor: %w", err)
+	}
+
+	newRoot, err = tree.Flush(ctx)
+	if err != nil {
+		return cid.Undef, xerrors.Errorf("flushing state tree: %w", err)
+	}
+
 	return newRoot, nil
 }
 
@@ -1139,17 +1171,7 @@ func splitGenesisMultisig0(ctx context.Context, cb ExecCallback, addr address.Ad
 	if cb != nil {
 		// record the transfer in execution traces
 
-		fakeMsg := &types.Message{
-			From:  builtin.SystemActorAddr,
-			To:    addr,
-			Value: big.Zero(),
-			Nonce: uint64(epoch),
-		}
-		fakeRct := &types.MessageReceipt{
-			ExitCode: 0,
-			Return:   nil,
-			GasUsed:  0,
-		}
+		fakeMsg := makeFakeMsg(builtin.SystemActorAddr, addr, big.Zero(), uint64(epoch))
 
 		if err := cb(fakeMsg.Cid(), fakeMsg, &vm.ApplyRet{
 			MessageReceipt: *fakeRct,
@@ -1275,3 +1297,12 @@ func resetMultisigVesting0(ctx context.Context, store adt0.Store, tree *state.St
 
 	return nil
 }
+
+func makeFakeMsg(from address.Address, to address.Address, amt abi.TokenAmount, nonce uint64) *types.Message {
+	return &types.Message{
+		From:  from,
+		To:    to,
+		Value: amt,
+		Nonce: nonce,
+	}
+}