Merge pull request #6463 from filecoin-project/chore/transport

tediou5 · web-flow · commit 7ca6448cb65b · 2025-03-21T15:12:04.000+08:00
Chore/transport
diff --git a/app/submodule/chain/chaininfo_api.go b/app/submodule/chain/chaininfo_api.go
@@ -762,6 +762,7 @@ func (cia *chainInfoAPI) StateGetNetworkParams(ctx context.Context) (*types.Netw
 			UpgradeWaffleHeight:      cfg.NetworkParams.ForkUpgradeParam.UpgradeWaffleHeight,
 			UpgradeTuktukHeight:      cfg.NetworkParams.ForkUpgradeParam.UpgradeTuktukHeight,
 			UpgradeTeepHeight:        cfg.NetworkParams.ForkUpgradeParam.UpgradeTeepHeight,
+			UpgradeTockHeight:        cfg.NetworkParams.ForkUpgradeParam.UpgradeTockHeight,
 		},
 		Eip155ChainID: cfg.NetworkParams.Eip155ChainID,
 	}
diff --git a/cmd/state.go b/cmd/state.go
@@ -278,6 +278,11 @@ var stateSectorCmd = &cmds.Command{
 			return err
 		}
 
+		nv, err := env.(*node.Env).ChainAPI.StateNetworkVersion(ctx, ts.Key())
+		if err != nil {
+			return err
+		}
+
 		si, err := env.(*node.Env).ChainAPI.StateSectorGetInfo(ctx, maddr, abi.SectorNumber(sid), ts.Key())
 		if err != nil {
 			return err
@@ -300,6 +305,16 @@ var stateSectorCmd = &cmds.Command{
 		writer.Println("DealWeight: ", si.DealWeight)
 		writer.Println("VerifiedDealWeight: ", si.VerifiedDealWeight)
 		writer.Println("InitialPledge: ", types.FIL(si.InitialPledge))
+
+		if nv < network.Version25 {
+			if si.ExpectedDayReward != nil {
+				writer.Println("ExpectedDayReward: ", types.FIL(*si.ExpectedDayReward))
+			}
+			if si.ExpectedStoragePledge != nil {
+				writer.Println("ExpectedStoragePledge: ", types.FIL(*si.ExpectedStoragePledge))
+			}
+		}
+
 		writer.Println()
 
 		sp, err := env.(*node.Env).ChainAPI.StateSectorPartition(req.Context, maddr, abi.SectorNumber(sid), ts.Key())
diff --git a/fixtures/networks/butterfly.go b/fixtures/networks/butterfly.go
@@ -67,6 +67,7 @@ func ButterflySnapNet() *NetworkConf {
 				UpgradeTuktukHeight:                  -28,
 				UpgradeTuktukPowerRampDurationEpochs: builtin.EpochsInYear,
 				UpgradeTeepHeight:                    100,
+				UpgradeTockHeight:                    200,
 			},
 			DrandSchedule:           map[abi.ChainEpoch]config.DrandEnum{0: config.DrandQuicknet},
 			AddressNetwork:          address.Testnet,
diff --git a/fixtures/networks/calibration.go b/fixtures/networks/calibration.go
@@ -74,7 +74,7 @@ func Calibration() *NetworkConf {
 				UpgradeWaffleHeight:                  1779094,       // 2024-07-11T12:00:00Z
 				UpgradeTuktukHeight:                  2078794,       // 2024-10-23T13:30:00Z
 				UpgradeTuktukPowerRampDurationEpochs: builtin.EpochsInDay * 3,
-				UpgradeTeepHeight:                    2520574, // 2025-03-25T23:00:00Z
+				UpgradeTeepHeight:                    2523454, // 2025-03-26T23:00:00Z
 			},
 			DrandSchedule:           map[abi.ChainEpoch]config.DrandEnum{0: 1},
 			AddressNetwork:          address.Testnet,
@@ -96,5 +96,9 @@ func Calibration() *NetworkConf {
 	nc.Network.F3Enabled = true
 	nc.Network.ManifestServerID = "12D3KooWS9vD9uwm8u2uPyJV32QBAhKAmPYwmziAgr3Xzk2FU1Mr"
 
+	// This epoch, 7 days after Teep is the completion of FIP-0100 where actors will start applying
+	// the new daily fee to pre-Teep sectors being extended.
+	nc.Network.ForkUpgradeParam.UpgradeTockHeight = nc.Network.ForkUpgradeParam.UpgradeTeepHeight + builtin.EpochsInDay*7
+
 	return nc
 }
diff --git a/fixtures/networks/forcenet.go b/fixtures/networks/forcenet.go
@@ -69,6 +69,7 @@ func ForceNet() *NetworkConf {
 				UpgradeTuktukHeight:                  -28,
 				UpgradeTuktukPowerRampDurationEpochs: 200,
 				UpgradeTeepHeight:                    200,
+				UpgradeTockHeight:                    300,
 			},
 			DrandSchedule:           map[abi.ChainEpoch]config.DrandEnum{0: config.DrandQuicknet},
 			AddressNetwork:          address.Testnet,
diff --git a/fixtures/networks/integrationtestnet.go b/fixtures/networks/integrationtestnet.go
@@ -6,6 +6,7 @@ import (
 	"github.com/filecoin-project/go-state-types/network"
 	"github.com/filecoin-project/venus/pkg/config"
 	"github.com/filecoin-project/venus/pkg/constants"
+	"github.com/filecoin-project/venus/venus-shared/actors/builtin"
 	"github.com/filecoin-project/venus/venus-shared/types"
 	"github.com/ipfs/go-cid"
 )
@@ -80,5 +81,7 @@ func IntegrationNet() *NetworkConf {
 	nc.Network.ForkUpgradeParam.UpgradePhoenixHeight = nc.Network.ForkUpgradeParam.UpgradeDragonHeight + 10
 	nc.Network.DrandSchedule[nc.Network.ForkUpgradeParam.UpgradePhoenixHeight] = config.DrandQuicknet
 
+	nc.Network.ForkUpgradeParam.UpgradeTockHeight = nc.Network.ForkUpgradeParam.UpgradeTeepHeight + builtin.EpochsInDay*90
+
 	return nc
 }
diff --git a/fixtures/networks/interopnet.go b/fixtures/networks/interopnet.go
@@ -68,6 +68,7 @@ func InteropNet() *NetworkConf {
 				UpgradeTuktukHeight:                  -28,
 				UpgradeTuktukPowerRampDurationEpochs: builtin.EpochsInYear,
 				UpgradeTeepHeight:                    50,
+				UpgradeTockHeight:                    100,
 			},
 			DrandSchedule:           map[abi.ChainEpoch]config.DrandEnum{0: config.DrandQuicknet},
 			AddressNetwork:          address.Testnet,
diff --git a/fixtures/networks/mainnet.go b/fixtures/networks/mainnet.go
@@ -7,6 +7,7 @@ import (
 	builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
 	"github.com/filecoin-project/venus/pkg/config"
 	"github.com/filecoin-project/venus/pkg/constants"
+	"github.com/filecoin-project/venus/venus-shared/actors/builtin"
 	"github.com/filecoin-project/venus/venus-shared/types"
 	"github.com/ipfs/go-cid"
 )
@@ -20,6 +21,9 @@ func Mainnet() *NetworkConf {
 				"/dns/bootstrap-mainnet-0.chainsafe-fil.io/tcp/34000/p2p/12D3KooWKKkCZbcigsWTEu1cgNetNbZJqeNtysRtFpq7DTqw3eqH",
 				"/dns/bootstrap-mainnet-1.chainsafe-fil.io/tcp/34000/p2p/12D3KooWGnkd9GQKo3apkShQDaq1d6cKJJmsVe6KiQkacUk1T8oZ",
 				"/dns/bootstrap-mainnet-2.chainsafe-fil.io/tcp/34000/p2p/12D3KooWHQRSDFv4FvAjtU32shQ7znz7oRbLBryXzZ9NMK2feyyH",
+				"/dns/n1.mainnet.fil.devtty.eu/udp/443/quic-v1/p2p/12D3KooWAke3M2ji7tGNKx3BQkTHCyxVhtV1CN68z6Fkrpmfr37F",
+				"/dns/n1.mainnet.fil.devtty.eu/tcp/443/p2p/12D3KooWAke3M2ji7tGNKx3BQkTHCyxVhtV1CN68z6Fkrpmfr37F",
+				"/dns/n1.mainnet.fil.devtty.eu/udp/443/quic-v1/webtransport/certhash/uEiAWlgd8EqbNhYLv86OdRvXHMosaUWFFDbhgGZgCkcmKnQ/certhash/uEiAvtq6tvZOZf_sIuityDDTyAXDJPfXSRRDK2xy9UVPsqA/p2p/12D3KooWAke3M2ji7tGNKx3BQkTHCyxVhtV1CN68z6Fkrpmfr37F",
 			},
 			Period: "30s",
 		},
@@ -94,5 +98,9 @@ func Mainnet() *NetworkConf {
 	nc.Network.ForkUpgradeParam.UpgradePhoenixHeight = nc.Network.ForkUpgradeParam.UpgradeDragonHeight + 120
 	nc.Network.DrandSchedule[nc.Network.ForkUpgradeParam.UpgradePhoenixHeight] = config.DrandQuicknet
 
+	// This epoch, 90 days after Teep is the completion of FIP-0100 where actors will start applying
+	// the new daily fee to pre-Teep sectors being extended.
+	nc.Network.ForkUpgradeParam.UpgradeTockHeight = nc.Network.ForkUpgradeParam.UpgradeTeepHeight + builtin.EpochsInDay*90
+
 	return nc
 }
diff --git a/fixtures/networks/net_2k.go b/fixtures/networks/net_2k.go
@@ -63,6 +63,7 @@ func Net2k() *NetworkConf {
 				UpgradeTuktukPowerRampDurationEpochs: 200,
 				UpgradeTuktukHeight:                  -28,
 				UpgradeTeepHeight:                    200,
+				UpgradeTockHeight:                    300,
 			},
 			DrandSchedule:           map[abi.ChainEpoch]config.DrandEnum{0: config.DrandQuicknet},
 			AddressNetwork:          address.Testnet,
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -19,6 +19,7 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/filecoin-project/venus/pkg/constants"
+	"github.com/filecoin-project/venus/venus-shared/actors/builtin"
 	"github.com/filecoin-project/venus/venus-shared/types"
 )
 
@@ -355,6 +356,7 @@ type ForkUpgradeConfig struct {
 	UpgradeTuktukHeight                  abi.ChainEpoch `json:"upgradeTuktukHeight"`
 	UpgradeTuktukPowerRampDurationEpochs abi.ChainEpoch `json:"upgradeTuktukPowerRampDurationEpochs"`
 	UpgradeTeepHeight                    abi.ChainEpoch `json:"upgradeTeepHeight"`
+	UpgradeTockHeight                    abi.ChainEpoch `json:"upgradeTockHeight"`
 }
 
 func IsNearUpgrade(epoch, upgradeEpoch abi.ChainEpoch) bool {
@@ -398,7 +400,8 @@ var DefaultForkUpgradeParam = &ForkUpgradeConfig{
 	UpgradeWaffleHeight:                  4154640,
 	UpgradeTuktukHeight:                  4461240,
 	UpgradeTuktukPowerRampDurationEpochs: 200,
-	UpgradeTeepHeight:                    9999999999,
+	UpgradeTeepHeight:                    9999999998,
+	UpgradeTockHeight:                    9999999998 + 90*builtin.EpochsInDay,
 }
 
 func newDefaultNetworkParamsConfig() *NetworkParamsConfig {
diff --git a/pkg/fork/fork.go b/pkg/fork/fork.go
@@ -471,6 +471,11 @@ func DefaultUpgradeSchedule(cf *ChainFork, upgradeHeight *config.ForkUpgradeConf
 			}},
 			Expensive: true,
 		},
+		{
+			Height:    upgradeHeight.UpgradeTockHeight,
+			Network:   network.Version26,
+			Migration: nil,
+		},
 	}
 
 	for _, u := range updates {
diff --git a/venus-shared/api/chain/v0/method.md b/venus-shared/api/chain/v0/method.md
@@ -1665,7 +1665,8 @@ Response:
     "UpgradePhoenixHeight": 10101,
     "UpgradeWaffleHeight": 10101,
     "UpgradeTuktukHeight": 10101,
-    "UpgradeTeepHeight": 10101
+    "UpgradeTeepHeight": 10101,
+    "UpgradeTockHeight": 10101
   },
   "Eip155ChainID": 123
 }
diff --git a/venus-shared/api/chain/v1/method.md b/venus-shared/api/chain/v1/method.md
@@ -1881,7 +1881,8 @@ Response:
     "UpgradePhoenixHeight": 10101,
     "UpgradeWaffleHeight": 10101,
     "UpgradeTuktukHeight": 10101,
-    "UpgradeTeepHeight": 10101
+    "UpgradeTeepHeight": 10101,
+    "UpgradeTockHeight": 10101
   },
   "Eip155ChainID": 123
 }
diff --git a/venus-shared/types/api_types.go b/venus-shared/types/api_types.go
@@ -483,6 +483,7 @@ type ForkUpgradeParams struct {
 	UpgradeWaffleHeight      abi.ChainEpoch
 	UpgradeTuktukHeight      abi.ChainEpoch
 	UpgradeTeepHeight        abi.ChainEpoch
+	UpgradeTockHeight        abi.ChainEpoch
 }
 
 type NodeStatus struct {

Original file line number	Diff line number	Diff line change
`@@ -762,6 +762,7 @@ func (cia chainInfoAPI) StateGetNetworkParams(ctx context.Context) (types.Netw`
`762`	`762`	`UpgradeWaffleHeight: cfg.NetworkParams.ForkUpgradeParam.UpgradeWaffleHeight,`
`763`	`763`	`UpgradeTuktukHeight: cfg.NetworkParams.ForkUpgradeParam.UpgradeTuktukHeight,`
`764`	`764`	`UpgradeTeepHeight: cfg.NetworkParams.ForkUpgradeParam.UpgradeTeepHeight,`
	`765`	`+ UpgradeTockHeight: cfg.NetworkParams.ForkUpgradeParam.UpgradeTockHeight,`
`765`	`766`	`},`
`766`	`767`	`Eip155ChainID: cfg.NetworkParams.Eip155ChainID,`
`767`	`768`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ import (`
`6`	`6`	`"github.com/filecoin-project/go-state-types/network"`
`7`	`7`	`"github.com/filecoin-project/venus/pkg/config"`
`8`	`8`	`"github.com/filecoin-project/venus/pkg/constants"`
	`9`	`+ "github.com/filecoin-project/venus/venus-shared/actors/builtin"`
`9`	`10`	`"github.com/filecoin-project/venus/venus-shared/types"`
`10`	`11`	`"github.com/ipfs/go-cid"`
`11`	`12`	`)`
`@@ -80,5 +81,7 @@ func IntegrationNet() *NetworkConf {`
`80`	`81`	`nc.Network.ForkUpgradeParam.UpgradePhoenixHeight = nc.Network.ForkUpgradeParam.UpgradeDragonHeight + 10`
`81`	`82`	`nc.Network.DrandSchedule[nc.Network.ForkUpgradeParam.UpgradePhoenixHeight] = config.DrandQuicknet`
`82`	`83`
	`84`	`+ nc.Network.ForkUpgradeParam.UpgradeTockHeight = nc.Network.ForkUpgradeParam.UpgradeTeepHeight + builtin.EpochsInDay*90`
	`85`	`+`
`83`	`86`	`return nc`
`84`	`87`	`}`