Merge pull request #5676 from filecoin-project/chore/hyperspace-asset

chore: update wallaby and hyperspace asset
filecoin-project · Jan 30, 2023 · 42772b3 · 42772b3
2 parents f2dca96 + 702de24
commit 42772b3
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 11 deletions.
diff --git a/fixtures/assets/asset.go b/fixtures/assets/asset.go
@@ -15,14 +15,12 @@ func GetGenesis(networkType types.NetworkType) ([]byte, error) {
 	switch networkType {
 	case types.NetworkForce:
 		fileName = "forcenet.car"
-	case types.NetworkNerpa:
-		fileName = "nerpanet.car"
 	case types.NetworkInterop:
 		fileName = "interopnet.car"
 	case types.NetworkButterfly:
 		fileName = "butterflynet.car"
 	case types.NetworkHyperspace:
-		fileName = "hyperspace.car"
+		fileName = "hyperspacenet.car"
 	case types.NetworkCalibnet:
 		fileName = "calibnet.car"
 	case types.NetworkWallaby:

diff --git a/fixtures/assets/genesis-car/hyperspacenet.car b/fixtures/assets/genesis-car/hyperspacenet.car
diff --git a/fixtures/assets/genesis-car/nerpanet.car b/fixtures/assets/genesis-car/nerpanet.car
diff --git a/fixtures/assets/genesis-car/wallabynet.car b/fixtures/assets/genesis-car/wallabynet.car
diff --git a/fixtures/networks/hyperspace.go b/fixtures/networks/hyperspace.go
@@ -11,7 +11,13 @@ import (
 func HyperspaceNet() *NetworkConf {
 	return &NetworkConf{
 		Bootstrap: config.BootstrapConfig{
-			Addresses:        []string{},
+			Addresses: []string{
+				"/dns4/de0.bootstrap.hyperspace.yoga/tcp/31000/p2p/12D3KooWRiwg6EHAJMR5w3DZTgpS5W4ncWPSVP2Mr1o4ey1RYSQo",
+				"/dns4/de1.bootstrap.hyperspace.yoga/tcp/31000/p2p/12D3KooWM9HZsp1bh5jNu2m9FBSbkKSeSWUPPuDBQiiMfPDBAK3U",
+				"/dns4/au0.bootstrap.hyperspace.yoga/tcp/31000/p2p/12D3KooWLup1gTdG9ipt3bSUyPCmM4CT86p9nNe12oqrCX8Zo8Na",
+				"/dns4/ca0.bootstrap.hyperspace.yoga/tcp/31000/p2p/12D3KooWNJ4evKioh6gexD4fyvyeFecNtp2oTEPTyp3jtSQ3pWaP",
+				"/dns4/sg0.bootstrap.hyperspace.yoga/tcp/31000/p2p/12D3KooWCENec46HHByaJKzbjSqz9TqVdSxSAdi9FKNwdMvfw3vp",
+			},
 			MinPeerThreshold: 0,
 			Period:           "30s",
 		},
@@ -56,6 +62,7 @@ func HyperspaceNet() *NetworkConf {
 			AddressNetwork:       address.Testnet,
 			PropagationDelaySecs: 6,
 			Eip155ChainID:        3141,
+			ActorDebugging:       false,
 		},
 	}
 }
diff --git a/fixtures/networks/wallaby.go b/fixtures/networks/wallaby.go
@@ -12,10 +12,11 @@ func WallabyNet() *NetworkConf {
 	return &NetworkConf{
 		Bootstrap: config.BootstrapConfig{
 			Addresses: []string{
-				"/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",
+				"/dns4/de0.bootstrap.wallaby.yoga/tcp/41000/p2p/12D3KooWGXLjN4FCXyTsvLPUrbZfkA5p7gXJ11WXXB56cQLEmNkE",
+				"/dns4/de1.bootstrap.wallaby.yoga/tcp/41000/p2p/12D3KooWEHyGpfQsLMPhCo4zmfp6uZfhQisiWZMYaPu1j92d2dax",
+				"/dns4/au0.bootstrap.wallaby.yoga/tcp/41000/p2p/12D3KooWLEPk3TcgpD7aWoou4dzbgdQA14Y9eTCg9rcoLaLruHtf",
+				"/dns4/ca0.bootstrap.wallaby.yoga/tcp/41000/p2p/12D3KooWQAupDxeHoLzmc617FzhWnHHWEt8e2fNfccqByT5mHWPp",
+				"/dns4/sg0.bootstrap.wallaby.yoga/tcp/41000/p2p/12D3KooWAkSaZCXSngvgSi4ufVModcExCysnS3JhG6nnprPjVV4o",
 			},
 			MinPeerThreshold: 0,
 			Period:           "30s",
@@ -61,7 +62,7 @@ func WallabyNet() *NetworkConf {
 			AddressNetwork:       address.Testnet,
 			PropagationDelaySecs: 6,
 			Eip155ChainID:        31415,
-			ActorDebugging:       true,
+			ActorDebugging:       false,
 		},
 	}
 }
diff --git a/venus-shared/actors/builtin_actors.go b/venus-shared/actors/builtin_actors.go
@@ -79,7 +79,7 @@ func SetNetworkBundle(networkType int) error {
 		networkBundle = "wallaby"
 	// case types.NetworkHyperspace:
 	case 0x10:
-		networkBundle = "hyperspacenet"
+		networkBundle = "hyperspace"
 	default:
 		networkBundle = "mainnet"
 	}

diff --git a/venus-shared/utils/utils_test.go b/venus-shared/utils/utils_test.go
@@ -45,7 +45,7 @@ func TestLoadBuiltinActors(t *testing.T) {
 	full := mock.NewMockFullNode(ctrl)
 
 	for nn := range NetworkNameWithNetworkType {
-		if nn == types.NetworkNameWallaby || nn == types.NetworkNameHyperspace {
+		if nn == types.NetworkNameWallaby {
 			continue
 		}