@fogo/sessions-sdk 0.0.19 → 0.0.20

package/cjs/index.js

@@ -446,7 +446,10 @@ const BRIDGING_ADDRESS_LOOKUP_TABLE = {
         // USDC
         ELNbJ1RtERV2fjtuZjbTscDekWhVzkQ1LjmiPsxp5uND: "4FCi6LptexBdZtaePsoCMeb1XpCijxnWu96g5LsSb6WP",
     },
-    [connection_js_1.Network.Mainnet]: undefined,
+    [connection_js_1.Network.Mainnet]: {
+        // USDC
+        UsdcSt7U9H5bVy4WaWgeqoowe8RgXpLShCmxUFgZssx: "DjM31fhuQsjxLmpRFQpFUpZvyXzwQeNvyR1DUd8GMVmo",
+    },
 };
 const buildStartSessionInstruction = async (options, sessionKey, tokens) => {
     const instruction = new sessions_idls_1.SessionManagerProgram(new anchor_1.AnchorProvider(options.context.connection, {}, {})).methods
@@ -568,26 +571,26 @@ const bridgeOut = async (options) => {
         (0, mpl_token_metadata_1.safeFetchMetadata)(umi, metadataAddress),
         getNttPdas(options, wh, program, outboxItem.publicKey, new web3_js_1.PublicKey(quote.payeeAddress)),
     ]);
-    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,
-    ], {
+    return options.context.sendTransaction(options.sessionKey, await Promise.all([
+        buildBridgeOutIntent(program, options, decimals, metadata?.symbol),
+        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: 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,
+        })
+            .instruction(),
+    ]), {
         extraSigners: [outboxItem],
         addressLookupTable: BRIDGING_ADDRESS_LOOKUP_TABLE[options.context.network]?.[options.fromToken.mint.toBase58()],
     });
@@ -623,6 +626,7 @@ const getNttPdas = async (options, wh, program, outboxItemPublicKey, quotePayeeA
         nttTokenAuthority: pdas.tokenAuthority(),
         payeeNttWithExecutor: quotePayeeAddress,
         transceiver: options.fromToken.transceiver,
+        wormholeProgram: coreBridgeContract,
         wormholeBridge: wormholePdas.wormholeBridge,
         wormholeFeeCollector: wormholePdas.wormholeFeeCollector,
         wormholeMessage: transceiverPdas.wormholeMessageAccount(outboxItemPublicKey),
@@ -665,7 +669,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 +678,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 +717,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.js

@@ -430,7 +430,10 @@ const BRIDGING_ADDRESS_LOOKUP_TABLE = {
         // USDC
         ELNbJ1RtERV2fjtuZjbTscDekWhVzkQ1LjmiPsxp5uND: "4FCi6LptexBdZtaePsoCMeb1XpCijxnWu96g5LsSb6WP",
     },
-    [Network.Mainnet]: undefined,
+    [Network.Mainnet]: {
+        // USDC
+        UsdcSt7U9H5bVy4WaWgeqoowe8RgXpLShCmxUFgZssx: "DjM31fhuQsjxLmpRFQpFUpZvyXzwQeNvyR1DUd8GMVmo",
+    },
 };
 const buildStartSessionInstruction = async (options, sessionKey, tokens) => {
     const instruction = new SessionManagerProgram(new AnchorProvider(options.context.connection, {}, {})).methods
@@ -551,26 +554,26 @@ export const bridgeOut = async (options) => {
         safeFetchMetadata(umi, metadataAddress),
         getNttPdas(options, wh, program, outboxItem.publicKey, new PublicKey(quote.payeeAddress)),
     ]);
-    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,
-    ], {
+    return options.context.sendTransaction(options.sessionKey, await Promise.all([
+        buildBridgeOutIntent(program, options, decimals, metadata?.symbol),
+        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: metadata?.symbol === undefined
+                ? // eslint-disable-next-line unicorn/no-null
+                    null
+                : new PublicKey(metadataAddress),
+            source: getAssociatedTokenAddressSync(options.fromToken.mint, options.walletPublicKey),
+            ntt: nttPdas,
+        })
+            .instruction(),
+    ]), {
         extraSigners: [outboxItem],
         addressLookupTable: BRIDGING_ADDRESS_LOOKUP_TABLE[options.context.network]?.[options.fromToken.mint.toBase58()],
     });
@@ -605,6 +608,7 @@ const getNttPdas = async (options, wh, program, outboxItemPublicKey, quotePayeeA
         nttTokenAuthority: pdas.tokenAuthority(),
         payeeNttWithExecutor: quotePayeeAddress,
         transceiver: options.fromToken.transceiver,
+        wormholeProgram: coreBridgeContract,
         wormholeBridge: wormholePdas.wormholeBridge,
         wormholeFeeCollector: wormholePdas.wormholeFeeCollector,
         wormholeMessage: transceiverPdas.wormholeMessageAccount(outboxItemPublicKey),
@@ -647,7 +651,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 +659,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 +698,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.20",
   "description": "A set of utilities for integrating with Fogo sessions",
   "keywords": [
     "fogo",