fix: resolve merge conflicts

.env.example

@@ -0,0 +1,7 @@
+HTTP_PROVIDER_1=
+HTTP_PROVIDER_137=
+HTTP_PROVIDER_43114=
+
+TENDERLY_TOKEN=
+TENDERLY_ACCOUNT_ID=
+TENDERLY_PROJECT=

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paraswap/dex-lib",
-  "version": "2.28.9",
+  "version": "2.47.2",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "repository": "https://github.com/paraswap/paraswap-dex-lib",
@@ -51,15 +51,17 @@
   },
   "dependencies": {
     "@0x/utils": "^4.5.2",
+    "@bgd-labs/aave-address-book": "2.21.1",
+    "@ethersproject/abi": "^5.7.0",
     "@hashflow/sdk": "1.2.4",
-    "@hashflow/taker-js": "0.0.2",
-    "@paraswap/core": "1.1.0",
+    "@hashflow/taker-js": "0.3.4",
+    "@paraswap/core": "2.0.0",
     "async": "^3.2.4",
     "axios": "0.26.0",
     "bignumber.js": "9.1.0",
     "cross-fetch": "^3.1.5",
     "es6-promise": "^4.2.8",
-    "ethers": "^5.6.5",
+    "ethers": "^5.7.2",
     "joi": "^17.7.0",
     "lens.ts": "^0.5.1",
     "lodash": "4.17.21",

scripts/dex-integration.ts

@@ -116,7 +116,7 @@ function testIntegration(argv: IOptions) {
       process.env.NODE_ENV = 'test';
     }
 
-    require('../node_modules/jest-cli/build/cli').run(
+    require('../node_modules/jest-cli/build').run(
       `src\/dex\/${dexNameParam}\/.+\.test\.ts`,
     );
   }