@m0-foundation/ntt-sdk-route 0.0.10 → 0.0.12

package/dist/index.d.mts

@@ -44,26 +44,36 @@ declare class M0AutomaticRoute<N extends Network> extends routes.AutomaticRoute<
      */
     transferMLike<N extends Network, C extends EvmChains>(ntt: EvmNtt<N, C>, sender: AccountAddress<C>, amount: bigint, destination: ChainAddress, sourceToken: string, destinationToken: string, options: Ntt.TransferOptions): AsyncGenerator<EvmUnsignedTransaction<N, C>>;
     createUnsignedTx<N extends Network, C extends EvmChains>(ntt: EvmNtt<N, C>, txReq: TransactionRequest, description: string, parallelizable?: boolean): EvmUnsignedTransaction<N, C>;
-    transferSolanaExtension<N extends Network, C extends SolanaChains>(ntt: SolanaNtt<N, C>, network: Network, sender: AccountAddress<C>, amount: bigint, recipient: ChainAddress, sourceToken: string, destinationToken: string, options: Ntt.TransferOptions): AsyncGenerator<SolanaUnsignedTransaction<N, C>>;
+    transferSolanaExtension<N extends Network, C extends SolanaChains>(ntt: SolanaNtt<N, C>, sender: AccountAddress<C>, amount: bigint, recipient: ChainAddress, sourceToken: string, destinationToken: string, options: Ntt.TransferOptions): AsyncGenerator<SolanaUnsignedTransaction<N, C>>;
     track(receipt: R, timeout?: number): AsyncGenerator<R, void, unknown>;
 }
 
-type SolanaNetwork = Exclude<Network, "Devnet">;
+type SvmNetwork = Exclude<Network, "Devnet">;
 type ExtensionDetails = {
     program: PublicKey;
     tokenProgram: PublicKey;
 };
-declare class SolanaRoutes {
-    network: SolanaNetwork;
+declare class SolanaRoutes<N extends Network, C extends SolanaChains> {
+    ntt: SolanaNtt<N, C>;
+    network: SvmNetwork;
     programs: Record<string, PublicKey>;
     extPrograms: Record<string, ExtensionDetails>;
-    constructor(network: Network);
-    getSolanaContracts(): Ntt.Contracts & {
+    constructor(ntt: SolanaNtt<N, C>);
+    private static getPrograms;
+    private static getExtPrograms;
+    static getSolanaContracts(chainContext: ChainContext<Network>): Ntt.Contracts & {
         mLikeTokens: string[];
     };
-    getTransferExtensionBurnIx<N extends Network, C extends SolanaChains>(ntt: SolanaNtt<N, C>, amount: bigint, recipient: ChainAddress, payer: PublicKey, outboxItem: PublicKey, extMint: PublicKey, destinationToken: Uint8Array, shouldQueue?: boolean): TransactionInstruction;
-    getReleaseInboundMintExtensionIx<N extends Network, C extends SolanaChains>(ntt: SolanaNtt<N, C>, payer: string, inboxItem: PublicKey, mMint: PublicKey, extMint: PublicKey, extAta: PublicKey): TransactionInstruction;
+    getTransferExtensionBurnIx(amount: bigint, recipient: ChainAddress, payer: PublicKey, outboxItem: PublicKey, extMint: PublicKey, destinationToken: Uint8Array, shouldQueue?: boolean): TransactionInstruction;
+    getReleaseInboundMintExtensionIx(nttMessage: Ntt.Message, emitterChain: Chain, payer: PublicKey, extMint: PublicKey, extAta: PublicKey): TransactionInstruction;
     getAddressLookupTableAccounts(connection: Connection): Promise<AddressLookupTableAccount>;
+    static createReleaseInboundMintInstruction<N extends Network, C extends SolanaChains>(ntt: SolanaNtt<N, C>, args: {
+        payer: PublicKey;
+        chain: Chain;
+        nttMessage: Ntt.Message;
+        recipient: PublicKey;
+        revertWhenNotReady: boolean;
+    }): Promise<TransactionInstruction[]>;
 }
 
 export { M0AutomaticRoute, SolanaRoutes };

package/dist/index.d.ts

@@ -44,26 +44,36 @@ declare class M0AutomaticRoute<N extends Network> extends routes.AutomaticRoute<
      */
     transferMLike<N extends Network, C extends EvmChains>(ntt: EvmNtt<N, C>, sender: AccountAddress<C>, amount: bigint, destination: ChainAddress, sourceToken: string, destinationToken: string, options: Ntt.TransferOptions): AsyncGenerator<EvmUnsignedTransaction<N, C>>;
     createUnsignedTx<N extends Network, C extends EvmChains>(ntt: EvmNtt<N, C>, txReq: TransactionRequest, description: string, parallelizable?: boolean): EvmUnsignedTransaction<N, C>;
-    transferSolanaExtension<N extends Network, C extends SolanaChains>(ntt: SolanaNtt<N, C>, network: Network, sender: AccountAddress<C>, amount: bigint, recipient: ChainAddress, sourceToken: string, destinationToken: string, options: Ntt.TransferOptions): AsyncGenerator<SolanaUnsignedTransaction<N, C>>;
+    transferSolanaExtension<N extends Network, C extends SolanaChains>(ntt: SolanaNtt<N, C>, sender: AccountAddress<C>, amount: bigint, recipient: ChainAddress, sourceToken: string, destinationToken: string, options: Ntt.TransferOptions): AsyncGenerator<SolanaUnsignedTransaction<N, C>>;
     track(receipt: R, timeout?: number): AsyncGenerator<R, void, unknown>;
 }
 
-type SolanaNetwork = Exclude<Network, "Devnet">;
+type SvmNetwork = Exclude<Network, "Devnet">;
 type ExtensionDetails = {
     program: PublicKey;
     tokenProgram: PublicKey;
 };
-declare class SolanaRoutes {
-    network: SolanaNetwork;
+declare class SolanaRoutes<N extends Network, C extends SolanaChains> {
+    ntt: SolanaNtt<N, C>;
+    network: SvmNetwork;
     programs: Record<string, PublicKey>;
     extPrograms: Record<string, ExtensionDetails>;
-    constructor(network: Network);
-    getSolanaContracts(): Ntt.Contracts & {
+    constructor(ntt: SolanaNtt<N, C>);
+    private static getPrograms;
+    private static getExtPrograms;
+    static getSolanaContracts(chainContext: ChainContext<Network>): Ntt.Contracts & {
         mLikeTokens: string[];
     };
-    getTransferExtensionBurnIx<N extends Network, C extends SolanaChains>(ntt: SolanaNtt<N, C>, amount: bigint, recipient: ChainAddress, payer: PublicKey, outboxItem: PublicKey, extMint: PublicKey, destinationToken: Uint8Array, shouldQueue?: boolean): TransactionInstruction;
-    getReleaseInboundMintExtensionIx<N extends Network, C extends SolanaChains>(ntt: SolanaNtt<N, C>, payer: string, inboxItem: PublicKey, mMint: PublicKey, extMint: PublicKey, extAta: PublicKey): TransactionInstruction;
+    getTransferExtensionBurnIx(amount: bigint, recipient: ChainAddress, payer: PublicKey, outboxItem: PublicKey, extMint: PublicKey, destinationToken: Uint8Array, shouldQueue?: boolean): TransactionInstruction;
+    getReleaseInboundMintExtensionIx(nttMessage: Ntt.Message, emitterChain: Chain, payer: PublicKey, extMint: PublicKey, extAta: PublicKey): TransactionInstruction;
     getAddressLookupTableAccounts(connection: Connection): Promise<AddressLookupTableAccount>;
+    static createReleaseInboundMintInstruction<N extends Network, C extends SolanaChains>(ntt: SolanaNtt<N, C>, args: {
+        payer: PublicKey;
+        chain: Chain;
+        nttMessage: Ntt.Message;
+        recipient: PublicKey;
+        revertWhenNotReady: boolean;
+    }): Promise<TransactionInstruction[]>;
 }
 
 export { M0AutomaticRoute, SolanaRoutes };

package/dist/index.js

@@ -17,13 +17,15 @@ function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 var BN__default = /*#__PURE__*/_interopDefault(BN);
 
 // src/m0AutomaticRoute.ts
-var SolanaRoutes = class {
-  constructor(network) {
-    if (network === "Devnet") {
-      throw new Error("Solana does not support Devnet for NTT contracts");
-    }
-    this.network = network;
-    this.programs = {
+var SolanaRoutes = class _SolanaRoutes {
+  constructor(ntt) {
+    this.ntt = ntt;
+    this.network = ntt.network;
+    this.programs = _SolanaRoutes.getPrograms(this.network);
+    this.extPrograms = _SolanaRoutes.getExtPrograms(this.network);
+  }
+  static getPrograms(network) {
+    return {
       Mainnet: {
         swap: pk("MSwapi3WhNKMUGm9YrxGhypgUEt7wYQH3ZgG32XoWzH"),
         earn: pk("mz2vDzjbQDUDXBH6FPF5s4odCJ4y8YLE5QWaZ8XdZ9Z"),
@@ -41,7 +43,9 @@ var SolanaRoutes = class {
         quoter: pk("Nqd6XqA8LbsCuG8MLWWuP865NV6jR1MbXeKxD4HLKDJ")
       }
     }[network];
-    this.extPrograms = {
+  }
+  static getExtPrograms(network) {
+    return {
       Mainnet: {
         mzeroXDoBpRVhnEXBra27qzAMdxgpWVY3DzQW7xMVJp: {
           program: pk("wMXX1K1nca5W4pZr1piETe78gcAVVrEFi9f4g46uXko"),
@@ -72,16 +76,22 @@ var SolanaRoutes = class {
       }
     }[network];
   }
-  getSolanaContracts() {
+  static getSolanaContracts(chainContext) {
+    const programs = _SolanaRoutes.getPrograms(
+      chainContext.network
+    );
+    const extPrograms = _SolanaRoutes.getExtPrograms(
+      chainContext.network
+    );
     return {
-      token: this.programs.mMint.toBase58(),
-      mLikeTokens: Object.keys(this.extPrograms),
-      manager: this.programs.portal.toBase58(),
-      transceiver: { wormhole: this.programs.portal.toBase58() },
-      quoter: this.programs.quoter.toBase58()
+      token: programs.mMint.toBase58(),
+      mLikeTokens: Object.keys(extPrograms),
+      manager: programs.portal.toBase58(),
+      transceiver: { wormhole: programs.portal.toBase58() },
+      quoter: programs.quoter.toBase58()
     };
   }
-  getTransferExtensionBurnIx(ntt, amount2, recipient, payer, outboxItem, extMint, destinationToken, shouldQueue = true) {
+  getTransferExtensionBurnIx(amount2, recipient, payer, outboxItem, extMint, destinationToken, shouldQueue = true) {
     const recipientAddress = Buffer.alloc(32);
     const dest = Buffer.from(recipient.address.toUint8Array());
     dest.copy(recipientAddress);
@@ -98,7 +108,7 @@ var SolanaRoutes = class {
     }
     const { program: extProgram, tokenProgram: extTokenProgram } = extension;
     return new web3_js.TransactionInstruction({
-      programId: ntt.program.programId,
+      programId: this.ntt.program.programId,
       keys: [
         {
           pubkey: payer,
@@ -107,7 +117,7 @@ var SolanaRoutes = class {
         },
         {
           // config
-          pubkey: ntt.pdas.configAccount(),
+          pubkey: this.ntt.pdas.configAccount(),
           isSigner: false,
           isWritable: false
         },
@@ -123,7 +133,7 @@ var SolanaRoutes = class {
             this.programs.mMint,
             web3_js.PublicKey.findProgramAddressSync(
               [Buffer.from("token_authority")],
-              ntt.program.programId
+              this.ntt.program.programId
             )[0],
             true,
             splToken.TOKEN_2022_PROGRAM_ID
@@ -145,13 +155,13 @@ var SolanaRoutes = class {
         },
         {
           // outbox rate limit
-          pubkey: ntt.pdas.outboxRateLimitAccount(),
+          pubkey: this.ntt.pdas.outboxRateLimitAccount(),
           isSigner: false,
           isWritable: true
         },
         {
           // custody
-          pubkey: ntt.config.custody,
+          pubkey: this.ntt.config.custody,
           isSigner: false,
           isWritable: true
         },
@@ -163,19 +173,19 @@ var SolanaRoutes = class {
         },
         {
           // inbox rate limit
-          pubkey: ntt.pdas.inboxRateLimitAccount(recipient.chain),
+          pubkey: this.ntt.pdas.inboxRateLimitAccount(recipient.chain),
           isSigner: false,
           isWritable: true
         },
         {
           // peer
-          pubkey: ntt.pdas.peerAccount(recipient.chain),
+          pubkey: this.ntt.pdas.peerAccount(recipient.chain),
           isSigner: false,
           isWritable: false
         },
         {
           // session auth
-          pubkey: ntt.pdas.sessionAuthority(payer, {
+          pubkey: this.ntt.pdas.sessionAuthority(payer, {
             amount: new BN__default.default(amount2),
             recipientChain: {
               id: 2
@@ -191,7 +201,7 @@ var SolanaRoutes = class {
           // token auth
           pubkey: web3_js.PublicKey.findProgramAddressSync(
             [Buffer.from("token_authority")],
-            ntt.program.programId
+            this.ntt.program.programId
           )[0],
           isSigner: false,
           isWritable: false
@@ -306,7 +316,7 @@ var SolanaRoutes = class {
       ])
     });
   }
-  getReleaseInboundMintExtensionIx(ntt, payer, inboxItem, mMint, extMint, extAta) {
+  getReleaseInboundMintExtensionIx(nttMessage, emitterChain, payer, extMint, extAta) {
     const extension = this.extPrograms[extMint.toBase58()];
     if (!extension) {
       throw new Error(
@@ -315,32 +325,32 @@ var SolanaRoutes = class {
     }
     const { program: extProgram, tokenProgram: extTokenProgram } = extension;
     return new web3_js.TransactionInstruction({
-      programId: ntt.program.programId,
+      programId: this.ntt.program.programId,
       keys: [
         {
-          pubkey: pk(payer),
+          pubkey: payer,
           isSigner: true,
           isWritable: true
         },
         {
           // config
-          pubkey: ntt.pdas.configAccount(),
+          pubkey: this.ntt.pdas.configAccount(),
           isSigner: false,
           isWritable: false
         },
         {
           // inbox item
-          pubkey: inboxItem,
+          pubkey: this.ntt.pdas.inboxItemAccount(emitterChain, nttMessage),
           isSigner: false,
           isWritable: true
         },
         {
           // recipient (mint to token auth which wraps to user)
           pubkey: splToken.getAssociatedTokenAddressSync(
-            mMint,
+            this.ntt.config.mint,
             web3_js.PublicKey.findProgramAddressSync(
               [Buffer.from("token_authority")],
-              ntt.program.programId
+              this.ntt.program.programId
             )[0],
             true,
             splToken.TOKEN_2022_PROGRAM_ID
@@ -352,14 +362,14 @@ var SolanaRoutes = class {
           // token auth
           pubkey: web3_js.PublicKey.findProgramAddressSync(
             [Buffer.from("token_authority")],
-            ntt.program.programId
+            this.ntt.program.programId
           )[0],
           isSigner: false,
           isWritable: false
         },
         {
           // m mint
-          pubkey: mMint,
+          pubkey: this.ntt.config.mint,
           isSigner: false,
           isWritable: true
         },
@@ -371,7 +381,7 @@ var SolanaRoutes = class {
         },
         {
           // custody
-          pubkey: ntt.config.custody,
+          pubkey: this.ntt.config.custody,
           isSigner: false,
           isWritable: true
         },
@@ -435,7 +445,7 @@ var SolanaRoutes = class {
         {
           // ext m vault
           pubkey: splToken.getAssociatedTokenAddressSync(
-            mMint,
+            this.ntt.config.mint,
             web3_js.PublicKey.findProgramAddressSync(
               [Buffer.from("m_vault")],
               extProgram
@@ -491,6 +501,77 @@ var SolanaRoutes = class {
       state: web3_js.AddressLookupTableAccount.deserialize(info.data)
     });
   }
+  static async createReleaseInboundMintInstruction(ntt, args) {
+    const router = new _SolanaRoutes(ntt);
+    const { additionalPayload } = args.nttMessage.payload;
+    if (additionalPayload.length < 40) {
+      throw new Error(
+        `Invalid additionalPayload length: ${additionalPayload.length}, expected at least 40 bytes`
+      );
+    }
+    const destinationMint = new web3_js.PublicKey(
+      // first 8 bytes is the index, next 32 bytes is the mint address
+      additionalPayload.slice(8, 40)
+    );
+    if (destinationMint.equals(ntt.config.mint)) {
+      const ix = await sdkSolanaNtt.NTT.createReleaseInboundMintInstruction(
+        ntt.program,
+        ntt.config,
+        args
+      );
+      ix.keys.push(
+        {
+          pubkey: router.programs.earn,
+          isSigner: false,
+          isWritable: false
+        },
+        {
+          pubkey: web3_js.PublicKey.findProgramAddressSync(
+            [Buffer.from("global")],
+            router.programs.earn
+          )[0],
+          isSigner: false,
+          isWritable: true
+        }
+      );
+      return [ix];
+    }
+    const extPrograms = router.extPrograms[destinationMint.toBase58()];
+    if (!extPrograms) {
+      throw new Error(
+        `No extension program found for mint ${destinationMint.toBase58()}`
+      );
+    }
+    const extAta = splToken.getAssociatedTokenAddressSync(
+      destinationMint,
+      args.recipient,
+      true,
+      extPrograms.tokenProgram
+    );
+    const ixs = [];
+    const acctInfo = await ntt.connection.getAccountInfo(extAta);
+    if (acctInfo === null) {
+      ixs.push(
+        splToken.createAssociatedTokenAccountInstruction(
+          args.payer,
+          extAta,
+          args.recipient,
+          destinationMint,
+          extPrograms.tokenProgram
+        )
+      );
+    }
+    ixs.push(
+      router.getReleaseInboundMintExtensionIx(
+        args.nttMessage,
+        args.chain,
+        args.payer,
+        destinationMint,
+        extAta
+      )
+    );
+    return ixs;
+  }
 };
 function pk(address) {
   return new web3_js.PublicKey(address);
@@ -535,9 +616,9 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends sdkConnect.routes.Automa
       case "ArbitrumSepolia":
         return this.EVM_CONTRACTS;
       case "Solana":
-        return new SolanaRoutes(chainContext.network).getSolanaContracts();
+        return SolanaRoutes.getSolanaContracts(chainContext);
       case "Fogo":
-        return new SolanaRoutes(chainContext.network).getSolanaContracts();
+        return SolanaRoutes.getSolanaContracts(chainContext);
       default:
         throw new Error(`Unsupported chain: ${chainContext.chain}`);
     }
@@ -675,7 +756,6 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends sdkConnect.routes.Automa
       // for Solana use custom transfer instruction
       this.transferSolanaExtension(
         ntt,
-        request.fromChain.network,
         // @ts-ignore
         sender,
         transferAmount,
@@ -744,9 +824,9 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends sdkConnect.routes.Automa
       parallelizable
     );
   }
-  async *transferSolanaExtension(ntt, network, sender, amount2, recipient, sourceToken, destinationToken, options) {
-    const router = new SolanaRoutes(network);
-    if (router.getSolanaContracts().token === sourceToken) {
+  async *transferSolanaExtension(ntt, sender, amount2, recipient, sourceToken, destinationToken, options) {
+    const router = new SolanaRoutes(ntt);
+    if ((await ntt.getConfig()).mint.toBase58() === sourceToken) {
       return ntt.transfer(sender, amount2, recipient, options);
     }
     const config = await ntt.getConfig();
@@ -755,7 +835,6 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends sdkConnect.routes.Automa
     const payerAddress = new sdkSolana.SolanaAddress(sender).unwrap();
     const ixs = [
       router.getTransferExtensionBurnIx(
-        ntt,
         amount2,
         recipient,
         new web3_js.PublicKey(sender.toUint8Array()),

package/dist/index.mjs

@@ -1,23 +1,25 @@
 import { routes, Wormhole, isSameToken, amount, finality, chainToPlatform, canonicalAddress, signSendWait, TransferState, universalAddress, toChainId, toUniversal, isSourceInitiated, isSourceFinalized, isAttested, isRedeemed, chainToChainId } from '@wormhole-foundation/sdk-connect';
 import { Ntt } from '@wormhole-foundation/sdk-definitions-ntt';
-import { WEI_PER_GWEI } from '@wormhole-foundation/sdk-solana-ntt';
+import { WEI_PER_GWEI, NTT } from '@wormhole-foundation/sdk-solana-ntt';
 import { EvmAddress, EvmPlatform, addFrom, EvmUnsignedTransaction, addChainId } from '@wormhole-foundation/sdk-evm';
 import { SolanaAddress } from '@wormhole-foundation/sdk-solana';
 import { NttRoute } from '@wormhole-foundation/sdk-route-ntt';
 import { Contract } from 'ethers';
 import { Keypair, PublicKey, Transaction, LAMPORTS_PER_SOL, TransactionMessage, VersionedTransaction, TransactionInstruction, SystemProgram, AddressLookupTableAccount } from '@solana/web3.js';
-import { TOKEN_2022_PROGRAM_ID, getAssociatedTokenAddressSync } from '@solana/spl-token';
+import { TOKEN_2022_PROGRAM_ID, getAssociatedTokenAddressSync, createAssociatedTokenAccountInstruction } from '@solana/spl-token';
 import BN from 'bn.js';
 import { sha256 } from '@noble/hashes/sha2';
 
 // src/m0AutomaticRoute.ts
-var SolanaRoutes = class {
-  constructor(network) {
-    if (network === "Devnet") {
-      throw new Error("Solana does not support Devnet for NTT contracts");
-    }
-    this.network = network;
-    this.programs = {
+var SolanaRoutes = class _SolanaRoutes {
+  constructor(ntt) {
+    this.ntt = ntt;
+    this.network = ntt.network;
+    this.programs = _SolanaRoutes.getPrograms(this.network);
+    this.extPrograms = _SolanaRoutes.getExtPrograms(this.network);
+  }
+  static getPrograms(network) {
+    return {
       Mainnet: {
         swap: pk("MSwapi3WhNKMUGm9YrxGhypgUEt7wYQH3ZgG32XoWzH"),
         earn: pk("mz2vDzjbQDUDXBH6FPF5s4odCJ4y8YLE5QWaZ8XdZ9Z"),
@@ -35,7 +37,9 @@ var SolanaRoutes = class {
         quoter: pk("Nqd6XqA8LbsCuG8MLWWuP865NV6jR1MbXeKxD4HLKDJ")
       }
     }[network];
-    this.extPrograms = {
+  }
+  static getExtPrograms(network) {
+    return {
       Mainnet: {
         mzeroXDoBpRVhnEXBra27qzAMdxgpWVY3DzQW7xMVJp: {
           program: pk("wMXX1K1nca5W4pZr1piETe78gcAVVrEFi9f4g46uXko"),
@@ -66,16 +70,22 @@ var SolanaRoutes = class {
       }
     }[network];
   }
-  getSolanaContracts() {
+  static getSolanaContracts(chainContext) {
+    const programs = _SolanaRoutes.getPrograms(
+      chainContext.network
+    );
+    const extPrograms = _SolanaRoutes.getExtPrograms(
+      chainContext.network
+    );
     return {
-      token: this.programs.mMint.toBase58(),
-      mLikeTokens: Object.keys(this.extPrograms),
-      manager: this.programs.portal.toBase58(),
-      transceiver: { wormhole: this.programs.portal.toBase58() },
-      quoter: this.programs.quoter.toBase58()
+      token: programs.mMint.toBase58(),
+      mLikeTokens: Object.keys(extPrograms),
+      manager: programs.portal.toBase58(),
+      transceiver: { wormhole: programs.portal.toBase58() },
+      quoter: programs.quoter.toBase58()
     };
   }
-  getTransferExtensionBurnIx(ntt, amount2, recipient, payer, outboxItem, extMint, destinationToken, shouldQueue = true) {
+  getTransferExtensionBurnIx(amount2, recipient, payer, outboxItem, extMint, destinationToken, shouldQueue = true) {
     const recipientAddress = Buffer.alloc(32);
     const dest = Buffer.from(recipient.address.toUint8Array());
     dest.copy(recipientAddress);
@@ -92,7 +102,7 @@ var SolanaRoutes = class {
     }
     const { program: extProgram, tokenProgram: extTokenProgram } = extension;
     return new TransactionInstruction({
-      programId: ntt.program.programId,
+      programId: this.ntt.program.programId,
       keys: [
         {
           pubkey: payer,
@@ -101,7 +111,7 @@ var SolanaRoutes = class {
         },
         {
           // config
-          pubkey: ntt.pdas.configAccount(),
+          pubkey: this.ntt.pdas.configAccount(),
           isSigner: false,
           isWritable: false
         },
@@ -117,7 +127,7 @@ var SolanaRoutes = class {
             this.programs.mMint,
             PublicKey.findProgramAddressSync(
               [Buffer.from("token_authority")],
-              ntt.program.programId
+              this.ntt.program.programId
             )[0],
             true,
             TOKEN_2022_PROGRAM_ID
@@ -139,13 +149,13 @@ var SolanaRoutes = class {
         },
         {
           // outbox rate limit
-          pubkey: ntt.pdas.outboxRateLimitAccount(),
+          pubkey: this.ntt.pdas.outboxRateLimitAccount(),
           isSigner: false,
           isWritable: true
         },
         {
           // custody
-          pubkey: ntt.config.custody,
+          pubkey: this.ntt.config.custody,
           isSigner: false,
           isWritable: true
         },
@@ -157,19 +167,19 @@ var SolanaRoutes = class {
         },
         {
           // inbox rate limit
-          pubkey: ntt.pdas.inboxRateLimitAccount(recipient.chain),
+          pubkey: this.ntt.pdas.inboxRateLimitAccount(recipient.chain),
           isSigner: false,
           isWritable: true
         },
         {
           // peer
-          pubkey: ntt.pdas.peerAccount(recipient.chain),
+          pubkey: this.ntt.pdas.peerAccount(recipient.chain),
           isSigner: false,
           isWritable: false
         },
         {
           // session auth
-          pubkey: ntt.pdas.sessionAuthority(payer, {
+          pubkey: this.ntt.pdas.sessionAuthority(payer, {
             amount: new BN(amount2),
             recipientChain: {
               id: 2
@@ -185,7 +195,7 @@ var SolanaRoutes = class {
           // token auth
           pubkey: PublicKey.findProgramAddressSync(
             [Buffer.from("token_authority")],
-            ntt.program.programId
+            this.ntt.program.programId
           )[0],
           isSigner: false,
           isWritable: false
@@ -300,7 +310,7 @@ var SolanaRoutes = class {
       ])
     });
   }
-  getReleaseInboundMintExtensionIx(ntt, payer, inboxItem, mMint, extMint, extAta) {
+  getReleaseInboundMintExtensionIx(nttMessage, emitterChain, payer, extMint, extAta) {
     const extension = this.extPrograms[extMint.toBase58()];
     if (!extension) {
       throw new Error(
@@ -309,32 +319,32 @@ var SolanaRoutes = class {
     }
     const { program: extProgram, tokenProgram: extTokenProgram } = extension;
     return new TransactionInstruction({
-      programId: ntt.program.programId,
+      programId: this.ntt.program.programId,
       keys: [
         {
-          pubkey: pk(payer),
+          pubkey: payer,
           isSigner: true,
           isWritable: true
         },
         {
           // config
-          pubkey: ntt.pdas.configAccount(),
+          pubkey: this.ntt.pdas.configAccount(),
           isSigner: false,
           isWritable: false
         },
         {
           // inbox item
-          pubkey: inboxItem,
+          pubkey: this.ntt.pdas.inboxItemAccount(emitterChain, nttMessage),
           isSigner: false,
           isWritable: true
         },
         {
           // recipient (mint to token auth which wraps to user)
           pubkey: getAssociatedTokenAddressSync(
-            mMint,
+            this.ntt.config.mint,
             PublicKey.findProgramAddressSync(
               [Buffer.from("token_authority")],
-              ntt.program.programId
+              this.ntt.program.programId
             )[0],
             true,
             TOKEN_2022_PROGRAM_ID
@@ -346,14 +356,14 @@ var SolanaRoutes = class {
           // token auth
           pubkey: PublicKey.findProgramAddressSync(
             [Buffer.from("token_authority")],
-            ntt.program.programId
+            this.ntt.program.programId
           )[0],
           isSigner: false,
           isWritable: false
         },
         {
           // m mint
-          pubkey: mMint,
+          pubkey: this.ntt.config.mint,
           isSigner: false,
           isWritable: true
         },
@@ -365,7 +375,7 @@ var SolanaRoutes = class {
         },
         {
           // custody
-          pubkey: ntt.config.custody,
+          pubkey: this.ntt.config.custody,
           isSigner: false,
           isWritable: true
         },
@@ -429,7 +439,7 @@ var SolanaRoutes = class {
         {
           // ext m vault
           pubkey: getAssociatedTokenAddressSync(
-            mMint,
+            this.ntt.config.mint,
             PublicKey.findProgramAddressSync(
               [Buffer.from("m_vault")],
               extProgram
@@ -485,6 +495,77 @@ var SolanaRoutes = class {
       state: AddressLookupTableAccount.deserialize(info.data)
     });
   }
+  static async createReleaseInboundMintInstruction(ntt, args) {
+    const router = new _SolanaRoutes(ntt);
+    const { additionalPayload } = args.nttMessage.payload;
+    if (additionalPayload.length < 40) {
+      throw new Error(
+        `Invalid additionalPayload length: ${additionalPayload.length}, expected at least 40 bytes`
+      );
+    }
+    const destinationMint = new PublicKey(
+      // first 8 bytes is the index, next 32 bytes is the mint address
+      additionalPayload.slice(8, 40)
+    );
+    if (destinationMint.equals(ntt.config.mint)) {
+      const ix = await NTT.createReleaseInboundMintInstruction(
+        ntt.program,
+        ntt.config,
+        args
+      );
+      ix.keys.push(
+        {
+          pubkey: router.programs.earn,
+          isSigner: false,
+          isWritable: false
+        },
+        {
+          pubkey: PublicKey.findProgramAddressSync(
+            [Buffer.from("global")],
+            router.programs.earn
+          )[0],
+          isSigner: false,
+          isWritable: true
+        }
+      );
+      return [ix];
+    }
+    const extPrograms = router.extPrograms[destinationMint.toBase58()];
+    if (!extPrograms) {
+      throw new Error(
+        `No extension program found for mint ${destinationMint.toBase58()}`
+      );
+    }
+    const extAta = getAssociatedTokenAddressSync(
+      destinationMint,
+      args.recipient,
+      true,
+      extPrograms.tokenProgram
+    );
+    const ixs = [];
+    const acctInfo = await ntt.connection.getAccountInfo(extAta);
+    if (acctInfo === null) {
+      ixs.push(
+        createAssociatedTokenAccountInstruction(
+          args.payer,
+          extAta,
+          args.recipient,
+          destinationMint,
+          extPrograms.tokenProgram
+        )
+      );
+    }
+    ixs.push(
+      router.getReleaseInboundMintExtensionIx(
+        args.nttMessage,
+        args.chain,
+        args.payer,
+        destinationMint,
+        extAta
+      )
+    );
+    return ixs;
+  }
 };
 function pk(address) {
   return new PublicKey(address);
@@ -529,9 +610,9 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends routes.AutomaticRoute {
       case "ArbitrumSepolia":
         return this.EVM_CONTRACTS;
       case "Solana":
-        return new SolanaRoutes(chainContext.network).getSolanaContracts();
+        return SolanaRoutes.getSolanaContracts(chainContext);
       case "Fogo":
-        return new SolanaRoutes(chainContext.network).getSolanaContracts();
+        return SolanaRoutes.getSolanaContracts(chainContext);
       default:
         throw new Error(`Unsupported chain: ${chainContext.chain}`);
     }
@@ -669,7 +750,6 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends routes.AutomaticRoute {
       // for Solana use custom transfer instruction
       this.transferSolanaExtension(
         ntt,
-        request.fromChain.network,
         // @ts-ignore
         sender,
         transferAmount,
@@ -738,9 +818,9 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends routes.AutomaticRoute {
       parallelizable
     );
   }
-  async *transferSolanaExtension(ntt, network, sender, amount2, recipient, sourceToken, destinationToken, options) {
-    const router = new SolanaRoutes(network);
-    if (router.getSolanaContracts().token === sourceToken) {
+  async *transferSolanaExtension(ntt, sender, amount2, recipient, sourceToken, destinationToken, options) {
+    const router = new SolanaRoutes(ntt);
+    if ((await ntt.getConfig()).mint.toBase58() === sourceToken) {
       return ntt.transfer(sender, amount2, recipient, options);
     }
     const config = await ntt.getConfig();
@@ -749,7 +829,6 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends routes.AutomaticRoute {
     const payerAddress = new SolanaAddress(sender).unwrap();
     const ixs = [
       router.getTransferExtensionBurnIx(
-        ntt,
         amount2,
         recipient,
         new PublicKey(sender.toUint8Array()),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@m0-foundation/ntt-sdk-route",
-  "version": "0.0.10",
+  "version": "0.0.12",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -20,6 +20,10 @@
   "files": [
     "dist"
   ],
+  "scripts": {
+    "build": "$npm_execpath tsup --clean",
+    "clean": "rm -rf dist"
+  },
   "devDependencies": {
     "@changesets/cli": "^2.28.1",
     "@types/bn.js": "^5.2.0",
@@ -30,6 +34,7 @@
   "publishConfig": {
     "access": "public"
   },
+  "packageManager": "pnpm@10.2.0",
   "dependencies": {
     "@noble/hashes": "^1.8.0",
     "@solana/spl-token": "^0.4.13",
@@ -44,9 +49,5 @@
     "@wormhole-foundation/sdk-solana-ntt": "^0.7.1",
     "bn.js": "^5.2.2",
     "ethers": "^6.5.1"
-  },
-  "scripts": {
-    "build": "$npm_execpath tsup --clean",
-    "clean": "rm -rf dist"
   }
-}
+}