From 550eef131c6578291572ac49eee44150b779aef2 Mon Sep 17 00:00:00 2001 From: Geoff Stuart Date: Fri, 20 Jan 2023 16:06:35 -0500 Subject: [PATCH] Remove references from wallaby and hyperspace --- Makefile | 6 --- build/actors/pack.sh | 2 +- build/bootstrap/wallabynet.pi | 4 -- build/params_hyperspace.go | 94 ----------------------------------- build/params_mainnet.go | 4 +- build/params_wallaby.go | 94 ----------------------------------- build/version.go | 20 +++----- 7 files changed, 10 insertions(+), 214 deletions(-) delete mode 100644 build/bootstrap/wallabynet.pi delete mode 100644 build/params_hyperspace.go delete mode 100644 build/params_wallaby.go diff --git a/Makefile b/Makefile index c085faafb..43c362b86 100644 --- a/Makefile +++ b/Makefile @@ -84,12 +84,6 @@ butterflynet: build-devnets interopnet: GOFLAGS+=-tags=interopnet interopnet: build-devnets -wallabynet: GOFLAGS+=-tags=wallabynet -wallabynet: build-devnets - -hyperspacenet: GOFLAGS+=-tags=hyperspacenet -hyperspacenet: build-devnets - lotus: $(BUILD_DEPS) rm -f lotus $(GOCC) build $(GOFLAGS) -o lotus ./cmd/lotus diff --git a/build/actors/pack.sh b/build/actors/pack.sh index 2702c80d5..c2060e67c 100755 --- a/build/actors/pack.sh +++ b/build/actors/pack.sh @@ -1,6 +1,6 @@ #!/bin/bash -NETWORKS=(devnet mainnet caterpillarnet butterflynet testing testing-fake-proofs calibrationnet hyperspace) +NETWORKS=(devnet mainnet caterpillarnet butterflynet testing testing-fake-proofs calibrationnet) set -e diff --git a/build/bootstrap/wallabynet.pi b/build/bootstrap/wallabynet.pi deleted file mode 100644 index 322e550bb..000000000 --- a/build/bootstrap/wallabynet.pi +++ /dev/null @@ -1,4 +0,0 @@ -/dns4/de0.bootstrap.wallaby.network/tcp/1337/p2p/12D3KooWHAvUVk5XuxSwi2dNLWbTDDRSGeHxMuWdQ3SQpRuNHbLz -/dns4/de1.bootstrap.wallaby.network/tcp/1337/p2p/12D3KooWBRqtxhJCtiLmCwKgAQozJtdGinEDdJGoS5oHw7vCjMGc -/dns4/ca0.bootstrap.wallaby.network/tcp/1337/p2p/12D3KooWCApBpUk7EX9pmEfyky1gKC6N2KJ74S1AwFfvnkDqw3pK -/dns4/sg0.bootstrap.wallaby.network/tcp/1337/p2p/12D3KooWLnYqr4hRoNHBJQVXsFGkDoKuoVfw5R2ASw1bHzrWU5Px \ No newline at end of file diff --git a/build/params_hyperspace.go b/build/params_hyperspace.go deleted file mode 100644 index 1e75c6bfa..000000000 --- a/build/params_hyperspace.go +++ /dev/null @@ -1,94 +0,0 @@ -//go:build hyperspacenet -// +build hyperspacenet - -package build - -import ( - "github.com/ipfs/go-cid" - - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" - actorstypes "github.com/filecoin-project/go-state-types/actors" - "github.com/filecoin-project/go-state-types/network" - builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" - - "github.com/filecoin-project/lotus/chain/actors/policy" -) - -var NetworkBundle = "hyperspace" -var BundleOverrides map[actorstypes.Version]string -var ActorDebugging = false - -const BootstrappersFile = "hyperspacenet.pi" -const GenesisFile = "hyperspacenet.car" - -const GenesisNetworkVersion = network.Version18 - -var UpgradeBreezeHeight = abi.ChainEpoch(-1) - -const BreezeGasTampingDuration = 120 - -var UpgradeSmokeHeight = abi.ChainEpoch(-1) -var UpgradeIgnitionHeight = abi.ChainEpoch(-2) -var UpgradeRefuelHeight = abi.ChainEpoch(-3) -var UpgradeTapeHeight = abi.ChainEpoch(-4) - -var UpgradeAssemblyHeight = abi.ChainEpoch(-5) -var UpgradeLiftoffHeight = abi.ChainEpoch(-6) - -var UpgradeKumquatHeight = abi.ChainEpoch(-7) -var UpgradeCalicoHeight = abi.ChainEpoch(-9) -var UpgradePersianHeight = abi.ChainEpoch(-10) -var UpgradeOrangeHeight = abi.ChainEpoch(-11) -var UpgradeClausHeight = abi.ChainEpoch(-12) - -var UpgradeTrustHeight = abi.ChainEpoch(-13) - -var UpgradeNorwegianHeight = abi.ChainEpoch(-14) - -var UpgradeTurboHeight = abi.ChainEpoch(-15) - -var UpgradeHyperdriveHeight = abi.ChainEpoch(-16) -var UpgradeChocolateHeight = abi.ChainEpoch(-17) -var UpgradeOhSnapHeight = abi.ChainEpoch(-18) -var UpgradeSkyrHeight = abi.ChainEpoch(-19) -var UpgradeSharkHeight = abi.ChainEpoch(-20) -var UpgradeHyggeHeight = abi.ChainEpoch(-21) - -var DrandSchedule = map[abi.ChainEpoch]DrandEnum{ - 0: DrandMainnet, -} - -var SupportedProofTypes = []abi.RegisteredSealProof{ - abi.RegisteredSealProof_StackedDrg512MiBV1, - abi.RegisteredSealProof_StackedDrg32GiBV1, - abi.RegisteredSealProof_StackedDrg64GiBV1, -} -var ConsensusMinerMinPower = abi.NewStoragePower(16 << 30) -var MinVerifiedDealSize = abi.NewStoragePower(1 << 20) -var PreCommitChallengeDelay = abi.ChainEpoch(10) - -func init() { - policy.SetSupportedProofTypes(SupportedProofTypes...) - policy.SetConsensusMinerMinPower(ConsensusMinerMinPower) - policy.SetMinVerifiedDealSize(MinVerifiedDealSize) - policy.SetPreCommitChallengeDelay(PreCommitChallengeDelay) - - BuildType = BuildHyperspacenet - SetAddressNetwork(address.Testnet) - Devnet = true - -} - -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 = 2 - -// ChainId defines the chain ID used in the Ethereum JSON-RPC endpoint. -// As per https://github.com/ethereum-lists/chains -const Eip155ChainId = 3141 - -var WhitelistedBlock = cid.Undef diff --git a/build/params_mainnet.go b/build/params_mainnet.go index f95525dbc..e29fa4567 100644 --- a/build/params_mainnet.go +++ b/build/params_mainnet.go @@ -1,5 +1,5 @@ -//go:build !debug && !2k && !testground && !calibnet && !butterflynet && !interopnet && !wallabynet && !hyperspacenet -// +build !debug,!2k,!testground,!calibnet,!butterflynet,!interopnet,!wallabynet,!hyperspacenet +//go:build !debug && !2k && !testground && !calibnet && !butterflynet && !interopnet +// +build !debug,!2k,!testground,!calibnet,!butterflynet,!interopnet package build diff --git a/build/params_wallaby.go b/build/params_wallaby.go deleted file mode 100644 index c5279bfd0..000000000 --- a/build/params_wallaby.go +++ /dev/null @@ -1,94 +0,0 @@ -//go:build wallabynet -// +build wallabynet - -package build - -import ( - "github.com/ipfs/go-cid" - - "github.com/filecoin-project/go-address" - "github.com/filecoin-project/go-state-types/abi" - actorstypes "github.com/filecoin-project/go-state-types/actors" - "github.com/filecoin-project/go-state-types/network" - builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" - - "github.com/filecoin-project/lotus/chain/actors/policy" -) - -var NetworkBundle = "wallaby" -var BundleOverrides map[actorstypes.Version]string -var ActorDebugging = false - -const BootstrappersFile = "wallabynet.pi" -const GenesisFile = "wallabynet.car" - -const GenesisNetworkVersion = network.Version18 - -var UpgradeBreezeHeight = abi.ChainEpoch(-1) - -const BreezeGasTampingDuration = 120 - -var UpgradeSmokeHeight = abi.ChainEpoch(-1) -var UpgradeIgnitionHeight = abi.ChainEpoch(-2) -var UpgradeRefuelHeight = abi.ChainEpoch(-3) -var UpgradeTapeHeight = abi.ChainEpoch(-4) - -var UpgradeAssemblyHeight = abi.ChainEpoch(-5) -var UpgradeLiftoffHeight = abi.ChainEpoch(-6) - -var UpgradeKumquatHeight = abi.ChainEpoch(-7) -var UpgradeCalicoHeight = abi.ChainEpoch(-9) -var UpgradePersianHeight = abi.ChainEpoch(-10) -var UpgradeOrangeHeight = abi.ChainEpoch(-11) -var UpgradeClausHeight = abi.ChainEpoch(-12) - -var UpgradeTrustHeight = abi.ChainEpoch(-13) - -var UpgradeNorwegianHeight = abi.ChainEpoch(-14) - -var UpgradeTurboHeight = abi.ChainEpoch(-15) - -var UpgradeHyperdriveHeight = abi.ChainEpoch(-16) -var UpgradeChocolateHeight = abi.ChainEpoch(-17) -var UpgradeOhSnapHeight = abi.ChainEpoch(-18) -var UpgradeSkyrHeight = abi.ChainEpoch(-19) -var UpgradeSharkHeight = abi.ChainEpoch(-20) -var UpgradeHyggeHeight = abi.ChainEpoch(-21) - -var DrandSchedule = map[abi.ChainEpoch]DrandEnum{ - 0: DrandMainnet, -} - -var SupportedProofTypes = []abi.RegisteredSealProof{ - abi.RegisteredSealProof_StackedDrg512MiBV1, - abi.RegisteredSealProof_StackedDrg32GiBV1, - abi.RegisteredSealProof_StackedDrg64GiBV1, -} -var ConsensusMinerMinPower = abi.NewStoragePower(16 << 30) -var MinVerifiedDealSize = abi.NewStoragePower(1 << 20) -var PreCommitChallengeDelay = abi.ChainEpoch(10) - -func init() { - policy.SetSupportedProofTypes(SupportedProofTypes...) - policy.SetConsensusMinerMinPower(ConsensusMinerMinPower) - policy.SetMinVerifiedDealSize(MinVerifiedDealSize) - policy.SetPreCommitChallengeDelay(PreCommitChallengeDelay) - - BuildType = BuildWallabynet - SetAddressNetwork(address.Testnet) - Devnet = true - -} - -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 = 2 - -// ChainId defines the chain ID used in the Ethereum JSON-RPC endpoint. -// As per https://github.com/ethereum-lists/chains -const Eip155ChainId = 31415 - -var WhitelistedBlock = cid.Undef diff --git a/build/version.go b/build/version.go index 4946059e2..70e27ad50 100644 --- a/build/version.go +++ b/build/version.go @@ -6,15 +6,13 @@ var CurrentCommit string var BuildType int const ( - BuildDefault = 0 - BuildMainnet = 0x1 - Build2k = 0x2 - BuildDebug = 0x3 - BuildCalibnet = 0x4 - BuildInteropnet = 0x5 - BuildButterflynet = 0x7 - BuildWallabynet = 0x8 - BuildHyperspacenet = 0x9 + BuildDefault = 0 + BuildMainnet = 0x1 + Build2k = 0x2 + BuildDebug = 0x3 + BuildCalibnet = 0x4 + BuildInteropnet = 0x5 + BuildButterflynet = 0x7 ) func BuildTypeString() string { @@ -33,10 +31,6 @@ func BuildTypeString() string { return "+interopnet" case BuildButterflynet: return "+butterflynet" - case BuildWallabynet: - return "+wallabynet" - case BuildHyperspacenet: - return "+hyperspacenet" default: return "+huh?" }