npm - @fogo/sessions-sdk - Versions diffs - 0.0.20 → 0.0.22 - Mend

@fogo/sessions-sdk 0.0.20 → 0.0.22

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

package/cjs/connection.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import type { Transaction, Instruction, TransactionWithLifetime } from "@solana/kit";
+import type { Transaction, Instruction, TransactionWithLifetime, Rpc, GetLatestBlockhashApi } from "@solana/kit";
 import type { TransactionError } from "@solana/web3.js";
 import { Keypair, Connection as Web3Connection, TransactionInstruction, VersionedTransaction, PublicKey } from "@solana/web3.js";
 export declare enum Network {
@@ -33,15 +33,18 @@ export declare const createSessionConnection: (options: {
     sendToPaymaster: (transaction: Transaction) => Promise<TransactionResult>;
     sponsor: PublicKey;
 })) => {
-    rpc: import("@solana/kit").Rpc<import("@solana/kit").RequestAirdropApi & import("@solana/kit").GetAccountInfoApi & import("@solana/kit").GetBalanceApi & import("@solana/kit").GetBlockApi & import("@solana/kit").GetBlockCommitmentApi & import("@solana/kit").GetBlockHeightApi & import("@solana/kit").GetBlockProductionApi & import("@solana/kit").GetBlocksApi & import("@solana/kit").GetBlocksWithLimitApi & import("@solana/kit").GetBlockTimeApi & import("@solana/kit").GetClusterNodesApi & import("@solana/kit").GetEpochInfoApi & import("@solana/kit").GetEpochScheduleApi & import("@solana/kit").GetFeeForMessageApi & import("@solana/kit").GetFirstAvailableBlockApi & import("@solana/kit").GetGenesisHashApi & import("@solana/kit").GetHealthApi & import("@solana/kit").GetHighestSnapshotSlotApi & import("@solana/kit").GetIdentityApi & import("@solana/kit").GetInflationGovernorApi & import("@solana/kit").GetInflationRateApi & import("@solana/kit").GetInflationRewardApi & import("@solana/kit").GetLargestAccountsApi & import("@solana/kit").GetLatestBlockhashApi & import("@solana/kit").GetLeaderScheduleApi & import("@solana/kit").GetMaxRetransmitSlotApi & import("@solana/kit").GetMaxShredInsertSlotApi & import("@solana/kit").GetMinimumBalanceForRentExemptionApi & import("@solana/kit").GetMultipleAccountsApi & import("@solana/kit").GetProgramAccountsApi & import("@solana/kit").GetRecentPerformanceSamplesApi & import("@solana/kit").GetRecentPrioritizationFeesApi & import("@solana/kit").GetSignaturesForAddressApi & import("@solana/kit").GetSignatureStatusesApi & import("@solana/kit").GetSlotApi & import("@solana/kit").GetSlotLeaderApi & import("@solana/kit").GetSlotLeadersApi & import("@solana/kit").GetStakeMinimumDelegationApi & import("@solana/kit").GetSupplyApi & import("@solana/kit").GetTokenAccountBalanceApi & import("@solana/kit").GetTokenAccountsByDelegateApi & import("@solana/kit").GetTokenAccountsByOwnerApi & import("@solana/kit").GetTokenLargestAccountsApi & import("@solana/kit").GetTokenSupplyApi & import("@solana/kit").GetTransactionApi & import("@solana/kit").GetTransactionCountApi & import("@solana/kit").GetVersionApi & import("@solana/kit").GetVoteAccountsApi & import("@solana/kit").IsBlockhashValidApi & import("@solana/kit").MinimumLedgerSlotApi & import("@solana/kit").SendTransactionApi & import("@solana/kit").SimulateTransactionApi>;
+    rpc: Rpc<import("@solana/kit").RequestAirdropApi & import("@solana/kit").GetAccountInfoApi & import("@solana/kit").GetBalanceApi & import("@solana/kit").GetBlockApi & import("@solana/kit").GetBlockCommitmentApi & import("@solana/kit").GetBlockHeightApi & import("@solana/kit").GetBlockProductionApi & import("@solana/kit").GetBlocksApi & import("@solana/kit").GetBlocksWithLimitApi & import("@solana/kit").GetBlockTimeApi & import("@solana/kit").GetClusterNodesApi & import("@solana/kit").GetEpochInfoApi & import("@solana/kit").GetEpochScheduleApi & import("@solana/kit").GetFeeForMessageApi & import("@solana/kit").GetFirstAvailableBlockApi & import("@solana/kit").GetGenesisHashApi & import("@solana/kit").GetHealthApi & import("@solana/kit").GetHighestSnapshotSlotApi & import("@solana/kit").GetIdentityApi & import("@solana/kit").GetInflationGovernorApi & import("@solana/kit").GetInflationRateApi & import("@solana/kit").GetInflationRewardApi & import("@solana/kit").GetLargestAccountsApi & GetLatestBlockhashApi & import("@solana/kit").GetLeaderScheduleApi & import("@solana/kit").GetMaxRetransmitSlotApi & import("@solana/kit").GetMaxShredInsertSlotApi & import("@solana/kit").GetMinimumBalanceForRentExemptionApi & import("@solana/kit").GetMultipleAccountsApi & import("@solana/kit").GetProgramAccountsApi & import("@solana/kit").GetRecentPerformanceSamplesApi & import("@solana/kit").GetRecentPrioritizationFeesApi & import("@solana/kit").GetSignaturesForAddressApi & import("@solana/kit").GetSignatureStatusesApi & import("@solana/kit").GetSlotApi & import("@solana/kit").GetSlotLeaderApi & import("@solana/kit").GetSlotLeadersApi & import("@solana/kit").GetStakeMinimumDelegationApi & import("@solana/kit").GetSupplyApi & import("@solana/kit").GetTokenAccountBalanceApi & import("@solana/kit").GetTokenAccountsByDelegateApi & import("@solana/kit").GetTokenAccountsByOwnerApi & import("@solana/kit").GetTokenLargestAccountsApi & import("@solana/kit").GetTokenSupplyApi & import("@solana/kit").GetTransactionApi & import("@solana/kit").GetTransactionCountApi & import("@solana/kit").GetVersionApi & import("@solana/kit").GetVoteAccountsApi & import("@solana/kit").IsBlockhashValidApi & import("@solana/kit").MinimumLedgerSlotApi & import("@solana/kit").SendTransactionApi & import("@solana/kit").SimulateTransactionApi>;
     connection: Web3Connection;
     network: Network;
     getSolanaConnection: () => Promise<Web3Connection>;
-    sendToPaymaster: (domain: string, sponsor: PublicKey, sessionKey: CryptoKeyPair | undefined, instructions: (TransactionInstruction | Instruction)[] | VersionedTransaction | (Transaction & TransactionWithLifetime), extraConfig?: {
-        addressLookupTable?: string | undefined;
-        extraSigners?: (CryptoKeyPair | Keypair)[] | undefined;
-    }) => Promise<TransactionResult>;
+    sendToPaymaster: (domain: string, sessionKey: CryptoKeyPair | undefined, instructions: TransactionOrInstructions, extraConfig?: SendTransactionOptions) => Promise<TransactionResult>;
     getSponsor: (domain: string) => Promise<PublicKey>;
 };
+export type TransactionOrInstructions = (TransactionInstruction | Instruction)[] | VersionedTransaction | (Transaction & TransactionWithLifetime);
+export type SendTransactionOptions = {
+    variation?: string | undefined;
+    addressLookupTable?: string | undefined;
+    extraSigners?: (CryptoKeyPair | Keypair)[] | undefined;
+};
 export type Connection = ReturnType<typeof createSessionConnection>;
 export {};

package/cjs/connection.js CHANGED Viewed

@@ -39,17 +39,14 @@ const createSessionConnection = (options) => {
     const rpc = (0, kit_1.createSolanaRpc)(rpcUrl);
     const connection = new web3_js_1.Connection(rpcUrl, "confirmed");
     const addressLookupTableCache = new Map();
+    const sponsorCache = new Map();
     return {
         rpc,
         connection,
         network: options.network,
         getSolanaConnection: createSolanaConnectionGetter(options.network),
-        sendToPaymaster: async (domain, sponsor, sessionKey, instructions, extraConfig) => {
-            const { value: latestBlockhash } = await rpc.getLatestBlockhash().send();
-            const transaction = await buildTransaction(connection, latestBlockhash, sessionKey, sponsor, instructions, addressLookupTableCache, extraConfig);
-            return sendToPaymaster(options, domain, transaction);
-        },
-        getSponsor: (domain) => getSponsor(options, domain),
+        sendToPaymaster: async (domain, sessionKey, instructions, extraConfig) => sendToPaymaster({ ...options, rpc, connection, addressLookupTableCache, sponsorCache }, domain, sessionKey, instructions, extraConfig),
+        getSponsor: (domain) => getSponsor(options, sponsorCache, domain),
     };
 };
 exports.createSessionConnection = createSessionConnection;
@@ -75,10 +72,17 @@ const NETWORK_TO_QUERY_PARAM = {
     [Network.Mainnet]: "mainnet",
     [Network.Testnet]: "testnet",
 };
-const sendToPaymaster = async (options, domain, transaction) => {
-    if (options.sendToPaymaster === undefined) {
-        const url = new URL("/api/sponsor_and_send", options.paymaster ?? DEFAULT_PAYMASTER[options.network]);
+const sendToPaymaster = async (connection, domain, sessionKey, instructions, extraConfig) => {
+    const signerKeys = await getSignerKeys(sessionKey, extraConfig?.extraSigners);
+    const transaction = Array.isArray(instructions)
+        ? await buildTransaction(connection, domain, signerKeys, instructions, extraConfig)
+        : await addSignaturesToExistingTransaction(instructions, signerKeys);
+    if (connection.sendToPaymaster === undefined) {
+        const url = new URL("/api/sponsor_and_send", connection.paymaster ?? DEFAULT_PAYMASTER[connection.network]);
         url.searchParams.set("domain", domain);
+        if (extraConfig?.variation !== undefined) {
+            url.searchParams.set("variation", extraConfig.variation);
+        }
         const response = await fetch(url, {
             method: "POST",
             headers: {
@@ -96,33 +100,31 @@ const sendToPaymaster = async (options, domain, transaction) => {
         }
     }
     else {
-        return options.sendToPaymaster(transaction);
+        return connection.sendToPaymaster(transaction);
     }
 };
-const buildTransaction = async (connection, latestBlockhash, sessionKey, sponsor, instructions, addressLookupTableCache, extraConfig) => {
-    const [signerKeys, addressLookupTable] = await Promise.all([
-        getSignerKeys(sessionKey, extraConfig?.extraSigners),
+const buildTransaction = async (connection, domain, signerKeys, instructions, extraConfig) => {
+    const [{ value: latestBlockhash }, sponsor, addressLookupTable, signers] = await Promise.all([
+        connection.rpc.getLatestBlockhash().send(),
+        connection.sponsor === undefined
+            ? getSponsor(connection, connection.sponsorCache, domain)
+            : Promise.resolve(connection.sponsor),
         extraConfig?.addressLookupTable === undefined
             ? Promise.resolve(undefined)
-            : getAddressLookupTable(connection, addressLookupTableCache, extraConfig.addressLookupTable),
+            : getAddressLookupTable(connection.connection, connection.addressLookupTableCache, extraConfig.addressLookupTable),
+        Promise.all(signerKeys.map((signer) => (0, kit_1.createSignerFromKeyPair)(signer))),
     ]);
-    if (Array.isArray(instructions)) {
-        const signers = await Promise.all(signerKeys.map((signer) => (0, kit_1.createSignerFromKeyPair)(signer)));
-        return (0, kit_1.partiallySignTransactionMessageWithSigners)((0, kit_1.pipe)((0, kit_1.createTransactionMessage)({ version: 0 }), (tx) => (0, kit_1.setTransactionMessageFeePayer)((0, compat_1.fromLegacyPublicKey)(sponsor), tx), (tx) => (0, kit_1.setTransactionMessageLifetimeUsingBlockhash)(latestBlockhash, tx), (tx) => (0, kit_1.appendTransactionMessageInstructions)(instructions.map((instruction) => instruction instanceof web3_js_1.TransactionInstruction
-            ? (0, compat_1.fromLegacyTransactionInstruction)(instruction)
-            : instruction), tx), (tx) => addressLookupTable === undefined
-            ? tx
-            : (0, kit_1.compressTransactionMessageUsingAddressLookupTables)(tx, {
-                [(0, compat_1.fromLegacyPublicKey)(addressLookupTable.key)]: addressLookupTable.state.addresses.map((address) => (0, compat_1.fromLegacyPublicKey)(address)),
-            }), (tx) => (0, kit_1.addSignersToTransactionMessage)(signers, tx)));
-    }
-    else {
-        const tx = instructions instanceof web3_js_1.VersionedTransaction
-            ? (0, compat_1.fromVersionedTransaction)(instructions) // VersionedTransaction has a lifetime so it's fine to cast it so we can call partiallySignTransaction
-            : instructions;
-        return (0, kit_1.partiallySignTransaction)(signerKeys, tx);
-    }
+    return (0, kit_1.partiallySignTransactionMessageWithSigners)((0, kit_1.pipe)((0, kit_1.createTransactionMessage)({ version: 0 }), (tx) => (0, kit_1.setTransactionMessageFeePayer)((0, compat_1.fromLegacyPublicKey)(sponsor), tx), (tx) => (0, kit_1.setTransactionMessageLifetimeUsingBlockhash)(latestBlockhash, tx), (tx) => (0, kit_1.appendTransactionMessageInstructions)(instructions.map((instruction) => instruction instanceof web3_js_1.TransactionInstruction
+        ? (0, compat_1.fromLegacyTransactionInstruction)(instruction)
+        : instruction), tx), (tx) => addressLookupTable === undefined
+        ? tx
+        : (0, kit_1.compressTransactionMessageUsingAddressLookupTables)(tx, {
+            [(0, compat_1.fromLegacyPublicKey)(addressLookupTable.key)]: addressLookupTable.state.addresses.map((address) => (0, compat_1.fromLegacyPublicKey)(address)),
+        }), (tx) => (0, kit_1.addSignersToTransactionMessage)(signers, tx)));
 };
+const addSignaturesToExistingTransaction = (transaction, signerKeys) => (0, kit_1.partiallySignTransaction)(signerKeys, transaction instanceof web3_js_1.VersionedTransaction
+    ? (0, compat_1.fromVersionedTransaction)(transaction) // VersionedTransaction has a lifetime so it's fine to cast it so we can call partiallySignTransaction
+    : transaction);
 const getSignerKeys = async (sessionKey, extraSigners) => {
     const extraSignerKeys = extraSigners === undefined
         ? []
@@ -151,20 +153,24 @@ const sponsorAndSendResponseSchema = zod_1.z
         ? TransactionResult.Success(data.signature)
         : TransactionResult.Failed(data.signature, data.error);
 });
-const getSponsor = async (options, domain) => {
-    if (options.sponsor === undefined) {
+const getSponsor = async (options, sponsorCache, domain) => {
+    const value = sponsorCache.get(domain);
+    if (value === undefined) {
         const url = new URL("/api/sponsor_pubkey", options.paymaster ?? DEFAULT_PAYMASTER[options.network]);
         url.searchParams.set("domain", domain);
+        url.searchParams.set("index", "autoassign");
         const response = await fetch(url);
         if (response.status === 200) {
-            return new web3_js_1.PublicKey(zod_1.z.string().parse(await response.text()));
+            const sponsor = new web3_js_1.PublicKey(zod_1.z.string().parse(await response.text()));
+            sponsorCache.set(domain, sponsor);
+            return sponsor;
         }
         else {
             throw new PaymasterResponseError(response.status, await response.text());
         }
     }
     else {
-        return options.sponsor;
+        return value;
     }
 };
 const getAddressLookupTable = async (connection, addressLookupTableCache, addressLookupTableAddress) => {

package/cjs/context.d.ts CHANGED Viewed

@@ -1,5 +1,6 @@
 import { Connection as Web3Connection } from "@solana/web3.js";
-import type { Connection } from "./connection.js";
+import type { Connection, SendTransactionOptions as SendTransactionBaseOptions, TransactionOrInstructions } from "./connection.js";
+export declare const SESSIONS_INTERNAL_PAYMASTER_DOMAIN = "sessions";
 export declare const createSessionContext: (options: {
     connection: Connection;
     defaultAddressLookupTableAddress?: string | undefined;
@@ -8,10 +9,14 @@ export declare const createSessionContext: (options: {
     chainId: string;
     domain: string;
     payer: import("@solana/web3.js").PublicKey;
+    internalPayer: import("@solana/web3.js").PublicKey;
     getSolanaConnection: () => Promise<Web3Connection>;
     connection: Web3Connection;
     rpc: import("@solana/kit").Rpc<import("@solana/kit").RequestAirdropApi & import("@solana/kit").GetAccountInfoApi & import("@solana/kit").GetBalanceApi & import("@solana/kit").GetBlockApi & import("@solana/kit").GetBlockCommitmentApi & import("@solana/kit").GetBlockHeightApi & import("@solana/kit").GetBlockProductionApi & import("@solana/kit").GetBlocksApi & import("@solana/kit").GetBlocksWithLimitApi & import("@solana/kit").GetBlockTimeApi & import("@solana/kit").GetClusterNodesApi & import("@solana/kit").GetEpochInfoApi & import("@solana/kit").GetEpochScheduleApi & import("@solana/kit").GetFeeForMessageApi & import("@solana/kit").GetFirstAvailableBlockApi & import("@solana/kit").GetGenesisHashApi & import("@solana/kit").GetHealthApi & import("@solana/kit").GetHighestSnapshotSlotApi & import("@solana/kit").GetIdentityApi & import("@solana/kit").GetInflationGovernorApi & import("@solana/kit").GetInflationRateApi & import("@solana/kit").GetInflationRewardApi & import("@solana/kit").GetLargestAccountsApi & import("@solana/kit").GetLatestBlockhashApi & import("@solana/kit").GetLeaderScheduleApi & import("@solana/kit").GetMaxRetransmitSlotApi & import("@solana/kit").GetMaxShredInsertSlotApi & import("@solana/kit").GetMinimumBalanceForRentExemptionApi & import("@solana/kit").GetMultipleAccountsApi & import("@solana/kit").GetProgramAccountsApi & import("@solana/kit").GetRecentPerformanceSamplesApi & import("@solana/kit").GetRecentPrioritizationFeesApi & import("@solana/kit").GetSignaturesForAddressApi & import("@solana/kit").GetSignatureStatusesApi & import("@solana/kit").GetSlotApi & import("@solana/kit").GetSlotLeaderApi & import("@solana/kit").GetSlotLeadersApi & import("@solana/kit").GetStakeMinimumDelegationApi & import("@solana/kit").GetSupplyApi & import("@solana/kit").GetTokenAccountBalanceApi & import("@solana/kit").GetTokenAccountsByDelegateApi & import("@solana/kit").GetTokenAccountsByOwnerApi & import("@solana/kit").GetTokenLargestAccountsApi & import("@solana/kit").GetTokenSupplyApi & import("@solana/kit").GetTransactionApi & import("@solana/kit").GetTransactionCountApi & import("@solana/kit").GetVersionApi & import("@solana/kit").GetVoteAccountsApi & import("@solana/kit").IsBlockhashValidApi & import("@solana/kit").MinimumLedgerSlotApi & import("@solana/kit").SendTransactionApi & import("@solana/kit").SimulateTransactionApi>;
     network: import("./connection.js").Network;
-    sendTransaction: (sessionKey: CryptoKeyPair | undefined, instructions: Parameters<typeof options.connection.sendToPaymaster>[3], extraConfig?: Parameters<typeof options.connection.sendToPaymaster>[4]) => Promise<import("./connection.js").TransactionResult>;
+    sendTransaction: (sessionKey: CryptoKeyPair | undefined, instructions: TransactionOrInstructions, sendTxOptions?: SendTransactionOptions) => Promise<import("./connection.js").TransactionResult>;
 }>;
+export type SendTransactionOptions = SendTransactionBaseOptions & {
+    paymasterDomain?: string | undefined;
+};
 export type SessionContext = Awaited<ReturnType<typeof createSessionContext>>;

package/cjs/context.js CHANGED Viewed

@@ -1,26 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createSessionContext = void 0;
+exports.createSessionContext = exports.SESSIONS_INTERNAL_PAYMASTER_DOMAIN = void 0;
 const anchor_1 = require("@coral-xyz/anchor");
 const sessions_idls_1 = require("@fogo/sessions-idls");
 const web3_js_1 = require("@solana/web3.js");
 // eslint-disable-next-line unicorn/no-typeof-undefined
 const IS_BROWSER = typeof globalThis.window !== "undefined";
+exports.SESSIONS_INTERNAL_PAYMASTER_DOMAIN = "sessions";
 const createSessionContext = async (options) => {
     const domain = getDomain(options.domain);
-    const sponsor = await options.connection.getSponsor(domain);
+    const [sponsor, internalSponsor] = await Promise.all([
+        options.connection.getSponsor(domain),
+        options.connection.getSponsor(exports.SESSIONS_INTERNAL_PAYMASTER_DOMAIN),
+    ]);
     return {
         chainId: await fetchChainId(options.connection.connection),
         domain: getDomain(options.domain),
         payer: sponsor,
+        internalPayer: internalSponsor,
         getSolanaConnection: options.connection.getSolanaConnection,
         connection: options.connection.connection,
         rpc: options.connection.rpc,
         network: options.connection.network,
-        sendTransaction: (sessionKey, instructions, extraConfig) => options.connection.sendToPaymaster(domain, sponsor, sessionKey, instructions, {
-            addressLookupTable: extraConfig?.addressLookupTable ??
+        sendTransaction: (sessionKey, instructions, sendTxOptions) => options.connection.sendToPaymaster(sendTxOptions?.paymasterDomain ?? domain, sessionKey, instructions, {
+            ...sendTxOptions,
+            addressLookupTable: sendTxOptions?.addressLookupTable ??
                 options.defaultAddressLookupTableAddress,
-            extraSigners: extraConfig?.extraSigners,
         }),
     };
 };

package/cjs/index.d.ts CHANGED Viewed

@@ -4,10 +4,10 @@ import { Connection, PublicKey } from "@solana/web3.js";
 import type { Chain } from "@wormhole-foundation/sdk";
 import BN from "bn.js";
 import { z } from "zod";
-import type { TransactionResult } from "./connection.js";
-import type { SessionContext } from "./context.js";
-export { type SessionContext, createSessionContext } from "./context.js";
-export { type TransactionResult, type Connection, Network, TransactionResultType, createSessionConnection, } from "./connection.js";
+import type { TransactionOrInstructions, TransactionResult } from "./connection.js";
+import type { SendTransactionOptions, SessionContext } from "./context.js";
+export { type SessionContext, type SendTransactionOptions, createSessionContext, } from "./context.js";
+export { type TransactionResult, type Connection, type TransactionOrInstructions, Network, TransactionResultType, createSessionConnection, } from "./connection.js";
 type EstablishSessionOptions = {
     context: SessionContext;
     walletPublicKey: PublicKey;
@@ -1307,9 +1307,23 @@ export type Session = {
     sessionKey: CryptoKeyPair;
     walletPublicKey: PublicKey;
     payer: PublicKey;
-    sendTransaction: (instructions: Parameters<SessionContext["sendTransaction"]>[1]) => Promise<TransactionResult>;
+    sendTransaction: (instructions: TransactionOrInstructions, extraConfig?: SendTransactionOptions) => Promise<TransactionResult>;
     sessionInfo: NonNullable<z.infer<typeof sessionInfoSchema>>;
 };
+export declare const getTransferFee: (context: SessionContext) => Promise<{
+    fee: bigint;
+    metadata: import("@metaplex-foundation/umi").PublicKey<string>;
+    mint: PublicKey;
+    symbolOrMint: string;
+    decimals: number;
+}>;
+export declare const getBridgeOutFee: (context: SessionContext) => Promise<{
+    fee: bigint;
+    metadata: import("@metaplex-foundation/umi").PublicKey<string>;
+    mint: PublicKey;
+    symbolOrMint: string;
+    decimals: number;
+}>;
 type SendTransferOptions = {
     context: SessionContext;
     walletPublicKey: PublicKey;
@@ -1317,6 +1331,7 @@ type SendTransferOptions = {
     mint: PublicKey;
     amount: bigint;
     recipient: PublicKey;
+    feeConfig: Awaited<ReturnType<typeof getTransferFee>>;
 };
 export declare const sendTransfer: (options: SendTransferOptions) => Promise<TransactionResult>;
 type SendBridgeOutOptions = {
@@ -1332,6 +1347,7 @@ type SendBridgeOutOptions = {
     toToken: WormholeToken & {
         chain: "Solana";
     };
+    feeConfig: Awaited<ReturnType<typeof getBridgeOutFee>>;
 };
 type WormholeToken = {
     chain: Chain;

package/cjs/index.js CHANGED Viewed

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.verifyLogInToken = exports.createLogInToken = exports.bridgeIn = exports.bridgeOut = exports.sendTransfer = exports.SessionResultType = exports.getDomainRecordAddress = exports.AuthorizedTokens = exports.AuthorizedProgramsType = exports.getSessionAccount = exports.reestablishSession = exports.revokeSession = exports.replaceSession = exports.establishSession = exports.createSessionConnection = exports.TransactionResultType = exports.Network = exports.createSessionContext = void 0;
+exports.verifyLogInToken = exports.createLogInToken = exports.bridgeIn = exports.bridgeOut = exports.sendTransfer = exports.getBridgeOutFee = exports.getTransferFee = exports.SessionResultType = exports.getDomainRecordAddress = exports.AuthorizedTokens = exports.AuthorizedProgramsType = exports.getSessionAccount = exports.reestablishSession = exports.revokeSession = exports.replaceSession = exports.establishSession = exports.createSessionConnection = exports.TransactionResultType = exports.Network = exports.createSessionContext = void 0;
 const anchor_1 = require("@coral-xyz/anchor");
 const sessions_idls_1 = require("@fogo/sessions-idls");
 const mpl_token_metadata_1 = require("@metaplex-foundation/mpl-token-metadata");
@@ -24,9 +24,10 @@ const bn_js_1 = __importDefault(require("bn.js"));
 const bs58_1 = __importDefault(require("bs58"));
 const zod_1 = require("zod");
 const connection_js_1 = require("./connection.js");
+const context_js_1 = require("./context.js");
 const crypto_js_1 = require("./crypto.js");
-var context_js_1 = require("./context.js");
-Object.defineProperty(exports, "createSessionContext", { enumerable: true, get: function () { return context_js_1.createSessionContext; } });
+var context_js_2 = require("./context.js");
+Object.defineProperty(exports, "createSessionContext", { enumerable: true, get: function () { return context_js_2.createSessionContext; } });
 var connection_js_2 = require("./connection.js");
 Object.defineProperty(exports, "Network", { enumerable: true, get: function () { return connection_js_2.Network; } });
 Object.defineProperty(exports, "TransactionResultType", { enumerable: true, get: function () { return connection_js_2.TransactionResultType; } });
@@ -39,9 +40,9 @@ const TOKENLESS_PERMISSIONS_VALUE = "this app may not spend any tokens";
 const CURRENT_MAJOR = "0";
 const CURRENT_MINOR = "3";
 const CURRENT_INTENT_TRANSFER_MAJOR = "0";
-const CURRENT_INTENT_TRANSFER_MINOR = "1";
+const CURRENT_INTENT_TRANSFER_MINOR = "2";
 const CURRENT_BRIDGE_OUT_MAJOR = "0";
-const CURRENT_BRIDGE_OUT_MINOR = "1";
+const CURRENT_BRIDGE_OUT_MINOR = "2";
 const SESSION_ESTABLISHMENT_LOOKUP_TABLE_ADDRESS = {
     [connection_js_1.Network.Testnet]: "B8cUjJMqaWWTNNSTXBmeptjWswwCH1gTSCRYv4nu7kJW",
     [connection_js_1.Network.Mainnet]: undefined,
@@ -65,16 +66,13 @@ const establishSession = async (options) => {
             buildIntentInstruction(options, sessionKey, tokenInfo),
             buildStartSessionInstruction(options, sessionKey, tokenInfo),
         ]);
-        return sendSessionEstablishTransaction(options, sessionKey, [
-            ...buildCreateAssociatedTokenAccountInstructions(options, tokenInfo),
-            intentInstruction,
-            startSessionInstruction,
-        ], options.sessionEstablishmentLookupTable);
+        return sendSessionEstablishTransaction(options, sessionKey, [intentInstruction, startSessionInstruction], options.sessionEstablishmentLookupTable);
     }
 };
 exports.establishSession = establishSession;
 const sendSessionEstablishTransaction = async (options, sessionKey, instructions, sessionEstablishmentLookupTable) => {
     const result = await options.context.sendTransaction(sessionKey, instructions, {
+        variation: "Session Establishment",
         addressLookupTable: sessionEstablishmentLookupTable ??
             SESSION_ESTABLISHMENT_LOOKUP_TABLE_ADDRESS[options.context.network],
     });
@@ -104,9 +102,9 @@ const revokeSession = async (options) => {
             session: options.session.sessionPublicKey,
         })
             .instruction();
-        return options.context.sendTransaction(options.session.sessionKey, [
-            instruction,
-        ]);
+        return options.context.sendTransaction(options.session.sessionKey, [instruction], {
+            variation: "Session Revocation",
+        });
     }
     else {
         return;
@@ -132,7 +130,7 @@ const createSession = async (context, walletPublicKey, sessionKey) => {
             walletPublicKey,
             sessionKey,
             payer: context.payer,
-            sendTransaction: (instructions) => context.sendTransaction(sessionKey, instructions),
+            sendTransaction: (instructions, extraConfig) => context.sendTransaction(sessionKey, instructions, extraConfig),
             sessionInfo,
         };
 };
@@ -435,7 +433,6 @@ const amountToString = (amount, decimals) => {
         ...(decimalTruncated === "" ? [] : [".", decimalTruncated]),
     ].join("");
 };
-const buildCreateAssociatedTokenAccountInstructions = (options, tokens) => tokens.map(({ mint }) => (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(options.context.payer, (0, spl_token_1.getAssociatedTokenAddressSync)(mint, options.walletPublicKey), options.walletPublicKey, mint));
 const getDomainRecordAddress = (domain) => {
     const hash = (0, sha2_1.sha256)(domain);
     return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("domain-record"), hash], new web3_js_1.PublicKey(sessions_idls_1.DomainRegistryIdl.address))[0];
@@ -448,7 +445,7 @@ const BRIDGING_ADDRESS_LOOKUP_TABLE = {
     },
     [connection_js_1.Network.Mainnet]: {
         // USDC
-        UsdcSt7U9H5bVy4WaWgeqoowe8RgXpLShCmxUFgZssx: "DjM31fhuQsjxLmpRFQpFUpZvyXzwQeNvyR1DUd8GMVmo",
+        uSd2czE61Evaf76RNbq4KPpXnkiL3irdzgLFUMe3NoG: "84k3mfNjmyinpZwyev7F15ChEW3Kqa3NoUkCJXXs4qkw",
     },
 };
 const buildStartSessionInstruction = async (options, sessionKey, tokens) => {
@@ -502,12 +499,52 @@ const EstablishSessionResult = {
         error,
     }),
 };
+const USDC_MINT = {
+    [connection_js_1.Network.Mainnet]: "uSd2czE61Evaf76RNbq4KPpXnkiL3irdzgLFUMe3NoG",
+    [connection_js_1.Network.Testnet]: "ELNbJ1RtERV2fjtuZjbTscDekWhVzkQ1LjmiPsxp5uND",
+};
+const USDC_DECIMALS = 6;
+const getTransferFee = async (context) => {
+    const { fee, ...config } = await getFee(context);
+    return {
+        ...config,
+        fee: fee.intrachainTransfer,
+    };
+};
+exports.getTransferFee = getTransferFee;
+const getBridgeOutFee = async (context) => {
+    const { fee, ...config } = await getFee(context);
+    return {
+        ...config,
+        fee: fee.bridgeTransfer,
+    };
+};
+exports.getBridgeOutFee = getBridgeOutFee;
+const getFee = async (context) => {
+    const program = new sessions_idls_1.IntentTransferProgram(new anchor_1.AnchorProvider(context.connection, {}, {}));
+    const umi = (0, umi_bundle_defaults_1.createUmi)(context.connection.rpcEndpoint);
+    const usdcMintAddress = USDC_MINT[context.network];
+    const usdcMint = new web3_js_1.PublicKey(usdcMintAddress);
+    const [feeConfigPda] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("fee_config"), usdcMint.toBytes()], program.programId);
+    const feeConfig = await program.account.feeConfig.fetch(feeConfigPda);
+    return {
+        metadata: (0, mpl_token_metadata_1.findMetadataPda)(umi, {
+            mint: (0, umi_1.publicKey)(usdcMintAddress),
+        })[0],
+        mint: usdcMint,
+        symbolOrMint: "USDC.s",
+        decimals: USDC_DECIMALS,
+        fee: {
+            intrachainTransfer: BigInt(feeConfig.intrachainTransferFee.toString()),
+            bridgeTransfer: BigInt(feeConfig.bridgeTransferFee.toString()),
+        },
+    };
+};
 const TRANSFER_MESSAGE_HEADER = `Fogo Transfer:
 Signing this intent will transfer the tokens as described below.
 `;
 const sendTransfer = async (options) => {
     const sourceAta = (0, spl_token_1.getAssociatedTokenAddressSync)(options.mint, options.walletPublicKey);
-    const destinationAta = (0, spl_token_1.getAssociatedTokenAddressSync)(options.mint, options.recipient);
     const program = new sessions_idls_1.IntentTransferProgram(new anchor_1.AnchorProvider(options.context.connection, {}, {}));
     const umi = (0, umi_bundle_defaults_1.createUmi)(options.context.connection.rpcEndpoint);
     const metaplexMint = (0, umi_1.publicKey)(options.mint.toBase58());
@@ -515,23 +552,29 @@ const sendTransfer = async (options) => {
     const metadata = await (0, mpl_token_metadata_1.safeFetchMetadata)(umi, metadataAddress);
     const symbol = metadata?.symbol ?? undefined;
     return options.context.sendTransaction(undefined, [
-        (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(options.context.payer, destinationAta, options.recipient, options.mint),
-        await buildTransferIntentInstruction(program, options, symbol),
+        await buildTransferIntentInstruction(program, options, symbol, options.feeConfig.symbolOrMint, amountToString(options.feeConfig.fee, options.feeConfig.decimals)),
         await program.methods
             .sendTokens()
             .accounts({
-            destination: destinationAta,
+            destinationOwner: options.recipient,
+            feeMetadata: options.feeConfig.metadata,
+            feeMint: options.feeConfig.mint,
+            feeSource: (0, spl_token_1.getAssociatedTokenAddressSync)(options.feeConfig.mint, options.walletPublicKey),
             mint: options.mint,
             source: sourceAta,
-            sponsor: options.context.payer,
+            sponsor: options.context.internalPayer,
+            metadata:
             // eslint-disable-next-line unicorn/no-null
-            metadata: symbol === undefined ? null : new web3_js_1.PublicKey(metadataAddress),
+            symbol === undefined ? null : new web3_js_1.PublicKey(metadataAddress),
         })
             .instruction(),
-    ]);
+    ], {
+        variation: "Intent Transfer",
+        paymasterDomain: context_js_1.SESSIONS_INTERNAL_PAYMASTER_DOMAIN,
+    });
 };
 exports.sendTransfer = sendTransfer;
-const buildTransferIntentInstruction = async (program, options, symbol) => {
+const buildTransferIntentInstruction = async (program, options, symbol, feeToken, feeAmount) => {
     const [nonce, { decimals }] = await Promise.all([
         getNonce(program, options.walletPublicKey, NonceType.Transfer),
         (0, spl_token_1.getMint)(options.context.connection, options.mint),
@@ -544,6 +587,8 @@ const buildTransferIntentInstruction = async (program, options, symbol) => {
             token: symbol ?? options.mint.toBase58(),
             amount: amountToString(options.amount, decimals),
             recipient: options.recipient.toBase58(),
+            fee_token: feeToken,
+            fee_amount: feeAmount,
             nonce: nonce === null ? "1" : nonce.nonce.add(new bn_js_1.default(1)).toString(),
         }),
     ].join("\n"));
@@ -557,6 +602,7 @@ const buildTransferIntentInstruction = async (program, options, symbol) => {
 const BRIDGE_OUT_MESSAGE_HEADER = `Fogo Bridge Transfer:
 Signing this intent will bridge out the tokens as described below.
 `;
+const BRIDGE_OUT_CUS = 220_000;
 const bridgeOut = async (options) => {
     const { wh, route, transferRequest, transferParams, decimals } = await buildWormholeTransfer(options, options.context.connection);
     // @ts-expect-error the wormhole client types are incorrect and do not
@@ -567,20 +613,20 @@ const bridgeOut = async (options) => {
     const metaplexMint = (0, umi_1.publicKey)(options.fromToken.mint.toBase58());
     const metadataAddress = (0, mpl_token_metadata_1.findMetadataPda)(umi, { mint: metaplexMint })[0];
     const outboxItem = web3_js_1.Keypair.generate();
-    const [metadata, nttPdas] = await Promise.all([
+    const [metadata, nttPdas, destinationAtaExists] = await Promise.all([
         (0, mpl_token_metadata_1.safeFetchMetadata)(umi, metadataAddress),
         getNttPdas(options, wh, program, outboxItem.publicKey, new web3_js_1.PublicKey(quote.payeeAddress)),
+        getDestinationAtaExists(options.context, options.toToken.mint, options.walletPublicKey),
     ]);
-    return options.context.sendTransaction(options.sessionKey, await Promise.all([
-        buildBridgeOutIntent(program, options, decimals, metadata?.symbol),
+    const instructions = await Promise.all([
+        buildBridgeOutIntent(program, options, decimals, metadata?.symbol, options.feeConfig.symbolOrMint, amountToString(options.feeConfig.fee, options.feeConfig.decimals)),
         program.methods
             .bridgeNttTokens({
-            execAmount: new bn_js_1.default(quote.estimatedCost.toString()),
-            relayInstructions: Buffer.from(quote.relayInstructions),
-            signedQuoteBytes: Buffer.from(quote.signedQuote),
+            payDestinationAtaRent: !destinationAtaExists,
+            signedQuoteBytes: [...quote.signedQuote],
         })
             .accounts({
-            sponsor: options.context.payer,
+            sponsor: options.context.internalPayer,
             mint: options.fromToken.mint,
             metadata: metadata?.symbol === undefined
                 ? // eslint-disable-next-line unicorn/no-null
@@ -588,14 +634,28 @@ const bridgeOut = async (options) => {
                 : new web3_js_1.PublicKey(metadataAddress),
             source: (0, spl_token_1.getAssociatedTokenAddressSync)(options.fromToken.mint, options.walletPublicKey),
             ntt: nttPdas,
+            feeMetadata: options.feeConfig.metadata,
+            feeMint: options.feeConfig.mint,
+            feeSource: (0, spl_token_1.getAssociatedTokenAddressSync)(options.feeConfig.mint, options.walletPublicKey),
         })
             .instruction(),
-    ]), {
+    ]);
+    return options.context.sendTransaction(options.sessionKey, [
+        web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: BRIDGE_OUT_CUS }),
+        ...instructions,
+    ], {
+        variation: "Intent NTT Bridge",
+        paymasterDomain: context_js_1.SESSIONS_INTERNAL_PAYMASTER_DOMAIN,
         extraSigners: [outboxItem],
         addressLookupTable: BRIDGING_ADDRESS_LOOKUP_TABLE[options.context.network]?.[options.fromToken.mint.toBase58()],
     });
 };
 exports.bridgeOut = bridgeOut;
+const getDestinationAtaExists = async (context, token, wallet) => {
+    const solanaConnection = await context.getSolanaConnection();
+    const ataAccount = await solanaConnection.getAccountInfo((0, spl_token_1.getAssociatedTokenAddressSync)(token, wallet));
+    return ataAccount !== null;
+};
 // Here we use the Wormhole SDKs to produce the wormhole pdas that are needed
 // for the bridge out transaction.  Currently this is using wormhole SDK apis
 // that are _technically_ public but it seems likely these are not considered to
@@ -613,6 +673,10 @@ const getNttPdas = async (options, wh, program, outboxItemPublicKey, quotePayeeA
     const transceiverPdas = sdk_solana_ntt_1.NTT.transceiverPdas(options.fromToken.manager);
     const [intentTransferSetterPda] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("intent_transfer")], program.programId);
     const wormholePdas = sdk_solana_core_1.utils.getWormholeDerivedAccounts(options.fromToken.manager, coreBridgeContract);
+    const [registeredTransceiverPda] = web3_js_1.PublicKey.findProgramAddressSync([
+        Buffer.from("registered_transceiver"),
+        options.fromToken.manager.toBytes(),
+    ], options.fromToken.manager);
     return {
         emitter: transceiverPdas.emitterAccount(),
         nttConfig: pdas.configAccount(),
@@ -625,7 +689,7 @@ const getNttPdas = async (options, wh, program, outboxItemPublicKey, quotePayeeA
         nttSessionAuthority: pdas.sessionAuthority(intentTransferSetterPda, sdk_solana_ntt_1.NTT.transferArgs(options.amount, sdk_1.Wormhole.chainAddress("Solana", options.walletPublicKey.toBase58()), false)),
         nttTokenAuthority: pdas.tokenAuthority(),
         payeeNttWithExecutor: quotePayeeAddress,
-        transceiver: options.fromToken.transceiver,
+        transceiver: registeredTransceiverPda,
         wormholeProgram: coreBridgeContract,
         wormholeBridge: wormholePdas.wormholeBridge,
         wormholeFeeCollector: wormholePdas.wormholeFeeCollector,
@@ -633,7 +697,7 @@ const getNttPdas = async (options, wh, program, outboxItemPublicKey, quotePayeeA
         wormholeSequence: wormholePdas.wormholeSequence,
     };
 };
-const buildBridgeOutIntent = async (program, options, decimals, symbol) => {
+const buildBridgeOutIntent = async (program, options, decimals, symbol, feeToken, feeAmount) => {
     const nonce = await getNonce(program, options.walletPublicKey, NonceType.Bridge);
     const message = new TextEncoder().encode([
         BRIDGE_OUT_MESSAGE_HEADER,
@@ -644,6 +708,8 @@ const buildBridgeOutIntent = async (program, options, decimals, symbol) => {
             token: symbol ?? options.fromToken.mint.toBase58(),
             amount: amountToString(options.amount, decimals),
             recipient_address: options.walletPublicKey.toBase58(),
+            fee_token: feeToken,
+            fee_amount: feeAmount,
             nonce: nonce === null ? "1" : nonce.nonce.add(new bn_js_1.default(1)).toString(),
         }),
     ].join("\n"));

package/esm/connection.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import type { Transaction, Instruction, TransactionWithLifetime } from "@solana/kit";
+import type { Transaction, Instruction, TransactionWithLifetime, Rpc, GetLatestBlockhashApi } from "@solana/kit";
 import type { TransactionError } from "@solana/web3.js";
 import { Keypair, Connection as Web3Connection, TransactionInstruction, VersionedTransaction, PublicKey } from "@solana/web3.js";
 export declare enum Network {
@@ -33,15 +33,18 @@ export declare const createSessionConnection: (options: {
     sendToPaymaster: (transaction: Transaction) => Promise<TransactionResult>;
     sponsor: PublicKey;
 })) => {
-    rpc: import("@solana/kit").Rpc<import("@solana/kit").RequestAirdropApi & import("@solana/kit").GetAccountInfoApi & import("@solana/kit").GetBalanceApi & import("@solana/kit").GetBlockApi & import("@solana/kit").GetBlockCommitmentApi & import("@solana/kit").GetBlockHeightApi & import("@solana/kit").GetBlockProductionApi & import("@solana/kit").GetBlocksApi & import("@solana/kit").GetBlocksWithLimitApi & import("@solana/kit").GetBlockTimeApi & import("@solana/kit").GetClusterNodesApi & import("@solana/kit").GetEpochInfoApi & import("@solana/kit").GetEpochScheduleApi & import("@solana/kit").GetFeeForMessageApi & import("@solana/kit").GetFirstAvailableBlockApi & import("@solana/kit").GetGenesisHashApi & import("@solana/kit").GetHealthApi & import("@solana/kit").GetHighestSnapshotSlotApi & import("@solana/kit").GetIdentityApi & import("@solana/kit").GetInflationGovernorApi & import("@solana/kit").GetInflationRateApi & import("@solana/kit").GetInflationRewardApi & import("@solana/kit").GetLargestAccountsApi & import("@solana/kit").GetLatestBlockhashApi & import("@solana/kit").GetLeaderScheduleApi & import("@solana/kit").GetMaxRetransmitSlotApi & import("@solana/kit").GetMaxShredInsertSlotApi & import("@solana/kit").GetMinimumBalanceForRentExemptionApi & import("@solana/kit").GetMultipleAccountsApi & import("@solana/kit").GetProgramAccountsApi & import("@solana/kit").GetRecentPerformanceSamplesApi & import("@solana/kit").GetRecentPrioritizationFeesApi & import("@solana/kit").GetSignaturesForAddressApi & import("@solana/kit").GetSignatureStatusesApi & import("@solana/kit").GetSlotApi & import("@solana/kit").GetSlotLeaderApi & import("@solana/kit").GetSlotLeadersApi & import("@solana/kit").GetStakeMinimumDelegationApi & import("@solana/kit").GetSupplyApi & import("@solana/kit").GetTokenAccountBalanceApi & import("@solana/kit").GetTokenAccountsByDelegateApi & import("@solana/kit").GetTokenAccountsByOwnerApi & import("@solana/kit").GetTokenLargestAccountsApi & import("@solana/kit").GetTokenSupplyApi & import("@solana/kit").GetTransactionApi & import("@solana/kit").GetTransactionCountApi & import("@solana/kit").GetVersionApi & import("@solana/kit").GetVoteAccountsApi & import("@solana/kit").IsBlockhashValidApi & import("@solana/kit").MinimumLedgerSlotApi & import("@solana/kit").SendTransactionApi & import("@solana/kit").SimulateTransactionApi>;
+    rpc: Rpc<import("@solana/kit").RequestAirdropApi & import("@solana/kit").GetAccountInfoApi & import("@solana/kit").GetBalanceApi & import("@solana/kit").GetBlockApi & import("@solana/kit").GetBlockCommitmentApi & import("@solana/kit").GetBlockHeightApi & import("@solana/kit").GetBlockProductionApi & import("@solana/kit").GetBlocksApi & import("@solana/kit").GetBlocksWithLimitApi & import("@solana/kit").GetBlockTimeApi & import("@solana/kit").GetClusterNodesApi & import("@solana/kit").GetEpochInfoApi & import("@solana/kit").GetEpochScheduleApi & import("@solana/kit").GetFeeForMessageApi & import("@solana/kit").GetFirstAvailableBlockApi & import("@solana/kit").GetGenesisHashApi & import("@solana/kit").GetHealthApi & import("@solana/kit").GetHighestSnapshotSlotApi & import("@solana/kit").GetIdentityApi & import("@solana/kit").GetInflationGovernorApi & import("@solana/kit").GetInflationRateApi & import("@solana/kit").GetInflationRewardApi & import("@solana/kit").GetLargestAccountsApi & GetLatestBlockhashApi & import("@solana/kit").GetLeaderScheduleApi & import("@solana/kit").GetMaxRetransmitSlotApi & import("@solana/kit").GetMaxShredInsertSlotApi & import("@solana/kit").GetMinimumBalanceForRentExemptionApi & import("@solana/kit").GetMultipleAccountsApi & import("@solana/kit").GetProgramAccountsApi & import("@solana/kit").GetRecentPerformanceSamplesApi & import("@solana/kit").GetRecentPrioritizationFeesApi & import("@solana/kit").GetSignaturesForAddressApi & import("@solana/kit").GetSignatureStatusesApi & import("@solana/kit").GetSlotApi & import("@solana/kit").GetSlotLeaderApi & import("@solana/kit").GetSlotLeadersApi & import("@solana/kit").GetStakeMinimumDelegationApi & import("@solana/kit").GetSupplyApi & import("@solana/kit").GetTokenAccountBalanceApi & import("@solana/kit").GetTokenAccountsByDelegateApi & import("@solana/kit").GetTokenAccountsByOwnerApi & import("@solana/kit").GetTokenLargestAccountsApi & import("@solana/kit").GetTokenSupplyApi & import("@solana/kit").GetTransactionApi & import("@solana/kit").GetTransactionCountApi & import("@solana/kit").GetVersionApi & import("@solana/kit").GetVoteAccountsApi & import("@solana/kit").IsBlockhashValidApi & import("@solana/kit").MinimumLedgerSlotApi & import("@solana/kit").SendTransactionApi & import("@solana/kit").SimulateTransactionApi>;
     connection: Web3Connection;
     network: Network;
     getSolanaConnection: () => Promise<Web3Connection>;
-    sendToPaymaster: (domain: string, sponsor: PublicKey, sessionKey: CryptoKeyPair | undefined, instructions: (TransactionInstruction | Instruction)[] | VersionedTransaction | (Transaction & TransactionWithLifetime), extraConfig?: {
-        addressLookupTable?: string | undefined;
-        extraSigners?: (CryptoKeyPair | Keypair)[] | undefined;
-    }) => Promise<TransactionResult>;
+    sendToPaymaster: (domain: string, sessionKey: CryptoKeyPair | undefined, instructions: TransactionOrInstructions, extraConfig?: SendTransactionOptions) => Promise<TransactionResult>;
     getSponsor: (domain: string) => Promise<PublicKey>;
 };
+export type TransactionOrInstructions = (TransactionInstruction | Instruction)[] | VersionedTransaction | (Transaction & TransactionWithLifetime);
+export type SendTransactionOptions = {
+    variation?: string | undefined;
+    addressLookupTable?: string | undefined;
+    extraSigners?: (CryptoKeyPair | Keypair)[] | undefined;
+};
 export type Connection = ReturnType<typeof createSessionConnection>;
 export {};

package/esm/connection.js CHANGED Viewed

@@ -36,17 +36,14 @@ export const createSessionConnection = (options) => {
     const rpc = createSolanaRpc(rpcUrl);
     const connection = new Web3Connection(rpcUrl, "confirmed");
     const addressLookupTableCache = new Map();
+    const sponsorCache = new Map();
     return {
         rpc,
         connection,
         network: options.network,
         getSolanaConnection: createSolanaConnectionGetter(options.network),
-        sendToPaymaster: async (domain, sponsor, sessionKey, instructions, extraConfig) => {
-            const { value: latestBlockhash } = await rpc.getLatestBlockhash().send();
-            const transaction = await buildTransaction(connection, latestBlockhash, sessionKey, sponsor, instructions, addressLookupTableCache, extraConfig);
-            return sendToPaymaster(options, domain, transaction);
-        },
-        getSponsor: (domain) => getSponsor(options, domain),
+        sendToPaymaster: async (domain, sessionKey, instructions, extraConfig) => sendToPaymaster({ ...options, rpc, connection, addressLookupTableCache, sponsorCache }, domain, sessionKey, instructions, extraConfig),
+        getSponsor: (domain) => getSponsor(options, sponsorCache, domain),
     };
 };
 const createSolanaConnectionGetter = (network) => {
@@ -71,10 +68,17 @@ const NETWORK_TO_QUERY_PARAM = {
     [Network.Mainnet]: "mainnet",
     [Network.Testnet]: "testnet",
 };
-const sendToPaymaster = async (options, domain, transaction) => {
-    if (options.sendToPaymaster === undefined) {
-        const url = new URL("/api/sponsor_and_send", options.paymaster ?? DEFAULT_PAYMASTER[options.network]);
+const sendToPaymaster = async (connection, domain, sessionKey, instructions, extraConfig) => {
+    const signerKeys = await getSignerKeys(sessionKey, extraConfig?.extraSigners);
+    const transaction = Array.isArray(instructions)
+        ? await buildTransaction(connection, domain, signerKeys, instructions, extraConfig)
+        : await addSignaturesToExistingTransaction(instructions, signerKeys);
+    if (connection.sendToPaymaster === undefined) {
+        const url = new URL("/api/sponsor_and_send", connection.paymaster ?? DEFAULT_PAYMASTER[connection.network]);
         url.searchParams.set("domain", domain);
+        if (extraConfig?.variation !== undefined) {
+            url.searchParams.set("variation", extraConfig.variation);
+        }
         const response = await fetch(url, {
             method: "POST",
             headers: {
@@ -92,33 +96,31 @@ const sendToPaymaster = async (options, domain, transaction) => {
         }
     }
     else {
-        return options.sendToPaymaster(transaction);
+        return connection.sendToPaymaster(transaction);
     }
 };
-const buildTransaction = async (connection, latestBlockhash, sessionKey, sponsor, instructions, addressLookupTableCache, extraConfig) => {
-    const [signerKeys, addressLookupTable] = await Promise.all([
-        getSignerKeys(sessionKey, extraConfig?.extraSigners),
+const buildTransaction = async (connection, domain, signerKeys, instructions, extraConfig) => {
+    const [{ value: latestBlockhash }, sponsor, addressLookupTable, signers] = await Promise.all([
+        connection.rpc.getLatestBlockhash().send(),
+        connection.sponsor === undefined
+            ? getSponsor(connection, connection.sponsorCache, domain)
+            : Promise.resolve(connection.sponsor),
         extraConfig?.addressLookupTable === undefined
             ? Promise.resolve(undefined)
-            : getAddressLookupTable(connection, addressLookupTableCache, extraConfig.addressLookupTable),
+            : getAddressLookupTable(connection.connection, connection.addressLookupTableCache, extraConfig.addressLookupTable),
+        Promise.all(signerKeys.map((signer) => createSignerFromKeyPair(signer))),
     ]);
-    if (Array.isArray(instructions)) {
-        const signers = await Promise.all(signerKeys.map((signer) => createSignerFromKeyPair(signer)));
-        return partiallySignTransactionMessageWithSigners(pipe(createTransactionMessage({ version: 0 }), (tx) => setTransactionMessageFeePayer(fromLegacyPublicKey(sponsor), tx), (tx) => setTransactionMessageLifetimeUsingBlockhash(latestBlockhash, tx), (tx) => appendTransactionMessageInstructions(instructions.map((instruction) => instruction instanceof TransactionInstruction
-            ? fromLegacyTransactionInstruction(instruction)
-            : instruction), tx), (tx) => addressLookupTable === undefined
-            ? tx
-            : compressTransactionMessageUsingAddressLookupTables(tx, {
-                [fromLegacyPublicKey(addressLookupTable.key)]: addressLookupTable.state.addresses.map((address) => fromLegacyPublicKey(address)),
-            }), (tx) => addSignersToTransactionMessage(signers, tx)));
-    }
-    else {
-        const tx = instructions instanceof VersionedTransaction
-            ? fromVersionedTransaction(instructions) // VersionedTransaction has a lifetime so it's fine to cast it so we can call partiallySignTransaction
-            : instructions;
-        return partiallySignTransaction(signerKeys, tx);
-    }
+    return partiallySignTransactionMessageWithSigners(pipe(createTransactionMessage({ version: 0 }), (tx) => setTransactionMessageFeePayer(fromLegacyPublicKey(sponsor), tx), (tx) => setTransactionMessageLifetimeUsingBlockhash(latestBlockhash, tx), (tx) => appendTransactionMessageInstructions(instructions.map((instruction) => instruction instanceof TransactionInstruction
+        ? fromLegacyTransactionInstruction(instruction)
+        : instruction), tx), (tx) => addressLookupTable === undefined
+        ? tx
+        : compressTransactionMessageUsingAddressLookupTables(tx, {
+            [fromLegacyPublicKey(addressLookupTable.key)]: addressLookupTable.state.addresses.map((address) => fromLegacyPublicKey(address)),
+        }), (tx) => addSignersToTransactionMessage(signers, tx)));
 };
+const addSignaturesToExistingTransaction = (transaction, signerKeys) => partiallySignTransaction(signerKeys, transaction instanceof VersionedTransaction
+    ? fromVersionedTransaction(transaction) // VersionedTransaction has a lifetime so it's fine to cast it so we can call partiallySignTransaction
+    : transaction);
 const getSignerKeys = async (sessionKey, extraSigners) => {
     const extraSignerKeys = extraSigners === undefined
         ? []
@@ -147,20 +149,24 @@ const sponsorAndSendResponseSchema = z
         ? TransactionResult.Success(data.signature)
         : TransactionResult.Failed(data.signature, data.error);
 });
-const getSponsor = async (options, domain) => {
-    if (options.sponsor === undefined) {
+const getSponsor = async (options, sponsorCache, domain) => {
+    const value = sponsorCache.get(domain);
+    if (value === undefined) {
         const url = new URL("/api/sponsor_pubkey", options.paymaster ?? DEFAULT_PAYMASTER[options.network]);
         url.searchParams.set("domain", domain);
+        url.searchParams.set("index", "autoassign");
         const response = await fetch(url);
         if (response.status === 200) {
-            return new PublicKey(z.string().parse(await response.text()));
+            const sponsor = new PublicKey(z.string().parse(await response.text()));
+            sponsorCache.set(domain, sponsor);
+            return sponsor;
         }
         else {
             throw new PaymasterResponseError(response.status, await response.text());
         }
     }
     else {
-        return options.sponsor;
+        return value;
     }
 };
 const getAddressLookupTable = async (connection, addressLookupTableCache, addressLookupTableAddress) => {

package/esm/context.d.ts CHANGED Viewed

@@ -1,5 +1,6 @@
 import { Connection as Web3Connection } from "@solana/web3.js";
-import type { Connection } from "./connection.js";
+import type { Connection, SendTransactionOptions as SendTransactionBaseOptions, TransactionOrInstructions } from "./connection.js";
+export declare const SESSIONS_INTERNAL_PAYMASTER_DOMAIN = "sessions";
 export declare const createSessionContext: (options: {
     connection: Connection;
     defaultAddressLookupTableAddress?: string | undefined;
@@ -8,10 +9,14 @@ export declare const createSessionContext: (options: {
     chainId: string;
     domain: string;
     payer: import("@solana/web3.js").PublicKey;
+    internalPayer: import("@solana/web3.js").PublicKey;
     getSolanaConnection: () => Promise<Web3Connection>;
     connection: Web3Connection;
     rpc: import("@solana/kit").Rpc<import("@solana/kit").RequestAirdropApi & import("@solana/kit").GetAccountInfoApi & import("@solana/kit").GetBalanceApi & import("@solana/kit").GetBlockApi & import("@solana/kit").GetBlockCommitmentApi & import("@solana/kit").GetBlockHeightApi & import("@solana/kit").GetBlockProductionApi & import("@solana/kit").GetBlocksApi & import("@solana/kit").GetBlocksWithLimitApi & import("@solana/kit").GetBlockTimeApi & import("@solana/kit").GetClusterNodesApi & import("@solana/kit").GetEpochInfoApi & import("@solana/kit").GetEpochScheduleApi & import("@solana/kit").GetFeeForMessageApi & import("@solana/kit").GetFirstAvailableBlockApi & import("@solana/kit").GetGenesisHashApi & import("@solana/kit").GetHealthApi & import("@solana/kit").GetHighestSnapshotSlotApi & import("@solana/kit").GetIdentityApi & import("@solana/kit").GetInflationGovernorApi & import("@solana/kit").GetInflationRateApi & import("@solana/kit").GetInflationRewardApi & import("@solana/kit").GetLargestAccountsApi & import("@solana/kit").GetLatestBlockhashApi & import("@solana/kit").GetLeaderScheduleApi & import("@solana/kit").GetMaxRetransmitSlotApi & import("@solana/kit").GetMaxShredInsertSlotApi & import("@solana/kit").GetMinimumBalanceForRentExemptionApi & import("@solana/kit").GetMultipleAccountsApi & import("@solana/kit").GetProgramAccountsApi & import("@solana/kit").GetRecentPerformanceSamplesApi & import("@solana/kit").GetRecentPrioritizationFeesApi & import("@solana/kit").GetSignaturesForAddressApi & import("@solana/kit").GetSignatureStatusesApi & import("@solana/kit").GetSlotApi & import("@solana/kit").GetSlotLeaderApi & import("@solana/kit").GetSlotLeadersApi & import("@solana/kit").GetStakeMinimumDelegationApi & import("@solana/kit").GetSupplyApi & import("@solana/kit").GetTokenAccountBalanceApi & import("@solana/kit").GetTokenAccountsByDelegateApi & import("@solana/kit").GetTokenAccountsByOwnerApi & import("@solana/kit").GetTokenLargestAccountsApi & import("@solana/kit").GetTokenSupplyApi & import("@solana/kit").GetTransactionApi & import("@solana/kit").GetTransactionCountApi & import("@solana/kit").GetVersionApi & import("@solana/kit").GetVoteAccountsApi & import("@solana/kit").IsBlockhashValidApi & import("@solana/kit").MinimumLedgerSlotApi & import("@solana/kit").SendTransactionApi & import("@solana/kit").SimulateTransactionApi>;
     network: import("./connection.js").Network;
-    sendTransaction: (sessionKey: CryptoKeyPair | undefined, instructions: Parameters<typeof options.connection.sendToPaymaster>[3], extraConfig?: Parameters<typeof options.connection.sendToPaymaster>[4]) => Promise<import("./connection.js").TransactionResult>;
+    sendTransaction: (sessionKey: CryptoKeyPair | undefined, instructions: TransactionOrInstructions, sendTxOptions?: SendTransactionOptions) => Promise<import("./connection.js").TransactionResult>;
 }>;
+export type SendTransactionOptions = SendTransactionBaseOptions & {
+    paymasterDomain?: string | undefined;
+};
 export type SessionContext = Awaited<ReturnType<typeof createSessionContext>>;

package/esm/context.js CHANGED Viewed

@@ -3,21 +3,26 @@ import { ChainIdProgram } from "@fogo/sessions-idls";
 import { Connection as Web3Connection, Keypair } from "@solana/web3.js";
 // eslint-disable-next-line unicorn/no-typeof-undefined
 const IS_BROWSER = typeof globalThis.window !== "undefined";
+export const SESSIONS_INTERNAL_PAYMASTER_DOMAIN = "sessions";
 export const createSessionContext = async (options) => {
     const domain = getDomain(options.domain);
-    const sponsor = await options.connection.getSponsor(domain);
+    const [sponsor, internalSponsor] = await Promise.all([
+        options.connection.getSponsor(domain),
+        options.connection.getSponsor(SESSIONS_INTERNAL_PAYMASTER_DOMAIN),
+    ]);
     return {
         chainId: await fetchChainId(options.connection.connection),
         domain: getDomain(options.domain),
         payer: sponsor,
+        internalPayer: internalSponsor,
         getSolanaConnection: options.connection.getSolanaConnection,
         connection: options.connection.connection,
         rpc: options.connection.rpc,
         network: options.connection.network,
-        sendTransaction: (sessionKey, instructions, extraConfig) => options.connection.sendToPaymaster(domain, sponsor, sessionKey, instructions, {
-            addressLookupTable: extraConfig?.addressLookupTable ??
+        sendTransaction: (sessionKey, instructions, sendTxOptions) => options.connection.sendToPaymaster(sendTxOptions?.paymasterDomain ?? domain, sessionKey, instructions, {
+            ...sendTxOptions,
+            addressLookupTable: sendTxOptions?.addressLookupTable ??
                 options.defaultAddressLookupTableAddress,
-            extraSigners: extraConfig?.extraSigners,
         }),
     };
 };

package/esm/index.d.ts CHANGED Viewed

@@ -4,10 +4,10 @@ import { Connection, PublicKey } from "@solana/web3.js";
 import type { Chain } from "@wormhole-foundation/sdk";
 import BN from "bn.js";
 import { z } from "zod";
-import type { TransactionResult } from "./connection.js";
-import type { SessionContext } from "./context.js";
-export { type SessionContext, createSessionContext } from "./context.js";
-export { type TransactionResult, type Connection, Network, TransactionResultType, createSessionConnection, } from "./connection.js";
+import type { TransactionOrInstructions, TransactionResult } from "./connection.js";
+import type { SendTransactionOptions, SessionContext } from "./context.js";
+export { type SessionContext, type SendTransactionOptions, createSessionContext, } from "./context.js";
+export { type TransactionResult, type Connection, type TransactionOrInstructions, Network, TransactionResultType, createSessionConnection, } from "./connection.js";
 type EstablishSessionOptions = {
     context: SessionContext;
     walletPublicKey: PublicKey;
@@ -1307,9 +1307,23 @@ export type Session = {
     sessionKey: CryptoKeyPair;
     walletPublicKey: PublicKey;
     payer: PublicKey;
-    sendTransaction: (instructions: Parameters<SessionContext["sendTransaction"]>[1]) => Promise<TransactionResult>;
+    sendTransaction: (instructions: TransactionOrInstructions, extraConfig?: SendTransactionOptions) => Promise<TransactionResult>;
     sessionInfo: NonNullable<z.infer<typeof sessionInfoSchema>>;
 };
+export declare const getTransferFee: (context: SessionContext) => Promise<{
+    fee: bigint;
+    metadata: import("@metaplex-foundation/umi").PublicKey<string>;
+    mint: PublicKey;
+    symbolOrMint: string;
+    decimals: number;
+}>;
+export declare const getBridgeOutFee: (context: SessionContext) => Promise<{
+    fee: bigint;
+    metadata: import("@metaplex-foundation/umi").PublicKey<string>;
+    mint: PublicKey;
+    symbolOrMint: string;
+    decimals: number;
+}>;
 type SendTransferOptions = {
     context: SessionContext;
     walletPublicKey: PublicKey;
@@ -1317,6 +1331,7 @@ type SendTransferOptions = {
     mint: PublicKey;
     amount: bigint;
     recipient: PublicKey;
+    feeConfig: Awaited<ReturnType<typeof getTransferFee>>;
 };
 export declare const sendTransfer: (options: SendTransferOptions) => Promise<TransactionResult>;
 type SendBridgeOutOptions = {
@@ -1332,6 +1347,7 @@ type SendBridgeOutOptions = {
     toToken: WormholeToken & {
         chain: "Solana";
     };
+    feeConfig: Awaited<ReturnType<typeof getBridgeOutFee>>;
 };
 type WormholeToken = {
     chain: Chain;

package/esm/index.js CHANGED Viewed

@@ -6,8 +6,8 @@ import { createUmi } from "@metaplex-foundation/umi-bundle-defaults";
 import { sha256 } from "@noble/hashes/sha2";
 import { fromLegacyPublicKey } from "@solana/compat";
 import { generateKeyPair, getAddressFromPublicKey, getProgramDerivedAddress, signatureBytes, verifySignature, } from "@solana/kit";
-import { createAssociatedTokenAccountIdempotentInstruction, getAssociatedTokenAddressSync, getMint, } from "@solana/spl-token";
-import { Connection, Ed25519Program, Keypair, PublicKey, } from "@solana/web3.js";
+import { getAssociatedTokenAddressSync, getMint } from "@solana/spl-token";
+import { ComputeBudgetProgram, Connection, Ed25519Program, Keypair, PublicKey, } from "@solana/web3.js";
 import { Wormhole, wormhole, routes } from "@wormhole-foundation/sdk";
 import solanaSdk from "@wormhole-foundation/sdk/solana";
 import { contracts } from "@wormhole-foundation/sdk-base";
@@ -18,8 +18,9 @@ import BN from "bn.js";
 import bs58 from "bs58";
 import { z } from "zod";
 import { Network, TransactionResultType } from "./connection.js";
+import { SESSIONS_INTERNAL_PAYMASTER_DOMAIN } from "./context.js";
 import { importKey, signMessageWithKey, verifyMessageWithKey, } from "./crypto.js";
-export { createSessionContext } from "./context.js";
+export { createSessionContext, } from "./context.js";
 export { Network, TransactionResultType, createSessionConnection, } from "./connection.js";
 const MESSAGE_HEADER = `Fogo Sessions:
 Signing this intent will allow this app to interact with your on-chain balances. Please make sure you trust this app and the domain in the message matches the domain of the current web application.
@@ -29,9 +30,9 @@ const TOKENLESS_PERMISSIONS_VALUE = "this app may not spend any tokens";
 const CURRENT_MAJOR = "0";
 const CURRENT_MINOR = "3";
 const CURRENT_INTENT_TRANSFER_MAJOR = "0";
-const CURRENT_INTENT_TRANSFER_MINOR = "1";
+const CURRENT_INTENT_TRANSFER_MINOR = "2";
 const CURRENT_BRIDGE_OUT_MAJOR = "0";
-const CURRENT_BRIDGE_OUT_MINOR = "1";
+const CURRENT_BRIDGE_OUT_MINOR = "2";
 const SESSION_ESTABLISHMENT_LOOKUP_TABLE_ADDRESS = {
     [Network.Testnet]: "B8cUjJMqaWWTNNSTXBmeptjWswwCH1gTSCRYv4nu7kJW",
     [Network.Mainnet]: undefined,
@@ -55,15 +56,12 @@ export const establishSession = async (options) => {
             buildIntentInstruction(options, sessionKey, tokenInfo),
             buildStartSessionInstruction(options, sessionKey, tokenInfo),
         ]);
-        return sendSessionEstablishTransaction(options, sessionKey, [
-            ...buildCreateAssociatedTokenAccountInstructions(options, tokenInfo),
-            intentInstruction,
-            startSessionInstruction,
-        ], options.sessionEstablishmentLookupTable);
+        return sendSessionEstablishTransaction(options, sessionKey, [intentInstruction, startSessionInstruction], options.sessionEstablishmentLookupTable);
     }
 };
 const sendSessionEstablishTransaction = async (options, sessionKey, instructions, sessionEstablishmentLookupTable) => {
     const result = await options.context.sendTransaction(sessionKey, instructions, {
+        variation: "Session Establishment",
         addressLookupTable: sessionEstablishmentLookupTable ??
             SESSION_ESTABLISHMENT_LOOKUP_TABLE_ADDRESS[options.context.network],
     });
@@ -92,9 +90,9 @@ export const revokeSession = async (options) => {
             session: options.session.sessionPublicKey,
         })
             .instruction();
-        return options.context.sendTransaction(options.session.sessionKey, [
-            instruction,
-        ]);
+        return options.context.sendTransaction(options.session.sessionKey, [instruction], {
+            variation: "Session Revocation",
+        });
     }
     else {
         return;
@@ -117,7 +115,7 @@ const createSession = async (context, walletPublicKey, sessionKey) => {
             walletPublicKey,
             sessionKey,
             payer: context.payer,
-            sendTransaction: (instructions) => context.sendTransaction(sessionKey, instructions),
+            sendTransaction: (instructions, extraConfig) => context.sendTransaction(sessionKey, instructions, extraConfig),
             sessionInfo,
         };
 };
@@ -420,7 +418,6 @@ const amountToString = (amount, decimals) => {
         ...(decimalTruncated === "" ? [] : [".", decimalTruncated]),
     ].join("");
 };
-const buildCreateAssociatedTokenAccountInstructions = (options, tokens) => tokens.map(({ mint }) => createAssociatedTokenAccountIdempotentInstruction(options.context.payer, getAssociatedTokenAddressSync(mint, options.walletPublicKey), options.walletPublicKey, mint));
 export const getDomainRecordAddress = (domain) => {
     const hash = sha256(domain);
     return PublicKey.findProgramAddressSync([Buffer.from("domain-record"), hash], new PublicKey(DomainRegistryIdl.address))[0];
@@ -432,7 +429,7 @@ const BRIDGING_ADDRESS_LOOKUP_TABLE = {
     },
     [Network.Mainnet]: {
         // USDC
-        UsdcSt7U9H5bVy4WaWgeqoowe8RgXpLShCmxUFgZssx: "DjM31fhuQsjxLmpRFQpFUpZvyXzwQeNvyR1DUd8GMVmo",
+        uSd2czE61Evaf76RNbq4KPpXnkiL3irdzgLFUMe3NoG: "84k3mfNjmyinpZwyev7F15ChEW3Kqa3NoUkCJXXs4qkw",
     },
 };
 const buildStartSessionInstruction = async (options, sessionKey, tokens) => {
@@ -486,12 +483,50 @@ const EstablishSessionResult = {
         error,
     }),
 };
+const USDC_MINT = {
+    [Network.Mainnet]: "uSd2czE61Evaf76RNbq4KPpXnkiL3irdzgLFUMe3NoG",
+    [Network.Testnet]: "ELNbJ1RtERV2fjtuZjbTscDekWhVzkQ1LjmiPsxp5uND",
+};
+const USDC_DECIMALS = 6;
+export const getTransferFee = async (context) => {
+    const { fee, ...config } = await getFee(context);
+    return {
+        ...config,
+        fee: fee.intrachainTransfer,
+    };
+};
+export const getBridgeOutFee = async (context) => {
+    const { fee, ...config } = await getFee(context);
+    return {
+        ...config,
+        fee: fee.bridgeTransfer,
+    };
+};
+const getFee = async (context) => {
+    const program = new IntentTransferProgram(new AnchorProvider(context.connection, {}, {}));
+    const umi = createUmi(context.connection.rpcEndpoint);
+    const usdcMintAddress = USDC_MINT[context.network];
+    const usdcMint = new PublicKey(usdcMintAddress);
+    const [feeConfigPda] = PublicKey.findProgramAddressSync([Buffer.from("fee_config"), usdcMint.toBytes()], program.programId);
+    const feeConfig = await program.account.feeConfig.fetch(feeConfigPda);
+    return {
+        metadata: findMetadataPda(umi, {
+            mint: metaplexPublicKey(usdcMintAddress),
+        })[0],
+        mint: usdcMint,
+        symbolOrMint: "USDC.s",
+        decimals: USDC_DECIMALS,
+        fee: {
+            intrachainTransfer: BigInt(feeConfig.intrachainTransferFee.toString()),
+            bridgeTransfer: BigInt(feeConfig.bridgeTransferFee.toString()),
+        },
+    };
+};
 const TRANSFER_MESSAGE_HEADER = `Fogo Transfer:
 Signing this intent will transfer the tokens as described below.
 `;
 export const sendTransfer = async (options) => {
     const sourceAta = getAssociatedTokenAddressSync(options.mint, options.walletPublicKey);
-    const destinationAta = getAssociatedTokenAddressSync(options.mint, options.recipient);
     const program = new IntentTransferProgram(new AnchorProvider(options.context.connection, {}, {}));
     const umi = createUmi(options.context.connection.rpcEndpoint);
     const metaplexMint = metaplexPublicKey(options.mint.toBase58());
@@ -499,22 +534,28 @@ export const sendTransfer = async (options) => {
     const metadata = await safeFetchMetadata(umi, metadataAddress);
     const symbol = metadata?.symbol ?? undefined;
     return options.context.sendTransaction(undefined, [
-        createAssociatedTokenAccountIdempotentInstruction(options.context.payer, destinationAta, options.recipient, options.mint),
-        await buildTransferIntentInstruction(program, options, symbol),
+        await buildTransferIntentInstruction(program, options, symbol, options.feeConfig.symbolOrMint, amountToString(options.feeConfig.fee, options.feeConfig.decimals)),
         await program.methods
             .sendTokens()
             .accounts({
-            destination: destinationAta,
+            destinationOwner: options.recipient,
+            feeMetadata: options.feeConfig.metadata,
+            feeMint: options.feeConfig.mint,
+            feeSource: getAssociatedTokenAddressSync(options.feeConfig.mint, options.walletPublicKey),
             mint: options.mint,
             source: sourceAta,
-            sponsor: options.context.payer,
+            sponsor: options.context.internalPayer,
+            metadata:
             // eslint-disable-next-line unicorn/no-null
-            metadata: symbol === undefined ? null : new PublicKey(metadataAddress),
+            symbol === undefined ? null : new PublicKey(metadataAddress),
         })
             .instruction(),
-    ]);
+    ], {
+        variation: "Intent Transfer",
+        paymasterDomain: SESSIONS_INTERNAL_PAYMASTER_DOMAIN,
+    });
 };
-const buildTransferIntentInstruction = async (program, options, symbol) => {
+const buildTransferIntentInstruction = async (program, options, symbol, feeToken, feeAmount) => {
     const [nonce, { decimals }] = await Promise.all([
         getNonce(program, options.walletPublicKey, NonceType.Transfer),
         getMint(options.context.connection, options.mint),
@@ -527,6 +568,8 @@ const buildTransferIntentInstruction = async (program, options, symbol) => {
             token: symbol ?? options.mint.toBase58(),
             amount: amountToString(options.amount, decimals),
             recipient: options.recipient.toBase58(),
+            fee_token: feeToken,
+            fee_amount: feeAmount,
             nonce: nonce === null ? "1" : nonce.nonce.add(new BN(1)).toString(),
         }),
     ].join("\n"));
@@ -540,6 +583,7 @@ const buildTransferIntentInstruction = async (program, options, symbol) => {
 const BRIDGE_OUT_MESSAGE_HEADER = `Fogo Bridge Transfer:
 Signing this intent will bridge out the tokens as described below.
 `;
+const BRIDGE_OUT_CUS = 220_000;
 export const bridgeOut = async (options) => {
     const { wh, route, transferRequest, transferParams, decimals } = await buildWormholeTransfer(options, options.context.connection);
     // @ts-expect-error the wormhole client types are incorrect and do not
@@ -550,20 +594,20 @@ export const bridgeOut = async (options) => {
     const metaplexMint = metaplexPublicKey(options.fromToken.mint.toBase58());
     const metadataAddress = findMetadataPda(umi, { mint: metaplexMint })[0];
     const outboxItem = Keypair.generate();
-    const [metadata, nttPdas] = await Promise.all([
+    const [metadata, nttPdas, destinationAtaExists] = await Promise.all([
         safeFetchMetadata(umi, metadataAddress),
         getNttPdas(options, wh, program, outboxItem.publicKey, new PublicKey(quote.payeeAddress)),
+        getDestinationAtaExists(options.context, options.toToken.mint, options.walletPublicKey),
     ]);
-    return options.context.sendTransaction(options.sessionKey, await Promise.all([
-        buildBridgeOutIntent(program, options, decimals, metadata?.symbol),
+    const instructions = await Promise.all([
+        buildBridgeOutIntent(program, options, decimals, metadata?.symbol, options.feeConfig.symbolOrMint, amountToString(options.feeConfig.fee, options.feeConfig.decimals)),
         program.methods
             .bridgeNttTokens({
-            execAmount: new BN(quote.estimatedCost.toString()),
-            relayInstructions: Buffer.from(quote.relayInstructions),
-            signedQuoteBytes: Buffer.from(quote.signedQuote),
+            payDestinationAtaRent: !destinationAtaExists,
+            signedQuoteBytes: [...quote.signedQuote],
         })
             .accounts({
-            sponsor: options.context.payer,
+            sponsor: options.context.internalPayer,
             mint: options.fromToken.mint,
             metadata: metadata?.symbol === undefined
                 ? // eslint-disable-next-line unicorn/no-null
@@ -571,13 +615,27 @@ export const bridgeOut = async (options) => {
                 : new PublicKey(metadataAddress),
             source: getAssociatedTokenAddressSync(options.fromToken.mint, options.walletPublicKey),
             ntt: nttPdas,
+            feeMetadata: options.feeConfig.metadata,
+            feeMint: options.feeConfig.mint,
+            feeSource: getAssociatedTokenAddressSync(options.feeConfig.mint, options.walletPublicKey),
         })
             .instruction(),
-    ]), {
+    ]);
+    return options.context.sendTransaction(options.sessionKey, [
+        ComputeBudgetProgram.setComputeUnitLimit({ units: BRIDGE_OUT_CUS }),
+        ...instructions,
+    ], {
+        variation: "Intent NTT Bridge",
+        paymasterDomain: SESSIONS_INTERNAL_PAYMASTER_DOMAIN,
         extraSigners: [outboxItem],
         addressLookupTable: BRIDGING_ADDRESS_LOOKUP_TABLE[options.context.network]?.[options.fromToken.mint.toBase58()],
     });
 };
+const getDestinationAtaExists = async (context, token, wallet) => {
+    const solanaConnection = await context.getSolanaConnection();
+    const ataAccount = await solanaConnection.getAccountInfo(getAssociatedTokenAddressSync(token, wallet));
+    return ataAccount !== null;
+};
 // Here we use the Wormhole SDKs to produce the wormhole pdas that are needed
 // for the bridge out transaction.  Currently this is using wormhole SDK apis
 // that are _technically_ public but it seems likely these are not considered to
@@ -595,6 +653,10 @@ const getNttPdas = async (options, wh, program, outboxItemPublicKey, quotePayeeA
     const transceiverPdas = NTT.transceiverPdas(options.fromToken.manager);
     const [intentTransferSetterPda] = PublicKey.findProgramAddressSync([Buffer.from("intent_transfer")], program.programId);
     const wormholePdas = utils.getWormholeDerivedAccounts(options.fromToken.manager, coreBridgeContract);
+    const [registeredTransceiverPda] = PublicKey.findProgramAddressSync([
+        Buffer.from("registered_transceiver"),
+        options.fromToken.manager.toBytes(),
+    ], options.fromToken.manager);
     return {
         emitter: transceiverPdas.emitterAccount(),
         nttConfig: pdas.configAccount(),
@@ -607,7 +669,7 @@ const getNttPdas = async (options, wh, program, outboxItemPublicKey, quotePayeeA
         nttSessionAuthority: pdas.sessionAuthority(intentTransferSetterPda, NTT.transferArgs(options.amount, Wormhole.chainAddress("Solana", options.walletPublicKey.toBase58()), false)),
         nttTokenAuthority: pdas.tokenAuthority(),
         payeeNttWithExecutor: quotePayeeAddress,
-        transceiver: options.fromToken.transceiver,
+        transceiver: registeredTransceiverPda,
         wormholeProgram: coreBridgeContract,
         wormholeBridge: wormholePdas.wormholeBridge,
         wormholeFeeCollector: wormholePdas.wormholeFeeCollector,
@@ -615,7 +677,7 @@ const getNttPdas = async (options, wh, program, outboxItemPublicKey, quotePayeeA
         wormholeSequence: wormholePdas.wormholeSequence,
     };
 };
-const buildBridgeOutIntent = async (program, options, decimals, symbol) => {
+const buildBridgeOutIntent = async (program, options, decimals, symbol, feeToken, feeAmount) => {
     const nonce = await getNonce(program, options.walletPublicKey, NonceType.Bridge);
     const message = new TextEncoder().encode([
         BRIDGE_OUT_MESSAGE_HEADER,
@@ -626,6 +688,8 @@ const buildBridgeOutIntent = async (program, options, decimals, symbol) => {
             token: symbol ?? options.fromToken.mint.toBase58(),
             amount: amountToString(options.amount, decimals),
             recipient_address: options.walletPublicKey.toBase58(),
+            fee_token: feeToken,
+            fee_amount: feeAmount,
             nonce: nonce === null ? "1" : nonce.nonce.add(new BN(1)).toString(),
         }),
     ].join("\n"));

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@fogo/sessions-sdk",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "description": "A set of utilities for integrating with Fogo sessions",
   "keywords": [
     "fogo",
@@ -44,6 +44,6 @@
     "bn.js": "^5.1.2",
     "bs58": "^6.0.0",
     "zod": "^3.25.62",
-    "@fogo/sessions-idls": "^0.0.8"
+    "@fogo/sessions-idls": "^0.0.9"
   }
 }