Merge pull request #6492 from filecoin-project/chore/actor-bundle

Chore/actor bundle

Author: tediou5

app/submodule/chain/chaininfo_api.go

@@ -763,7 +763,7 @@ func (cia *chainInfoAPI) StateGetNetworkParams(ctx context.Context) (*types.Netw
 			UpgradeTuktukHeight:      cfg.NetworkParams.ForkUpgradeParam.UpgradeTuktukHeight,
 			UpgradeTeepHeight:        cfg.NetworkParams.ForkUpgradeParam.UpgradeTeepHeight,
 			UpgradeTockHeight:        cfg.NetworkParams.ForkUpgradeParam.UpgradeTockHeight,
-			UpgradeXxHeight:          cfg.NetworkParams.ForkUpgradeParam.UpgradeXxHeight,
+			UpgradeGoldenWeekHeight:  cfg.NetworkParams.ForkUpgradeParam.UpgradeGoldenWeekHeight,
 		},
 		Eip155ChainID: cfg.NetworkParams.Eip155ChainID,
 	}

app/submodule/chain/miner_api.go

@@ -964,6 +964,78 @@ func (msa *minerStateAPI) StateMinerInitialPledgeForSector(ctx context.Context,
 	return types.BigDiv(types.BigMul(initialPledge, initialPledgeNum), initialPledgeDen), nil
 }
 
+func (msa *minerStateAPI) StateMinerCreationDeposit(ctx context.Context, tsk types.TipSetKey) (types.BigInt, error) {
+	// Reference implementation: https://github.com/filecoin-project/builtin-actors/blob/00db828d09c3dfb61fe768ff6a19416a313444bd/actors/miner/src/lib.rs#L5264-L5279
+	nv, err := msa.ChainSubmodule.API().StateNetworkVersion(ctx, tsk)
+	if err != nil {
+		return types.EmptyInt, fmt.Errorf("getting network version: %w", err)
+	}
+
+	if nv < network.Version27 {
+		return big.Zero(), nil
+	}
+
+	// Get current chain head
+	ts, err := msa.ChainReader.GetTipSet(ctx, tsk)
+	if err != nil {
+		return types.EmptyInt, fmt.Errorf("loading tipset %s: %w", tsk, err)
+	}
+
+	_, state, err := msa.ChainSubmodule.Stmgr.ParentState(ctx, ts)
+	if err != nil {
+		return types.EmptyInt, fmt.Errorf("loading state %s: %w", tsk, err)
+	}
+
+	rewardActor, found, err := state.GetActor(ctx, reward.Address)
+	if err != nil {
+		return types.EmptyInt, fmt.Errorf("loading reward actor: %w", err)
+	}
+	if !found {
+		return types.EmptyInt, errors.New("not found reward")
+	}
+
+	rewardState, err := reward.Load(msa.ChainReader.Store(ctx), rewardActor)
+	if err != nil {
+		return types.EmptyInt, fmt.Errorf("loading reward actor state: %w", err)
+	}
+
+	circSupply, err := msa.StateVMCirculatingSupplyInternal(ctx, ts.Key())
+	if err != nil {
+		return types.EmptyInt, fmt.Errorf("getting circulating supply: %w", err)
+	}
+
+	pledgeCollateral, powerSmoothed, err := msa.pledgeCalculationInputs(ctx, state)
+	if err != nil {
+		return types.EmptyInt, err
+	}
+
+	// Get network parameters to obtain ConsensusMinerMinPower
+	networkParams, err := msa.ChainSubmodule.API().StateGetNetworkParams(ctx)
+	if err != nil {
+		return types.EmptyInt, fmt.Errorf("getting network params: %w", err)
+	}
+	createMinerDepositPower := big.Div(networkParams.ConsensusMinerMinPower, big.NewInt(10))
+
+	epochsSinceRampStart, rampDurationEpochs, err := msa.getPledgeRampParams(ctx, ts.Height(), state)
+	if err != nil {
+		return types.EmptyInt, fmt.Errorf("getting pledge ramp params: %w", err)
+	}
+
+	deposit, err := rewardState.InitialPledgeForPower(
+		createMinerDepositPower,
+		pledgeCollateral,
+		powerSmoothed,
+		circSupply.FilCirculating,
+		epochsSinceRampStart,
+		rampDurationEpochs,
+	)
+	if err != nil {
+		return types.EmptyInt, fmt.Errorf("calculating initial pledge for power: %w", err)
+	}
+
+	return deposit, nil
+}
+
 // StateVMCirculatingSupplyInternal returns an approximation of the circulating supply of Filecoin at the given tipset.
 // This is the value reported by the runtime interface to actors code.
 func (msa *minerStateAPI) StateVMCirculatingSupplyInternal(ctx context.Context, tsk types.TipSetKey) (types.CirculatingSupply, error) {

cmd/miner.go

@@ -165,10 +165,15 @@ var newMinerCmd = &cmds.Command{
 			sender = faddr
 		}
 
+		deposit, err := env.(*node.Env).ChainAPI.StateMinerCreationDeposit(ctx, types.EmptyTSK)
+		if err != nil {
+			return err
+		}
+
 		createStorageMinerMsg := &types.Message{
 			To:    power.Address,
 			From:  sender,
-			Value: big.Zero(),
+			Value: deposit,
 
 			Method: power.Methods.CreateMiner,
 			Params: params,

extern/filecoin-ffi

@@ -68,7 +68,7 @@ func ButterflySnapNet() *NetworkConf {
 				UpgradeTeepHeight:                    -30,
 				UpgradeTockFixHeight:                 -29,
 				UpgradeTockHeight:                    -31,
-				UpgradeXxHeight:                      9999999999,
+				UpgradeGoldenWeekHeight:              9999999999,
 			},
 			DrandSchedule:           map[abi.ChainEpoch]config.DrandEnum{0: config.DrandQuicknet},
 			AddressNetwork:          address.Testnet,

fixtures/networks/butterfly.go

@@ -75,7 +75,7 @@ func Calibration() *NetworkConf {
 				UpgradeTuktukPowerRampDurationEpochs: builtin.EpochsInDay * 3,
 				UpgradeTeepHeight:                    2523454, // 2025-03-26T23:00:00Z
 				UpgradeTockFixHeight:                 2558014, // 2025-04-07T23:00:00Z
-				UpgradeXxHeight:                      99999999,
+				UpgradeGoldenWeekHeight:              3007294, // 2025-09-10T23:00:00Z
 			},
 			DrandSchedule:           map[abi.ChainEpoch]config.DrandEnum{0: 1},
 			AddressNetwork:          address.Testnet,

fixtures/networks/calibration.go

@@ -70,7 +70,7 @@ func ForceNet() *NetworkConf {
 				UpgradeTeepHeight:                    -30,
 				UpgradeTockHeight:                    -31,
 				UpgradeTockFixHeight:                 -29,
-				UpgradeXxHeight:                      200,
+				UpgradeGoldenWeekHeight:              200,
 			},
 			DrandSchedule:           map[abi.ChainEpoch]config.DrandEnum{0: config.DrandQuicknet},
 			AddressNetwork:          address.Testnet,

fixtures/networks/forcenet.go

@@ -61,7 +61,7 @@ func IntegrationNet() *NetworkConf {
 				UpgradeTuktukHeight:               4461240,
 				UpgradeTeepHeight:                 4867320,
 				UpgradeTockFixHeight:              -29,
-				UpgradeXxHeight:                   999999999,
+				UpgradeGoldenWeekHeight:           999999999,
 			},
 			DrandSchedule:           map[abi.ChainEpoch]config.DrandEnum{0: 5, 51000: 1},
 			AddressNetwork:          address.Testnet,

fixtures/networks/integrationtestnet.go

@@ -69,7 +69,7 @@ func InteropNet() *NetworkConf {
 				UpgradeTeepHeight:                    -30,
 				UpgradeTockHeight:                    -31,
 				UpgradeTockFixHeight:                 -29,
-				UpgradeXxHeight:                      50,
+				UpgradeGoldenWeekHeight:              50,
 			},
 			DrandSchedule:           map[abi.ChainEpoch]config.DrandEnum{0: config.DrandQuicknet},
 			AddressNetwork:          address.Testnet,

fixtures/networks/interopnet.go

@@ -78,7 +78,7 @@ func Mainnet() *NetworkConf {
 				UpgradeTuktukPowerRampDurationEpochs: builtin2.EpochsInYear,
 				UpgradeTeepHeight:                    4878840, // 2025-04-14T23:00:00Z
 				UpgradeTockFixHeight:                 -1,
-				UpgradeXxHeight:                      9999999999,
+				UpgradeGoldenWeekHeight:              9999999999,
 			},
 			DrandSchedule:                 map[abi.ChainEpoch]config.DrandEnum{0: 5, 51000: 1},
 			AddressNetwork:                address.Mainnet,