cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Merge pull request #5839 from filecoin-project/chore/backport_nerpa_reset_to_1_5_3

Browse Source 
Chore/backport nerpa reset to 1 5 3
This commit is contained in:
Peter Rabbitson 2021-03-22 16:38:32 +01:00 committed by GitHub
commit b55ca92d33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -63,20 +63,23 @@ CLEAN+=build/.update-modules
deps: $(BUILD_DEPS) deps: $(BUILD_DEPS)
.PHONY: deps .PHONY: deps
build-devnets: build lotus-seed lotus-shed lotus-wallet lotus-gateway
.PHONY: build-devnets
debug: GOFLAGS+=-tags=debug debug: GOFLAGS+=-tags=debug
debug: lotus lotus-miner lotus-worker lotus-seed debug: build-devnets
2k: GOFLAGS+=-tags=2k 2k: GOFLAGS+=-tags=2k
2k: lotus lotus-miner lotus-worker lotus-seed 2k: build-devnets
calibnet: GOFLAGS+=-tags=calibnet calibnet: GOFLAGS+=-tags=calibnet
calibnet: lotus lotus-miner lotus-worker lotus-seed calibnet: build-devnets
nerpanet: GOFLAGS+=-tags=nerpanet nerpanet: GOFLAGS+=-tags=nerpanet
nerpanet: lotus lotus-miner lotus-worker lotus-seed nerpanet: build-devnets
butterflynet: GOFLAGS+=-tags=butterflynet butterflynet: GOFLAGS+=-tags=butterflynet
butterflynet: lotus lotus-miner lotus-worker lotus-seed butterflynet: build-devnets
lotus: $(BUILD_DEPS) lotus: $(BUILD_DEPS)
rm -f lotus rm -f lotus

8
build/bootstrap/nerpanet.pi
View File

@ -1,4 +1,4 @@
/dns4/bootstrap-0.nerpa.interplanetary.dev/tcp/1347/p2p/12D3KooWNfuGjtzWTVz8eJGZ2C3aJg2xLqorhsagu4LTWw6CwpK9 /dns4/bootstrap-2.nerpa.interplanetary.dev/tcp/1347/p2p/12D3KooWQcL6ReWmR6ASWx4iT7EiAmxKDQpvgq1MKNTQZp5NPnWW
/dns4/bootstrap-1.nerpa.interplanetary.dev/tcp/1347/p2p/12D3KooWDfsxYk7dC6NNsHqZqqyMJCzkjZuXhjsmqBk3TUCBZLga /dns4/bootstrap-0.nerpa.interplanetary.dev/tcp/1347/p2p/12D3KooWGyJCwCm7EfupM15CFPXM4c7zRVHwwwjcuy9umaGeztMX
/dns4/bootstrap-2.nerpa.interplanetary.dev/tcp/1347/p2p/12D3KooWRZAGHmCCaa2gkYmnC4Q2TEwHGFSh6Fh1FFJ7RSXak5yN /dns4/bootstrap-3.nerpa.interplanetary.dev/tcp/1347/p2p/12D3KooWNK9RmfksKXSCQj7ZwAM7L6roqbN4kwJteihq7yPvSgPs
/dns4/bootstrap-3.nerpa.interplanetary.dev/tcp/1347/p2p/12D3KooWBFxEigSKLvxJVdw3JziC9ePHHnyAn5LifWSqg2kttcth /dns4/bootstrap-1.nerpa.interplanetary.dev/tcp/1347/p2p/12D3KooWCWSaH6iUyXYspYxELjDfzToBsyVGVz3QvC7ysXv7wESo

BIN
build/genesis/nerpanet.car
View File

Binary file not shown.

18
build/params_nerpanet.go
View File

@ -24,21 +24,21 @@ const UpgradeSmokeHeight = -1
const UpgradeIgnitionHeight = -2 const UpgradeIgnitionHeight = -2
const UpgradeRefuelHeight = -3 const UpgradeRefuelHeight = -3
const UpgradeTapeHeight = -4
const UpgradeLiftoffHeight = -5 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 UpgradeCalicoHeight = 306000 const UpgradeKumquatHeight = 90
const UpgradePersianHeight = UpgradeCalicoHeight + (builtin2.EpochsInHour * 12)
const UpgradeOrangeHeight = 307500 const UpgradeCalicoHeight = 100
const UpgradePersianHeight = UpgradeCalicoHeight + (builtin2.EpochsInHour * 1)
const UpgradeClausHeight = 307600 const UpgradeClausHeight = 250
const UpgradeActorsV3Height = 308000 const UpgradeOrangeHeight = 300
const UpgradeActorsV3Height = 600
func init() { func init() {
// Minimum block production power is set to 4 TiB // Minimum block production power is set to 4 TiB

4
chain/stmgr/forks.go
View File

@ -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) { 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) store := sm.cs.ActorStore(ctx)
var stateRoot types.StateRoot var stateRoot types.StateRoot
if err := store.Get(ctx, root, &stateRoot); err != nil { if err := store.Get(ctx, root, &stateRoot); err != nil {

18
cmd/lotus-seed/genesis.go
View File

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