@m0-foundation/ntt-sdk-route 0.0.13 → 0.0.15

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import { Network, routes, Chain, ChainContext, TokenId, Signer, ChainAddress, AccountAddress } from '@wormhole-foundation/sdk-connect';
-import { Ntt } from '@wormhole-foundation/sdk-definitions-ntt';
+import { Ntt, NttWithExecutor } from '@wormhole-foundation/sdk-definitions-ntt';
 import { EvmNtt } from '@wormhole-foundation/sdk-evm-ntt';
 import { SolanaNtt } from '@wormhole-foundation/sdk-solana-ntt';
 import { EvmChains, EvmUnsignedTransaction } from '@wormhole-foundation/sdk-evm';
@@ -21,6 +21,7 @@ type Contracts = Ntt.Contracts & {
 declare class M0AutomaticRoute<N extends Network> extends routes.AutomaticRoute<N, Op, Vp, R> implements routes.StaticRouteMethods<typeof M0AutomaticRoute> {
     static NATIVE_GAS_DROPOFF_SUPPORTED: boolean;
     static EVM_WRAPPED_M_TOKEN: string;
+    static EXECUTOR_ENTRYPOINT: string;
     static EVM_CONTRACTS: Contracts;
     static meta: {
         name: string;
@@ -46,6 +47,8 @@ declare class M0AutomaticRoute<N extends Network> extends routes.AutomaticRoute<
     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>, sender: AccountAddress<C>, amount: bigint, recipient: ChainAddress, sourceToken: string, destinationToken: string, options: Ntt.TransferOptions, outboxItem?: Keypair): AsyncGenerator<SolanaUnsignedTransaction<N, C>>;
     track(receipt: R, timeout?: number): AsyncGenerator<R, void, unknown>;
+    private getExecutorQuote;
+    private requiresExecutor;
 }
 
 type SvmNetwork = Exclude<Network, "Devnet">;
@@ -61,10 +64,14 @@ declare class SolanaRoutes<N extends Network, C extends SolanaChains> {
     constructor(ntt: SolanaNtt<N, C>);
     private static getPrograms;
     private static getExtPrograms;
-    static getSolanaContracts(chainContext: ChainContext<Network>): Ntt.Contracts & {
+    static getSolanaContracts(network: Network, chain: SolanaChains): Ntt.Contracts & {
+        mLikeTokens: string[];
+    };
+    getSolanaContracts(): Ntt.Contracts & {
         mLikeTokens: string[];
     };
     getTransferExtensionBurnIx(amount: bigint, recipient: ChainAddress, payer: PublicKey, outboxItem: PublicKey, extMint: PublicKey, destinationToken: Uint8Array, shouldQueue?: boolean): TransactionInstruction;
+    getExecutorRelayIx(sender: PublicKey, quote: NttWithExecutor.Quote, destinationChain: Chain): Promise<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: {

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { Network, routes, Chain, ChainContext, TokenId, Signer, ChainAddress, AccountAddress } from '@wormhole-foundation/sdk-connect';
-import { Ntt } from '@wormhole-foundation/sdk-definitions-ntt';
+import { Ntt, NttWithExecutor } from '@wormhole-foundation/sdk-definitions-ntt';
 import { EvmNtt } from '@wormhole-foundation/sdk-evm-ntt';
 import { SolanaNtt } from '@wormhole-foundation/sdk-solana-ntt';
 import { EvmChains, EvmUnsignedTransaction } from '@wormhole-foundation/sdk-evm';
@@ -21,6 +21,7 @@ type Contracts = Ntt.Contracts & {
 declare class M0AutomaticRoute<N extends Network> extends routes.AutomaticRoute<N, Op, Vp, R> implements routes.StaticRouteMethods<typeof M0AutomaticRoute> {
     static NATIVE_GAS_DROPOFF_SUPPORTED: boolean;
     static EVM_WRAPPED_M_TOKEN: string;
+    static EXECUTOR_ENTRYPOINT: string;
     static EVM_CONTRACTS: Contracts;
     static meta: {
         name: string;
@@ -46,6 +47,8 @@ declare class M0AutomaticRoute<N extends Network> extends routes.AutomaticRoute<
     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>, sender: AccountAddress<C>, amount: bigint, recipient: ChainAddress, sourceToken: string, destinationToken: string, options: Ntt.TransferOptions, outboxItem?: Keypair): AsyncGenerator<SolanaUnsignedTransaction<N, C>>;
     track(receipt: R, timeout?: number): AsyncGenerator<R, void, unknown>;
+    private getExecutorQuote;
+    private requiresExecutor;
 }
 
 type SvmNetwork = Exclude<Network, "Devnet">;
@@ -61,10 +64,14 @@ declare class SolanaRoutes<N extends Network, C extends SolanaChains> {
     constructor(ntt: SolanaNtt<N, C>);
     private static getPrograms;
     private static getExtPrograms;
-    static getSolanaContracts(chainContext: ChainContext<Network>): Ntt.Contracts & {
+    static getSolanaContracts(network: Network, chain: SolanaChains): Ntt.Contracts & {
+        mLikeTokens: string[];
+    };
+    getSolanaContracts(): Ntt.Contracts & {
         mLikeTokens: string[];
     };
     getTransferExtensionBurnIx(amount: bigint, recipient: ChainAddress, payer: PublicKey, outboxItem: PublicKey, extMint: PublicKey, destinationToken: Uint8Array, shouldQueue?: boolean): TransactionInstruction;
+    getExecutorRelayIx(sender: PublicKey, quote: NttWithExecutor.Quote, destinationChain: Chain): Promise<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: {

package/dist/index.js

@@ -2,19 +2,23 @@
 
 var sdkConnect = require('@wormhole-foundation/sdk-connect');
 var sdkDefinitionsNtt = require('@wormhole-foundation/sdk-definitions-ntt');
-var sdkSolanaNtt = require('@wormhole-foundation/sdk-solana-ntt');
 var sdkEvm = require('@wormhole-foundation/sdk-evm');
 var sdkSolana = require('@wormhole-foundation/sdk-solana');
 var sdkRouteNtt = require('@wormhole-foundation/sdk-route-ntt');
 var ethers = require('ethers');
 var web3_js = require('@solana/web3.js');
 var splToken = require('@solana/spl-token');
+var sdkSolanaNtt = require('@wormhole-foundation/sdk-solana-ntt');
 var BN = require('bn.js');
 var sha2 = require('@noble/hashes/sha2');
+var evm = require('@wormhole-foundation/sdk/platforms/evm');
+var solana = require('@wormhole-foundation/sdk/platforms/solana');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var BN__default = /*#__PURE__*/_interopDefault(BN);
+var evm__default = /*#__PURE__*/_interopDefault(evm);
+var solana__default = /*#__PURE__*/_interopDefault(solana);
 
 // src/m0AutomaticRoute.ts
 var SolanaRoutes = class _SolanaRoutes {
@@ -22,7 +26,10 @@ var SolanaRoutes = class _SolanaRoutes {
     this.ntt = ntt;
     this.network = ntt.network;
     this.programs = _SolanaRoutes.getPrograms(this.network);
-    this.extPrograms = _SolanaRoutes.getExtPrograms(this.network);
+    this.extPrograms = _SolanaRoutes.getExtPrograms(
+      this.network,
+      this.ntt.chain
+    );
   }
   static getPrograms(network) {
     return {
@@ -30,7 +37,7 @@ var SolanaRoutes = class _SolanaRoutes {
         swap: pk("MSwapi3WhNKMUGm9YrxGhypgUEt7wYQH3ZgG32XoWzH"),
         earn: pk("mz2vDzjbQDUDXBH6FPF5s4odCJ4y8YLE5QWaZ8XdZ9Z"),
         lut: pk("9JLRqBqkznKiSoNfotA4ywSRdnWb2fE76SiFrAfkaRCD"),
-        mMint: pk("mzerokyEX9TNDoK4o2YZQBDmMzjokAeN6M2g2S3pLJo"),
+        mMint: pk("mzerojk9tg56ebsrEAhfkyc9VgKjTW2zDqp6C5mhjzH"),
         portal: pk("mzp1q2j5Hr1QuLC3KFBCAUz5aUckT6qyuZKZ3WJnMmY"),
         quoter: pk("Nqd6XqA8LbsCuG8MLWWuP865NV6jR1MbXeKxD4HLKDJ")
       },
@@ -38,13 +45,21 @@ var SolanaRoutes = class _SolanaRoutes {
         swap: pk("MSwapi3WhNKMUGm9YrxGhypgUEt7wYQH3ZgG32XoWzH"),
         earn: pk("mz2vDzjbQDUDXBH6FPF5s4odCJ4y8YLE5QWaZ8XdZ9Z"),
         lut: pk("6GhuWPuAmiJeeSVsr58KjqHcAejJRndCx9BVtHkaYHUR"),
-        mMint: pk("mzeroZRGCah3j5xEWp2Nih3GDejSBbH1rbHoxDg8By6"),
+        mMint: pk("mzerojk9tg56ebsrEAhfkyc9VgKjTW2zDqp6C5mhjzH"),
         portal: pk("mzp1q2j5Hr1QuLC3KFBCAUz5aUckT6qyuZKZ3WJnMmY"),
         quoter: pk("Nqd6XqA8LbsCuG8MLWWuP865NV6jR1MbXeKxD4HLKDJ")
       }
     }[network];
   }
-  static getExtPrograms(network) {
+  static getExtPrograms(network, chain) {
+    if (chain === "Fogo") {
+      return {
+        fUSDqquEMUU8UmU2YWYGZy2Lda1oMzBc88Mkzc1PRDw: {
+          program: pk("extUkDFf3HLekkxbcZ3XRUizMjbxMJgKBay3p9xGVmg"),
+          tokenProgram: splToken.TOKEN_PROGRAM_ID
+        }
+      };
+    }
     return {
       Mainnet: {
         mzeroXDoBpRVhnEXBra27qzAMdxgpWVY3DzQW7xMVJp: {
@@ -72,16 +87,19 @@ var SolanaRoutes = class _SolanaRoutes {
         usdkyPPxgV7sfNyKb8eDz66ogPrkRXG3wS2FVb6LLUf: {
           program: pk("3PskKTHgboCbUSQPMcCAZdZNFHbNvSoZ8zEFYANCdob7"),
           tokenProgram: splToken.TOKEN_2022_PROGRAM_ID
+        },
+        fUSDqquEMUU8UmU2YWYGZy2Lda1oMzBc88Mkzc1PRDw: {
+          program: pk("extUkDFf3HLekkxbcZ3XRUizMjbxMJgKBay3p9xGVmg"),
+          tokenProgram: splToken.TOKEN_PROGRAM_ID
         }
       }
     }[network];
   }
-  static getSolanaContracts(chainContext) {
-    const programs = _SolanaRoutes.getPrograms(
-      chainContext.network
-    );
+  static getSolanaContracts(network, chain) {
+    const programs = _SolanaRoutes.getPrograms(network);
     const extPrograms = _SolanaRoutes.getExtPrograms(
-      chainContext.network
+      network,
+      chain
     );
     return {
       token: programs.mMint.toBase58(),
@@ -91,10 +109,19 @@ var SolanaRoutes = class _SolanaRoutes {
       quoter: programs.quoter.toBase58()
     };
   }
+  getSolanaContracts() {
+    return _SolanaRoutes.getSolanaContracts(this.network, this.ntt.chain);
+  }
   getTransferExtensionBurnIx(amount2, recipient, payer, outboxItem, extMint, destinationToken, shouldQueue = true) {
-    const recipientAddress = Buffer.alloc(32);
-    const dest = Buffer.from(recipient.address.toUint8Array());
-    dest.copy(recipientAddress);
+    const recipientAddress = sdkConnect.toUniversal(
+      recipient.chain,
+      recipient.address.toString()
+    ).toUint8Array();
+    if (recipientAddress.length !== 32) {
+      throw new Error(
+        `recipient address must be 32 bytes, got ${recipientAddress.length} bytes`
+      );
+    }
     if (destinationToken.length !== 32) {
       throw new Error(
         `destinationToken must be 32 bytes, got ${destinationToken.length} bytes`
@@ -107,6 +134,16 @@ var SolanaRoutes = class _SolanaRoutes {
       );
     }
     const { program: extProgram, tokenProgram: extTokenProgram } = extension;
+    const [tokenAuth] = web3_js.PublicKey.findProgramAddressSync(
+      [Buffer.from("token_authority")],
+      this.programs.portal
+    );
+    const sessionAuth = this.ntt.pdas.sessionAuthority(tokenAuth, {
+      amount: new BN__default.default(amount2),
+      recipientChain: { id: sdkConnect.chainToChainId(recipient.chain) },
+      recipientAddress: [...recipientAddress],
+      shouldQueue
+    });
     return new web3_js.TransactionInstruction({
       programId: this.ntt.program.programId,
       keys: [
@@ -131,10 +168,7 @@ var SolanaRoutes = class _SolanaRoutes {
           // from (token auth m token account)
           pubkey: splToken.getAssociatedTokenAddressSync(
             this.programs.mMint,
-            web3_js.PublicKey.findProgramAddressSync(
-              [Buffer.from("token_authority")],
-              this.ntt.program.programId
-            )[0],
+            tokenAuth,
             true,
             splToken.TOKEN_2022_PROGRAM_ID
           ),
@@ -185,24 +219,13 @@ var SolanaRoutes = class _SolanaRoutes {
         },
         {
           // session auth
-          pubkey: this.ntt.pdas.sessionAuthority(payer, {
-            amount: new BN__default.default(amount2),
-            recipientChain: {
-              id: 2
-              // Ethereum
-            },
-            recipientAddress: [...Array(32)],
-            shouldQueue: false
-          }),
+          pubkey: sessionAuth,
           isSigner: false,
           isWritable: false
         },
         {
           // token auth
-          pubkey: web3_js.PublicKey.findProgramAddressSync(
-            [Buffer.from("token_authority")],
-            this.ntt.program.programId
-          )[0],
+          pubkey: tokenAuth,
           isSigner: false,
           isWritable: false
         },
@@ -309,10 +332,79 @@ var SolanaRoutes = class _SolanaRoutes {
         // chain_id
         recipientAddress,
         // recipient_address
-        destinationToken,
-        // destination_token
-        Buffer.from([Number(shouldQueue)])
+        Buffer.from([Number(shouldQueue)]),
         // should_queue
+        destinationToken
+        // destination_token
+      ])
+    });
+  }
+  async getExecutorRelayIx(sender, quote, destinationChain) {
+    const emitter = web3_js.PublicKey.findProgramAddressSync(
+      [Buffer.from("emitter")],
+      this.ntt.program.programId
+    )[0];
+    const bridgeSequence = web3_js.PublicKey.findProgramAddressSync(
+      [Buffer.from("Sequence"), emitter.toBytes()],
+      new web3_js.PublicKey(this.ntt.contracts.coreBridge)
+    )[0];
+    const info = await this.ntt.connection.getAccountInfo(bridgeSequence);
+    const sequence = new BN__default.default(info.data, "le");
+    const vaaReqBytes = Buffer.concat([
+      Buffer.from("ERV1"),
+      // type
+      new BN__default.default(sdkConnect.chainToChainId(this.ntt.chain)).toArrayLike(Buffer, "be", 2),
+      // emitter chain
+      emitter.toBuffer(),
+      // emitter address
+      sequence.toArrayLike(Buffer, "be", 8)
+      // sequence
+    ]);
+    const signedQuoteBytes = Buffer.from(quote.signedQuote);
+    const relayInstructions = Buffer.from(quote.relayInstructions);
+    return new web3_js.TransactionInstruction({
+      keys: [
+        {
+          pubkey: sender,
+          isSigner: true,
+          isWritable: true
+        },
+        {
+          // payee
+          pubkey: new web3_js.PublicKey(quote.payeeAddress),
+          isSigner: false,
+          isWritable: true
+        },
+        {
+          pubkey: web3_js.SystemProgram.programId,
+          isSigner: false,
+          isWritable: false
+        }
+      ],
+      programId: new web3_js.PublicKey("execXUrAsMnqMmTHj5m7N1YQgsDz3cwGLYCYyuDRciV"),
+      data: Buffer.concat([
+        Buffer.from(sha2.sha256("global:request_for_execution").subarray(0, 8)),
+        // [109, 107, 87, 37, 151, 192, 119, 115]
+        new BN__default.default(quote.estimatedCost.toString()).toArrayLike(Buffer, "le", 8),
+        // amount
+        new BN__default.default(sdkConnect.chainToChainId(destinationChain)).toArrayLike(Buffer, "le", 2),
+        // dst_chain
+        this.ntt.program.programId.toBuffer(),
+        // peer portal address
+        sender.toBuffer(),
+        // refund_addr
+        new BN__default.default(signedQuoteBytes.length).toArrayLike(Buffer, "le", 4),
+        // vec length
+        signedQuoteBytes,
+        // signed_quote_bytes
+        new BN__default.default(vaaReqBytes.length).toArrayLike(Buffer, "le", 4),
+        // vec length
+        vaaReqBytes,
+        // request_bytes
+        new BN__default.default(relayInstructions.length).toArrayLike(Buffer, "le", 4),
+        // vec length
+        relayInstructions
+        // relay_instructions
       ])
     });
   }
@@ -577,6 +669,62 @@ function pk(address) {
   return new web3_js.PublicKey(address);
 }
 
+// src/executor.ts
+function getExecutorConfig(network = "Mainnet") {
+  const svmContracts = SolanaRoutes.getSolanaContracts(network, "Solana");
+  const svmChains = ["Solana", "Fogo"];
+  const evmChains = network === "Mainnet" ? ["Ethereum", "Optimism", "Arbitrum"] : ["Sepolia", "ArbitrumSepolia", "OptimismSepolia"];
+  return {
+    ntt: {
+      tokens: {
+        M0: [
+          ...svmChains.map((chain) => ({
+            chain,
+            token: svmContracts.token,
+            manager: svmContracts.manager,
+            transceiver: [
+              {
+                type: "wormhole",
+                address: svmContracts.transceiver.wormhole
+              }
+            ],
+            quoter: svmContracts.quoter
+          })),
+          ...evmChains.map((chain) => ({
+            chain,
+            token: M0AutomaticRoute.EVM_CONTRACTS.token,
+            manager: M0AutomaticRoute.EVM_CONTRACTS.manager,
+            transceiver: [
+              {
+                type: "wormhole",
+                address: M0AutomaticRoute.EVM_CONTRACTS.transceiver.wormhole
+              }
+            ],
+            quoter: M0AutomaticRoute.EVM_CONTRACTS.quoter
+          }))
+        ]
+      }
+    },
+    referrerFee: {
+      feeDbps: 0n,
+      perTokenOverrides: {
+        // SVM chains require extra compute when receiving messages
+        // so we need to override the gas cost
+        Solana: {
+          [svmContracts.token]: {
+            msgValue: 15000000n
+          }
+        },
+        Fogo: {
+          [svmContracts.token]: {
+            msgValue: 15000000n
+          }
+        }
+      }
+    }
+  };
+}
+
 // src/m0AutomaticRoute.ts
 var _M0AutomaticRoute = class _M0AutomaticRoute extends sdkConnect.routes.AutomaticRoute {
   static supportedNetworks() {
@@ -604,21 +752,18 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends sdkConnect.routes.Automa
   static getContracts(chainContext) {
     switch (chainContext.chain) {
       case "Ethereum":
-        return this.EVM_CONTRACTS;
       case "Optimism":
-        return this.EVM_CONTRACTS;
       case "Arbitrum":
-        return this.EVM_CONTRACTS;
       case "Sepolia":
-        return this.EVM_CONTRACTS;
       case "OptimismSepolia":
-        return this.EVM_CONTRACTS;
       case "ArbitrumSepolia":
         return this.EVM_CONTRACTS;
       case "Solana":
-        return SolanaRoutes.getSolanaContracts(chainContext);
       case "Fogo":
-        return SolanaRoutes.getSolanaContracts(chainContext);
+        return SolanaRoutes.getSolanaContracts(
+          chainContext.network,
+          chainContext.chain
+        );
       default:
         throw new Error(`Unsupported chain: ${chainContext.chain}`);
     }
@@ -636,9 +781,11 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends sdkConnect.routes.Automa
       return [];
     }
     const { token: mToken, mLikeTokens } = this.getContracts(toChain);
-    return [mToken, ...mLikeTokens].map(
-      (x) => sdkConnect.Wormhole.tokenId(toChain.chain, x)
-    );
+    const tokens = mLikeTokens.map((x) => sdkConnect.Wormhole.tokenId(toChain.chain, x));
+    if (toChain.chain === "Solana" || toChain.chain === "Fogo") {
+      return tokens;
+    }
+    return [...tokens, sdkConnect.Wormhole.tokenId(toChain.chain, mToken)];
   }
   static isProtocolSupported(chain) {
     return chain.supportsProtocol("Ntt");
@@ -654,10 +801,6 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends sdkConnect.routes.Automa
   }
   async validate(request, params) {
     const options = params.options ?? this.getDefaultOptions();
-    const gasDropoff = sdkConnect.amount.parse(
-      options.gasDropoff ?? "0.0",
-      request.toChain.config.nativeTokenDecimals
-    );
     const parsedAmount = sdkConnect.amount.parse(params.amount, request.source.decimals);
     const trimmedAmount = sdkRouteNtt.NttRoute.trimAmount(
       parsedAmount,
@@ -673,8 +816,7 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends sdkConnect.routes.Automa
         destinationContracts: toContracts,
         options: {
           queue: false,
-          automatic: true,
-          gasDropoff: sdkConnect.amount.units(gasDropoff)
+          automatic: true
         }
       },
       options
@@ -719,7 +861,7 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends sdkConnect.routes.Automa
         )
       },
       destinationNativeGas: sdkConnect.amount.fromBaseUnits(
-        params.normalizedParams.options.gasDropoff ?? 0n,
+        0n,
         toChain.config.nativeTokenDecimals
       ),
       eta: sdkConnect.finality.estimateFinalityTime(request.fromChain.chain)
@@ -780,18 +922,18 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends sdkConnect.routes.Automa
    */
   async *transferMLike(ntt, sender, amount2, destination, sourceToken, destinationToken, options) {
     const senderAddress = new sdkEvm.EvmAddress(sender).toString();
-    const totalPrice = await ntt.quoteDeliveryPrice(destination.chain, options);
     const tokenContract = sdkEvm.EvmPlatform.getTokenImplementation(
       ntt.provider,
       sourceToken
     );
+    const spenderAddress = this.requiresExecutor(destination.chain) ? _M0AutomaticRoute.EXECUTOR_ENTRYPOINT : ntt.managerAddress;
     const allowance = await tokenContract.allowance(
       senderAddress,
-      ntt.managerAddress
+      spenderAddress
     );
     if (allowance < amount2) {
       const txReq2 = await tokenContract.approve.populateTransaction(
-        ntt.managerAddress,
+        spenderAddress,
         amount2
       );
       yield this.createUnsignedTx(
@@ -801,6 +943,36 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends sdkConnect.routes.Automa
       );
     }
     const receiver = sdkConnect.universalAddress(destination);
+    if (this.requiresExecutor(destination.chain)) {
+      const quote = await this.getExecutorQuote(
+        ntt.network,
+        ntt.chain,
+        destination.chain,
+        amount2
+      );
+      const contract2 = new ethers.Contract(_M0AutomaticRoute.EXECUTOR_ENTRYPOINT, [
+        "function transferMLikeToken(uint256 amount, address sourceToken, uint16 destinationChainId, bytes32 destinationToken, bytes32 recipient, bytes32 refundAddress, (uint256 value, address refundAddress, bytes signedQuote, bytes instructions) executorArgs, bytes memory transceiverInstructions) external payable returns (bytes32 messageId)"
+      ]);
+      const executorArgs = {
+        value: quote.estimatedCost,
+        refundAddress: senderAddress,
+        signedQuote: quote.signedQuote,
+        instructions: quote.relayInstructions
+      };
+      const txReq2 = await contract2.getFunction("transferMLikeToken").populateTransaction(
+        amount2,
+        sourceToken,
+        sdkConnect.toChainId(destination.chain),
+        sdkConnect.toUniversal(destination.chain, destinationToken).toString(),
+        receiver,
+        receiver,
+        executorArgs,
+        Uint8Array.from(Buffer.from("01000101", "hex")),
+        { value: quote.estimatedCost }
+      );
+      yield ntt.createUnsignedTx(sdkEvm.addFrom(txReq2, senderAddress), "Ntt.transfer");
+      return;
+    }
     const contract = new ethers.Contract(ntt.managerAddress, [
       "function transferMLikeToken(uint256 amount, address sourceToken, uint16 destinationChainId, bytes32 destinationToken, bytes32 recipient, bytes32 refundAddress) external payable returns (uint64 sequence)"
     ]);
@@ -811,7 +983,7 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends sdkConnect.routes.Automa
       sdkConnect.toUniversal(destination.chain, destinationToken).toString(),
       receiver,
       receiver,
-      { value: totalPrice }
+      { value: await ntt.quoteDeliveryPrice(destination.chain, options) }
     );
     yield ntt.createUnsignedTx(sdkEvm.addFrom(txReq, senderAddress), "Ntt.transfer");
   }
@@ -826,7 +998,7 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends sdkConnect.routes.Automa
   }
   async *transferSolanaExtension(ntt, sender, amount2, recipient, sourceToken, destinationToken, options, outboxItem) {
     const router = new SolanaRoutes(ntt);
-    if ((await ntt.getConfig()).mint.toBase58() === sourceToken) {
+    if (router.getSolanaContracts().token === sourceToken) {
       return ntt.transfer(sender, amount2, recipient, options);
     }
     const config = await ntt.getConfig();
@@ -861,18 +1033,29 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends sdkConnect.routes.Automa
     const tx = new web3_js.Transaction();
     tx.feePayer = payerAddress;
     tx.add(...ixs);
-    if (options.automatic) {
-      if (!ntt.quoter)
+    if (this.requiresExecutor(recipient.chain)) {
+      const quote = await this.getExecutorQuote(
+        ntt.network,
+        ntt.chain,
+        recipient.chain,
+        amount2
+      );
+      tx.add(
+        await router.getExecutorRelayIx(payerAddress, quote, recipient.chain)
+      );
+    } else if (options.automatic) {
+      if (!ntt.quoter) {
         throw new Error(
           "No quoter available, cannot initiate an automatic transfer."
         );
+      }
       const fee = await ntt.quoteDeliveryPrice(recipient.chain, options);
       const relayIx = await ntt.quoter.createRequestRelayInstruction(
         payerAddress,
         outboxItem.publicKey,
         recipient.chain,
         Number(fee) / web3_js.LAMPORTS_PER_SOL,
-        Number(options.gasDropoff ?? 0n) / sdkSolanaNtt.WEI_PER_GWEI
+        0
       );
       tx.add(relayIx);
     }
@@ -952,11 +1135,44 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends sdkConnect.routes.Automa
     }
     yield receipt;
   }
+  async getExecutorQuote(network, sourceChain, destinationChain, amount2) {
+    const wh = new sdkConnect.Wormhole(network, [solana__default.default.Platform, evm__default.default.Platform]);
+    const executorRoute = sdkRouteNtt.nttExecutorRoute(getExecutorConfig(network));
+    const routeInstance = new executorRoute(wh);
+    const resolveM = (chain) => {
+      if (sdkConnect.chainToPlatform(chain) === "Solana") {
+        const c = chain;
+        return SolanaRoutes.getSolanaContracts(network, c).token;
+      }
+      return _M0AutomaticRoute.EVM_CONTRACTS.token;
+    };
+    const transferRequest = await sdkConnect.routes.RouteTransferRequest.create(wh, {
+      source: sdkConnect.Wormhole.tokenId(sourceChain, resolveM(sourceChain)),
+      destination: sdkConnect.Wormhole.tokenId(
+        destinationChain,
+        resolveM(destinationChain)
+      )
+    });
+    const validated = await routeInstance.validate(transferRequest, {
+      amount: amount2.toString()
+    });
+    if (!validated.valid) {
+      throw new Error(`Validation failed: ${validated.error.message}`);
+    }
+    return await routeInstance.fetchExecutorQuote(
+      transferRequest,
+      validated.params
+    );
+  }
+  requiresExecutor(destination) {
+    return sdkConnect.chainToPlatform(destination) === "Solana";
+  }
 };
 // ntt does not support gas drop-off currently
 _M0AutomaticRoute.NATIVE_GAS_DROPOFF_SUPPORTED = false;
 // Wrapped M token address is the same on EVM chains
 _M0AutomaticRoute.EVM_WRAPPED_M_TOKEN = "0x437cc33344a0B27A429f795ff6B469C72698B291";
+_M0AutomaticRoute.EXECUTOR_ENTRYPOINT = "0x8518040a9cf9dfb55a4f099bb0eaabeefeb03643";
 // Contract addresses are the same on all EVM chains
 _M0AutomaticRoute.EVM_CONTRACTS = {
   // M token address is the same on EVM chains

package/dist/index.mjs

@@ -1,14 +1,16 @@
 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, 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 { NttRoute, nttExecutorRoute } 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, createAssociatedTokenAccountInstruction } from '@solana/spl-token';
+import { TOKEN_PROGRAM_ID, TOKEN_2022_PROGRAM_ID, getAssociatedTokenAddressSync, createAssociatedTokenAccountInstruction } from '@solana/spl-token';
+import { NTT } from '@wormhole-foundation/sdk-solana-ntt';
 import BN from 'bn.js';
 import { sha256 } from '@noble/hashes/sha2';
+import evm from '@wormhole-foundation/sdk/platforms/evm';
+import solana from '@wormhole-foundation/sdk/platforms/solana';
 
 // src/m0AutomaticRoute.ts
 var SolanaRoutes = class _SolanaRoutes {
@@ -16,7 +18,10 @@ var SolanaRoutes = class _SolanaRoutes {
     this.ntt = ntt;
     this.network = ntt.network;
     this.programs = _SolanaRoutes.getPrograms(this.network);
-    this.extPrograms = _SolanaRoutes.getExtPrograms(this.network);
+    this.extPrograms = _SolanaRoutes.getExtPrograms(
+      this.network,
+      this.ntt.chain
+    );
   }
   static getPrograms(network) {
     return {
@@ -24,7 +29,7 @@ var SolanaRoutes = class _SolanaRoutes {
         swap: pk("MSwapi3WhNKMUGm9YrxGhypgUEt7wYQH3ZgG32XoWzH"),
         earn: pk("mz2vDzjbQDUDXBH6FPF5s4odCJ4y8YLE5QWaZ8XdZ9Z"),
         lut: pk("9JLRqBqkznKiSoNfotA4ywSRdnWb2fE76SiFrAfkaRCD"),
-        mMint: pk("mzerokyEX9TNDoK4o2YZQBDmMzjokAeN6M2g2S3pLJo"),
+        mMint: pk("mzerojk9tg56ebsrEAhfkyc9VgKjTW2zDqp6C5mhjzH"),
         portal: pk("mzp1q2j5Hr1QuLC3KFBCAUz5aUckT6qyuZKZ3WJnMmY"),
         quoter: pk("Nqd6XqA8LbsCuG8MLWWuP865NV6jR1MbXeKxD4HLKDJ")
       },
@@ -32,13 +37,21 @@ var SolanaRoutes = class _SolanaRoutes {
         swap: pk("MSwapi3WhNKMUGm9YrxGhypgUEt7wYQH3ZgG32XoWzH"),
         earn: pk("mz2vDzjbQDUDXBH6FPF5s4odCJ4y8YLE5QWaZ8XdZ9Z"),
         lut: pk("6GhuWPuAmiJeeSVsr58KjqHcAejJRndCx9BVtHkaYHUR"),
-        mMint: pk("mzeroZRGCah3j5xEWp2Nih3GDejSBbH1rbHoxDg8By6"),
+        mMint: pk("mzerojk9tg56ebsrEAhfkyc9VgKjTW2zDqp6C5mhjzH"),
         portal: pk("mzp1q2j5Hr1QuLC3KFBCAUz5aUckT6qyuZKZ3WJnMmY"),
         quoter: pk("Nqd6XqA8LbsCuG8MLWWuP865NV6jR1MbXeKxD4HLKDJ")
       }
     }[network];
   }
-  static getExtPrograms(network) {
+  static getExtPrograms(network, chain) {
+    if (chain === "Fogo") {
+      return {
+        fUSDqquEMUU8UmU2YWYGZy2Lda1oMzBc88Mkzc1PRDw: {
+          program: pk("extUkDFf3HLekkxbcZ3XRUizMjbxMJgKBay3p9xGVmg"),
+          tokenProgram: TOKEN_PROGRAM_ID
+        }
+      };
+    }
     return {
       Mainnet: {
         mzeroXDoBpRVhnEXBra27qzAMdxgpWVY3DzQW7xMVJp: {
@@ -66,16 +79,19 @@ var SolanaRoutes = class _SolanaRoutes {
         usdkyPPxgV7sfNyKb8eDz66ogPrkRXG3wS2FVb6LLUf: {
           program: pk("3PskKTHgboCbUSQPMcCAZdZNFHbNvSoZ8zEFYANCdob7"),
           tokenProgram: TOKEN_2022_PROGRAM_ID
+        },
+        fUSDqquEMUU8UmU2YWYGZy2Lda1oMzBc88Mkzc1PRDw: {
+          program: pk("extUkDFf3HLekkxbcZ3XRUizMjbxMJgKBay3p9xGVmg"),
+          tokenProgram: TOKEN_PROGRAM_ID
         }
       }
     }[network];
   }
-  static getSolanaContracts(chainContext) {
-    const programs = _SolanaRoutes.getPrograms(
-      chainContext.network
-    );
+  static getSolanaContracts(network, chain) {
+    const programs = _SolanaRoutes.getPrograms(network);
     const extPrograms = _SolanaRoutes.getExtPrograms(
-      chainContext.network
+      network,
+      chain
     );
     return {
       token: programs.mMint.toBase58(),
@@ -85,10 +101,19 @@ var SolanaRoutes = class _SolanaRoutes {
       quoter: programs.quoter.toBase58()
     };
   }
+  getSolanaContracts() {
+    return _SolanaRoutes.getSolanaContracts(this.network, this.ntt.chain);
+  }
   getTransferExtensionBurnIx(amount2, recipient, payer, outboxItem, extMint, destinationToken, shouldQueue = true) {
-    const recipientAddress = Buffer.alloc(32);
-    const dest = Buffer.from(recipient.address.toUint8Array());
-    dest.copy(recipientAddress);
+    const recipientAddress = toUniversal(
+      recipient.chain,
+      recipient.address.toString()
+    ).toUint8Array();
+    if (recipientAddress.length !== 32) {
+      throw new Error(
+        `recipient address must be 32 bytes, got ${recipientAddress.length} bytes`
+      );
+    }
     if (destinationToken.length !== 32) {
       throw new Error(
         `destinationToken must be 32 bytes, got ${destinationToken.length} bytes`
@@ -101,6 +126,16 @@ var SolanaRoutes = class _SolanaRoutes {
       );
     }
     const { program: extProgram, tokenProgram: extTokenProgram } = extension;
+    const [tokenAuth] = PublicKey.findProgramAddressSync(
+      [Buffer.from("token_authority")],
+      this.programs.portal
+    );
+    const sessionAuth = this.ntt.pdas.sessionAuthority(tokenAuth, {
+      amount: new BN(amount2),
+      recipientChain: { id: chainToChainId(recipient.chain) },
+      recipientAddress: [...recipientAddress],
+      shouldQueue
+    });
     return new TransactionInstruction({
       programId: this.ntt.program.programId,
       keys: [
@@ -125,10 +160,7 @@ var SolanaRoutes = class _SolanaRoutes {
           // from (token auth m token account)
           pubkey: getAssociatedTokenAddressSync(
             this.programs.mMint,
-            PublicKey.findProgramAddressSync(
-              [Buffer.from("token_authority")],
-              this.ntt.program.programId
-            )[0],
+            tokenAuth,
             true,
             TOKEN_2022_PROGRAM_ID
           ),
@@ -179,24 +211,13 @@ var SolanaRoutes = class _SolanaRoutes {
         },
         {
           // session auth
-          pubkey: this.ntt.pdas.sessionAuthority(payer, {
-            amount: new BN(amount2),
-            recipientChain: {
-              id: 2
-              // Ethereum
-            },
-            recipientAddress: [...Array(32)],
-            shouldQueue: false
-          }),
+          pubkey: sessionAuth,
           isSigner: false,
           isWritable: false
         },
         {
           // token auth
-          pubkey: PublicKey.findProgramAddressSync(
-            [Buffer.from("token_authority")],
-            this.ntt.program.programId
-          )[0],
+          pubkey: tokenAuth,
           isSigner: false,
           isWritable: false
         },
@@ -303,10 +324,79 @@ var SolanaRoutes = class _SolanaRoutes {
         // chain_id
         recipientAddress,
         // recipient_address
-        destinationToken,
-        // destination_token
-        Buffer.from([Number(shouldQueue)])
+        Buffer.from([Number(shouldQueue)]),
         // should_queue
+        destinationToken
+        // destination_token
+      ])
+    });
+  }
+  async getExecutorRelayIx(sender, quote, destinationChain) {
+    const emitter = PublicKey.findProgramAddressSync(
+      [Buffer.from("emitter")],
+      this.ntt.program.programId
+    )[0];
+    const bridgeSequence = PublicKey.findProgramAddressSync(
+      [Buffer.from("Sequence"), emitter.toBytes()],
+      new PublicKey(this.ntt.contracts.coreBridge)
+    )[0];
+    const info = await this.ntt.connection.getAccountInfo(bridgeSequence);
+    const sequence = new BN(info.data, "le");
+    const vaaReqBytes = Buffer.concat([
+      Buffer.from("ERV1"),
+      // type
+      new BN(chainToChainId(this.ntt.chain)).toArrayLike(Buffer, "be", 2),
+      // emitter chain
+      emitter.toBuffer(),
+      // emitter address
+      sequence.toArrayLike(Buffer, "be", 8)
+      // sequence
+    ]);
+    const signedQuoteBytes = Buffer.from(quote.signedQuote);
+    const relayInstructions = Buffer.from(quote.relayInstructions);
+    return new TransactionInstruction({
+      keys: [
+        {
+          pubkey: sender,
+          isSigner: true,
+          isWritable: true
+        },
+        {
+          // payee
+          pubkey: new PublicKey(quote.payeeAddress),
+          isSigner: false,
+          isWritable: true
+        },
+        {
+          pubkey: SystemProgram.programId,
+          isSigner: false,
+          isWritable: false
+        }
+      ],
+      programId: new PublicKey("execXUrAsMnqMmTHj5m7N1YQgsDz3cwGLYCYyuDRciV"),
+      data: Buffer.concat([
+        Buffer.from(sha256("global:request_for_execution").subarray(0, 8)),
+        // [109, 107, 87, 37, 151, 192, 119, 115]
+        new BN(quote.estimatedCost.toString()).toArrayLike(Buffer, "le", 8),
+        // amount
+        new BN(chainToChainId(destinationChain)).toArrayLike(Buffer, "le", 2),
+        // dst_chain
+        this.ntt.program.programId.toBuffer(),
+        // peer portal address
+        sender.toBuffer(),
+        // refund_addr
+        new BN(signedQuoteBytes.length).toArrayLike(Buffer, "le", 4),
+        // vec length
+        signedQuoteBytes,
+        // signed_quote_bytes
+        new BN(vaaReqBytes.length).toArrayLike(Buffer, "le", 4),
+        // vec length
+        vaaReqBytes,
+        // request_bytes
+        new BN(relayInstructions.length).toArrayLike(Buffer, "le", 4),
+        // vec length
+        relayInstructions
+        // relay_instructions
       ])
     });
   }
@@ -571,6 +661,62 @@ function pk(address) {
   return new PublicKey(address);
 }
 
+// src/executor.ts
+function getExecutorConfig(network = "Mainnet") {
+  const svmContracts = SolanaRoutes.getSolanaContracts(network, "Solana");
+  const svmChains = ["Solana", "Fogo"];
+  const evmChains = network === "Mainnet" ? ["Ethereum", "Optimism", "Arbitrum"] : ["Sepolia", "ArbitrumSepolia", "OptimismSepolia"];
+  return {
+    ntt: {
+      tokens: {
+        M0: [
+          ...svmChains.map((chain) => ({
+            chain,
+            token: svmContracts.token,
+            manager: svmContracts.manager,
+            transceiver: [
+              {
+                type: "wormhole",
+                address: svmContracts.transceiver.wormhole
+              }
+            ],
+            quoter: svmContracts.quoter
+          })),
+          ...evmChains.map((chain) => ({
+            chain,
+            token: M0AutomaticRoute.EVM_CONTRACTS.token,
+            manager: M0AutomaticRoute.EVM_CONTRACTS.manager,
+            transceiver: [
+              {
+                type: "wormhole",
+                address: M0AutomaticRoute.EVM_CONTRACTS.transceiver.wormhole
+              }
+            ],
+            quoter: M0AutomaticRoute.EVM_CONTRACTS.quoter
+          }))
+        ]
+      }
+    },
+    referrerFee: {
+      feeDbps: 0n,
+      perTokenOverrides: {
+        // SVM chains require extra compute when receiving messages
+        // so we need to override the gas cost
+        Solana: {
+          [svmContracts.token]: {
+            msgValue: 15000000n
+          }
+        },
+        Fogo: {
+          [svmContracts.token]: {
+            msgValue: 15000000n
+          }
+        }
+      }
+    }
+  };
+}
+
 // src/m0AutomaticRoute.ts
 var _M0AutomaticRoute = class _M0AutomaticRoute extends routes.AutomaticRoute {
   static supportedNetworks() {
@@ -598,21 +744,18 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends routes.AutomaticRoute {
   static getContracts(chainContext) {
     switch (chainContext.chain) {
       case "Ethereum":
-        return this.EVM_CONTRACTS;
       case "Optimism":
-        return this.EVM_CONTRACTS;
       case "Arbitrum":
-        return this.EVM_CONTRACTS;
       case "Sepolia":
-        return this.EVM_CONTRACTS;
       case "OptimismSepolia":
-        return this.EVM_CONTRACTS;
       case "ArbitrumSepolia":
         return this.EVM_CONTRACTS;
       case "Solana":
-        return SolanaRoutes.getSolanaContracts(chainContext);
       case "Fogo":
-        return SolanaRoutes.getSolanaContracts(chainContext);
+        return SolanaRoutes.getSolanaContracts(
+          chainContext.network,
+          chainContext.chain
+        );
       default:
         throw new Error(`Unsupported chain: ${chainContext.chain}`);
     }
@@ -630,9 +773,11 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends routes.AutomaticRoute {
       return [];
     }
     const { token: mToken, mLikeTokens } = this.getContracts(toChain);
-    return [mToken, ...mLikeTokens].map(
-      (x) => Wormhole.tokenId(toChain.chain, x)
-    );
+    const tokens = mLikeTokens.map((x) => Wormhole.tokenId(toChain.chain, x));
+    if (toChain.chain === "Solana" || toChain.chain === "Fogo") {
+      return tokens;
+    }
+    return [...tokens, Wormhole.tokenId(toChain.chain, mToken)];
   }
   static isProtocolSupported(chain) {
     return chain.supportsProtocol("Ntt");
@@ -648,10 +793,6 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends routes.AutomaticRoute {
   }
   async validate(request, params) {
     const options = params.options ?? this.getDefaultOptions();
-    const gasDropoff = amount.parse(
-      options.gasDropoff ?? "0.0",
-      request.toChain.config.nativeTokenDecimals
-    );
     const parsedAmount = amount.parse(params.amount, request.source.decimals);
     const trimmedAmount = NttRoute.trimAmount(
       parsedAmount,
@@ -667,8 +808,7 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends routes.AutomaticRoute {
         destinationContracts: toContracts,
         options: {
           queue: false,
-          automatic: true,
-          gasDropoff: amount.units(gasDropoff)
+          automatic: true
         }
       },
       options
@@ -713,7 +853,7 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends routes.AutomaticRoute {
         )
       },
       destinationNativeGas: amount.fromBaseUnits(
-        params.normalizedParams.options.gasDropoff ?? 0n,
+        0n,
         toChain.config.nativeTokenDecimals
       ),
       eta: finality.estimateFinalityTime(request.fromChain.chain)
@@ -774,18 +914,18 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends routes.AutomaticRoute {
    */
   async *transferMLike(ntt, sender, amount2, destination, sourceToken, destinationToken, options) {
     const senderAddress = new EvmAddress(sender).toString();
-    const totalPrice = await ntt.quoteDeliveryPrice(destination.chain, options);
     const tokenContract = EvmPlatform.getTokenImplementation(
       ntt.provider,
       sourceToken
     );
+    const spenderAddress = this.requiresExecutor(destination.chain) ? _M0AutomaticRoute.EXECUTOR_ENTRYPOINT : ntt.managerAddress;
     const allowance = await tokenContract.allowance(
       senderAddress,
-      ntt.managerAddress
+      spenderAddress
     );
     if (allowance < amount2) {
       const txReq2 = await tokenContract.approve.populateTransaction(
-        ntt.managerAddress,
+        spenderAddress,
         amount2
       );
       yield this.createUnsignedTx(
@@ -795,6 +935,36 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends routes.AutomaticRoute {
       );
     }
     const receiver = universalAddress(destination);
+    if (this.requiresExecutor(destination.chain)) {
+      const quote = await this.getExecutorQuote(
+        ntt.network,
+        ntt.chain,
+        destination.chain,
+        amount2
+      );
+      const contract2 = new Contract(_M0AutomaticRoute.EXECUTOR_ENTRYPOINT, [
+        "function transferMLikeToken(uint256 amount, address sourceToken, uint16 destinationChainId, bytes32 destinationToken, bytes32 recipient, bytes32 refundAddress, (uint256 value, address refundAddress, bytes signedQuote, bytes instructions) executorArgs, bytes memory transceiverInstructions) external payable returns (bytes32 messageId)"
+      ]);
+      const executorArgs = {
+        value: quote.estimatedCost,
+        refundAddress: senderAddress,
+        signedQuote: quote.signedQuote,
+        instructions: quote.relayInstructions
+      };
+      const txReq2 = await contract2.getFunction("transferMLikeToken").populateTransaction(
+        amount2,
+        sourceToken,
+        toChainId(destination.chain),
+        toUniversal(destination.chain, destinationToken).toString(),
+        receiver,
+        receiver,
+        executorArgs,
+        Uint8Array.from(Buffer.from("01000101", "hex")),
+        { value: quote.estimatedCost }
+      );
+      yield ntt.createUnsignedTx(addFrom(txReq2, senderAddress), "Ntt.transfer");
+      return;
+    }
     const contract = new Contract(ntt.managerAddress, [
       "function transferMLikeToken(uint256 amount, address sourceToken, uint16 destinationChainId, bytes32 destinationToken, bytes32 recipient, bytes32 refundAddress) external payable returns (uint64 sequence)"
     ]);
@@ -805,7 +975,7 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends routes.AutomaticRoute {
       toUniversal(destination.chain, destinationToken).toString(),
       receiver,
       receiver,
-      { value: totalPrice }
+      { value: await ntt.quoteDeliveryPrice(destination.chain, options) }
     );
     yield ntt.createUnsignedTx(addFrom(txReq, senderAddress), "Ntt.transfer");
   }
@@ -820,7 +990,7 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends routes.AutomaticRoute {
   }
   async *transferSolanaExtension(ntt, sender, amount2, recipient, sourceToken, destinationToken, options, outboxItem) {
     const router = new SolanaRoutes(ntt);
-    if ((await ntt.getConfig()).mint.toBase58() === sourceToken) {
+    if (router.getSolanaContracts().token === sourceToken) {
       return ntt.transfer(sender, amount2, recipient, options);
     }
     const config = await ntt.getConfig();
@@ -855,18 +1025,29 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends routes.AutomaticRoute {
     const tx = new Transaction();
     tx.feePayer = payerAddress;
     tx.add(...ixs);
-    if (options.automatic) {
-      if (!ntt.quoter)
+    if (this.requiresExecutor(recipient.chain)) {
+      const quote = await this.getExecutorQuote(
+        ntt.network,
+        ntt.chain,
+        recipient.chain,
+        amount2
+      );
+      tx.add(
+        await router.getExecutorRelayIx(payerAddress, quote, recipient.chain)
+      );
+    } else if (options.automatic) {
+      if (!ntt.quoter) {
         throw new Error(
           "No quoter available, cannot initiate an automatic transfer."
         );
+      }
       const fee = await ntt.quoteDeliveryPrice(recipient.chain, options);
       const relayIx = await ntt.quoter.createRequestRelayInstruction(
         payerAddress,
         outboxItem.publicKey,
         recipient.chain,
         Number(fee) / LAMPORTS_PER_SOL,
-        Number(options.gasDropoff ?? 0n) / WEI_PER_GWEI
+        0
       );
       tx.add(relayIx);
     }
@@ -946,11 +1127,44 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends routes.AutomaticRoute {
     }
     yield receipt;
   }
+  async getExecutorQuote(network, sourceChain, destinationChain, amount2) {
+    const wh = new Wormhole(network, [solana.Platform, evm.Platform]);
+    const executorRoute = nttExecutorRoute(getExecutorConfig(network));
+    const routeInstance = new executorRoute(wh);
+    const resolveM = (chain) => {
+      if (chainToPlatform(chain) === "Solana") {
+        const c = chain;
+        return SolanaRoutes.getSolanaContracts(network, c).token;
+      }
+      return _M0AutomaticRoute.EVM_CONTRACTS.token;
+    };
+    const transferRequest = await routes.RouteTransferRequest.create(wh, {
+      source: Wormhole.tokenId(sourceChain, resolveM(sourceChain)),
+      destination: Wormhole.tokenId(
+        destinationChain,
+        resolveM(destinationChain)
+      )
+    });
+    const validated = await routeInstance.validate(transferRequest, {
+      amount: amount2.toString()
+    });
+    if (!validated.valid) {
+      throw new Error(`Validation failed: ${validated.error.message}`);
+    }
+    return await routeInstance.fetchExecutorQuote(
+      transferRequest,
+      validated.params
+    );
+  }
+  requiresExecutor(destination) {
+    return chainToPlatform(destination) === "Solana";
+  }
 };
 // ntt does not support gas drop-off currently
 _M0AutomaticRoute.NATIVE_GAS_DROPOFF_SUPPORTED = false;
 // Wrapped M token address is the same on EVM chains
 _M0AutomaticRoute.EVM_WRAPPED_M_TOKEN = "0x437cc33344a0B27A429f795ff6B469C72698B291";
+_M0AutomaticRoute.EXECUTOR_ENTRYPOINT = "0x8518040a9cf9dfb55a4f099bb0eaabeefeb03643";
 // Contract addresses are the same on all EVM chains
 _M0AutomaticRoute.EVM_CONTRACTS = {
   // M token address is the same on EVM chains

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@m0-foundation/ntt-sdk-route",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -20,34 +20,35 @@
   "files": [
     "dist"
   ],
-  "scripts": {
-    "build": "$npm_execpath tsup --clean",
-    "clean": "rm -rf dist"
-  },
   "devDependencies": {
     "@changesets/cli": "^2.28.1",
     "@types/bn.js": "^5.2.0",
     "@types/node": "~20.17.17",
+    "ts-node": "^10.9.2",
     "tsup": "~8.3.6",
     "typescript": "~5.6.3"
   },
   "publishConfig": {
     "access": "public"
   },
-  "packageManager": "pnpm@10.2.0",
   "dependencies": {
     "@noble/hashes": "^1.8.0",
     "@solana/spl-token": "^0.4.13",
     "@solana/web3.js": "^1.98.2",
-    "@wormhole-foundation/sdk": "^1.7.0",
-    "@wormhole-foundation/sdk-connect": "^1.7.0",
-    "@wormhole-foundation/sdk-definitions-ntt": "^0.7.1",
-    "@wormhole-foundation/sdk-evm": "^1.7.0",
-    "@wormhole-foundation/sdk-evm-ntt": "^0.7.1",
-    "@wormhole-foundation/sdk-route-ntt": "^0.7.1",
-    "@wormhole-foundation/sdk-solana": "^1.7.0",
-    "@wormhole-foundation/sdk-solana-ntt": "^0.7.1",
+    "@wormhole-foundation/sdk": "3.4.7",
+    "@wormhole-foundation/sdk-connect": "3.4.7",
+    "@wormhole-foundation/sdk-definitions-ntt": "2.0.5",
+    "@wormhole-foundation/sdk-evm": "3.4.7",
+    "@wormhole-foundation/sdk-evm-ntt": "2.0.5",
+    "@wormhole-foundation/sdk-route-ntt": "2.0.5",
+    "@wormhole-foundation/sdk-solana": "3.4.7",
+    "@wormhole-foundation/sdk-solana-ntt": "2.0.5",
     "bn.js": "^5.2.2",
     "ethers": "^6.5.1"
+  },
+  "scripts": {
+    "build": "$npm_execpath tsup --clean",
+    "clean": "rm -rf dist",
+    "test-bridge": "node --env-file=.env -r ts-node/register scripts/bridge.ts"
   }
-}
+}