watcher: improve fetchMissingVaaMessages

watcher/scripts/fetchMissingVAAs.ts

@@ -27,8 +27,14 @@ const missingVaas: { [id: string]: string | undefined } = {};
   const now = Math.floor(Date.now() / 1000);
   try {
     let log = ora('Fetching messages without a signed VAA...').start();
+    // @ts-ignore
+    const beforeFetch = performance.now();
     const missingVaaMessages = await bt.fetchMissingVaaMessages();
-    log.succeed();
+    // @ts-ignore
+    const afterFetch = performance.now();
+    log.succeed(
+      `Fetched messages without a signed VAA in ${((afterFetch - beforeFetch) / 1000).toFixed(2)}s`
+    );
     const total = missingVaaMessages.length;
     let found = 0;
     let search = 0;
@@ -64,7 +70,8 @@ const missingVaas: { [id: string]: string | undefined } = {};
           tooNew++;
         }
       } else {
-        missingVaas[id] = observedMessage.data.info.txHash?.[0].value;
+        // TODO: txHash is no longer returned, do a bulk lookup at the end
+        missingVaas[id] = observedMessage.data.info.txHash?.[0].value || '';
       }
     }
     log.succeed();

watcher/src/databases/BigtableDatabase.ts

@@ -184,15 +184,25 @@ export class BigtableDatabase extends Database {
     }
   }
 
+  /**
+   * Returns message table rows where `hasSignedVAA === 0`. Note, this does not return all columns.
+   */
   async fetchMissingVaaMessages(): Promise<BigtableMessagesResultRow[]> {
     const instance = this.bigtable.instance(this.instanceId);
     const messageTable = instance.table(this.msgTableId);
-    // TODO: how to filter to only messages with hasSignedVaa === 0
-    const observedMessages = (await messageTable.getRows())[0] as BigtableMessagesResultRow[];
-    const missingVaaMessages = observedMessages.filter(
-      (x) => x.data.info.hasSignedVaa?.[0].value === 0
-    );
-    return missingVaaMessages;
+    const observedMessages = (
+      await messageTable.getRows({
+        filter: [
+          {
+            column: /^hasSignedVaa$/,
+          },
+          {
+            value: { start: { value: 0, inclusive: true }, end: { value: 1, inclusive: false } },
+          },
+        ],
+      })
+    )[0] as BigtableMessagesResultRow[];
+    return observedMessages;
   }
 
   async watchMissing(): Promise<void> {