@m0-foundation/ntt-sdk-route 0.0.26 → 0.0.28

package/dist/index.js

@@ -9,14 +9,12 @@ var sdkSolana = require('@wormhole-foundation/sdk-solana');
 var sdkRouteNtt = require('@wormhole-foundation/sdk-route-ntt');
 var web3_js = require('@solana/web3.js');
 var anchor = require('@coral-xyz/anchor');
-var NodeWallet = require('@coral-xyz/anchor/dist/cjs/nodewallet');
 var ethers = require('ethers');
 var splToken = require('@solana/spl-token');
 var BN = require('bn.js');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
-var NodeWallet__default = /*#__PURE__*/_interopDefault(NodeWallet);
 var BN__default = /*#__PURE__*/_interopDefault(BN);
 
 // src/m0AutomaticRoute.ts
@@ -8141,21 +8139,20 @@ var portal_default2 = [
 ];
 
 // src/artifacts/index.ts
-var svmPortalProvider = (connection) => {
+function dummyWallet() {
   const key = web3_js.Keypair.generate();
-  const dummyProvider = new anchor.AnchorProvider(connection, new NodeWallet__default.default(key));
-  return new anchor.Program(portal_default, dummyProvider);
-};
-var svmWormholeAdapterProvider = (connection) => {
-  const key = web3_js.Keypair.generate();
-  const dummyProvider = new anchor.AnchorProvider(connection, new NodeWallet__default.default(key));
-  return new anchor.Program(wormhole_adapter_default, dummyProvider);
-};
-var svmSwapFacilityProvider = (connection) => {
-  const key = web3_js.Keypair.generate();
-  const dummyProvider = new anchor.AnchorProvider(connection, new NodeWallet__default.default(key));
-  return new anchor.Program(ext_swap_default, dummyProvider);
-};
+  return {
+    publicKey: key.publicKey,
+    signTransaction: async (tx) => tx,
+    signAllTransactions: async (txs) => txs
+  };
+}
+function createProgram(connection, idl) {
+  return new anchor.Program(idl, new anchor.AnchorProvider(connection, dummyWallet()));
+}
+var svmPortalProvider = (connection) => createProgram(connection, portal_default);
+var svmWormholeAdapterProvider = (connection) => createProgram(connection, wormhole_adapter_default);
+var svmSwapFacilityProvider = (connection) => createProgram(connection, ext_swap_default);
 var evmPortalProvider = (provider) => {
   return new ethers.Contract(
     "0xD925C84b55E4e44a53749fF5F2a5A13F63D128fd",
@@ -8285,7 +8282,7 @@ var _SvmRouter = class _SvmRouter {
     });
     return extensionsWithPath.map((mint) => ({
       chain: this.chain,
-      address: new sdkConnect.UniversalAddress(mint, "base58")
+      address: sdkConnect.toNative(this.chain, mint)
     }));
   }
   async getSupportedDestinationTokens(sourceToken, toChain) {
@@ -8297,7 +8294,7 @@ var _SvmRouter = class _SvmRouter {
     if (!dests) return [];
     return Array.from(dests).map((dest) => ({
       chain: toChain,
-      address: new sdkConnect.UniversalAddress(dest, "hex")
+      address: sdkConnect.toNative(toChain, dest)
     }));
   }
   async getAddressLookupTableAccounts() {
@@ -8357,7 +8354,7 @@ var _SvmRouter = class _SvmRouter {
     });
   }
   getRemainingAccounts() {
-    const adapter = svmWormholeAdapterProvider(null).programId;
+    const adapter = svmWormholeAdapterProvider(this.connection).programId;
     const bridgePrograms = {
       Mainnet: {
         config: new web3_js.PublicKey("2yVjuQwpsvdsrywzsJJVs9Ueh4zayyo5DYJbBNc3DDpn"),
@@ -8456,7 +8453,7 @@ var _EvmRouter = class _EvmRouter {
   async getSupportedSourceTokens() {
     return this.TOKENS.map((token) => ({
       chain: this.chain,
-      address: new sdkConnect.UniversalAddress(token, "hex")
+      address: sdkConnect.toNative(this.chain, token)
     }));
   }
   async getSupportedDestinationTokens(_sourceToken, toChain) {
@@ -8464,16 +8461,13 @@ var _EvmRouter = class _EvmRouter {
       return [
         {
           chain: toChain,
-          address: new sdkConnect.UniversalAddress(
-            "mzeroXDoBpRVhnEXBra27qzAMdxgpWVY3DzQW7xMVJp",
-            "base58"
-          )
+          address: sdkConnect.toNative(toChain, "mzeroXDoBpRVhnEXBra27qzAMdxgpWVY3DzQW7xMVJp")
         }
       ];
     }
     return this.TOKENS.map((token) => ({
       chain: toChain,
-      address: new sdkConnect.UniversalAddress(token, "hex")
+      address: sdkConnect.toNative(toChain, token)
     }));
   }
   static async fromChainContext(ctx) {

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { routes, chainToPlatform, amount, finality, Wormhole, canonicalAddress, signSendWait, TransferState, isSourceInitiated, isSourceFinalized, isAttested, isRedeemed, UniversalAddress, chainToChainId, sha256 } from '@wormhole-foundation/sdk-connect';
+import { routes, chainToPlatform, amount, finality, Wormhole, canonicalAddress, signSendWait, TransferState, isSourceInitiated, isSourceFinalized, isAttested, isRedeemed, toNative, chainToChainId, sha256 } from '@wormhole-foundation/sdk-connect';
 import { Ntt, register } from '@wormhole-foundation/sdk-definitions-ntt';
 import { register as register$1 } from '@wormhole-foundation/sdk-evm-ntt';
 import { register as register$2 } from '@wormhole-foundation/sdk-solana-ntt';
@@ -6,8 +6,7 @@ import { EvmAddress, EvmUnsignedTransaction, addChainId } from '@wormhole-founda
 import { SolanaUnsignedTransaction } from '@wormhole-foundation/sdk-solana';
 import { NttRoute, nttExecutorRoute } from '@wormhole-foundation/sdk-route-ntt';
 import { PublicKey, TransactionMessage, VersionedTransaction, AddressLookupTableAccount, TransactionInstruction, SystemProgram, SYSVAR_CLOCK_PUBKEY, Keypair } from '@solana/web3.js';
-import { AnchorProvider, Program } from '@coral-xyz/anchor';
-import NodeWallet from '@coral-xyz/anchor/dist/cjs/nodewallet';
+import { Program, AnchorProvider } from '@coral-xyz/anchor';
 import { Contract } from 'ethers';
 import { getAssociatedTokenAddressSync, TOKEN_2022_PROGRAM_ID, unpackMint, getScaledUiAmountConfig } from '@solana/spl-token';
 import BN from 'bn.js';
@@ -8134,21 +8133,20 @@ var portal_default2 = [
 ];
 
 // src/artifacts/index.ts
-var svmPortalProvider = (connection) => {
+function dummyWallet() {
   const key = Keypair.generate();
-  const dummyProvider = new AnchorProvider(connection, new NodeWallet(key));
-  return new Program(portal_default, dummyProvider);
-};
-var svmWormholeAdapterProvider = (connection) => {
-  const key = Keypair.generate();
-  const dummyProvider = new AnchorProvider(connection, new NodeWallet(key));
-  return new Program(wormhole_adapter_default, dummyProvider);
-};
-var svmSwapFacilityProvider = (connection) => {
-  const key = Keypair.generate();
-  const dummyProvider = new AnchorProvider(connection, new NodeWallet(key));
-  return new Program(ext_swap_default, dummyProvider);
-};
+  return {
+    publicKey: key.publicKey,
+    signTransaction: async (tx) => tx,
+    signAllTransactions: async (txs) => txs
+  };
+}
+function createProgram(connection, idl) {
+  return new Program(idl, new AnchorProvider(connection, dummyWallet()));
+}
+var svmPortalProvider = (connection) => createProgram(connection, portal_default);
+var svmWormholeAdapterProvider = (connection) => createProgram(connection, wormhole_adapter_default);
+var svmSwapFacilityProvider = (connection) => createProgram(connection, ext_swap_default);
 var evmPortalProvider = (provider) => {
   return new Contract(
     "0xD925C84b55E4e44a53749fF5F2a5A13F63D128fd",
@@ -8278,7 +8276,7 @@ var _SvmRouter = class _SvmRouter {
     });
     return extensionsWithPath.map((mint) => ({
       chain: this.chain,
-      address: new UniversalAddress(mint, "base58")
+      address: toNative(this.chain, mint)
     }));
   }
   async getSupportedDestinationTokens(sourceToken, toChain) {
@@ -8290,7 +8288,7 @@ var _SvmRouter = class _SvmRouter {
     if (!dests) return [];
     return Array.from(dests).map((dest) => ({
       chain: toChain,
-      address: new UniversalAddress(dest, "hex")
+      address: toNative(toChain, dest)
     }));
   }
   async getAddressLookupTableAccounts() {
@@ -8350,7 +8348,7 @@ var _SvmRouter = class _SvmRouter {
     });
   }
   getRemainingAccounts() {
-    const adapter = svmWormholeAdapterProvider(null).programId;
+    const adapter = svmWormholeAdapterProvider(this.connection).programId;
     const bridgePrograms = {
       Mainnet: {
         config: new PublicKey("2yVjuQwpsvdsrywzsJJVs9Ueh4zayyo5DYJbBNc3DDpn"),
@@ -8449,7 +8447,7 @@ var _EvmRouter = class _EvmRouter {
   async getSupportedSourceTokens() {
     return this.TOKENS.map((token) => ({
       chain: this.chain,
-      address: new UniversalAddress(token, "hex")
+      address: toNative(this.chain, token)
     }));
   }
   async getSupportedDestinationTokens(_sourceToken, toChain) {
@@ -8457,16 +8455,13 @@ var _EvmRouter = class _EvmRouter {
       return [
         {
           chain: toChain,
-          address: new UniversalAddress(
-            "mzeroXDoBpRVhnEXBra27qzAMdxgpWVY3DzQW7xMVJp",
-            "base58"
-          )
+          address: toNative(toChain, "mzeroXDoBpRVhnEXBra27qzAMdxgpWVY3DzQW7xMVJp")
         }
       ];
     }
     return this.TOKENS.map((token) => ({
       chain: toChain,
-      address: new UniversalAddress(token, "hex")
+      address: toNative(toChain, token)
     }));
   }
   static async fromChainContext(ctx) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@m0-foundation/ntt-sdk-route",
-  "version": "0.0.26",
+  "version": "0.0.28",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",