fly: share GuardianEntry and prom_gossip cache cleanup

Author: evan-gray

fly/cmd/heartbeats/main.go

@@ -12,7 +12,7 @@ import (
 	"time"
 
 	tm "github.com/buger/goterm"
-	"github.com/certusone/wormhole/node/pkg/common"
+	node_common "github.com/certusone/wormhole/node/pkg/common"
 	"github.com/certusone/wormhole/node/pkg/p2p"
 	gossipv1 "github.com/certusone/wormhole/node/pkg/proto/gossip/v1"
 	"github.com/certusone/wormhole/node/pkg/supervisor"
@@ -22,6 +22,7 @@ import (
 	"github.com/libp2p/go-libp2p/core/crypto"
 	"github.com/prometheus/client_golang/prometheus"
 	dto "github.com/prometheus/client_model/go"
+	"github.com/wormhole-foundation/wormhole-monitor/fly/common"
 	"github.com/wormhole-foundation/wormhole-monitor/fly/utils"
 	"github.com/wormhole-foundation/wormhole/sdk"
 	"github.com/wormhole-foundation/wormhole/sdk/vaa"
@@ -86,61 +87,6 @@ var currentObsvData map[uint]uint
 var currentObsvTable map[uint]uint
 var obsvRateRows []obsvRateRow
 
-type guardianEntry struct {
-	index   int
-	name    string
-	address string
-}
-
-var mainnetGuardians = []guardianEntry{
-	{0, "RockawayX", "0x5893B5A76c3f739645648885bDCcC06cd70a3Cd3"},
-	{1, "Staked", "0xfF6CB952589BDE862c25Ef4392132fb9D4A42157"},
-	{2, "Figment", "0x114De8460193bdf3A2fCf81f86a09765F4762fD1"},
-	{3, "ChainodeTech", "0x107A0086b32d7A0977926A205131d8731D39cbEB"},
-	{4, "Inotel", "0x8C82B2fd82FaeD2711d59AF0F2499D16e726f6b2"},
-	{5, "HashKey Cloud", "0x11b39756C042441BE6D8650b69b54EbE715E2343"},
-	{6, "ChainLayer", "0x54Ce5B4D348fb74B958e8966e2ec3dBd4958a7cd"},
-	{7, "xLabs", "0x15e7cAF07C4e3DC8e7C469f92C8Cd88FB8005a20"},
-	{8, "Forbole", "0x74a3bf913953D695260D88BC1aA25A4eeE363ef0"},
-	{9, "Staking Fund", "0x000aC0076727b35FBea2dAc28fEE5cCB0fEA768e"},
-	{10, "Moonlet", "0xAF45Ced136b9D9e24903464AE889F5C8a723FC14"},
-	{11, "P2P Validator", "0xf93124b7c738843CBB89E864c862c38cddCccF95"},
-	{12, "01node", "0xD2CC37A4dc036a8D232b48f62cDD4731412f4890"},
-	{13, "MCF", "0xDA798F6896A3331F64b48c12D1D57Fd9cbe70811"},
-	{14, "Everstake", "0x71AA1BE1D36CaFE3867910F99C09e347899C19C3"},
-	{15, "Chorus One", "0x8192b6E7387CCd768277c17DAb1b7a5027c0b3Cf"},
-	{16, "syncnode", "0x178e21ad2E77AE06711549CFBB1f9c7a9d8096e8"},
-	{17, "Triton", "0x5E1487F35515d02A92753504a8D75471b9f49EdB"},
-	{18, "Staking Facilities", "0x6FbEBc898F403E4773E95feB15E80C9A99c8348d"},
-}
-
-// Although there are multiple testnet guardians running, they all use the same key, so it looks like one.
-var testnetGuardians = []guardianEntry{
-	{0, "Testnet", "0x13947Bd48b18E53fdAeEe77F3473391aC727C638"},
-}
-
-var devnetGuardians = []guardianEntry{
-	{0, "guardian-0", "0xbeFA429d57cD18b7F8A4d91A2da9AB4AF05d0FBe"},
-	{1, "guardian-1", "0x88D7D8B32a9105d228100E72dFFe2Fae0705D31c"},
-	{2, "guardian-2", "0x58076F561CC62A47087B567C86f986426dFCD000"},
-	{3, "guardian-3", "0xBd6e9833490F8fA87c733A183CD076a6cBD29074"},
-	{4, "guardian-4", "0xb853FCF0a5C78C1b56D15fCE7a154e6ebe9ED7a2"},
-	{5, "guardian-5", "0xAF3503dBD2E37518ab04D7CE78b630F98b15b78a"},
-	{6, "guardian-6", "0x785632deA5609064803B1c8EA8bB2c77a6004Bd1"},
-	{7, "guardian-7", "0x09a281a698C0F5BA31f158585B41F4f33659e54D"},
-	{8, "guardian-8", "0x3178443AB76a60E21690DBfB17f7F59F09Ae3Ea1"},
-	{9, "guardian-9", "0x647ec26ae49b14060660504f4DA1c2059E1C5Ab6"},
-	{10, "guardian-10", "0x810AC3D8E1258Bd2F004a94Ca0cd4c68Fc1C0611"},
-	{11, "guardian-11", "0x80610e96d645b12f47ae5cf4546b18538739e90F"},
-	{12, "guardian-12", "0x2edb0D8530E31A218E72B9480202AcBaeB06178d"},
-	{13, "guardian-13", "0xa78858e5e5c4705CdD4B668FFe3Be5bae4867c9D"},
-	{14, "guardian-14", "0x5Efe3A05Efc62D60e1D19fAeB56A80223CDd3472"},
-	{15, "guardian-15", "0xD791b7D32C05aBB1cc00b6381FA0c4928f0c56fC"},
-	{16, "guardian-16", "0x14Bc029B8809069093D712A3fd4DfAb31963597e"},
-	{17, "guardian-17", "0x246Ab29FC6EBeDf2D392a51ab2Dc5C59d0902A03"},
-	{18, "guardian-18", "0x132A84dFD920b35a3D0BA5f7A0635dF298F9033e"},
-}
-
 func main() {
 	flag.Parse()
 
@@ -158,37 +104,37 @@ func main() {
 		logger.Fatal("--env is required")
 	}
 
-	env, err := common.ParseEnvironment(*envStr)
-	if err != nil || (env != common.UnsafeDevNet && env != common.TestNet && env != common.MainNet) {
+	env, err := node_common.ParseEnvironment(*envStr)
+	if err != nil || (env != node_common.UnsafeDevNet && env != node_common.TestNet && env != node_common.MainNet) {
 		if *envStr == "" {
 			logger.Fatal("Please specify --env")
 		}
 		logger.Fatal("Invalid value for --env, should be devnet, testnet or mainnet", zap.String("val", *envStr))
 	}
 
 	// Build the set of guardians based on our environment, where the default is mainnet.
-	var guardians []guardianEntry
+	var guardians []common.GuardianEntry
 	var knownEmitter []sdk.EmitterInfo
-	if env == common.MainNet {
-		guardians = mainnetGuardians
+	if env == node_common.MainNet {
+		guardians = common.MainnetGuardians
 		knownEmitter = sdk.KnownEmitters
 		rpcUrl = "https://rpc.ankr.com/eth"
 		coreBridgeAddr = "0x98f3c9e6E3fAce36bAAd05FE09d375Ef1464288B"
-	} else if env == common.TestNet {
-		guardians = testnetGuardians
+	} else if env == node_common.TestNet {
+		guardians = common.TestnetGuardians
 		knownEmitter = sdk.KnownTestnetEmitters
 		rpcUrl = "https://rpc.ankr.com/eth_holesky"
 		coreBridgeAddr = "0xa10f2eF61dE1f19f586ab8B6F2EbA89bACE63F7a"
-	} else if env == common.UnsafeDevNet {
-		guardians = devnetGuardians
+	} else if env == node_common.UnsafeDevNet {
+		guardians = common.DevnetGuardians
 		knownEmitter = sdk.KnownDevnetEmitters
 		rpcUrl = "http://localhost:8545"
 		coreBridgeAddr = "0xC89Ce4735882C9F0f0FE26686c53074E09B0D550"
 	}
 
 	for _, gse := range guardians {
-		guardianIndexToNameMap[gse.index] = gse.name
-		guardianIndexMap[strings.ToLower(gse.address)] = gse.index
+		guardianIndexToNameMap[gse.Index] = gse.Name
+		guardianIndexMap[strings.ToLower(gse.Address)] = gse.Index
 	}
 
 	// Fill in the known emitters
@@ -251,7 +197,7 @@ func main() {
 	sendC := make(chan []byte)
 
 	// Inbound observations
-	obsvC := make(chan *common.MsgWithTimeStamp[gossipv1.SignedObservation], 20000)
+	obsvC := make(chan *node_common.MsgWithTimeStamp[gossipv1.SignedObservation], 20000)
 
 	// Inbound observation requests
 	obsvReqC := make(chan *gossipv1.ObservationRequest, 20000)
@@ -263,7 +209,7 @@ func main() {
 	heartbeatC := make(chan *gossipv1.Heartbeat, 20000)
 
 	// Guardian set state managed by processor
-	gst := common.NewGuardianSetState(heartbeatC)
+	gst := node_common.NewGuardianSetState(heartbeatC)
 
 	// Governor cfg
 	govConfigC := make(chan *gossipv1.SignedChainGovernorConfig, 20000)
@@ -276,7 +222,7 @@ func main() {
 		logger.Fatal("Failed to fetch guardian set", zap.Error(err))
 	}
 	logger.Info("guardian set", zap.Uint32("index", idx), zap.Any("gs", sgs))
-	gs := common.GuardianSet{
+	gs := node_common.GuardianSet{
 		Keys:  sgs.Keys,
 		Index: idx,
 	}
@@ -608,7 +554,7 @@ func main() {
 
 	// Load p2p private key
 	var priv crypto.PrivKey
-	priv, err = common.GetOrCreateNodeKey(logger, *nodeKeyPath)
+	priv, err = node_common.GetOrCreateNodeKey(logger, *nodeKeyPath)
 	if err != nil {
 		logger.Fatal("Failed to load node key", zap.Error(err))
 	}