@faremeter/payment-solana 0.20.0 → 0.21.0

package/dist/src/compat.test.js

@@ -0,0 +1,70 @@
+#!/usr/bin/env pnpm tsx
+import t from "tap";
+import { address, createKeyPairSignerFromBytes, createSolanaRpc, } from "@solana/kit";
+import { toAddress, toKeyPairSigner, toRpc } from "./compat.js";
+// A deterministic 64-byte secret key for testing (32-byte seed +
+// 32-byte public key, as expected by createKeyPairSignerFromBytes).
+// Generated once from a known seed; the address is deterministic.
+const TEST_SECRET_KEY = new Uint8Array([
+    174, 47, 154, 16, 202, 193, 206, 113, 199, 190, 53, 133, 169, 175, 31, 56,
+    222, 53, 138, 189, 224, 216, 117, 173, 10, 149, 53, 45, 73, 251, 237, 246, 15,
+    185, 186, 82, 177, 240, 148, 69, 241, 227, 167, 80, 141, 89, 240, 121, 121,
+    35, 172, 247, 68, 251, 226, 218, 48, 63, 176, 109, 168, 89, 238, 135,
+]);
+// ---------- toAddress ----------
+await t.test("toAddress: passes through a kit Address string", async (t) => {
+    const addr = address("11111111111111111111111111111111");
+    const result = toAddress(addr);
+    t.equal(result, addr);
+});
+await t.test("toAddress: converts a PublicKey-like object", async (t) => {
+    const fakePublicKey = {
+        toBase58: () => "11111111111111111111111111111111",
+    };
+    const result = toAddress(fakePublicKey);
+    t.equal(result, "11111111111111111111111111111111");
+});
+await t.test("toAddress: throws on invalid input", async (t) => {
+    t.throws(() => toAddress(42), {
+        message: /expected an Address string or PublicKey/,
+    });
+});
+// ---------- toKeyPairSigner ----------
+await t.test("toKeyPairSigner: passes through a kit KeyPairSigner", async (t) => {
+    const signer = await createKeyPairSignerFromBytes(TEST_SECRET_KEY);
+    const result = await toKeyPairSigner(signer);
+    t.equal(result.address, signer.address);
+    t.ok("signMessages" in result);
+});
+await t.test("toKeyPairSigner: converts a Uint8Array secret key", async (t) => {
+    const expected = await createKeyPairSignerFromBytes(TEST_SECRET_KEY);
+    const result = await toKeyPairSigner(TEST_SECRET_KEY);
+    t.equal(result.address, expected.address);
+    t.ok("signMessages" in result);
+});
+await t.test("toKeyPairSigner: converts a Keypair-like object", async (t) => {
+    const expected = await createKeyPairSignerFromBytes(TEST_SECRET_KEY);
+    // Duck-type that matches @solana/web3.js v1 Keypair shape
+    const fakeKeypair = {
+        secretKey: TEST_SECRET_KEY,
+        publicKey: { toBase58: () => expected.address },
+    };
+    const result = await toKeyPairSigner(fakeKeypair);
+    t.equal(result.address, expected.address);
+    t.ok("signMessages" in result);
+});
+await t.test("toKeyPairSigner: throws on invalid input", async (t) => {
+    await t.rejects(() => toKeyPairSigner("not-a-signer"), {
+        message: /expected a Uint8Array, KeyPairSigner, or Keypair/,
+    });
+});
+// ---------- toRpc ----------
+await t.test("toRpc: passes through an Rpc object", async (t) => {
+    const rpc = createSolanaRpc("https://api.devnet.solana.com");
+    const result = toRpc(rpc);
+    t.equal(result, rpc);
+});
+await t.test("toRpc: creates an Rpc from a URL string", async (t) => {
+    const result = toRpc("https://api.devnet.solana.com");
+    t.ok(typeof result.getLatestBlockhash === "function");
+});

package/dist/src/exact/client.d.ts

@@ -1,26 +1,27 @@
 import type { PaymentHandler } from "@faremeter/types/client";
 import type { SolanaCAIP2Network } from "@faremeter/info/solana";
-import { Connection, PublicKey, TransactionInstruction, VersionedTransaction } from "@solana/web3.js";
+import { type Address, type Blockhash, type Instruction, type Rpc, type SolanaRpcApi, type Transaction } from "@solana/kit";
+export type WalletLifetimeConstraint = {
+    blockhash: Blockhash;
+    lastValidBlockHeight: bigint;
+};
 export type Wallet = {
     network: string | SolanaCAIP2Network;
-    publicKey: PublicKey;
-    buildTransaction?: (instructions: TransactionInstruction[], recentBlockHash: string) => Promise<VersionedTransaction>;
-    partiallySignTransaction?: (tx: VersionedTransaction) => Promise<VersionedTransaction>;
-    updateTransaction?: (tx: VersionedTransaction) => Promise<VersionedTransaction>;
-    sendTransaction?: (tx: VersionedTransaction) => Promise<string>;
+    publicKey: Address;
+    buildTransaction?: (instructions: readonly Instruction[], lifetimeConstraint: WalletLifetimeConstraint) => Promise<Transaction>;
+    partiallySignTransaction?: (tx: Transaction) => Promise<Transaction>;
+    sendTransaction?: (tx: Transaction) => Promise<string>;
 };
-interface GetAssociatedTokenAddressSyncOptions {
-    allowOwnerOffCurve?: boolean;
-    programId?: PublicKey;
-    associatedTokenProgramId?: PublicKey;
-}
 interface CreatePaymentHandlerOptions {
-    token?: GetAssociatedTokenAddressSyncOptions;
+    token?: {
+        programId?: Address;
+    };
     settlementRentDestination?: string;
     features?: {
         enableSettlementAccounts?: boolean;
     };
 }
+export declare function buildAndSignClientTransaction(wallet: Wallet, instructions: readonly Instruction[], payerKey: Address, lifetimeConstraint: WalletLifetimeConstraint): Promise<Transaction>;
 /**
  * Creates a payment handler for the Solana exact payment scheme.
  *
@@ -28,11 +29,13 @@ interface CreatePaymentHandlerOptions {
  * and submitted by the client to fulfill x402 payment requirements.
  *
  * @param wallet - Wallet providing signing capabilities
- * @param mint - SPL token mint public key
- * @param connection - Optional Solana connection for fetching blockhash and mint info
+ * @param mintInput - SPL token mint address
+ * @param rpcInput - Optional Solana RPC client for fetching blockhash and mint info
  * @param options - Optional configuration for token address and features
  * @returns A PaymentHandler function for use with the x402 client
  */
-export declare function createPaymentHandler(wallet: Wallet, mint: PublicKey, connection?: Connection, options?: CreatePaymentHandlerOptions): PaymentHandler;
+export declare function createPaymentHandler(wallet: Wallet, mintInput: Address | {
+    toBase58(): string;
+}, rpcInput?: Rpc<SolanaRpcApi> | string, options?: CreatePaymentHandlerOptions): PaymentHandler;
 export {};
 //# sourceMappingURL=client.d.ts.map

package/dist/src/exact/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/exact/client.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAEV,cAAc,EAEf,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAajE,OAAO,EAEL,UAAU,EACV,SAAS,EACT,sBAAsB,EAEtB,oBAAoB,EAErB,MAAM,iBAAiB,CAAC;AAMzB,MAAM,MAAM,MAAM,GAAG;IACnB,OAAO,EAAE,MAAM,GAAG,kBAAkB,CAAC;IACrC,SAAS,EAAE,SAAS,CAAC;IACrB,gBAAgB,CAAC,EAAE,CACjB,YAAY,EAAE,sBAAsB,EAAE,EACtC,eAAe,EAAE,MAAM,KACpB,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACnC,wBAAwB,CAAC,EAAE,CACzB,EAAE,EAAE,oBAAoB,KACrB,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACnC,iBAAiB,CAAC,EAAE,CAClB,EAAE,EAAE,oBAAoB,KACrB,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACnC,eAAe,CAAC,EAAE,CAAC,EAAE,EAAE,oBAAoB,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CACjE,CAAC;AAEF,UAAU,oCAAoC;IAC5C,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,wBAAwB,CAAC,EAAE,SAAS,CAAC;CACtC;AAyFD,UAAU,2BAA2B;IACnC,KAAK,CAAC,EAAE,oCAAoC,CAAC;IAC7C,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,EAAE;QACT,wBAAwB,CAAC,EAAE,OAAO,CAAC;KACpC,CAAC;CACH;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,EACf,UAAU,CAAC,EAAE,UAAU,EACvB,OAAO,CAAC,EAAE,2BAA2B,GACpC,cAAc,CAyMhB"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/exact/client.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAEV,cAAc,EAEf,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAYjE,OAAO,EAYL,KAAK,OAAO,EACZ,KAAK,SAAS,EACd,KAAK,WAAW,EAChB,KAAK,GAAG,EACR,KAAK,YAAY,EACjB,KAAK,WAAW,EACjB,MAAM,aAAa,CAAC;AAOrB,MAAM,MAAM,wBAAwB,GAAG;IACrC,SAAS,EAAE,SAAS,CAAC;IACrB,oBAAoB,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG;IACnB,OAAO,EAAE,MAAM,GAAG,kBAAkB,CAAC;IACrC,SAAS,EAAE,OAAO,CAAC;IACnB,gBAAgB,CAAC,EAAE,CACjB,YAAY,EAAE,SAAS,WAAW,EAAE,EACpC,kBAAkB,EAAE,wBAAwB,KACzC,OAAO,CAAC,WAAW,CAAC,CAAC;IAC1B,wBAAwB,CAAC,EAAE,CAAC,EAAE,EAAE,WAAW,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC;IACrE,eAAe,CAAC,EAAE,CAAC,EAAE,EAAE,WAAW,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CACxD,CAAC;AAoFF,UAAU,2BAA2B;IACnC,KAAK,CAAC,EAAE;QACN,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB,CAAC;IACF,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,EAAE;QACT,wBAAwB,CAAC,EAAE,OAAO,CAAC;KACpC,CAAC;CACH;AAED,wBAAsB,6BAA6B,CACjD,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,SAAS,WAAW,EAAE,EACpC,QAAQ,EAAE,OAAO,EACjB,kBAAkB,EAAE,wBAAwB,GAC3C,OAAO,CAAC,WAAW,CAAC,CAsBtB;AAwBD;;;;;;;;;;;GAWG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,OAAO,GAAG;IAAE,QAAQ,IAAI,MAAM,CAAA;CAAE,EAC3C,QAAQ,CAAC,EAAE,GAAG,CAAC,YAAY,CAAC,GAAG,MAAM,EACrC,OAAO,CAAC,EAAE,2BAA2B,GACpC,cAAc,CAwJhB"}

package/dist/src/exact/client.js

@@ -1,35 +1,38 @@
 import { isValidationError, throwValidationError } from "@faremeter/types";
-import { createAssociatedTokenAccountIdempotentInstruction, createTransferCheckedInstruction, getAssociatedTokenAddressSync, getMint, TOKEN_PROGRAM_ID, } from "@solana/spl-token";
-import { getBase64EncodedWireTransaction, } from "@solana/transactions";
-import { ComputeBudgetProgram, Connection, PublicKey, TransactionInstruction, TransactionMessage, VersionedTransaction, Keypair, } from "@solana/web3.js";
+import { fetchMint, findAssociatedTokenPda, getCreateAssociatedTokenIdempotentInstruction, getTransferCheckedInstruction, TOKEN_PROGRAM_ADDRESS, } from "@solana-program/token";
+import { getSetComputeUnitLimitInstruction, getSetComputeUnitPriceInstruction, } from "@solana-program/compute-budget";
+import { address, appendTransactionMessageInstructions, compileTransaction, createKeyPairFromPrivateKeyBytes, createKeyPairSignerFromBytes, createNoopSigner, createTransactionMessage, getBase64EncodedWireTransaction, pipe, setTransactionMessageFeePayer, setTransactionMessageLifetimeUsingBlockhash, } from "@solana/kit";
 import { PaymentRequirementsExtra } from "./facilitator.js";
 import { generateMatcher } from "./common.js";
-import { createMemoInstruction, generateMemoNonce } from "./memo.js";
-import { logger } from "./logger.js";
-function generateGetAssociatedTokenAddressSyncRest(tokenConfig) {
-    const { allowOwnerOffCurve, programId, associatedTokenProgramId } = tokenConfig;
-    // NOTE: These map to the trailing default args of
-    // getAssociatedTokenAddressSync, so order matters. If things are
-    // refactored, they should be updated to match the reality of the
-    // implementation.
-    return [allowOwnerOffCurve, programId, associatedTokenProgramId];
-}
+import { generateMemoNonce } from "./memo.js";
+import { getAddMemoInstruction } from "@solana-program/memo";
+import { toAddress, toRpc } from "../compat.js";
 const PaymentMode = {
     ToSpec: "toSpec",
     SettlementAccount: "settlementAccount",
 };
 async function extractMetadata(args) {
-    const { connection, mint, requirements, wallet, options } = args;
+    const { rpc, mint, requirements, wallet, options } = args;
     const extra = PaymentRequirementsExtra(requirements.extra);
     if (isValidationError(extra)) {
         throwValidationError("couldn't validate requirements extra field", extra);
     }
-    let recentBlockhash;
+    let lifetimeConstraint;
     if (extra.recentBlockhash !== undefined) {
-        recentBlockhash = extra.recentBlockhash;
+        // The server supplied a blockhash but no lastValidBlockHeight. Kit
+        // requires both; use a sentinel lastValidBlockHeight of 0n since it
+        // only affects client-side retry timing, not wire format.
+        lifetimeConstraint = {
+            blockhash: extra.recentBlockhash,
+            lastValidBlockHeight: 0n,
+        };
     }
-    else if (connection !== undefined) {
-        recentBlockhash = (await connection.getLatestBlockhash()).blockhash;
+    else if (rpc !== undefined) {
+        const { value } = await rpc.getLatestBlockhash().send();
+        lifetimeConstraint = {
+            blockhash: value.blockhash,
+            lastValidBlockHeight: value.lastValidBlockHeight,
+        };
     }
     else {
         throw new Error("couldn't get the latest Solana network block hash");
@@ -38,15 +41,15 @@ async function extractMetadata(args) {
     if (extra.decimals !== undefined) {
         decimals = extra.decimals;
     }
-    else if (connection !== undefined) {
-        const mintInfo = await getMint(connection, mint);
-        decimals = mintInfo.decimals;
+    else if (rpc !== undefined) {
+        const mintInfo = await fetchMint(rpc, mint);
+        decimals = mintInfo.data.decimals;
     }
     else {
         throw new Error("couldn't get the decimal information for the mint");
     }
-    const payerKey = new PublicKey(extra.feePayer);
-    const payTo = new PublicKey(requirements.payTo);
+    const payerKey = address(extra.feePayer);
+    const payTo = address(requirements.payTo);
     const amount = Number(requirements.amount);
     let paymentMode = PaymentMode.ToSpec;
     if (options?.features?.enableSettlementAccounts &&
@@ -55,11 +58,11 @@ async function extractMetadata(args) {
         paymentMode = PaymentMode.SettlementAccount;
     }
     const tokenProgramId = extra.tokenProgram
-        ? new PublicKey(extra.tokenProgram)
-        : (options?.token?.programId ?? TOKEN_PROGRAM_ID);
+        ? address(extra.tokenProgram)
+        : (options?.token?.programId ?? TOKEN_PROGRAM_ADDRESS);
     const memo = extra.memo;
     return {
-        recentBlockhash,
+        lifetimeConstraint,
         decimals,
         payTo,
         amount,
@@ -69,6 +72,39 @@ async function extractMetadata(args) {
         memo,
     };
 }
+export async function buildAndSignClientTransaction(wallet, instructions, payerKey, lifetimeConstraint) {
+    const sign = async (tx) => {
+        if (wallet.partiallySignTransaction) {
+            return wallet.partiallySignTransaction(tx);
+        }
+        return tx;
+    };
+    let tx;
+    if (wallet.buildTransaction) {
+        tx = await wallet.buildTransaction(instructions, lifetimeConstraint);
+    }
+    else {
+        const message = pipe(createTransactionMessage({ version: 0 }), (m) => setTransactionMessageFeePayer(payerKey, m), (m) => setTransactionMessageLifetimeUsingBlockhash(lifetimeConstraint, m), (m) => appendTransactionMessageInstructions(instructions, m));
+        tx = compileTransaction(message);
+    }
+    return sign(tx);
+}
+async function generateSettleSigner() {
+    // Build a fresh ed25519 keypair locally and also return its wire-format
+    // bytes (32-byte privkey || 32-byte pubkey) so the facilitator can
+    // reconstruct the signer on settlement via createKeyPairSignerFromBytes.
+    const privateKeyBytes = crypto.getRandomValues(new Uint8Array(32));
+    // @solana/keys' CryptoKeyPair is returned here; the lib in our tsconfig
+    // doesn't include DOM types so we widen to a minimal local shape.
+    const keyPair = (await createKeyPairFromPrivateKeyBytes(privateKeyBytes, 
+    /* extractable */ true));
+    const publicKeyBytes = new Uint8Array(await crypto.subtle.exportKey("raw", keyPair.publicKey));
+    const secretKey = new Uint8Array(64);
+    secretKey.set(privateKeyBytes);
+    secretKey.set(publicKeyBytes, 32);
+    const signer = await createKeyPairSignerFromBytes(secretKey);
+    return { signer, secretKey };
+}
 /**
  * Creates a payment handler for the Solana exact payment scheme.
  *
@@ -76,101 +112,93 @@ async function extractMetadata(args) {
  * and submitted by the client to fulfill x402 payment requirements.
  *
  * @param wallet - Wallet providing signing capabilities
- * @param mint - SPL token mint public key
- * @param connection - Optional Solana connection for fetching blockhash and mint info
+ * @param mintInput - SPL token mint address
+ * @param rpcInput - Optional Solana RPC client for fetching blockhash and mint info
  * @param options - Optional configuration for token address and features
  * @returns A PaymentHandler function for use with the x402 client
  */
-export function createPaymentHandler(wallet, mint, connection, options) {
-    const tokenConfig = options?.token ?? {};
-    let hasWarnedAboutDeprecation = false;
-    const signTransaction = async (tx) => {
-        if (wallet.partiallySignTransaction) {
-            return wallet.partiallySignTransaction(tx);
-        }
-        if (wallet.updateTransaction) {
-            if (!hasWarnedAboutDeprecation) {
-                logger.warning("wallet.partiallySignTransaction is not available, falling back to updateTransaction");
-                hasWarnedAboutDeprecation = true;
-            }
-            return wallet.updateTransaction(tx);
-        }
-        return tx;
-    };
-    const { isMatchingRequirement } = generateMatcher(wallet.network, mint ? mint.toBase58() : "sol");
+export function createPaymentHandler(wallet, mintInput, rpcInput, options) {
+    const mint = toAddress(mintInput);
+    const rpc = rpcInput ? toRpc(rpcInput) : undefined;
+    const { isMatchingRequirement } = generateMatcher(wallet.network, mint);
     return async (_context, accepts) => {
         const compatibleRequirements = accepts.filter(isMatchingRequirement);
         const res = compatibleRequirements.map((requirements) => {
             const exec = async () => {
-                const { recentBlockhash, decimals, payTo, amount, payerKey, paymentMode, tokenProgramId, memo, } = await extractMetadata({
-                    connection,
+                const { lifetimeConstraint, decimals, payTo, amount, payerKey, paymentMode, tokenProgramId, memo, } = await extractMetadata({
+                    rpc,
                     mint,
                     requirements,
                     wallet,
                     options,
                 });
-                const getAssociatedTokenAddressSyncRest = generateGetAssociatedTokenAddressSyncRest({
-                    ...tokenConfig,
-                    programId: tokenProgramId,
-                });
-                const instructions = [
-                    ComputeBudgetProgram.setComputeUnitLimit({
-                        units: 50_000,
-                    }),
-                    ComputeBudgetProgram.setComputeUnitPrice({
-                        microLamports: 1,
-                    }),
+                const baseInstructions = [
+                    getSetComputeUnitLimitInstruction({ units: 50_000 }),
+                    getSetComputeUnitPriceInstruction({ microLamports: 1n }),
                 ];
-                const sourceAccount = getAssociatedTokenAddressSync(mint, wallet.publicKey, ...getAssociatedTokenAddressSyncRest);
+                const walletSigner = createNoopSigner(wallet.publicKey);
+                const [sourceAccount] = await findAssociatedTokenPda({
+                    mint,
+                    owner: wallet.publicKey,
+                    tokenProgram: tokenProgramId,
+                });
                 switch (paymentMode) {
                     case PaymentMode.ToSpec: {
-                        const receiverAccount = getAssociatedTokenAddressSync(mint, payTo, ...getAssociatedTokenAddressSyncRest);
-                        instructions.push(createTransferCheckedInstruction(sourceAccount, mint, receiverAccount, wallet.publicKey, amount, decimals, undefined, tokenProgramId), createMemoInstruction(memo ?? generateMemoNonce()));
-                        let tx;
-                        if (wallet.buildTransaction) {
-                            tx = await wallet.buildTransaction(instructions, recentBlockhash);
-                        }
-                        else {
-                            const message = new TransactionMessage({
-                                instructions,
-                                payerKey,
-                                recentBlockhash,
-                            }).compileToV0Message();
-                            tx = new VersionedTransaction(message);
-                        }
-                        tx = await signTransaction(tx);
-                        const base64EncodedWireTransaction = getBase64EncodedWireTransaction({
-                            messageBytes: tx.message.serialize(),
-                            signatures: tx.signatures,
+                        const [receiverAccount] = await findAssociatedTokenPda({
+                            mint,
+                            owner: payTo,
+                            tokenProgram: tokenProgramId,
                         });
+                        const instructions = [
+                            ...baseInstructions,
+                            getTransferCheckedInstruction({
+                                source: sourceAccount,
+                                mint,
+                                destination: receiverAccount,
+                                authority: walletSigner,
+                                amount,
+                                decimals,
+                            }, { programAddress: tokenProgramId }),
+                            getAddMemoInstruction({ memo: memo ?? generateMemoNonce() }),
+                        ];
+                        const tx = await buildAndSignClientTransaction(wallet, instructions, payerKey, lifetimeConstraint);
                         const payload = {
-                            transaction: base64EncodedWireTransaction,
+                            transaction: getBase64EncodedWireTransaction(tx),
                         };
                         return { payload };
                     }
                     case PaymentMode.SettlementAccount: {
-                        const settleKeypair = Keypair.generate();
-                        const settleATA = getAssociatedTokenAddressSync(mint, settleKeypair.publicKey, ...getAssociatedTokenAddressSyncRest);
-                        instructions.push(createAssociatedTokenAccountIdempotentInstruction(wallet.publicKey, settleATA, settleKeypair.publicKey, mint, tokenProgramId, tokenConfig.associatedTokenProgramId), createTransferCheckedInstruction(sourceAccount, mint, settleATA, wallet.publicKey, amount, decimals, undefined, tokenProgramId));
-                        let tx;
-                        if (wallet.buildTransaction) {
-                            tx = await wallet.buildTransaction(instructions, recentBlockhash);
-                        }
-                        else {
-                            const message = new TransactionMessage({
-                                instructions,
-                                payerKey,
-                                recentBlockhash,
-                            }).compileToV0Message();
-                            tx = new VersionedTransaction(message);
-                        }
-                        tx = await signTransaction(tx);
+                        const { signer: settleSigner, secretKey: settleSecretBytes } = await generateSettleSigner();
+                        const [settleATA] = await findAssociatedTokenPda({
+                            mint,
+                            owner: settleSigner.address,
+                            tokenProgram: tokenProgramId,
+                        });
+                        const instructions = [
+                            ...baseInstructions,
+                            getCreateAssociatedTokenIdempotentInstruction({
+                                ata: settleATA,
+                                owner: settleSigner.address,
+                                payer: walletSigner,
+                                mint,
+                                tokenProgram: tokenProgramId,
+                            }),
+                            getTransferCheckedInstruction({
+                                source: sourceAccount,
+                                mint,
+                                destination: settleATA,
+                                authority: walletSigner,
+                                amount,
+                                decimals,
+                            }, { programAddress: tokenProgramId }),
+                        ];
+                        const tx = await buildAndSignClientTransaction(wallet, instructions, payerKey, lifetimeConstraint);
                         if (!wallet.sendTransaction) {
                             throw new Error("wallet must support sending transactions to use settlement accounts with exact");
                         }
                         const transactionSignature = await wallet.sendTransaction(tx);
-                        const settleSecretKey = Buffer.from(settleKeypair.secretKey).toString("base64");
-                        const settlementRentDestination = options?.settlementRentDestination ?? wallet.publicKey.toBase58();
+                        const settleSecretKey = Buffer.from(settleSecretBytes).toString("base64");
+                        const settlementRentDestination = options?.settlementRentDestination ?? wallet.publicKey;
                         const payload = {
                             settleSecretKey,
                             transactionSignature,

package/dist/src/exact/common.d.ts

@@ -1,7 +1,7 @@
 import { type SolanaCAIP2Network } from "@faremeter/info/solana";
 export declare const x402Scheme = "exact";
 export declare function generateMatcher(network: string | SolanaCAIP2Network, asset: string): {
-    matchTuple: import("arktype/internal/methods/object.ts").ObjectType<{
+    matchTuple: import("arktype/internal/variants/object.ts").ObjectType<{
         scheme: (In: string) => import("arktype/internal/attributes.ts").To<Lowercase<string>>;
         network: (In: string) => import("arktype/internal/attributes.ts").To<Lowercase<string>>;
         asset: (In: string) => import("arktype/internal/attributes.ts").To<Lowercase<string>>;

package/dist/src/exact/facilitator.d.ts

@@ -2,15 +2,14 @@ import { type x402PaymentRequirements, type x402PaymentPayload, type x402SettleR
 import type { FacilitatorHandler } from "@faremeter/types/facilitator";
 import { type SolanaCAIP2Network } from "@faremeter/info/solana";
 import { fetchMint } from "@solana-program/token";
-import { type Rpc, type SolanaRpcApi } from "@solana/kit";
+import { type Address, type KeyPairSigner, type Rpc, type SolanaRpcApi } from "@solana/kit";
 import type { TransactionError } from "@solana/rpc-types";
-import { Keypair, PublicKey } from "@solana/web3.js";
 import { logger } from "./logger.js";
 export interface HookBaseArgs {
     network: string | SolanaCAIP2Network;
     rpc: Rpc<SolanaRpcApi>;
-    feePayerKeypair: Keypair;
-    mint: PublicKey;
+    feePayerSigner: KeyPairSigner;
+    mint: Address;
     mintInfo: Awaited<ReturnType<typeof fetchMint>>;
     requirements: x402PaymentRequirements;
     payment: x402PaymentPayload;
@@ -24,11 +23,11 @@ export interface FacilitatorHooks {
     afterVerify?: HookResponseFuncs<x402VerifyResponse>;
     afterSettle?: HookResponseFuncs<x402SettleResponse>;
 }
-export declare const PaymentRequirementsExtraFeatures: import("arktype/internal/methods/object.ts").ObjectType<{
+export declare const PaymentRequirementsExtraFeatures: import("arktype/internal/variants/object.ts").ObjectType<{
     xSettlementAccountSupported?: boolean;
 }, {}>;
 export type PaymentRequirementsExtraFeatures = typeof PaymentRequirementsExtraFeatures.infer;
-export declare const PaymentRequirementsExtra: import("arktype/internal/methods/object.ts").ObjectType<{
+export declare const PaymentRequirementsExtra: import("arktype/internal/variants/object.ts").ObjectType<{
     feePayer: string;
     decimals?: number;
     recentBlockhash?: string;
@@ -43,20 +42,21 @@ interface FacilitatorOptions {
     retryDelayMs?: number;
     maxPriorityFee?: number;
     maxTransactionAge?: number;
+    requireMemo?: boolean;
     features?: {
         enableSettlementAccounts?: boolean;
         enableDuplicateCheck?: boolean;
     };
     hooks?: readonly FacilitatorHooks[];
 }
-export declare const PaymentPayloadTransaction: import("arktype/internal/methods/object.ts").ObjectType<{
+export declare const PaymentPayloadTransaction: import("arktype/internal/variants/object.ts").ObjectType<{
     transaction: (In: string) => import("arktype").Out<Readonly<{
         messageBytes: import("@solana/transactions").TransactionMessageBytes;
         signatures: import("@solana/transactions").SignaturesMap;
     }>>;
 }, {}>;
 export type PaymentPayloadTransaction = typeof PaymentPayloadTransaction.infer;
-export declare const PaymentPayloadSettlementAccount: import("arktype/internal/methods/object.ts").ObjectType<{
+export declare const PaymentPayloadSettlementAccount: import("arktype/internal/variants/object.ts").ObjectType<{
     transactionSignature: string;
     settleSecretKey: (In: string) => import("arktype").Out<Uint8Array<ArrayBuffer>>;
     settlementRentDestination?: string;
@@ -70,12 +70,19 @@ export declare function transactionErrorToString(t: TransactionError): string;
  * fee payer keypair, and submits them to the Solana network.
  *
  * @param network - Solana network identifier (cluster name, CAIP-2 string, or SolanaCAIP2Network object)
- * @param rpc - Solana RPC client
- * @param feePayerKeypair - Keypair for paying transaction fees
- * @param mint - SPL token mint public key
+ * @param rpcInput - Solana RPC client
+ * @param feePayerSignerInput - Keypair or signer for paying transaction fees
+ * @param mintInput - SPL token mint public key
  * @param config - Optional configuration for retries, fees, and hooks
  * @returns A FacilitatorHandler for processing Solana exact payments
  */
-export declare const createFacilitatorHandler: (network: string | SolanaCAIP2Network, rpc: Rpc<SolanaRpcApi>, feePayerKeypair: Keypair, mint: PublicKey, config?: FacilitatorOptions) => Promise<FacilitatorHandler>;
+export declare const createFacilitatorHandler: (network: string | SolanaCAIP2Network, rpcInput: Rpc<SolanaRpcApi> | string, feePayerSignerInput: KeyPairSigner | {
+    secretKey: Uint8Array;
+    publicKey: {
+        toBase58(): string;
+    };
+}, mintInput: Address | {
+    toBase58(): string;
+}, config?: FacilitatorOptions) => Promise<FacilitatorHandler>;
 export {};
 //# sourceMappingURL=facilitator.d.ts.map

package/dist/src/exact/facilitator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"facilitator.d.ts","sourceRoot":"","sources":["../../../src/exact/facilitator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,uBAAuB,EAC5B,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EAExB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAML,KAAK,kBAAkB,EACxB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,SAAS,EAIV,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAYL,KAAK,GAAG,EACR,KAAK,YAAY,EAElB,MAAM,aAAa,CAAC;AAOrB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGrD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAKlC,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,MAAM,GAAG,kBAAkB,CAAC;IACrC,GAAG,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;IACvB,eAAe,EAAE,OAAO,CAAC;IACzB,IAAI,EAAE,SAAS,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,SAAS,CAAC,CAAC,CAAC;IAChD,YAAY,EAAE,uBAAuB,CAAC;IACtC,OAAO,EAAE,kBAAkB,CAAC;IAC5B,MAAM,EAAE,OAAO,MAAM,CAAC;CACvB;AAED,MAAM,MAAM,gBAAgB,CAAC,QAAQ,IAAI,YAAY,GAAG;IAAE,QAAQ,EAAE,QAAQ,CAAA;CAAE,CAAC;AAE/E,MAAM,MAAM,iBAAiB,CAAC,QAAQ,IAAI,CACxC,IAAI,EAAE,gBAAgB,CAAC,QAAQ,CAAC,KAC7B,OAAO,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAEvC,MAAM,WAAW,gBAAgB;IAC/B,WAAW,CAAC,EAAE,iBAAiB,CAAC,kBAAkB,CAAC,CAAC;IACpD,WAAW,CAAC,EAAE,iBAAiB,CAAC,kBAAkB,CAAC,CAAC;CACrD;AAED,eAAO,MAAM,gCAAgC;;MAE3C,CAAC;AAEH,MAAM,MAAM,gCAAgC,GAC1C,OAAO,gCAAgC,CAAC,KAAK,CAAC;AAEhD,eAAO,MAAM,wBAAwB;;;;;;;;;MAOnC,CAAC;AAEH,UAAU,kBAAkB;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IAGtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,EAAE;QACT,wBAAwB,CAAC,EAAE,OAAO,CAAC;QACnC,oBAAoB,CAAC,EAAE,OAAO,CAAC;KAChC,CAAC;IACF,KAAK,CAAC,EAAE,SAAS,gBAAgB,EAAE,CAAC;CACrC;AASD,eAAO,MAAM,yBAAyB;;;;;MAEpC,CAAC;AACH,MAAM,MAAM,yBAAyB,GAAG,OAAO,yBAAyB,CAAC,KAAK,CAAC;AAE/E,eAAO,MAAM,+BAA+B;;;;MAM1C,CAAC;AACH,MAAM,MAAM,+BAA+B,GACzC,OAAO,+BAA+B,CAAC,KAAK,CAAC;AAE/C,wBAAgB,wBAAwB,CAAC,CAAC,EAAE,gBAAgB,UAY3D;AAiDD;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,wBAAwB,GACnC,SAAS,MAAM,GAAG,kBAAkB,EACpC,KAAK,GAAG,CAAC,YAAY,CAAC,EACtB,iBAAiB,OAAO,EACxB,MAAM,SAAS,EACf,SAAS,kBAAkB,KAC1B,OAAO,CAAC,kBAAkB,CA0c5B,CAAC"}
+{"version":3,"file":"facilitator.d.ts","sourceRoot":"","sources":["../../../src/exact/facilitator.ts"],"names":[],"mappings":"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"}