Merge branch 'main' into bing/historical_uptime_guardian_heartbeats

bingyuyap · web-flow · commit fe88b63f32f5 · 2024-02-20T16:05:27.000-05:00
diff --git a/dashboard/src/components/Home.tsx b/dashboard/src/components/Home.tsx
@@ -41,7 +41,7 @@ function Home({
           <Divider />
           <MonitorSettingsProvider>
             <CollapsibleSection header="Monitor">
-              <Monitor />
+              <Monitor governorInfo={governorInfo} />
             </CollapsibleSection>
           </MonitorSettingsProvider>
         </>
diff --git a/dashboard/src/components/Monitor.tsx b/dashboard/src/components/Monitor.tsx
@@ -25,6 +25,7 @@ import {
   explorerVaa,
 } from '@wormhole-foundation/wormhole-monitor-common';
 import { Environment, useCurrentEnvironment, useNetworkContext } from '../contexts/NetworkContext';
+import { CloudGovernorInfo } from '../hooks/useCloudGovernorInfo';
 
 type LastBlockByChain = { [chainId: string]: string };
 type CountsByChain = {
@@ -291,7 +292,7 @@ function ReobserveCode({ misses }: { misses: MissesByChain | null }) {
   ) : null;
 }
 
-function Misses() {
+function Misses({ governorInfo }: { governorInfo?: CloudGovernorInfo | null }) {
   const { currentNetwork } = useNetworkContext();
   const { showAllMisses } = useSettings();
   const [missesWrapper, setMissesWrapper] = useState<DataWrapper<MissesByChain>>(
@@ -329,7 +330,17 @@ function Misses() {
         .map(([chain, info]) => {
           const filteredMisses = showAllMisses
             ? info.messages
-            : info.messages.filter((message) => message.timestamp < twoHoursAgo);
+            : info.messages
+                .filter((message) => message.timestamp < twoHoursAgo)
+                .filter(
+                  (message) =>
+                    !governorInfo?.enqueuedVAAs.some(
+                      (enqueuedVAA) =>
+                        enqueuedVAA.emitterChain === message.chain &&
+                        enqueuedVAA.emitterAddress === message.emitter &&
+                        enqueuedVAA.sequence === message.seq
+                    )
+                );
           return filteredMisses.length === 0 ? null : (
             <CollapsibleSection
               key={chain}
@@ -400,7 +411,7 @@ function SettingsButton() {
   );
 }
 
-function Monitor() {
+function Monitor({ governorInfo }: { governorInfo?: CloudGovernorInfo | null }) {
   const { currentNetwork } = useNetworkContext();
   const [lastBlockByChainWrapper, setLastBlockByChainWrapper] = useState<
     DataWrapper<LastBlockByChain>
@@ -466,7 +477,7 @@ function Monitor() {
         <SettingsButton />
       </Box>
       <Box mb={2}>
-        <Misses />
+        <Misses governorInfo={governorInfo} />
       </Box>
       <Typography variant="h4">Chains</Typography>
       <Box pl={0.5}>
diff --git a/watcher/src/consts.ts b/watcher/src/consts.ts
@@ -80,6 +80,7 @@ export const RPCS_BY_CHAIN: { [key in Environment]: { [key in ChainName]?: strin
     base: process.env.BASE_RPC,
     sei: process.env.SEI_RPC,
     wormchain: process.env.WORMCHAIN_RPC,
+    sepolia: process.env.SEPOLIA_RPC,
   },
   ['devnet']: {},
 };
@@ -135,8 +136,12 @@ export const ALGORAND_INFO: { [key in Environment]: AlgorandInfo } = {
   },
 };
 
-export const SEI_EXPLORER_GRAPHQL = 'https://pacific-1-graphql.alleslabs.dev/v1/graphql';
-export const SEI_EXPLORER_TXS = 'https://celatone-api-prod.alleslabs.dev/v1/sei/pacific-1/txs/';
+export const SEI_EXPLORER_GRAPHQL_MAINNET = 'https://pacific-1-graphql.alleslabs.dev/v1/graphql';
+export const SEI_EXPLORER_TXS_MAINNET =
+  'https://celatone-api-prod.alleslabs.dev/v1/sei/pacific-1/txs/';
+export const SEI_EXPLORER_GRAPHQL_TESTNET = 'https://atlantic-2-graphql.alleslabs.dev/v1/graphql';
+export const SEI_EXPLORER_TXS_TESTNET =
+  'https://celatone-api-prod.alleslabs.dev/v1/sei/atlantic-2/txs/';
 
 export const DB_SOURCE =
   process.env.NODE_ENV === 'test' ? 'local' : process.env.DB_SOURCE || 'local';
diff --git a/watcher/src/index.ts b/watcher/src/index.ts
@@ -42,6 +42,7 @@ const supportedChains: ChainName[] =
         'base',
         'sei',
         // 'wormchain',
+        'sepolia',
       ]
     : [
         // This is the list of chains supported in MAINNET.
diff --git a/watcher/src/watchers/ArbitrumWatcher.ts b/watcher/src/watchers/ArbitrumWatcher.ts
@@ -17,7 +17,10 @@ export class ArbitrumWatcher extends EVMWatcher {
     if (!this.rpc) {
       throw new Error(`${this.chain} RPC is not defined!`);
     }
-    this.evmWatcher = new EVMWatcher(network, 'ethereum', 'finalized');
+    this.evmWatcher =
+      network === 'mainnet'
+        ? new EVMWatcher(network, 'ethereum', 'finalized')
+        : new EVMWatcher(network, 'sepolia', 'finalized');
     this.latestL2Finalized = 0;
     this.l1L2Map = new Map<number, number>();
     this.lastEthTime = 0;
diff --git a/watcher/src/watchers/EVMWatcher.ts b/watcher/src/watchers/EVMWatcher.ts
@@ -1,5 +1,5 @@
 import { Implementation__factory } from '@certusone/wormhole-sdk/lib/cjs/ethers-contracts/factories/Implementation__factory';
-import { CONTRACTS, EVMChainName } from '@certusone/wormhole-sdk/lib/cjs/utils/consts';
+import { CONTRACTS, Contracts, EVMChainName } from '@certusone/wormhole-sdk/lib/cjs/utils/consts';
 import { Log } from '@ethersproject/abstract-provider';
 import axios from 'axios';
 import { BigNumber } from 'ethers';
@@ -206,7 +206,13 @@ export class EVMWatcher extends Watcher {
   }
 
   async getMessagesForBlocks(fromBlock: number, toBlock: number): Promise<VaasByBlock> {
-    const address = CONTRACTS.MAINNET[this.chain].core;
+    const contracts: Contracts =
+      this.network === 'mainnet'
+        ? CONTRACTS.MAINNET[this.chain]
+        : this.network === 'testnet'
+        ? CONTRACTS.TESTNET[this.chain]
+        : CONTRACTS.DEVNET[this.chain];
+    const address = contracts.core;
     if (!address) {
       throw new Error(`Core contract not defined for ${this.chain}`);
     }
diff --git a/watcher/src/watchers/SeiExplorerWatcher.ts b/watcher/src/watchers/SeiExplorerWatcher.ts
@@ -1,6 +1,12 @@
-import { CONTRACTS } from '@certusone/wormhole-sdk/lib/cjs/utils/consts';
+import { CONTRACTS, Contracts } from '@certusone/wormhole-sdk/lib/cjs/utils/consts';
 import axios from 'axios';
-import { AXIOS_CONFIG_JSON, SEI_EXPLORER_GRAPHQL, SEI_EXPLORER_TXS } from '../consts';
+import {
+  AXIOS_CONFIG_JSON,
+  SEI_EXPLORER_GRAPHQL_MAINNET,
+  SEI_EXPLORER_GRAPHQL_TESTNET,
+  SEI_EXPLORER_TXS_MAINNET,
+  SEI_EXPLORER_TXS_TESTNET,
+} from '../consts';
 import { VaasByBlock } from '../databases/types';
 import { makeBlockKey, makeVaaKey } from '../databases/utils';
 import { CosmwasmHashResult, CosmwasmWatcher } from './CosmwasmWatcher';
@@ -29,33 +35,65 @@ type SeiExplorerAccountTransactionsResponse = {
 };
 
 export class SeiExplorerWatcher extends CosmwasmWatcher {
+  explorerGraphql: string;
+  explorerTxs: string;
+  accountId: number;
+
   constructor(network: Environment) {
     super(network, 'sei');
     // arbitrarily large since the code here is capable of pulling all logs from all via indexer pagination
     this.maximumBatchSize = 1_000_000;
+    this.explorerGraphql =
+      network === 'mainnet'
+        ? SEI_EXPLORER_GRAPHQL_MAINNET
+        : network === 'testnet'
+        ? SEI_EXPLORER_GRAPHQL_TESTNET
+        : '';
+    this.explorerTxs =
+      network === 'mainnet'
+        ? SEI_EXPLORER_TXS_MAINNET
+        : network === 'testnet'
+        ? SEI_EXPLORER_TXS_TESTNET
+        : '';
+    this.accountId = network === 'mainnet' ? 42 : network === 'testnet' ? 3254150 : 0;
+    // 42 is the account id of sei1gjrrme22cyha4ht2xapn3f08zzw6z3d4uxx6fyy9zd5dyr3yxgzqqncdqn <-- mainnet
+    // MAINNET:
+    // curl https://pacific-1-graphql.alleslabs.dev/v1/graphql \
+    //   -X POST \
+    //   -H "Content-Type: application/json" \
+    //   --data '{"query":"query getAccountIdByAddressQueryDocument($address: String!) {accounts_by_pk(address: $address) {id}}", "variables":{"address":"sei1gjrrme22cyha4ht2xapn3f08zzw6z3d4uxx6fyy9zd5dyr3yxgzqqncdqn"}, "operationName":"getAccountIdByAddressQueryDocument"}'
+    // {"data":{"accounts_by_pk":{"id":42}}}
+    //
+    // 3254150 is the account number of sei1nna9mzp274djrgzhzkac2gvm3j27l402s4xzr08chq57pjsupqnqaj0d5s <-- testnet
+    // TESTNET:
+    // curl https://atlantic-2-graphql.alleslabs.dev/v1/graphql \
+    //   -X POST \
+    //   -H "Content-Type: application/json" \
+    //   --data '{"query":"query getAccountIdByAddressQueryDocument($address: String!) {accounts_by_pk(address: $address) {id}}", "variables":{"address":"sei1nna9mzp274djrgzhzkac2gvm3j27l402s4xzr08chq57pjsupqnqaj0d5s"}, "operationName":"getAccountIdByAddressQueryDocument"}'
+    // {"data":{"accounts_by_pk":{"id":3254150}}}
+    // returned by getAccountIdByAddressQueryDocument
   }
 
   makeGraphQLQuery(offset: number, pageSize: number) {
     return {
       query:
         'query getTxsByAddressPagination($expression: account_transactions_bool_exp, $offset: Int!, $pageSize: Int!) {\n  account_transactions(\n    where: $expression\n    order_by: {block_height: desc}\n    offset: $offset\n    limit: $pageSize\n  ) {\n    block {\n      height\n      timestamp\n    }\n    transaction {\n      account {\n        address\n      }\n      hash\n      success\n      messages\n      is_clear_admin\n      is_execute\n      is_ibc\n      is_instantiate\n      is_migrate\n      is_send\n      is_store_code\n      is_update_admin\n    }\n    is_signer\n  }\n}',
-      variables: { expression: { account_id: { _eq: 42 } }, offset, pageSize },
-      // 42 is the account id of sei1gjrrme22cyha4ht2xapn3f08zzw6z3d4uxx6fyy9zd5dyr3yxgzqqncdqn
-      // returned by getAccountIdByAddressQueryDocument
+      variables: { expression: { account_id: { _eq: this.accountId } }, offset, pageSize },
       operationName: 'getTxsByAddressPagination',
     };
   }
 
   async getFinalizedBlockNumber(): Promise<number> {
     const query = this.makeGraphQLQuery(0, 1);
-    this.logger.debug(`Query string = ${JSON.stringify(query)}`);
+    // this.logger.debug(`Query string = ${JSON.stringify(query)}`);
     const bulkTxnResult = (
       await axios.post<SeiExplorerAccountTransactionsResponse>(
-        SEI_EXPLORER_GRAPHQL,
+        this.explorerGraphql,
         query,
         AXIOS_CONFIG_JSON
       )
     ).data;
+    this.logger.debug(`bulkTxnResult = ${JSON.stringify(bulkTxnResult)}`);
     const blockHeight = bulkTxnResult?.data?.account_transactions?.[0]?.block?.height;
     if (blockHeight) {
       if (blockHeight !== this.latestBlockHeight) {
@@ -70,7 +108,13 @@ export class SeiExplorerWatcher extends CosmwasmWatcher {
   // retrieve blocks for core contract
   // compare block height with what is passed in
   async getMessagesForBlocks(fromBlock: number, toBlock: number): Promise<VaasByBlock> {
-    const address = CONTRACTS.MAINNET[this.chain].core;
+    const contracts: Contracts =
+      this.network === 'mainnet'
+        ? CONTRACTS.MAINNET[this.chain]
+        : this.network === 'testnet'
+        ? CONTRACTS.TESTNET[this.chain]
+        : CONTRACTS.DEVNET[this.chain];
+    const address = contracts.core;
     if (!address) {
       throw new Error(`Core contract not defined for ${this.chain}`);
     }
@@ -83,10 +127,10 @@ export class SeiExplorerWatcher extends CosmwasmWatcher {
     let skip: number = 0;
     while (!done) {
       const query = this.makeGraphQLQuery(skip, limit);
-      this.logger.debug(`Query string = ${JSON.stringify(query)}`);
+      // this.logger.debug(`Query string = ${JSON.stringify(query)}`);
       const bulkTxnResult = (
         await axios.post<SeiExplorerAccountTransactionsResponse>(
-          SEI_EXPLORER_GRAPHQL,
+          this.explorerGraphql,
           query,
           AXIOS_CONFIG_JSON
         )
@@ -130,7 +174,7 @@ export class SeiExplorerWatcher extends CosmwasmWatcher {
             } catch (e: any) {
               if (e?.response?.status === 404) {
                 // the node is mysteriously missing some transactions, but so is this ='(
-                hashResult = (await axios.get(`${SEI_EXPLORER_TXS}${hash}`, AXIOS_CONFIG_JSON))
+                hashResult = (await axios.get(`${this.explorerTxs}${hash}`, AXIOS_CONFIG_JSON))
                   .data;
               }
             }
diff --git a/watcher/src/watchers/Watcher.ts b/watcher/src/watchers/Watcher.ts
@@ -74,6 +74,7 @@ export class Watcher {
             fromBlock = toBlock;
           }
           retry = 0;
+          this.logger.debug(`fromBlock = ${fromBlock}, toBlock = ${toBlock}`);
           await sleep(TIMEOUT);
         } catch (e) {
           // skip attempting to fetch messages until getting the finalized block succeeds
diff --git a/watcher/src/watchers/utils.ts b/watcher/src/watchers/utils.ts
@@ -56,6 +56,8 @@ export function makeFinalizedWatcher(network: Environment, chainName: ChainName)
     return new SuiWatcher(network);
   } else if (chainName === 'wormchain') {
     return new WormchainWatcher(network);
+  } else if (chainName === 'sepolia' && network === 'testnet') {
+    return new EVMWatcher(network, chainName, 'finalized');
   } else {
     throw new Error(`Attempted to create finalized watcher for unsupported chain ${chainName}`);
   }

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ const supportedChains: ChainName[] =`
`42`	`42`	`'base',`
`43`	`43`	`'sei',`
`44`	`44`	`// 'wormchain',`
	`45`	`+ 'sepolia',`
`45`	`46`	`]`
`46`	`47`	`: [`
`47`	`48`	`// This is the list of chains supported in MAINNET.`
Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@ export class Watcher {`
`74`	`74`	`fromBlock = toBlock;`
`75`	`75`	`}`
`76`	`76`	`retry = 0;`
	`77`	+ this.logger.debug(`fromBlock = ${fromBlock}, toBlock = ${toBlock}`);
`77`	`78`	`await sleep(TIMEOUT);`
`78`	`79`	`} catch (e) {`
`79`	`80`	`// skip attempting to fetch messages until getting the finalized block succeeds`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,8 @@ export function makeFinalizedWatcher(network: Environment, chainName: ChainName)`
`56`	`56`	`return new SuiWatcher(network);`
`57`	`57`	`} else if (chainName === 'wormchain') {`
`58`	`58`	`return new WormchainWatcher(network);`
	`59`	`+ } else if (chainName === 'sepolia' && network === 'testnet') {`
	`60`	`+ return new EVMWatcher(network, chainName, 'finalized');`
`59`	`61`	`} else {`
`60`	`62`	throw new Error(`Attempted to create finalized watcher for unsupported chain ${chainName}`);
`61`	`63`	`}`