fix: check nonceType in DaimoNonceMetadata.fromHex (daimo-eth#284)

mihoward21 · Oct 2, 2023 · 17165d6 · 17165d6
1 parent 09d9ab1
commit 17165d6
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 7 deletions.
diff --git a/apps/daimo-mobile/src/view/screen/HistoryOpScreen.tsx b/apps/daimo-mobile/src/view/screen/HistoryOpScreen.tsx
@@ -73,7 +73,7 @@ function TransferBody({ op }: { op: TransferOpEvent }) {
   assert(account != null);
 
   const opRequestId = op.nonceMetadata
-    ? DaimoNonceMetadata.fromHex(op.nonceMetadata).identifier.toString()
+    ? DaimoNonceMetadata.fromHex(op.nonceMetadata)?.identifier.toString()
     : undefined;
   const matchingTrackedRequest = account.trackedRequests.find(
     (req) =>

diff --git a/packages/daimo-api/src/contract/opIndexer.ts b/packages/daimo-api/src/contract/opIndexer.ts
@@ -46,7 +46,9 @@ export class OpIndexer {
 
         const nonceMetadata = DaimoNonce.fromHex(
           numberToHex(log.args.nonce, { size: 32 })
-        ).metadata.toHex();
+        )?.metadata.toHex();
+        if (!nonceMetadata) continue;
+
         const curTxes = this.nonceMetadataToTxes.get(nonceMetadata);
         const newTxes = curTxes
           ? [...curTxes, log.transactionHash]
@@ -65,7 +67,7 @@ export class OpIndexer {
       if (log.logIndex > queryLogIndex) {
         return DaimoNonce.fromHex(
           numberToHex(log.args.nonce, { size: 32 })
-        ).metadata.toHex();
+        )?.metadata.toHex();
       }
     }
     return undefined;

diff --git a/packages/daimo-api/src/pushNotifier.ts b/packages/daimo-api/src/pushNotifier.ts
@@ -82,7 +82,7 @@ export class PushNotifier {
 
       const receivingRequestedMoney =
         log.nonceMetadata != null &&
-        DaimoNonceMetadata.fromHex(log.nonceMetadata).nonceType ===
+        DaimoNonceMetadata.fromHex(log.nonceMetadata)?.nonceType ===
           DaimoNonceType.RequestResponse;
 
       const [a, b] = await Promise.all([

diff --git a/packages/daimo-userop/src/nonce.ts b/packages/daimo-userop/src/nonce.ts
@@ -29,12 +29,12 @@ export class DaimoNonce {
     return nonce;
   }
 
-  public static fromHex(nonce: Hex): DaimoNonce {
+  public static fromHex(nonce: Hex): DaimoNonce | undefined {
     const paddedNonce = bytesToHex(hexToBytes(nonce), { size: 64 });
     const hexMetadata = paddedNonce.slice(0, 2 + 16) as Hex;
     const metadata = DaimoNonceMetadata.fromHex(hexMetadata);
     const key = `0x${paddedNonce.slice(2 + 16, 2 + 16 + 32)}` as Hex;
-    return new DaimoNonce(metadata, key);
+    return metadata ? new DaimoNonce(metadata, key) : undefined;
   }
 }
 
@@ -62,9 +62,11 @@ export class DaimoNonceMetadata {
     this.identifier = identifier;
   }
 
-  public static fromHex(hexMetadata: Hex): DaimoNonceMetadata {
+  public static fromHex(hexMetadata: Hex): DaimoNonceMetadata | undefined {
     assert(hexMetadata.length === 16 + 2);
     const nonceType = parseInt(hexMetadata.slice(2, 4), 16);
+    if (!(nonceType in DaimoNonceType) || nonceType === DaimoNonceType.MAX)
+      return undefined;
     const identifier = BigInt("0x" + hexMetadata.slice(4)) as bigint;
     return new DaimoNonceMetadata(nonceType, identifier);
   }

diff --git a/packages/daimo-userop/test/nonce.test.ts b/packages/daimo-userop/test/nonce.test.ts
@@ -44,3 +44,15 @@ test("DaimoNonce serde", () => {
     }
   }
 });
+
+test("DaimoNonce bad Nonce type serialization", () => {
+  const hexNonceBadType =
+    "0xFE00000000000123123412341234123412341234123412340000000000000000"; // Nonce type = 254
+  let parsed = DaimoNonce.fromHex(hexNonceBadType);
+  assert.strictEqual(parsed, undefined);
+
+  const hexNonceMaxType =
+    "0xFF00000000000123123412341234123412341234123412340000000000000000"; // Nonce type = 255
+  parsed = DaimoNonce.fromHex(hexNonceMaxType);
+  assert.strictEqual(parsed, undefined);
+});