added ntt token group id

Author: kev1n-peters

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

@@ -2248,6 +2248,7 @@ export const TESTNET_TOKENS: TokensConfig = {
       default: 8,
     },
     ntt: {
+      groupId: 'test_ntt',
       nttManager: '0xB231aD95f2301bc82eA44c515001F0F746D637e0',
       wormholeTransceiver: '0x1fDC902e30b188FD2BA976B421Cb179943F57896',
     },
@@ -2268,6 +2269,7 @@ export const TESTNET_TOKENS: TokensConfig = {
       default: 8,
     },
     ntt: {
+      groupId: 'test_ntt',
       nttManager: '0xEec94CD3083e067398256a79CcA7e740C5c8ef81',
       wormholeTransceiver: '0x0E24D17D7467467b39Bf64A9DFf88776Bd6c74d7',
     },
@@ -2288,6 +2290,7 @@ export const TESTNET_TOKENS: TokensConfig = {
       default: 8,
     },
     ntt: {
+      groupId: 'test_ntt',
       nttManager: '0xB03b030b2f5B40819Df76467d67eD1C85Ff66fAD',
       wormholeTransceiver: '0x1e072169541f1171e427Aa44B5fd8924BEE71b0e',
     },
@@ -2308,6 +2311,7 @@ export const TESTNET_TOKENS: TokensConfig = {
       default: 8,
     },
     ntt: {
+      groupId: 'test_ntt',
       nttManager: '0x7f430D4e7939D994C0955A01FC75D9DE33F12D11',
       wormholeTransceiver: '0x41265eb2863bf0238081F6AeefeF73549C82C3DD',
     },
@@ -2328,6 +2332,7 @@ export const TESTNET_TOKENS: TokensConfig = {
       default: 8,
     },
     ntt: {
+      groupId: 'test_ntt',
       nttManager: 'nTTh3bZ5Aer6xboWZe39RDEft4MeVxSQ8D1EYAVLZw9',
       // The wormhole transceiver is baked into the Solana NTT contract.
       // If the transceiver is split into a separate contract, this address

wormhole-connect/src/config/types.ts

@@ -234,6 +234,7 @@ export type TokenConfig = {
     };
   };
   ntt?: {
+    groupId: string;
     nttManager: string;
     wormholeTransceiver: string;
     solanaQuoter?: string;

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

@@ -28,7 +28,7 @@ import {
   removeDust,
   toNormalizedDecimals,
 } from 'utils';
-import { getNativeVersionOfToken } from 'store/transferInput';
+import { getNttToken } from 'store/transferInput';
 import { getNttManager } from './platforms';
 import { InboundQueuedTransfer } from './types';
 import {
@@ -340,10 +340,10 @@ export abstract class NttBase extends BaseRoute {
     chain: ChainName | ChainId,
   ): Promise<string | null> {
     const tokenConfig = getTokenById(token);
-    if (!tokenConfig) {
+    if (!tokenConfig?.ntt) {
       throw new Error('invalid token');
     }
-    const key = getNativeVersionOfToken(tokenConfig.symbol, toChainName(chain));
+    const key = getNttToken(tokenConfig.ntt.groupId, chain);
     return config.tokens[key]?.tokenId?.address || null;
   }
 

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

@@ -8,7 +8,7 @@ import {
 import { ethers } from 'ethers';
 import { hexlify } from 'ethers/lib/utils';
 import { NttRelayingType, UnsignedNttMessage } from 'routes/types';
-import { getNativeVersionOfToken } from 'store/transferInput';
+import { getNttToken } from 'store/transferInput';
 import { getTokenById, getTokenDecimals } from 'utils';
 import { getWormholeLogEvm } from 'utils/vaa';
 import { NttManager__factory } from './abis';
@@ -45,7 +45,7 @@ export const getMessageEvm = async (
     address: tokenAddress,
   };
   const token = getTokenById(tokenId);
-  if (!token) {
+  if (!token?.ntt) {
     throw new Error(`Token ${tokenId} not found`);
   }
   const wormholeLog = await getWormholeLogEvm(fromChain, receipt);
@@ -79,6 +79,10 @@ export const getMessageEvm = async (
   const toChain = toChainName(
     nttManagerMessage.payload.recipientChain as ChainId,
   );
+  const receivedTokenKey = getNttToken(token.ntt.groupId, toChain);
+  if (!receivedTokenKey) {
+    throw new Error(`Received token key not found for ${tokenId}`);
+  }
   return {
     sendTx: receipt.transactionHash,
     sender: receipt.from,
@@ -95,7 +99,7 @@ export const getMessageEvm = async (
     tokenId,
     tokenKey: token.key,
     tokenDecimals: getTokenDecimals(toChainId(fromChain), tokenId),
-    receivedTokenKey: getNativeVersionOfToken(token.symbol, toChain),
+    receivedTokenKey,
     emitterAddress: hexlify(
       config.wh.formatAddress(parsedWormholeLog.args.sender, fromChain),
     ),

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

@@ -2,7 +2,7 @@ import { solanaContext } from 'utils/sdk';
 import { PostedMessageData } from '@certusone/wormhole-sdk/lib/esm/solana/wormhole';
 import { hexlify } from 'ethers/lib/utils';
 import { NttRelayingType, UnsignedNttMessage } from 'routes/types';
-import { getNativeVersionOfToken } from 'store/transferInput';
+import { getNttToken } from 'store/transferInput';
 import { getTokenById, getTokenDecimals } from 'utils';
 import {
   getNttManagerMessageDigest,
@@ -54,9 +54,13 @@ export const getMessageSolana = async (
     address: tokenAddress,
   };
   const token = getTokenById(tokenId);
-  if (!token) {
+  if (!token?.ntt) {
     throw new Error(`Token ${tokenId} not found`);
   }
+  const receivedTokenKey = getNttToken(token.ntt.groupId, toChain);
+  if (!receivedTokenKey) {
+    throw new Error(`Received token key not found for ${tokenId}`);
+  }
   const logMsgs = response.meta?.logMessages || [];
   const regex = /total fee in lamports: (\d+)/;
   const relayerFeeMsg = logMsgs.find((msg) => regex.test(msg));
@@ -83,7 +87,7 @@ export const getMessageSolana = async (
     tokenId,
     tokenKey: token.key,
     tokenDecimals: getTokenDecimals(config.wh.toChainId(fromChain), tokenId),
-    receivedTokenKey: getNativeVersionOfToken(token.symbol, toChain),
+    receivedTokenKey,
     emitterAddress: hexlify(
       context.formatAddress(messageData.message.emitterAddress),
     ),

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

@@ -363,7 +363,7 @@ export class NttManagerSolana {
     const signatures = await this.connection.getSignaturesForAddress(address, {
       limit: 1,
     });
-    return signatures ? signatures[0].signature : undefined;
+    return signatures?.[0]?.signature;
   }
 
   // Account addresses

wormhole-connect/src/store/transferInput.ts

@@ -1,5 +1,9 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
-import { ChainName, Context } from '@wormhole-foundation/wormhole-connect-sdk';
+import {
+  ChainName,
+  ChainId,
+  Context,
+} from '@wormhole-foundation/wormhole-connect-sdk';
 import { BigNumber } from 'ethers';
 import config from 'config';
 import { Route, TokenConfig } from 'config/types';
@@ -55,6 +59,19 @@ export const getNativeVersionOfToken = (
   );
 };
 
+// get the token key for the NTT token for a given group and chain
+export const getNttToken = (
+  groupId: string,
+  chain: ChainName | ChainId,
+): string => {
+  return (
+    Object.entries(config.tokens)
+      .map(([key, t]) => t)
+      .find((t) => t.ntt?.groupId === groupId && t.nativeChain === chain)
+      ?.key || ''
+  );
+};
+
 export const accessChainBalances = (
   balances: WalletBalances | undefined,
   walletAddress: WalletAddress | undefined,
@@ -200,7 +217,7 @@ const performModificationsIfFromChainChanged = (state: TransferInputState) => {
         state.token = getNativeVersionOfToken(tokenConfig.symbol, fromChain!);
       }
     } else if (tokenConfig.ntt && tokenConfig.nativeChain !== fromChain) {
-      state.token = getNativeVersionOfToken(tokenConfig.symbol, fromChain!);
+      state.token = getNttToken(tokenConfig.ntt.groupId, fromChain!);
     }
   }
 };
@@ -228,7 +245,7 @@ const performModificationsIfToChainChanged = (state: TransferInputState) => {
         state.destToken = getNativeVersionOfToken(tokenConfig.symbol, toChain!);
       }
     } else if (tokenConfig.ntt && tokenConfig.nativeChain !== toChain) {
-      state.destToken = getNativeVersionOfToken(tokenConfig.symbol, toChain!);
+      state.destToken = getNttToken(tokenConfig.ntt.groupId, toChain!);
     }
   }
 };

wormhole-connect/src/views/Bridge/NttInboundCapacityWarning.tsx

@@ -4,7 +4,7 @@ import { NttManual } from 'routes/ntt';
 import { parseUnits } from 'ethers/lib/utils';
 import { getTokenDecimals } from 'utils';
 import { BigNumber } from 'ethers';
-import { getNativeVersionOfToken } from 'store/transferInput';
+import { getNttToken } from 'store/transferInput';
 import { useSelector } from 'react-redux';
 import { RootState } from 'store';
 import config from 'config';
@@ -81,10 +81,9 @@ const NttInboundCapacityWarning = () => {
       !fromChain
     )
       return false;
-    const destTokenKey = getNativeVersionOfToken(
-      config.tokens[destToken].symbol,
-      toChain,
-    );
+    const groupId = config.tokens[destToken]?.ntt?.groupId;
+    if (!groupId) return false;
+    const destTokenKey = getNttToken(groupId, toChain);
     const destTokenConfig = config.tokens[destTokenKey];
     if (!destTokenConfig) return false;
     // capacity is in destination token decimals, so we need to convert the amount to the same decimals