Refactor configuration by removing Pangaea network references

block/factory/factory.go

@@ -48,7 +48,6 @@ var (
 	ForTest      = NewFactory(params.TestChainConfig)
 	ForTestnet   = NewFactory(params.TestnetChainConfig)
 	ForMainnet   = NewFactory(params.MainnetChainConfig)
-	ForPangaea   = NewFactory(params.PangaeaChainConfig)
 	ForPartner   = NewFactory(params.PartnerChainConfig)
 	ForStressnet = NewFactory(params.StressnetChainConfig)
 )

cmd/bootnode/main.go

@@ -128,7 +128,7 @@ func main() {
 	muxer := flag.String("muxer", "yamux, mplexC6", "protocol muxer to mux per-protocol streams (yamux, mplex, mplexC6)")
 	userAgent := flag.String("user_agent", defUserAgent, "explicitly set the user-agent, so we can differentiate from other Go libp2p users")
 	noRelay := flag.Bool("no_relay", true, "no relay services, direct connections between peers only")
-	networkType := flag.String("network", "mainnet", "network type (mainnet, testnet, pangaea, partner, stressnet, devnet, localnet)")
+	networkType := flag.String("network", "mainnet", "network type (mainnet, testnet, partner, stressnet, devnet, localnet)")
 	pprof := flag.Bool("pprof", false, "enabled pprof")
 	pprofAddr := flag.String("pprof.addr", "127.0.0.1:6060", "http pprof address")
 	//keyFile := flag.String("pprof.profile.names", "", "the private key file of the bootnode")

cmd/config/config.go

@@ -130,8 +130,6 @@ func parseNetworkType(nt string) nodeconfig.NetworkType {
 		return nodeconfig.Mainnet
 	case "testnet":
 		return nodeconfig.Testnet
-	case "pangaea", "staking", "stk":
-		return nodeconfig.Pangaea
 	case "partner":
 		return nodeconfig.Partner
 	case "stressnet", "stress", "stn":

cmd/config/dumpdb.go

@@ -64,8 +64,6 @@ func getShardSchedule(networkType nodeconfig.NetworkType) shardingconfig.Schedul
 		return shardingconfig.MainnetSchedule
 	case nodeconfig.Testnet:
 		return shardingconfig.TestnetSchedule
-	case nodeconfig.Pangaea:
-		return shardingconfig.PangaeaSchedule
 	case nodeconfig.Localnet:
 		return shardingconfig.LocalnetSchedule
 	case nodeconfig.Partner:

cmd/config/flags.go

@@ -459,7 +459,7 @@ var (
 		Name:      "network",
 		Shorthand: "n",
 		DefValue:  "mainnet",
-		Usage:     "network to join (mainnet, testnet, pangaea, localnet, partner, stressnet, devnet)",
+		Usage:     "network to join (mainnet, testnet, localnet, partner, stressnet, devnet)",
 	}
 	bootNodeFlag = cli.StringSliceFlag{
 		Name:  "bootnodes",
@@ -472,7 +472,7 @@ var (
 	}
 	legacyNetworkTypeFlag = cli.StringFlag{
 		Name:       "network_type",
-		Usage:      "network to join (mainnet, testnet, pangaea, localnet, partner, stressnet, devnet)",
+		Usage:      "network to join (mainnet, testnet, localnet, partner, stressnet, devnet)",
 		Deprecated: "use --network",
 	}
 )

cmd/config/flags_test.go

@@ -383,11 +383,11 @@ func TestNetworkFlags(t *testing.T) {
 			},
 		},
 		{
-			args: []string{"--network", "stk", "--bootnodes", "1,2,3,4", "--dns.zone", "8.8.8.8",
+			args: []string{"--network", "stn", "--bootnodes", "1,2,3,4", "--dns.zone", "8.8.8.8",
 				"--dns.port", "9001", "--dns.server-port", "9002"},
 			expConfig: harmonyconfig.HarmonyConfig{
 				Network: harmonyconfig.NetworkConfig{
-					NetworkType: "pangaea",
+					NetworkType: "stressnet",
 					BootNodes:   []string{"1", "2", "3", "4"},
 				},
 				DNSSync: harmonyconfig.DnsSync{
@@ -399,18 +399,18 @@ func TestNetworkFlags(t *testing.T) {
 			},
 		},
 		{
-			args: []string{"--network_type", "stk", "--bootnodes", "1,2,3,4", "--dns_zone", "8.8.8.8",
+			args: []string{"--network_type", "stn", "--bootnodes", "1,2,3,4", "--dns_zone", "8.8.8.8",
 				"--dns_port", "9001"},
 			expConfig: harmonyconfig.HarmonyConfig{
 				Network: harmonyconfig.NetworkConfig{
-					NetworkType: "pangaea",
+					NetworkType: "stressnet",
 					BootNodes:   []string{"1", "2", "3", "4"},
 				},
 				DNSSync: harmonyconfig.DnsSync{
 					Port:       9001,
 					Zone:       "8.8.8.8",
 					Server:     true,
-					ServerPort: nodeconfig.GetDefaultDNSPort(nodeconfig.Pangaea),
+					ServerPort: nodeconfig.GetDefaultDNSPort(nodeconfig.Stressnet),
 				},
 			},
 		},

cmd/harmony/main.go

@@ -440,8 +440,6 @@ func nodeconfigSetShardSchedule(config harmonyconfig.HarmonyConfig) {
 		shard.Schedule = shardingconfig.MainnetSchedule
 	case nodeconfig.Testnet:
 		shard.Schedule = shardingconfig.TestnetSchedule
-	case nodeconfig.Pangaea:
-		shard.Schedule = shardingconfig.PangaeaSchedule
 	case nodeconfig.Localnet:
 		shard.Schedule = shardingconfig.LocalnetSchedule
 	case nodeconfig.Partner:

core/blockchain_impl.go

@@ -3283,7 +3283,6 @@ func (bc *BlockChainImpl) UpdateBlockRewardAccumulator(
 ) error {
 	current, err := bc.ReadBlockRewardAccumulator(number - 1)
 	if err != nil {
-		// one-off fix for pangaea, return after pangaea enter staking.
 		current = big.NewInt(0)
 		bc.WriteBlockRewardAccumulator(batch, current, number)
 	}

core/genesis.go

@@ -107,8 +107,6 @@ func NewGenesisSpec(netType nodeconfig.NetworkType, shardID uint32) *Genesis {
 		}
 	case nodeconfig.Testnet:
 		chainConfig = *params.TestnetChainConfig
-	case nodeconfig.Pangaea:
-		chainConfig = *params.PangaeaChainConfig
 	case nodeconfig.Partner:
 		chainConfig = *params.PartnerChainConfig
 	case nodeconfig.Devnet:

internal/configs/bootnode/config.go

@@ -39,7 +39,6 @@ type NetworkType string
 const (
 	Mainnet   = "mainnet"
 	Testnet   = "testnet"
-	Pangaea   = "pangaea"
 	Partner   = "partner"
 	Stressnet = "stressnet"
 	Devnet    = "devnet"
@@ -51,8 +50,6 @@ func (t NetworkType) ChainConfig() params.ChainConfig {
 	switch t {
 	case Mainnet:
 		return *params.MainnetChainConfig
-	case Pangaea:
-		return *params.PangaeaChainConfig
 	case Partner:
 		return *params.PartnerChainConfig
 	case Devnet:

internal/configs/node/config.go

@@ -51,7 +51,6 @@ type NetworkType string
 const (
 	Mainnet   = "mainnet"
 	Testnet   = "testnet"
-	Pangaea   = "pangaea"
 	Partner   = "partner"
 	Stressnet = "stressnet"
 	Devnet    = "devnet"
@@ -63,8 +62,6 @@ func (t NetworkType) ChainConfig() params.ChainConfig {
 	switch t {
 	case Mainnet:
 		return *params.MainnetChainConfig
-	case Pangaea:
-		return *params.PangaeaChainConfig
 	case Partner:
 		return *params.PartnerChainConfig
 	case Devnet:

internal/configs/node/group.go

@@ -39,8 +39,6 @@ func getNetworkPrefix(shardID ShardID) (netPre string) {
 		netPre = "harmony"
 	case Testnet:
 		netPre = "hmy/testnet"
-	case Pangaea:
-		netPre = "hmy/pangaea"
 	case Partner:
 		netPre = "hmy/partner"
 	case Stressnet:

internal/configs/node/network.go

@@ -11,11 +11,6 @@ var (
 		"/dnsaddr/bootstrap.b.hmny.io",
 	}
 
-	pangaeaBootNodes = []string{
-		"/ip4/52.40.84.2/tcp/9800/p2p/QmbPVwrqWsTYXq1RxGWcxx9SWaTUCfoo1wA6wmdbduWe29",
-		"/ip4/54.86.126.90/tcp/9800/p2p/Qmdfjtk6hPoyrH1zVD9PEH4zfWLo38dP2mDvvKXfh3tnEv",
-	}
-
 	partnerBootNodes = []string{
 		"/dnsaddr/bootstrap.ps.hmny.io",
 	}
@@ -30,7 +25,6 @@ var (
 const (
 	mainnetDNSZone   = "t.hmny.io"
 	testnetDNSZone   = "b.hmny.io"
-	pangaeaDNSZone   = "os.hmny.io"
 	partnerDNSZone   = "ps.hmny.io"
 	stressnetDNSZone = "stn.hmny.io"
 )
@@ -136,8 +130,6 @@ func GetDefaultBootNodes(networkType NetworkType) []string {
 		return mainnetBootNodes
 	case Testnet:
 		return testnetBootNodes
-	case Pangaea:
-		return pangaeaBootNodes
 	case Partner:
 		return partnerBootNodes
 	case Stressnet:
@@ -163,8 +155,6 @@ func GetDefaultDNSZone(networkType NetworkType) string {
 		return mainnetDNSZone
 	case Testnet:
 		return testnetDNSZone
-	case Pangaea:
-		return pangaeaDNSZone
 	case Partner:
 		return partnerDNSZone
 	case Devnet:

internal/configs/sharding/instance.go

@@ -18,7 +18,6 @@ const (
 	MainNet NetworkID = iota
 	TestNet
 	LocalNet
-	Pangaea
 	Partner
 	StressNet
 	DevNet