v-swap-smart-order-router 3.10.15 → 3.11.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/main/providers/v3/pool-provider.js +2 -2
- package/build/main/providers/v3/subgraph-provider.js +2 -2
- package/build/main/tsconfig.tsbuildinfo +1 -1
- package/build/main/util/addresses.d.ts +2 -2
- package/build/main/util/addresses.js +7 -7
- package/build/module/providers/v3/pool-provider.js +3 -3
- package/build/module/providers/v3/subgraph-provider.js +2 -2
- package/build/module/tsconfig.module.tsbuildinfo +1 -1
- package/build/module/util/addresses.d.ts +2 -2
- package/build/module/util/addresses.js +6 -6
- package/package.json +1 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.WETH9 = exports.constructSameAddressMap = exports.MULTICALL2_ADDRESS = exports.V3_MIGRATOR_ADDRESS = exports.NONFUNGIBLE_POSITION_MANAGER_ADDRESS = exports.TICK_LENS_ADDRESS = exports.ARB_GASINFO_ADDRESS = exports.OVM_GASPRICE_ADDRESS = exports.SWAP_ROUTER_02_ADDRESSES = exports.UNISWAP_MULTICALL_ADDRESSES = exports.MIXED_ROUTE_QUOTER_V1_ADDRESSES = exports.QUOTER_V2_ADDRESSES = exports.V3_CORE_FACTORY_ADDRESSES = exports.
|
|
3
|
+
exports.WETH9 = exports.constructSameAddressMap = exports.MULTICALL2_ADDRESS = exports.V3_MIGRATOR_ADDRESS = exports.NONFUNGIBLE_POSITION_MANAGER_ADDRESS = exports.TICK_LENS_ADDRESS = exports.ARB_GASINFO_ADDRESS = exports.OVM_GASPRICE_ADDRESS = exports.SWAP_ROUTER_02_ADDRESSES = exports.UNISWAP_MULTICALL_ADDRESSES = exports.MIXED_ROUTE_QUOTER_V1_ADDRESSES = exports.QUOTER_V2_ADDRESSES = exports.V3_CORE_FACTORY_ADDRESSES = exports.CFX_POOL_INIT_CODE_HASH = exports.BSC_V3_MIGRATOR_ADDRESS = exports.BSC_SWAP_ROUTER_02_ADDRESS = exports.BSC_NONFUNGIBLE_POSITION_MANAGER_ADDRESS = exports.BSC_TICK_LENS_ADDRESS = void 0;
|
|
4
4
|
const sdk_core_1 = require("@uniswap/sdk-core");
|
|
5
5
|
const v3_sdk_1 = require("@uniswap/v3-sdk");
|
|
6
6
|
const chains_1 = require("./chains");
|
|
@@ -20,15 +20,15 @@ exports.BSC_TICK_LENS_ADDRESS = '0xD9270014D396281579760619CCf4c3af0501A47C';
|
|
|
20
20
|
exports.BSC_NONFUNGIBLE_POSITION_MANAGER_ADDRESS = '0x7b8A01B39D58278b5DE7e48c8449c9f4F5170613';
|
|
21
21
|
exports.BSC_SWAP_ROUTER_02_ADDRESS = '0xB971eF87ede563556b2ED4b1C0b0019111Dd85d2';
|
|
22
22
|
exports.BSC_V3_MIGRATOR_ADDRESS = '0x32681814957e0C13117ddc0c2aba232b5c9e760f';
|
|
23
|
-
const CFX_V3_CORE_FACTORY_ADDRESSES = "
|
|
24
|
-
const CFX_QUOTER_ADDRESSES = "
|
|
25
|
-
const CFX_MULTICALL_ADDRESS = "
|
|
26
|
-
const CFX_SWAP_ROUTER_ADDRESS = "
|
|
23
|
+
const CFX_V3_CORE_FACTORY_ADDRESSES = "0x50caddc77c6727bdd3c78b428c149bf110b4f595"; // TODO: update
|
|
24
|
+
const CFX_QUOTER_ADDRESSES = "0x085c0e2695b6d5f6483f083db6657c3164520d9c"; // TODO: update 实际为UniswapV3QuoterV2
|
|
25
|
+
const CFX_MULTICALL_ADDRESS = "0x680f7dee91e6c44a1150bc6dacccdad046dd0164"; // TODO: update
|
|
26
|
+
const CFX_SWAP_ROUTER_ADDRESS = "0x3b02e356d09e758e2711bc64cf33e48f3e1239b8"; // TODO: update
|
|
27
27
|
const CFX_TEST_V3_CORE_FACTORY_ADDRESSES = "0x7aa9221ca91f857289ff89d795e759d1a8236d0b"; // TODO: update
|
|
28
28
|
const CFX_TEST_QUOTER_ADDRESSES = "0x2b44e3f7ee27fd024a2414b6c1edc742f2f2f90c"; // TODO: 实际为UniswapV3QuoterV2
|
|
29
29
|
const CFX_TEST_MULTICALL_ADDRESS = "0x6fb332ebf7ca244a985e14a7c3308ff91a10e6d9"; // TODO: update
|
|
30
|
-
exports.CFX_TEST_POOL_INIT_CODE_HASH = "0x21f9fbd4afc79e76492f571c11dd0bcb3b6b948b580e367c86487b679b037db4";
|
|
31
30
|
const CFX_TEST_SWAP_ROUTER_ADDRESS = "0x07b8afbb0f34e6a26208be1c7acb51520676bd78"; // TODO: update
|
|
31
|
+
exports.CFX_POOL_INIT_CODE_HASH = "0x21f9fbd4afc79e76492f571c11dd0bcb3b6b948b580e367c86487b679b037db4";
|
|
32
32
|
exports.V3_CORE_FACTORY_ADDRESSES = Object.assign(Object.assign({}, constructSameAddressMap(v3_sdk_1.FACTORY_ADDRESS)), { [chains_1.ChainId.CELO]: CELO_V3_CORE_FACTORY_ADDRESSES, [chains_1.ChainId.CELO_ALFAJORES]: CELO_V3_CORE_FACTORY_ADDRESSES, [chains_1.ChainId.OPTIMISM_GOERLI]: OPTIMISM_GOERLI_V3_CORE_FACTORY_ADDRESSES, [chains_1.ChainId.ARBITRUM_GOERLI]: ARBITRUM_GOERLI_V3_CORE_FACTORY_ADDRESSES, [chains_1.ChainId.BSC]: BSC_V3_CORE_FACTORY_ADDRESSES, [chains_1.ChainId.CFX]: CFX_V3_CORE_FACTORY_ADDRESSES, [chains_1.ChainId.CFX_TEST]: CFX_TEST_V3_CORE_FACTORY_ADDRESSES });
|
|
33
33
|
exports.QUOTER_V2_ADDRESSES = Object.assign(Object.assign({}, constructSameAddressMap('0x61fFE014bA17989E743c5F6cB21bF9697530B21e')), { [chains_1.ChainId.CELO]: CELO_QUOTER_ADDRESSES, [chains_1.ChainId.CELO_ALFAJORES]: CELO_QUOTER_ADDRESSES, [chains_1.ChainId.OPTIMISM_GOERLI]: OPTIMISM_GOERLI_QUOTER_ADDRESSES, [chains_1.ChainId.ARBITRUM_GOERLI]: ARBITRUM_GOERLI_QUOTER_ADDRESSES, [chains_1.ChainId.BSC]: BSC_QUOTER_ADDRESSES, [chains_1.ChainId.CFX]: CFX_QUOTER_ADDRESSES, [chains_1.ChainId.CFX_TEST]: CFX_TEST_QUOTER_ADDRESSES });
|
|
34
34
|
exports.MIXED_ROUTE_QUOTER_V1_ADDRESSES = {
|
|
@@ -81,4 +81,4 @@ exports.WETH9 = {
|
|
|
81
81
|
[chains_1.ChainId.CFX]: new sdk_core_1.Token(chains_1.ChainId.CFX, "0x14b2d3bc65e74dae1030eafd8ac30c533c976a9b", 18, "WCFX", "Wrapped CFX"),
|
|
82
82
|
[chains_1.ChainId.CFX_TEST]: new sdk_core_1.Token(chains_1.ChainId.CFX_TEST, "0x2ed3dddae5b2f321af0806181fbfa6d049be47d8", 18, "WCFX", "Wrapped CFX"),
|
|
83
83
|
};
|
|
84
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
84
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWRkcmVzc2VzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3V0aWwvYWRkcmVzc2VzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLGdEQUEwQztBQUMxQyw0Q0FBa0Q7QUFFbEQscUNBQXlFO0FBRXpFLE1BQU0sOEJBQThCLEdBQ2xDLDRDQUE0QyxDQUFDO0FBQy9DLE1BQU0scUJBQXFCLEdBQUcsNENBQTRDLENBQUM7QUFDM0UsTUFBTSxzQkFBc0IsR0FBRyw0Q0FBNEMsQ0FBQztBQUU1RSxNQUFNLHlDQUF5QyxHQUM3Qyw0Q0FBNEMsQ0FBQztBQUMvQyxNQUFNLGdDQUFnQyxHQUNwQyw0Q0FBNEMsQ0FBQztBQUMvQyxNQUFNLGlDQUFpQyxHQUNyQyw0Q0FBNEMsQ0FBQztBQUUvQyxNQUFNLHlDQUF5QyxHQUM3Qyw0Q0FBNEMsQ0FBQztBQUMvQyxNQUFNLGdDQUFnQyxHQUNwQyw0Q0FBNEMsQ0FBQztBQUMvQyxNQUFNLGlDQUFpQyxHQUNyQyw0Q0FBNEMsQ0FBQztBQUUvQyxNQUFNLDZCQUE2QixHQUNqQyw0Q0FBNEMsQ0FBQztBQUMvQyxNQUFNLG9CQUFvQixHQUFHLDRDQUE0QyxDQUFDO0FBQzFFLE1BQU0scUJBQXFCLEdBQUcsNENBQTRDLENBQUM7QUFFOUQsUUFBQSxxQkFBcUIsR0FDaEMsNENBQTRDLENBQUM7QUFDbEMsUUFBQSx3Q0FBd0MsR0FDbkQsNENBQTRDLENBQUM7QUFDbEMsUUFBQSwwQkFBMEIsR0FDckMsNENBQTRDLENBQUM7QUFDbEMsUUFBQSx1QkFBdUIsR0FDbEMsNENBQTRDLENBQUM7QUFFL0MsTUFBTSw2QkFBNkIsR0FDakMsNENBQTRDLENBQUMsQ0FBQyxlQUFlO0FBQy9ELE1BQU0sb0JBQW9CLEdBQUcsNENBQTRDLENBQUMsQ0FBQyxvQ0FBb0M7QUFDL0csTUFBTSxxQkFBcUIsR0FBRyw0Q0FBNEMsQ0FBQyxDQUFDLGVBQWU7QUFDM0YsTUFBTSx1QkFBdUIsR0FBRyw0Q0FBNEMs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
|
|
@@ -2,7 +2,7 @@ import { computePoolAddress, Pool } from '@uniswap/v3-sdk';
|
|
|
2
2
|
import retry from 'async-retry';
|
|
3
3
|
import _ from 'lodash';
|
|
4
4
|
import { IUniswapV3PoolState__factory } from '../../types/v3/factories/IUniswapV3PoolState__factory';
|
|
5
|
-
import { V3_CORE_FACTORY_ADDRESSES,
|
|
5
|
+
import { V3_CORE_FACTORY_ADDRESSES, CFX_POOL_INIT_CODE_HASH } from '../../util/addresses';
|
|
6
6
|
import { log } from '../../util/log';
|
|
7
7
|
import { poolToString } from '../../util/routes';
|
|
8
8
|
export class V3PoolProvider {
|
|
@@ -96,7 +96,7 @@ export class V3PoolProvider {
|
|
|
96
96
|
tokenA: token0,
|
|
97
97
|
tokenB: token1,
|
|
98
98
|
fee: feeAmount,
|
|
99
|
-
initCodeHashManualOverride:
|
|
99
|
+
initCodeHashManualOverride: CFX_POOL_INIT_CODE_HASH,
|
|
100
100
|
});
|
|
101
101
|
log.info(`Computed pool address for factory ${V3_CORE_FACTORY_ADDRESSES[this.chainId]} token0: ${token0.address}, token1: ${token1.address}, fee: ${feeAmount}. pool address is ${poolAddress}`);
|
|
102
102
|
this.POOL_ADDRESS_CACHE[cacheKey] = poolAddress;
|
|
@@ -115,4 +115,4 @@ export class V3PoolProvider {
|
|
|
115
115
|
return results;
|
|
116
116
|
}
|
|
117
117
|
}
|
|
118
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
118
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicG9vbC1wcm92aWRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9wcm92aWRlcnMvdjMvcG9vbC1wcm92aWRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsa0JBQWtCLEVBQWEsSUFBSSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDdEUsT0FBTyxLQUFrQyxNQUFNLGFBQWEsQ0FBQztBQUM3RCxPQUFPLENBQUMsTUFBTSxRQUFRLENBQUM7QUFFdkIsT0FBTyxFQUFFLDRCQUE0QixFQUFFLE1BQU0sdURBQXVELENBQUM7QUFFckcsT0FBTyxFQUFFLHlCQUF5QixFQUFFLHVCQUF1QixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDMUYsT0FBTyxFQUFFLEdBQUcsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQ3JDLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQThEakQsTUFBTSxPQUFPLGNBQWM7SUFLekI7Ozs7O09BS0c7SUFDSCxZQUNZLE9BQWdCLEVBQ2hCLGtCQUFzQyxFQUN0QyxlQUFtQztRQUMzQyxPQUFPLEVBQUUsQ0FBQztRQUNWLFVBQVUsRUFBRSxFQUFFO1FBQ2QsVUFBVSxFQUFFLEdBQUc7S0FDaEI7UUFOUyxZQUFPLEdBQVAsT0FBTyxDQUFTO1FBQ2hCLHVCQUFrQixHQUFsQixrQkFBa0IsQ0FBb0I7UUFDdEMsaUJBQVksR0FBWixZQUFZLENBSXJCO1FBakJILHlFQUF5RTtRQUN6RSxrREFBa0Q7UUFDMUMsdUJBQWtCLEdBQThCLEVBQUUsQ0FBQztJQWdCdkQsQ0FBQztJQUVFLEtBQUssQ0FBQyxRQUFRLENBQ25CLFVBQXVDLEVBQ3ZDLGNBQStCO1FBRS9CLE1BQU0sY0FBYyxHQUFnQixJQUFJLEdBQUcsRUFBVSxDQUFDO1FBQ3RELE1BQU0sZ0JBQWdCLEdBQXFDLEVBQUUsQ0FBQztRQUM5RCxNQUFNLG1CQUFtQixHQUFhLEVBQUUsQ0FBQztRQUV6QyxL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
|
|
@@ -14,7 +14,7 @@ const SUBGRAPH_URL_BY_CHAIN = {
|
|
|
14
14
|
[ChainId.CELO]: "https://api.thegraph.com/subgraphs/name/jesse-sawa/uniswap-celo",
|
|
15
15
|
[ChainId.GÖRLI]: "https://api.thegraph.com/subgraphs/name/ianlapham/uniswap-v3-gorli",
|
|
16
16
|
[ChainId.BSC]: "https://api.thegraph.com/subgraphs/name/ilyamk/uniswap-v3---bnb-chain",
|
|
17
|
-
[ChainId.CFX]: "",
|
|
17
|
+
[ChainId.CFX]: "https://mainnet.congraph.io/subgraphs/name/ianlapham/uniswap-v3",
|
|
18
18
|
[ChainId.CFX_TEST]:
|
|
19
19
|
// "https://thegraph-espace.conflux123.xyz/subgraphs/name/ianlapham/uniswap-v3",
|
|
20
20
|
"https://testnet.congraph.io/subgraphs/name/ianlapham/uniswap-v3",
|
|
@@ -131,4 +131,4 @@ export class V3SubgraphProvider {
|
|
|
131
131
|
return poolsSanitized;
|
|
132
132
|
}
|
|
133
133
|
}
|
|
134
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
134
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3ViZ3JhcGgtcHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvcHJvdmlkZXJzL3YzL3N1YmdyYXBoLXByb3ZpZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxNQUFNLGFBQWEsQ0FBQztBQUNoQyxPQUFPLE9BQU8sTUFBTSxlQUFlLENBQUM7QUFDcEMsT0FBTyxFQUFFLEdBQUcsRUFBRSxhQUFhLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUNyRCxPQUFPLENBQUMsTUFBTSxRQUFRLENBQUM7QUFFdkIsT0FBTyxFQUFFLE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFrQzFDLE1BQU0sQ0FBQyxNQUFNLG1CQUFtQixHQUFHLENBQUMsQ0FBaUIsRUFBRSxFQUFFLENBQ3JELEdBQUcsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxFQUFFLElBQUksQ0FBQyxDQUFDLE1BQU0sQ0FBQyxFQUFFLElBQUksQ0FBQyxDQUFDLE9BQU8sRUFBRSxDQUFDO0FBRWpELE1BQU0sQ0FBQyxNQUFNLG1CQUFtQixHQUFHLENBQUMsQ0FBaUIsRUFBRSxFQUFFLENBQ3JELEdBQUcsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxFQUFFLElBQUksQ0FBQyxDQUFDLE1BQU0sQ0FBQyxFQUFFLEVBQUUsQ0FBQztBQUVwQyxNQUFNLHFCQUFxQixHQUFzQztJQUM3RCxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsRUFDYiw0REFBNEQ7SUFDaEUsQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLEVBQ2Isc0VBQXNFO0lBQzFFLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxFQUNkLDJFQUEyRTtJQUMvRSxDQUFDLE9BQU8sQ0FBQyxZQUFZLENBQUMsRUFDbEIsb0VBQW9FO0lBQ3hFLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxFQUNiLHNFQUFzRTtJQUMxRSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFDVixp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
|