rebased development

wormhole-foundation · Apr 1, 2024 · 6923d6b · 6923d6b
1 parent af4f4cc
commit 6923d6b
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 14 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/wormhole-connect/src/config/testnet/nttGroups.ts b/wormhole-connect/src/config/testnet/nttGroups.ts
@@ -51,12 +51,7 @@ export const TESTNET_NTT_GROUPS: NttGroups = {
  chainName: 'solana',
  address: 'nTTh3bZ5Aer6xboWZe39RDEft4MeVxSQ8D1EYAVLZw9',
  tokenKey: 'TEST_NTTsolana',
- transceivers: [
- {
- address: 'nTTh3bZ5Aer6xboWZe39RDEft4MeVxSQ8D1EYAVLZw9',
- type: 'wormhole',
- },
- ],
+ transceivers: [],
  solanaQuoter: 'NqTdGLLL6b6bFo7YESNEezocgF8onH5cst5EdH791en',
  },
  ],

diff --git a/wormhole-connect/src/config/utils.ts b/wormhole-connect/src/config/utils.ts
@@ -126,6 +126,17 @@ export const mergeNttGroups = (
  continue;
  }
 
+ // if any of the chain names in the custom group are duplicated, skip
+ if (
+ new Set(customGroup.nttManagers.map((manager) => manager.chainName))
+ .size !== customGroup.nttManagers.length
+ ) {
+ console.warn(
+ `Skipping custom NTT group config for "${key}" because it contains duplicate chain names`,
+ );
+ continue;
+ }
+
  console.info(`Accepted custom NTT group config for "${key}"`);
  builtin[key] = custom[key];
  }

diff --git a/wormhole-connect/src/store/transferInput.ts b/wormhole-connect/src/store/transferInput.ts
@@ -186,8 +186,8 @@ const performModificationsIfFromChainChanged = (state: TransferInputState) => {
  }
  if (isNttRoute(route) && destToken) {
  const groupKey = getNttGroupKey(tokenConfig, config.tokens[destToken]);
- if (groupKey) {
- state.token = getNttTokenByGroupKey(groupKey, fromChain!)?.key || '';
+ if (groupKey && fromChain) {
+ state.token = getNttTokenByGroupKey(groupKey, fromChain)?.key || '';
  } else {
  state.token = '';
  }
@@ -222,8 +222,8 @@ const performModificationsIfToChainChanged = (state: TransferInputState) => {
  }
  if (isNttRoute(route) && token) {
  const groupKey = getNttGroupKey(tokenConfig, config.tokens[token]);
- if (groupKey) {
- state.destToken = getNttTokenByGroupKey(groupKey, toChain!)?.key || '';
+ if (groupKey && toChain) {
+ state.destToken = getNttTokenByGroupKey(groupKey, toChain)?.key || '';
  } else {
  state.destToken = '';
  }

diff --git a/wormhole-connect/src/utils/ntt.ts b/wormhole-connect/src/utils/ntt.ts
@@ -102,14 +102,14 @@ export const getNttManagerConfigByAddress = (
  isEqualCaseInsensitive(manager.address, managerAddress) &&
  manager.chainName === chainName,
  ),
- )[0];
+ )?.[0];
 };
 
 export const getNttManagerConfigByGroupKey = (
  groupKey: string,
  chainName: ChainName,
 ): NttManagerConfig | undefined => {
- return config.nttGroups[groupKey].nttManagers.find(
+ return config.nttGroups[groupKey]?.nttManagers.find(
  (manager) => manager.chainName === chainName,
  );
 };

diff --git a/wormhole-connect/src/views/Redeem/NttInboundQueued.tsx b/wormhole-connect/src/views/Redeem/NttInboundQueued.tsx
@@ -151,6 +151,7 @@ const NttInboundQueued = () => {
  <Header
  chain={signedMessage.toChain}
  address={signedMessage.recipient}
+ side="destination"
  />
  {!expired ? (
  <div>

diff --git a/wormhole-connect/src/views/Redeem/Redeem.tsx b/wormhole-connect/src/views/Redeem/Redeem.tsx
@@ -90,9 +90,8 @@ function Redeem({
  while (signed === undefined && !cancelled) {
  try {
  signed = await RouteOperator.getSignedMessage(route, txData);
- } catch (e) {
+ } catch {
  signed = undefined;
- console.log(e);
  }
  if (cancelled) {
  return;

diff --git a/wormhole-connect/src/views/Redeem/RelayerDeliveryFailed.tsx b/wormhole-connect/src/views/Redeem/RelayerDeliveryFailed.tsx
@@ -37,6 +37,7 @@ const RelayerDeliveryFailed = () => {
  chain={txData.toChain}
  address={txData.recipient}
  txHash={redeemTx}
+ side="destination"
  />
  <div className={classes.root}>
  <Typography>