@fogo/sessions-sdk 0.0.19 → 0.0.21

package/cjs/index.d.ts

@@ -1310,6 +1310,20 @@ export type Session = {
     sendTransaction: (instructions: Parameters<SessionContext["sendTransaction"]>[1]) => 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

@@ -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");
@@ -39,9 +39,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,
@@ -446,7 +446,10 @@ const BRIDGING_ADDRESS_LOOKUP_TABLE = {
         // USDC
         ELNbJ1RtERV2fjtuZjbTscDekWhVzkQ1LjmiPsxp5uND: "4FCi6LptexBdZtaePsoCMeb1XpCijxnWu96g5LsSb6WP",
     },
-    [connection_js_1.Network.Mainnet]: undefined,
+    [connection_js_1.Network.Mainnet]: {
+        // USDC
+        uSd2czE61Evaf76RNbq4KPpXnkiL3irdzgLFUMe3NoG: "84k3mfNjmyinpZwyev7F15ChEW3Kqa3NoUkCJXXs4qkw",
+    },
 };
 const buildStartSessionInstruction = async (options, sessionKey, tokens) => {
     const instruction = new sessions_idls_1.SessionManagerProgram(new anchor_1.AnchorProvider(options.context.connection, {}, {})).methods
@@ -499,12 +502,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: context.network === connection_js_1.Network.Mainnet ? "USDC.s" : "USDC",
+        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());
@@ -512,12 +555,14 @@ 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,
@@ -528,7 +573,7 @@ const sendTransfer = async (options) => {
     ]);
 };
 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),
@@ -541,6 +586,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"));
@@ -554,6 +601,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
@@ -564,35 +612,47 @@ 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),
+    ]);
+    const instructions = await Promise.all([
+        buildBridgeOutIntent(program, options, decimals, metadata?.symbol, options.feeConfig.symbolOrMint, amountToString(options.feeConfig.fee, options.feeConfig.decimals)),
+        program.methods
+            .bridgeNttTokens({
+            payDestinationAtaRent: !destinationAtaExists,
+            signedQuoteBytes: Buffer.from(quote.signedQuote),
+        })
+            .accounts({
+            sponsor: options.context.payer,
+            mint: options.fromToken.mint,
+            metadata: metadata?.symbol === undefined
+                ? // eslint-disable-next-line unicorn/no-null
+                    null
+                : 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(),
     ]);
-    const bridgeInstruction = await program.methods
-        .bridgeNttTokens({
-        execAmount: new bn_js_1.default(quote.estimatedCost.toString()),
-        relayInstructions: Buffer.from(quote.relayInstructions),
-        signedQuoteBytes: Buffer.from(quote.signedQuote),
-    })
-        .accounts({
-        sponsor: options.context.payer,
-        mint: options.fromToken.mint,
-        metadata: 
-        // eslint-disable-next-line unicorn/no-null
-        metadata?.symbol === undefined ? null : new web3_js_1.PublicKey(metadataAddress),
-        source: (0, spl_token_1.getAssociatedTokenAddressSync)(options.fromToken.mint, options.walletPublicKey),
-        ntt: nttPdas,
-    })
-        .instruction();
     return options.context.sendTransaction(options.sessionKey, [
-        await buildBridgeOutIntent(program, options, decimals, metadata?.symbol),
-        bridgeInstruction,
+        web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: BRIDGE_OUT_CUS }),
+        ...instructions,
     ], {
         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
@@ -610,6 +670,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(),
@@ -622,14 +686,15 @@ 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,
         wormholeMessage: transceiverPdas.wormholeMessageAccount(outboxItemPublicKey),
         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,
@@ -640,6 +705,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"));
@@ -665,7 +732,7 @@ const bridgeIn = async (options) => {
             // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access
             transaction.transaction, solanaConnection, 
             // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
-            { signers: transaction.signers, skipPreflight: true }))),
+            { signers: transaction.signers }))),
         }, quote, sdk_1.Wormhole.chainAddress("Fogo", options.walletPublicKey.toBase58())));
     }
     else {
@@ -674,8 +741,11 @@ const bridgeIn = async (options) => {
 };
 exports.bridgeIn = bridgeIn;
 const buildWormholeTransfer = async (options, connection) => {
+    const solanaConnection = await options.context.getSolanaConnection();
     const [wh, { decimals }] = await Promise.all([
-        (0, sdk_1.wormhole)(NETWORK_TO_WORMHOLE_NETWORK[options.context.network], [solana_1.default]),
+        (0, sdk_1.wormhole)(NETWORK_TO_WORMHOLE_NETWORK[options.context.network], [solana_1.default], {
+            chains: { Solana: { rpc: solanaConnection.rpcEndpoint } },
+        }),
         (0, spl_token_1.getMint)(connection, options.fromToken.mint),
     ]);
     const Route = (0, sdk_route_ntt_1.nttExecutorRoute)({
@@ -710,6 +780,7 @@ const buildWormholeTransfer = async (options, connection) => {
     });
     const route = new Route(wh);
     const transferRequest = await sdk_1.routes.RouteTransferRequest.create(wh, {
+        recipient: sdk_1.Wormhole.chainAddress(options.toToken.chain, options.walletPublicKey.toBase58()),
         source: sdk_1.Wormhole.tokenId(options.fromToken.chain, options.fromToken.mint.toBase58()),
         destination: sdk_1.Wormhole.tokenId(options.toToken.chain, options.toToken.mint.toBase58()),
     });

package/esm/index.d.ts

@@ -1310,6 +1310,20 @@ export type Session = {
     sendTransaction: (instructions: Parameters<SessionContext["sendTransaction"]>[1]) => 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

@@ -7,7 +7,7 @@ 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 { 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";
@@ -29,9 +29,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,
@@ -430,7 +430,10 @@ const BRIDGING_ADDRESS_LOOKUP_TABLE = {
         // USDC
         ELNbJ1RtERV2fjtuZjbTscDekWhVzkQ1LjmiPsxp5uND: "4FCi6LptexBdZtaePsoCMeb1XpCijxnWu96g5LsSb6WP",
     },
-    [Network.Mainnet]: undefined,
+    [Network.Mainnet]: {
+        // USDC
+        uSd2czE61Evaf76RNbq4KPpXnkiL3irdzgLFUMe3NoG: "84k3mfNjmyinpZwyev7F15ChEW3Kqa3NoUkCJXXs4qkw",
+    },
 };
 const buildStartSessionInstruction = async (options, sessionKey, tokens) => {
     const instruction = new SessionManagerProgram(new AnchorProvider(options.context.connection, {}, {})).methods
@@ -483,12 +486,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: context.network === Network.Mainnet ? "USDC.s" : "USDC",
+        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());
@@ -496,12 +537,14 @@ 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,
@@ -511,7 +554,7 @@ export const sendTransfer = async (options) => {
             .instruction(),
     ]);
 };
-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),
@@ -524,6 +567,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"));
@@ -537,6 +582,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
@@ -547,34 +593,46 @@ 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),
+    ]);
+    const instructions = await Promise.all([
+        buildBridgeOutIntent(program, options, decimals, metadata?.symbol, options.feeConfig.symbolOrMint, amountToString(options.feeConfig.fee, options.feeConfig.decimals)),
+        program.methods
+            .bridgeNttTokens({
+            payDestinationAtaRent: !destinationAtaExists,
+            signedQuoteBytes: Buffer.from(quote.signedQuote),
+        })
+            .accounts({
+            sponsor: options.context.payer,
+            mint: options.fromToken.mint,
+            metadata: metadata?.symbol === undefined
+                ? // eslint-disable-next-line unicorn/no-null
+                    null
+                : 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(),
     ]);
-    const bridgeInstruction = await program.methods
-        .bridgeNttTokens({
-        execAmount: new BN(quote.estimatedCost.toString()),
-        relayInstructions: Buffer.from(quote.relayInstructions),
-        signedQuoteBytes: Buffer.from(quote.signedQuote),
-    })
-        .accounts({
-        sponsor: options.context.payer,
-        mint: options.fromToken.mint,
-        metadata: 
-        // eslint-disable-next-line unicorn/no-null
-        metadata?.symbol === undefined ? null : new PublicKey(metadataAddress),
-        source: getAssociatedTokenAddressSync(options.fromToken.mint, options.walletPublicKey),
-        ntt: nttPdas,
-    })
-        .instruction();
     return options.context.sendTransaction(options.sessionKey, [
-        await buildBridgeOutIntent(program, options, decimals, metadata?.symbol),
-        bridgeInstruction,
+        ComputeBudgetProgram.setComputeUnitLimit({ units: BRIDGE_OUT_CUS }),
+        ...instructions,
     ], {
         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
@@ -592,6 +650,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(),
@@ -604,14 +666,15 @@ 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,
         wormholeMessage: transceiverPdas.wormholeMessageAccount(outboxItemPublicKey),
         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,
@@ -622,6 +685,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"));
@@ -647,7 +712,7 @@ export const bridgeIn = async (options) => {
             // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access
             transaction.transaction, solanaConnection, 
             // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
-            { signers: transaction.signers, skipPreflight: true }))),
+            { signers: transaction.signers }))),
         }, quote, Wormhole.chainAddress("Fogo", options.walletPublicKey.toBase58())));
     }
     else {
@@ -655,8 +720,11 @@ export const bridgeIn = async (options) => {
     }
 };
 const buildWormholeTransfer = async (options, connection) => {
+    const solanaConnection = await options.context.getSolanaConnection();
     const [wh, { decimals }] = await Promise.all([
-        wormhole(NETWORK_TO_WORMHOLE_NETWORK[options.context.network], [solanaSdk]),
+        wormhole(NETWORK_TO_WORMHOLE_NETWORK[options.context.network], [solanaSdk], {
+            chains: { Solana: { rpc: solanaConnection.rpcEndpoint } },
+        }),
         getMint(connection, options.fromToken.mint),
     ]);
     const Route = nttExecutorRoute({
@@ -691,6 +759,7 @@ const buildWormholeTransfer = async (options, connection) => {
     });
     const route = new Route(wh);
     const transferRequest = await routes.RouteTransferRequest.create(wh, {
+        recipient: Wormhole.chainAddress(options.toToken.chain, options.walletPublicKey.toBase58()),
         source: Wormhole.tokenId(options.fromToken.chain, options.fromToken.mint.toBase58()),
         destination: Wormhole.tokenId(options.toToken.chain, options.toToken.mint.toBase58()),
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fogo/sessions-sdk",
-  "version": "0.0.19",
+  "version": "0.0.21",
   "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"
   }
 }