changed testnet addresses

Author: kev1n-peters

wormhole-connect/src/AppRouter.tsx

@@ -74,7 +74,7 @@ function AppRouter({ config }: Props) {
       dispatch(clearRedeem());
       dispatch(clearWallets());
       dispatch(clearNtt());
-      wh.registerProviders(); // reset any providers that may have been set (e.g. signer.provider)
+      wh.registerProviders(); // reset providers that may have been set during transfer
     }
     // reset transfer state on leave
     if (prevRoute === bridgeRoute && route !== bridgeRoute) {

wormhole-connect/src/config/testnet/gasEstimates.ts

@@ -252,11 +252,11 @@ export const TESTNET_GAS_ESTIMATES: GasEstimates = {
       claim: 200000,
     },
     [Route.NttManual]: {
-      sendToken: 10000000,
-      claim: 15000000,
+      sendToken: 200000,
+      claim: 250000,
     },
     [Route.NttRelay]: {
-      sendToken: 15000000,
+      sendToken: 450000,
     },
   },
   arbitrum_sepolia: {

wormhole-connect/src/config/testnet/tokens.ts

@@ -2231,14 +2231,15 @@ export const TESTNET_TOKENS: TokensConfig = {
     decimals: {
       default: 18,
     },
+  },
   TEST_NTTsepolia: {
     key: 'TEST_NTTsepolia',
     symbol: 'TEST_NTT',
     nativeChain: 'sepolia',
     icon: Icon.NTT,
     tokenId: {
       chain: 'sepolia',
-      address: '0x169D91C797edF56100F1B765268145660503a423',
+      address: '0x1d30E78B7C7fbbcef87ae6e97B5389b2e470CA4a',
     },
     coinGeckoId: '',
     color: '#2774CA',
@@ -2247,8 +2248,8 @@ export const TESTNET_TOKENS: TokensConfig = {
       default: 8,
     },
     ntt: {
-      nttManager: '0x24c7E23e3A97cD2F04c9EB9F354bb7f3B31d2d1A',
-      wormholeTransceiver: '0xC5bf11aB6aE525FFCA02e2af7F6704CDcECec2eA',
+      nttManager: '0xB231aD95f2301bc82eA44c515001F0F746D637e0',
+      wormholeTransceiver: '0x1fDC902e30b188FD2BA976B421Cb179943F57896',
     },
   },
   TEST_NTTarbitrum_sepolia: {
@@ -2258,7 +2259,7 @@ export const TESTNET_TOKENS: TokensConfig = {
     icon: Icon.NTT,
     tokenId: {
       chain: 'arbitrum_sepolia',
-      address: '0x169D91C797edF56100F1B765268145660503a423',
+      address: '0x84A1Cb660B19eB0063EE5FD377eC14AAe3364d74',
     },
     coinGeckoId: '',
     color: '#2774CA',
@@ -2267,8 +2268,8 @@ export const TESTNET_TOKENS: TokensConfig = {
       default: 8,
     },
     ntt: {
-      nttManager: '0xaBFa6Ab8dD4d4166b8fea7f84C1458BEf92F3a61',
-      wormholeTransceiver: '0xC9a478f97ad763052AD4F00c4d7fC5d187DFFb1B',
+      nttManager: '0xEec94CD3083e067398256a79CcA7e740C5c8ef81',
+      wormholeTransceiver: '0x0E24D17D7467467b39Bf64A9DFf88776Bd6c74d7',
     },
   },
   TEST_NTTbase_sepolia: {
@@ -2278,7 +2279,7 @@ export const TESTNET_TOKENS: TokensConfig = {
     icon: Icon.NTT,
     tokenId: {
       chain: 'base_sepolia',
-      address: '0x169D91C797edF56100F1B765268145660503a423',
+      address: '0x7f430D4e7939D994C0955A01FC75D9DE33F12D11',
     },
     coinGeckoId: '',
     color: '#2774CA',
@@ -2287,8 +2288,8 @@ export const TESTNET_TOKENS: TokensConfig = {
       default: 8,
     },
     ntt: {
-      nttManager: '0x838a95B6a3E06B6f11C437e22f3C7561a6ec40F1',
-      wormholeTransceiver: '0xc3a1248e9bdC1EEF81d16b2AD1594764cBd9307a',
+      nttManager: '0xB03b030b2f5B40819Df76467d67eD1C85Ff66fAD',
+      wormholeTransceiver: '0x1e072169541f1171e427Aa44B5fd8924BEE71b0e',
     },
   },
   TEST_NTToptimism_sepolia: {
@@ -2298,7 +2299,7 @@ export const TESTNET_TOKENS: TokensConfig = {
     icon: Icon.NTT,
     tokenId: {
       chain: 'optimism_sepolia',
-      address: '0x169D91C797edF56100F1B765268145660503a423',
+      address: '0x0e15979a7a1eFAEf20312CA45A59eb141bF7E340',
     },
     coinGeckoId: '',
     color: '#2774CA',
@@ -2307,8 +2308,8 @@ export const TESTNET_TOKENS: TokensConfig = {
       default: 8,
     },
     ntt: {
-      nttManager: '0x605dE5E0880Cfd6Ffc61aF9585CBAB3946594A3D',
-      wormholeTransceiver: '0x5a76440b725909000697E0f72646adf1a492DF8B',
+      nttManager: '0x7f430D4e7939D994C0955A01FC75D9DE33F12D11',
+      wormholeTransceiver: '0x41265eb2863bf0238081F6AeefeF73549C82C3DD',
     },
   },
   TEST_NTTsolana: {
@@ -2318,7 +2319,7 @@ export const TESTNET_TOKENS: TokensConfig = {
     icon: Icon.NTT,
     tokenId: {
       chain: 'solana',
-      address: 'SCAmk7zfNKXemDjap14aGJJyQXZXXhq9X2Fs8oVSsdr',
+      address: '87r5ZS91Q2pQbFTvvneqs7y7mbtegtqMt4LDAS4g23Ax',
     },
     coinGeckoId: '',
     color: '#2774CA',
@@ -2327,11 +2328,11 @@ export const TESTNET_TOKENS: TokensConfig = {
       default: 8,
     },
     ntt: {
-      nttManager: '7nMTXqo19kzwyisGCdcRP5AErEBToYpVYg2C5PNrjsa2',
-      // The wormhole endpoint is baked into the ntt contract on Solana.
-      // If the endpoint is split into a separate contract, this address
+      nttManager: 'nTTh3bZ5Aer6xboWZe39RDEft4MeVxSQ8D1EYAVLZw9',
+      // The wormhole transceiver is baked into the Solana ntt contract.
+      // If the transceiver is split into a separate contract, this address
       // and route code should be updated to support the new structure.
-      wormholeTransceiver: '7nMTXqo19kzwyisGCdcRP5AErEBToYpVYg2C5PNrjsa2',
+      wormholeTransceiver: 'nTTh3bZ5Aer6xboWZe39RDEft4MeVxSQ8D1EYAVLZw9',
       solanaQuoter: '',
     },
   },

wormhole-connect/src/routes/ntt/nttBase.ts

@@ -40,6 +40,7 @@ import { WormholeTransceiver, getMessageEvm } from './platforms/evm';
 import { NttManagerSolana, getMessageSolana } from './platforms/solana';
 import { formatGasFee } from 'routes/utils';
 import { NO_INPUT } from 'utils/style';
+import { estimateAverageGasFee } from 'utils/gas';
 
 export abstract class NttBase extends BaseRoute {
   isSupportedChain(chain: ChainName): boolean {
@@ -58,7 +59,8 @@ export abstract class NttBase extends BaseRoute {
     if (
       destChain &&
       destToken &&
-      !this.isSupportedToken(destToken, destChain)
+      !this.isSupportedToken(destToken, destChain) &&
+      token.symbol === destToken.symbol
     ) {
       return false;
     }
@@ -77,7 +79,8 @@ export abstract class NttBase extends BaseRoute {
     if (
       sourceChain &&
       sourceToken &&
-      !this.isSupportedToken(sourceToken, sourceChain)
+      !this.isSupportedToken(sourceToken, sourceChain) &&
+      token.symbol === sourceToken.symbol
     ) {
       return false;
     }
@@ -159,9 +162,8 @@ export abstract class NttBase extends BaseRoute {
     routeOptions?: any,
   ): Promise<BigNumber> {
     if (isEvmChain(sendingChain)) {
-      const provider = wh.mustGetProvider(sendingChain);
-      const gasPrice = await provider.getGasPrice();
-      return gasPrice.mul(this.TYPE === Route.NttManual ? 200_000 : 250_000);
+      const gasLimit = this.TYPE === Route.NttManual ? 200_000 : 250_000;
+      return await estimateAverageGasFee(sendingChain, gasLimit);
     } else if (wh.toChainName(sendingChain) === 'solana') {
       return BigNumber.from(10_000);
     }
@@ -177,11 +179,10 @@ export abstract class NttBase extends BaseRoute {
       return BigNumber.from(0);
     }
     if (isEvmChain(destChain)) {
-      const provider = wh.mustGetProvider(destChain);
-      const gasPrice = await provider.getGasPrice();
-      return gasPrice.mul(300_000);
+      const gasLimit = 300_000;
+      return await estimateAverageGasFee(destChain, gasLimit);
     } else if (wh.toChainName(destChain) === 'solana') {
-      return BigNumber.from(65_000);
+      return BigNumber.from(65_000); // TODO: check this
     }
     throw new Error('Unsupported chain');
   }
@@ -224,6 +225,9 @@ export abstract class NttBase extends BaseRoute {
       tokenConfig.tokenId,
     );
     const sendAmount = removeDust(parseUnits(amount, decimals), decimals);
+    if (sendAmount.isZero()) {
+      throw new Error('Amount too low');
+    }
     const shouldSkipRelayerSend = this.TYPE !== Route.NttRelay;
     return await nttManager.send(
       token,
@@ -351,10 +355,10 @@ export abstract class NttBase extends BaseRoute {
     chain: ChainName | ChainId,
   ): Promise<UnsignedNttMessage> {
     if (isEvmChain(chain)) {
-      return getMessageEvm(tx, chain);
+      return await getMessageEvm(tx, chain);
     }
     if (wh.toChainName(chain) === 'solana') {
-      return getMessageSolana(tx);
+      return await getMessageSolana(tx);
     }
     throw new Error('Unsupported chain');
   }
@@ -378,8 +382,6 @@ export abstract class NttBase extends BaseRoute {
     return undefined;
   }
 
-  // The transfer is considered completed when the message is executed
-  // and not inbound queued
   async isTransferCompleted(
     chain: ChainName | ChainId,
     signedMessage: SignedNttMessage,
@@ -389,14 +391,7 @@ export abstract class NttBase extends BaseRoute {
     }
     const { recipientNttManager, messageDigest } = signedMessage;
     const nttManager = getNttManager(chain, recipientNttManager);
-    const isMessageExecuted = await nttManager.isMessageExecuted(messageDigest);
-    if (isMessageExecuted) {
-      const queuedTransfer = await nttManager.getInboundQueuedTransfer(
-        messageDigest,
-      );
-      return !queuedTransfer;
-    }
-    return false;
+    return await nttManager.isTransferCompleted(messageDigest);
   }
 
   async getTransferDestInfo<T extends TransferDestInfoBaseParams>(

wormhole-connect/src/routes/ntt/payloads/transfers.ts

@@ -1,4 +1,4 @@
-import { TrimmedAmount } from '../trimmedAmount';
+import { TrimmedAmount } from './trimmedAmount';
 
 export class NativeTokenTransfer {
   static prefix = Buffer.from([0x99, 0x4e, 0x54, 0x54]);

wormhole-connect/src/routes/ntt/trimmedAmount.ts wormhole-connect/src/routes/ntt/payloads/trimmedAmount.ts

@@ -20,6 +20,9 @@ import {
 
 const RELAYING_INFO_EVENT_TOPIC =
   '0x375a56c053c4d19a2e3445e97b7a28bf4e908617ce6d766e1e03a9d3f5276271';
+const RELAYING_INFO_IFACE = new ethers.utils.Interface([
+  'event RelayingInfo(uint8 relayingType, uint256 deliveryPayment)',
+]);
 
 export const getMessageEvm = async (
   tx: string,
@@ -53,10 +56,7 @@ export const getMessageEvm = async (
   if (!relayingInfoEvent) {
     throw new Error('RelayingInfo event not found');
   }
-  const relayingInfoIface = new ethers.utils.Interface([
-    'event RelayingInfo(uint8 relayingType, uint256 deliveryPayment)',
-  ]);
-  const parsedRelayingInfo = relayingInfoIface.parseLog(relayingInfoEvent);
+  const parsedRelayingInfo = RELAYING_INFO_IFACE.parseLog(relayingInfoEvent);
   const { relayingType, deliveryPayment } = parsedRelayingInfo.args;
   let payload: Buffer;
   if (relayingType === NttRelayingType.Standard) {

wormhole-connect/src/routes/ntt/platforms/evm/getMessage.ts

@@ -92,14 +92,14 @@ export class NttManagerEvm {
     if (!tokenConfig?.ntt?.wormholeTransceiver) {
       throw new Error('no wormhole transceiver');
     }
-    const deliveryPrice = !shouldSkipRelayerSend
-      ? BigNumber.from(
+    const deliveryPrice = shouldSkipRelayerSend
+      ? undefined
+      : BigNumber.from(
           await this.quoteDeliveryPrice(
             toChain,
             tokenConfig.ntt.wormholeTransceiver,
           ),
-        )
-      : undefined;
+        );
     const transceiverIxs = encodeTransceiverInstructions([
       {
         index: 0,
@@ -182,17 +182,20 @@ export class NttManagerEvm {
     }
   }
 
-  async isMessageExecuted(messageDigest: string): Promise<boolean> {
-    try {
-      return this.nttManager.isMessageExecuted(messageDigest);
-    } catch (e) {
-      console.error(e);
-      throw e;
+  // The transfer is "complete" when the message is executed and not inbound queued
+  async isTransferCompleted(messageDigest: string): Promise<boolean> {
+    const isMessageExecuted = await this.nttManager.isMessageExecuted(
+      messageDigest,
+    );
+    if (isMessageExecuted) {
+      const queuedTransfer = await this.getInboundQueuedTransfer(messageDigest);
+      return !queuedTransfer;
     }
+    return false;
   }
 
   async isPaused(): Promise<boolean> {
-    return this.nttManager.isPaused();
+    return await this.nttManager.isPaused();
   }
 
   async fetchRedeemTx(messageDigest: string): Promise<string | undefined> {

wormhole-connect/src/routes/ntt/platforms/evm/nttManager.ts

@@ -3,6 +3,7 @@ import { wh } from 'utils/sdk';
 import { WormholeTransceiver__factory } from './abis/WormholeTransceiver__factory';
 import { TransferWallet, signAndSendTransaction } from 'utils/wallet';
 import { WormholeTransceiver as WormholeTransceiverAbi } from './abis/WormholeTransceiver';
+import { BigNumber } from 'ethers';
 
 export class WormholeTransceiver {
   readonly transceiver: WormholeTransceiverAbi;
@@ -32,6 +33,7 @@ export class WormholeTransceiver {
 
   async receiveMessage(vaa: string, payer: string): Promise<string> {
     const tx = await this.transceiver.populateTransaction.receiveMessage(vaa);
+    tx.gasLimit = BigNumber.from(500000);
     const signer = await wh.mustGetSigner(this.chain);
     const response = await signer.sendTransaction(tx);
     const receipt = await response.wait();

wormhole-connect/src/routes/ntt/platforms/evm/wormholeTransceiver.ts

@@ -2,8 +2,6 @@ import { ChainName, ChainId } from '@wormhole-foundation/wormhole-connect-sdk';
 import { isEvmChain, wh } from 'utils/sdk';
 import { NttManagerEvm } from './evm';
 import { NttManagerSolana } from './solana';
-import { WormholeTransceiver } from './evm';
-import { NttQuoter } from './solana/nttQuoter';
 
 export const getNttManager = (
   chain: ChainName | ChainId,
@@ -17,22 +15,3 @@ export const getNttManager = (
   }
   throw new Error(`Unsupported chain: ${chain}`);
 };
-
-export const isRelayingEnabled = async (
-  chain: ChainName | ChainId,
-  address: string,
-  destChain: ChainName | ChainId,
-) => {
-  if (isEvmChain(chain)) {
-    const transceiver = new WormholeTransceiver(chain, address);
-    return await Promise.all([
-      transceiver.isWormholeRelayingEnabled(destChain),
-      transceiver.isSpecialRelayingEnabled(destChain),
-    ]).then((results) => results.some((r) => r));
-  }
-  if (wh.toChainName(chain) === 'solana') {
-    const quoter = new NttQuoter(address);
-    return await quoter.isRelayEnabled(destChain);
-  }
-  throw new Error(`Unsupported chain: ${chain}`);
-};

wormhole-connect/src/routes/ntt/platforms/index.ts

@@ -326,13 +326,10 @@ export class NttManagerSolana {
     return txId;
   }
 
-  async isMessageExecuted(messageDigest: string): Promise<boolean> {
+  async isTransferCompleted(messageDigest: string): Promise<boolean> {
     try {
       const inboxItem = await this.getInboxItem(messageDigest);
-      return (
-        inboxItem.releaseStatus.released !== null &&
-        inboxItem.releaseStatus.released !== undefined
-      );
+      return !!inboxItem.releaseStatus.released;
     } catch (e: any) {
       if (e.message?.includes('Account does not exist')) {
         return false;
@@ -347,7 +344,6 @@ export class NttManagerSolana {
     const signatures = await this.connection.getSignaturesForAddress(address, {
       limit: 1,
     });
-    console.log(`fetchRedeemTx: ${signatures[0].signature}`);
     return signatures ? signatures[0].signature : undefined;
   }