diff --git a/.circleci/config.yml b/.circleci/config.yml index 7b85006d1..975d58b15 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -282,21 +282,6 @@ jobs: root: "." paths: - linux-butterflynet - build-ntwk-nerpa: - description: | - Compile lotus binaries for the nerpa network - parameters: - <<: *test-params - executor: << parameters.executor >> - steps: - - install-deps - - prepare - - run: make nerpanet - - run: mkdir linux-nerpanet && mv lotus lotus-miner lotus-worker linux-nerpanet - - persist_to_workspace: - root: "." - paths: - - linux-nerpanet build-lotus-soup: description: | Compile `lotus-soup` Testground test plan @@ -718,18 +703,6 @@ jobs: - packer/build: template: tools/packer/lotus.pkr.hcl args: "-var ci_workspace_bins=./linux-butterflynet -var lotus_network=butterflynet -var git_tag=$CIRCLE_TAG" - publish-packer-nerpanet: - description: build and push AWS IAM and DigitalOcean droplet. - executor: - name: packer/default - packer-version: 1.6.6 - steps: - - checkout - - attach_workspace: - at: "." - - packer/build: - template: tools/packer/lotus.pkr.hcl - args: "-var ci_workspace_bins=./linux-nerpanet -var lotus_network=nerpanet -var git_tag=$CIRCLE_TAG" publish-dockerhub: description: publish to dockerhub machine: @@ -977,11 +950,6 @@ workflows: tags: only: - /^v\d+\.\d+\.\d+(-rc\d+)?$/ - - build-ntwk-nerpa: - filters: - tags: - only: - - /^v\d+\.\d+\.\d+(-rc\d+)?$/ - build-lotus-soup - build-macos: filters: @@ -1046,16 +1014,6 @@ workflows: tags: only: - /^v\d+\.\d+\.\d+(-rc\d+)?$/ - - publish-packer-nerpanet: - requires: - - build-ntwk-nerpa - filters: - branches: - ignore: - - /.*/ - tags: - only: - - /^v\d+\.\d+\.\d+(-rc\d+)?$/ - publish-snapcraft: name: publish-snapcraft-stable channel: stable diff --git a/.circleci/template.yml b/.circleci/template.yml index f1d0680c4..1f992e162 100644 --- a/.circleci/template.yml +++ b/.circleci/template.yml @@ -282,21 +282,6 @@ jobs: root: "." paths: - linux-butterflynet - build-ntwk-nerpa: - description: | - Compile lotus binaries for the nerpa network - parameters: - <<: *test-params - executor: << parameters.executor >> - steps: - - install-deps - - prepare - - run: make nerpanet - - run: mkdir linux-nerpanet && mv lotus lotus-miner lotus-worker linux-nerpanet - - persist_to_workspace: - root: "." - paths: - - linux-nerpanet build-lotus-soup: description: | Compile `lotus-soup` Testground test plan @@ -718,18 +703,6 @@ jobs: - packer/build: template: tools/packer/lotus.pkr.hcl args: "-var ci_workspace_bins=./linux-butterflynet -var lotus_network=butterflynet -var git_tag=$CIRCLE_TAG" - publish-packer-nerpanet: - description: build and push AWS IAM and DigitalOcean droplet. - executor: - name: packer/default - packer-version: 1.6.6 - steps: - - checkout - - attach_workspace: - at: "." - - packer/build: - template: tools/packer/lotus.pkr.hcl - args: "-var ci_workspace_bins=./linux-nerpanet -var lotus_network=nerpanet -var git_tag=$CIRCLE_TAG" publish-dockerhub: description: publish to dockerhub machine: @@ -832,11 +805,6 @@ workflows: tags: only: - /^v\d+\.\d+\.\d+(-rc\d+)?$/ - - build-ntwk-nerpa: - filters: - tags: - only: - - /^v\d+\.\d+\.\d+(-rc\d+)?$/ - build-lotus-soup - build-macos: filters: @@ -901,16 +869,6 @@ workflows: tags: only: - /^v\d+\.\d+\.\d+(-rc\d+)?$/ - - publish-packer-nerpanet: - requires: - - build-ntwk-nerpa - filters: - branches: - ignore: - - /.*/ - tags: - only: - - /^v\d+\.\d+\.\d+(-rc\d+)?$/ - publish-snapcraft: name: publish-snapcraft-stable channel: stable diff --git a/Makefile b/Makefile index 5d170c320..024ea3d66 100644 --- a/Makefile +++ b/Makefile @@ -76,9 +76,6 @@ debug: build-devnets calibnet: GOFLAGS+=-tags=calibnet calibnet: build-devnets -nerpanet: GOFLAGS+=-tags=nerpanet -nerpanet: build-devnets - butterflynet: GOFLAGS+=-tags=butterflynet butterflynet: build-devnets diff --git a/README.md b/README.md index a44c69006..055937398 100644 --- a/README.md +++ b/README.md @@ -123,7 +123,6 @@ Note: The default branch `master` is the dev branch where the latest new feature # Or to join a testnet or devnet: make clean calibnet # Calibration with min 32GiB sectors - make clean nerpanet # Nerpa with min 512MiB sectors sudo make install ``` diff --git a/build/bootstrap/nerpanet.pi b/build/bootstrap/nerpanet.pi deleted file mode 100644 index 83ad1d184..000000000 --- a/build/bootstrap/nerpanet.pi +++ /dev/null @@ -1,4 +0,0 @@ -/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 deleted file mode 100644 index c32e0171b..000000000 Binary files a/build/genesis/nerpanet.car and /dev/null differ diff --git a/build/params_nerpanet.go b/build/params_nerpanet.go deleted file mode 100644 index b7beb5953..000000000 --- a/build/params_nerpanet.go +++ /dev/null @@ -1,81 +0,0 @@ -//go:build nerpanet -// +build nerpanet - -package build - -import ( - "github.com/filecoin-project/go-state-types/abi" - "github.com/filecoin-project/lotus/chain/actors/policy" - "github.com/ipfs/go-cid" - - builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" -) - -var DrandSchedule = map[abi.ChainEpoch]DrandEnum{ - 0: DrandMainnet, -} - -const BootstrappersFile = "nerpanet.pi" -const GenesisFile = "nerpanet.car" - -const UpgradeBreezeHeight = -1 -const BreezeGasTampingDuration = 0 - -const UpgradeSmokeHeight = -1 - -const UpgradeIgnitionHeight = -2 -const UpgradeRefuelHeight = -3 - -const UpgradeLiftoffHeight = -5 - -const UpgradeAssemblyHeight = 30 // critical: the network can bootstrap from v1 only -const UpgradeTapeHeight = 60 - -const UpgradeKumquatHeight = 90 - -const UpgradeCalicoHeight = 100 -const UpgradePersianHeight = UpgradeCalicoHeight + (builtin2.EpochsInHour * 1) - -const UpgradeClausHeight = 250 - -const UpgradeOrangeHeight = 300 - -const UpgradeTrustHeight = 600 -const UpgradeNorwegianHeight = 201000 -const UpgradeTurboHeight = 203000 -const UpgradeHyperdriveHeight = 379178 - -func init() { - // Minimum block production power is set to 4 TiB - // Rationale is to discourage small-scale miners from trying to take over the network - // One needs to invest in ~2.3x the compute to break consensus, making it not worth it - // - // DOWNSIDE: the fake-seals need to be kept alive/protected, otherwise network will seize - // - policy.SetConsensusMinerMinPower(abi.NewStoragePower(4 << 40)) - - policy.SetSupportedProofTypes( - abi.RegisteredSealProof_StackedDrg512MiBV1, - abi.RegisteredSealProof_StackedDrg32GiBV1, - abi.RegisteredSealProof_StackedDrg64GiBV1, - ) - - // Lower the most time-consuming parts of PoRep - policy.SetPreCommitChallengeDelay(10) - - // TODO - make this a variable - //miner.WPoStChallengeLookback = abi.ChainEpoch(2) - - Devnet = false - - BuildType = BuildNerpanet -} - -const BlockDelaySecs = uint64(builtin2.EpochDurationSeconds) - -const PropagationDelaySecs = uint64(6) - -// BootstrapPeerThreshold is the minimum number peers we need to track for a sync worker to start -const BootstrapPeerThreshold = 4 - -var WhitelistedBlock = cid.Undef diff --git a/build/version.go b/build/version.go index dd01d9f03..56a5f073a 100644 --- a/build/version.go +++ b/build/version.go @@ -12,7 +12,6 @@ const ( BuildDebug = 0x3 BuildCalibnet = 0x4 BuildInteropnet = 0x5 - BuildNerpanet = 0x6 BuildButterflynet = 0x7 ) @@ -30,8 +29,6 @@ func buildType() string { return "+calibnet" case BuildInteropnet: return "+interopnet" - case BuildNerpanet: - return "+nerpanet" case BuildButterflynet: return "+butterflynet" default: diff --git a/tools/packer/scripts/nerpanet/lotus-init.sh b/tools/packer/scripts/nerpanet/lotus-init.sh deleted file mode 100755 index a0f19ae92..000000000 --- a/tools/packer/scripts/nerpanet/lotus-init.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash - -# This script sets up an initial configuraiton for the lotus daemon and miner -# It will only run once. - -GATE="$LOTUS_PATH"/date_initialized - -# Don't init if already initialized. -if [ -f "$GATE" ]; then - echo lotus already initialized. - exit 0 -fi - -# Not importing snapshot on nerpanet -# -# echo importing minimal snapshot -# lotus daemon --import-snapshot https://fil-chain-snapshots-fallback.s3.amazonaws.com/mainnet/minimal_finality_stateroots_latest.car --halt-after-import - -# Block future inits -date > "$GATE"