Fix Route resolution issue (#2148)

* fix baseRoute impl * remove trace
wormhole-foundation · May 29, 2024 · 854a421 · 854a421
1 parent 01fd047
commit 854a421
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 38 deletions.
diff --git a/wormhole-connect/src/routes/bridge/baseRoute.ts b/wormhole-connect/src/routes/bridge/baseRoute.ts
@@ -75,11 +75,11 @@ export abstract class BaseRoute extends RouteAbstract {
     tokens: TokenConfig[],
     destToken?: TokenConfig,
     sourceChain?: ChainName | ChainId,
+    destChain?: ChainName | ChainId,
   ): Promise<TokenConfig[]> {
-    if (!destToken) return tokens;
     const shouldAdd = await Promise.allSettled(
       tokens.map((token) =>
-        this.isSupportedSourceToken(token, destToken, sourceChain),
+        this.isSupportedSourceToken(token, destToken, sourceChain, destChain),
       ),
     );
     return tokens.filter((_token, i) => {
@@ -91,10 +91,13 @@ export abstract class BaseRoute extends RouteAbstract {
   async supportedDestTokens(
     tokens: TokenConfig[],
     sourceToken?: TokenConfig,
+    sourceChain?: ChainName | ChainId,
+    destChain?: ChainName | ChainId,
   ): Promise<TokenConfig[]> {
-    if (!sourceToken) return tokens;
     const shouldAdd = await Promise.allSettled(
-      tokens.map((token) => this.isSupportedDestToken(token, sourceToken)),
+      tokens.map((token) =>
+        this.isSupportedDestToken(token, sourceToken, sourceChain, destChain),
+      ),
     );
     return tokens.filter((_token, i) => {
       const res = shouldAdd[i];

diff --git a/wormhole-connect/src/routes/porticoBridge/porticoBridge.ts b/wormhole-connect/src/routes/porticoBridge/porticoBridge.ts
@@ -129,40 +129,6 @@ export abstract class PorticoBridge extends BaseRoute {
     );
   }
 
-  async supportedSourceTokens(
-    tokens: TokenConfig[],
-    destToken?: TokenConfig,
-    sourceChain?: ChainName | ChainId,
-    destChain?: ChainName | ChainId,
-  ): Promise<TokenConfig[]> {
-    const shouldAdd = await Promise.allSettled(
-      tokens.map((token) =>
-        this.isSupportedSourceToken(token, destToken, sourceChain, destChain),
-      ),
-    );
-    return tokens.filter((_token, i) => {
-      const res = shouldAdd[i];
-      return res.status === 'fulfilled' && res.value;
-    });
-  }
-
-  async supportedDestTokens(
-    tokens: TokenConfig[],
-    sourceToken?: TokenConfig,
-    sourceChain?: ChainName | ChainId,
-    destChain?: ChainName | ChainId,
-  ): Promise<TokenConfig[]> {
-    const shouldAdd = await Promise.allSettled(
-      tokens.map((token) =>
-        this.isSupportedDestToken(token, sourceToken, sourceChain, destChain),
-      ),
-    );
-    return tokens.filter((_token, i) => {
-      const res = shouldAdd[i];
-      return res.status === 'fulfilled' && res.value;
-    });
-  }
-
   async isRouteSupported(
     sourceToken: string,
     destToken: string,