Merge pull request #5834 from Digital-MOB-Filecoin/nerpa/202103181-70…

…7219b7a Nerpa reset based on 1.5.2
filecoin-project · Mar 18, 2021 · 73eabc3 · 73eabc3
2 parents a54c6bf + ef5b079
commit 73eabc3
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 23 deletions.
diff --git a/build/bootstrap/nerpanet.pi b/build/bootstrap/nerpanet.pi
@@ -1,4 +1,4 @@
-/dns4/bootstrap-0.nerpa.interplanetary.dev/tcp/1347/p2p/12D3KooWNfuGjtzWTVz8eJGZ2C3aJg2xLqorhsagu4LTWw6CwpK9
-/dns4/bootstrap-1.nerpa.interplanetary.dev/tcp/1347/p2p/12D3KooWDfsxYk7dC6NNsHqZqqyMJCzkjZuXhjsmqBk3TUCBZLga
-/dns4/bootstrap-2.nerpa.interplanetary.dev/tcp/1347/p2p/12D3KooWRZAGHmCCaa2gkYmnC4Q2TEwHGFSh6Fh1FFJ7RSXak5yN
-/dns4/bootstrap-3.nerpa.interplanetary.dev/tcp/1347/p2p/12D3KooWBFxEigSKLvxJVdw3JziC9ePHHnyAn5LifWSqg2kttcth
+/dns4/bootstrap-2.nerpa.interplanetary.dev/tcp/1347/p2p/12D3KooWQcL6ReWmR6ASWx4iT7EiAmxKDQpvgq1MKNTQZp5NPnWW
+/dns4/bootstrap-0.nerpa.interplanetary.dev/tcp/1347/p2p/12D3KooWGyJCwCm7EfupM15CFPXM4c7zRVHwwwjcuy9umaGeztMX
+/dns4/bootstrap-3.nerpa.interplanetary.dev/tcp/1347/p2p/12D3KooWNK9RmfksKXSCQj7ZwAM7L6roqbN4kwJteihq7yPvSgPs
+/dns4/bootstrap-1.nerpa.interplanetary.dev/tcp/1347/p2p/12D3KooWCWSaH6iUyXYspYxELjDfzToBsyVGVz3QvC7ysXv7wESo
diff --git a/build/genesis/nerpanet.car b/build/genesis/nerpanet.car
diff --git a/build/params_nerpanet.go b/build/params_nerpanet.go
@@ -24,21 +24,21 @@ const UpgradeSmokeHeight = -1
 const UpgradeIgnitionHeight = -2
 const UpgradeRefuelHeight = -3
 
-const UpgradeTapeHeight = -4
-
 const UpgradeLiftoffHeight = -5
-const UpgradeActorsV2Height = 120 // critical: the network can bootstrap from v1 only
 
-const UpgradeKumquatHeight = -6
+const UpgradeActorsV2Height = 30 // critical: the network can bootstrap from v1 only
+const UpgradeTapeHeight = 60
+
+const UpgradeKumquatHeight = 90
 
-const UpgradeCalicoHeight = 306000
-const UpgradePersianHeight = UpgradeCalicoHeight + (builtin2.EpochsInHour * 12)
+const UpgradeCalicoHeight = 100
+const UpgradePersianHeight = UpgradeCalicoHeight + (builtin2.EpochsInHour * 1)
 
-const UpgradeOrangeHeight = 307500
+const UpgradeClausHeight = 250
 
-const UpgradeClausHeight = 307600
+const UpgradeOrangeHeight = 300
 
-const UpgradeActorsV3Height = 308000
+const UpgradeActorsV3Height = 600
 
 func init() {
 	// Minimum block production power is set to 4 TiB

diff --git a/chain/stmgr/forks.go b/chain/stmgr/forks.go
@@ -852,6 +852,10 @@ func UpgradeLiftoff(ctx context.Context, sm *StateManager, _ MigrationCache, cb
 }
 
 func UpgradeCalico(ctx context.Context, sm *StateManager, _ MigrationCache, cb ExecCallback, root cid.Cid, epoch abi.ChainEpoch, ts *types.TipSet) (cid.Cid, error) {
+	if build.BuildType != build.BuildMainnet {
+		return root, nil
+	}
+
 	store := sm.cs.ActorStore(ctx)
 	var stateRoot types.StateRoot
 	if err := store.Get(ctx, root, &stateRoot); err != nil {

diff --git a/cmd/lotus-seed/genesis.go b/cmd/lotus-seed/genesis.go
@@ -334,11 +334,6 @@ var genesisSetVRKCmd = &cli.Command{
 			return err
 		}
 
-		csvf, err := homedir.Expand(cctx.Args().Get(1))
-		if err != nil {
-			return err
-		}
-
 		var template genesis.Template
 		b, err := ioutil.ReadFile(genf)
 		if err != nil {
@@ -363,6 +358,10 @@ var genesisSetVRKCmd = &cli.Command{
 				Meta:    am.ActorMeta(),
 			}
 		} else if cctx.IsSet("multisig") {
+			csvf, err := homedir.Expand(cctx.String("multisig"))
+			if err != nil {
+				return err
+			}
 
 			entries, err := parseMultisigCsv(csvf)
 			if err != nil {
@@ -431,11 +430,6 @@ var genesisSetRemainderCmd = &cli.Command{
 			return err
 		}
 
-		csvf, err := homedir.Expand(cctx.Args().Get(1))
-		if err != nil {
-			return err
-		}
-
 		var template genesis.Template
 		b, err := ioutil.ReadFile(genf)
 		if err != nil {
@@ -460,6 +454,10 @@ var genesisSetRemainderCmd = &cli.Command{
 				Meta:    am.ActorMeta(),
 			}
 		} else if cctx.IsSet("multisig") {
+			csvf, err := homedir.Expand(cctx.String("multisig"))
+			if err != nil {
+				return err
+			}
 
 			entries, err := parseMultisigCsv(csvf)
 			if err != nil {