@invisible-labs/sdk 0.8.0-devnet → 0.10.0-devnet

package/dist/stats.js

@@ -1,4 +1,4 @@
-import { NotImplementedError } from './chunk-QRN46R3F.js';
+import { NotImplementedError } from './chunk-RWKG7N7I.js';
 import './chunk-VR6T6OJS.js';
 
 // src/stats/index.ts

package/dist/storage.js

@@ -1,5 +1,5 @@
-export { browserStorage, extensionStorage, inMemoryStorage } from './chunk-DCTYBUY3.js';
-import './chunk-QRN46R3F.js';
+export { browserStorage, extensionStorage, inMemoryStorage } from './chunk-AIKC2XQS.js';
+import './chunk-RWKG7N7I.js';
 import './chunk-VR6T6OJS.js';
 //# sourceMappingURL=storage.js.map
 //# sourceMappingURL=storage.js.map

package/dist/{types.generated-YhFu9ZBR.d.ts → types.generated-CtMxCo9F.d.ts}

@@ -18,9 +18,10 @@ type TransportErrorCode = "WS_HANDSHAKE_FAILED" | "NOISE_HANDSHAKE_FAILED" | "NO
 /** Leader/role routing failures. Failover and re-attest. */
 type RoutingErrorCode = "WRONG_ROLE" | "STALE_LEADER_EPOCH" | "POOL_DEGRADED" | "VERSION_NOT_SUPPORTED";
 /** Coordinator-side command rejections. Product decides whether to retry. */
-type CommandErrorCode = "REJECTED_GUARD" | "REJECTED_STATE" | "REJECTED_EXPIRED" | "REJECTED_STALE_JOB" | "REJECTED_RESOURCE_CAP";
+type CommandErrorCode = "REJECTED_GUARD" | "REJECTED_STATE" | "REJECTED_EXPIRED" | "REJECTED_STALE_JOB" | "REJECTED_RESOURCE_CAP" | "RETRYABLE_BUSY";
+declare const COORDINATOR_CAPACITY_FULL_ERROR_CODE: "ERR_ADMISSION_CAPACITY_FULL";
 /** Coordinator wire error code preserved on command rejections. */
-type CoordinatorWireErrorCode = "ERR_INVALID_PAYLOAD" | "ERR_UNEXPECTED_TYPE" | "ERR_UNKNOWN_SWAP" | "ERR_POLICY_VIOLATION" | "ERR_INVALID_RECOVERY_CODE" | "ERR_SWAP_NOT_REFUNDABLE" | "ERR_DKG_FAILURE" | "ERR_INTERNAL" | "ERR_INVALID_DEPOSIT" | "ERR_SETTLEMENT_FAILED";
+type CoordinatorWireErrorCode = "ERR_INVALID_PAYLOAD" | "ERR_UNEXPECTED_TYPE" | "ERR_UNKNOWN_SWAP" | "ERR_POLICY_VIOLATION" | "ERR_INVALID_RECOVERY_CODE" | "ERR_SWAP_NOT_REFUNDABLE" | "ERR_DKG_FAILURE" | "ERR_INTERNAL" | "ERR_PRESEAL_ADMISSION_BUSY" | "ERR_INITIALIZATION_BUSY" | typeof COORDINATOR_CAPACITY_FULL_ERROR_CODE | "ERR_INVALID_DEPOSIT" | "ERR_SETTLEMENT_FAILED";
 /** Local input-validation failures. Never sent on the wire; fix the input. */
 type PolicyValidationErrorCode = "INVALID_PAYOUT_PLAN" | "INVALID_WITHDRAWAL_PLAN" | "INVALID_POSITION_AUTH" | "INVALID_REDEMPTION_PLAN" | "INVALID_DESTINATION_ADDRESS" | "INVALID_AMOUNT";
 /** Storage-adapter failures. */
@@ -53,6 +54,8 @@ interface StorageErrorOptions extends InvisibleErrorOptions {
 interface CommandErrorOptions extends InvisibleErrorOptions {
     /** Exact coordinator `Error` envelope code, when the rejection came from the wire. */
     readonly coordinatorCode?: CoordinatorWireErrorCode;
+    /** Exact coordinator `Error` envelope message, when `message` is user-facing copy. */
+    readonly coordinatorMessage?: string;
     /** Request id rejected by the coordinator, when present in the `Error` envelope. */
     readonly failedReqId?: number;
 }
@@ -84,6 +87,7 @@ declare class RoutingError extends InvisibleError {
 declare class CommandError extends InvisibleError {
     readonly code: CommandErrorCode;
     readonly coordinatorCode?: CoordinatorWireErrorCode;
+    readonly coordinatorMessage?: string;
     readonly failedReqId?: number;
     constructor(code: CommandErrorCode, message: string, options?: CommandErrorOptions);
 }
@@ -142,6 +146,12 @@ type RuntimeMeasurements = {
     readonly rtmr2: string;
     readonly rtmr3: string;
 };
+type LpFeePolicy = {
+    readonly version: 1;
+    readonly profile: "internal" | "partner";
+    readonly commission_bps: 0 | 6000;
+    readonly policy_hash: string;
+};
 type LpPositionView = {
     readonly id: string;
     readonly status: "dkg_pending" | "active" | "withdrawing" | "closed";
@@ -161,6 +171,74 @@ type LpPositionView = {
         readonly grantRevision: number;
         readonly observedAtMs: number;
     };
+    readonly feePolicy?: LpFeePolicy;
+    readonly lpFeePolicyVersion?: 1;
+    readonly actorSync?: {
+        readonly economicReturn?: {
+            readonly providerRewardLamports: string;
+            readonly sourceExpenseCompensationLamports: string;
+            readonly chargedReimbursementLossLamports: string;
+            readonly netEconomicReturnLamports: string;
+        };
+        readonly lpPositionId: string;
+        readonly status: "idle" | "settling" | "reimbursement_due";
+        readonly sourceLiquidityUse: "not_materialized" | "available" | "locked_for_payout" | "pending_finality" | "spent" | "released";
+        readonly redeemablePrincipalLamports?: number;
+        readonly redeemableFeeLamports?: number;
+        readonly lifetimeEarnedLamports?: number;
+        readonly redeemablePrincipalSourceCount?: number;
+        readonly redeemableFeeSourceCount?: number;
+        readonly redeemableSourceCount?: number;
+        readonly pendingReservationCount: number;
+        readonly reservedPayoutLamports: number;
+        readonly estimatedNetworkFeeLamports: number;
+        readonly reimbursementDueCount: number;
+        readonly reimbursementDueSourceCount: number;
+        readonly reimbursementDuePayoutLamports: number;
+        readonly reimbursementDueNetworkFeeLamports: number;
+        readonly withdrawalRequestedLamports: number;
+        readonly withdrawalLandedLamports: number;
+        readonly withdrawalLandedFeeLamports: number;
+        readonly withdrawalCanceledLamports: number;
+        readonly withdrawalNetworkFeeLossLamports: number;
+        readonly withdrawalTxHashes: readonly string[];
+        readonly redemptionHistory?: readonly {
+            readonly redemptionId: string;
+            readonly state: "requested" | "match_requested" | "reserved" | "pending" | "confirmed" | "rejected";
+            readonly withdrawalMode?: "exact" | "max_available";
+            readonly acceptedLamports: number;
+            readonly acceptedDepositPrincipalLamports: number;
+            readonly acceptedEarnedFeeLamports: number;
+            readonly landedLamports: number;
+            readonly landedDepositPrincipalLamports: number;
+            readonly landedEarnedFeeLamports: number;
+            readonly canceledLamports: number;
+            readonly canceledDepositPrincipalLamports: number;
+            readonly canceledEarnedFeeLamports: number;
+            readonly networkFeeLamports: number;
+            readonly networkFeeLossLamports: number;
+            readonly failedAttempts: number;
+            readonly destinationAddresses: readonly string[];
+            readonly destinationCount: number;
+            readonly txSignatures: readonly string[];
+            readonly txSignatureCount: number;
+            readonly detailsTruncated: boolean;
+            readonly stateVersion: number;
+            readonly createdAtMs: number;
+            readonly updatedAtMs: number;
+            readonly feePolicyHash?: string;
+            readonly feeBasisRevision?: number;
+        }[];
+        readonly redemptionHistoryHasMore?: boolean;
+        readonly redemptionHistoryNextCursor?: string;
+        readonly stateVersion: number;
+        readonly updatedAtMs: number;
+        readonly feePolicy?: LpFeePolicy;
+        readonly feeBasisRevision?: number;
+        readonly grossFeeLamports?: number;
+        readonly protocolCommissionLamports?: number;
+        readonly redeemableProjectionAvailable: boolean;
+    };
 };
 type PayoutDestination = {
     readonly address: string;

package/dist/user.d.ts

@@ -1,6 +1,6 @@
+import { C as CommandError, P as PayoutPolicy } from './types.generated-CtMxCo9F.js';
+export { I as InvalidDepositAmountError } from './types.generated-CtMxCo9F.js';
 import { S as Session } from './session-DFuy54C-.js';
-import { P as PayoutPolicy } from './types.generated-YhFu9ZBR.js';
-export { I as InvalidDepositAmountError } from './types.generated-YhFu9ZBR.js';
 
 /**
  * Acceptance receipts (spec section 8.2).
@@ -30,6 +30,7 @@ type PayoutSpec = {
     readonly destination_addresses: readonly string[];
 };
 type SpendingPolicySnapshot = {
+    readonly economics?: "legacy" | "zero_protocol_fees";
     readonly asset: "SOL";
     readonly entry_amount_lamports: number;
     readonly total_committed_lamports: number;
@@ -79,6 +80,7 @@ type NormalUserRefundStatus = "queued" | "reserved" | "submitted" | "confirming"
 type SourceLiquidityUse = "not_materialized" | "available" | "locked_for_payout" | "pending_finality" | "spent" | "released";
 type NormalUserContractSyncSnapshot = {
     readonly contract_id: string;
+    readonly deposit_origin_address?: string | null;
     readonly status: NormalUserContractStatus;
     readonly settlement_phase: NormalUserSettlementPhase;
     readonly refundability: NormalUserRefundability;
@@ -129,8 +131,17 @@ type RefundAcceptanceReceipt = AcceptanceReceipt & {
     readonly amountLamports: number;
     readonly acceptedAtMs?: number;
 };
+/** Caller-owned delay/continuation for a proven, same-command initialization rejection. */
+type InitializationRetry = {
+    readonly swapId: string;
+    readonly stage: "DkgRound2" | "DelegateShare";
+    readonly error: CommandError;
+};
 type RunSwapParams = {
+    /** No automatic policy: absent this callback, initialization busy is returned to the caller. */
+    onInitializationRetry?: (retry: InitializationRetry) => Promise<void>;
     amountLamports: number;
+    batchExclusionId?: string;
     payoutSpec: PayoutSpec;
     payoutDeadlineMs?: number;
     onPolicySnapshot?: (policy: SpendingPolicySnapshot) => void;
@@ -167,6 +178,7 @@ type RunSwapParams = {
         originAddress: string | undefined;
     }) => void | Promise<void>;
     payoutWindowMs?: number;
+    signal?: AbortSignal;
 };
 /**
  * Details returned once the coordinator has accepted, initialized, and
@@ -197,6 +209,8 @@ type ContractRequestResult = {
 };
 /** Inputs for resuming an already allocated pre-delegation contract. */
 type ResumePreDelegationParams = {
+    readonly onInitializationRetry?: RunSwapParams["onInitializationRetry"];
+    readonly signal?: AbortSignal;
     readonly swapId: string;
     readonly resumeSecret: Uint8Array;
     readonly syncSecret?: Uint8Array;
@@ -273,19 +287,13 @@ declare function recoveryCodeToHex(code: Uint8Array): string;
 declare function recoveryCodeFromHex(hex: string): Uint8Array;
 declare function recoveryCodeFromUserInput(input: string): Uint8Array;
 
-/**
- * `@invisible-labs/sdk/user` - normal-user (private transfer) commands (spec 4.3).
- *
- * The normal-user API is functional and operates on the caller-owned attested
- * Session. Importing this module must not pull in `/lp`, `/stats`, or `/events`.
- */
-
 /** Inclusive minimum private-transfer entry amount in lamports. */
 declare const MIN_ENTRY_AMOUNT_LAMPORTS = 1500000000;
 /** Inclusive maximum private-transfer entry amount in lamports. */
 declare const MAX_ENTRY_AMOUNT_LAMPORTS = 100000000000;
 /** Arguments to start a new private-transfer pool entry. */
 interface ContractRequestArgs {
+    readonly onInitializationRetry?: RunSwapParams["onInitializationRetry"];
     /**
      * Gross private-transfer amount in lamports.
      *
@@ -300,8 +308,12 @@ interface ContractRequestArgs {
     /**
      * Where and how the output is delivered. V0 normal-user requests support
      * exactly one payout destination and validate the policy locally before
-     * submission. `batchExclusionId` is rejected in V0; its planned V1 meaning
-     * is campaign-scoped batch exclusion, never a stable actor identity.
+     * submission. Reuse the same `batchExclusionId` for each contract belonging
+     * to one user so liquidity from their own deposits, including deposits that
+     * later reimbursed an LP, cannot fund their own payout. The payout waits
+     * when no other liquidity is available.
+     * This opaque value is not proof of identity; integrators are responsible
+     * for assigning and retaining it.
      * `destinations[*].minDelayMs` and `destinations[*].maxDelayMs` are also
      * rejected in V0 because the current runtime does not honor them.
      * `totalDeadlineMs` selects the payout window: use `0` for instant payout,
@@ -338,6 +350,8 @@ interface ContractRequestArgs {
         swapId: string;
         delegateShare: Uint8Array;
     }) => void | Promise<void>;
+    /** Cancels only a pending pre-seal admission backoff; it cannot reverse an accepted contract. */
+    readonly signal?: AbortSignal;
 }
 /**
  * Start a new pool entry through the current normal-user coordinator flow.

package/dist/user.js

@@ -1,13 +1,13 @@
-import { scheduledPayoutWindowSeconds } from './chunk-MPNVF727.js';
-import { validatePayoutPolicyShape, formatAjvErrors, persistTransferStatus, createSession, disabledClientPersistence, readPersistedTransferForResume, persistTransferReady, createExponentialBackoff, persistTransferTerminal, persistTransferRecoveryCode, persistTransferAllocation, persistTransferDkgMetadata } from './chunk-Y7AK6RBV.js';
-export { getPersistedTransfer, listPersistedTransfers, purgePersistedTransfers, removePersistedTransfer } from './chunk-Y7AK6RBV.js';
-import { PRODUCT_MAX_ENTRY_LAMPORTS, PRODUCT_MIN_ENTRY_LAMPORTS } from './chunk-IG6JJFR2.js';
-import { assertAttested, publicKey, solanaAddressFromPublicKeyBytes } from './chunk-EBWTAXNT.js';
-import { requestEnvelope, CoordinatorMessageType, onEnvelope, closeProtocolRuntime, EnvelopeKind } from './chunk-MZKJU3UA.js';
-import { getSessionState } from './chunk-HJFMDMPY.js';
-import './chunk-DCTYBUY3.js';
-import { PolicyValidationError, CommandError, StorageError, TransportError, normalizeError, InvalidDepositAmountError, AttestationError, RoutingError } from './chunk-QRN46R3F.js';
-export { InvalidDepositAmountError } from './chunk-QRN46R3F.js';
+import { scheduledPayoutWindowSeconds, ErrorCode } from './chunk-DFBH5XLM.js';
+import { validatePayoutPolicyShape, formatAjvErrors, persistTransferStatus, createSession, disabledClientPersistence, readPersistedTransferForResume, persistTransferReady, createExponentialBackoff, persistTransferTerminal, persistTransferRecoveryCode, persistTransferAllocation, persistTransferDkgMetadata } from './chunk-ANQMIQYS.js';
+export { getPersistedTransfer, listPersistedTransfers, purgePersistedTransfers, removePersistedTransfer } from './chunk-ANQMIQYS.js';
+import { PRODUCT_MAX_ENTRY_LAMPORTS, PRODUCT_MIN_ENTRY_LAMPORTS } from './chunk-HWRMSK7E.js';
+import { assertAttested, publicKey, solanaAddressFromPublicKeyBytes } from './chunk-EPWTRF5U.js';
+import { requestEnvelope, CoordinatorMessageType, onEnvelope, closeProtocolRuntime, EnvelopeKind } from './chunk-6AGC3IOB.js';
+import { getSessionState } from './chunk-6AKBRYKO.js';
+import './chunk-AIKC2XQS.js';
+import { PolicyValidationError, CommandError, StorageError, TransportError, normalizeError, InvalidDepositAmountError, AttestationError, RoutingError } from './chunk-RWKG7N7I.js';
+export { InvalidDepositAmountError } from './chunk-RWKG7N7I.js';
 import './chunk-VR6T6OJS.js';
 
 // src/validation/payoutPolicy.ts
@@ -27,7 +27,6 @@ Math.max(...SUPPORTED_TOTAL_DEADLINE_MS);
 var SHARE_SUM_TOLERANCE = 0.01;
 var CURRENT_USER_PAYOUT_DESTINATION_LIMIT = 1;
 var CURRENT_USER_PAYOUT_DESTINATION_LIMIT_MESSAGE = "current V0 normal-user SDK and coordinator support exactly one payout destination; multi-address receive is not supported yet";
-var CURRENT_USER_BATCH_EXCLUSION_ID_UNSUPPORTED_MESSAGE = "batchExclusionId is not supported in V0 normal-user payout requests; V1 defines it as campaign-scoped batch exclusion, never a stable actor identity";
 var CURRENT_USER_MIN_DELAY_UNSUPPORTED_MESSAGE = "destinations[*].minDelayMs is not supported in V0 normal-user payout requests";
 var CURRENT_USER_MAX_DELAY_UNSUPPORTED_MESSAGE = "destinations[*].maxDelayMs is not supported in V0 normal-user payout requests";
 var CURRENT_USER_PAYOUT_FRAGMENT_LIMIT = 1;
@@ -91,12 +90,6 @@ function validatePayoutPolicy(input, ctx = {}) {
   return policy;
 }
 function assertCurrentUserUnsupportedPayoutFeatures(policy) {
-  if (policy.batchExclusionId !== void 0) {
-    throw new PolicyValidationError(
-      "INVALID_PAYOUT_PLAN",
-      CURRENT_USER_BATCH_EXCLUSION_ID_UNSUPPORTED_MESSAGE
-    );
-  }
   for (const destination of policy.destinations) {
     if (destination.minDelayMs !== void 0) {
       throw new PolicyValidationError(
@@ -172,11 +165,11 @@ function recoveryCodeFromUserInput(input) {
 var protocolPromise = null;
 var frostRuntimePromise = null;
 function loadProtocol() {
-  protocolPromise ??= import('./coordinator-E2TS6NR2.js');
+  protocolPromise ??= import('./coordinator-T2B7253V.js');
   return protocolPromise;
 }
 function loadFrostRuntime() {
-  frostRuntimePromise ??= import('./frostRuntime-6FTPKUCP.js');
+  frostRuntimePromise ??= import('./frostRuntime-JESDHN6O.js');
   return frostRuntimePromise;
 }
 function loadFrost() {
@@ -195,6 +188,11 @@ var MAX_EVENT_DEDUP_ENTRIES_PER_KIND = 1024;
 var SWAP_STATUS_RETRY_JITTER_RATIO = 0.2;
 var DEFAULT_REFUND_OUTCOME_POLL_BUDGET_MS = 5 * 60 * 1e3;
 var REFUND_OUTCOME_POLL_INTERVAL_MS = 3e3;
+var INITIALIZATION_PUSH_TIMEOUT_MS = 3e4;
+var CONTRACT_ADMISSION_BUSY_MAX_ATTEMPTS = 6;
+var CONTRACT_ADMISSION_BUSY_INITIAL_DELAY_MS = 250;
+var CONTRACT_ADMISSION_BUSY_MAX_DELAY_MS = 4e3;
+var CONTRACT_ADMISSION_BUSY_JITTER_RATIO = 0.2;
 var REFUND_OUTCOME_PER_POLL_TIMEOUT_MS = 5e3;
 var UNBOUND_RECONCILIATION_KEY = "__unbound__";
 var REQUEST_TIMEOUT_MESSAGE = "coordinator request timed out";
@@ -202,6 +200,9 @@ var REFUND_PENDING_FINALIZATION_MESSAGE = "refund accepted and pending finalizat
 var CURRENT_SCHEDULED_PAYOUT_WINDOW_SECONDS = new Set(scheduledPayoutWindowSeconds());
 var CURRENT_SCHEDULED_PAYOUT_WINDOW_MESSAGE = `scheduled payout_spec.window_seconds must be one of [${scheduledPayoutWindowSeconds().join(", ")}]`;
 var TERMINAL_SWAP_STATES = /* @__PURE__ */ new Set(["completed", "refunded", "failed"]);
+function createRequestAbortError() {
+  return new DOMException("coordinator request aborted", "AbortError");
+}
 function isBenignTransportDrop(err) {
   return typeof err === "object" && err !== null && err[BENIGN_TRANSPORT_DROP] === true;
 }
@@ -503,7 +504,8 @@ var UserCoordinatorSession = class {
         const dkg = await this.runDkg(
           context,
           params.onDelegateShareReady,
-          persistedResumeRecord !== null
+          persistedResumeRecord !== null,
+          params
         );
         jointPublicKey = dkg.jointPublicKey;
         depositAddress = solanaAddressFromPublicKeyBytes(jointPublicKey);
@@ -515,14 +517,15 @@ var UserCoordinatorSession = class {
       const delegateAckPromise = this.awaitPush(CoordinatorMessageType.DelegateAck, context.swapId);
       let delegateResp;
       try {
-        delegateResp = await this.request(
+        delegateResp = await this.requestInitialization(
           CoordinatorMessageType.DelegateShare,
           {
             share: delegateShare,
             recovery_commitment: new Uint8Array(params.recoveryCommitment),
             resume_secret: context.resumeSecret
           },
-          { swapId: context.swapId }
+          context,
+          params
         );
       } catch (err) {
         void delegateAckPromise.catch(() => void 0);
@@ -972,11 +975,13 @@ var UserCoordinatorSession = class {
     if (generatedResumeSecret) {
       await params.onResumeSecretReady?.({ secretHex: resumeSecretHex });
     }
-    const swapResp = await this.request(
-      CoordinatorMessageType.ContractRequest,
+    const swapResp = await this.requestContract(
       {
         actor: "user",
         amount_lamports: params.amountLamports,
+        ...params.batchExclusionId !== void 0 && {
+          batch_exclusion_id: params.batchExclusionId
+        },
         payout_spec: params.payoutSpec,
         sync_commitment: syncCommitment,
         resume_commitment: resumeCommitment,
@@ -984,7 +989,7 @@ var UserCoordinatorSession = class {
           payout_deadline_ms: params.payoutDeadlineMs ?? payoutDeadlineMs
         }
       },
-      { swapId: null, requireNonNullResponseSwapId: true }
+      params.signal
     );
     const swapPayload = protocol.asSwapRequestResponsePayload(swapResp);
     const swapId = swapPayload.swap_id;
@@ -1022,7 +1027,12 @@ var UserCoordinatorSession = class {
         null
       );
       void depositConfirmedPromise.catch(() => void 0);
-      const { jointPublicKey, keyHandle, depositExpiresAtMs, coordinatorTimestampMs } = await this.runDkg(context, params.delegateShare ? void 0 : params.onDelegateShareReady);
+      const { jointPublicKey, keyHandle, depositExpiresAtMs, coordinatorTimestampMs } = await this.runDkg(
+        context,
+        params.delegateShare ? void 0 : params.onDelegateShareReady,
+        true,
+        params
+      );
       this.updateContextState(context, "awaiting_deposit");
       let recoveryCommitment = params.recoveryCommitment;
       let recoveryCodeHex;
@@ -1045,14 +1055,15 @@ var UserCoordinatorSession = class {
       const share = params.delegateShare ?? keyHandle.secretShareBytes();
       let delegateResp;
       try {
-        delegateResp = await this.request(
+        delegateResp = await this.requestInitialization(
           CoordinatorMessageType.DelegateShare,
           {
             share,
             recovery_commitment: recoveryCommitment,
             resume_secret: context.resumeSecret
           },
-          { swapId: context.swapId }
+          context,
+          params
         );
       } catch (err) {
         void delegateAckPromise.catch(() => void 0);
@@ -1119,7 +1130,7 @@ var UserCoordinatorSession = class {
       }
     }
   }
-  async runDkg(context, onDelegateShareReady, persistDkgMetadata = true) {
+  async runDkg(context, onDelegateShareReady, persistDkgMetadata = true, retryOptions = {}) {
     await ensureFrostWasm();
     const protocol = this.requireProtocol();
     const { dkgRound1 } = await loadFrost();
@@ -1159,13 +1170,14 @@ var UserCoordinatorSession = class {
     });
     const dkgCompletePromise = this.awaitPush(CoordinatorMessageType.DkgComplete, context.swapId);
     void dkgCompletePromise.catch(() => void 0);
-    await this.request(
+    await this.requestInitialization(
       CoordinatorMessageType.DkgRound2,
       {
         package: aliceRound2Bytes,
         resume_secret: context.resumeSecret
       },
-      { swapId: context.swapId }
+      context,
+      retryOptions
     );
     const completeEnvelope = await dkgCompletePromise;
     const complete = readDkgComplete(protocol, completeEnvelope);
@@ -1509,23 +1521,72 @@ var UserCoordinatorSession = class {
     return requestEnvelope(this.session, type, payload, {
       swapId: options.swapId === void 0 ? this.swapId : options.swapId,
       timeoutMs: options.timeoutMs,
+      signal: options.signal,
       rejectMatchingOutOfBandErrors: options.rejectMatchingOutOfBandErrors,
       requireNonNullResponseSwapId: options.requireNonNullResponseSwapId,
       onLog: (message, direction) => this.log(message, direction)
     });
   }
+  async requestInitialization(stage, payload, context, options) {
+    let retrying = false;
+    for (; ; ) {
+      if (retrying && options.signal?.aborted) throw createRequestAbortError();
+      try {
+        return await this.request(stage, payload, { swapId: context.swapId });
+      } catch (error) {
+        if (!(error instanceof CommandError) || error.coordinatorCode !== ErrorCode.ERR_INITIALIZATION_BUSY || error.failedReqId === void 0 || !options.onInitializationRetry)
+          throw error;
+        const pushType = stage === CoordinatorMessageType.DkgRound2 ? CoordinatorMessageType.DkgComplete : CoordinatorMessageType.DelegateAck;
+        const listener = this.pushListeners.get(pushType)?.find((candidate) => candidate.swapId === context.swapId);
+        if (listener) this.setPushTimeout(pushType, listener, null);
+        try {
+          await options.onInitializationRetry({ swapId: context.swapId, stage, error });
+        } finally {
+          if (listener && this.pushListeners.get(pushType)?.includes(listener))
+            this.setPushTimeout(pushType, listener, INITIALIZATION_PUSH_TIMEOUT_MS);
+        }
+        retrying = true;
+      }
+    }
+  }
+  async requestContract(payload, signal) {
+    const busyBackoff = createExponentialBackoff({
+      initialDelayMs: CONTRACT_ADMISSION_BUSY_INITIAL_DELAY_MS,
+      maxDelayMs: CONTRACT_ADMISSION_BUSY_MAX_DELAY_MS,
+      jitterRatio: CONTRACT_ADMISSION_BUSY_JITTER_RATIO
+    });
+    for (let attempt = 1; ; attempt += 1) {
+      if (signal?.aborted) throw createRequestAbortError();
+      try {
+        return await this.request(CoordinatorMessageType.ContractRequest, payload, {
+          swapId: null,
+          requireNonNullResponseSwapId: true
+        });
+      } catch (error) {
+        if (!(error instanceof CommandError) || error.coordinatorCode !== ErrorCode.ERR_PRESEAL_ADMISSION_BUSY || error.failedReqId === void 0 || attempt >= CONTRACT_ADMISSION_BUSY_MAX_ATTEMPTS)
+          throw error;
+        await abortableDelay(busyBackoff.nextDelayMs(), signal);
+      }
+    }
+  }
   awaitPush(type, swapId, timeoutMs = 3e4) {
     return new Promise((resolve, reject) => {
-      const timer = timeoutMs === null ? null : setTimeout(() => {
-        this.removePushListener(type, listener);
-        reject(new CommandError("REJECTED_STALE_JOB", `timed out waiting for ${type} push`));
-      }, timeoutMs);
-      const listener = { swapId, resolve, reject, timer };
+      const listener = { swapId, resolve, reject, timer: null };
+      this.setPushTimeout(type, listener, timeoutMs);
       const listeners = this.pushListeners.get(type) ?? [];
       listeners.push(listener);
       this.pushListeners.set(type, listeners);
     });
   }
+  setPushTimeout(type, listener, timeoutMs) {
+    if (listener.timer) clearTimeout(listener.timer);
+    listener.timer = timeoutMs === null ? null : setTimeout(() => {
+      this.removePushListener(type, listener);
+      listener.reject(
+        new CommandError("REJECTED_STALE_JOB", `timed out waiting for ${type} push`)
+      );
+    }, timeoutMs);
+  }
   rejectAllPushListeners(err) {
     for (const listeners of this.pushListeners.values()) {
       for (const listener of listeners) {
@@ -1787,6 +1848,21 @@ function bytesToHex(bytes) {
 function delay(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
+function abortableDelay(ms, signal) {
+  if (signal === void 0) return delay(ms);
+  if (signal.aborted) return Promise.reject(createRequestAbortError());
+  return new Promise((resolve, reject) => {
+    const onAbort = () => {
+      clearTimeout(timer);
+      reject(createRequestAbortError());
+    };
+    const timer = setTimeout(() => {
+      signal.removeEventListener("abort", onAbort);
+      resolve();
+    }, ms);
+    signal.addEventListener("abort", onAbort, { once: true });
+  });
+}
 function payoutWindowMsFromSpec(payoutSpec) {
   if (payoutSpec.mode === "instant") return void 0;
   return payoutSpec.window_seconds * 1e3;
@@ -1829,7 +1905,7 @@ function bytesEqual(a, b) {
   return diff === 0;
 }
 function spendingPoliciesEqual(a, b) {
-  return a.asset === b.asset && a.entry_amount_lamports === b.entry_amount_lamports && a.total_committed_lamports === b.total_committed_lamports && a.payout_deadline_ms === b.payout_deadline_ms && a.payout_window_ms === b.payout_window_ms && a.fragment_count === b.fragment_count && a.payout_mode === b.payout_mode && a.matching_mode === b.matching_mode && a.fragmentation_allowed === b.fragmentation_allowed && a.min_fee_bps === b.min_fee_bps && a.fee_bps === b.fee_bps && a.fee_lamports === b.fee_lamports && a.net_payout_lamports === b.net_payout_lamports && payoutSchedulesEqual(a.payout_schedule, b.payout_schedule);
+  return (a.economics ?? "legacy") === (b.economics ?? "legacy") && a.asset === b.asset && a.entry_amount_lamports === b.entry_amount_lamports && a.total_committed_lamports === b.total_committed_lamports && a.payout_deadline_ms === b.payout_deadline_ms && a.payout_window_ms === b.payout_window_ms && a.fragment_count === b.fragment_count && a.payout_mode === b.payout_mode && a.matching_mode === b.matching_mode && a.fragmentation_allowed === b.fragmentation_allowed && a.min_fee_bps === b.min_fee_bps && a.fee_bps === b.fee_bps && a.fee_lamports === b.fee_lamports && a.net_payout_lamports === b.net_payout_lamports && payoutSchedulesEqual(a.payout_schedule, b.payout_schedule);
 }
 function payoutSchedulesEqual(a, b) {
   if (a.length !== b.length) return false;
@@ -1890,6 +1966,9 @@ async function contractRequest(session, args) {
   return contractRequestOnSession(session, {
     amountLamports: args.amountLamports,
     payoutSpec: wirePayoutSpec,
+    ...payoutPolicy.batchExclusionId !== void 0 && {
+      batchExclusionId: payoutPolicy.batchExclusionId
+    },
     ...args.syncSecret !== void 0 && { syncSecret: args.syncSecret },
     ...args.recoveryCommitment !== void 0 && {
       recoveryCommitment: args.recoveryCommitment
@@ -1909,6 +1988,10 @@ async function contractRequest(session, args) {
     },
     ...args.onDelegateShareReady !== void 0 && {
       onDelegateShareReady: args.onDelegateShareReady
+    },
+    ...args.signal !== void 0 && { signal: args.signal },
+    ...args.onInitializationRetry !== void 0 && {
+      onInitializationRetry: args.onInitializationRetry
     }
   });
 }
@@ -1920,6 +2003,10 @@ async function resumePreDelegation(session, args) {
     ...args.syncSecret !== void 0 && { syncSecret: new Uint8Array(args.syncSecret) },
     recoveryCommitment: new Uint8Array(args.recoveryCommitment),
     policySnapshot: args.policySnapshot,
+    ...args.onInitializationRetry !== void 0 && {
+      onInitializationRetry: args.onInitializationRetry
+    },
+    ...args.signal !== void 0 && { signal: args.signal },
     ...args.onDelegateShareReady !== void 0 && {
       onDelegateShareReady: args.onDelegateShareReady
     },