fix: reduce amount of buildconstant hacking in itests

Author: rvagg

itests/daily_fees_test.go

@@ -21,6 +21,7 @@ import (
 	gstStore "github.com/filecoin-project/go-state-types/store"
 
 	"github.com/filecoin-project/lotus/blockstore"
+	"github.com/filecoin-project/lotus/build/buildconstants"
 	"github.com/filecoin-project/lotus/chain/actors/builtin/miner"
 	"github.com/filecoin-project/lotus/chain/consensus/filcns"
 	"github.com/filecoin-project/lotus/chain/state"
@@ -44,6 +45,15 @@ func TestDailyFees(t *testing.T) {
 		nv26epoch abi.ChainEpoch = nv25epoch + builtin.EpochsInDay/2 // Tock
 		feePostWg sync.WaitGroup
 	)
+	// itests start off with a FilReserved of 300M FIL, leading to a circulating supply of 0 initially,
+	// but we'll also simulate the calibnet bump of the InitialFilReserved to get the circulating
+	// supply calculation up to ~700M FIL. It has ~300M in it, we need to pretend 700M has been used,
+	// so 1B - 300M = 700M.
+	originalUpgradeTeepInitialFilReserved := buildconstants.UpgradeTeepInitialFilReserved
+	buildconstants.UpgradeTeepInitialFilReserved = types.MustParseFIL("1000000000 FIL").Int
+	t.Cleanup(func() {
+		buildconstants.UpgradeTeepInitialFilReserved = originalUpgradeTeepInitialFilReserved
+	})
 
 	type sectorInfo struct {
 		sn          abi.SectorNumber

itests/fevm_test.go

@@ -427,7 +427,7 @@ func TestFEVMTestSendToContract(t *testing.T) {
 	_, _, err = client.EVM().InvokeContractByFuncName(ctx, fromAddr, contractAddr, "destroy()", []byte{})
 	require.NoError(t, err)
 
-	finalBalanceMinimum := types.FromFil(uint64(99_999_999)) // 100 million FIL - 1 FIL for gas upper bounds
+	finalBalanceMinimum := types.FromFil(uint64(9_999_999)) // 10 million FIL - 1 FIL for gas upper bounds
 	finalBal, err := client.WalletBalance(ctx, client.DefaultKey.Address)
 	require.NoError(t, err)
 	require.Equal(t, true, finalBal.GreaterThan(finalBalanceMinimum))

itests/kit/ensemble.go

@@ -54,6 +54,7 @@ import (
 	"github.com/filecoin-project/lotus/cmd/lotus-worker/sealworker"
 	"github.com/filecoin-project/lotus/gateway"
 	"github.com/filecoin-project/lotus/genesis"
+	"github.com/filecoin-project/lotus/lib/must"
 	lotusminer "github.com/filecoin-project/lotus/miner"
 	"github.com/filecoin-project/lotus/node"
 	"github.com/filecoin-project/lotus/node/config"
@@ -158,14 +159,23 @@ func NewEnsemble(t *testing.T, opts ...EnsembleOpt) *Ensemble {
 		}
 	}
 
+	usedBalance := big.Zero()
 	// add accounts from ensemble options to genesis.
 	for _, acc := range options.accounts {
 		n.genesis.accounts = append(n.genesis.accounts, genesis.Actor{
 			Type:    genesis.TAccount,
 			Balance: acc.initialBalance,
 			Meta:    (&genesis.AccountMeta{Owner: acc.key.Address}).ActorMeta(),
 		})
+		usedBalance = big.Add(usedBalance, acc.initialBalance)
 	}
+	// Soak up some balance from FilBase so that we leave FilReserved at 300M to match mainnet.
+	// See https://github.com/filecoin-project/lotus/pull/12932 for context on this.
+	n.genesis.accounts = append(n.genesis.accounts, genesis.Actor{
+		Type:    genesis.TAccount,
+		Balance: big.Sub(big.Int(types.MustParseFIL("400000000 FIL")), usedBalance),
+		Meta:    (&genesis.AccountMeta{Owner: must.One(key.GenerateKey(types.KTSecp256k1)).Address}).ActorMeta(),
+	})
 
 	// Ensure we're using the right actors. This really shouldn't be some global thing, but it's
 	// the best we can do for now.
@@ -176,15 +186,7 @@ func NewEnsemble(t *testing.T, opts ...EnsembleOpt) *Ensemble {
 	}
 
 	buildconstants.EquivocationDelaySecs = 0
-
-	// See FIP-0100; we manually set these to the 2k network settings for itests not run with -tags 2k
 	buildconstants.UpgradeAssemblyHeight = -1 // so GetVMCirculatingSupplyDetailed() properly calculates FilReserved
-	// 700M FIL is the correct value for test networks, with UpgradeAssemblyHeight in the past, this
-	// value is used in supply.go to calculate the mining reserve in circulation which is added to
-	// circulating supply.
-	buildconstants.InitialFilReserved = types.MustParseFIL("700000000 FIL").Int
-	// Bump it at Teep upgrade to simulate FIP-0100 and get CS close to ~700M FIL like in mainnet.
-	buildconstants.UpgradeTeepInitialFilReserved = types.MustParseFIL("1400000000 FIL").Int
 
 	return n
 }

itests/kit/evm.go

@@ -425,12 +425,12 @@ func SetupFEVMTest(t *testing.T, opts ...interface{}) (context.Context, context.
 	ens.InterconnectAll().BeginMining(blockTime)
 	ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
 
-	// require that the initial balance is 100 million FIL in setup
+	// require that the initial balance is 10 million FIL in setup
 	// this way other tests can count on this initial wallet balance
 	fromAddr := client.DefaultKey.Address
 	bal, err := client.WalletBalance(ctx, fromAddr)
 	require.NoError(t, err)
-	originalBalance := types.FromFil(uint64(100_000_000)) // 100 million FIL
+	originalBalance := types.FromFil(uint64(10_000_000)) // 10 million FIL
 	require.Equal(t, originalBalance, bal)
 
 	return ctx, cancel, client

itests/kit/node_opts.go

@@ -81,7 +81,7 @@ var _ connmgr.ConnectionGater = (*loopbackConnGater)(nil)
 
 // DefaultNodeOpts are the default options that will be applied to test nodes.
 var DefaultNodeOpts = nodeOpts{
-	balance:    big.Mul(big.NewInt(100000000), types.NewInt(buildconstants.FilecoinPrecision)),
+	balance:    big.Mul(big.NewInt(10_000_000), types.NewInt(buildconstants.FilecoinPrecision)),
 	sectors:    DefaultPresealsPerBootstrapMiner,
 	sectorSize: abi.SectorSize(2 << 10), // 2KiB.
 

itests/migration_test.go

@@ -909,6 +909,10 @@ func TestMigrationNV24(t *testing.T) {
 	)
 	buildconstants.UpgradeTuktukPowerRampDurationEpochs = powerRampDurationEpochs
 	buildconstants.UpgradeTuktukHeight = nv24epoch
+	// Pretend that the reserve account started with 1B FIL, so that when calculating the
+	// circulating supply we find that the reserve account only has ~300M FIL so there must be ~700M
+	// FIL in circulation, which is close to current mainnet supply.
+	buildconstants.InitialFilReserved = types.MustParseFIL("1000000000 FIL").Int
 
 	// InitialPledgeMaxPerByte is a little too low for an itest environment so gets in the way of
 	// testing the underlying calculation, so we bump it up here so it doesn't interfere.

itests/supply_test.go

@@ -28,7 +28,7 @@ func TestCirciulationSupplyUpgrade(t *testing.T) {
 	ctx := context.Background()
 
 	// Choosing something divisible by epochs per day to remove error with simple deal duration
-	lockedClientBalance := big.Mul(abi.NewTokenAmount(11_520_000), abi.NewTokenAmount(1e18))
+	lockedClientBalance := big.Mul(abi.NewTokenAmount(8_640_000), abi.NewTokenAmount(1e18))
 	lockedProviderBalance := big.Mul(abi.NewTokenAmount(1_000_000), abi.NewTokenAmount(1e18))
 	var height0 abi.ChainEpoch
 	var height1 abi.ChainEpoch