filecoin-project · rvagg · Dec 5, 2024 · Dec 4, 2024 · Dec 4, 2024 · Dec 4, 2024
diff --git a/api/types.go b/api/types.go
@@ -193,7 +193,7 @@ type ForkUpgradeParams struct {
 	UpgradePhoenixHeight     abi.ChainEpoch
 	UpgradeWaffleHeight      abi.ChainEpoch
 	UpgradeTuktukHeight      abi.ChainEpoch
-	UpgradeXxHeight          abi.ChainEpoch
+	UpgradeTeepHeight        abi.ChainEpoch
 }
 
 // ChainExportConfig holds configuration for chain ranged exports.

diff --git a/build/actors/v16.tar.zst b/build/actors/v16.tar.zst
diff --git a/build/buildconstants/params_2k.go b/build/buildconstants/params_2k.go
@@ -73,7 +73,7 @@ var UpgradeWaffleHeight = abi.ChainEpoch(-26)
 
 var UpgradeTuktukHeight = abi.ChainEpoch(-27)
 
-var UpgradeXxHeight = abi.ChainEpoch(200)
+var UpgradeTeepHeight = abi.ChainEpoch(200)
 
 // FIP-0081: for the power actor state for pledge calculations.
 // UpgradeTuktukPowerRampDurationEpochs ends up in the power actor state after
@@ -169,7 +169,7 @@ func init() {
 	UpgradeWaffleHeight = getUpgradeHeight("LOTUS_WAFFLE_HEIGHT", UpgradeWaffleHeight)
 	UpgradePhoenixHeight = getUpgradeHeight("LOTUS_PHOENIX_HEIGHT", UpgradePhoenixHeight)
 	UpgradeTuktukHeight = getUpgradeHeight("LOTUS_TUKTUK_HEIGHT", UpgradeTuktukHeight)
-	UpgradeXxHeight = getUpgradeHeight("LOTUS_XX_HEIGHT", UpgradeXxHeight)
+	UpgradeTeepHeight = getUpgradeHeight("LOTUS_TEEP_HEIGHT", UpgradeTeepHeight)
 
 	DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 		0: DrandQuicknet,

diff --git a/build/buildconstants/params_butterfly.go b/build/buildconstants/params_butterfly.go
@@ -18,7 +18,7 @@ var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 	0: DrandQuicknet,
 }
 
-const GenesisNetworkVersion = network.Version22
+const GenesisNetworkVersion = network.Version24
 
 var NetworkBundle = "butterflynet"
 var ActorDebugging = false
@@ -59,7 +59,7 @@ const UpgradeWaffleHeight = -27
 const UpgradeTuktukHeight = -28
 
 // ??????
-const UpgradeXxHeight = 999999999999999
+const UpgradeTeepHeight = 100
 
 // FIP-0081: for the power actor state for pledge calculations.
 // UpgradeTuktukPowerRampDurationEpochs ends up in the power actor state after

diff --git a/build/buildconstants/params_calibnet.go b/build/buildconstants/params_calibnet.go
@@ -102,8 +102,8 @@ const UpgradeWaffleHeight = 1779094
 // 2024-10-23T13:30:00Z
 const UpgradeTuktukHeight = 2078794
 
-// ??????
-const UpgradeXxHeight = 999999999999999
+// 2024-12-16T23:00:00Z
+const UpgradeTeepHeight = 2235454
 
 // FIP-0081: for the power actor state for pledge calculations.
 // UpgradeTuktukPowerRampDurationEpochs ends up in the power actor state after

diff --git a/build/buildconstants/params_interop.go b/build/buildconstants/params_interop.go
@@ -57,7 +57,7 @@ var UpgradePhoenixHeight = abi.ChainEpoch(-26)
 var UpgradeWaffleHeight = abi.ChainEpoch(-27)
 var UpgradeTuktukHeight = abi.ChainEpoch(-28)
 
-const UpgradeXxHeight = 50
+const UpgradeTeepHeight = 50
 
 // FIP-0081: for the power actor state for pledge calculations.
 // UpgradeTuktukPowerRampDurationEpochs ends up in the power actor state after

diff --git a/build/buildconstants/params_mainnet.go b/build/buildconstants/params_mainnet.go
@@ -114,7 +114,7 @@ const UpgradeWaffleHeight abi.ChainEpoch = 4154640
 var UpgradeTuktukHeight abi.ChainEpoch = 4461240
 
 // ??????
-var UpgradeXxHeight = abi.ChainEpoch(9999999999)
+var UpgradeTeepHeight = abi.ChainEpoch(9999999999)
 
 // FIP-0081: for the power actor state for pledge calculations.
 // UpgradeTuktukPowerRampDurationEpochs ends up in the power actor state after
@@ -149,8 +149,8 @@ func init() {
 	}
 	SetAddressNetwork(addrNetwork)
 
-	if os.Getenv("LOTUS_DISABLE_XX") == "1" {
-		UpgradeXxHeight = math.MaxInt64 - 1
+	if os.Getenv("LOTUS_DISABLE_TEEP") == "1" {
+		UpgradeTeepHeight = math.MaxInt64 - 1
 	}
 
 	// NOTE: DO NOT change this unless you REALLY know what you're doing. This is not consensus critical, however,

diff --git a/build/buildconstants/params_testground.go b/build/buildconstants/params_testground.go
@@ -107,7 +107,7 @@ var (
 	UpgradeCalibrationDragonFixHeight abi.ChainEpoch = -28
 	UpgradeWaffleHeight               abi.ChainEpoch = -29
 	UpgradeTuktukHeight               abi.ChainEpoch = -30
-	UpgradeXxHeight                   abi.ChainEpoch = -31
+	UpgradeTeepHeight                 abi.ChainEpoch = -31
 
 	UpgradeTuktukPowerRampDurationEpochs uint64 = 0
 

diff --git a/build/builtin_actors_gen.go b/build/builtin_actors_gen.go
diff --git a/build/openrpc/full.json b/build/openrpc/full.json
@@ -19907,7 +19907,7 @@
                                 "UpgradePhoenixHeight": 10101,
                                 "UpgradeWaffleHeight": 10101,
                                 "UpgradeTuktukHeight": 10101,
-                                "UpgradeXxHeight": 10101
+                                "UpgradeTeepHeight": 10101
                             },
                             "Eip155ChainID": 123
                         }
@@ -20021,6 +20021,10 @@
                                     "title": "number",
                                     "type": "number"
                                 },
+                                "UpgradeTeepHeight": {
+                                    "title": "number",
+                                    "type": "number"
+                                },
                                 "UpgradeThunderHeight": {
                                     "title": "number",
                                     "type": "number"
@@ -20044,10 +20048,6 @@
                                 "UpgradeWatermelonHeight": {
                                     "title": "number",
                                     "type": "number"
-                                },
-                                "UpgradeXxHeight": {
-                                    "title": "number",
-                                    "type": "number"
                                 }
                             },
                             "type": "object"

diff --git a/chain/consensus/filcns/upgrades.go b/chain/consensus/filcns/upgrades.go
@@ -331,7 +331,7 @@ func DefaultUpgradeSchedule() stmgr.UpgradeSchedule {
 		}},
 		Expensive: true,
 	}, {
-		Height:    buildconstants.UpgradeXxHeight,
+		Height:    buildconstants.UpgradeTeepHeight,
 		Network:   network.Version25,
 		Migration: UpgradeActorsV16,
 		PreMigrations: []stmgr.PreMigration{{

diff --git a/documentation/en/api-v0-methods.md b/documentation/en/api-v0-methods.md
@@ -4485,7 +4485,7 @@ Response:
     "UpgradePhoenixHeight": 10101,
     "UpgradeWaffleHeight": 10101,
     "UpgradeTuktukHeight": 10101,
-    "UpgradeXxHeight": 10101
+    "UpgradeTeepHeight": 10101
   },
   "Eip155ChainID": 123
 }

diff --git a/documentation/en/api-v1-unstable-methods.md b/documentation/en/api-v1-unstable-methods.md
@@ -6796,7 +6796,7 @@ Response:
     "UpgradePhoenixHeight": 10101,
     "UpgradeWaffleHeight": 10101,
     "UpgradeTuktukHeight": 10101,
-    "UpgradeXxHeight": 10101
+    "UpgradeTeepHeight": 10101
   },
   "Eip155ChainID": 123
 }

diff --git a/extern/filecoin-ffi b/extern/filecoin-ffi
diff --git a/go.mod b/go.mod
@@ -50,7 +50,7 @@ require (
 	github.com/filecoin-project/go-jsonrpc v0.7.0
 	github.com/filecoin-project/go-padreader v0.0.1
 	github.com/filecoin-project/go-paramfetch v0.0.4
-	github.com/filecoin-project/go-state-types v0.16.0-dev
+	github.com/filecoin-project/go-state-types v0.16.0-rc1
 	github.com/filecoin-project/go-statemachine v1.0.3
 	github.com/filecoin-project/go-statestore v0.2.0
 	github.com/filecoin-project/go-storedcounter v0.1.0
@@ -131,7 +131,7 @@ require (
 	github.com/raulk/go-watchdog v1.3.0
 	github.com/samber/lo v1.39.0
 	github.com/sirupsen/logrus v1.9.2
-	github.com/stretchr/testify v1.9.0
+	github.com/stretchr/testify v1.10.0
 	github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
 	github.com/triplewz/poseidon v0.0.2
 	github.com/urfave/cli/v2 v2.25.5

diff --git a/go.sum b/go.sum
@@ -298,8 +298,8 @@ github.com/filecoin-project/go-state-types v0.0.0-20200928172055-2df22083d8ab/go
 github.com/filecoin-project/go-state-types v0.0.0-20201102161440-c8033295a1fc/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g=
 github.com/filecoin-project/go-state-types v0.1.0/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g=
 github.com/filecoin-project/go-state-types v0.1.6/go.mod h1:UwGVoMsULoCK+bWjEdd/xLCvLAQFBC7EDT477SKml+Q=
-github.com/filecoin-project/go-state-types v0.16.0-dev h1:66GP8xfo0elYdLLGxQ4LcAhAvOqKf4IiJkRYxU7UH2M=
-github.com/filecoin-project/go-state-types v0.16.0-dev/go.mod h1:k0/j7i06QHRet86mv9/8gregMq59tv+yCr655G9zsX8=
+github.com/filecoin-project/go-state-types v0.16.0-rc1 h1:/51MhupBAjfmWygUKDZCdLOzAnKFcayPHX9ApTswgmo=
+github.com/filecoin-project/go-state-types v0.16.0-rc1/go.mod h1:4rjTgHP6LWrkQXQCgx+dRGDa0gnk4WiJVCFwZtuDOGE=
 github.com/filecoin-project/go-statemachine v1.0.3 h1:N07o6alys+V1tNoSTi4WuuoeNC4erS/6jE74+NsgQuk=
 github.com/filecoin-project/go-statemachine v1.0.3/go.mod h1:jZdXXiHa61n4NmgWFG4w8tnqgvZVHYbJ3yW7+y8bF54=
 github.com/filecoin-project/go-statestore v0.1.0/go.mod h1:LFc9hD+fRxPqiHiaqUEZOinUJB4WARkRfNl10O7kTnI=
@@ -1246,8 +1246,9 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/stvp/go-udp-testing v0.0.0-20201019212854-469649b16807/go.mod h1:7jxmlfBCDBXRzr0eAQJ48XC1hBu1np4CS5+cHEYfwpc=
 github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY=

diff --git a/node/impl/full/state.go b/node/impl/full/state.go
@@ -2079,7 +2079,7 @@ func (a *StateAPI) StateGetNetworkParams(ctx context.Context) (*api.NetworkParam
 			UpgradePhoenixHeight:     buildconstants.UpgradePhoenixHeight,
 			UpgradeWaffleHeight:      buildconstants.UpgradeWaffleHeight,
 			UpgradeTuktukHeight:      buildconstants.UpgradeTuktukHeight,
-			UpgradeXxHeight:          buildconstants.UpgradeXxHeight,
+			UpgradeTeepHeight:        buildconstants.UpgradeTeepHeight,
 		},
 	}, nil
 }
+1 −1		.github/actions/configure-environment/action.yml
+11 −5		.github/workflows/ci.yml
+4 −4		go.mod
+8 −8		go.sum
+97 −141		rust/Cargo.lock
+9 −9		rust/Cargo.toml
+1 −1		version.json