@m0-foundation/ntt-sdk-route 0.0.5 → 0.0.7

package/dist/index.d.mts

@@ -13,18 +13,23 @@ type QR = routes.QuoteResult<Op, Vp>;
 type Q = routes.Quote<Op, Vp>;
 type R = NttRoute.AutomaticTransferReceipt;
 type Contracts = Ntt.Contracts & {
-    wrappedMToken: string;
+    mLikeTokens: string[];
 };
 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 SOLANA_MAINNET_M_TOKEN: string;
+    static SOLANA_TESTNET_M_TOKEN: string;
     static EVM_CONTRACTS: Contracts;
     static meta: {
         name: string;
         provider: string;
     };
+    static solanaContracts(network: Network): Contracts;
     static supportedNetworks(): Network[];
+    static isPlatformSupported(platform: string): boolean;
     static supportedChains(network: Network): Chain[];
-    static getContracts(chain: Chain): Contracts;
+    static getContracts(chainContext: ChainContext<Network>): Contracts;
     static supportedSourceTokens(fromChain: ChainContext<Network>): Promise<TokenId[]>;
     static supportedDestinationTokens<N extends Network>(token: TokenId, fromChain: ChainContext<N>, toChain: ChainContext<N>): Promise<TokenId[]>;
     static isProtocolSupported<N extends Network>(chain: ChainContext<N>): boolean;

package/dist/index.d.ts

@@ -13,18 +13,23 @@ type QR = routes.QuoteResult<Op, Vp>;
 type Q = routes.Quote<Op, Vp>;
 type R = NttRoute.AutomaticTransferReceipt;
 type Contracts = Ntt.Contracts & {
-    wrappedMToken: string;
+    mLikeTokens: string[];
 };
 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 SOLANA_MAINNET_M_TOKEN: string;
+    static SOLANA_TESTNET_M_TOKEN: string;
     static EVM_CONTRACTS: Contracts;
     static meta: {
         name: string;
         provider: string;
     };
+    static solanaContracts(network: Network): Contracts;
     static supportedNetworks(): Network[];
+    static isPlatformSupported(platform: string): boolean;
     static supportedChains(network: Network): Chain[];
-    static getContracts(chain: Chain): Contracts;
+    static getContracts(chainContext: ChainContext<Network>): Contracts;
     static supportedSourceTokens(fromChain: ChainContext<Network>): Promise<TokenId[]>;
     static supportedDestinationTokens<N extends Network>(token: TokenId, fromChain: ChainContext<N>, toChain: ChainContext<N>): Promise<TokenId[]>;
     static isProtocolSupported<N extends Network>(chain: ChainContext<N>): boolean;

package/dist/index.js

@@ -2,27 +2,42 @@
 
 var sdkConnect = require('@wormhole-foundation/sdk-connect');
 var sdkDefinitionsNtt = require('@wormhole-foundation/sdk-definitions-ntt');
+require('@wormhole-foundation/sdk-solana-ntt');
 var sdkEvm = require('@wormhole-foundation/sdk-evm');
+require('@wormhole-foundation/sdk-solana');
 var sdkRouteNtt = require('@wormhole-foundation/sdk-route-ntt');
 var ethers = require('ethers');
 
 // src/m0AutomaticRoute.ts
 var _M0AutomaticRoute = class _M0AutomaticRoute extends sdkConnect.routes.AutomaticRoute {
+  static solanaContracts(network) {
+    return {
+      token: network == "Mainnet" ? this.SOLANA_MAINNET_M_TOKEN : this.SOLANA_TESTNET_M_TOKEN,
+      // Only M token can be bridged from Solana
+      mLikeTokens: [],
+      manager: "mzp1q2j5Hr1QuLC3KFBCAUz5aUckT6qyuZKZ3WJnMmY",
+      transceiver: { wormhole: "mzp1q2j5Hr1QuLC3KFBCAUz5aUckT6qyuZKZ3WJnMmY" },
+      quoter: "Nqd6XqA8LbsCuG8MLWWuP865NV6jR1MbXeKxD4HLKDJ"
+    };
+  }
   static supportedNetworks() {
     return ["Mainnet", "Testnet"];
   }
+  static isPlatformSupported(platform) {
+    return platform == "Evm" || platform == "Solana";
+  }
   static supportedChains(network) {
     switch (network) {
       case "Mainnet":
-        return ["Ethereum", "Arbitrum", "Optimism"];
+        return ["Ethereum", "Arbitrum", "Optimism", "Solana"];
       case "Testnet":
-        return ["Sepolia", "ArbitrumSepolia", "OptimismSepolia"];
+        return ["Sepolia", "ArbitrumSepolia", "OptimismSepolia", "Solana"];
       default:
         throw new Error(`Unsupported network: ${network}`);
     }
   }
-  static getContracts(chain) {
-    switch (chain) {
+  static getContracts(chainContext) {
+    switch (chainContext.chain) {
       case "Ethereum":
         return this.EVM_CONTRACTS;
       case "Optimism":
@@ -35,15 +50,17 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends sdkConnect.routes.Automa
         return this.EVM_CONTRACTS;
       case "ArbitrumSepolia":
         return this.EVM_CONTRACTS;
+      case "Solana":
+        return this.solanaContracts(chainContext.network);
       default:
-        throw new Error(`Unsupported chain: ${chain}`);
+        throw new Error(`Unsupported chain: ${chainContext.chain}`);
     }
   }
   static async supportedSourceTokens(fromChain) {
-    const { token, wrappedMToken } = this.getContracts(fromChain.chain);
+    const { token, mLikeTokens } = this.getContracts(fromChain);
     return [
       sdkConnect.Wormhole.tokenId(fromChain.chain, token),
-      sdkConnect.Wormhole.tokenId(fromChain.chain, wrappedMToken)
+      ...mLikeTokens.map((x) => sdkConnect.Wormhole.tokenId(fromChain.chain, x))
     ];
   }
   static async supportedDestinationTokens(token, fromChain, toChain) {
@@ -51,10 +68,10 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends sdkConnect.routes.Automa
     if (!sourceTokens.some((t) => sdkConnect.isSameToken(t, token))) {
       return [];
     }
-    const { token: mToken, wrappedMToken } = this.getContracts(toChain.chain);
+    const { token: mToken, mLikeTokens } = this.getContracts(toChain);
     return [
       sdkConnect.Wormhole.tokenId(toChain.chain, mToken),
-      sdkConnect.Wormhole.tokenId(toChain.chain, wrappedMToken)
+      ...mLikeTokens.map((x) => sdkConnect.Wormhole.tokenId(toChain.chain, x))
     ];
   }
   static isProtocolSupported(chain) {
@@ -65,7 +82,7 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends sdkConnect.routes.Automa
   }
   async isAvailable(request) {
     const ntt = await request.fromChain.getProtocol("Ntt", {
-      ntt: _M0AutomaticRoute.getContracts(request.fromChain.chain)
+      ntt: _M0AutomaticRoute.getContracts(request.fromChain)
     });
     return ntt.isRelayingAvailable(request.toChain.chain);
   }
@@ -80,10 +97,8 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends sdkConnect.routes.Automa
       parsedAmount,
       request.destination.decimals
     );
-    const fromContracts = _M0AutomaticRoute.getContracts(
-      request.fromChain.chain
-    );
-    const toContracts = _M0AutomaticRoute.getContracts(request.toChain.chain);
+    const fromContracts = _M0AutomaticRoute.getContracts(request.fromChain);
+    const toContracts = _M0AutomaticRoute.getContracts(request.toChain);
     const validatedParams = {
       amount: params.amount,
       normalizedParams: {
@@ -103,7 +118,7 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends sdkConnect.routes.Automa
   async quote(request, params) {
     const { fromChain, toChain } = request;
     const ntt = await fromChain.getProtocol("Ntt", {
-      ntt: _M0AutomaticRoute.getContracts(fromChain.chain)
+      ntt: _M0AutomaticRoute.getContracts(fromChain)
     });
     if (!await ntt.isRelayingAvailable(toChain.chain)) {
       return {
@@ -149,22 +164,17 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends sdkConnect.routes.Automa
     const { params } = quote;
     const { fromChain } = request;
     const sender = sdkConnect.Wormhole.parseAddress(signer.chain(), signer.address());
-    if (sdkConnect.chainToPlatform(fromChain.chain) !== "Evm")
-      throw new Error("The route supports only EVM");
+    const platform = sdkConnect.chainToPlatform(fromChain.chain);
+    const transferAmount = sdkConnect.amount.units(params.normalizedParams.amount);
+    const options = params.normalizedParams.options;
+    if (platform !== "Evm" && platform !== "Solana")
+      throw new Error(`Unsupported platform ${platform}`);
     const ntt = await fromChain.getProtocol("Ntt", {
-      ntt: _M0AutomaticRoute.getContracts(fromChain.chain)
+      ntt: _M0AutomaticRoute.getContracts(fromChain)
     });
-    const sourceTokenAddress = sdkConnect.canonicalAddress(request.source.id);
-    const destinationTokenAddress = sdkConnect.canonicalAddress(request.destination.id);
-    const initXfer = this.transferMLike(
-      ntt,
-      sender,
-      sdkConnect.amount.units(params.normalizedParams.amount),
-      to,
-      sourceTokenAddress,
-      destinationTokenAddress,
-      params.normalizedParams.options
-    );
+    const sourceToken = sdkConnect.canonicalAddress(request.source.id);
+    const destinationToken = sdkConnect.canonicalAddress(request.destination.id);
+    const initXfer = platform === "Evm" ? this.transferMLike(ntt, sender, transferAmount, to, sourceToken, destinationToken, options) : ntt.transfer(sender, transferAmount, to, options);
     const txids = await sdkConnect.signSendWait(fromChain, initXfer, signer);
     return {
       from: fromChain.chain,
@@ -225,13 +235,10 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends sdkConnect.routes.Automa
     );
   }
   async *track(receipt, timeout) {
+    const isEvmPlatform = (chain) => sdkConnect.chainToPlatform(chain) === "Evm";
     if (sdkConnect.isSourceInitiated(receipt) || sdkConnect.isSourceFinalized(receipt)) {
       const { txid } = receipt.originTxs[receipt.originTxs.length - 1];
-      const isEvmPlatform = (chain) => sdkConnect.chainToPlatform(chain) === "Evm";
-      const vaaType = isEvmPlatform(receipt.from) && isEvmPlatform(receipt.to) ? (
-        // Automatic NTT transfers between EVM chains use standard relayers
-        "Ntt:WormholeTransferStandardRelayer"
-      ) : "Ntt:WormholeTransfer";
+      const vaaType = isEvmPlatform(receipt.from) && isEvmPlatform(receipt.to) ? "Ntt:WormholeTransferStandardRelayer" : "Ntt:WormholeTransfer";
       const vaa = await this.wh.getVaa(txid, vaaType, timeout);
       if (!vaa) {
         throw new Error(`No VAA found for transaction: ${txid}`);
@@ -253,7 +260,7 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends sdkConnect.routes.Automa
     }
     const toChain = this.wh.getChain(receipt.to);
     const ntt = await toChain.getProtocol("Ntt", {
-      ntt: _M0AutomaticRoute.getContracts(toChain.chain)
+      ntt: _M0AutomaticRoute.getContracts(toChain)
     });
     if (sdkConnect.isAttested(receipt)) {
       const {
@@ -269,13 +276,11 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends sdkConnect.routes.Automa
       }
     }
     if (sdkConnect.isRedeemed(receipt)) {
-      const {
-        attestation: { attestation: vaa }
-      } = receipt;
+      const { attestation: { attestation: vaa } } = receipt;
       const payload = vaa.payloadName === "WormholeTransfer" ? vaa.payload : vaa.payload["payload"];
-      const isExecuted = await ntt.manager.isMessageExecuted(
+      const isExecuted = isEvmPlatform(receipt.to) ? await ntt.manager.isMessageExecuted(
         sdkDefinitionsNtt.Ntt.messageDigest(vaa.emitterChain, payload["nttManagerPayload"])
-      );
+      ) : await ntt.getIsExecuted(vaa);
       if (isExecuted) {
         receipt = {
           ...receipt,
@@ -289,18 +294,22 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends sdkConnect.routes.Automa
 };
 // 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.SOLANA_MAINNET_M_TOKEN = "mzerokyEX9TNDoK4o2YZQBDmMzjokAeN6M2g2S3pLJo";
+_M0AutomaticRoute.SOLANA_TESTNET_M_TOKEN = "mzeroZRGCah3j5xEWp2Nih3GDejSBbH1rbHoxDg8By6";
 // Contract addresses are the same on all EVM chains
 _M0AutomaticRoute.EVM_CONTRACTS = {
   // M token address is the same on EVM chains
   token: "0x866A2BF4E572CbcF37D5071A7a58503Bfb36be1b",
-  // Wrapped M token address is the same on EVM chains
-  wrappedMToken: "0x437cc33344a0B27A429f795ff6B469C72698B291",
+  // Wrapped $M and Extension Tokens that can bridged by unwrapping to $M
+  mLikeTokens: [_M0AutomaticRoute.EVM_WRAPPED_M_TOKEN],
   // M0 Portal address is the same on EVM chains
   manager: "0xD925C84b55E4e44a53749fF5F2a5A13F63D128fd",
   // Wormhole transceiver address is the same on EVM chains
   transceiver: { wormhole: "0x0763196A091575adF99e2306E5e90E0Be5154841" }
 };
-_M0AutomaticRoute.meta = { name: "M0AutomaticRoute", provider: "M^0" };
+_M0AutomaticRoute.meta = { name: "M0AutomaticRoute", provider: "M0" };
 var M0AutomaticRoute = _M0AutomaticRoute;
 
 exports.M0AutomaticRoute = M0AutomaticRoute;

package/dist/index.mjs

@@ -1,26 +1,41 @@
 import { routes, Wormhole, isSameToken, amount, finality, chainToPlatform, canonicalAddress, signSendWait, TransferState, universalAddress, toChainId, toUniversal, isSourceInitiated, isSourceFinalized, isAttested, isRedeemed } from '@wormhole-foundation/sdk-connect';
 import { Ntt } from '@wormhole-foundation/sdk-definitions-ntt';
+import '@wormhole-foundation/sdk-solana-ntt';
 import { EvmAddress, EvmPlatform, addFrom, EvmUnsignedTransaction, addChainId } from '@wormhole-foundation/sdk-evm';
+import '@wormhole-foundation/sdk-solana';
 import { NttRoute } from '@wormhole-foundation/sdk-route-ntt';
 import { Contract } from 'ethers';
 
 // src/m0AutomaticRoute.ts
 var _M0AutomaticRoute = class _M0AutomaticRoute extends routes.AutomaticRoute {
+  static solanaContracts(network) {
+    return {
+      token: network == "Mainnet" ? this.SOLANA_MAINNET_M_TOKEN : this.SOLANA_TESTNET_M_TOKEN,
+      // Only M token can be bridged from Solana
+      mLikeTokens: [],
+      manager: "mzp1q2j5Hr1QuLC3KFBCAUz5aUckT6qyuZKZ3WJnMmY",
+      transceiver: { wormhole: "mzp1q2j5Hr1QuLC3KFBCAUz5aUckT6qyuZKZ3WJnMmY" },
+      quoter: "Nqd6XqA8LbsCuG8MLWWuP865NV6jR1MbXeKxD4HLKDJ"
+    };
+  }
   static supportedNetworks() {
     return ["Mainnet", "Testnet"];
   }
+  static isPlatformSupported(platform) {
+    return platform == "Evm" || platform == "Solana";
+  }
   static supportedChains(network) {
     switch (network) {
       case "Mainnet":
-        return ["Ethereum", "Arbitrum", "Optimism"];
+        return ["Ethereum", "Arbitrum", "Optimism", "Solana"];
       case "Testnet":
-        return ["Sepolia", "ArbitrumSepolia", "OptimismSepolia"];
+        return ["Sepolia", "ArbitrumSepolia", "OptimismSepolia", "Solana"];
       default:
         throw new Error(`Unsupported network: ${network}`);
     }
   }
-  static getContracts(chain) {
-    switch (chain) {
+  static getContracts(chainContext) {
+    switch (chainContext.chain) {
       case "Ethereum":
         return this.EVM_CONTRACTS;
       case "Optimism":
@@ -33,15 +48,17 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends routes.AutomaticRoute {
         return this.EVM_CONTRACTS;
       case "ArbitrumSepolia":
         return this.EVM_CONTRACTS;
+      case "Solana":
+        return this.solanaContracts(chainContext.network);
       default:
-        throw new Error(`Unsupported chain: ${chain}`);
+        throw new Error(`Unsupported chain: ${chainContext.chain}`);
     }
   }
   static async supportedSourceTokens(fromChain) {
-    const { token, wrappedMToken } = this.getContracts(fromChain.chain);
+    const { token, mLikeTokens } = this.getContracts(fromChain);
     return [
       Wormhole.tokenId(fromChain.chain, token),
-      Wormhole.tokenId(fromChain.chain, wrappedMToken)
+      ...mLikeTokens.map((x) => Wormhole.tokenId(fromChain.chain, x))
     ];
   }
   static async supportedDestinationTokens(token, fromChain, toChain) {
@@ -49,10 +66,10 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends routes.AutomaticRoute {
     if (!sourceTokens.some((t) => isSameToken(t, token))) {
       return [];
     }
-    const { token: mToken, wrappedMToken } = this.getContracts(toChain.chain);
+    const { token: mToken, mLikeTokens } = this.getContracts(toChain);
     return [
       Wormhole.tokenId(toChain.chain, mToken),
-      Wormhole.tokenId(toChain.chain, wrappedMToken)
+      ...mLikeTokens.map((x) => Wormhole.tokenId(toChain.chain, x))
     ];
   }
   static isProtocolSupported(chain) {
@@ -63,7 +80,7 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends routes.AutomaticRoute {
   }
   async isAvailable(request) {
     const ntt = await request.fromChain.getProtocol("Ntt", {
-      ntt: _M0AutomaticRoute.getContracts(request.fromChain.chain)
+      ntt: _M0AutomaticRoute.getContracts(request.fromChain)
     });
     return ntt.isRelayingAvailable(request.toChain.chain);
   }
@@ -78,10 +95,8 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends routes.AutomaticRoute {
       parsedAmount,
       request.destination.decimals
     );
-    const fromContracts = _M0AutomaticRoute.getContracts(
-      request.fromChain.chain
-    );
-    const toContracts = _M0AutomaticRoute.getContracts(request.toChain.chain);
+    const fromContracts = _M0AutomaticRoute.getContracts(request.fromChain);
+    const toContracts = _M0AutomaticRoute.getContracts(request.toChain);
     const validatedParams = {
       amount: params.amount,
       normalizedParams: {
@@ -101,7 +116,7 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends routes.AutomaticRoute {
   async quote(request, params) {
     const { fromChain, toChain } = request;
     const ntt = await fromChain.getProtocol("Ntt", {
-      ntt: _M0AutomaticRoute.getContracts(fromChain.chain)
+      ntt: _M0AutomaticRoute.getContracts(fromChain)
     });
     if (!await ntt.isRelayingAvailable(toChain.chain)) {
       return {
@@ -147,22 +162,17 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends routes.AutomaticRoute {
     const { params } = quote;
     const { fromChain } = request;
     const sender = Wormhole.parseAddress(signer.chain(), signer.address());
-    if (chainToPlatform(fromChain.chain) !== "Evm")
-      throw new Error("The route supports only EVM");
+    const platform = chainToPlatform(fromChain.chain);
+    const transferAmount = amount.units(params.normalizedParams.amount);
+    const options = params.normalizedParams.options;
+    if (platform !== "Evm" && platform !== "Solana")
+      throw new Error(`Unsupported platform ${platform}`);
     const ntt = await fromChain.getProtocol("Ntt", {
-      ntt: _M0AutomaticRoute.getContracts(fromChain.chain)
+      ntt: _M0AutomaticRoute.getContracts(fromChain)
     });
-    const sourceTokenAddress = canonicalAddress(request.source.id);
-    const destinationTokenAddress = canonicalAddress(request.destination.id);
-    const initXfer = this.transferMLike(
-      ntt,
-      sender,
-      amount.units(params.normalizedParams.amount),
-      to,
-      sourceTokenAddress,
-      destinationTokenAddress,
-      params.normalizedParams.options
-    );
+    const sourceToken = canonicalAddress(request.source.id);
+    const destinationToken = canonicalAddress(request.destination.id);
+    const initXfer = platform === "Evm" ? this.transferMLike(ntt, sender, transferAmount, to, sourceToken, destinationToken, options) : ntt.transfer(sender, transferAmount, to, options);
     const txids = await signSendWait(fromChain, initXfer, signer);
     return {
       from: fromChain.chain,
@@ -223,13 +233,10 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends routes.AutomaticRoute {
     );
   }
   async *track(receipt, timeout) {
+    const isEvmPlatform = (chain) => chainToPlatform(chain) === "Evm";
     if (isSourceInitiated(receipt) || isSourceFinalized(receipt)) {
       const { txid } = receipt.originTxs[receipt.originTxs.length - 1];
-      const isEvmPlatform = (chain) => chainToPlatform(chain) === "Evm";
-      const vaaType = isEvmPlatform(receipt.from) && isEvmPlatform(receipt.to) ? (
-        // Automatic NTT transfers between EVM chains use standard relayers
-        "Ntt:WormholeTransferStandardRelayer"
-      ) : "Ntt:WormholeTransfer";
+      const vaaType = isEvmPlatform(receipt.from) && isEvmPlatform(receipt.to) ? "Ntt:WormholeTransferStandardRelayer" : "Ntt:WormholeTransfer";
       const vaa = await this.wh.getVaa(txid, vaaType, timeout);
       if (!vaa) {
         throw new Error(`No VAA found for transaction: ${txid}`);
@@ -251,7 +258,7 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends routes.AutomaticRoute {
     }
     const toChain = this.wh.getChain(receipt.to);
     const ntt = await toChain.getProtocol("Ntt", {
-      ntt: _M0AutomaticRoute.getContracts(toChain.chain)
+      ntt: _M0AutomaticRoute.getContracts(toChain)
     });
     if (isAttested(receipt)) {
       const {
@@ -267,13 +274,11 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends routes.AutomaticRoute {
       }
     }
     if (isRedeemed(receipt)) {
-      const {
-        attestation: { attestation: vaa }
-      } = receipt;
+      const { attestation: { attestation: vaa } } = receipt;
       const payload = vaa.payloadName === "WormholeTransfer" ? vaa.payload : vaa.payload["payload"];
-      const isExecuted = await ntt.manager.isMessageExecuted(
+      const isExecuted = isEvmPlatform(receipt.to) ? await ntt.manager.isMessageExecuted(
         Ntt.messageDigest(vaa.emitterChain, payload["nttManagerPayload"])
-      );
+      ) : await ntt.getIsExecuted(vaa);
       if (isExecuted) {
         receipt = {
           ...receipt,
@@ -287,18 +292,22 @@ var _M0AutomaticRoute = class _M0AutomaticRoute extends routes.AutomaticRoute {
 };
 // 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.SOLANA_MAINNET_M_TOKEN = "mzerokyEX9TNDoK4o2YZQBDmMzjokAeN6M2g2S3pLJo";
+_M0AutomaticRoute.SOLANA_TESTNET_M_TOKEN = "mzeroZRGCah3j5xEWp2Nih3GDejSBbH1rbHoxDg8By6";
 // Contract addresses are the same on all EVM chains
 _M0AutomaticRoute.EVM_CONTRACTS = {
   // M token address is the same on EVM chains
   token: "0x866A2BF4E572CbcF37D5071A7a58503Bfb36be1b",
-  // Wrapped M token address is the same on EVM chains
-  wrappedMToken: "0x437cc33344a0B27A429f795ff6B469C72698B291",
+  // Wrapped $M and Extension Tokens that can bridged by unwrapping to $M
+  mLikeTokens: [_M0AutomaticRoute.EVM_WRAPPED_M_TOKEN],
   // M0 Portal address is the same on EVM chains
   manager: "0xD925C84b55E4e44a53749fF5F2a5A13F63D128fd",
   // Wormhole transceiver address is the same on EVM chains
   transceiver: { wormhole: "0x0763196A091575adF99e2306E5e90E0Be5154841" }
 };
-_M0AutomaticRoute.meta = { name: "M0AutomaticRoute", provider: "M^0" };
+_M0AutomaticRoute.meta = { name: "M0AutomaticRoute", provider: "M0" };
 var M0AutomaticRoute = _M0AutomaticRoute;
 
 export { M0AutomaticRoute };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@m0-foundation/ntt-sdk-route",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -35,6 +35,8 @@
     "@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-solana": "^1.7.0",
+    "@wormhole-foundation/sdk-solana-ntt": "^0.7.1",
     "@wormhole-foundation/sdk-route-ntt": "^0.7.1",
     "ethers": "^6.5.1"
   },