phygital-payment-sdk 0.1.0 → 0.2.0

package/dist/merchant/charge.d.ts

@@ -102,5 +102,4 @@ export interface ResumeChargeParams {
 }
 export declare function resumeCharge(ctx: ChargeContext, cosigned: CosignedTap, params?: ResumeChargeParams): Promise<ChargeResult>;
 export declare function charge(ctx: ChargeContext, params: ChargeParams): Promise<ChargeResult>;
-export declare const DEFAULT_TOKEN_PROGRAM: Address<"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA">;
 //# sourceMappingURL=charge.d.ts.map

package/dist/merchant/charge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"charge.d.ts","sourceRoot":"","sources":["../../src/merchant/charge.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"charge.d.ts","sourceRoot":"","sources":["../../src/merchant/charge.ts"],"names":[],"mappings":"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"}

package/dist/merchant/charge.js

@@ -1,16 +1,16 @@
-import { TOKEN_PROGRAM_ADDRESS } from "@solana-program/token";
 import { bufferToBase64URLString, base64URLStringToBuffer, } from "@simplewebauthn/browser";
-import { address, } from "@solana/kit";
+import {} from "@solana/kit";
 import { buildVerifyInputFromWebAuthn, findAssetPda, getSecp256r1VerifyInstruction, parseSecp256r1Pubkey, } from "phygital-token-sdk";
 import { fetchPaymentAccount } from "../generated/accounts/paymentAccount.js";
 import { getTransferInstructionAsync } from "../generated/instructions/transfer.js";
+import { throwIfAborted } from "../core/abort.js";
 import { assertU64 } from "../core/amounts.js";
 import { bytesEqualConstant, bytesToBase58, bytesToBase64Url, randomReference, toUint8Array, } from "../core/bytes.js";
 import { assertValidReference } from "../core/challenge.js";
 import { ArbiterNotApprovedError, ArbiterRejectedError, ConfigurationError, EnablerMismatchError, InvalidAmountError, PhygitalPaymentSdkError, } from "../core/errors.js";
 import { computeExecutionPlan, } from "../core/execution-plan.js";
 import { effectiveApprovedArbiter, effectiveEnablerPubkey, fetchArbiterReputation, fetchEscrowBalance, } from "../core/payment.js";
-import { deriveEscrowAddress, derivePaymentAccountAddress, derivePaymentAddress, } from "../core/pda.js";
+import { DEFAULT_PUBKEY, deriveEscrowAddress, derivePaymentAccountAddress, derivePaymentAddress, } from "../core/pda.js";
 import { nowSeconds } from "../core/time.js";
 import { serializePendingTap } from "./deferred-store.js";
 import { readPaymentAccessoryCredential } from "./tap.js";
@@ -22,21 +22,12 @@ export class CosignLandError extends PhygitalPaymentSdkError {
         this.cosigned = cosigned;
     }
 }
-const DEFAULT_ADDRESS = address("11111111111111111111111111111111");
 function assertChargeAmount(amount) {
     assertU64(amount);
     if (amount <= 0n) {
         throw new InvalidAmountError(`Charge amount must be greater than zero (got ${amount}).`);
     }
 }
-function throwIfAborted(signal) {
-    if (!signal?.aborted)
-        return;
-    const reason = signal.reason;
-    throw reason instanceof Error
-        ? reason
-        : new DOMException("The operation was aborted.", "AbortError");
-}
 function buildTransferInstructions(ctx, cosigned) {
     const preamble = getSecp256r1VerifyInstruction([
         cosigned.credentialEntry,
@@ -247,7 +238,7 @@ export async function charge(ctx, params) {
         pendingApprovedArbiter: paymentAccount.data.pendingApprovedArbiter,
         arbiterEffectiveAt: paymentAccount.data.arbiterEffectiveAt,
     });
-    if (approvedArbiter === DEFAULT_ADDRESS) {
+    if (approvedArbiter === DEFAULT_PUBKEY) {
         throw new ArbiterNotApprovedError("The payer has not approved an arbiter, so this payment cannot be taken.");
     }
     if (params.acceptArbiter) {
@@ -307,5 +298,4 @@ export async function charge(ctx, params) {
         allowDeferral: params.allowDeferral,
     });
 }
-export const DEFAULT_TOKEN_PROGRAM = TOKEN_PROGRAM_ADDRESS;
 //# sourceMappingURL=charge.js.map

package/dist/merchant/charge.js.map

@@ -1 +1 @@
-{"version":3,"file":"charge.js","sourceRoot":"","sources":["../../src/merchant/charge.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"charge.js","sourceRoot":"","sources":["../../src/merchant/charge.ts"],"names":[],"mappings":"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"}

package/dist/merchant/client.d.ts

@@ -7,11 +7,10 @@ import { type DeferredQueueStore } from "./deferred-store.js";
 export interface MerchantClientConfig {
     rpc: SdkRpc;
     rpcSubscriptions?: RpcSubscriptions<SolanaRpcSubscriptionsApi>;
-    merchant: Address;
+    merchantTreasury: Address;
     provider: ProviderTransport | ProviderTransportConfig;
-    feePayer?: TransactionSigner;
-    treasurySigner?: TransactionSigner;
-    operator?: TransactionSigner;
+    feePayer: TransactionSigner;
+    merchantOperator?: TransactionSigner;
     rpId?: string;
     tokenProgram?: Address;
     deferredStore?: DeferredQueueStore;
@@ -27,7 +26,6 @@ export interface MerchantClient {
         landed: number;
         restored: number;
     }>;
-    restoreDeferredFromProvider(): Promise<number>;
     refund(params: {
         payment: Address;
         amount?: bigint;
@@ -52,14 +50,10 @@ export interface MerchantClient {
     }): Promise<{
         signature: Signature;
     }>;
-    addOperator(operator: Address, options?: {
-        treasurySigner?: TransactionSigner;
-    }): Promise<{
+    addOperator(operator: Address): Promise<{
         signature: Signature;
     }>;
-    removeOperator(operator: Address, options?: {
-        treasurySigner?: TransactionSigner;
-    }): Promise<{
+    removeOperator(operator: Address): Promise<{
         signature: Signature;
     }>;
     getPayment(paymentOrSeeds: Address | {

package/dist/merchant/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/merchant/client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/merchant/client.ts"],"names":[],"mappings":"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"}

package/dist/merchant/client.js

@@ -8,7 +8,6 @@ import { ConfigurationError, InvalidAmountError } from "../core/errors.js";
 import { collectEventsForAddress, eventParticipants, subscribeToPaymentEvents, } from "../core/events.js";
 import { fetchPaymentSummary, } from "../core/payment.js";
 import { deriveAssociatedTokenAddress, deriveMerchantOperatorAddress, derivePaymentAccountAddress, derivePaymentAddressFromSeeds, } from "../core/pda.js";
-import { createProviderFeePayerSigner } from "../core/provider-fee-payer.js";
 import { createProviderTransport, } from "../core/provider-transport.js";
 import { PaymentStatus } from "../core/status.js";
 import { createTransactionRuntime } from "../core/transactions.js";
@@ -26,31 +25,22 @@ export function createMerchantClient(config) {
         (typeof globalThis.indexedDB !== "undefined"
             ? createIndexedDbDeferredStore()
             : createInMemoryDeferredStore());
-    let chargePayerPromise = null;
-    function getChargePayer() {
-        if (config.feePayer)
-            return Promise.resolve(config.feePayer);
-        if (!chargePayerPromise) {
-            chargePayerPromise = createProviderFeePayerSigner(provider);
-        }
-        return chargePayerPromise;
-    }
-    let deferredQueuePromise = null;
-    async function getDeferredQueue() {
-        if (!deferredQueuePromise) {
-            deferredQueuePromise = getChargePayer().then((feePayer) => createDeferredQueue({
+    let deferredQueue = null;
+    function getDeferredQueue() {
+        if (!deferredQueue) {
+            deferredQueue = createDeferredQueue({
                 rpc: config.rpc,
                 store: deferredStore,
                 runtime,
-                feePayer,
+                feePayer: config.feePayer,
                 provider,
-                merchant: config.merchant,
-            }));
+                merchant: config.merchantTreasury,
+            });
         }
-        return deferredQueuePromise;
+        return deferredQueue;
     }
     async function restoreAndFlush() {
-        const queue = await getDeferredQueue();
+        const queue = getDeferredQueue();
         try {
             await queue.reconcileWithProviderAndChain();
         }
@@ -82,26 +72,33 @@ export function createMerchantClient(config) {
             });
         }
     }
-    function requireTreasury(override, context = "this merchant operation") {
-        const signer = override ?? config.treasurySigner;
+    function requireOperator(override, context = "this merchant operation") {
+        const signer = override ?? config.merchantOperator;
         if (!signer) {
-            throw new ConfigurationError(`treasurySigner is required for ${context}. Pass it to createMerchantClient (charge uses the provider fee payer and does not need it).`);
+            throw new ConfigurationError(`merchantOperator is required for ${context}. Pass it to createMerchantClient (charge uses feePayer and does not need it).`);
         }
         return signer;
     }
-    async function merchantAuthority() {
-        const feePayer = requireTreasury(undefined, "refund/respond");
-        if (config.operator) {
-            return {
-                authority: config.operator,
-                feePayer,
-                merchantOperator: await deriveMerchantOperatorAddress({
-                    treasury: config.merchant,
-                    operator: config.operator.address,
+    async function resolveAuthority(override) {
+        const authority = requireOperator(override, "refund/respond");
+        const isTreasury = authority.address === config.merchantTreasury;
+        return {
+            authority,
+            feePayer: config.feePayer,
+            merchantOperatorPda: isTreasury
+                ? undefined
+                : await deriveMerchantOperatorAddress({
+                    treasury: config.merchantTreasury,
+                    operator: authority.address,
                 }),
-            };
+        };
+    }
+    function requireTreasuryAuthority(context) {
+        const authority = requireOperator(undefined, context);
+        if (authority.address !== config.merchantTreasury) {
+            throw new ConfigurationError(`${context} requires merchantOperator to be the treasury key (${config.merchantTreasury}). Cashiers cannot manage operators.`);
         }
-        return { authority: feePayer, feePayer, merchantOperator: undefined };
+        return authority;
     }
     async function fetchPaymentOrThrow(payment) {
         const summary = await fetchPaymentSummary(config.rpc, payment);
@@ -112,37 +109,33 @@ export function createMerchantClient(config) {
     }
     return {
         async charge(params) {
-            const feePayer = await getChargePayer();
-            const deferredQueue = await getDeferredQueue();
             return runCharge({
                 rpc: config.rpc,
                 runtime,
                 provider,
-                merchant: config.merchant,
-                feePayer,
+                merchant: config.merchantTreasury,
+                feePayer: config.feePayer,
                 tokenProgram,
-                deferredQueue,
+                deferredQueue: getDeferredQueue(),
                 rpId: config.rpId,
                 allowDeferral: config.allowDeferral,
             }, params);
         },
         async resumeCharge(cosigned, params = {}) {
-            const feePayer = await getChargePayer();
-            const deferredQueue = await getDeferredQueue();
             return runResumeCharge({
                 rpc: config.rpc,
                 runtime,
                 provider,
-                merchant: config.merchant,
-                feePayer,
+                merchant: config.merchantTreasury,
+                feePayer: config.feePayer,
                 tokenProgram,
-                deferredQueue,
+                deferredQueue: getDeferredQueue(),
                 rpId: config.rpId,
                 allowDeferral: config.allowDeferral,
             }, cosigned, params);
         },
         async flushDeferred() {
-            const queue = await getDeferredQueue();
+            const queue = getDeferredQueue();
             await queue.reconcileWithProviderAndChain().catch(() => ({
                 landed: 0,
                 restored: 0,
@@ -150,10 +143,7 @@ export function createMerchantClient(config) {
             return queue.flush();
         },
         async reconcileDeferred() {
-            return (await getDeferredQueue()).reconcileWithProviderAndChain();
-        },
-        async restoreDeferredFromProvider() {
-            return (await getDeferredQueue()).restoreFromProvider();
+            return getDeferredQueue().reconcileWithProviderAndChain();
         },
         async refund({ payment, amount }) {
             const summary = await fetchPaymentOrThrow(payment);
@@ -165,7 +155,7 @@ export function createMerchantClient(config) {
                 refunded !== summary.amount) {
                 throw new InvalidAmountError("A disputed payment can only be refunded in full (this concedes the dispute and returns the payer's bond). Omit `amount` to refund everything.");
             }
-            const { authority, feePayer, merchantOperator } = await merchantAuthority();
+            const { authority, feePayer, merchantOperatorPda } = await resolveAuthority();
             const paymentAccount = await derivePaymentAccountAddress({
                 owner: summary.payer,
                 mint: summary.mint,
@@ -175,7 +165,7 @@ export function createMerchantClient(config) {
                 authority,
                 paymentAccount,
                 payment,
-                merchantOperator,
+                merchantOperator: merchantOperatorPda,
                 refundAmount: refunded,
             });
             const signature = await runtime.sendAndConfirm(feePayer, [instruction]);
@@ -183,7 +173,7 @@ export function createMerchantClient(config) {
         },
         async respond({ payment, evidenceHash }) {
             const summary = await fetchPaymentOrThrow(payment);
-            const { authority, feePayer, merchantOperator } = await merchantAuthority();
+            const { authority, feePayer, merchantOperatorPda } = await resolveAuthority();
             const paymentAccount = await derivePaymentAccountAddress({
                 owner: summary.payer,
                 mint: summary.mint,
@@ -193,15 +183,18 @@ export function createMerchantClient(config) {
                 authority,
                 paymentAccount,
                 payment,
-                merchantOperator,
+                merchantOperator: merchantOperatorPda,
                 evidenceHash,
             });
             const signature = await runtime.sendAndConfirm(feePayer, [instruction]);
             return { signature };
         },
         async refundSettled(params) {
-            const merchantSigner = requireTreasury(params.merchantSigner, "refundSettled");
-            const feePayer = requireTreasury(undefined, "refundSettled");
+            const merchantSigner = params.merchantSigner ?? requireOperator(undefined, "refundSettled");
+            if (merchantSigner.address !== config.merchantTreasury) {
+                throw new ConfigurationError("refundSettled requires the treasury token owner. Pass merchantSigner, or set merchantOperator to the treasury key.");
+            }
+            const feePayer = config.feePayer;
             const [merchantTokenAccount, payerTokenAccount] = await Promise.all([
                 deriveAssociatedTokenAddress({
                     owner: merchantSigner.address,
@@ -235,22 +228,26 @@ export function createMerchantClient(config) {
             const signature = await runtime.sendAndConfirm(feePayer, instructions);
             return { signature };
         },
-        async addOperator(operator, options = {}) {
-            const treasury = requireTreasury(options.treasurySigner, "addOperator");
+        async addOperator(operator) {
+            const treasury = requireTreasuryAuthority("addOperator");
             const instruction = await getAddMerchantOperatorInstructionAsync({
                 treasury,
                 operator,
             });
-            const signature = await runtime.sendAndConfirm(treasury, [instruction]);
+            const signature = await runtime.sendAndConfirm(config.feePayer, [
+                instruction,
+            ]);
             return { signature };
         },
-        async removeOperator(operator, options = {}) {
-            const treasury = requireTreasury(options.treasurySigner, "removeOperator");
+        async removeOperator(operator) {
+            const treasury = requireTreasuryAuthority("removeOperator");
             const instruction = await getRemoveMerchantOperatorInstructionAsync({
                 treasury,
                 operator,
             });
-            const signature = await runtime.sendAndConfirm(treasury, [instruction]);
+            const signature = await runtime.sendAndConfirm(config.feePayer, [
+                instruction,
+            ]);
             return { signature };
         },
         async getPayment(paymentOrSeeds) {
@@ -265,14 +262,14 @@ export function createMerchantClient(config) {
             return fetchPaymentSummary(config.rpc, address);
         },
         recentPayments(options = {}) {
-            return collectEventsForAddress(config.rpc, config.merchant, options);
+            return collectEventsForAddress(config.rpc, config.merchantTreasury, options);
         },
         onPayment(callback, options = {}) {
             if (!config.rpcSubscriptions) {
                 throw new ConfigurationError("rpcSubscriptions is required for onPayment; pass it to createMerchantClient.");
             }
             return subscribeToPaymentEvents(config.rpcSubscriptions, (event) => {
-                if (eventParticipants(event.event).includes(config.merchant)) {
+                if (eventParticipants(event.event).includes(config.merchantTreasury)) {
                     callback(event);
                 }
             }, { onError: options.onError });

package/dist/merchant/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/merchant/client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/merchant/client.ts"],"names":[],"mappings":"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"}

package/dist/merchant/deferred-queue.d.ts

@@ -1,7 +1,7 @@
 import { type Address, type Instruction, type Signature, type TransactionSigner } from "@solana/kit";
 import type { SdkRpc } from "../core/payment.js";
-import type { ProviderTransport } from "../core/provider-transport.js";
-import type { TransactionRuntime } from "../core/transactions.js";
+import { type ProviderTransport } from "../core/provider-transport.js";
+import { type TransactionRuntime } from "../core/transactions.js";
 import { type DeferredQueueStore, type PendingTap, type PendingTapWire } from "./deferred-store.js";
 export type EnqueuePendingTapInput = Omit<PendingTap, "id" | "attempts"> & {
     id?: string;
@@ -24,7 +24,6 @@ export interface DeferredQueue {
         landed: number;
         restored: number;
     }>;
-    restoreFromProvider(): Promise<number>;
 }
 export declare const DEFAULT_FLUSH_INTERVAL_MS: number;
 export declare function rebuildBatchInstructions(taps: readonly PendingTap[], feePayer: TransactionSigner): Promise<Instruction[]>;

package/dist/merchant/deferred-queue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deferred-queue.d.ts","sourceRoot":"","sources":["../../src/merchant/deferred-queue.ts"],"names":[],"mappings":"AAaA,OAAO,EASL,KAAK,OAAO,EAEZ,KAAK,WAAW,EAChB,KAAK,SAAS,EACd,KAAK,iBAAiB,EACvB,MAAM,aAAa,CAAC;AASrB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAEvE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAIL,KAAK,kBAAkB,EACvB,KAAK,UAAU,EACf,KAAK,cAAc,EACpB,MAAM,qBAAqB,CAAC;AAE7B,MAAM,MAAM,sBAAsB,GAAG,IAAI,CAAC,UAAU,EAAE,IAAI,GAAG,UAAU,CAAC,GAAG;IACzE,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,WAAW,mBAAmB;IAClC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,kBAAkB,CAAC;IAC1B,OAAO,EAAE,kBAAkB,CAAC;IAC5B,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,QAAQ,EAAE,OAAO,CAAC;IAElB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,aAAa;IAC5B,OAAO,CAAC,GAAG,EAAE,sBAAsB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAEtD,KAAK,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;IAE9B,aAAa,IAAI,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC;IAK3C,6BAA6B,IAAI,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAE/E,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;CACxC;AAGD,eAAO,MAAM,yBAAyB,QAAiB,CAAC;AAGxD,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,SAAS,UAAU,EAAE,EAC3B,QAAQ,EAAE,iBAAiB,GAC1B,OAAO,CAAC,WAAW,EAAE,CAAC,CAsCxB;AAGD,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,iBAAiB,EAC3B,YAAY,EAAE,WAAW,EAAE,GAC1B,MAAM,CAsBR;AAMD,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,SAAS,UAAU,EAAE,EAC3B,QAAQ,EAAE,iBAAiB,EAC3B,OAAO,GAAE,MAAwB,GAChC,OAAO,CAAC,UAAU,EAAE,CAAC,CAcvB;AAiBD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,mBAAmB,GAAG,aAAa,CAyK9E;AAED,YAAY,EAAE,cAAc,EAAE,CAAC"}
+{"version":3,"file":"deferred-queue.d.ts","sourceRoot":"","sources":["../../src/merchant/deferred-queue.ts"],"names":[],"mappings":"AAaA,OAAO,EAEL,KAAK,OAAO,EACZ,KAAK,WAAW,EAChB,KAAK,SAAS,EACd,KAAK,iBAAiB,EACvB,MAAM,aAAa,CAAC;AAYrB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAEL,KAAK,kBAAkB,EACxB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAIL,KAAK,kBAAkB,EACvB,KAAK,UAAU,EACf,KAAK,cAAc,EACpB,MAAM,qBAAqB,CAAC;AAE7B,MAAM,MAAM,sBAAsB,GAAG,IAAI,CAAC,UAAU,EAAE,IAAI,GAAG,UAAU,CAAC,GAAG;IACzE,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,WAAW,mBAAmB;IAClC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,kBAAkB,CAAC;IAC1B,OAAO,EAAE,kBAAkB,CAAC;IAC5B,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,QAAQ,EAAE,OAAO,CAAC;IAElB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,aAAa;IAC5B,OAAO,CAAC,GAAG,EAAE,sBAAsB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAEtD,KAAK,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;IAE9B,aAAa,IAAI,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC;IAK3C,6BAA6B,IAAI,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAChF;AAGD,eAAO,MAAM,yBAAyB,QAAiB,CAAC;AAGxD,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,SAAS,UAAU,EAAE,EAC3B,QAAQ,EAAE,iBAAiB,GAC1B,OAAO,CAAC,WAAW,EAAE,CAAC,CAsCxB;AAGD,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,iBAAiB,EAC3B,YAAY,EAAE,WAAW,EAAE,GAC1B,MAAM,CAOR;AAMD,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,SAAS,UAAU,EAAE,EAC3B,QAAQ,EAAE,iBAAiB,EAC3B,OAAO,GAAE,MAAwB,GAChC,OAAO,CAAC,UAAU,EAAE,CAAC,CAcvB;AAiBD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,mBAAmB,GAAG,aAAa,CAyK9E;AAED,YAAY,EAAE,cAAc,EAAE,CAAC"}

package/dist/merchant/deferred-queue.js

@@ -1,10 +1,12 @@
-import { appendTransactionMessageInstructions, compileTransaction, createTransactionMessage, getBase58Decoder, getBase64EncodedWireTransaction, pipe, setTransactionMessageFeePayerSigner, setTransactionMessageLifetimeUsingBlockhash, } from "@solana/kit";
+import { getBase64EncodedWireTransaction, } from "@solana/kit";
 import { getSecp256r1VerifyInstruction, } from "phygital-token-sdk";
-import { fetchMaybePayment } from "../generated/accounts/payment.js";
+import { fetchAllMaybePayment, fetchMaybePayment, } from "../generated/accounts/payment.js";
 import { getTransferInstructionAsync } from "../generated/instructions/transfer.js";
 import { base58ToBytes } from "../core/bytes.js";
 import { ProviderHttpError } from "../core/errors.js";
+import { isTransientProviderStatus, } from "../core/provider-transport.js";
 import { nowSeconds } from "../core/time.js";
+import { compileWithThrowawayLifetime, } from "../core/transactions.js";
 import { deserializePendingTap, MAX_TAPS_PER_TX, MAX_TRANSACTION_SIZE, } from "./deferred-store.js";
 export const DEFAULT_FLUSH_INTERVAL_MS = 15 * 60 * 1000;
 export async function rebuildBatchInstructions(taps, feePayer) {
@@ -42,10 +44,7 @@ export async function rebuildBatchInstructions(taps, feePayer) {
     return [preamble, ...transfers];
 }
 export function estimateTransactionSize(feePayer, instructions) {
-    const transaction = pipe(createTransactionMessage({ version: 0 }), (m) => setTransactionMessageFeePayerSigner(feePayer, m), (m) => setTransactionMessageLifetimeUsingBlockhash({
-        blockhash: getBase58Decoder().decode(crypto.getRandomValues(new Uint8Array(32))),
-        lastValidBlockHeight: 0n,
-    }, m), (m) => appendTransactionMessageInstructions(instructions, m), (m) => compileTransaction(m));
+    const transaction = compileWithThrowawayLifetime(feePayer, instructions);
     const wire = getBase64EncodedWireTransaction(transaction);
     if (typeof Buffer !== "undefined") {
         return Buffer.from(wire, "base64").byteLength;
@@ -71,7 +70,7 @@ export async function packTapsForBatch(taps, feePayer, maxTaps = MAX_TAPS_PER_TX
 }
 function isLikelyTransient(error) {
     if (error instanceof ProviderHttpError) {
-        return error.status === 0 || error.status === 408 || error.status === 429 || error.status >= 500;
+        return isTransientProviderStatus(error.status);
     }
     if (error instanceof TypeError)
         return true;
@@ -84,21 +83,27 @@ function isLikelyTransient(error) {
 }
 export function createDeferredQueue(config) {
     const maxTaps = Math.min(config.maxTapsPerTx ?? MAX_TAPS_PER_TX, MAX_TAPS_PER_TX);
-    async function markLandedElsewhere(tap) {
-        await config.store.markDone(tap.id, "reconciled-on-chain");
+    async function acknowledgeBackup(reference) {
         try {
-            await config.provider.acknowledgePendingTap({ reference: tap.reference });
+            await config.provider.acknowledgePendingTap({ reference });
         }
         catch (error) {
             if (!(error instanceof ProviderHttpError))
                 throw error;
         }
     }
+    async function markLandedElsewhere(tap) {
+        await config.store.markDone(tap.id, "reconciled-on-chain");
+        await acknowledgeBackup(tap.reference);
+    }
     async function dropAlreadyOnChain(taps) {
+        if (taps.length === 0)
+            return [];
+        const accounts = await fetchAllMaybePayment(config.rpc, taps.map((tap) => tap.payment));
         const remaining = [];
-        for (const tap of taps) {
-            const onChain = await fetchMaybePayment(config.rpc, tap.payment);
-            if (onChain.exists) {
+        for (let i = 0; i < taps.length; i++) {
+            const tap = taps[i];
+            if (accounts[i].exists) {
                 await markLandedElsewhere(tap);
             }
             else {
@@ -132,13 +137,7 @@ export function createDeferredQueue(config) {
         const signature = await config.runtime.sendAndConfirm(config.feePayer, instructions);
         for (const tap of batch) {
             await config.store.markDone(tap.id, signature);
-            try {
-                await config.provider.acknowledgePendingTap({ reference: tap.reference });
-            }
-            catch (error) {
-                if (!(error instanceof ProviderHttpError))
-                    throw error;
-            }
+            await acknowledgeBackup(tap.reference);
         }
         return signature;
     }
@@ -193,13 +192,7 @@ export function createDeferredQueue(config) {
             const tap = deserializePendingTap(wire);
             const onChain = await fetchMaybePayment(config.rpc, tap.payment);
             if (onChain.exists) {
-                try {
-                    await config.provider.acknowledgePendingTap({ reference: tap.reference });
-                }
-                catch (error) {
-                    if (!(error instanceof ProviderHttpError))
-                        throw error;
-                }
+                await acknowledgeBackup(tap.reference);
                 continue;
             }
             await config.store.put({ ...tap, id: "", attempts: 0 });
@@ -231,7 +224,6 @@ export function createDeferredQueue(config) {
         flush,
         flushOneBatch,
         reconcileWithProviderAndChain,
-        restoreFromProvider,
     };
 }
 //# sourceMappingURL=deferred-queue.js.map