common: v0.2.10, bytesToAddr

daimo-eth · Sep 22, 2024 · b8b4fe6 · b8b4fe6
1 parent efd259b
commit b8b4fe6
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 51 deletions.
diff --git a/packages/daimo-api/src/contract/ClogMatcher.ts b/packages/daimo-api/src/contract/ClogMatcher.ts
@@ -1,14 +1,12 @@
-import { assertNotNull, debugJson, retryBackoff } from "@daimo/common";
+import {
+  assertNotNull,
+  bytesToAddr,
+  debugJson,
+  retryBackoff,
+} from "@daimo/common";
 import { daimoFastCctpAddrs } from "@daimo/contract";
 import { Kysely } from "kysely";
-import {
-  Address,
-  bytesToHex,
-  getAddress,
-  Hex,
-  hexToBytes,
-  zeroAddress,
-} from "viem";
+import { Address, bytesToHex, Hex, hexToBytes, zeroAddress } from "viem";
 
 import { ForeignTokenTransfer } from "./foreignCoinIndexer";
 import { DB as IndexDB } from "../codegen/dbIndex";
@@ -72,12 +70,9 @@ export class ClogMatcher {
         transactionHash: bytesToHex(row.tx_hash, { size: 32 }),
         transactionIndex: Number(row.tx_idx),
         logIndex: Number(row.sort_idx),
-        address:
-          row.token == null
-            ? zeroAddress
-            : getAddress(bytesToHex(row.token, { size: 20 })),
-        from: getAddress(bytesToHex(row.f, { size: 20 })),
-        to: getAddress(bytesToHex(row.t, { size: 20 })),
+        address: row.token == null ? zeroAddress : bytesToAddr(row.token),
+        from: bytesToAddr(row.f),
+        to: bytesToAddr(row.t),
         value: BigInt(row.amount),
       };
       const token = this.tokenReg.getToken(transferLog.address, chainId);
@@ -114,11 +109,9 @@ export class ClogMatcher {
         transactionHash: bytesToHex(row.tx_hash, { size: 32 }),
         transactionIndex: Number(row.tx_idx),
         logIndex: Number(row.log_idx),
-        address: getAddress(bytesToHex(row.to_token, { size: 20 })),
-        from: getAddress(
-          bytesToHex(assertNotNull(row.from_addr), { size: 20 })
-        ),
-        to: getAddress(bytesToHex(row.to_addr, { size: 20 })),
+        address: bytesToAddr(row.to_token),
+        from: bytesToAddr(assertNotNull(row.from_addr)),
+        to: bytesToAddr(row.to_addr),
         value: BigInt(row.to_amount),
       };
 
@@ -201,13 +194,9 @@ export class ClogMatcher {
         transactionHash: bytesToHex(assertNotNull(row.tx_hash), { size: 32 }),
         transactionIndex: Number(row.tx_idx),
         logIndex: Number(row.log_idx),
-        address: getAddress(
-          bytesToHex(assertNotNull(row.from_token), { size: 20 })
-        ),
-        from: getAddress(
-          bytesToHex(assertNotNull(row.from_addr), { size: 20 })
-        ),
-        to: getAddress(bytesToHex(assertNotNull(row.to_addr), { size: 20 })),
+        address: bytesToAddr(assertNotNull(row.from_token)),
+        from: bytesToAddr(assertNotNull(row.from_addr)),
+        to: bytesToAddr(assertNotNull(row.to_addr)),
         value: BigInt(assertNotNull(row.to_amount)),
       };
       const crossChainToken = this.tokenReg.getToken(

diff --git a/packages/daimo-api/src/contract/foreignCoinIndexer.ts b/packages/daimo-api/src/contract/foreignCoinIndexer.ts
@@ -2,6 +2,7 @@ import {
   amountToDollars,
   assertNotNull,
   BigIntStr,
+  bytesToAddr,
   debugJson,
   EAccount,
   guessTimestampFromNum,
@@ -104,9 +105,9 @@ export class ForeignCoinIndexer extends Indexer {
         address:
           row.token == null
             ? zeroAddress // ETH / native token transfer
-            : getAddress(bytesToHex(row.token, { size: 20 })), // ERC-20
-        from: getAddress(bytesToHex(row.f, { size: 20 })),
-        to: getAddress(bytesToHex(row.t, { size: 20 })),
+            : bytesToAddr(row.token), // ERC-20
+        from: bytesToAddr(row.f),
+        to: bytesToAddr(row.t),
         value: BigInt(row.amount),
       }))
       .filter((t) => t.address !== chainConfig.tokenAddress) // not home coin

diff --git a/packages/daimo-api/src/contract/homeCoinIndexer.ts b/packages/daimo-api/src/contract/homeCoinIndexer.ts
@@ -5,6 +5,7 @@ import {
   PreSwapTransfer,
   TransferClog,
   assertNotNull,
+  bytesToAddr,
   guessTimestampFromNum,
   hexToBuffer,
   retryBackoff,
@@ -98,9 +99,9 @@ export class HomeCoinIndexer extends Indexer {
         transactionHash: bytesToHex(row.tx_hash, { size: 32 }),
         transactionIndex: Number(row.tx_idx),
         logIndex: Number(row.sort_idx) / 2,
-        address: getAddress(bytesToHex(assertNotNull(row.token), { size: 20 })),
-        from: getAddress(bytesToHex(row.f, { size: 20 })),
-        to: getAddress(bytesToHex(row.t, { size: 20 })),
+        address: bytesToAddr(assertNotNull(row.token)),
+        from: bytesToAddr(row.f),
+        to: bytesToAddr(row.t),
         value: BigInt(row.amount),
       };
       txHashes.add(transferLog.transactionHash);

diff --git a/packages/daimo-api/src/contract/nameRegistry.ts b/packages/daimo-api/src/contract/nameRegistry.ts
@@ -5,6 +5,7 @@ import {
   EAccount,
   assertEqual,
   assertNotNull,
+  bytesToAddr,
   isValidName,
   now,
   retryBackoff,
@@ -18,7 +19,6 @@ import {
 import { Kysely } from "kysely";
 import {
   Address,
-  bytesToHex,
   bytesToString,
   encodeFunctionData,
   getAddress,
@@ -133,7 +133,7 @@ export class NameRegistry extends Indexer {
       return {
         timestamp: Number(r.block_ts),
         name: bytesToString(r.name, { size: 32 }),
-        addr: getAddress(bytesToHex(r.addr, { size: 20 })),
+        addr: bytesToAddr(r.addr),
       };
     });
     this.logs.push(...names);

diff --git a/packages/daimo-api/src/contract/noteIndexer.ts b/packages/daimo-api/src/contract/noteIndexer.ts
@@ -3,13 +3,14 @@ import {
   DaimoNoteStatus,
   amountToDollars,
   assertNotNull,
+  bytesToAddr,
   debugJson,
   getEAccountStr,
   getNoteId,
   retryBackoff,
 } from "@daimo/common";
 import { Kysely } from "kysely";
-import { Address, Hex, bytesToHex, getAddress } from "viem";
+import { Address, Hex, bytesToHex } from "viem";
 
 import { Indexer } from "./indexer";
 import { NameRegistry } from "./nameRegistry";
@@ -99,11 +100,11 @@ export class NoteIndexer extends Indexer {
       transactionIndex: Number(r.tx_idx),
       logIndex: Number(r.log_idx),
       transactionHash: bytesToHex(r.tx_hash, { size: 32 }),
-      from: getAddress(bytesToHex(r.creator, { size: 20 })),
-      redeemer: r.redeemer && getAddress(bytesToHex(r.redeemer, { size: 20 })),
-      ephemeralOwner: getAddress(bytesToHex(r.ephemeral_owner, { size: 20 })),
+      from: bytesToAddr(r.creator),
+      redeemer: r.redeemer && bytesToAddr(r.redeemer),
+      ephemeralOwner: bytesToAddr(r.ephemeral_owner),
       amount: BigInt(r.amount),
-      logAddr: getAddress(bytesToHex(r.log_addr, { size: 20 })),
+      logAddr: bytesToAddr(r.log_addr),
     }));
   }
 

diff --git a/packages/daimo-api/src/contract/requestIndexer.ts b/packages/daimo-api/src/contract/requestIndexer.ts
@@ -4,6 +4,7 @@ import {
   DaimoRequestV2Status,
   amountToDollars,
   assertNotNull,
+  bytesToAddr,
   debugJson,
   decodeRequestIdString,
   encodeRequestId,
@@ -14,7 +15,7 @@ import {
   retryBackoff,
 } from "@daimo/common";
 import { Kysely } from "kysely";
-import { Address, Hex, bytesToHex, getAddress } from "viem";
+import { Address, Hex, bytesToHex } from "viem";
 
 import { Indexer } from "./indexer";
 import { NameRegistry } from "./nameRegistry";
@@ -92,13 +93,11 @@ export class RequestIndexer extends Indexer {
         transactionHash: bytesToHex(r.tx_hash, { size: 32 }),
         logIndex: Number(r.log_idx),
         id: BigInt(r.id),
-        recipient: getAddress(
-          bytesToHex(assertNotNull(r.recipient), { size: 20 })
-        ),
-        creator: getAddress(bytesToHex(assertNotNull(r.creator), { size: 20 })),
+        recipient: bytesToAddr(assertNotNull(r.recipient)),
+        creator: bytesToAddr(assertNotNull(r.creator)),
         amount: BigInt(assertNotNull(r.amount)),
         metadata: bytesToHex(r.metadata || Buffer.from([])),
-        logAddr: getAddress(bytesToHex(r.log_addr, { size: 20 })),
+        logAddr: bytesToAddr(r.log_addr),
         blockNumber: BigInt(r.block_num),
         blockTime: Number(r.block_ts),
       }));
@@ -108,9 +107,7 @@ export class RequestIndexer extends Indexer {
         transactionHash: bytesToHex(r.tx_hash, { size: 32 }),
         logIndex: Number(r.log_idx),
         id: BigInt(r.id),
-        fulfiller: getAddress(
-          bytesToHex(assertNotNull(r.fulfiller), { size: 20 })
-        ),
+        fulfiller: bytesToAddr(assertNotNull(r.fulfiller)),
         blockNumber: BigInt(r.block_num),
         blockTime: Number(r.block_ts),
       }));

diff --git a/packages/daimo-common/package.json b/packages/daimo-common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@daimo/common",
-  "version": "0.2.9",
+  "version": "0.2.10",
   "description": "Shared between web and mobile",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/packages/daimo-common/src/viemClient.ts b/packages/daimo-common/src/viemClient.ts
@@ -1,4 +1,11 @@
-import { extractChain, Chain } from "viem";
+import {
+  extractChain,
+  Chain,
+  getAddress,
+  bytesToHex,
+  ByteArray,
+  Address,
+} from "viem";
 import {
   mainnet,
   sepolia,
@@ -62,3 +69,13 @@ const alchemyChainNames: Record<number, string> = {
   [optimismSepolia.id]: "opt-sepolia",
 };
 const supportedChainIds = Object.keys(alchemyChainNames).map(Number);
+
+/** Converts a buffer to a viem Address. Zero-length buffer = zero addr.
+ * Any length other than 0 or 20 bytes = throws an error.
+ */
+export function bytesToAddr(bytes: ByteArray): Address {
+  if (bytes.length !== 0 && bytes.length !== 20) {
+    throw new Error(`invalid address byte[], got ${bytes.length} bytes`);
+  }
+  return getAddress(bytesToHex(bytes, { size: 20 }));
+}