@unicitylabs/sphere-sdk 0.14.5 → 0.14.6-dev.1

package/dist/modules/payments-v2/index.cjs

@@ -786,7 +786,7 @@ var CheckpointTrustbaseMismatchError = class extends SphereError {
 };
 
 // modules/payments-v2/machine/TransferMachine.ts
-var CERTIFY_WIDTH = 8;
+var CERTIFY_WIDTH = 20;
 var KEEP_OPEN_CODES = /* @__PURE__ */ new Set([
   "CERTIFICATION_UNCONFIRMED",
   "CHECKPOINT_PERSIST_FAILED",
@@ -882,12 +882,15 @@ var TransferMachine = class {
       payload: r.payload,
       ...r.payload.memo !== void 0 ? { memo: r.payload.memo } : {}
     };
-    const { committed, conflicts } = await this.resumeOps(ctx, engine, r);
+    const outcomes = await this.resumeOps(ctx, engine, r);
+    const { committed, cls, firstError } = summarize(outcomes);
+    const conflicts = this.toConflicts(engine, r, outcomes);
     if (committed.length === 0 && conflicts.length > 0) throw conflicts[0].error;
     let deliveryPending = false;
     if (committed.length > 0) {
       deliveryPending = await this.deliverSet(r.transferId, r.payload.recipient, r.payload.memo, committed);
     }
+    if (cls !== null && cls !== "conflict") throw firstError;
     await this.applyCommitted(engine, r.transferId, committed);
     if (conflicts.length > 0) {
       return { deliveryPending, partial: await this.settlePartial(engine, r, committed, conflicts) };
@@ -972,25 +975,28 @@ var TransferMachine = class {
     );
     return { recipientBlob: outputs[0].blob.token, changeBlob: outputs[1].blob.token };
   }
+  /** Raw outcomes; `summarize` alone decides what they mean — same as the send path. */
   async resumeOps(ctx, engine, r) {
-    const committed = [];
-    const conflicts = [];
+    const outcomes = [];
     for (const op of buildOps(r.payload)) {
       const journaled = op.kind === "direct" ? r.journaled.get(op.opIndex) : void 0;
       if (journaled !== void 0) {
-        committed.push({ op, certified: true, recipientBlob: hexToBytes(journaled.blobHex) });
-        continue;
-      }
-      const source = r.sources.get(op.sourceTokenId);
-      const outcome = await this.certifyOne(ctx, engine, op, source);
-      if (outcome.certified) {
-        committed.push(outcome);
+        outcomes.push({ op, certified: true, recipientBlob: hexToBytes(journaled.blobHex) });
         continue;
       }
-      if (classifyError(outcome.error) !== "conflict") throw outcome.error;
-      conflicts.push({ op, error: outcome.error, amount: conflictAmount(engine, r.payload, op, source) });
+      outcomes.push(await this.certifyOne(ctx, engine, op, r.sources.get(op.sourceTokenId)));
+      const last = outcomes[outcomes.length - 1];
+      if (last.error !== void 0 && classifyError(last.error) !== "conflict") break;
     }
-    return { committed, conflicts };
+    return outcomes;
+  }
+  /** Conflicted ops with the amount each leaves undelivered (#690 shortfall math). */
+  toConflicts(engine, r, outcomes) {
+    return outcomes.filter((o) => !o.certified && classifyError(o.error) === "conflict").map((o) => ({
+      op: o.op,
+      error: o.error,
+      amount: conflictAmount(engine, r.payload, o.op, r.sources.get(o.op.sourceTokenId))
+    }));
   }
   async deliverSet(transferId, recipientPubkey, memo, committed) {
     const journaled = committed.filter((o) => o.error === void 0 && o.recipientBlob !== void 0);