@faremeter/payment-solana 0.20.0 → 0.21.0

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

@@ -1,17 +1,21 @@
 import type { MPPPaymentHandler } from "@faremeter/types/mpp";
-import { Connection, PublicKey } from "@solana/web3.js";
-import type { Wallet } from "../exact/index.js";
+import { type Address, type Rpc, type SolanaRpcApi } from "@solana/kit";
+import { type Wallet } from "../exact/client.js";
 export type CreateMPPSolanaChargeClientArgs = {
     wallet: Wallet;
-    mint: PublicKey;
-    connection?: Connection;
-    tokenProgramId?: PublicKey;
+    mint: Address | {
+        toBase58(): string;
+    };
+    rpc?: Rpc<SolanaRpcApi> | string;
+    tokenProgramId?: Address | {
+        toBase58(): string;
+    };
     broadcast?: boolean;
 };
 export declare function createMPPSolanaChargeClient(args: CreateMPPSolanaChargeClientArgs): MPPPaymentHandler;
 export type CreateMPPSolanaNativeChargeClientArgs = {
     wallet: Wallet;
-    connection?: Connection;
+    rpc?: Rpc<SolanaRpcApi> | string;
     broadcast?: boolean;
 };
 export declare function createMPPSolanaNativeChargeClient(args: CreateMPPSolanaNativeChargeClientArgs): MPPPaymentHandler;

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

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/charge/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EAIlB,MAAM,sBAAsB,CAAC;AAS9B,OAAO,EAEL,UAAU,EACV,SAAS,EAIV,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAqCvC,MAAM,MAAM,+BAA+B,GAAG;IAC5C,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,SAAS,CAAC;IAChB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,cAAc,CAAC,EAAE,SAAS,CAAC;IAC3B,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,+BAA+B,GACpC,iBAAiB,CAoInB;AAED,MAAM,MAAM,qCAAqC,GAAG;IAClD,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,qCAAqC,GAC1C,iBAAiB,CAmGnB"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/charge/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EAIlB,MAAM,sBAAsB,CAAC;AAc9B,OAAO,EAIL,KAAK,OAAO,EAGZ,KAAK,GAAG,EAER,KAAK,YAAY,EAElB,MAAM,aAAa,CAAC;AACrB,OAAO,EAEL,KAAK,MAAM,EAEZ,MAAM,iBAAiB,CAAC;AAmFzB,MAAM,MAAM,+BAA+B,GAAG;IAC5C,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,OAAO,GAAG;QAAE,QAAQ,IAAI,MAAM,CAAA;KAAE,CAAC;IACvC,GAAG,CAAC,EAAE,GAAG,CAAC,YAAY,CAAC,GAAG,MAAM,CAAC;IACjC,cAAc,CAAC,EAAE,OAAO,GAAG;QAAE,QAAQ,IAAI,MAAM,CAAA;KAAE,CAAC;IAClD,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,+BAA+B,GACpC,iBAAiB,CAwHnB;AAED,MAAM,MAAM,qCAAqC,GAAG;IAClD,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,GAAG,CAAC,YAAY,CAAC,GAAG,MAAM,CAAC;IACjC,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,qCAAqC,GAC1C,iBAAiB,CAoFnB"}

package/dist/src/charge/client.js

@@ -1,32 +1,79 @@
 import { decodeBase64URL } from "@faremeter/types/mpp";
 import { isValidationError } from "@faremeter/types";
-import { createTransferCheckedInstruction, getAssociatedTokenAddressSync, getMint, TOKEN_PROGRAM_ID, } from "@solana/spl-token";
-import { ComputeBudgetProgram, Connection, PublicKey, SystemProgram, TransactionMessage, VersionedTransaction, } from "@solana/web3.js";
+import { fetchMint, findAssociatedTokenPda, getTransferCheckedInstruction, TOKEN_PROGRAM_ADDRESS, } from "@solana-program/token";
+import { getSetComputeUnitLimitInstruction, getSetComputeUnitPriceInstruction, } from "@solana-program/compute-budget";
+import { getTransferSolInstruction } from "@solana-program/system";
+import { address, createNoopSigner, getBase64EncodedWireTransaction, } from "@solana/kit";
+import { buildAndSignClientTransaction, } from "../exact/client.js";
 import { mppChargeRequest } from "./common.js";
-async function broadcastAndConfirm(tx, wallet, connection, challenge, md, recentBlockhash) {
+import { toAddress, toRpc } from "../compat.js";
+async function broadcastAndConfirm(tx, wallet, rpc, challenge, md, lifetimeConstraint) {
     if (md?.feePayer) {
         throw new Error("push mode is not allowed with fee sponsorship");
     }
-    const { lastValidBlockHeight } = await connection.getLatestBlockhash({
-        commitment: "confirmed",
-    });
     let signature;
     if (wallet.sendTransaction) {
         signature = await wallet.sendTransaction(tx);
     }
     else {
-        signature = await connection.sendRawTransaction(tx.serialize());
+        const wire = getBase64EncodedWireTransaction(tx);
+        signature = await rpc.sendTransaction(wire, { encoding: "base64" }).send();
+    }
+    // Poll until the signature is confirmed or the blockhash expires.
+    const maxPolls = 60;
+    let confirmed = false;
+    for (let i = 0; i < maxPolls; i++) {
+        const status = await rpc
+            .getSignatureStatuses([signature])
+            .send();
+        if (status.value[0]?.err) {
+            throw new Error(`transaction failed: ${JSON.stringify(status.value[0].err)}`);
+        }
+        if (status.value[0]?.confirmationStatus === "confirmed" ||
+            status.value[0]?.confirmationStatus === "finalized") {
+            confirmed = true;
+            break;
+        }
+        const currentHeight = await rpc.getBlockHeight().send();
+        if (lifetimeConstraint.lastValidBlockHeight > 0n &&
+            currentHeight > lifetimeConstraint.lastValidBlockHeight) {
+            throw new Error("blockhash expired before confirmation");
+        }
+        await new Promise((resolve) => setTimeout(resolve, 1000));
+    }
+    if (!confirmed) {
+        throw new Error("transaction confirmation timed out");
     }
-    await connection.confirmTransaction({ signature, blockhash: recentBlockhash, lastValidBlockHeight }, "confirmed");
     return {
         challenge,
         payload: { type: "signature", signature },
     };
 }
+async function fetchLifetimeConstraint(rpc, supplied) {
+    if (supplied) {
+        return {
+            blockhash: supplied,
+            lastValidBlockHeight: 0n,
+        };
+    }
+    if (!rpc) {
+        throw new Error("no blockhash available");
+    }
+    const { value } = await rpc.getLatestBlockhash().send();
+    return {
+        blockhash: value.blockhash,
+        lastValidBlockHeight: value.lastValidBlockHeight,
+    };
+}
 export function createMPPSolanaChargeClient(args) {
-    const { wallet, mint, connection, broadcast = false } = args;
-    if (broadcast && !connection) {
-        throw new Error("connection is required when broadcast is true");
+    const mint = toAddress(args.mint);
+    const defaultTokenProgram = args.tokenProgramId
+        ? toAddress(args.tokenProgramId)
+        : undefined;
+    const rpc = args.rpc ? toRpc(args.rpc) : undefined;
+    const { wallet, broadcast = false } = args;
+    if (broadcast && !rpc) {
+        throw new Error("rpc is required when broadcast is true");
     }
     return async (challenge) => {
         if (challenge.method !== "solana")
@@ -50,69 +97,60 @@ export function createMPPSolanaChargeClient(args) {
             exec: async () => {
                 const md = request.methodDetails;
                 const amount = BigInt(request.amount);
-                const recipientKey = new PublicKey(request.recipient);
-                const feePayerKey = md?.feePayer === true ? md.feePayerKey : undefined;
-                let recentBlockhash;
-                if (md?.recentBlockhash) {
-                    recentBlockhash = md.recentBlockhash;
-                }
-                else if (connection) {
-                    recentBlockhash = (await connection.getLatestBlockhash()).blockhash;
-                }
-                else {
-                    throw new Error("no blockhash available");
-                }
+                const recipientKey = address(request.recipient);
+                const feePayerKey = md?.feePayer === true && md.feePayerKey
+                    ? address(md.feePayerKey)
+                    : undefined;
+                const lifetimeConstraint = await fetchLifetimeConstraint(rpc, md?.recentBlockhash);
                 let decimals;
                 if (md?.decimals !== undefined) {
                     decimals = md.decimals;
                 }
-                else if (connection) {
-                    const mintInfo = await getMint(connection, mint);
-                    decimals = mintInfo.decimals;
+                else if (rpc) {
+                    const mintInfo = await fetchMint(rpc, mint);
+                    decimals = mintInfo.data.decimals;
                 }
                 else {
                     throw new Error("no decimals available");
                 }
                 const tokenProgramId = md?.tokenProgram
-                    ? new PublicKey(md.tokenProgram)
-                    : (args.tokenProgramId ?? TOKEN_PROGRAM_ID);
-                const sourceAccount = getAssociatedTokenAddressSync(mint, wallet.publicKey, false, tokenProgramId);
-                const receiverAccount = getAssociatedTokenAddressSync(mint, recipientKey, false, tokenProgramId);
+                    ? address(md.tokenProgram)
+                    : (defaultTokenProgram ?? TOKEN_PROGRAM_ADDRESS);
+                const [sourceAccount] = await findAssociatedTokenPda({
+                    mint,
+                    owner: wallet.publicKey,
+                    tokenProgram: tokenProgramId,
+                });
+                const [receiverAccount] = await findAssociatedTokenPda({
+                    mint,
+                    owner: recipientKey,
+                    tokenProgram: tokenProgramId,
+                });
+                const walletSigner = createNoopSigner(wallet.publicKey);
                 const instructions = [
-                    ComputeBudgetProgram.setComputeUnitLimit({ units: 200_000 }),
-                    ComputeBudgetProgram.setComputeUnitPrice({ microLamports: 1 }),
-                    createTransferCheckedInstruction(sourceAccount, mint, receiverAccount, wallet.publicKey, amount, decimals, undefined, tokenProgramId),
+                    getSetComputeUnitLimitInstruction({ units: 200_000 }),
+                    getSetComputeUnitPriceInstruction({ microLamports: 1n }),
+                    getTransferCheckedInstruction({
+                        source: sourceAccount,
+                        mint,
+                        destination: receiverAccount,
+                        authority: walletSigner,
+                        amount,
+                        decimals,
+                    }, { programAddress: tokenProgramId }),
                 ];
-                const payerKey = feePayerKey
-                    ? new PublicKey(feePayerKey)
-                    : wallet.publicKey;
-                let tx;
-                if (wallet.buildTransaction) {
-                    tx = await wallet.buildTransaction(instructions, recentBlockhash);
-                }
-                else {
-                    const message = new TransactionMessage({
-                        instructions,
-                        payerKey,
-                        recentBlockhash,
-                    }).compileToV0Message();
-                    tx = new VersionedTransaction(message);
-                }
-                if (wallet.partiallySignTransaction) {
-                    tx = await wallet.partiallySignTransaction(tx);
-                }
+                const payerKey = feePayerKey ?? wallet.publicKey;
+                const tx = await buildAndSignClientTransaction(wallet, instructions, payerKey, lifetimeConstraint);
                 if (broadcast) {
-                    if (!connection)
-                        throw new Error("connection is required");
-                    return broadcastAndConfirm(tx, wallet, connection, challenge, md, recentBlockhash);
+                    if (!rpc)
+                        throw new Error("rpc is required");
+                    return broadcastAndConfirm(tx, wallet, rpc, challenge, md, lifetimeConstraint);
                 }
-                const wireBytes = tx.serialize();
-                const base64Transaction = btoa(String.fromCharCode.apply(null, [...wireBytes]));
                 return {
                     challenge,
                     payload: {
                         type: "transaction",
-                        transaction: base64Transaction,
+                        transaction: getBase64EncodedWireTransaction(tx),
                     },
                 };
             },
@@ -120,9 +158,10 @@ export function createMPPSolanaChargeClient(args) {
     };
 }
 export function createMPPSolanaNativeChargeClient(args) {
-    const { wallet, connection, broadcast = false } = args;
-    if (broadcast && !connection) {
-        throw new Error("connection is required when broadcast is true");
+    const rpc = args.rpc ? toRpc(args.rpc) : undefined;
+    const { wallet, broadcast = false } = args;
+    if (broadcast && !rpc) {
+        throw new Error("rpc is required when broadcast is true");
     }
     return async (challenge) => {
         if (challenge.method !== "solana")
@@ -146,57 +185,33 @@ export function createMPPSolanaNativeChargeClient(args) {
             exec: async () => {
                 const md = request.methodDetails;
                 const amount = BigInt(request.amount);
-                const recipientKey = new PublicKey(request.recipient);
-                const feePayerKey = md?.feePayer === true ? md.feePayerKey : undefined;
-                let recentBlockhash;
-                if (md?.recentBlockhash) {
-                    recentBlockhash = md.recentBlockhash;
-                }
-                else if (connection) {
-                    recentBlockhash = (await connection.getLatestBlockhash()).blockhash;
-                }
-                else {
-                    throw new Error("no blockhash available");
-                }
+                const recipientKey = address(request.recipient);
+                const feePayerKey = md?.feePayer === true && md.feePayerKey
+                    ? address(md.feePayerKey)
+                    : undefined;
+                const lifetimeConstraint = await fetchLifetimeConstraint(rpc, md?.recentBlockhash);
+                const walletSigner = createNoopSigner(wallet.publicKey);
                 const instructions = [
-                    ComputeBudgetProgram.setComputeUnitLimit({ units: 200_000 }),
-                    ComputeBudgetProgram.setComputeUnitPrice({ microLamports: 1 }),
-                    SystemProgram.transfer({
-                        fromPubkey: wallet.publicKey,
-                        toPubkey: recipientKey,
-                        lamports: amount,
+                    getSetComputeUnitLimitInstruction({ units: 200_000 }),
+                    getSetComputeUnitPriceInstruction({ microLamports: 1n }),
+                    getTransferSolInstruction({
+                        source: walletSigner,
+                        destination: recipientKey,
+                        amount,
                     }),
                 ];
-                const payerKey = feePayerKey
-                    ? new PublicKey(feePayerKey)
-                    : wallet.publicKey;
-                let tx;
-                if (wallet.buildTransaction) {
-                    tx = await wallet.buildTransaction(instructions, recentBlockhash);
-                }
-                else {
-                    const message = new TransactionMessage({
-                        instructions,
-                        payerKey,
-                        recentBlockhash,
-                    }).compileToV0Message();
-                    tx = new VersionedTransaction(message);
-                }
-                if (wallet.partiallySignTransaction) {
-                    tx = await wallet.partiallySignTransaction(tx);
-                }
+                const payerKey = feePayerKey ?? wallet.publicKey;
+                const tx = await buildAndSignClientTransaction(wallet, instructions, payerKey, lifetimeConstraint);
                 if (broadcast) {
-                    if (!connection)
-                        throw new Error("connection is required");
-                    return broadcastAndConfirm(tx, wallet, connection, challenge, md, recentBlockhash);
+                    if (!rpc)
+                        throw new Error("rpc is required");
+                    return broadcastAndConfirm(tx, wallet, rpc, challenge, md, lifetimeConstraint);
                 }
-                const wireBytes = tx.serialize();
-                const base64Transaction = btoa(String.fromCharCode.apply(null, [...wireBytes]));
                 return {
                     challenge,
                     payload: {
                         type: "transaction",
-                        transaction: base64Transaction,
+                        transaction: getBase64EncodedWireTransaction(tx),
                     },
                 };
             },

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

@@ -1,4 +1,4 @@
-export declare const solanaChargeMethodDetails: import("arktype/internal/methods/object.ts").ObjectType<{
+export declare const solanaChargeMethodDetails: import("arktype/internal/variants/object.ts").ObjectType<{
     network?: string;
     decimals?: number;
     tokenProgram?: string;
@@ -12,7 +12,7 @@ export declare const solanaChargeMethodDetails: import("arktype/internal/methods
     }[];
 }, {}>;
 export type solanaChargeMethodDetails = typeof solanaChargeMethodDetails.infer;
-export declare const mppChargeRequest: import("arktype/internal/methods/object.ts").ObjectType<{
+export declare const mppChargeRequest: import("arktype/internal/variants/object.ts").ObjectType<{
     amount: string;
     currency: string;
     recipient: string;
@@ -33,7 +33,7 @@ export declare const mppChargeRequest: import("arktype/internal/methods/object.t
     };
 }, {}>;
 export type mppChargeRequest = typeof mppChargeRequest.infer;
-export declare const chargeCredentialPayload: import("arktype/internal/methods/object.ts").ObjectType<{
+export declare const chargeCredentialPayload: import("arktype/internal/variants/object.ts").ObjectType<{
     type: "transaction";
     transaction: string;
 } | {

package/dist/src/charge/server.d.ts

@@ -1,13 +1,19 @@
 import type { MPPMethodHandler } from "@faremeter/types/mpp";
 import { type SolanaCAIP2Network } from "@faremeter/info/solana";
-import { type Rpc, type SolanaRpcApi } from "@solana/kit";
-import { Keypair, PublicKey } from "@solana/web3.js";
+import { type Address, type KeyPairSigner, type Rpc, type SolanaRpcApi } from "@solana/kit";
 import type { ReplayStore } from "./replay.js";
 export type CreateMPPSolanaChargeHandlerArgs = {
     network: string | SolanaCAIP2Network;
-    rpc: Rpc<SolanaRpcApi>;
-    feePayerKeypair?: Keypair;
-    mint: PublicKey;
+    rpc: Rpc<SolanaRpcApi> | string;
+    feePayerSigner?: KeyPairSigner | {
+        secretKey: Uint8Array;
+        publicKey: {
+            toBase58(): string;
+        };
+    };
+    mint: Address | {
+        toBase58(): string;
+    };
     replayStore: ReplayStore;
     realm: string;
     secretKey: Uint8Array;
@@ -18,8 +24,13 @@ export type CreateMPPSolanaChargeHandlerArgs = {
 export declare function createMPPSolanaChargeHandler(args: CreateMPPSolanaChargeHandlerArgs): Promise<MPPMethodHandler>;
 export type CreateMPPSolanaNativeChargeHandlerArgs = {
     network: string | SolanaCAIP2Network;
-    rpc: Rpc<SolanaRpcApi>;
-    feePayerKeypair?: Keypair;
+    rpc: Rpc<SolanaRpcApi> | string;
+    feePayerSigner?: KeyPairSigner | {
+        secretKey: Uint8Array;
+        publicKey: {
+            toBase58(): string;
+        };
+    };
     replayStore: ReplayStore;
     realm: string;
     secretKey: Uint8Array;

package/dist/src/charge/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/charge/server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAKjB,MAAM,sBAAsB,CAAC;AAQ9B,OAAO,EAGL,KAAK,kBAAkB,EACxB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAKL,KAAK,GAAG,EAER,KAAK,YAAY,EAElB,MAAM,aAAa,CAAC;AAMrB,OAAO,EAAE,OAAO,EAAoB,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAIvE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAiD5C,MAAM,MAAM,gCAAgC,GAAG;IAC7C,OAAO,EAAE,MAAM,GAAG,kBAAkB,CAAC;IACrC,GAAG,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;IACvB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,IAAI,EAAE,SAAS,CAAC;IAChB,WAAW,EAAE,WAAW,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,UAAU,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAsGF,wBAAsB,4BAA4B,CAChD,IAAI,EAAE,gCAAgC,GACrC,OAAO,CAAC,gBAAgB,CAAC,CAoN3B;AAID,MAAM,MAAM,sCAAsC,GAAG;IACnD,OAAO,EAAE,MAAM,GAAG,kBAAkB,CAAC;IACrC,GAAG,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;IACvB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,WAAW,EAAE,WAAW,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,UAAU,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,wBAAsB,kCAAkC,CACtD,IAAI,EAAE,sCAAsC,GAC3C,OAAO,CAAC,gBAAgB,CAAC,CA6M3B"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/charge/server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAKjB,MAAM,sBAAsB,CAAC;AAQ9B,OAAO,EAGL,KAAK,kBAAkB,EACxB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAIL,KAAK,OAAO,EACZ,KAAK,aAAa,EAClB,KAAK,GAAG,EAER,KAAK,YAAY,EAElB,MAAM,aAAa,CAAC;AAWrB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAkD5C,MAAM,MAAM,gCAAgC,GAAG;IAC7C,OAAO,EAAE,MAAM,GAAG,kBAAkB,CAAC;IACrC,GAAG,EAAE,GAAG,CAAC,YAAY,CAAC,GAAG,MAAM,CAAC;IAChC,cAAc,CAAC,EACX,aAAa,GACb;QAAE,SAAS,EAAE,UAAU,CAAC;QAAC,SAAS,EAAE;YAAE,QAAQ,IAAI,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC;IACjE,IAAI,EAAE,OAAO,GAAG;QAAE,QAAQ,IAAI,MAAM,CAAA;KAAE,CAAC;IACvC,WAAW,EAAE,WAAW,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,UAAU,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAsGF,wBAAsB,4BAA4B,CAChD,IAAI,EAAE,gCAAgC,GACrC,OAAO,CAAC,gBAAgB,CAAC,CA+M3B;AAID,MAAM,MAAM,sCAAsC,GAAG;IACnD,OAAO,EAAE,MAAM,GAAG,kBAAkB,CAAC;IACrC,GAAG,EAAE,GAAG,CAAC,YAAY,CAAC,GAAG,MAAM,CAAC;IAChC,cAAc,CAAC,EACX,aAAa,GACb;QAAE,SAAS,EAAE,UAAU,CAAC;QAAC,SAAS,EAAE;YAAE,QAAQ,IAAI,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC;IACjE,WAAW,EAAE,WAAW,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,UAAU,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,wBAAsB,kCAAkC,CACtD,IAAI,EAAE,sCAAsC,GAC3C,OAAO,CAAC,gBAAgB,CAAC,CAwM3B"}

package/dist/src/charge/server.js

@@ -2,12 +2,13 @@ import { encodeBase64URL, canonicalizeSortedJSON, decodeBase64URL, } from "@fare
 import { isValidationError } from "@faremeter/types";
 import { lookupX402Network, caip2ToCluster, } from "@faremeter/info/solana";
 import { fetchMint } from "@solana-program/token";
-import { address, decompileTransactionMessage, getBase64Encoder, getCompiledTransactionMessageDecoder, } from "@solana/kit";
+import { decompileTransactionMessage, getBase64Encoder, getCompiledTransactionMessageDecoder, } from "@solana/kit";
 import { getBase64EncodedWireTransaction, getTransactionDecoder, partiallySignTransaction, } from "@solana/transactions";
-import { Keypair, LAMPORTS_PER_SOL, PublicKey } from "@solana/web3.js";
+const LAMPORTS_PER_SOL = 1_000_000_000;
 import { mppChargeRequest, chargeCredentialPayload } from "./common.js";
 import { verifyChargeTransaction, verifyNativeChargeTransaction, } from "./verify.js";
 import { logger } from "./logger.js";
+import { toAddress, toKeyPairSigner, toRpc } from "../compat.js";
 async function generateChallengeID(secret, params) {
     const slots = [
         params.realm,
@@ -106,26 +107,25 @@ const decodeWireTransaction = (base64Transaction) => {
     };
 };
 export async function createMPPSolanaChargeHandler(args) {
-    const { network, rpc, feePayerKeypair, mint, replayStore, realm, secretKey, maxRetries = 30, retryDelayMs = 1000, maxPriorityFee = 100_000, } = args;
+    const { network, replayStore, realm, secretKey, maxRetries = 30, retryDelayMs = 1000, maxPriorityFee = 100_000, } = args;
+    const rpc = toRpc(args.rpc);
+    const mint = toAddress(args.mint);
+    const feePayerSigner = args.feePayerSigner
+        ? await toKeyPairSigner(args.feePayerSigner)
+        : undefined;
     const solanaNetwork = lookupX402Network(network);
-    const mintAddress = mint.toBase58();
-    const hasFeePayerKeypair = feePayerKeypair !== undefined;
-    const feePayerAddress = feePayerKeypair?.publicKey.toBase58();
-    const mintInfo = await fetchMint(rpc, address(mintAddress));
+    const mintAddress = mint;
+    const hasFeePayer = feePayerSigner !== undefined;
+    const feePayerAddress = feePayerSigner?.address;
+    const mintInfo = await fetchMint(rpc, mint);
     const tokenProgram = mintInfo.programAddress;
-    const feePayerSigner = hasFeePayerKeypair
-        ? await (async () => {
-            const { createKeyPairSignerFromBytes } = await import("@solana/kit");
-            return createKeyPairSignerFromBytes(feePayerKeypair.secretKey);
-        })()
-        : null;
     const getChallenge = async (intent, pricing, _resourceURL, opts) => {
         const methodDetails = {
             network: caip2ToCluster(solanaNetwork.caip2) ?? solanaNetwork.caip2,
             decimals: mintInfo.data.decimals,
             tokenProgram: tokenProgram,
         };
-        if (hasFeePayerKeypair && feePayerAddress) {
+        if (hasFeePayer && feePayerAddress) {
             const latestBlockhash = await rpc.getLatestBlockhash().send();
             methodDetails.feePayer = true;
             methodDetails.feePayerKey = feePayerAddress;
@@ -253,22 +253,20 @@ export async function createMPPSolanaChargeHandler(args) {
 }
 const SOL_DECIMALS = Math.log10(LAMPORTS_PER_SOL);
 export async function createMPPSolanaNativeChargeHandler(args) {
-    const { network, rpc, feePayerKeypair, replayStore, realm, secretKey, maxRetries = 30, retryDelayMs = 1000, maxPriorityFee = 100_000, } = args;
+    const { network, replayStore, realm, secretKey, maxRetries = 30, retryDelayMs = 1000, maxPriorityFee = 100_000, } = args;
+    const rpc = toRpc(args.rpc);
+    const feePayerSigner = args.feePayerSigner
+        ? await toKeyPairSigner(args.feePayerSigner)
+        : undefined;
     const solanaNetwork = lookupX402Network(network);
-    const hasFeePayerKeypair = feePayerKeypair !== undefined;
-    const feePayerAddress = feePayerKeypair?.publicKey.toBase58();
-    const feePayerSigner = hasFeePayerKeypair
-        ? await (async () => {
-            const { createKeyPairSignerFromBytes } = await import("@solana/kit");
-            return createKeyPairSignerFromBytes(feePayerKeypair.secretKey);
-        })()
-        : null;
+    const hasFeePayer = feePayerSigner !== undefined;
+    const feePayerAddress = feePayerSigner?.address;
     const getChallenge = async (intent, pricing, _resourceURL, opts) => {
         const methodDetails = {
             network: caip2ToCluster(solanaNetwork.caip2) ?? solanaNetwork.caip2,
             decimals: SOL_DECIMALS,
         };
-        if (hasFeePayerKeypair && feePayerAddress) {
+        if (hasFeePayer && feePayerAddress) {
             const latestBlockhash = await rpc.getLatestBlockhash().send();
             methodDetails.feePayer = true;
             methodDetails.feePayerKey = feePayerAddress;

package/dist/src/compat.d.ts

@@ -0,0 +1,38 @@
+/**
+ * Backwards-compatibility helpers for callers still using
+ * @solana/web3.js v1 types (PublicKey, Keypair).
+ *
+ * These use duck-typing so payment-solana never imports v1 at
+ * runtime. The v1 package stays out of our dependency tree while
+ * callers who still have it can pass v1 objects directly.
+ *
+ * Every helper logs a one-shot deprecation warning the first time
+ * the v1 code-path is taken.
+ */
+import { type Address, type KeyPairSigner, type Rpc, type SolanaRpcApi } from "@solana/kit";
+/** Duck-type for @solana/web3.js v1 PublicKey. */
+interface PublicKeyLike {
+    toBase58(): string;
+}
+/** Duck-type for @solana/web3.js v1 Keypair. */
+interface KeypairLike {
+    secretKey: Uint8Array;
+    publicKey: PublicKeyLike;
+}
+/**
+ * Accepts an {@link Address} string or a v1 `PublicKey` and returns
+ * a kit `Address`.
+ */
+export declare function toAddress(input: Address | PublicKeyLike): Address;
+/**
+ * Accepts a kit `KeyPairSigner`, a 64-byte secret key, or a v1
+ * `Keypair` and returns a `KeyPairSigner`.
+ */
+export declare function toKeyPairSigner(input: KeyPairSigner | Uint8Array | KeypairLike): Promise<KeyPairSigner>;
+/**
+ * Accepts an `Rpc<SolanaRpcApi>` or a URL string and returns
+ * an `Rpc<SolanaRpcApi>`.
+ */
+export declare function toRpc(input: Rpc<SolanaRpcApi> | string): Rpc<SolanaRpcApi>;
+export {};
+//# sourceMappingURL=compat.d.ts.map

package/dist/src/compat.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"compat.d.ts","sourceRoot":"","sources":["../../src/compat.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,EAIL,KAAK,OAAO,EACZ,KAAK,aAAa,EAClB,KAAK,GAAG,EACR,KAAK,YAAY,EAClB,MAAM,aAAa,CAAC;AAQrB,kDAAkD;AAClD,UAAU,aAAa;IACrB,QAAQ,IAAI,MAAM,CAAC;CACpB;AAED,gDAAgD;AAChD,UAAU,WAAW;IACnB,SAAS,EAAE,UAAU,CAAC;IACtB,SAAS,EAAE,aAAa,CAAC;CAC1B;AAmBD;;;GAGG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,OAAO,GAAG,aAAa,GAAG,OAAO,CAiBjE;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,KAAK,EAAE,aAAa,GAAG,UAAU,GAAG,WAAW,GAC9C,OAAO,CAAC,aAAa,CAAC,CA+BxB;AAED;;;GAGG;AACH,wBAAgB,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,YAAY,CAAC,GAAG,MAAM,GAAG,GAAG,CAAC,YAAY,CAAC,CAK1E"}

package/dist/src/compat.js

@@ -0,0 +1,86 @@
+/**
+ * Backwards-compatibility helpers for callers still using
+ * @solana/web3.js v1 types (PublicKey, Keypair).
+ *
+ * These use duck-typing so payment-solana never imports v1 at
+ * runtime. The v1 package stays out of our dependency tree while
+ * callers who still have it can pass v1 objects directly.
+ *
+ * Every helper logs a one-shot deprecation warning the first time
+ * the v1 code-path is taken.
+ */
+import { address, createKeyPairSignerFromBytes, createSolanaRpc, } from "@solana/kit";
+import { getLogger } from "@faremeter/logs";
+const logger = await getLogger(["faremeter", "payment-solana", "compat"]);
+let warnedPublicKey = false;
+let warnedKeypair = false;
+function isPublicKeyLike(v) {
+    return (typeof v === "object" &&
+        v !== null &&
+        typeof v.toBase58 === "function");
+}
+function isKeypairLike(v) {
+    return (typeof v === "object" &&
+        v !== null &&
+        v.secretKey instanceof Uint8Array &&
+        isPublicKeyLike(v.publicKey));
+}
+/**
+ * Accepts an {@link Address} string or a v1 `PublicKey` and returns
+ * a kit `Address`.
+ */
+export function toAddress(input) {
+    if (typeof input === "string") {
+        return address(input);
+    }
+    if (isPublicKeyLike(input)) {
+        if (!warnedPublicKey) {
+            logger.warning("Passing a @solana/web3.js PublicKey is deprecated — " +
+                "use a plain address string or @solana/kit address() " +
+                "instead. v1 compatibility will be removed in a " +
+                "future release.");
+            warnedPublicKey = true;
+        }
+        return address(input.toBase58());
+    }
+    throw new TypeError("expected an Address string or PublicKey");
+}
+/**
+ * Accepts a kit `KeyPairSigner`, a 64-byte secret key, or a v1
+ * `Keypair` and returns a `KeyPairSigner`.
+ */
+export async function toKeyPairSigner(input) {
+    // Already a KeyPairSigner (has signMessages method)
+    if (typeof input === "object" &&
+        input !== null &&
+        "address" in input &&
+        "signMessages" in input) {
+        return input;
+    }
+    // Raw secret key bytes
+    if (input instanceof Uint8Array) {
+        return createKeyPairSignerFromBytes(input);
+    }
+    // v1 Keypair duck-type
+    if (isKeypairLike(input)) {
+        if (!warnedKeypair) {
+            logger.warning("Passing a @solana/web3.js Keypair is deprecated — " +
+                "use a Uint8Array secret key or @solana/kit " +
+                "KeyPairSigner instead. v1 compatibility will be " +
+                "removed in a future release.");
+            warnedKeypair = true;
+        }
+        return createKeyPairSignerFromBytes(input.secretKey);
+    }
+    throw new TypeError("expected a Uint8Array, KeyPairSigner, or Keypair");
+}
+/**
+ * Accepts an `Rpc<SolanaRpcApi>` or a URL string and returns
+ * an `Rpc<SolanaRpcApi>`.
+ */
+export function toRpc(input) {
+    if (typeof input === "string") {
+        return createSolanaRpc(input);
+    }
+    return input;
+}

package/dist/src/compat.test.d.ts

@@ -0,0 +1,3 @@
+#!/usr/bin/env pnpm tsx
+export {};
+//# sourceMappingURL=compat.test.d.ts.map

package/dist/src/compat.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"compat.test.d.ts","sourceRoot":"","sources":["../../src/compat.test.ts"],"names":[],"mappings":""}