diff --git a/event_database/cloud_functions/external-data.go b/event_database/cloud_functions/external-data.go index 94675ce3e..79578dfd7 100644 --- a/event_database/cloud_functions/external-data.go +++ b/event_database/cloud_functions/external-data.go @@ -119,8 +119,6 @@ func chainIdToCoinGeckoPlatform(chain vaa.ChainID) string { return "" // TODO: not currently supported case vaa.ChainIDXpla: return "" // TODO: not currently supported - case vaa.ChainIDEthereumRopsten: - return "ethereum" } return "" } diff --git a/event_database/cloud_functions/process-transfer.go b/event_database/cloud_functions/process-transfer.go index 821faa21a..333de66fa 100644 --- a/event_database/cloud_functions/process-transfer.go +++ b/event_database/cloud_functions/process-transfer.go @@ -58,7 +58,6 @@ func transformHexAddressToNative(chain vaa.ChainID, address string) string { vaa.ChainIDPolygon, vaa.ChainIDAvalanche, vaa.ChainIDOasis, - vaa.ChainIDEthereumRopsten, vaa.ChainIDAurora, vaa.ChainIDFantom, vaa.ChainIDKarura, diff --git a/event_database/cloud_functions/process-vaa.go b/event_database/cloud_functions/process-vaa.go index c6f34465c..d3a1210d1 100644 --- a/event_database/cloud_functions/process-vaa.go +++ b/event_database/cloud_functions/process-vaa.go @@ -45,7 +45,6 @@ var nftEmitters = map[string]string{ "00000000000000000000000051a02d0dcb5e52F5b92bdAA38FA013C91c7309A9": "0x51a02d0dcb5e52F5b92bdAA38FA013C91c7309A9", // polygon "000000000000000000000000D601BAf2EEE3C028344471684F6b27E789D9075D": "0xD601BAf2EEE3C028344471684F6b27E789D9075D", // avalanche "000000000000000000000000C5c25B41AB0b797571620F5204Afa116A44c0ebA": "0xC5c25B41AB0b797571620F5204Afa116A44c0ebA", // oasis - "0000000000000000000000002b048Da40f69c8dc386a56705915f8E966fe1eba": "0x2b048Da40f69c8dc386a56705915f8E966fe1eba", // ethereum ropsten } var muNFTEmitters sync.RWMutex @@ -81,7 +80,6 @@ var tokenTransferEmitters = map[string]string{ "000000000000000000000000377D55a7928c046E18eEbb61977e714d2a76472a": "0x377D55a7928c046E18eEbb61977e714d2a76472a", // polygon "00000000000000000000000061E44E506Ca5659E6c0bba9b678586fA2d729756": "0x61E44E506Ca5659E6c0bba9b678586fA2d729756", // avalanche "00000000000000000000000088d8004A9BdbfD9D28090A02010C19897a29605c": "0x88d8004A9BdbfD9D28090A02010C19897a29605c", // oasis - "000000000000000000000000F174F9A837536C449321df1Ca093Bb96948D5386": "0xF174F9A837536C449321df1Ca093Bb96948D5386", // ethereum ropsten "9e28beafa966b2407bffb0d48651e94972a56e69f3c0897d9e8facbdaeb98386": "terra1nc5tatafv6eyq7llkr2gv50ff9e22mnf70qgjlv737ktmt4eswrquka9l6", // terra2 "8edf5b0e108c3a1a0a4b704cc89591f2ad8d50df24e991567e640ed720a94be2": "6", // algorand } diff --git a/event_database/cloud_functions/shared.go b/event_database/cloud_functions/shared.go index 1cee9d7d8..f5c189eaf 100644 --- a/event_database/cloud_functions/shared.go +++ b/event_database/cloud_functions/shared.go @@ -281,8 +281,6 @@ func chainIdStringToType(chainId string) vaa.ChainID { return vaa.ChainIDAptos case "28": return vaa.ChainIDXpla - case "10001": - return vaa.ChainIDEthereumRopsten } return vaa.ChainIDUnset } diff --git a/node/cmd/guardiand/adminnodes.go b/node/cmd/guardiand/adminnodes.go index 1114e6146..5be98afae 100644 --- a/node/cmd/guardiand/adminnodes.go +++ b/node/cmd/guardiand/adminnodes.go @@ -66,16 +66,6 @@ func runListNodes(cmd *cobra.Command, args []string) { log.Printf("%d nodes in guardian state set", len(nodes)) - // Check if any node is sending Ropsten metrics - var isTestnet bool - for _, node := range nodes { - for _, network := range node.RawHeartbeat.Networks { - if vaa.ChainID(network.Id) == vaa.ChainIDEthereumRopsten { - isTestnet = true - } - } - } - w := tabwriter.NewWriter(os.Stdout, 0, 8, 2, ' ', 0) headers := []string{ @@ -118,17 +108,11 @@ func runListNodes(cmd *cobra.Command, args []string) { {"Moonbeam", vaa.ChainIDMoonbeam}, {"Arbitrum", vaa.ChainIDArbitrum}, {"Xpla", vaa.ChainIDXpla}, + {"Injective", vaa.ChainIDInjective}, + {"Neon", vaa.ChainIDNeon}, {"Wormchain", vaa.ChainIDWormchain}, } - if isTestnet { - networks = append(networks, network{"Ropsten", vaa.ChainIDEthereumRopsten}) - networks = append(networks, network{"Neon", vaa.ChainIDNeon}) - networks = append(networks, network{"Injective", vaa.ChainIDInjective}) - networks = append(networks, network{"Arbitrum", vaa.ChainIDArbitrum}) - networks = append(networks, network{"XPLA", vaa.ChainIDXpla}) - } - if len(only) > 0 { var filtered []network for _, network := range networks { diff --git a/node/cmd/guardiand/node.go b/node/cmd/guardiand/node.go index 78af8182e..91b15cc50 100644 --- a/node/cmd/guardiand/node.go +++ b/node/cmd/guardiand/node.go @@ -78,9 +78,6 @@ var ( polygonRPC *string polygonContract *string - ethRopstenRPC *string - ethRopstenContract *string - auroraRPC *string auroraContract *string @@ -207,9 +204,6 @@ func init() { polygonRPC = NodeCmd.Flags().String("polygonRPC", "", "Polygon RPC URL") polygonContract = NodeCmd.Flags().String("polygonContract", "", "Polygon contract address") - ethRopstenRPC = NodeCmd.Flags().String("ethRopstenRPC", "", "Ethereum Ropsten RPC URL") - ethRopstenContract = NodeCmd.Flags().String("ethRopstenContract", "", "Ethereum Ropsten contract address") - avalancheRPC = NodeCmd.Flags().String("avalancheRPC", "", "Avalanche RPC URL") avalancheContract = NodeCmd.Flags().String("avalancheContract", "", "Avalanche contract address") @@ -283,7 +277,7 @@ func init() { logLevel = NodeCmd.Flags().String("logLevel", "info", "Logging level (debug, info, warn, error, dpanic, panic, fatal)") unsafeDevMode = NodeCmd.Flags().Bool("unsafeDevMode", false, "Launch node in unsafe, deterministic devnet mode") - testnetMode = NodeCmd.Flags().Bool("testnetMode", false, "Launch node in testnet mode (enables testnet-only features like Ropsten)") + testnetMode = NodeCmd.Flags().Bool("testnetMode", false, "Launch node in testnet mode (enables testnet-only features)") devNumGuardians = NodeCmd.Flags().Uint("devNumGuardians", 5, "Number of devnet guardians to include in guardian set") nodeName = NodeCmd.Flags().String("nodeName", "", "Node name to announce in gossip heartbeats") @@ -571,12 +565,6 @@ func runNode(cmd *cobra.Command, args []string) { } if *testnetMode { - if *ethRopstenRPC == "" { - logger.Fatal("Please specify --ethRopstenRPC") - } - if *ethRopstenContract == "" { - logger.Fatal("Please specify --ethRopstenContract") - } if *neonRPC == "" { logger.Fatal("Please specify --neonRPC") } @@ -593,12 +581,6 @@ func runNode(cmd *cobra.Command, args []string) { logger.Fatal("Please specify --injectiveContract") } } else { - if *ethRopstenRPC != "" { - logger.Fatal("Please do not specify --ethRopstenRPC in non-testnet mode") - } - if *ethRopstenContract != "" { - logger.Fatal("Please do not specify --ethRopstenContract in non-testnet mode") - } if *neonRPC != "" && !*unsafeDevMode { logger.Fatal("Please do not specify --neonRPC") } @@ -714,7 +696,6 @@ func runNode(cmd *cobra.Command, args []string) { ethContractAddr := eth_common.HexToAddress(*ethContract) bscContractAddr := eth_common.HexToAddress(*bscContract) polygonContractAddr := eth_common.HexToAddress(*polygonContract) - ethRopstenContractAddr := eth_common.HexToAddress(*ethRopstenContract) avalancheContractAddr := eth_common.HexToAddress(*avalancheContract) oasisContractAddr := eth_common.HexToAddress(*oasisContract) auroraContractAddr := eth_common.HexToAddress(*auroraContract) @@ -1148,15 +1129,6 @@ func runNode(cmd *cobra.Command, args []string) { } if *testnetMode { - if shouldStart(ethRopstenRPC) { - logger.Info("Starting Eth Ropsten watcher") - readiness.RegisterComponent(common.ReadinessEthRopstenSyncing) - chainObsvReqC[vaa.ChainIDEthereumRopsten] = make(chan *gossipv1.ObservationRequest, observationRequestBufferSize) - if err := supervisor.Run(ctx, "ethropstenwatch", - evm.NewEthWatcher(*ethRopstenRPC, ethRopstenContractAddr, "ethropsten", common.ReadinessEthRopstenSyncing, vaa.ChainIDEthereumRopsten, lockC, nil, 1, chainObsvReqC[vaa.ChainIDEthereumRopsten], *unsafeDevMode, nil).Run); err != nil { - return err - } - } if shouldStart(neonRPC) { logger.Info("Starting Neon watcher") readiness.RegisterComponent(common.ReadinessNeonSyncing) diff --git a/node/pkg/common/readiness.go b/node/pkg/common/readiness.go index a3ec2d38a..c9760f0c4 100644 --- a/node/pkg/common/readiness.go +++ b/node/pkg/common/readiness.go @@ -3,29 +3,28 @@ package common import "github.com/certusone/wormhole/node/pkg/readiness" const ( - ReadinessEthSyncing readiness.Component = "ethSyncing" - ReadinessSolanaSyncing readiness.Component = "solanaSyncing" - ReadinessTerraSyncing readiness.Component = "terraSyncing" - ReadinessAlgorandSyncing readiness.Component = "algorandSyncing" - ReadinessNearSyncing readiness.Component = "nearSyncing" - ReadinessAptosSyncing readiness.Component = "aptosSyncing" - ReadinessBSCSyncing readiness.Component = "bscSyncing" - ReadinessPolygonSyncing readiness.Component = "polygonSyncing" - ReadinessEthRopstenSyncing readiness.Component = "ethRopstenSyncing" - ReadinessAvalancheSyncing readiness.Component = "avalancheSyncing" - ReadinessOasisSyncing readiness.Component = "oasisSyncing" - ReadinessAuroraSyncing readiness.Component = "auroraSyncing" - ReadinessFantomSyncing readiness.Component = "fantomSyncing" - ReadinessKaruraSyncing readiness.Component = "karuraSyncing" - ReadinessAcalaSyncing readiness.Component = "acalaSyncing" - ReadinessKlaytnSyncing readiness.Component = "klaytnSyncing" - ReadinessCeloSyncing readiness.Component = "celoSyncing" - ReadinessMoonbeamSyncing readiness.Component = "moonbeamSyncing" - ReadinessNeonSyncing readiness.Component = "neonSyncing" - ReadinessTerra2Syncing readiness.Component = "terra2Syncing" - ReadinessInjectiveSyncing readiness.Component = "injectiveSyncing" - ReadinessXplaSyncing readiness.Component = "xplaSyncing" - ReadinessPythNetSyncing readiness.Component = "pythnetSyncing" - ReadinessArbitrumSyncing readiness.Component = "arbitrumSyncing" - ReadinessWormchainSyncing readiness.Component = "wormchainSyncing" + ReadinessEthSyncing readiness.Component = "ethSyncing" + ReadinessSolanaSyncing readiness.Component = "solanaSyncing" + ReadinessTerraSyncing readiness.Component = "terraSyncing" + ReadinessAlgorandSyncing readiness.Component = "algorandSyncing" + ReadinessNearSyncing readiness.Component = "nearSyncing" + ReadinessAptosSyncing readiness.Component = "aptosSyncing" + ReadinessBSCSyncing readiness.Component = "bscSyncing" + ReadinessPolygonSyncing readiness.Component = "polygonSyncing" + ReadinessAvalancheSyncing readiness.Component = "avalancheSyncing" + ReadinessOasisSyncing readiness.Component = "oasisSyncing" + ReadinessAuroraSyncing readiness.Component = "auroraSyncing" + ReadinessFantomSyncing readiness.Component = "fantomSyncing" + ReadinessKaruraSyncing readiness.Component = "karuraSyncing" + ReadinessAcalaSyncing readiness.Component = "acalaSyncing" + ReadinessKlaytnSyncing readiness.Component = "klaytnSyncing" + ReadinessCeloSyncing readiness.Component = "celoSyncing" + ReadinessMoonbeamSyncing readiness.Component = "moonbeamSyncing" + ReadinessNeonSyncing readiness.Component = "neonSyncing" + ReadinessTerra2Syncing readiness.Component = "terra2Syncing" + ReadinessInjectiveSyncing readiness.Component = "injectiveSyncing" + ReadinessXplaSyncing readiness.Component = "xplaSyncing" + ReadinessPythNetSyncing readiness.Component = "pythnetSyncing" + ReadinessArbitrumSyncing readiness.Component = "arbitrumSyncing" + ReadinessWormchainSyncing readiness.Component = "wormchainSyncing" ) diff --git a/proto/publicrpc/v1/publicrpc.proto b/proto/publicrpc/v1/publicrpc.proto index d4af4b08c..8dc08507c 100644 --- a/proto/publicrpc/v1/publicrpc.proto +++ b/proto/publicrpc/v1/publicrpc.proto @@ -36,9 +36,6 @@ enum ChainID { CHAIN_ID_GNOSIS = 25; CHAIN_ID_PYTHNET = 26; CHAIN_ID_XPLA = 28; - // Special case - Eth has two testnets. CHAIN_ID_ETHEREUM is Goerli, - // but we also want to connect to Ropsten, so we add a separate chain. - CHAIN_ID_ETHEREUM_ROPSTEN = 10001; } // MessageID is a VAA's globally unique identifier (see data availability design document). diff --git a/sdk/testnet_consts.go b/sdk/testnet_consts.go index 4bb1fd070..d6a32d7ac 100644 --- a/sdk/testnet_consts.go +++ b/sdk/testnet_consts.go @@ -8,47 +8,45 @@ var KnownTestnetEmitters = buildKnownEmitters(knownTestnetTokenbridgeEmitters, k // KnownTestnetTokenbridgeEmitters is a map of known tokenbridge emitters on the various L1 testnets. var KnownTestnetTokenbridgeEmitters = buildEmitterMap(knownTestnetTokenbridgeEmitters) var knownTestnetTokenbridgeEmitters = map[vaa.ChainID]string{ - vaa.ChainIDSolana: "3b26409f8aaded3f5ddca184695aa6a0fa829b0c85caf84856324896d214ca98", - vaa.ChainIDEthereum: "000000000000000000000000f890982f9310df57d00f659cf4fd87e65aded8d7", - vaa.ChainIDTerra: "0000000000000000000000000c32d68d8f22613f6b9511872dad35a59bfdf7f0", - vaa.ChainIDTerra2: "c3d4c6c2bcba163de1defb7e8f505cdb40619eee4fa618678955e8790ae1448d", - vaa.ChainIDBSC: "0000000000000000000000009dcf9d205c9de35334d646bee44b2d2859712a09", - vaa.ChainIDPolygon: "000000000000000000000000377D55a7928c046E18eEbb61977e714d2a76472a", - vaa.ChainIDAvalanche: "00000000000000000000000061e44e506ca5659e6c0bba9b678586fa2d729756", - vaa.ChainIDOasis: "00000000000000000000000088d8004a9bdbfd9d28090a02010c19897a29605c", - vaa.ChainIDAlgorand: "6241ffdc032b693bfb8544858f0403dec86f2e1720af9f34f8d65fe574b6238c", - vaa.ChainIDAptos: "0000000000000000000000000000000000000000000000000000000000000001", - vaa.ChainIDAurora: "000000000000000000000000d05ed3ad637b890d68a854d607eeaf11af456fba", - vaa.ChainIDFantom: "000000000000000000000000599cea2204b4faecd584ab1f2b6aca137a0afbe8", - vaa.ChainIDKarura: "000000000000000000000000d11de1f930ea1f7dd0290fe3a2e35b9c91aefb37", - vaa.ChainIDAcala: "000000000000000000000000eba00cbe08992edd08ed7793e07ad6063c807004", - vaa.ChainIDKlaytn: "000000000000000000000000c7a13be098720840dea132d860fdfa030884b09a", - vaa.ChainIDCelo: "00000000000000000000000005ca6037ec51f8b712ed2e6fa72219feae74e153", - vaa.ChainIDNear: "c2c0b6ecbbe9ecf91b2b7999f0264018ba68126c2e83bf413f59f712f3a1df55", - vaa.ChainIDMoonbeam: "000000000000000000000000bc976d4b9d57e57c3ca52e1fd136c45ff7955a96", - vaa.ChainIDArbitrum: "00000000000000000000000023908A62110e21C04F3A4e011d24F901F911744A", - vaa.ChainIDNeon: "000000000000000000000000c7a204bdbfe983fcd8d8e61d02b475d4073ff97e", - vaa.ChainIDXpla: "b66da121bd3621c8d2604c08c82965640fe682d606af26a302ee09094f5e62cf", - vaa.ChainIDEthereumRopsten: "000000000000000000000000F174F9A837536C449321df1Ca093Bb96948D5386", + vaa.ChainIDSolana: "3b26409f8aaded3f5ddca184695aa6a0fa829b0c85caf84856324896d214ca98", + vaa.ChainIDEthereum: "000000000000000000000000f890982f9310df57d00f659cf4fd87e65aded8d7", + vaa.ChainIDTerra: "0000000000000000000000000c32d68d8f22613f6b9511872dad35a59bfdf7f0", + vaa.ChainIDTerra2: "c3d4c6c2bcba163de1defb7e8f505cdb40619eee4fa618678955e8790ae1448d", + vaa.ChainIDBSC: "0000000000000000000000009dcf9d205c9de35334d646bee44b2d2859712a09", + vaa.ChainIDPolygon: "000000000000000000000000377D55a7928c046E18eEbb61977e714d2a76472a", + vaa.ChainIDAvalanche: "00000000000000000000000061e44e506ca5659e6c0bba9b678586fa2d729756", + vaa.ChainIDOasis: "00000000000000000000000088d8004a9bdbfd9d28090a02010c19897a29605c", + vaa.ChainIDAlgorand: "6241ffdc032b693bfb8544858f0403dec86f2e1720af9f34f8d65fe574b6238c", + vaa.ChainIDAptos: "0000000000000000000000000000000000000000000000000000000000000001", + vaa.ChainIDAurora: "000000000000000000000000d05ed3ad637b890d68a854d607eeaf11af456fba", + vaa.ChainIDFantom: "000000000000000000000000599cea2204b4faecd584ab1f2b6aca137a0afbe8", + vaa.ChainIDKarura: "000000000000000000000000d11de1f930ea1f7dd0290fe3a2e35b9c91aefb37", + vaa.ChainIDAcala: "000000000000000000000000eba00cbe08992edd08ed7793e07ad6063c807004", + vaa.ChainIDKlaytn: "000000000000000000000000c7a13be098720840dea132d860fdfa030884b09a", + vaa.ChainIDCelo: "00000000000000000000000005ca6037ec51f8b712ed2e6fa72219feae74e153", + vaa.ChainIDNear: "c2c0b6ecbbe9ecf91b2b7999f0264018ba68126c2e83bf413f59f712f3a1df55", + vaa.ChainIDMoonbeam: "000000000000000000000000bc976d4b9d57e57c3ca52e1fd136c45ff7955a96", + vaa.ChainIDArbitrum: "00000000000000000000000023908A62110e21C04F3A4e011d24F901F911744A", + vaa.ChainIDNeon: "000000000000000000000000c7a204bdbfe983fcd8d8e61d02b475d4073ff97e", + vaa.ChainIDXpla: "b66da121bd3621c8d2604c08c82965640fe682d606af26a302ee09094f5e62cf", } // KnownTestnetNFTBridgeEmitters is a map of known NFT emitters on the various L1 testnets. var KnownTestnetNFTBridgeEmitters = buildEmitterMap(knownTestnetNFTBridgeEmitters) var knownTestnetNFTBridgeEmitters = map[vaa.ChainID]string{ - vaa.ChainIDSolana: "752a49814e40b96b097207e4b53fdd330544e1e661653fbad4bc159cc28a839e", - vaa.ChainIDEthereum: "000000000000000000000000d8e4c2dbdd2e2bd8f1336ea691dbff6952b1a6eb", - vaa.ChainIDBSC: "000000000000000000000000cd16e5613ef35599dc82b24cb45b5a93d779f1ee", - vaa.ChainIDPolygon: "00000000000000000000000051a02d0dcb5e52f5b92bdaa38fa013c91c7309a9", - vaa.ChainIDAvalanche: "000000000000000000000000d601baf2eee3c028344471684f6b27e789d9075d", - vaa.ChainIDOasis: "000000000000000000000000c5c25b41ab0b797571620f5204afa116a44c0eba", - vaa.ChainIDAurora: "0000000000000000000000008f399607e9ba2405d87f5f3e1b78d950b44b2e24", - vaa.ChainIDFantom: "00000000000000000000000063ed9318628d26bdcb15df58b53bb27231d1b227", - vaa.ChainIDKarura: "0000000000000000000000000a693c2d594292b6eb89cb50efe4b0b63dd2760d", - vaa.ChainIDAcala: "00000000000000000000000096f1335e0acab3cfd9899b30b2374e25a2148a6e", - vaa.ChainIDKlaytn: "00000000000000000000000094c994fc51c13101062958b567e743f1a04432de", - vaa.ChainIDCelo: "000000000000000000000000acd8190f647a31e56a656748bc30f69259f245db", - vaa.ChainIDMoonbeam: "00000000000000000000000098a0f4b96972b32fcb3bd03caeb66a44a6ab9edb", - vaa.ChainIDArbitrum: "000000000000000000000000Ee3dB83916Ccdc3593b734F7F2d16D630F39F1D0", - vaa.ChainIDNeon: "00000000000000000000000023908a62110e21c04f3a4e011d24f901f911744a", - vaa.ChainIDEthereumRopsten: "0000000000000000000000002b048da40f69c8dc386a56705915f8e966fe1eba", + vaa.ChainIDSolana: "752a49814e40b96b097207e4b53fdd330544e1e661653fbad4bc159cc28a839e", + vaa.ChainIDEthereum: "000000000000000000000000d8e4c2dbdd2e2bd8f1336ea691dbff6952b1a6eb", + vaa.ChainIDBSC: "000000000000000000000000cd16e5613ef35599dc82b24cb45b5a93d779f1ee", + vaa.ChainIDPolygon: "00000000000000000000000051a02d0dcb5e52f5b92bdaa38fa013c91c7309a9", + vaa.ChainIDAvalanche: "000000000000000000000000d601baf2eee3c028344471684f6b27e789d9075d", + vaa.ChainIDOasis: "000000000000000000000000c5c25b41ab0b797571620f5204afa116a44c0eba", + vaa.ChainIDAurora: "0000000000000000000000008f399607e9ba2405d87f5f3e1b78d950b44b2e24", + vaa.ChainIDFantom: "00000000000000000000000063ed9318628d26bdcb15df58b53bb27231d1b227", + vaa.ChainIDKarura: "0000000000000000000000000a693c2d594292b6eb89cb50efe4b0b63dd2760d", + vaa.ChainIDAcala: "00000000000000000000000096f1335e0acab3cfd9899b30b2374e25a2148a6e", + vaa.ChainIDKlaytn: "00000000000000000000000094c994fc51c13101062958b567e743f1a04432de", + vaa.ChainIDCelo: "000000000000000000000000acd8190f647a31e56a656748bc30f69259f245db", + vaa.ChainIDMoonbeam: "00000000000000000000000098a0f4b96972b32fcb3bd03caeb66a44a6ab9edb", + vaa.ChainIDArbitrum: "000000000000000000000000Ee3dB83916Ccdc3593b734F7F2d16D630F39F1D0", + vaa.ChainIDNeon: "00000000000000000000000023908a62110e21c04f3a4e011d24f901f911744a", } diff --git a/sdk/vaa/structs.go b/sdk/vaa/structs.go index ddb5b14e8..052602df4 100644 --- a/sdk/vaa/structs.go +++ b/sdk/vaa/structs.go @@ -168,8 +168,6 @@ func (c ChainID) String() string { return "aptos" case ChainIDSui: return "sui" - case ChainIDEthereumRopsten: - return "ethereum-ropsten" case ChainIDKarura: return "karura" case ChainIDAcala: @@ -229,8 +227,6 @@ func ChainIDFromString(s string) (ChainID, error) { return ChainIDSui, nil case "aptos": return ChainIDAptos, nil - case "ethereum-ropsten": - return ChainIDEthereumRopsten, nil case "karura": return ChainIDKarura, nil case "acala": @@ -313,9 +309,6 @@ const ( //ChainIDWormchain is the ChainID of Wormchain ChainIDWormchain ChainID = 3104 - // ChainIDEthereumRopsten is the ChainID of Ethereum Ropsten - ChainIDEthereumRopsten ChainID = 10001 - // Minimum VAA size is derrived from the following assumptions: // HEADER // - Supported VAA Version (1 byte) diff --git a/sdk/vaa/structs_test.go b/sdk/vaa/structs_test.go index e965cd89c..79c25c8cb 100644 --- a/sdk/vaa/structs_test.go +++ b/sdk/vaa/structs_test.go @@ -47,7 +47,6 @@ func TestChainIDFromString(t *testing.T) { {input: "injective", output: ChainIDInjective}, {input: "arbitrum", output: ChainIDArbitrum}, {input: "xpla", output: ChainIDXpla}, - {input: "ethereum-ropsten", output: ChainIDEthereumRopsten}, {input: "Solana", output: ChainIDSolana}, {input: "Ethereum", output: ChainIDEthereum}, @@ -72,7 +71,6 @@ func TestChainIDFromString(t *testing.T) { {input: "Injective", output: ChainIDInjective}, {input: "Arbitrum", output: ChainIDArbitrum}, {input: "XPLA", output: ChainIDXpla}, - {input: "Ethereum-ropsten", output: ChainIDEthereumRopsten}, {input: "Wormchain", output: ChainIDWormchain}, {input: "wormchain", output: ChainIDWormchain}, } @@ -169,7 +167,6 @@ func TestChainId_String(t *testing.T) { {input: 22, output: "aptos"}, {input: 23, output: "arbitrum"}, {input: 28, output: "xpla"}, - {input: 10001, output: "ethereum-ropsten"}, {input: 3104, output: "wormchain"}, }