solve merge conflicts

paraswap · Dec 9, 2024 · 4cc4ca2 · 4cc4ca2
2 parents d3b26e9 + aa7ea5a
commit 4cc4ca2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@paraswap/dex-lib",
-  "version": "3.11.8-stader.1",
+  "version": "3.11.8-stader.2",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "repository": "https://github.com/paraswap/paraswap-dex-lib",

diff --git a/src/dex/stader/stader.ts b/src/dex/stader/stader.ts
@@ -104,6 +104,7 @@ export class Stader
     isFirstSwap?: boolean | undefined,
   ): Promise<ExchangePrices<StaderData> | null> {
     if (side === SwapSide.BUY) return null;
+    if (!this.isEligibleSwap(srcToken, destToken)) return null;
 
     const pool = this.ethxPool;
     if (!pool.getState(blockNumber)) return null;
@@ -127,11 +128,7 @@ export class Stader
     ];
   }
 
-  isEligibleSwap(
-    srcToken: Token | string,
-    destToken: Token | string,
-    side: SwapSide,
-  ): boolean {
+  isEligibleSwap(srcToken: Token | string, destToken: Token | string): boolean {
     const srcTokenAddress = (
       typeof srcToken === 'string' ? srcToken : srcToken.address
     ).toLowerCase();
@@ -189,7 +186,7 @@ export class Stader
   ): Promise<string[]> {
     if (side === SwapSide.BUY) return [];
 
-    if (!this.isEligibleSwap(srcToken, destToken, side)) return [];
+    if (!this.isEligibleSwap(srcToken, destToken)) return [];
 
     return [`${ETHER_ADDRESS}_${destToken.address}`.toLowerCase()];
   }