Deposit/Withdraw fixes

packages/bridge/src/axelar/index.ts

@@ -568,7 +568,7 @@ export class AxelarBridgeProvider implements BridgeProvider {
           });
 
       const timeoutHeight = await this.ctx.getTimeoutHeight({
-        destinationAddress: depositAddress,
+        chainId: toChain.chainId.toString(),
       });
 
       const ibcAsset = getAssetFromAssetList({

packages/bridge/src/ibc/index.ts

@@ -146,7 +146,7 @@ export class IbcBridgeProvider implements BridgeProvider {
     const { sourceChannel, sourcePort, address } = this.getIbcSource(params);
 
     const timeoutHeight = await this.ctx.getTimeoutHeight({
-      destinationAddress: params.toAddress,
+      chainId: params.toChain.chainId.toString(),
     });
 
     const { typeUrl, value: msg } = cosmosMsgOpts.ibcTransfer.messageComposer({

packages/bridge/src/interface.ts

@@ -12,9 +12,8 @@ export interface BridgeProviderContext {
   assetLists: AssetList[];
   chainList: Chain[];
 
-  /** Provides current timeout height for a chain of the ID
-   *  parsed from the bech32 config of the given destinationAddress. */
-  getTimeoutHeight(params: { destinationAddress: string }): Promise<{
+  /** Provides current timeout height for a chain of given chainId. */
+  getTimeoutHeight(params: { chainId: string }): Promise<{
     revisionNumber: string | undefined;
     revisionHeight: string;
   }>;

packages/bridge/src/skip/index.ts

@@ -151,7 +151,8 @@ export class SkipBridgeProvider implements BridgeProvider {
               if (
                 msg.includes(
                   "no single-tx routes found, to enable multi-tx routes set allow_multi_tx to true"
-                )
+                ) ||
+                msg.includes("no routes found")
               ) {
                 throw new BridgeQuoteError({
                   bridgeId: SkipBridgeProvider.ID,
@@ -493,7 +494,7 @@ export class SkipBridgeProvider implements BridgeProvider {
       // is an ibc transfer
 
       const timeoutHeight = await this.ctx.getTimeoutHeight({
-        destinationAddress: messageData.receiver,
+        chainId: messageData.chain_id,
       });
 
       const { typeUrl, value } = cosmosMsgOpts.ibcTransfer.messageComposer({

packages/bridge/src/squid/index.ts

@@ -271,6 +271,7 @@ export class SquidBridgeProvider implements BridgeProvider {
             : await this.createCosmosTransaction(
                 transactionRequest.data,
                 fromAddress,
+                toChain.chainId.toString(),
                 { denom: fromAsset.address, amount: fromAmount }
                 // TODO: uncomment when we're able to find a way to get gas limit from Squid
                 // or get it ourselves
@@ -494,6 +495,7 @@ export class SquidBridgeProvider implements BridgeProvider {
   async createCosmosTransaction(
     data: string,
     fromAddress: string,
+    toChainId: string,
     fromCoin: {
       denom: string;
       amount: string;
@@ -532,7 +534,7 @@ export class SquidBridgeProvider implements BridgeProvider {
         };
 
         const timeoutHeight = await this.ctx.getTimeoutHeight({
-          destinationAddress: ibcData.msg.receiver,
+          chainId: toChainId,
         });
 
         const { typeUrl, value: msg } =

packages/server/src/queries/complex/get-timeout-height.ts

@@ -7,16 +7,13 @@ import { queryRPCStatus } from "../../queries/cosmos";
 export async function getTimeoutHeight({
   chainList,
   chainId,
-  destinationAddress,
 }: {
   chainList: Chain[];
-  chainId?: string;
-  destinationAddress?: string;
+  chainId: string;
 }) {
   const destinationCosmosChain = getChain({
     chainList,
     chainId,
-    destinationAddress,
   });
 
   if (!destinationCosmosChain) {

packages/utils/src/chain-utils.ts

@@ -8,6 +8,10 @@ export function getChain<Chain extends ChainType>({
 }: {
   chainId?: string;
   chainName?: string;
+  /**
+   * WARNING: bech32 prefix may be the same across different chains,
+   * retulting in the use of an unintended chain.
+   */
   destinationAddress?: string;
   chainList: Chain[];
 }): Chain | undefined {

packages/web/components/bridge/use-bridges-supported-assets.ts

@@ -72,11 +72,7 @@ export const useBridgesSupportedAssets = ({
   );
 
   const isLoading = useMemo(
-    () =>
-      supportedAssetsResults.some(
-        (data): data is NonNullable<Required<typeof data>> =>
-          !isNil(data) && data.isLoading
-      ),
+    () => supportedAssetsResults.some((data) => isNil(data) || data.isLoading),
     [supportedAssetsResults]
   );
 

packages/web/server/api/routers/bridge-transfer.ts

@@ -78,8 +78,7 @@ export const bridgeTransferRouter = createTRPCRouter({
           ...ctx,
           env: IS_TESTNET ? "testnet" : "mainnet",
           cache: lruCache,
-          getTimeoutHeight: ({ destinationAddress }) =>
-            getTimeoutHeight({ ...ctx, destinationAddress }),
+          getTimeoutHeight: (params) => getTimeoutHeight({ ...ctx, ...params }),
         }
       );
 
@@ -330,8 +329,7 @@ export const bridgeTransferRouter = createTRPCRouter({
           ...ctx,
           env: IS_TESTNET ? "testnet" : "mainnet",
           cache: lruCache,
-          getTimeoutHeight: ({ destinationAddress }) =>
-            getTimeoutHeight({ ...ctx, destinationAddress }),
+          getTimeoutHeight: (params) => getTimeoutHeight({ ...ctx, ...params }),
         }
       );
 
@@ -455,9 +453,7 @@ export const bridgeTransferRouter = createTRPCRouter({
           ...ctx,
           env: IS_TESTNET ? "testnet" : "mainnet",
           cache: lruCache,
-          getTimeoutHeight: ({ destinationAddress }) =>
-            // passes testnet chains if IS_TESTNET
-            getTimeoutHeight({ ...ctx, destinationAddress }),
+          getTimeoutHeight: (params) => getTimeoutHeight({ ...ctx, ...params }),
         }
       );
 
@@ -498,9 +494,7 @@ export const bridgeTransferRouter = createTRPCRouter({
           ...ctx,
           env: IS_TESTNET ? "testnet" : "mainnet",
           cache: lruCache,
-          getTimeoutHeight: ({ destinationAddress }) =>
-            // passes testnet chains if IS_TESTNET
-            getTimeoutHeight({ ...ctx, destinationAddress }),
+          getTimeoutHeight: (params) => getTimeoutHeight({ ...ctx, ...params }),
         }
       );