Hyperspace nv20: upgrade and migration.

.circleci/config.yml

@@ -628,6 +628,11 @@ workflows:
           suite: itest-eth_block_hash
           target: "./itests/eth_block_hash_test.go"
 
+      - test:
+          name: test-itest-eth_bytecode
+          suite: itest-eth_bytecode
+          target: "./itests/eth_bytecode_test.go"
+
       - test:
           name: test-itest-eth_config
           suite: itest-eth_config
@@ -723,6 +728,11 @@ workflows:
           suite: itest-migration_nv19
           target: "./itests/migration_nv19_test.go"
 
+      - test:
+          name: test-itest-migration_nv20
+          suite: itest-migration_nv20
+          target: "./itests/migration_nv20_test.go"
+
       - test:
           name: test-itest-mpool_msg_uuid
           suite: itest-mpool_msg_uuid

build/params_2k.go

@@ -63,6 +63,8 @@ var UpgradeHyggeHeight = abi.ChainEpoch(30)
 
 var UpgradeHyperspaceNV19Height = abi.ChainEpoch(60)
 
+var UpgradeHyperspaceNV20Height = abi.ChainEpoch(70)
+
 var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 	0: DrandMainnet,
 }

build/params_butterfly.go

@@ -51,9 +51,11 @@ const UpgradeChocolateHeight = -17
 const UpgradeOhSnapHeight = -18
 const UpgradeSkyrHeight = -19
 const UpgradeSharkHeight = abi.ChainEpoch(-20)
-const UpgradeHyggeHeight = abi.ChainEpoch(600)
+const UpgradeHyggeHeight = abi.ChainEpoch(80)
 
-var UpgradeHyperspaceNV19Height = abi.ChainEpoch(99999999999999)
+var UpgradeHyperspaceNV19Height = abi.ChainEpoch(100)
+
+var UpgradeHyperspaceNV20Height = abi.ChainEpoch(120)
 
 var SupportedProofTypes = []abi.RegisteredSealProof{
 	abi.RegisteredSealProof_StackedDrg512MiBV1,

build/params_calibnet.go

@@ -73,7 +73,11 @@ const UpgradeSharkHeight = 16800 // 6 days after genesis
 
 const UpgradeHyggeHeight = math.MaxInt64
 
-var UpgradeHyperspaceNV19Height = abi.ChainEpoch(99999999999999)
+// dummy
+var UpgradeHyperspaceNV19Height = abi.ChainEpoch(math.MaxInt64 - 1)
+
+// dummy
+var UpgradeHyperspaceNV20Height = abi.ChainEpoch(math.MaxInt64)
 
 var SupportedProofTypes = []abi.RegisteredSealProof{
 	abi.RegisteredSealProof_StackedDrg32GiBV1,

build/params_hyperspace.go

@@ -58,6 +58,9 @@ var UpgradeHyggeHeight = abi.ChainEpoch(-21)
 // 2023-01-18T15:00:00Z
 var UpgradeHyperspaceNV19Height = abi.ChainEpoch(6840)
 
+// 2023-02-15T15:00:00Z
+var UpgradeHyperspaceNV20Height = abi.ChainEpoch(87480)
+
 var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 	0: DrandMainnet,
 }

build/params_interop.go

@@ -4,6 +4,7 @@
 package build
 
 import (
+	"math"
 	"os"
 	"strconv"
 
@@ -52,9 +53,11 @@ var UpgradeSkyrHeight = abi.ChainEpoch(-19)
 
 const UpgradeSharkHeight = abi.ChainEpoch(-20)
 
-const UpgradeHyggeHeight = abi.ChainEpoch(99999999999999)
+const UpgradeHyggeHeight = abi.ChainEpoch(math.MaxInt64 - 2)
 
-var UpgradeHyperspaceNV19Height = abi.ChainEpoch(99999999999999)
+var UpgradeHyperspaceNV19Height = abi.ChainEpoch(math.MaxInt64 - 1)
+
+var UpgradeHyperspaceNV20Height = abi.ChainEpoch(math.MaxInt64)
 
 var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 	0: DrandMainnet,

build/params_mainnet.go

@@ -87,10 +87,13 @@ const UpgradeSkyrHeight = 1960320
 const UpgradeSharkHeight = 2383680
 
 // ??????????????
-var UpgradeHyggeHeight = abi.ChainEpoch(math.MaxInt64 - 1)
+var UpgradeHyggeHeight = abi.ChainEpoch(math.MaxInt64 - 2)
 
 // ??????????????
-var UpgradeHyperspaceNV19Height = abi.ChainEpoch(math.MaxInt64)
+var UpgradeHyperspaceNV19Height = abi.ChainEpoch(math.MaxInt64 - 1)
+
+// dummy
+var UpgradeHyperspaceNV20Height = abi.ChainEpoch(math.MaxInt64)
 
 var SupportedProofTypes = []abi.RegisteredSealProof{
 	abi.RegisteredSealProof_StackedDrg32GiBV1,

build/params_shared_vals.go

@@ -33,7 +33,7 @@ const TestNetworkVersion = network.Version{{.latestNetworkVersion}}
 
 /* inline-gen start */
 
-const TestNetworkVersion = network.Version19
+const TestNetworkVersion = network.Version20
 
 /* inline-gen end */
 

chain/actors/builtin/account/account.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/filecoin-project/go-address"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
-	builtin11 "github.com/filecoin-project/go-state-types/builtin"
+	builtin12 "github.com/filecoin-project/go-state-types/builtin"
 	"github.com/filecoin-project/go-state-types/cbor"
 	"github.com/filecoin-project/go-state-types/manifest"
 	builtin0 "github.com/filecoin-project/specs-actors/actors/builtin"
@@ -22,7 +22,7 @@ import (
 	"github.com/filecoin-project/lotus/chain/types"
 )
 
-var Methods = builtin11.MethodsAccount
+var Methods = builtin12.MethodsAccount
 
 func Load(store adt.Store, act *types.Actor) (State, error) {
 	if name, av, ok := actors.GetActorMetaByCode(act.Code); ok {
@@ -44,6 +44,9 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		case actorstypes.Version11:
 			return load11(store, act.Head)
 
+		case actorstypes.Version12:
+			return load12(store, act.Head)
+
 		}
 	}
 
@@ -111,6 +114,9 @@ func MakeState(store adt.Store, av actorstypes.Version, addr address.Address) (S
 	case actorstypes.Version11:
 		return make11(store, addr)
 
+	case actorstypes.Version12:
+		return make12(store, addr)
+
 	}
 	return nil, xerrors.Errorf("unknown actor version %d", av)
 }
@@ -139,5 +145,6 @@ func AllCodes() []cid.Cid {
 		(&state9{}).Code(),
 		(&state10{}).Code(),
 		(&state11{}).Code(),
+		(&state12{}).Code(),
 	}
 }

chain/actors/builtin/cron/cron.go

@@ -5,7 +5,7 @@ import (
 	"golang.org/x/xerrors"
 
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
-	builtin11 "github.com/filecoin-project/go-state-types/builtin"
+	builtin12 "github.com/filecoin-project/go-state-types/builtin"
 	"github.com/filecoin-project/go-state-types/manifest"
 	builtin0 "github.com/filecoin-project/specs-actors/actors/builtin"
 	builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
@@ -40,6 +40,9 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		case actorstypes.Version11:
 			return load11(store, act.Head)
 
+		case actorstypes.Version12:
+			return load12(store, act.Head)
+
 		}
 	}
 
@@ -107,13 +110,16 @@ func MakeState(store adt.Store, av actorstypes.Version) (State, error) {
 	case actorstypes.Version11:
 		return make11(store)
 
+	case actorstypes.Version12:
+		return make12(store)
+
 	}
 	return nil, xerrors.Errorf("unknown actor version %d", av)
 }
 
 var (
-	Address = builtin11.CronActorAddr
-	Methods = builtin11.MethodsCron
+	Address = builtin12.CronActorAddr
+	Methods = builtin12.MethodsCron
 )
 
 type State interface {
@@ -137,5 +143,6 @@ func AllCodes() []cid.Cid {
 		(&state9{}).Code(),
 		(&state10{}).Code(),
 		(&state11{}).Code(),
+		(&state12{}).Code(),
 	}
 }

chain/actors/builtin/datacap/datacap.go

@@ -7,7 +7,7 @@ import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
-	builtin11 "github.com/filecoin-project/go-state-types/builtin"
+	builtin12 "github.com/filecoin-project/go-state-types/builtin"
 	"github.com/filecoin-project/go-state-types/cbor"
 	"github.com/filecoin-project/go-state-types/manifest"
 
@@ -17,8 +17,8 @@ import (
 )
 
 var (
-	Address = builtin11.DatacapActorAddr
-	Methods = builtin11.MethodsDatacap
+	Address = builtin12.DatacapActorAddr
+	Methods = builtin12.MethodsDatacap
 )
 
 func Load(store adt.Store, act *types.Actor) (State, error) {
@@ -38,6 +38,9 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		case actorstypes.Version11:
 			return load11(store, act.Head)
 
+		case actorstypes.Version12:
+			return load12(store, act.Head)
+
 		}
 	}
 
@@ -56,6 +59,9 @@ func MakeState(store adt.Store, av actorstypes.Version, governor address.Address
 	case actorstypes.Version11:
 		return make11(store, governor, bitwidth)
 
+	case actorstypes.Version12:
+		return make12(store, governor, bitwidth)
+
 	default:
 		return nil, xerrors.Errorf("datacap actor only valid for actors v9 and above, got %d", av)
 	}
@@ -79,5 +85,6 @@ func AllCodes() []cid.Cid {
 		(&state9{}).Code(),
 		(&state10{}).Code(),
 		(&state11{}).Code(),
+		(&state12{}).Code(),
 	}
 }