@paraswap/dex-lib 2.20.1 → 2.20.2-swaap-v2-fixes

package/.idea/aws.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="accountSettings">
+    <option name="activeProfile" value="profile:default" />
+    <option name="activeRegion" value="us-east-1" />
+    <option name="recentlyUsedProfiles">
+      <list>
+        <option value="profile:default" />
+      </list>
+    </option>
+    <option name="recentlyUsedRegions">
+      <list>
+        <option value="us-east-1" />
+      </list>
+    </option>
+  </component>
+</project>

package/.idea/codeStyles/Project.xml

@@ -0,0 +1,19 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <ScalaCodeStyleSettings>
+      <option name="MULTILINE_STRING_CLOSING_QUOTES_ON_NEW_LINE" value="true" />
+    </ScalaCodeStyleSettings>
+    <TypeScriptCodeStyleSettings version="0">
+      <option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACKETS" value="true" />
+      <option name="USE_DOUBLE_QUOTES" value="false" />
+      <option name="SPACES_WITHIN_IMPORTS" value="true" />
+    </TypeScriptCodeStyleSettings>
+    <codeStyleSettings language="TypeScript">
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+  </code_scheme>
+</component>

package/.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
+  </state>
+</component>

package/.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

package/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/paraswap-dex-lib.iml" filepath="$PROJECT_DIR$/.idea/paraswap-dex-lib.iml" />
+    </modules>
+  </component>
+</project>

package/.idea/paraswap-dex-lib.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

package/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

package/build/dex/aave-v3/tokens/arbitrum.json

@@ -0,0 +1,50 @@
+[
+    {
+        "aSymbol": "aArbDAI",
+        "aAddress": "0x82E64f49Ed5EC1bC6e43DAD4FC8Af9bb3A2312EE",
+        "address": "0xda10009cbd5d07dd0cecc66161fc93d7c9000da1",
+        "decimals": 18
+    },
+    {
+        "aSymbol": "aArbEURS",
+        "aAddress": "0x6d80113e533a2C0fe82EaBD35f1875DcEA89Ea97",
+        "address": "0xd22a58f79e9481d1a88e00c343885a588b34b68b",
+        "decimals": 2
+    },
+    {
+        "aSymbol": "aArbUSDC",
+        "aAddress": "0x625E7708f30cA75bfd92586e17077590C60eb4cD",
+        "address": "0xff970a61a04b1ca14834a43f5de4533ebddb5cc8",
+        "decimals": 6
+    },
+    {
+        "aSymbol": "aArbUSDT",
+        "aAddress": "0x6ab707aca953edaefbc4fd23ba73294241490620",
+        "address": "0xfd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb9",
+        "decimals": 6
+    },
+    {
+        "aSymbol": "aArbAAVE",
+        "aAddress": "0xf329e36C7bF6E5E86ce2150875a84Ce77f477375",
+        "address": "0xba5ddd1f9d7f570dc94a51479a000e3bce967196",
+        "decimals": 18
+    },
+    {
+        "aSymbol": "aArbLINK",
+        "aAddress": "0x191c10Aa4AF7C30e871E70C95dB0E4eb77237530",
+        "address": "0xf97f4df75117a78c1a5a0dbb814af92458539fb4",
+        "decimals": 18
+    },
+    {
+        "aSymbol": "aArbWBTC",
+        "aAddress": "0x078f358208685046a11C85e8ad32895DED33A249",
+        "address": "0x2f2a2543b76a4166549f7aab2e75bef0aefc5b0f",
+        "decimals": 8
+    },
+    {
+        "aSymbol": "aArbWETH",
+        "aAddress": "0xe50fA9b3c56FfB159cB0FCA61F5c9D750e8128c8",
+        "address": "0x82af49447d8a07e3bd95bd0d56f35241523fbab1",
+        "decimals": 18
+    }
+]

package/build/dex/aave-v3/tokens/avalanche.json

@@ -0,0 +1,74 @@
+[
+    {
+        "aSymbol": "aAvaDAI",
+        "aAddress": "0x82e64f49ed5ec1bc6e43dad4fc8af9bb3a2312ee",
+        "address": "0xd586e7f844cea2f87f50152665bcbc2c279d8d70",
+        "decimals": 18
+    },
+    {
+        "aSymbol": "aAvaFRAX",
+        "aAddress": "0xc45A479877e1e9Dfe9FcD4056c699575a1045dAA",
+        "address": "0xD24C2Ad096400B6FBcd2ad8B24E7acBc21A1da64",
+        "decimals": 18
+    },
+    {
+        "aSymbol": "aAvaMAI",
+        "aAddress": "0x8Eb270e296023E9D92081fdF967dDd7878724424",
+        "address": "0x5c49b268c9841AFF1Cc3B0a418ff5c3442eE3F3b",
+        "decimals": 18
+    },
+    {
+        "aSymbol": "aAvaUSDC",
+        "aAddress": "0x625e7708f30ca75bfd92586e17077590c60eb4cd",
+        "address": "0xb97ef9ef8734c71904d8002f8b6bc66dd9c48a6e",
+        "decimals": 6
+    },
+    {
+        "aSymbol": "aAvaUSDT",
+        "aAddress": "0x6ab707aca953edaefbc4fd23ba73294241490620",
+        "address": "0x9702230a8ea53601f5cd2dc00fdbc13d4df4a8c7",
+        "decimals": 6
+    },
+    {
+        "aSymbol": "aAvaAAVE",
+        "aAddress": "0xf329e36c7bf6e5e86ce2150875a84ce77f477375",
+        "address": "0x63a72806098bd3d9520cc43356dd78afe5d386d9",
+        "decimals": 18
+    },
+    {
+        "aSymbol": "aAvaBTC.b",
+        "aAddress": "0x8ffDf2DE812095b1D19CB146E4c004587C0A0692",
+        "address": "0x152b9d0FdC40C096757F570A51E494bd4b943E50",
+        "decimals": 8
+    },
+    {
+        "aSymbol": "aAvaLINK",
+        "aAddress": "0x191c10aa4af7c30e871e70c95db0e4eb77237530",
+        "address": "0x5947bb275c521040051d82396192181b413227a3",
+        "decimals": 18
+    },
+    {
+        "aSymbol": "aAvaSAVAX",
+        "aAddress": "0x513c7E3a9c69cA3e22550eF58AC1C0088e918FFf",
+        "address": "0x2b2C81e08f1Af8835a78Bb2A90AE924ACE0eA4bE",
+        "decimals": 18
+    },
+    {
+        "aSymbol": "aAvaWAVAX",
+        "aAddress": "0x6d80113e533a2C0fe82EaBD35f1875DcEA89Ea97",
+        "address": "0xB31f66AA3C1e785363F0875A1B74E27b85FD66c7",
+        "decimals": 18
+    },
+    {
+        "aSymbol": "aAvaWBTC",
+        "aAddress": "0x078f358208685046a11c85e8ad32895ded33a249",
+        "address": "0x50b7545627a5162f82a992c33b87adc75187b218",
+        "decimals": 8
+    },
+    {
+        "aSymbol": "aAvaWETH",
+        "aAddress": "0xe50fa9b3c56ffb159cb0fca61f5c9d750e8128c8",
+        "address": "0x49d5c2bdffac6ce2bfdb6640f4f80f226bc10bab",
+        "decimals": 18
+    }
+]

package/build/dex/aave-v3/tokens/fantom.json

@@ -0,0 +1,62 @@
+[
+    {
+        "aSymbol": "aFanAAVE",
+        "aAddress": "0xf329e36c7bf6e5e86ce2150875a84ce77f477375",
+        "address": "0x6a07a792ab2965c72a5b8088d3a069a7ac3a993b",
+        "decimals": 18
+    },
+    {
+        "aSymbol": "aFanDAI",
+        "aAddress": "0x82e64f49ed5ec1bc6e43dad4fc8af9bb3a2312ee",
+        "address": "0x8d11ec38a3eb5e956b052f67da8bdc9bef8abf3e",
+        "decimals": 18
+    },
+    {
+        "aSymbol": "aFanUSDT",
+        "aAddress": "0x6ab707aca953edaefbc4fd23ba73294241490620",
+        "address": "0x049d68029688eabf473097a2fc38ef61633a3c7a",
+        "decimals": 6
+    },
+    {
+        "aSymbol": "aFanLINK",
+        "aAddress": "0x191c10aa4af7c30e871e70c95db0e4eb77237530",
+        "address": "0xb3654dc3d10ea7645f8319668e8f54d2574fbdc8",
+        "decimals": 18
+    },
+    {
+        "aSymbol": "aFanWFTM",
+        "aAddress": "0x6d80113e533a2c0fe82eabd35f1875dcea89ea97",
+        "address": "0x21be370d5312f44cb42ce377bc9b8a0cef1a4c83",
+        "decimals": 18
+    },
+    {
+        "aSymbol": "aFanUSDC",
+        "aAddress": "0x625e7708f30ca75bfd92586e17077590c60eb4cd",
+        "address": "0x04068da6c83afcfa0e13ba15a6696662335d5b75",
+        "decimals": 6
+    },
+    {
+        "aSymbol": "aFanWBTC",
+        "aAddress": "0x078f358208685046a11c85e8ad32895ded33a249",
+        "address": "0x321162cd933e2be498cd2267a90534a804051b11",
+        "decimals": 8
+    },
+    {
+        "aSymbol": "aFanWETH",
+        "aAddress": "0xe50fa9b3c56ffb159cb0fca61f5c9d750e8128c8",
+        "address": "0x74b23882a30290451a17c44f4f05243b6b58c76d",
+        "decimals": 18
+    },
+    {
+        "aSymbol": "aFanCRV",
+        "aAddress": "0x513c7e3a9c69ca3e22550ef58ac1c0088e918fff",
+        "address": "0x1e4f97b9f9f913c46f1632781732927b9019c68b",
+        "decimals": 18
+    },
+    {
+        "aSymbol": "aFanSUSHI",
+        "aAddress": "0xc45a479877e1e9dfe9fcd4056c699575a1045daa",
+        "address": "0xae75a438b2e0cb8bb01ec1e1e376de11d44477cc",
+        "decimals": 18
+    }
+]

package/build/dex/aave-v3/tokens/optimism.json

@@ -0,0 +1,50 @@
+[
+    {
+        "aSymbol": "aOptDAI",
+        "aAddress": "0x82E64f49Ed5EC1bC6e43DAD4FC8Af9bb3A2312EE",
+        "address": "0xda10009cbd5d07dd0cecc66161fc93d7c9000da1",
+        "decimals": 18
+    },
+    {
+        "aSymbol": "aOptSUSD",
+        "aAddress": "0x6d80113e533a2C0fe82EaBD35f1875DcEA89Ea97",
+        "address": "0x8c6f28f2f1a3c87f0f938b96d27520d9751ec8d9",
+        "decimals": 18
+    },
+    {
+        "aSymbol": "aOptUSDC",
+        "aAddress": "0x625E7708f30cA75bfd92586e17077590C60eb4cD",
+        "address": "0x7f5c764cbc14f9669b88837ca1490cca17c31607",
+        "decimals": 6
+    },
+    {
+        "aSymbol": "aOptUSDT",
+        "aAddress": "0x6ab707aca953edaefbc4fd23ba73294241490620",
+        "address": "0x94b008aa00579c1307b0ef2c499ad98a8ce58e58",
+        "decimals": 6
+    },
+    {
+        "aSymbol": "aOptAAVE",
+        "aAddress": "0xf329e36C7bF6E5E86ce2150875a84Ce77f477375",
+        "address": "0x76fb31fb4af56892a25e32cfc43de717950c9278",
+        "decimals": 18
+    },
+    {
+        "aSymbol": "aOptLINK",
+        "aAddress": "0x191c10Aa4AF7C30e871E70C95dB0E4eb77237530",
+        "address": "0x350a791Bfc2C21F9Ed5d10980Dad2e2638ffa7f6",
+        "decimals": 18
+    },
+    {
+        "aSymbol": "aOptWBTC",
+        "aAddress": "0x078f358208685046a11C85e8ad32895DED33A249",
+        "address": "0x68f180fcce6836688e9084f035309e29bf0a2095",
+        "decimals": 8
+    },
+    {
+        "aSymbol": "aOptWETH",
+        "aAddress": "0xe50fA9b3c56FfB159cB0FCA61F5c9D750e8128c8",
+        "address": "0x4200000000000000000000000000000000000006",
+        "decimals": 18
+    }
+]

package/build/dex/aave-v3/tokens/polygon.json

@@ -0,0 +1,116 @@
+[
+    {
+        "aSymbol": "aPolAGEUR",
+        "aAddress": "0x8437d7c167dfb82ed4cb79cd44b7a32a1dd95c77",
+        "address": "0xe0b52e49357fd4daf2c15e02058dce6bc0057db4",
+        "decimals": 18
+    },
+    {
+        "aSymbol": "aPolDAI",
+        "aAddress": "0x82e64f49ed5ec1bc6e43dad4fc8af9bb3a2312ee",
+        "address": "0x8f3cf7ad23cd3cadbd9735aff958023239c6a063",
+        "decimals": 18
+    },
+    {
+        "aSymbol": "aPolEURS",
+        "aAddress": "0x38d693ce1df5aadf7bc62595a37d667ad57922e5",
+        "address": "0xe111178a87a3bff0c8d18decba5798827539ae99",
+        "decimals": 2
+    },
+    {
+        "aSymbol": "aPolJEUR",
+        "aAddress": "0x6533afac2e7bccb20dca161449a13a32d391fb00",
+        "address": "0x4e3decbb3645551b8a19f0ea1678079fcb33fb4c",
+        "decimals": 18
+    },
+    {
+        "aSymbol": "aPolMIMATIC",
+        "aAddress": "0xeBe517846d0F36eCEd99C735cbF6131e1fEB775D",
+        "address": "0xa3Fa99A148fA48D14Ed51d610c367C61876997F1",
+        "decimals": 18
+    },
+    {
+        "aSymbol": "aPolUSDC",
+        "aAddress": "0x625e7708f30ca75bfd92586e17077590c60eb4cd",
+        "address": "0x2791bca1f2de4661ed88a30c99a7a9449aa84174",
+        "decimals": 6
+    },
+    {
+        "aSymbol": "aPolUSDT",
+        "aAddress": "0x6ab707aca953edaefbc4fd23ba73294241490620",
+        "address": "0xc2132d05d31c914a87c6611c10748aeb04b58e8f",
+        "decimals": 6
+    },
+    {
+        "aSymbol": "aPolAAVE",
+        "aAddress": "0xf329e36c7bf6e5e86ce2150875a84ce77f477375",
+        "address": "0xd6df932a45c0f255f85145f286ea0b292b21c90b",
+        "decimals": 18
+    },
+    {
+        "aSymbol": "aPolBAL",
+        "aAddress": "0x8ffdf2de812095b1d19cb146e4c004587c0a0692",
+        "address": "0x9a71012b13ca4d3d0cdc72a177df3ef03b0e76a3",
+        "decimals": 18
+    },
+    {
+        "aSymbol": "aPolCRV",
+        "aAddress": "0x513c7e3a9c69ca3e22550ef58ac1c0088e918fff",
+        "address": "0x172370d5cd63279efa6d502dab29171933a610af",
+        "decimals": 18
+    },
+    {
+        "aSymbol": "aPolDPI",
+        "aAddress": "0x724dc807b04555b71ed48a6896b6f41593b8c637",
+        "address": "0x85955046df4668e1dd369d2de9f3aeb98dd2a369",
+        "decimals": 18
+    },
+    {
+        "aSymbol": "aPolGHST",
+        "aAddress": "0x8eb270e296023e9d92081fdf967ddd7878724424",
+        "address": "0x385eeac5cb85a38a9a07a70c73e0a3271cfb54a7",
+        "decimals": 18
+    },
+    {
+        "aSymbol": "aPolLINK",
+        "aAddress": "0x191c10aa4af7c30e871e70c95db0e4eb77237530",
+        "address": "0x53e0bca35ec356bd5dddfebbd1fc0fd03fabad39",
+        "decimals": 18
+    },
+    {
+        "aSymbol": "aPolMATICX",
+        "aAddress": "0x80cA0d8C38d2e2BcbaB66aA1648Bd1C7160500FE",
+        "address": "0xfa68FB4628DFF1028CFEc22b4162FCcd0d45efb6",
+        "decimals": 18
+    },
+    {
+        "aSymbol": "aPolSTMATIC",
+        "aAddress": "0xEA1132120ddcDDA2F119e99Fa7A27a0d036F7Ac9",
+        "address": "0x3A58a54C066FdC0f2D55FC9C89F0415C92eBf3C4",
+        "decimals": 18
+    },
+    {
+        "aSymbol": "aPolSUSHI",
+        "aAddress": "0xc45a479877e1e9dfe9fcd4056c699575a1045daa",
+        "address": "0x0b3f868e0be5597d5db7feb59e1cadbb0fdda50a",
+        "decimals": 18
+    },
+    {
+        "aSymbol": "aPolWBTC",
+        "aAddress": "0x078f358208685046a11c85e8ad32895ded33a249",
+        "address": "0x1bfd67037b42cf73acf2047067bd4f2c47d9bfd6",
+        "decimals": 8
+    },
+    {
+        "aSymbol": "aPolWETH",
+        "aAddress": "0xe50fa9b3c56ffb159cb0fca61f5c9d750e8128c8",
+        "address": "0x7ceb23fd6bc0add59e62ac25578270cff1b9f619",
+        "decimals": 18
+    },
+    {
+        "aSymbol": "aPolWMATIC",
+        "aAddress": "0x6d80113e533a2c0fe82eabd35f1875dcea89ea97",
+        "address": "0x0d500b1d8e8ef31e21c99d1db9a6444d3adf1270",
+        "decimals": 18
+    }
+]

package/build/dex/pancakeswap-v3/types.d.ts

@@ -0,0 +1,14 @@
+import { Address } from '../../types';
+export declare type DexParams = {
+    router: Address;
+    quoter: Address;
+    factory: Address;
+    stateMulticall: Address;
+    uniswapMulticall: Address;
+    supportedFees: bigint[];
+    feeProtocols: bigint[];
+    chunksCount: number;
+    deployer?: Address;
+    subgraphURL: string;
+    initHash: string;
+};

package/build/dex/pancakeswap-v3/types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

package/build/dex/pancakeswap-v3/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/dex/pancakeswap-v3/types.ts"],"names":[],"mappings":""}

package/build/dex/solidly/forks-override/chronos.d.ts

@@ -0,0 +1,20 @@
+import { Solidly } from '../solidly';
+import { SolidlyPair } from '../types';
+import { Network } from '../../../constants';
+import { IDexHelper } from '../../../dex-helper';
+export declare class Chronos extends Solidly {
+    protected network: Network;
+    protected dexHelper: IDexHelper;
+    static dexKeysWithNetwork: {
+        key: string;
+        networks: Network[];
+    }[];
+    constructor(network: Network, dexKey: string, dexHelper: IDexHelper);
+    protected getFeesMultiCallData(pair: SolidlyPair): {
+        callEntry: {
+            target: string;
+            callData: string;
+        };
+        callDecoder: (values: any[]) => number;
+    };
+}

package/build/dex/solidly/forks-override/chronos.js

@@ -0,0 +1,44 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Chronos = void 0;
+const solidly_1 = require("../solidly");
+const abi_1 = require("@ethersproject/abi");
+const utils_1 = require("../../../utils");
+const config_1 = require("../config");
+const lodash_1 = __importDefault(require("lodash"));
+const ChronosFactoryABI = [
+    {
+        inputs: [{ internalType: 'bool', name: '_stable', type: 'bool' }],
+        name: 'getFee',
+        outputs: [{ internalType: 'uint256', name: '', type: 'uint256' }],
+        stateMutability: 'view',
+        type: 'function',
+    },
+];
+const chronosFactoryIface = new abi_1.Interface(ChronosFactoryABI);
+class Chronos extends solidly_1.Solidly {
+    constructor(network, dexKey, dexHelper) {
+        super(network, dexKey, dexHelper, true);
+        this.network = network;
+        this.dexHelper = dexHelper;
+    }
+    getFeesMultiCallData(pair) {
+        const callEntry = {
+            target: this.factoryAddress,
+            callData: chronosFactoryIface.encodeFunctionData('getFee', [pair.stable]),
+        };
+        const callDecoder = (values) => parseInt(chronosFactoryIface
+            .decodeFunctionResult('getFee', values)[0]
+            .toString());
+        return {
+            callEntry,
+            callDecoder,
+        };
+    }
+}
+exports.Chronos = Chronos;
+Chronos.dexKeysWithNetwork = (0, utils_1.getDexKeysWithNetwork)(lodash_1.default.pick(config_1.SolidlyConfig, ['Chronos']));
+//# sourceMappingURL=chronos.js.map

package/build/dex/solidly/forks-override/chronos.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"chronos.js","sourceRoot":"","sources":["../../../../src/dex/solidly/forks-override/chronos.ts"],"names":[],"mappings":";;;;;;AAAA,wCAAqC;AAIrC,4CAA+C;AAC/C,0CAAuD;AACvD,sCAA0C;AAC1C,oDAAuB;AAEvB,MAAM,iBAAiB,GAAG;IACxB;QACE,MAAM,EAAE,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;QACjE,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,CAAC,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QACjE,eAAe,EAAE,MAAM;QACvB,IAAI,EAAE,UAAU;KACjB;CACF,CAAC;AAEF,MAAM,mBAAmB,GAAG,IAAI,eAAS,CAAC,iBAAiB,CAAC,CAAC;AAE7D,MAAa,OAAQ,SAAQ,iBAAO;IAIlC,YACY,OAAgB,EAC1B,MAAc,EACJ,SAAqB;QAE/B,KAAK,CACH,OAAO,EACP,MAAM,EACN,SAAS,EACT,IAAI,CACL,CAAC;QATQ,YAAO,GAAP,OAAO,CAAS;QAEhB,cAAS,GAAT,SAAS,CAAY;IAQjC,CAAC;IAES,oBAAoB,CAAC,IAAiB;QAC9C,MAAM,SAAS,GAAG;YAChB,MAAM,EAAE,IAAI,CAAC,cAAc;YAC3B,QAAQ,EAAE,mBAAmB,CAAC,kBAAkB,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SAC1E,CAAC;QACF,MAAM,WAAW,GAAG,CAAC,MAAa,EAAE,EAAE,CACpC,QAAQ,CACN,mBAAmB;aAChB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;aACzC,QAAQ,EAAE,CACd,CAAC;QAEJ,OAAO;YACL,SAAS;YACT,WAAW;SACZ,CAAC;IACJ,CAAC;;AAjCH,0BAkCC;AAjCe,0BAAkB,GAC9B,IAAA,6BAAqB,EAAC,gBAAC,CAAC,IAAI,CAAC,sBAAa,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC"}

package/build/dex/swaap-v2/swaap-v2.js

@@ -205,15 +205,17 @@ class SwaapV2 extends simple_exchange_1.SimpleExchange {
             if (levels === null) {
                 return null;
             }
-            const poolIdentifier = (0, utils_3.getPoolIdentifier)(this.dexKey, normalizedSrcToken.address, normalizedDestToken.address);
             const levelEntries = Object.keys(levels)
-                .map((pair) => {
-                if (pools.includes(poolIdentifier)) {
-                    return levels[pair];
+                .filter((pair) => {
+                const { base, quote } = levels[pair];
+                if (pools.includes((0, utils_3.getPoolIdentifier)(this.dexKey, quote, base))
+                    || pools.includes((0, utils_3.getPoolIdentifier)(this.dexKey, base, quote))) {
+                    return true;
                 }
-                return undefined;
-            })
-                .filter((o) => o !== undefined);
+                return false;
+            }).map((pair) => {
+                return levels[pair];
+            });
             const unitVolume = (0, bignumber_constants_1.getBigNumberPow)((side === constants_1.SwapSide.SELL ? normalizedSrcToken : normalizedDestToken)
                 .decimals);
             const amountsFloat = amounts.map(a => new bignumber_js_1.default(a.toString()).dividedBy(unitVolume));
@@ -522,7 +524,7 @@ class SwaapV2 extends simple_exchange_1.SimpleExchange {
             .slice(0, limit);
     }
     getTokenFromAddress(address) {
-        return this.tokensMap[address];
+        return this.tokensMap[(0, utils_3.normalizeTokenAddress)(address)];
     }
     releaseResources() {
         if (this.rateFetcher) {

package/build/dex/swaap-v2/swaap-v2.js.map

@@ -1 +1 @@
-{"version":3,"file":"swaap-v2.js","sourceRoot":"","sources":["../../../src/dex/swaap-v2/swaap-v2.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"swaap-v2.js","sourceRoot":"","sources":["../../../src/dex/swaap-v2/swaap-v2.ts"],"names":[],"mappings":"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"}

package/build/dex/swaap-v2/utils.js

@@ -26,7 +26,7 @@ const getPoolIdentifier = (dexKey, srcAddress, destAddress) => {
 };
 exports.getPoolIdentifier = getPoolIdentifier;
 const normalizeTokenAddress = (address) => {
-    return address.toLowerCase() === constants_1.ETHER_ADDRESS
+    return address.toLowerCase() === constants_1.ETHER_ADDRESS.toLowerCase()
         ? constants_1.NULL_ADDRESS
         : address.toLowerCase();
 };

package/build/dex/swaap-v2/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/dex/swaap-v2/utils.ts"],"names":[],"mappings":";;;AACA,+CAA4E;AAErE,MAAM,mBAAmB,GAAG,CACjC,MAAc,EACd,UAAmB,EACnB,WAAoB,EACpB,EAAE;IACF,OAAO,GAAG,MAAM,IAAI,IAAA,mBAAW,EAAC,UAAU,EAAE,WAAW,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC;AAC3E,CAAC,CAAC;AANW,QAAA,mBAAmB,uBAM9B;AAEK,MAAM,WAAW,GAAG,CAAC,UAAmB,EAAE,WAAoB,EAAE,EAAE;IACvE,MAAM,eAAe,GACnB,UAAU,GAAG,WAAW;QACtB,CAAC,CAAC,CAAC,UAAU,EAAE,WAAW,CAAC;QAC3B,CAAC,CAAC,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IAChC,OAAO,GAAG,eAAe,CAAC,CAAC,CAAC,IAAI,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC;AACrE,CAAC,CAAC;AANW,QAAA,WAAW,eAMtB;AAEK,MAAM,WAAW,GAAG,CAAC,MAAc,EAAE,SAAiB,EAAE,EAAE;IAC/D,OAAO,GAAG,wBAAY,IAAI,MAAM,IAAI,SAAS,EAAE,CAAC,WAAW,EAAE,CAAC;AAChE,CAAC,CAAC;AAFW,QAAA,WAAW,eAEtB;AAEK,MAAM,sBAAsB,GAAG,CAAC,MAAc,EAAE,EAAE;IACvD,OAAO,IAAA,mBAAW,EAAC,MAAM,EAAE,cAAc,CAAC,CAAC;AAC7C,CAAC,CAAC;AAFW,QAAA,sBAAsB,0BAEjC;AAEK,MAAM,iBAAiB,GAAG,CAC/B,MAAc,EACd,UAAmB,EACnB,WAAoB,EACpB,EAAE;IACF,OAAO,GAAG,IAAA,2BAAmB,EAC3B,MAAM,EACN,UAAU,EACV,WAAW,CACZ,EAAE,CAAC,WAAW,EAAE,CAAC;AACpB,CAAC,CAAC;AAVW,QAAA,iBAAiB,qBAU5B;AAEK,MAAM,qBAAqB,GAAG,CAAC,OAAe,EAAU,EAAE;IAC/D,OAAO,OAAO,CAAC,WAAW,EAAE,KAAK,yBAAa;QAC5C,CAAC,CAAC,wBAAY;QACd,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;AAC5B,CAAC,CAAC;AAJW,QAAA,qBAAqB,yBAIhC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/dex/swaap-v2/utils.ts"],"names":[],"mappings":";;;AACA,+CAA4E;AAErE,MAAM,mBAAmB,GAAG,CACjC,MAAc,EACd,UAAmB,EACnB,WAAoB,EACpB,EAAE;IACF,OAAO,GAAG,MAAM,IAAI,IAAA,mBAAW,EAAC,UAAU,EAAE,WAAW,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC;AAC3E,CAAC,CAAC;AANW,QAAA,mBAAmB,uBAM9B;AAEK,MAAM,WAAW,GAAG,CAAC,UAAmB,EAAE,WAAoB,EAAE,EAAE;IACvE,MAAM,eAAe,GACnB,UAAU,GAAG,WAAW;QACtB,CAAC,CAAC,CAAC,UAAU,EAAE,WAAW,CAAC;QAC3B,CAAC,CAAC,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IAChC,OAAO,GAAG,eAAe,CAAC,CAAC,CAAC,IAAI,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC;AACrE,CAAC,CAAC;AANW,QAAA,WAAW,eAMtB;AAEK,MAAM,WAAW,GAAG,CAAC,MAAc,EAAE,SAAiB,EAAE,EAAE;IAC/D,OAAO,GAAG,wBAAY,IAAI,MAAM,IAAI,SAAS,EAAE,CAAC,WAAW,EAAE,CAAC;AAChE,CAAC,CAAC;AAFW,QAAA,WAAW,eAEtB;AAEK,MAAM,sBAAsB,GAAG,CAAC,MAAc,EAAE,EAAE;IACvD,OAAO,IAAA,mBAAW,EAAC,MAAM,EAAE,cAAc,CAAC,CAAC;AAC7C,CAAC,CAAC;AAFW,QAAA,sBAAsB,0BAEjC;AAEK,MAAM,iBAAiB,GAAG,CAC/B,MAAc,EACd,UAAmB,EACnB,WAAoB,EACpB,EAAE;IACF,OAAO,GAAG,IAAA,2BAAmB,EAC3B,MAAM,EACN,UAAU,EACV,WAAW,CACZ,EAAE,CAAC,WAAW,EAAE,CAAC;AACpB,CAAC,CAAC;AAVW,QAAA,iBAAiB,qBAU5B;AAEK,MAAM,qBAAqB,GAAG,CAAC,OAAe,EAAU,EAAE;IAC/D,OAAO,OAAO,CAAC,WAAW,EAAE,KAAK,yBAAa,CAAC,WAAW,EAAE;QAC1D,CAAC,CAAC,wBAAY;QACd,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;AAC5B,CAAC,CAAC;AAJW,QAAA,qBAAqB,yBAIhC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paraswap/dex-lib",
-  "version": "2.20.1",
+  "version": "2.20.2-swaap-v2-fixes",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "repository": "https://github.com/paraswap/paraswap-dex-lib",

package/src/dex/swaap-v2/swaap-v2-e2e.test.ts

@@ -5,7 +5,6 @@ import { testE2E } from '../../../tests/utils-e2e';
 import {
   Tokens,
   Holders,
-  NativeTokenSymbols,
 } from '../../../tests/constants-e2e';
 import { Network, ContractMethod, SwapSide } from '../../constants';
 import { StaticJsonRpcProvider } from '@ethersproject/providers';
@@ -13,23 +12,8 @@ import { generateConfig } from '../../config';
 
 const sleepMs: number = 5000;
 
-function testForNetwork(
-  network: Network,
-  dexKey: string,
-  tokenASymbol: string,
-  tokenBSymbol: string,
-  tokenAAmount: string,
-  tokenBAmount: string,
-  nativeTokenAmount: string,
-  excludeNativeTokenTests: boolean = true,
-) {
-  const provider = new StaticJsonRpcProvider(
-    generateConfig(network).privateHttpProvider,
-    network,
-  );
-  const tokens = Tokens[network];
-  const holders = Holders[network];
-  const nativeTokenSymbol = NativeTokenSymbols[network];
+describe('SwaapV2 E2E', () => {
+  const dexKey = 'SwaapV2';
 
   const sideToContractMethods = new Map([
     [
@@ -43,55 +27,67 @@ function testForNetwork(
     [SwapSide.BUY, [ContractMethod.simpleBuy, ContractMethod.buy]],
   ]);
 
-  describe(`${network}`, () => {
+  describe('Polygon', () => {
+    const network = Network.POLYGON;
+    const provider = new StaticJsonRpcProvider(
+      generateConfig(network).privateHttpProvider,
+      network,
+    );
+    const tokens = Tokens[network];
+    const holders = Holders[network];
+
+    const pairs: { name: string; sellAmount: string; buyAmount: string }[][] = [
+      [
+        {
+          name: 'USDC',
+          sellAmount: '100000000',
+          buyAmount: '1000000000000000000',
+        },
+        {
+          name: 'WETH',
+          sellAmount: '1000000000000000000',
+          buyAmount: '100000000',
+        },
+      ],
+      [
+        {
+          name: 'MATIC',
+          sellAmount: '150000000000000000000',
+          buyAmount: '100000000',
+        },
+        {
+          name: 'USDC',
+          sellAmount: '100000000',
+          buyAmount: '150000000000000000000',
+        },
+      ],
+      [
+        {
+          name: 'WMATIC',
+          sellAmount: '150000000000000000000',
+          buyAmount: '100000000',
+        },
+        {
+          name: 'USDC',
+          sellAmount: '100000000',
+          buyAmount: '150000000000000000000',
+        },
+      ],
+    ];
+
     sideToContractMethods.forEach((contractMethods, side) =>
       describe(`${side}`, () => {
         contractMethods.forEach((contractMethod: ContractMethod) => {
-          describe(`${contractMethod}`, () => {
-            if (excludeNativeTokenTests) {
-              it(`${tokenASymbol} -> ${tokenBSymbol}`, async () => {
-                await testE2E(
-                  tokens[tokenASymbol],
-                  tokens[tokenBSymbol],
-                  holders[tokenASymbol],
-                  side === SwapSide.SELL ? tokenAAmount : tokenBAmount,
-                  side,
-                  dexKey,
-                  contractMethod,
-                  network,
-                  provider,
-                  undefined,
-                  undefined,
-                  undefined,
-                  undefined,
-                  sleepMs,
-                );
-              });
-              it(`${tokenBSymbol} -> ${tokenASymbol}`, async () => {
-                await testE2E(
-                  tokens[tokenBSymbol],
-                  tokens[tokenASymbol],
-                  holders[tokenBSymbol],
-                  side === SwapSide.SELL ? tokenBAmount : tokenAAmount,
-                  side,
-                  dexKey,
-                  contractMethod,
-                  network,
-                  provider,
-                  undefined,
-                  undefined,
-                  undefined,
-                  undefined,
-                  sleepMs,
-                );
-              });
-            } else {
-              it(`${nativeTokenSymbol} -> ${tokenASymbol}`, async () => {
+          pairs.forEach(pair => {
+            describe(`${contractMethod}`, () => {
+              it(`${pair[0].name} -> ${pair[1].name}`, async () => {
                 await testE2E(
-                  tokens[nativeTokenSymbol],
-                  tokens[tokenASymbol],
-                  holders[nativeTokenSymbol],
-                  side === SwapSide.SELL ? nativeTokenAmount : tokenAAmount,
+                  tokens[pair[0].name],
+                  tokens[pair[1].name],
+                  holders[pair[0].name],
+                  side === SwapSide.SELL
+                    ? pair[0].sellAmount
+                    : pair[0].buyAmount,
                   side,
                   dexKey,
                   contractMethod,
@@ -104,12 +100,14 @@ function testForNetwork(
                   sleepMs,
                 );
               });
-              it(`${tokenASymbol} -> ${nativeTokenSymbol}`, async () => {
+              it(`${pair[1].name} -> ${pair[0].name}`, async () => {
                 await testE2E(
-                  tokens[tokenASymbol],
-                  tokens[nativeTokenSymbol],
-                  holders[tokenASymbol],
-                  side === SwapSide.SELL ? tokenAAmount : nativeTokenAmount,
+                  tokens[pair[1].name],
+                  tokens[pair[0].name],
+                  holders[pair[1].name],
+                  side === SwapSide.SELL
+                    ? pair[1].sellAmount
+                    : pair[1].buyAmount,
                   side,
                   dexKey,
                   contractMethod,
@@ -122,37 +120,12 @@ function testForNetwork(
                   sleepMs,
                 );
               });
-            }
+            });
           });
         });
       }),
     );
   });
-}
-
-describe('SwaapV2 E2E', () => {
-  const dexKey = 'SwaapV2';
-
-  describe('Polygon', () => {
-    const network = Network.POLYGON;
-
-    const tokenASymbol: string = 'USDC';
-    const tokenBSymbol: string = 'WETH';
-
-    const tokenAAmount: string = '100000000';
-    const tokenBAmount: string = '100000000000000000';
-    const nativeTokenAmount = '1000000000000000000';
-
-    testForNetwork(
-      network,
-      dexKey,
-      tokenASymbol,
-      tokenBSymbol,
-      tokenAAmount,
-      tokenBAmount,
-      nativeTokenAmount,
-    );
-  });
 
   // Arbitrum will be supported later
   // describe('Arbitrum', () => {

package/src/dex/swaap-v2/swaap-v2.ts

@@ -310,20 +310,20 @@ export class SwaapV2 extends SimpleExchange implements IDex<SwaapV2Data> {
         return null;
       }
 
-      const poolIdentifier = getPoolIdentifier(
-        this.dexKey,
-        normalizedSrcToken.address,
-        normalizedDestToken.address,
-      );
-
       const levelEntries: SwaapV2PriceLevels[] = Object.keys(levels)
-        .map((pair: string) => {
-          if (pools.includes(poolIdentifier)) {
-            return levels[pair];
+        .filter((pair) => {
+          const { base, quote } = levels[pair];
+          if(
+            pools.includes(getPoolIdentifier(this.dexKey, quote, base))
+            || pools.includes(getPoolIdentifier(this.dexKey, base, quote))
+          ) {
+            return true;
           }
-          return undefined;
-        })
-        .filter((o): o is SwaapV2PriceLevels => o !== undefined);
+
+          return false;
+        }).map((pair) => {
+          return levels[pair];
+        });
 
       const unitVolume = getBigNumberPow(
         (side === SwapSide.SELL ? normalizedSrcToken : normalizedDestToken)
@@ -840,7 +840,7 @@ export class SwaapV2 extends SimpleExchange implements IDex<SwaapV2Data> {
   }
 
   getTokenFromAddress(address: Address): Token {
-    return this.tokensMap[address];
+    return this.tokensMap[normalizeTokenAddress(address)];
   }
 
   releaseResources(): void {

package/src/dex/swaap-v2/utils.ts

@@ -38,7 +38,7 @@ export const getPoolIdentifier = (
 };
 
 export const normalizeTokenAddress = (address: string): string => {
-  return address.toLowerCase() === ETHER_ADDRESS
+  return address.toLowerCase() === ETHER_ADDRESS.toLowerCase()
     ? NULL_ADDRESS
     : address.toLowerCase();
 };