Lock before setting up genesis msigs

build/params_testground.go

@@ -49,13 +49,13 @@ var (
 	TicketRandomnessLookback     = abi.ChainEpoch(1)
 	WinningPoStSectorSetLookback = abi.ChainEpoch(10)
 
-	TotalFilecoin     uint64 = 2_000_000_000
-	MiningRewardTotal uint64 = 1_400_000_000
+	FilBase               uint64 = 2_000_000_000
+	FilAllocStorageMining uint64 = 1_400_000_000
 
 	FilecoinPrecision uint64 = 1_000_000_000_000_000_000
 
 	InitialRewardBalance = func() *big.Int {
-		v := big.NewInt(int64(MiningRewardTotal))
+		v := big.NewInt(int64(FilAllocStorageMining))
 		v = v.Mul(v, big.NewInt(int64(FilecoinPrecision)))
 		return v
 	}()

chain/stmgr/stmgr.go

@@ -39,6 +39,7 @@ type StateManager struct {
 	stCache       map[string][]cid.Cid
 	compWait      map[string]chan struct{}
 	stlk          sync.Mutex
+	genesisMsigLk sync.Mutex
 	newVM         func(cid.Cid, abi.ChainEpoch, vm.Rand, blockstore.Blockstore, vm.SyscallBuilder, vm.VestedCalculator) (*vm.VM, error)
 	genesisMsigs  []multisig.State
 }
@@ -852,7 +853,8 @@ func (sm *StateManager) setupGenesisMsigs(ctx context.Context) error {
 }
 
 func (sm *StateManager) GetVestedFunds(ctx context.Context, height abi.ChainEpoch) (abi.TokenAmount, error) {
-
+	sm.genesisMsigLk.Lock()
+	defer sm.genesisMsigLk.Unlock()
 	if sm.genesisMsigs == nil {
 		err := sm.setupGenesisMsigs(ctx)
 		if err != nil {

chain/vm/runtime.go

@@ -73,6 +73,9 @@ func (rt *Runtime) TotalFilCircSupply() abi.TokenAmount {
 	}
 
 	filMined := types.BigSub(types.FromFil(build.FilAllocStorageMining), rew.Balance)
+	if filMined.LessThan(big.Zero()) {
+		filMined = big.Zero()
+	}
 
 	burnt, err := rt.state.GetActor(builtin.BurntFundsActorAddr)
 	if err != nil {
@@ -109,6 +112,10 @@ func (rt *Runtime) TotalFilCircSupply() abi.TokenAmount {
 	ret := types.BigAdd(filVested, filMined)
 	ret = types.BigSub(ret, filBurned)
 	ret = types.BigSub(ret, filLocked)
+
+	if ret.LessThan(big.Zero()) {
+		ret = big.Zero()
+	}
 	return ret
 }