From 93ee5f3d31599e867ce69b8bc1bc017221803442 Mon Sep 17 00:00:00 2001 From: Leo Date: Mon, 14 Feb 2022 14:30:13 +0100 Subject: [PATCH] node: remove duplicated public RPC node definitions commit-id:452deba7 --- node/cmd/guardiand/adminclient.go | 3 ++- node/hack/repair/repair.go | 14 +++----------- .../endpoints.go => pkg/common/mainnet_consts.go} | 11 ++++++++--- 3 files changed, 13 insertions(+), 15 deletions(-) rename node/{cmd/guardiand/endpoints.go => pkg/common/mainnet_consts.go} (62%) diff --git a/node/cmd/guardiand/adminclient.go b/node/cmd/guardiand/adminclient.go index 10f007c1..e015a6bd 100644 --- a/node/cmd/guardiand/adminclient.go +++ b/node/cmd/guardiand/adminclient.go @@ -4,6 +4,7 @@ import ( "context" "encoding/hex" "fmt" + "github.com/certusone/wormhole/node/pkg/common" gossipv1 "github.com/certusone/wormhole/node/pkg/proto/gossip/v1" publicrpcv1 "github.com/certusone/wormhole/node/pkg/proto/publicrpc/v1" "github.com/certusone/wormhole/node/pkg/vaa" @@ -161,7 +162,7 @@ func runFindMissingMessages(cmd *cobra.Command, args []string) { EmitterChain: uint32(chainID), EmitterAddress: emitterAddress, RpcBackfill: *shouldBackfill, - BackfillNodes: publicRPCEndpoints, + BackfillNodes: common.PublicRPCEndpoints, } resp, err := c.FindMissingMessages(ctx, &msg) if err != nil { diff --git a/node/hack/repair/repair.go b/node/hack/repair/repair.go index 1b6b6684..56a8e4bc 100644 --- a/node/hack/repair/repair.go +++ b/node/hack/repair/repair.go @@ -5,6 +5,7 @@ import ( "encoding/hex" "flag" "fmt" + "github.com/certusone/wormhole/node/pkg/common" "github.com/certusone/wormhole/node/pkg/db" gossipv1 "github.com/certusone/wormhole/node/pkg/proto/gossip/v1" nodev1 "github.com/certusone/wormhole/node/pkg/proto/node/v1" @@ -47,15 +48,6 @@ func getAdminClient(ctx context.Context, addr string) (*grpc.ClientConn, error, return conn, err, c } -var publicRPCEndpoints = []string{ - "https://wormhole-v2-mainnet-api.certus.one", - "https://wormhole.inotel.ro", - "https://wormhole-v2-mainnet-api.mcf.rocks", - "https://wormhole-v2-mainnet-api.chainlayer.network", - "https://wormhole-v2-mainnet-api.staking.fund", - "https://wormhole-v2-mainnet.01node.com", -} - func main() { flag.Parse() @@ -75,7 +67,7 @@ func main() { EmitterChain: uint32(vaa.ChainIDSolana), EmitterAddress: emitter, RpcBackfill: true, - BackfillNodes: publicRPCEndpoints, + BackfillNodes: common.PublicRPCEndpoints, } resp, err := admin.FindMissingMessages(ctx, &msg) if err != nil { @@ -211,7 +203,7 @@ func main() { log.Printf("verifying %d", p.Sequence) req, err := http.NewRequestWithContext(ctx, "GET", fmt.Sprintf( "%s/v1/signed_vaa/%d/%s/%d", - publicRPCEndpoints[0], + common.PublicRPCEndpoints[0], vaa.ChainIDSolana, hex.EncodeToString(addr[:]), p.Sequence), nil) diff --git a/node/cmd/guardiand/endpoints.go b/node/pkg/common/mainnet_consts.go similarity index 62% rename from node/cmd/guardiand/endpoints.go rename to node/pkg/common/mainnet_consts.go index bf4c0387..d13726f1 100644 --- a/node/cmd/guardiand/endpoints.go +++ b/node/pkg/common/mainnet_consts.go @@ -1,8 +1,13 @@ -package guardiand +package common +import "github.com/certusone/wormhole/node/pkg/vaa" + +// PublicRPCEndpoints is a list of known public RPC endpoints for mainnet, operated by +// Wormhole guardian nodes. +// // This list is duplicated a couple times across the codebase - make to to update all copies! - -var publicRPCEndpoints = []string{ +// +var PublicRPCEndpoints = []string{ "https://wormhole-v2-mainnet-api.certus.one", "https://wormhole.inotel.ro", "https://wormhole-v2-mainnet-api.mcf.rocks",