Skip to content

Remove reference to Moonbeam #4930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
djb15 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove reference to Moonbeam #4930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion node/cmd/guardiand/adminnodes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ func runListNodes(cmd *cobra.Command, args []string) {
{"Klaytn", vaa.ChainIDKlaytn},
{"Celo", vaa.ChainIDCelo},
{"Near", vaa.ChainIDNear},
{"Moonbeam", vaa.ChainIDMoonbeam},
{"Injective", vaa.ChainIDInjective},
// Osmosis is not supported in the guardian.
{"Sui", vaa.ChainIDSui},
Expand Down
21 changes: 0 additions & 21 deletions node/cmd/guardiand/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,6 @@ var (
celoRPC *string
celoContract *string

moonbeamRPC *string
moonbeamContract *string

terra2WS *string
terra2LCD *string
terra2Contract *string
Expand Down Expand Up @@ -372,9 +369,6 @@ func init() {
celoRPC = node.RegisterFlagWithValidationOrFail(NodeCmd, "celoRPC", "Celo RPC URL", "ws://eth-devnet:8545", []string{"ws", "wss"})
celoContract = NodeCmd.Flags().String("celoContract", "", "Celo contract address")

moonbeamRPC = node.RegisterFlagWithValidationOrFail(NodeCmd, "moonbeamRPC", "Moonbeam RPC URL", "ws://eth-devnet:8545", []string{"ws", "wss"})
moonbeamContract = NodeCmd.Flags().String("moonbeamContract", "", "Moonbeam contract address")

terra2WS = node.RegisterFlagWithValidationOrFail(NodeCmd, "terra2WS", "Path to terrad root for websocket connection", "ws://terra2-terrad:26657/websocket", []string{"ws", "wss"})
terra2LCD = node.RegisterFlagWithValidationOrFail(NodeCmd, "terra2LCD", "Path to LCD service root for http calls", "http://terra2-terrad:1317", []string{"http", "https"})
terra2Contract = NodeCmd.Flags().String("terra2Contract", "", "Wormhole contract address on Terra 2 blockchain")
Expand Down Expand Up @@ -914,7 +908,6 @@ func runNode(cmd *cobra.Command, args []string) {
*avalancheContract = checkEvmArgs(logger, *avalancheRPC, *avalancheContract, vaa.ChainIDAvalanche)
*klaytnContract = checkEvmArgs(logger, *klaytnRPC, *klaytnContract, vaa.ChainIDKlaytn)
*celoContract = checkEvmArgs(logger, *celoRPC, *celoContract, vaa.ChainIDCelo)
*moonbeamContract = checkEvmArgs(logger, *moonbeamRPC, *moonbeamContract, vaa.ChainIDMoonbeam)
*arbitrumContract = checkEvmArgs(logger, *arbitrumRPC, *arbitrumContract, vaa.ChainIDArbitrum)
*optimismContract = checkEvmArgs(logger, *optimismRPC, *optimismContract, vaa.ChainIDOptimism)
*baseContract = checkEvmArgs(logger, *baseRPC, *baseContract, vaa.ChainIDBase)
Expand Down Expand Up @@ -1090,7 +1083,6 @@ func runNode(cmd *cobra.Command, args []string) {
rpcMap["klaytnRPC"] = *klaytnRPC
rpcMap["celoRPC"] = *celoRPC
rpcMap["nearRPC"] = *nearRPC
rpcMap["moonbeamRPC"] = *moonbeamRPC
rpcMap["injectiveLCD"] = *injectiveLCD
rpcMap["injectiveWS"] = *injectiveWS
// ChainIDOsmosis is not supported in the guardian.
Expand Down Expand Up @@ -1402,19 +1394,6 @@ func runNode(cmd *cobra.Command, args []string) {
watcherConfigs = append(watcherConfigs, wc)
}

if shouldStart(moonbeamRPC) {
wc := &evm.WatcherConfig{
NetworkID: "moonbeam",
ChainID: vaa.ChainIDMoonbeam,
Rpc: *moonbeamRPC,
Contract: *moonbeamContract,
CcqBackfillCache: *ccqBackfillCache,
TxVerifierEnabled: slices.Contains(txVerifierChains, vaa.ChainIDMoonbeam),
}

watcherConfigs = append(watcherConfigs, wc)
}

if shouldStart(arbitrumRPC) {
wc := &evm.WatcherConfig{
NetworkID: "arbitrum",
Expand Down
2 changes: 1 addition & 1 deletion node/hack/governor/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ const expectedUSDDepeggs = [
// Chains that have been deprecated. Tokens on these chains will not be included in the token list.
// Deprecated chain IDs are listed in the Go SDK:
// https://github.com/wormhole-foundation/wormhole/blob/main/sdk/vaa/structs.go
const deprecatedChains = [3,7,9,10,11,12,17,18,28,34,35,36,37,43];
const deprecatedChains = [3,7,9,10,11,12,16,17,18,28,34,35,36,37,43];

const axios = require("axios");
const fs = require("fs");
Expand Down
1 change: 0 additions & 1 deletion node/hack/repair_eth/repair_eth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ var etherscanAPIMap = map[vaa.ChainID]string{
vaa.ChainIDPolygon: "https://api.polygonscan.com/api",
// NOTE: Not sure what should be here for Klaytn, since they use: https://scope.klaytn.com/
vaa.ChainIDCelo: "https://celoscan.xyz/api",
vaa.ChainIDMoonbeam: "https://api-moonbeam.moonscan.io",
vaa.ChainIDArbitrum: "https://api.arbiscan.io",
vaa.ChainIDOptimism: "https://api-optimistic.etherscan.io",
vaa.ChainIDBase: "https://api.basescan.org",
Expand Down
6 changes: 3 additions & 3 deletions node/pkg/common/chainlock_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -979,7 +979,7 @@ func TestNormalizeForDelegateConsensus(t *testing.T) {
Nonce: 42,
Sequence: 95838,
ConsistencyLevel: 1,
EmitterChain: vaa.ChainIDMoonbeam,
EmitterChain: vaa.ChainIDCelo,
EmitterAddress: emitter,
Payload: []byte("payload"),
IsReobservation: false,
Expand Down Expand Up @@ -1019,7 +1019,7 @@ func TestIsReobservationDoesNotSplitDelegateQuorumBucket(t *testing.T) {
Nonce: 0,
Sequence: 95838,
ConsistencyLevel: 1,
EmitterChain: vaa.ChainIDMoonbeam, // chain 16
EmitterChain: vaa.ChainIDCelo,
EmitterAddress: emitter,
Payload: []byte("identical-tb-transfer-payload"),
IsReobservation: isReobs,
Expand Down Expand Up @@ -1059,7 +1059,7 @@ func TestDelegateQuorumIsReobservationDoesNotPreventQuorum(t *testing.T) {
Timestamp: time.Unix(1746026862, 0),
Sequence: 95838,
ConsistencyLevel: 1,
EmitterChain: vaa.ChainIDMoonbeam,
EmitterChain: vaa.ChainIDCelo,
EmitterAddress: emitter,
Payload: []byte("payload"),
IsReobservation: isReobs,
Expand Down
11 changes: 0 additions & 11 deletions node/pkg/governor/generated_mainnet_tokens.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1364,17 +1364,6 @@ func generatedMainnetTokenList() []TokenConfigEntry {
{Chain: 15, Addr: "b55c490bafb82aeb4b950fa479341c1b5fbfa814f8253b6acdf8426b7cd9d3c0", Symbol: "wnear", CoinGeckoId: "wrapped-near", Decimals: 24, Price: 2.17}, // Addr: wrap.near, Notional: 201.15104545269998
{Chain: 15, Addr: "d1d057c9a9a579e4f31531ae77c9a91c0d7622df1d69707aa198a7212a2f5fa5", Symbol: "asi", CoinGeckoId: "sender-ai", Decimals: 18, Price: 0.00009386}, // Addr: token.sendertge.near, Notional: 0.018931562
{Chain: 15, Addr: "f2cc590922eb9d32267bd416a259c2944789f9eb1a6584f4b7149e0f820a237b", Symbol: "sol", CoinGeckoId: "allbridge-bridged-sol-near-protocol", Decimals: 24, Price: 74.45}, // Addr: sol.token.a11bd.near, Notional: 12.956663042999999
{Chain: 16, Addr: "00000000000000000000000030d2a9f5fdf90ace8c17952cbb4ee48a55d916a7", Symbol: "weth", CoinGeckoId: "nomad-bridged-weth-moonbeam", Decimals: 18, Price: 107.93}, // Addr: 0x30D2a9F5FDf90ACe8c17952cbb4eE48a55D916A7, Notional: 75.47066770100001
{Chain: 16, Addr: "000000000000000000000000322e86852e492a7ee17f28a78c663da38fb33bfb", Symbol: "frax", CoinGeckoId: "frax", Decimals: 18, Price: 0.990308}, // Addr: 0x322E86852e492a7Ee17f28a78c663da38FB33bfb, Notional: 4.96144308
{Chain: 16, Addr: "000000000000000000000000511ab53f793683763e5a8829738301368a2411e3", Symbol: "well", CoinGeckoId: "moonwell-artemis", Decimals: 18, Price: 0.00370432}, // Addr: 0x511aB53F793683763E5a8829738301368a2411E3, Notional: 139348.55991888838
{Chain: 16, Addr: "000000000000000000000000524d524b4c9366be706d3a90dcf70076ca037ae3", Symbol: "rmrk", CoinGeckoId: "rmrk", Decimals: 18, Price: 0.00809535}, // Addr: 0x524d524B4c9366be706D3A90dcf70076ca037aE3, Notional: 0.42053724179999996
{Chain: 16, Addr: "000000000000000000000000818ec0a7fe18ff94269904fced6ae3dae6d6dc0b", Symbol: "usdc", CoinGeckoId: "multichain-bridged-usdc-moonbeam", Decimals: 6, Price: 0.01533007}, // Addr: 0x818ec0A7Fe18Ff94269904fCED6AE3DaE6d6dC0b, Notional: 18.0033559672295
{Chain: 16, Addr: "0000000000000000000000008f552a71efe5eefc207bf75485b356a0b3f01ec9", Symbol: "usdc", CoinGeckoId: "nomad-bridged-usdc-moonbeam", Decimals: 6, Price: 0.140116}, // Addr: 0x8f552a71EFE5eeFc207Bf75485b356A0b3f01eC9, Notional: 145.02623701386
{Chain: 16, Addr: "000000000000000000000000acc15dc74880c9944775448304b263d191c6077f", Symbol: "wglmr", CoinGeckoId: "wrapped-moonbeam", Decimals: 18, Price: 0.00889032}, // Addr: 0xAcc15dC74880C9944775448304B263D191c6077F, Notional: 666.6311097860232
{Chain: 16, Addr: "000000000000000000000000ca01a1d0993565291051daff390892518acfad3a", Symbol: "axlusdc", CoinGeckoId: "axlusdc", Decimals: 6, Price: 0.999327}, // Addr: 0xCa01a1D0993565291051daFF390892518ACfAD3A, Notional: 16.99855227
{Chain: 16, Addr: "000000000000000000000000cd3b51d98478d53f4515a306be565c6eebef1d58", Symbol: "glint", CoinGeckoId: "beamswap", Decimals: 18, Price: 0.00001429}, // Addr: 0xcd3B51D98478D53F4515A306bE565c6EebeF1D58, Notional: 0.00035725000000000004
{Chain: 16, Addr: "000000000000000000000000ffffffff1fcacbd218edc0eba20fc2308c778080", Symbol: "dot", CoinGeckoId: "xcdot", Decimals: 10, Price: 1.005}, // Addr: 0xFfFFfFff1FcaCBd218EDc0EbA20Fc2308C778080, Notional: 46.4994653436
{Chain: 16, Addr: "000000000000000000000000ffffffffea09fb06d082fd1275cd48b191cbcd1d", Symbol: "xcusdt", CoinGeckoId: "xcusdt", Decimals: 6, Price: 1.004}, // Addr: 0xFFFFFFfFea09FB06d082fd1275CD48b191cbCD1d, Notional: 321.91252803199995
{Chain: 21, Addr: "01087411ef48aaac1eb6e24803213e3a60a03b147dac930e5e341f17a85e524e", Symbol: "fud", CoinGeckoId: "fud-the-pug", Decimals: 5, Price: 6.282e-9}, // Addr: 76cb819b01abed502bee8a702b4c2d547532c12f25001c9dea795a5e631c26f1::fud::FUD, Notional: 0.0000012564
{Chain: 21, Addr: "10258b4eaaa1a79ae3c6affc1b544bd4856ce8daaa89ed4b6d9036d0c95afe00", Symbol: "pumpkin", CoinGeckoId: "pumpkin-token", Decimals: 6, Price: 0.00001032}, // Addr: 09f1c8f05cb47bbcb61133dd2ef00583720694f41d4f8a61c94467d8f5911a14::pumpkin::PUMPKIN, Notional: 279.7637543530382
{Chain: 21, Addr: "16668a0d6ed3c74bd0b8aa48acc9faf54e3db951f4da981324ef19ac3fd46931", Symbol: "koban", CoinGeckoId: "koban", Decimals: 9, Price: 0.00007066}, // Addr: 8400e7044d360c28dd338111d2aa54ca5bdc960a8d6b60bf3b28e1ca503df3e2::koban::KOBAN, Notional: 1418.6033384568395
Expand Down
1 change: 0 additions & 1 deletion node/pkg/governor/mainnet_chains.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ func ChainList() []ChainConfigEntry {
{EmitterChainID: vaa.ChainIDKlaytn, DailyLimit: 100_000, BigTransactionSize: 10_000},
{EmitterChainID: vaa.ChainIDCelo, DailyLimit: 10_000, BigTransactionSize: 10_000},
{EmitterChainID: vaa.ChainIDNear, DailyLimit: 100_000, BigTransactionSize: 10_000},
{EmitterChainID: vaa.ChainIDMoonbeam, DailyLimit: 1_000_000, BigTransactionSize: 100_000},
{EmitterChainID: vaa.ChainIDInjective, DailyLimit: 10_000, BigTransactionSize: 10_000},
{EmitterChainID: vaa.ChainIDSui, DailyLimit: 2_500_000, BigTransactionSize: 250_000},
{EmitterChainID: vaa.ChainIDAptos, DailyLimit: 1_000_000, BigTransactionSize: 100_000},
Expand Down
1 change: 0 additions & 1 deletion node/pkg/governor/manual_tokens.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ func manualTokenList() []TokenConfigEntry {
// MATIC is 1:1 swappable with POL
{Chain: 2, Addr: "0000000000000000000000007d1afa7b718fb893db30a3abc0cfc608aacfebb0", Symbol: "MATIC", CoinGeckoId: "polygon-ecosystem-token", Decimals: 18, Price: 0.2},
{Chain: 4, Addr: "000000000000000000000000cc42724c6683b7e57334c4e856f4c9965ed682bd", Symbol: "MATIC", CoinGeckoId: "polygon-ecosystem-token", Decimals: 18, Price: 0.2},
{Chain: 16, Addr: "0000000000000000000000003405a1bd46b85c5c029483fbecf2f3e611026e45", Symbol: "MATIC", CoinGeckoId: "polygon-ecosystem-token", Decimals: 18, Price: 0.2},
// ZEROGRAVITY
{Chain: 67, Addr: "0000000000000000000000001Cd0690fF9a693f5EF2dD976660a8dAFc81A109c", Symbol: "W0G", CoinGeckoId: "wrapped-0g", Decimals: 18, Price: 0.91},
}
Expand Down
8 changes: 4 additions & 4 deletions node/pkg/processor/observation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ func makeDelegateObs(t *testing.T, signer ethcommon.Address, txHash []byte, isRe
t.Fatal(err)
}
return &gossipv1.DelegateObservation{
EmitterChain: uint32(vaa.ChainIDMoonbeam),
EmitterChain: uint32(vaa.ChainIDCelo),
EmitterAddress: emitter[:],
Sequence: 95838,
TxHash: txHash,
Expand Down Expand Up @@ -354,8 +354,8 @@ func TestHandleCanonicalDelegateObservation_TxIDDisagreementWarn(t *testing.T) {
// What this test does NOT verify:
//
// 1. That the notary is skipped on the delegate-consensus path. The notary
// in this setup is non-nil but, for Moonbeam, returns Approve immediately
// (txverifier doesn't support Moonbeam), so a regression that re-introduces
// in this setup is non-nil but, for Celo, returns Approve immediately
// (txverifier doesn't support Celo), so a regression that re-introduces
// processWithNotary into handleDelegateConsensusMessagePublication would
// still pass every assertion here. The notary-skip property is enforced
// by code review of handleDelegateConsensusMessagePublication's body
Expand Down Expand Up @@ -457,7 +457,7 @@ func TestCheckForDelegateQuorum_ConsensusPathContract(t *testing.T) {
Nonce: 0,
Sequence: 95838,
ConsistencyLevel: 1,
EmitterChain: vaa.ChainIDMoonbeam,
EmitterChain: vaa.ChainIDCelo,
EmitterAddress: emitter,
Payload: []byte("payload"),
IsReobservation: false, // must be forced to true
Expand Down
Loading
Loading