feat: use Oneinch v5 and common CrosschainForwarder

debridge-finance · Feb 9, 2024 · 26dd30b · 26dd30b
1 parent b7b60a9
commit 26dd30b
Show file tree

Hide file tree

Showing 7 changed files with 265 additions and 113 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@debridge-finance/dln-taker",
-  "version": "3.2.5",
+  "version": "3.3.0",
   "description": "DLN executor is the rule-based daemon service developed to automatically execute orders placed on the deSwap Liquidity Network (DLN) across supported blockchains",
   "license": "GPL-3.0-only",
   "author": "deBridge",
@@ -33,7 +33,7 @@
   },
   "types": "./dist/index.d.ts",
   "dependencies": {
-    "@debridge-finance/dln-client": "8.3.3",
+    "@debridge-finance/dln-client": "8.3.5",
     "@debridge-finance/legacy-dln-profitability": "3.2.0",
     "@debridge-finance/solana-utils": "4.2.1",
     "@protobuf-ts/plugin": "2.8.1",

diff --git a/sample.config.ts b/sample.config.ts
@@ -76,6 +76,13 @@ const config: ExecutorLaunchConfig = {
    */
   subsidizationRules: [],
 
+  oneInchConfig: {
+    apiServer: 'https://api.1inch.dev/swap',
+    apiToken: undefined, // obtain one at https://portal.1inch.dev
+    disablePMMProtocols: true,
+    disabledProtocols: [],
+  },
+
   allowSubsidy: false,
 
   tokenPriceService: configurator.tokenPriceService({

diff --git a/src/config.ts b/src/config.ts
@@ -342,4 +342,11 @@ export interface ExecutorLaunchConfig {
     maxAccounts?: number;
     blacklistedDexes?: Array<string>;
   };
+
+  oneInchConfig?: {
+    apiToken?: string;
+    apiServer?: string;
+    disablePMMProtocols?: boolean;
+    disabledProtocols?: string[];
+  };
 }
diff --git a/src/environments.ts b/src/environments.ts
@@ -91,7 +91,7 @@ const PRODUCTION: Env = {
     pmmSrc: '0xeF4fB24aD0916217251F553c0596F8Edc630EB66',
     pmmDst: '0xE7351Fd770A37282b91D153Ee690B63579D6dd7f',
     evm: {
-      forwarderContract: '0xc31fc94F3Fd088eE53ac915D6e8a14fF25a23C47',
+      forwarderContract: '0x663DC15D3C1aC63ff12E45Ab68FeA3F0a883C251',
     },
   },
   chains: {
@@ -107,25 +107,6 @@ const PRODUCTION: Env = {
       deBridgeContract: '0xc1656B63D9EEBa6d114f6bE19565177893e5bCBF',
       pmmSrc: '0xeF4fB24aD0916217251F553c0596F8Edc630EB66',
       pmmDst: '0xE7351Fd770A37282b91D153Ee690B63579D6dd7f',
-      evm: {
-        forwarderContract: '0x663DC15D3C1aC63ff12E45Ab68FeA3F0a883C251',
-      },
-    },
-    [ChainId.Optimism]: {
-      deBridgeContract: '0x43dE2d77BF8027e25dBD179B491e8d64f38398aA',
-      pmmSrc: '0xeF4fB24aD0916217251F553c0596F8Edc630EB66',
-      pmmDst: '0xE7351Fd770A37282b91D153Ee690B63579D6dd7f',
-      evm: {
-        forwarderContract: '0x663DC15D3C1aC63ff12E45Ab68FeA3F0a883C251',
-      },
-    },
-    [ChainId.Linea]: {
-      deBridgeContract: '0x43dE2d77BF8027e25dBD179B491e8d64f38398aA',
-      pmmSrc: '0xeF4fB24aD0916217251F553c0596F8Edc630EB66',
-      pmmDst: '0xE7351Fd770A37282b91D153Ee690B63579D6dd7f',
-      evm: {
-        forwarderContract: '0x663DC15D3C1aC63ff12E45Ab68FeA3F0a883C251',
-      },
     },
   },
 };

diff --git a/src/executor.ts b/src/executor.ts
@@ -174,8 +174,6 @@ export class Executor implements IExecutor {
 
   #isInitialized = false;
 
-  readonly #url1Inch = 'https://nodes.debridge.finance';
-
   private readonly logger: Logger;
 
   constructor(logger: Logger) {
@@ -256,7 +254,7 @@ export class Executor implements IExecutor {
     this.subsidizationRules = config.subsidizationRules || [];
 
     this.swapConnector = new SwapConnectorImplementationService({
-      oneInchApi: this.#url1Inch,
+      oneInchConfig: config.oneInchConfig,
     });
 
     this.buckets = Executor.getTokenBuckets(config.buckets);

diff --git a/src/processors/swap-connector-implementation.service.ts b/src/processors/swap-connector-implementation.service.ts
@@ -9,30 +9,41 @@ import {
   SwapConnectorResult,
 } from '@debridge-finance/dln-client';
 
+type OneInchConfig = {
+  apiToken?: string;
+  apiServer?: string;
+  disablePMMProtocols?: boolean;
+  disabledProtocols?: string[];
+};
+
 export class SwapConnectorImplementationService implements SwapConnector {
   readonly #connectors: { [key in ChainId]: SwapConnector | null };
 
-  constructor(config: { oneInchApi: string }) {
-    const oneInchV4Connector = new OneInch.OneInchV4Connector(config.oneInchApi);
-    const oneInchV5Connector = new OneInch.OneInchV5Connector(config.oneInchApi);
+  constructor(configuration?: { oneInchConfig?: OneInchConfig }) {
+    const oneInchV5Connector = new OneInch.OneInchV5Connector({
+      customApiURL: configuration?.oneInchConfig?.apiServer || 'https://api.1inch.dev/swap',
+      token: configuration?.oneInchConfig?.apiToken,
+      disablePMMProtocols: configuration?.oneInchConfig?.disablePMMProtocols,
+      disabledProtocols: configuration?.oneInchConfig?.disabledProtocols,
+    });
 
     this.#connectors = {
-      [ChainId.Arbitrum]: oneInchV4Connector,
+      [ChainId.Arbitrum]: oneInchV5Connector,
       [ChainId.ArbitrumTest]: null,
-      [ChainId.Avalanche]: oneInchV4Connector,
+      [ChainId.Avalanche]: oneInchV5Connector,
       [ChainId.AvalancheTest]: null,
       [ChainId.Base]: oneInchV5Connector,
-      [ChainId.BSC]: oneInchV4Connector,
+      [ChainId.BSC]: oneInchV5Connector,
       [ChainId.BSCTest]: null,
-      [ChainId.Ethereum]: oneInchV4Connector,
-      [ChainId.Fantom]: oneInchV4Connector,
+      [ChainId.Ethereum]: oneInchV5Connector,
+      [ChainId.Fantom]: oneInchV5Connector,
       [ChainId.Heco]: null,
       [ChainId.HecoTest]: null,
       [ChainId.Kovan]: null,
-      [ChainId.Linea]: oneInchV4Connector,
+      [ChainId.Linea]: oneInchV5Connector,
       [ChainId.Neon]: null,
-      [ChainId.Optimism]: oneInchV4Connector,
-      [ChainId.Polygon]: oneInchV4Connector,
+      [ChainId.Optimism]: oneInchV5Connector,
+      [ChainId.Polygon]: oneInchV5Connector,
       [ChainId.PolygonTest]: null,
       [ChainId.Solana]: null,
     };