@defdone/annon 0.1.0-alpha.0 → 0.1.0-alpha.2

package/dist/pay/base.js

@@ -298,32 +298,44 @@ async function lastBlock(url, from, validBefore, now) {
             return at;
     }
 }
-/** The block of an `AuthorizationCanceled` for this nonce in `[from, to]`, searched in chunks. */
-async function canceledAfter(url, e, from, to) {
-    // Note: 10,000 blocks per query, the common RPC limit; a long-expired purchase takes several.
-    for (let at = from; at <= to; at += 10_000) {
-        const end = Math.min(to, at + 9_999);
-        const topics = [
-            TOPICS.authorizationCanceled,
-            toHex(addressWord(e.from)),
-            e.nonce.toLowerCase(),
-        ];
+/** Note: blocks per eth_getLogs, the common RPC limit (QuickNode refuses a wider range). */
+const LOG_RANGE = 10_000;
+/**
+ * USDC's logs for `topics` (a list in a position matches any of it) in `[from, to]`, read in
+ * chunks of `LOG_RANGE` blocks, earliest first. Each chunk's logs must answer that chunk's query.
+ * Stops after the first chunk with a log `enough` accepts; an empty range reads nothing.
+ */
+async function usdcLogs(url, usdc, topics, from, to, enough) {
+    const all = [];
+    for (let at = from; at <= to; at += LOG_RANGE) {
+        const end = Math.min(to, at + LOG_RANGE - 1);
         const found = await ask(url, 'eth_getLogs', [
-            { address: e.usdc, fromBlock: qty(at), toBlock: qty(end), topics },
+            { address: usdc, fromBlock: qty(at), toBlock: qty(end), topics },
         ]);
         if (!Array.isArray(found))
             return malformed('eth_getLogs result');
-        for (const l of found.map(evmLog).filter((l) => !l.removed)) {
-            if (l.address !== strip(e.usdc) ||
-                l.topics.join() !== topics.map(strip).join() ||
+        const logs = found.map(evmLog).filter((l) => !l.removed);
+        // Every log must answer the query; anything else is an RPC that can't be believed.
+        for (const l of logs) {
+            if (l.address !== strip(usdc) ||
+                l.topics.length !== topics.length ||
+                !topics.every((t, i) => [t].flat().some((x) => strip(x) === l.topics[i])) ||
                 l.block_number < at ||
                 l.block_number > end) {
                 return malformed('eth_getLogs returned a log the query did not ask for');
             }
-            return l.block_number;
         }
+        all.push(...logs);
+        if (logs.some(enough))
+            break;
     }
-    return null;
+    return all;
+}
+/** The block of an `AuthorizationCanceled` for this nonce in `[from, to]`. */
+async function canceledAfter(url, e, from, to) {
+    const topics = [TOPICS.authorizationCanceled, toHex(addressWord(e.from)), e.nonce.toLowerCase()];
+    const [first] = await usdcLogs(url, e.usdc, topics, from, to, () => true);
+    return first ? first.block_number : null;
 }
 /**
  * Where a signed purchase stands, found by its nonce alone, so a lost transaction hash loses
@@ -338,33 +350,14 @@ export async function paymentStatus(url, e) {
     const final = await block(url, 'finalized');
     const now = await head(url);
     const last = await lastBlock(url, e.block, e.validBefore, now);
-    const query = {
-        address: e.usdc,
-        fromBlock: qty(e.block),
-        toBlock: qty(last),
-        topics: [
-            [TOPICS.authorizationUsed, TOPICS.authorizationCanceled],
-            toHex(addressWord(e.from)),
-            e.nonce.toLowerCase(),
-        ],
-    };
-    const found = await ask(url, 'eth_getLogs', [query]);
-    if (!Array.isArray(found))
-        return malformed('eth_getLogs result');
-    const logs = found.map(evmLog).filter((l) => !l.removed);
-    // Every log must answer the query; anything else is an RPC that can't be believed.
-    for (const l of logs) {
-        if (l.address !== strip(e.usdc) ||
-            l.topics.length !== 3 ||
-            !query.topics[0].some((t) => strip(t) === l.topics[0]) ||
-            l.topics[1] !== topicOf(e.from) ||
-            l.topics[2] !== strip(e.nonce) ||
-            l.block_number < e.block ||
-            l.block_number > last) {
-            return malformed('eth_getLogs returned a log the query did not ask for');
-        }
-    }
-    const used = logs.find((l) => l.topics[0] === strip(TOPICS.authorizationUsed));
+    // A used authorization in any chunk wins over a cancellation, so only that ends the search.
+    const usedTopic = strip(TOPICS.authorizationUsed);
+    const logs = await usdcLogs(url, e.usdc, [
+        [TOPICS.authorizationUsed, TOPICS.authorizationCanceled],
+        toHex(addressWord(e.from)),
+        e.nonce.toLowerCase(),
+    ], e.block, last, (l) => l.topics[0] === usedTopic);
+    const used = logs.find((l) => l.topics[0] === usedTopic);
     if (used) {
         const receipt = await ask(url, 'eth_getTransactionReceipt', [`0x${used.transaction_hash}`]);
         const paid = paymentLogs(receipt, e);

package/dist/pay/purchase.d.ts

@@ -76,9 +76,10 @@ export interface PurchaseRecord extends Versioned {
     recoveryProved: boolean;
     /** Source details are the reviewed 1Click quote. */
     payment: PaymentSummary;
+    /** A NEAR send that may be on chain; `txHash` only when the wallet returned one. */
     nearSubmission?: {
         state: 'uncertain';
-        txHash: string;
+        txHash?: string;
     };
     paymentState?: 'expired' | 'canceled';
     purchase: Purchase;

package/dist/wallet/account-only.d.ts

@@ -1,4 +1,4 @@
-/** Never supply contractId/methodNames: MyNearWallet otherwise generates a local secret. */
+/** Never supply contractId/methodNames: a wallet would otherwise add a function-call key for them. */
 export declare function signInAccountOnly(wallet: {
     signOut?: () => Promise<void>;
     signIn(params: {

package/dist/wallet/account-only.js

@@ -1,4 +1,4 @@
-/** Never supply contractId/methodNames: MyNearWallet otherwise generates a local secret. */
+/** Never supply contractId/methodNames: a wallet would otherwise add a function-call key for them. */
 export async function signInAccountOnly(wallet) {
     // A reused loopback origin may contain older connector authority. Never let it sign silently.
     await wallet.signOut?.();

package/dist/wallet/uncertain.d.ts

@@ -1,8 +1,11 @@
 import { AnnonError } from '../errors.js';
-/** Public evidence to retain whenever a submitted NEAR transaction cannot be confirmed. */
+/**
+ * Public evidence to retain whenever a submitted NEAR transaction cannot be confirmed. `txHash` is
+ * absent when a wallet may have broadcast but never returned a hash: unknown, never invented.
+ */
 export declare class TransactionUncertain extends AnnonError {
-    readonly txHash: string;
+    readonly txHash: string | undefined;
     readonly purchaseId?: string | undefined;
     readonly code = "transaction_uncertain";
-    constructor(txHash: string, purchaseId?: string | undefined);
+    constructor(txHash: string | undefined, purchaseId?: string | undefined);
 }

package/dist/wallet/uncertain.js

@@ -1,5 +1,8 @@
 import { AnnonError } from '../errors.js';
-/** Public evidence to retain whenever a submitted NEAR transaction cannot be confirmed. */
+/**
+ * Public evidence to retain whenever a submitted NEAR transaction cannot be confirmed. `txHash` is
+ * absent when a wallet may have broadcast but never returned a hash: unknown, never invented.
+ */
 export class TransactionUncertain extends AnnonError {
     txHash;
     purchaseId;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defdone/annon",
-  "version": "0.1.0-alpha.0",
+  "version": "0.1.0-alpha.2",
   "description": "Files only the buyer can open: encrypted on the client, the key released by NEAR once the payment is verified.",
   "license": "Apache-2.0",
   "homepage": "https://annon.dev",
@@ -115,7 +115,8 @@
   ],
   "devDependencies": {
     "@near-wallet-selector/core": "10.1.4",
-    "@near-wallet-selector/my-near-wallet": "10.1.4",
+    "@near-wallet-selector/hot-wallet": "10.1.4",
+    "@near-wallet-selector/meteor-wallet": "10.1.4",
     "@types/node": "26.6.5",
     "buffer": "6.0.3",
     "esbuild": "0.28.2",