Merge pull request #349 from hummingbot/development

fix/ adding uniswap updates PR to gateway staging
hummingbot · Aug 16, 2024 · 481e895 · 481e895
2 parents 850e451 + 212a5c8
commit 481e895
Show file tree

Hide file tree

Showing 5 changed files with 542 additions and 340 deletions.
diff --git a/package.json b/package.json
@@ -61,12 +61,12 @@
     "@types/minimist": "^1.2.2",
     "@types/morgan": "^1.9.3",
     "@types/uuid": "^8.3.4",
-    "@uniswap/sdk": "3.0.2",
-    "@uniswap/sdk-core": "^3.0.0",
-    "@uniswap/smart-order-router": "^2.5.26",
-    "@uniswap/v3-core": "^1.0.0",
+    "@uniswap/sdk": "3.0.3",
+    "@uniswap/sdk-core": "^5.3.1",
+    "@uniswap/smart-order-router": "^3.39.0",
+    "@uniswap/v3-core": "^1.0.1",
     "@uniswap/v3-periphery": "^1.1.1",
-    "@uniswap/v3-sdk": "^3.7.0",
+    "@uniswap/v3-sdk": "^3.13.1",
     "abi-decoder": "^2.4.0",
     "ajv": "^8.6.3",
     "algosdk": "^2.2.0",

diff --git a/src/connectors/uniswap/uniswap.ts b/src/connectors/uniswap/uniswap.ts
@@ -80,20 +80,10 @@ export class Uniswap implements Uniswapish {
     this._ttl = UniswapConfig.config.ttl;
     this._maximumHops = UniswapConfig.config.maximumHops;
 
-    this._alphaRouter = null;
-    const excluded_chainIds = [
-      11155111, // sepolia
-      8453,     // base
-      56,       // binance-smart-chain
-      42220,    // celo
-      43114,    // avalanche
-    ];
-    if (this.chainId in excluded_chainIds) {
-        this._alphaRouter = new AlphaRouter({
-        chainId: this.chainId,
-        provider: this.chain.provider,
-      });
-    }
+      this._alphaRouter = new AlphaRouter({
+      chainId: this.chainId,
+      provider: this.chain.provider,
+    });
     this._routerAbi = routerAbi.abi;
     this._gasLimitEstimate = UniswapConfig.config.gasLimitEstimate;
     this._router = config.uniswapV3SmartOrderRouterAddress(chain, network);

diff --git a/test/connectors/uniswap/uniswap.lp.test.ts b/test/connectors/uniswap/uniswap.lp.test.ts
@@ -33,7 +33,7 @@ const USDC = new Token(
 
 const TX = {
   type: 2,
-  chainId: 42,
+  chainId: 5,
   nonce: 115,
   maxPriorityFeePerGas: { toString: () => '106000000000' },
   maxFeePerGas: { toString: () => '106000000000' },
@@ -117,8 +117,10 @@ const patchPoolState = () => {
 };
 
 const patchAlphaRouter = () => {
-  patch(uniswapLP.alphaRouter, 'routeToRatio', () => {
-    return { status: 3 };
+  patch(uniswapLP, '_alphaRouter', {
+    routeToRatio() {
+      return { status: 3 };
+    }
   });
 };
 

diff --git a/test/connectors/uniswap/uniswap.test.ts b/test/connectors/uniswap/uniswap.test.ts
@@ -68,49 +68,51 @@ afterAll(async () => {
 });
 
 const patchTrade = (_key: string, error?: Error) => {
-  patch(uniswap.alphaRouter, 'route', () => {
-    if (error) return false;
-    const WETH_DAI = new Pair(
-      CurrencyAmount.fromRawAmount(WETH, '2000000000000000000'),
-      CurrencyAmount.fromRawAmount(DAI, '1000000000000000000')
-    );
-    const DAI_TO_WETH = new Route([WETH_DAI], DAI, WETH);
-    return {
-      quote: CurrencyAmount.fromRawAmount(DAI, '1000000000000000000'),
-      quoteGasAdjusted: CurrencyAmount.fromRawAmount(
-        DAI,
-        '1000000000000000000'
-      ),
-      estimatedGasUsed: utils.parseEther('100'),
-      estimatedGasUsedQuoteToken: CurrencyAmount.fromRawAmount(
-        DAI,
-        '1000000000000000000'
-      ),
-      estimatedGasUsedUSD: CurrencyAmount.fromRawAmount(
-        DAI,
-        '1000000000000000000'
-      ),
-      gasPriceWei: utils.parseEther('100'),
-      trade: new Trade({
-        v2Routes: [
-          {
-            routev2: DAI_TO_WETH,
-            inputAmount: CurrencyAmount.fromRawAmount(
-              DAI,
-              '1000000000000000000'
-            ),
-            outputAmount: CurrencyAmount.fromRawAmount(
-              WETH,
-              '2000000000000000000'
-            ),
-          },
-        ],
-        v3Routes: [],
-        tradeType: TradeType.EXACT_INPUT,
-      }),
-      route: [],
-      blockNumber: BigNumber.from(5000),
-    };
+  patch(uniswap, '_alphaRouter', {
+    route() {
+      if (error) return false;
+      const WETH_DAI = new Pair(
+        CurrencyAmount.fromRawAmount(WETH, '2000000000000000000'),
+        CurrencyAmount.fromRawAmount(DAI, '1000000000000000000')
+      );
+      const DAI_TO_WETH = new Route([WETH_DAI], DAI, WETH);
+      return {
+        quote: CurrencyAmount.fromRawAmount(DAI, '1000000000000000000'),
+        quoteGasAdjusted: CurrencyAmount.fromRawAmount(
+          DAI,
+          '1000000000000000000'
+        ),
+        estimatedGasUsed: utils.parseEther('100'),
+        estimatedGasUsedQuoteToken: CurrencyAmount.fromRawAmount(
+          DAI,
+          '1000000000000000000'
+        ),
+        estimatedGasUsedUSD: CurrencyAmount.fromRawAmount(
+          DAI,
+          '1000000000000000000'
+        ),
+        gasPriceWei: utils.parseEther('100'),
+        trade: new Trade({
+          v2Routes: [
+            {
+              routev2: DAI_TO_WETH,
+              inputAmount: CurrencyAmount.fromRawAmount(
+                DAI,
+                '1000000000000000000'
+              ),
+              outputAmount: CurrencyAmount.fromRawAmount(
+                WETH,
+                '2000000000000000000'
+              ),
+            },
+          ],
+          v3Routes: [],
+          tradeType: TradeType.EXACT_INPUT,
+        }),
+        route: [],
+        blockNumber: BigNumber.from(5000),
+      };
+    }  
   });
 };