api: better swap logging

daimo-eth · Sep 3, 2024 · db3a422 · db3a422
1 parent b567885
commit db3a422
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 15 deletions.
diff --git a/packages/daimo-api/src/contract/foreignCoinIndexer.ts b/packages/daimo-api/src/contract/foreignCoinIndexer.ts
@@ -80,8 +80,8 @@ export class ForeignCoinIndexer extends Indexer {
           ])
           .where("chain_id", "=", "" + chainConfig.chainL2.id)
           .where((eb) => eb.between("block_num", "" + from, "" + to))
-          .orderBy("block_num", "asc")
-          .orderBy("sort_idx", "asc")
+          .orderBy("block_num")
+          .orderBy("sort_idx")
           .execute()
     );
 
@@ -200,15 +200,12 @@ export class ForeignCoinIndexer extends Indexer {
       this.pendingSwapsByAddr.set(addr, newPendingSwaps);
     } else {
       // inbound transfer, add as a pending swap
+      const pending = this.pendingSwapsByAddr.get(addr) || [];
+      pending.push(log);
+      this.pendingSwapsByAddr.set(addr, pending);
       console.log(
-        `[FOREIGN-COIN] inbound token transfer to ${addrName} ${addr}, ${log.value} ${log.foreignToken.symbol} ${log.foreignToken.token}`
+        `[FOREIGN-COIN] inbound token transfer to ${addrName} ${addr}, ${log.value} ${log.foreignToken.symbol} ${log.foreignToken.token}, new bal ${newBal}, # swaps pending: ${pending.length}`
       );
-      const pending = this.pendingSwapsByAddr.get(addr);
-      if (pending != null) {
-        pending.push(log);
-      } else {
-        this.pendingSwapsByAddr.set(addr, [log]);
-      }
     }
   }
 

diff --git a/packages/daimo-api/src/contract/homeCoinIndexer.ts b/packages/daimo-api/src/contract/homeCoinIndexer.ts
@@ -83,8 +83,8 @@ export class HomeCoinIndexer extends Indexer {
           .where("chain_id", "=", "" + chainConfig.chainL2.id)
           .where((e) => e.between("block_num", "" + from, "" + to))
           .where("token", "=", hexToBuffer(chainConfig.tokenAddress))
-          .orderBy("block_num", "asc")
-          .orderBy("sort_idx", "asc")
+          .orderBy("block_num")
+          .orderBy("sort_idx")
           .execute()
     );
 

diff --git a/packages/daimo-api/src/contract/keyRegistry.ts b/packages/daimo-api/src/contract/keyRegistry.ts
@@ -51,7 +51,6 @@ export class KeyRegistry extends Indexer {
         .where("chain_id", "=", "" + chainConfig.chainL2.id)
         .where((eb) => eb.between("block_num", "" + from, "" + to))
         .orderBy("block_num")
-        .orderBy("tx_idx")
         .orderBy("log_idx")
         .execute()
     );

diff --git a/packages/daimo-api/src/contract/nameRegistry.ts b/packages/daimo-api/src/contract/nameRegistry.ts
@@ -118,7 +118,6 @@ export class NameRegistry extends Indexer {
           .where("chain_id", "=", "" + chainConfig.chainL2.id)
           .where((eb) => eb.between("block_num", "" + from, "" + to))
           .orderBy("block_num")
-          .orderBy("tx_idx")
           .orderBy("log_idx")
           .execute()
     );

diff --git a/packages/daimo-api/src/contract/noteIndexer.ts b/packages/daimo-api/src/contract/noteIndexer.ts
@@ -90,7 +90,6 @@ export class NoteIndexer extends Indexer {
           .where("chain_id", "=", "" + chainConfig.chainL2.id)
           .where((eb) => eb.between("block_num", "" + from, "" + to))
           .orderBy("block_num")
-          .orderBy("tx_idx")
           .orderBy("log_idx")
           .execute()
     );

diff --git a/packages/daimo-api/src/contract/requestIndexer.ts b/packages/daimo-api/src/contract/requestIndexer.ts
@@ -81,7 +81,6 @@ export class RequestIndexer extends Indexer {
         .where("chain_id", "=", "" + chainConfig.chainL2.id)
         .where((eb) => eb.between("block_num", "" + from, "" + to))
         .orderBy("block_num")
-        .orderBy("tx_idx")
         .orderBy("log_idx")
         .execute()
     );