Merge pull request #162 from hummingbot/fix/remove-zigzag-defikingdoms

(gov) remove zigzag defikingdoms

jest.config.js

@@ -21,7 +21,6 @@ module.exports = {
     'src/connectors/uniswap/uniswap.config.ts',
     'src/connectors/uniswap/uniswap.ts',
     'src/connectors/uniswap/uniswap.lp.helper.ts',
-    'src/connectors/defikingdoms/defikingdoms.ts',
     'src/connectors/defira/defira.ts',
     'src/connectors/openocean/openocean.ts',
     'src/connectors/pangolin/pangolin.ts',

package.json

@@ -43,7 +43,6 @@
     "@pangolindex/sdk": "^1.1.0",
     "@perp/sdk-curie": "^1.16.0",
     "@sushiswap/sdk": "^5.0.0-canary.116",
-    "@switchboard-xyz/defikingdoms-sdk": "^1.0.7",
     "@tinymanorg/tinyman-js-sdk": "^3.0.0",
     "@traderjoe-xyz/sdk-v2": "^2.0.5",
     "@types/fs-extra": "^9.0.13",

src/amm/amm.controllers.ts

@@ -65,12 +65,7 @@ import {
   RefAMMish,
   Uniswapish,
   UniswapLPish,
-  ZigZagish,
 } from '../services/common-interfaces';
-import {
-  price as zigzagPrice,
-  trade as zigzagTrade,
-} from '../connectors/zigzag/zigzag.controllers';
 import { Algorand } from '../chains/algorand/algorand';
 import { Tinyman } from '../connectors/tinyman/tinyman';
 
@@ -79,8 +74,8 @@ export async function price(req: PriceRequest): Promise<PriceResponse> {
     req.chain,
     req.network
   );
-  const connector: Uniswapish | RefAMMish | Tinyman | ZigZagish =
-    await getConnector<Uniswapish | RefAMMish | Tinyman | ZigZagish>(
+  const connector: Uniswapish | RefAMMish | Tinyman  =
+    await getConnector<Uniswapish | RefAMMish | Tinyman>(
       req.chain,
       req.network,
       req.connector
@@ -89,8 +84,6 @@ export async function price(req: PriceRequest): Promise<PriceResponse> {
   // we currently use the presence of routerAbi to distinguish Uniswapish from RefAMMish
   if ('routerAbi' in connector) {
     return uniswapPrice(<Ethereumish>chain, connector, req);
-  } else if ('estimate' in connector) {
-    return zigzagPrice(<Ethereumish>chain, connector as any, req);
   } else if (connector instanceof Tinyman) {
     return tinymanPrice(chain as unknown as Algorand, connector, req);
   } else {
@@ -103,8 +96,8 @@ export async function trade(req: TradeRequest): Promise<TradeResponse> {
     req.chain,
     req.network
   );
-  const connector: Uniswapish | RefAMMish | Tinyman | ZigZagish =
-    await getConnector<Uniswapish | RefAMMish | Tinyman | ZigZagish>(
+  const connector: Uniswapish | RefAMMish | Tinyman =
+    await getConnector<Uniswapish | RefAMMish | Tinyman >(
       req.chain,
       req.network,
       req.connector
@@ -113,8 +106,6 @@ export async function trade(req: TradeRequest): Promise<TradeResponse> {
   // we currently use the presence of routerAbi to distinguish Uniswapish from RefAMMish
   if ('routerAbi' in connector) {
     return uniswapTrade(<Ethereumish>chain, connector, req);
-  } else if ('estimate' in connector) {
-    return zigzagTrade(<Ethereumish>chain, connector as any, req);
   } else if (connector instanceof Tinyman) {
     return tinymanTrade(chain as unknown as Algorand, connector, req);
   } else {

src/chains/ethereum/ethereum.ts

@@ -13,7 +13,6 @@ import { UniswapConfig } from '../../connectors/uniswap/uniswap.config';
 import { Perp } from '../../connectors/perp/perp';
 import { SushiswapConfig } from '../../connectors/sushiswap/sushiswap.config';
 import { OpenoceanConfig } from '../../connectors/openocean/openocean.config';
-import { ZigZagConfig } from '../../connectors/zigzag/zigzag.config';
 
 // MKR does not match the ERC20 perfectly so we need to use a separate ABI.
 const MKR_ADDRESS = '0x9f8f72aa9304c8b593d555f12ef6589cc3a579a2';
@@ -197,8 +196,6 @@ export class Ethereum extends EthereumBase implements Ethereumish {
       spender = perp.perp.contracts.vault.address;
     } else if (reqSpender === 'openocean') {
       spender = OpenoceanConfig.config.routerAddress('ethereum', this._chain);
-    } else if (reqSpender === 'zigzag') {
-      spender = ZigZagConfig.config.contractAddress(this._chain);
     } else {
       spender = reqSpender;
     }

src/chains/ethereum/ethereum.validators.ts

@@ -57,13 +57,11 @@ export const validateSpender: Validator = mkValidator(
       val === 'viperswap' ||
       val === 'openocean' ||
       val === 'quickswap' ||
-      val === 'defikingdoms' ||
       val === 'defira' ||
       val === 'mad_meerkat' ||
       val === 'vvs' ||
       val === 'pancakeswap' ||
       val === 'xsswap' ||
-      val === 'zigzag' ||
       isAddress(val))
 );
 

src/chains/harmony/harmony.ts

@@ -146,9 +146,7 @@ export class Harmony extends EthereumBase implements Ethereumish {
 
   getSpender(reqSpender: string): string {
     let spender: string;
-    if (reqSpender === 'defikingdoms') {
-      spender = '0x24ad62502d1C652Cc7684081169D04896aC20f30';
-    } else if (reqSpender === 'defira') {
+    if (reqSpender === 'defira') {
       spender = '0x3C8BF7e25EbfAaFb863256A4380A8a93490d8065';
     } else if (reqSpender === 'openocean') {
       spender = OpenoceanConfig.config.routerAddress('ethereum', this._chain);

src/chains/harmony/harmony.validators.ts

@@ -43,8 +43,6 @@ export const validateSpender: Validator = mkValidator(
   (val) =>
     typeof val === 'string' &&
     (val === 'sushiswap' ||
-      val === 'viperswap' ||
-      val === 'defikingdoms' ||
       val === 'defira' ||
       val === 'openocean' ||
       isValidAddress(val))

src/connectors/connectors.routes.ts

@@ -3,7 +3,6 @@
 import { Router, Response } from 'express';
 import { asyncHandler } from '../services/error-handler';
 import { DefiraConfig } from './defira/defira.config';
-import { DefikingdomsConfig } from './defikingdoms/defikingdoms.config';
 import { MadMeerkatConfig } from './mad_meerkat/mad_meerkat.config';
 import { OpenoceanConfig } from './openocean/openocean.config';
 import { PangolinConfig } from './pangolin/pangolin.config';
@@ -19,7 +18,6 @@ import { InjectiveCLOBConfig } from './injective/injective.clob.config';
 import { XsswapConfig } from './xsswap/xsswap.config';
 import { ConnectorsResponse } from './connectors.request';
 import { DexalotCLOBConfig } from './dexalot/dexalot.clob.config';
-import { ZigZagConfig } from './zigzag/zigzag.config';
 import { TinymanConfig } from './tinyman/tinyman.config';
 
 export namespace ConnectorsRoutes {
@@ -81,12 +79,6 @@ export namespace ConnectorsRoutes {
             chain_type: TraderjoeConfig.config.chainType,
             available_networks: TraderjoeConfig.config.availableNetworks,
           },
-          {
-            name: 'defikingdoms',
-            trading_type: DefikingdomsConfig.config.tradingTypes,
-            chain_type: DefikingdomsConfig.config.chainType,
-            available_networks: DefikingdomsConfig.config.availableNetworks,
-          },
           {
             name: 'defira',
             trading_type: DefiraConfig.config.tradingTypes,
@@ -153,12 +145,6 @@ export namespace ConnectorsRoutes {
                 'Enter a Dexalot API Key if you have one, otherwise hit return >>> ',
             },
           },
-          {
-            name: 'zigzag',
-            trading_type: ZigZagConfig.config.tradingTypes,
-            chain_type: ZigZagConfig.config.chainType,
-            available_networks: ZigZagConfig.config.availableNetworks,
-          },
           {
             name: 'tinyman',
             trading_type: TinymanConfig.config.tradingTypes,