Merge pull request #329 from hummingbot/feat/add-uniswap-base

fix / revised uniswap-base support
hummingbot · Jul 25, 2024 · 70ca18a · 70ca18a
2 parents 22fbbe0 + 2126514
commit 70ca18a
Show file tree

Hide file tree

Showing 34 changed files with 559 additions and 2,873 deletions.
diff --git a/package.json b/package.json
@@ -100,7 +100,6 @@
     "osmojs": "16.5.1",
     "promise-retry": "^2.0.1",
     "quickswap-sdk": "^3.0.8",
-    "quipuswap-v3-sdk": "^0.0.7",
     "swagger-ui-express": "^4.1.6",
     "swap-router-sdk": "^1.21.1",
     "tslib": "^2.3.1",

diff --git a/src/amm/amm.controllers.ts b/src/amm/amm.controllers.ts
@@ -63,11 +63,6 @@ import {
   trade as plentyTrade,
   estimateGas as plentyEstimateGas,
 } from '../connectors/plenty/plenty.controllers';
-import {
-  price as quipuPrice,
-  trade as quipuTrade,
-  estimateGas as quipuEstimateGas,
-} from '../connectors/quipuswap/quipuswap.controllers';
 import {
   getInitializedChain,
   getConnector,
@@ -85,7 +80,6 @@ import {
 import { Algorand } from '../chains/algorand/algorand';
 import { Tinyman } from '../connectors/tinyman/tinyman';
 import { Plenty } from '../connectors/plenty/plenty';
-import { QuipuSwap } from '../connectors/quipuswap/quipuswap';
 import { Osmosis } from '../chains/osmosis/osmosis';
 import { Carbonamm } from '../connectors/carbon/carbonAMM';
 
@@ -97,17 +91,15 @@ export async function price(req: PriceRequest): Promise<PriceResponse> {
     return chain.controller.price(chain as unknown as Osmosis, req);
   }
 
-  const connector: Uniswapish | RefAMMish | Tinyman | Plenty | QuipuSwap =
-    await getConnector<Uniswapish | RefAMMish | Tinyman | Plenty | QuipuSwap>(
+  const connector: Uniswapish | RefAMMish | Tinyman | Plenty  =
+    await getConnector<Uniswapish | RefAMMish | Tinyman | Plenty>(
       req.chain,
       req.network,
       req.connector
     );
 
   if (connector instanceof Plenty) {
     return plentyPrice(<Tezosish>chain, connector, req);
-  } else if (connector instanceof QuipuSwap) {
-    return quipuPrice(<Tezosish>chain, connector, req);
   } else if (connector instanceof Carbonamm) {
     return carbonPrice(<Ethereumish>chain, connector, req);
   } else if ('routerAbi' in connector) {
@@ -128,17 +120,15 @@ export async function trade(req: TradeRequest): Promise<TradeResponse> {
     return chain.controller.trade(chain as unknown as Osmosis, req);
   }
 
-  const connector: Uniswapish | RefAMMish | Tinyman | Plenty | QuipuSwap =
-    await getConnector<Uniswapish | RefAMMish | Tinyman | Plenty | QuipuSwap>(
+  const connector: Uniswapish | RefAMMish | Tinyman | Plenty =
+    await getConnector<Uniswapish | RefAMMish | Tinyman | Plenty>(
       req.chain,
       req.network,
       req.connector
     );
 
   if (connector instanceof Plenty) {
     return plentyTrade(<Tezosish>chain, connector, req);
-  } else if (connector instanceof QuipuSwap) {
-    return quipuTrade(<Tezosish>chain, connector, req);
   } else if (connector instanceof Carbonamm) {
     return carbonTrade(<Ethereumish>chain, connector, req);
   } else if ('routerAbi' in connector) {
@@ -238,17 +228,15 @@ export async function estimateGas(
     return chain.controller.estimateGas(chain as unknown as Osmosis);
   }
 
-  const connector: Uniswapish | RefAMMish | Tinyman | Plenty | QuipuSwap =
-    await getConnector<Uniswapish | RefAMMish | Plenty | QuipuSwap>(
+  const connector: Uniswapish | RefAMMish | Tinyman | Plenty =
+    await getConnector<Uniswapish | RefAMMish | Plenty>(
       req.chain,
       req.network,
       req.connector
     );
 
   if (connector instanceof Plenty) {
     return plentyEstimateGas(<Tezosish>chain, connector);
-  } else if (connector instanceof QuipuSwap) {
-    return quipuEstimateGas(<Tezosish>chain, connector);
   } else if (connector instanceof Carbonamm) {
     return carbonEstimateGas(<Ethereumish>chain, connector);
   } else if ('routerAbi' in connector) {

diff --git a/src/chains/tezos/tezos.base.ts b/src/chains/tezos/tezos.base.ts
@@ -208,9 +208,6 @@ export class TezosBase {
     if (spender === 'plenty') {
       // plenty doesn't need an allowance
       return { value: constants.MaxUint256, decimals: tokenDecimals };
-    } else if (spender === 'quipuswap') {
-      // quipuswap doesn't need an allowance
-      return { value: constants.MaxUint256, decimals: tokenDecimals };
     }
 
     let value = BigNumber.from(0);

diff --git a/src/connectors/connectors.routes.ts b/src/connectors/connectors.routes.ts
@@ -21,7 +21,6 @@ import { CurveConfig } from './curve/curveswap.config';
 import { PlentyConfig } from './plenty/plenty.config';
 import { XRPLCLOBConfig } from './xrpl/xrpl.clob.config';
 import { KujiraConfig } from './kujira/kujira.config';
-import { QuipuswapConfig } from './quipuswap/quipuswap.config';
 import { OsmosisConfig } from '../chains/osmosis/osmosis.config';
 import { CarbonConfig } from './carbon/carbon.config';
 import { BalancerConfig } from './balancer/balancer.config';
@@ -166,12 +165,6 @@ export namespace ConnectorsRoutes {
                 'Enter your kujira account number (input 0 if unsure) >>> ',
             },
           },
-          {
-            name: 'quipuswap',
-            trading_type: QuipuswapConfig.config.tradingTypes,
-            chain_type: QuipuswapConfig.config.chainType,
-            available_networks: QuipuswapConfig.config.availableNetworks,
-          },
           {
             name: 'osmosis',
             trading_type: OsmosisConfig.config.tradingTypes('swap'),

diff --git a/src/connectors/quipuswap/quipuswap.config.ts b/src/connectors/quipuswap/quipuswap.config.ts