@owney/sdk 0.7.32-beta.2 → 0.7.32-beta.4

package/dist/{chunk-YBMCUL5D.js → chunk-CW55W2WO.js}

@@ -175,6 +175,7 @@ function batchArgs(b) {
 
 // src/lib/token-batch-family.ts
 var memory = /* @__PURE__ */ new Map();
+var unfinished = /* @__PURE__ */ new Map();
 var settled = /* @__PURE__ */ new Map();
 var hashPattern = /^0x[\da-f]{64}$/i;
 var uint = (value) => typeof value === "string" && /^\d{1,78}$/.test(value) && BigInt(value) < 1n << 256n;
@@ -395,6 +396,9 @@ function merge(base, incoming) {
 async function loadTokenBatchFamily(scope, expectedHash, allowMissing = false) {
   try {
     const key = tokenBatchKey(scope), records = /* @__PURE__ */ new Map();
+    for (const sidecar of [...unfinished.keys()])
+      if (sidecar.startsWith(`${key}:family:`) && !tokenBatchRead(sidecar))
+        unfinished.delete(sidecar);
     for (const k of keys().filter((k2) => k2.startsWith(`${key}:family:`))) {
       const raw = tokenBatchRead(k);
       if (!raw) continue;
@@ -422,6 +426,19 @@ async function loadTokenBatchFamily(scope, expectedHash, allowMissing = false) {
         );
       }
     }
+    const marked = /* @__PURE__ */ new Set();
+    for (const [id, family] of [...records]) {
+      const sidecar = `${key}:family:${id}`;
+      const terminal = unfinished.get(sidecar);
+      if (!terminal) continue;
+      if (family.terminal) {
+        unfinished.delete(sidecar);
+        continue;
+      }
+      finishTokenBatchFamily(scope, family, terminal);
+      marked.add(id);
+      records.set(id, { ...family, terminal });
+    }
     if (expectedHash) {
       let found = [...records.values()].filter(
         (f) => f.attempts.some((a) => same(a.hash, expectedHash))
@@ -440,7 +457,7 @@ async function loadTokenBatchFamily(scope, expectedHash, allowMissing = false) {
       return found[0];
     }
     const active = [...records.values()].filter(
-      (f) => !f.terminal || f.authorizationId === projectedId
+      (f) => !f.terminal || f.authorizationId === projectedId && !marked.has(f.authorizationId)
     );
     if (active.length > 1) throw pending();
     return active[0];
@@ -449,6 +466,59 @@ async function loadTokenBatchFamily(scope, expectedHash, allowMissing = false) {
     throw pending();
   }
 }
+async function dropExpiredHashlessTokenBatch(scope, pub) {
+  try {
+    const key = tokenBatchKey(scope);
+    const family = await loadTokenBatchFamily(scope);
+    const raw = family ? void 0 : tokenBatchRead(key);
+    const body = family ? family.terminal ? void 0 : family.body : raw ? JSON.parse(raw) : void 0;
+    if (!body || body.serializedTransaction || family?.attempts.some((a) => a.phase === "deposit") || !uint(body.deadline))
+      return false;
+    const block = await pub.getBlock();
+    if (typeof block?.timestamp !== "bigint" || block.timestamp <= BigInt(body.deadline))
+      return false;
+    if (family)
+      finishTokenBatchFamily(scope, family, {
+        kind: "expired",
+        blockNumber: typeof block.number === "bigint" ? block.number.toString() : "0"
+      });
+    else tokenBatchClear(key, raw);
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function discardHashlessTokenBatch(scope, deadline, matches) {
+  try {
+    const key = tokenBatchKey(scope);
+    const family = await loadTokenBatchFamily(scope);
+    const raw = family ? void 0 : tokenBatchRead(key);
+    const body = family ? family.terminal ? void 0 : family.body : raw ? JSON.parse(raw) : void 0;
+    if (!body || body.serializedTransaction || family?.attempts.some((a) => a.phase === "deposit") || body.deadline !== deadline || body.chainId !== scope.chainId || !same(body.from, scope.owner) || !same(body.token, scope.token) || !matches(body))
+      return false;
+    if (family)
+      finishTokenBatchFamily(scope, family, { kind: "failed", blockNumber: "0" });
+    else tokenBatchClear(key, raw);
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function savedTokenBatchBody(scope, pub) {
+  try {
+    if (pub) await dropExpiredHashlessTokenBatch(scope, pub);
+    const family = await loadTokenBatchFamily(scope);
+    if (family) return family.terminal ? void 0 : family.body;
+    const raw = tokenBatchRead(tokenBatchKey(scope));
+    if (!raw) return void 0;
+    const body = JSON.parse(raw);
+    if (body?.chainId !== scope.chainId || typeof body.from !== "string" || typeof body.token !== "string" || !same(body.from, scope.owner) || !same(body.token, scope.token) || !uint(body.deadline) || !Array.isArray(body.transfers) || !body.transfers.length)
+      return void 0;
+    return body;
+  } catch {
+    return void 0;
+  }
+}
 async function saveTokenBatchAttempt(scope, body, attempt, assertCurrent = () => {
 }) {
   try {
@@ -507,10 +577,15 @@ function finishTokenBatchFamily(scope, family, terminal) {
       return;
     const evidence = terminalOf(terminal, current.attempts);
     if (!evidence) return;
-    tokenBatchWrite(
-      sidecar,
-      JSON.stringify({ ...current, terminal: evidence })
-    );
+    try {
+      tokenBatchWrite(
+        sidecar,
+        JSON.stringify({ ...current, terminal: evidence })
+      );
+      unfinished.delete(sidecar);
+    } catch {
+      unfinished.set(sidecar, evidence);
+    }
     const projected = tokenBatchRead(key);
     if (projected && tokenBatchAuthorizationId(JSON.parse(projected), family.relayer) === family.authorizationId)
       tokenBatchClear(key, projected);
@@ -539,6 +614,9 @@ export {
   tokenBatchCall,
   validateTokenBatchAttempt,
   loadTokenBatchFamily,
+  dropExpiredHashlessTokenBatch,
+  discardHashlessTokenBatch,
+  savedTokenBatchBody,
   saveTokenBatchAttempt,
   finishTokenBatchFamily
 };