v-swap-smart-order-router 3.13.3 → 3.13.4
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/caching-gas-provider.d.ts +1 -0
- package/build/main/providers/caching-gas-provider.js +14 -5
- package/build/main/providers/caching-token-list-provider.js +6 -3
- package/build/main/providers/caching-token-provider.d.ts +3 -1
- package/build/main/providers/caching-token-provider.js +39 -14
- package/build/main/providers/on-chain-quote-provider.js +28 -19
- package/build/main/providers/v2/caching-subgraph-provider.d.ts +1 -0
- package/build/main/providers/v2/caching-subgraph-provider.js +14 -5
- package/build/main/providers/v3/caching-pool-provider.d.ts +1 -0
- package/build/main/providers/v3/caching-pool-provider.js +33 -11
- package/build/main/providers/v3/caching-subgraph-provider.d.ts +1 -0
- package/build/main/providers/v3/caching-subgraph-provider.js +16 -5
- package/build/main/providers/v3/static-subgraph-provider.d.ts +2 -0
- package/build/main/providers/v3/static-subgraph-provider.js +24 -12
- package/build/main/routers/alpha-router/functions/compute-all-routes.js +12 -4
- package/build/main/routers/alpha-router/functions/get-candidate-pools.js +53 -47
- package/build/main/routers/alpha-router/quoters/mixed-quoter.js +7 -5
- package/build/main/routers/alpha-router/quoters/v2-quoter.js +7 -5
- package/build/main/routers/alpha-router/quoters/v3-quoter.js +7 -5
- package/build/main/tsconfig.tsbuildinfo +1 -1
- package/build/main/util/index.d.ts +1 -0
- package/build/main/util/index.js +2 -1
- package/build/main/util/metric.d.ts +1 -1
- package/build/main/util/metric.js +5 -5
- package/build/main/util/single-flight.d.ts +15 -0
- package/build/main/util/single-flight.js +38 -0
- package/build/module/providers/caching-gas-provider.d.ts +1 -0
- package/build/module/providers/caching-gas-provider.js +14 -5
- package/build/module/providers/caching-token-list-provider.js +6 -3
- package/build/module/providers/caching-token-provider.d.ts +3 -1
- package/build/module/providers/caching-token-provider.js +39 -14
- package/build/module/providers/on-chain-quote-provider.js +28 -19
- package/build/module/providers/v2/caching-subgraph-provider.d.ts +1 -0
- package/build/module/providers/v2/caching-subgraph-provider.js +14 -5
- package/build/module/providers/v3/caching-pool-provider.d.ts +1 -0
- package/build/module/providers/v3/caching-pool-provider.js +36 -11
- package/build/module/providers/v3/caching-subgraph-provider.d.ts +1 -0
- package/build/module/providers/v3/caching-subgraph-provider.js +16 -5
- package/build/module/providers/v3/static-subgraph-provider.d.ts +2 -0
- package/build/module/providers/v3/static-subgraph-provider.js +24 -12
- package/build/module/routers/alpha-router/functions/compute-all-routes.js +12 -4
- package/build/module/routers/alpha-router/functions/get-candidate-pools.js +53 -47
- package/build/module/routers/alpha-router/quoters/mixed-quoter.js +7 -5
- package/build/module/routers/alpha-router/quoters/v2-quoter.js +7 -5
- package/build/module/routers/alpha-router/quoters/v3-quoter.js +7 -5
- package/build/module/tsconfig.module.tsbuildinfo +1 -1
- package/build/module/util/index.d.ts +1 -0
- package/build/module/util/index.js +2 -1
- package/build/module/util/metric.d.ts +1 -1
- package/build/module/util/metric.js +5 -5
- package/build/module/util/single-flight.d.ts +15 -0
- package/build/module/util/single-flight.js +34 -0
- package/package.json +1 -1
|
@@ -12,6 +12,7 @@ export declare class CachingGasStationProvider implements IGasPriceProvider {
|
|
|
12
12
|
private gasPriceProvider;
|
|
13
13
|
private cache;
|
|
14
14
|
private GAS_KEY;
|
|
15
|
+
private inFlight;
|
|
15
16
|
/**
|
|
16
17
|
* Creates an instance of CachingGasStationProvider.
|
|
17
18
|
* @param chainId The chain id to use.
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CachingGasStationProvider = void 0;
|
|
4
4
|
const log_1 = require("../util/log");
|
|
5
|
+
const single_flight_1 = require("../util/single-flight");
|
|
5
6
|
/**
|
|
6
7
|
* Provider for getting gas price, with functionality for caching the results.
|
|
7
8
|
*
|
|
@@ -20,18 +21,26 @@ class CachingGasStationProvider {
|
|
|
20
21
|
this.gasPriceProvider = gasPriceProvider;
|
|
21
22
|
this.cache = cache;
|
|
22
23
|
this.GAS_KEY = (chainId) => `gasPrice-${chainId}`;
|
|
24
|
+
this.inFlight = new single_flight_1.SingleFlight();
|
|
23
25
|
}
|
|
24
26
|
async getGasPrice() {
|
|
25
|
-
const
|
|
27
|
+
const key = this.GAS_KEY(this.chainId);
|
|
28
|
+
const cachedGasPrice = await this.cache.get(key);
|
|
26
29
|
if (cachedGasPrice) {
|
|
27
30
|
log_1.log.info({ cachedGasPrice }, `Got gas station price from local cache: ${cachedGasPrice.gasPriceWei}.`);
|
|
28
31
|
return cachedGasPrice;
|
|
29
32
|
}
|
|
30
33
|
log_1.log.info('Gas station price local cache miss.');
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
+
return this.inFlight.run(key, async () => {
|
|
35
|
+
const cachedGasPriceAfterWait = await this.cache.get(key);
|
|
36
|
+
if (cachedGasPriceAfterWait) {
|
|
37
|
+
return cachedGasPriceAfterWait;
|
|
38
|
+
}
|
|
39
|
+
const gasPrice = await this.gasPriceProvider.getGasPrice();
|
|
40
|
+
await this.cache.set(key, gasPrice);
|
|
41
|
+
return gasPrice;
|
|
42
|
+
});
|
|
34
43
|
}
|
|
35
44
|
}
|
|
36
45
|
exports.CachingGasStationProvider = CachingGasStationProvider;
|
|
37
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
46
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FjaGluZy1nYXMtcHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcHJvdmlkZXJzL2NhY2hpbmctZ2FzLXByb3ZpZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLHFDQUFrQztBQUNsQyx5REFBcUQ7QUFLckQ7Ozs7O0dBS0c7QUFDSCxNQUFhLHlCQUF5QjtJQUlwQzs7Ozs7T0FLRztJQUNILFlBQ1ksT0FBZ0IsRUFDbEIsZ0JBQW1DLEVBQ25DLEtBQXVCO1FBRnJCLFlBQU8sR0FBUCxPQUFPLENBQVM7UUFDbEIscUJBQWdCLEdBQWhCLGdCQUFnQixDQUFtQjtRQUNuQyxVQUFLLEdBQUwsS0FBSyxDQUFrQjtRQVp6QixZQUFPLEdBQUcsQ0FBQyxPQUFnQixFQUFFLEVBQUUsQ0FBQyxZQUFZLE9BQU8sRUFBRSxDQUFDO1FBQ3RELGFBQVEsR0FBRyxJQUFJLDRCQUFZLEVBQUUsQ0FBQztJQVluQyxDQUFDO0lBRUcsS0FBSyxDQUFDLFdBQVc7UUFDdEIsTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDdkMsTUFBTSxjQUFjLEdBQUcsTUFBTSxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUVqRCxJQUFJLGNBQWMsRUFBRTtZQUNsQixTQUFHLENBQUMsSUFBSSxDQUNOLEVBQUUsY0FBYyxFQUFFLEVBQ2xCLDJDQUEyQyxjQUFjLENBQUMsV0FBVyxHQUFHLENBQ3pFLENBQUM7WUFFRixPQUFPLGNBQWMsQ0FBQztTQUN2QjtRQUVELFNBQUcsQ0FBQyxJQUFJLENBQUMscUNBQXFDLENBQUMsQ0FBQztRQUNoRCxPQUFPLElBQUksQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLEdBQUcsRUFBRSxLQUFLLElBQUksRUFBRTtZQUN2QyxNQUFNLHVCQUF1QixHQUFHLE1BQU0sSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDMUQsSUFBSSx1QkFBdUIsRUFBRTtnQkFDM0IsT0FBTyx1QkFBdUIsQ0FBQzthQUNoQztZQUVELE1BQU0sUUFBUSxHQUFHLE1BQU0sSUFBSSxDQUFDLGdCQUFnQixDQUFDLFdBQVcsRUFBRSxDQUFDO1lBQzNELE1BQU0sSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFLFFBQVEsQ0FBQyxDQUFDO1lBRXBDLE9BQU8sUUFBUSxDQUFDO1FBQ2xCLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGO0FBMUNELDhEQTBDQyJ9
|
|
@@ -61,8 +61,11 @@ class CachingTokenListProvider {
|
|
|
61
61
|
async getTokens(_addresses) {
|
|
62
62
|
const addressToToken = {};
|
|
63
63
|
const symbolToToken = {};
|
|
64
|
-
|
|
65
|
-
|
|
64
|
+
const tokens = await Promise.all(_addresses.map(async (address) => ({
|
|
65
|
+
address,
|
|
66
|
+
token: await this.getTokenByAddress(address),
|
|
67
|
+
})));
|
|
68
|
+
for (const { address, token } of tokens) {
|
|
66
69
|
if (!token) {
|
|
67
70
|
continue;
|
|
68
71
|
}
|
|
@@ -120,4 +123,4 @@ class CachingTokenListProvider {
|
|
|
120
123
|
}
|
|
121
124
|
}
|
|
122
125
|
exports.CachingTokenListProvider = CachingTokenListProvider;
|
|
123
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
126
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FjaGluZy10b2tlbi1saXN0LXByb3ZpZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3Byb3ZpZGVycy9jYWNoaW5nLXRva2VuLWxpc3QtcHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsNkRBQTZEO0FBQzdELGdEQUEwQztBQUUxQyxrREFBMEI7QUFDMUIsb0RBQXVCO0FBR3ZCLHFDQUFrQztBQUNsQywyQ0FBMEQ7QUFzQjFELE1BQWEsd0JBQXdCO0lBZ0JuQzs7Ozs7OztPQU9HO0lBQ0gsWUFDRSxPQUF5QixFQUN6QixTQUFvQixFQUNaLFVBQXlCO1FBQXpCLGVBQVUsR0FBVixVQUFVLENBQWU7UUF4QjNCLGNBQVMsR0FBRyxDQUFDLFNBQW9CLEVBQUUsRUFBRSxDQUMzQyxvQkFBb0IsSUFBSSxDQUFDLE9BQU8sSUFBSSxJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksSUFDckQsSUFBSSxDQUFDLFNBQVMsQ0FBQyxTQUNqQixJQUFJLElBQUksQ0FBQyxTQUFTLENBQUMsT0FBTyxJQUFJLFNBQVMsQ0FBQyxPQUFPLENBQUMsV0FBVyxFQUFFLElBQzNELFNBQVMsQ0FBQyxRQUNaLElBQUksU0FBUyxDQUFDLE1BQU0sSUFBSSxTQUFTLENBQUMsSUFBSSxFQUFFLENBQUM7UUFxQnpDLElBQUksQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDO1FBQ3ZCLElBQUksQ0FBQyxTQUFTLEdBQUcsU0FBUyxDQUFDO1FBRTNCLElBQUksQ0FBQyxpQkFBaUIsR0FBRyxnQkFBQyxDQUFDLE1BQU0sQ0FDL0IsSUFBSSxDQUFDLFNBQVMsQ0FBQyxNQUFNLEVBQ3JCLENBQUMsTUFBNEIsRUFBRSxTQUFvQixFQUFFLEVBQUU7WUFDckQsTUFBTSxPQUFPLEdBQUcsU0FBUyxDQUFDLE9BQU8sQ0FBQyxRQUFRLEVBQUUsQ0FBQztZQUM3QyxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxFQUFFO2dCQUNwQixN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
|
|
@@ -20,6 +20,8 @@ export declare class CachingTokenProviderWithFallback implements ITokenProvider
|
|
|
20
20
|
protected primaryTokenProvider: ITokenProvider;
|
|
21
21
|
protected fallbackTokenProvider?: ITokenProvider | undefined;
|
|
22
22
|
private CACHE_KEY;
|
|
23
|
+
private inFlight;
|
|
23
24
|
constructor(chainId: ChainId, tokenCache: ICache<Token>, primaryTokenProvider: ITokenProvider, fallbackTokenProvider?: ITokenProvider | undefined);
|
|
24
|
-
getTokens(
|
|
25
|
+
getTokens(addresses: string[]): Promise<TokenAccessor>;
|
|
26
|
+
private getTokensInternal;
|
|
25
27
|
}
|
|
@@ -7,6 +7,7 @@ exports.CachingTokenProviderWithFallback = exports.CACHE_SEED_TOKENS = void 0;
|
|
|
7
7
|
const sdk_core_1 = require("@uniswap/sdk-core");
|
|
8
8
|
const lodash_1 = __importDefault(require("lodash"));
|
|
9
9
|
const util_1 = require("../util");
|
|
10
|
+
const single_flight_1 = require("../util/single-flight");
|
|
10
11
|
const token_provider_1 = require("./token-provider");
|
|
11
12
|
// These tokens will added to the Token cache on initialization.
|
|
12
13
|
exports.CACHE_SEED_TOKENS = {
|
|
@@ -127,13 +128,26 @@ class CachingTokenProviderWithFallback {
|
|
|
127
128
|
this.primaryTokenProvider = primaryTokenProvider;
|
|
128
129
|
this.fallbackTokenProvider = fallbackTokenProvider;
|
|
129
130
|
this.CACHE_KEY = (chainId, address) => `token-${chainId}-${address}`;
|
|
131
|
+
this.inFlight = new single_flight_1.SingleFlight();
|
|
130
132
|
}
|
|
131
|
-
|
|
133
|
+
getTokens(addresses) {
|
|
134
|
+
const key = (0, lodash_1.default)(addresses)
|
|
135
|
+
.map((address) => address.toLowerCase())
|
|
136
|
+
.uniq()
|
|
137
|
+
.sort()
|
|
138
|
+
.join(',');
|
|
139
|
+
return this.inFlight.run(key, () => this.getTokensInternal(addresses));
|
|
140
|
+
}
|
|
141
|
+
async getTokensInternal(_addresses) {
|
|
132
142
|
const seedTokens = exports.CACHE_SEED_TOKENS[this.chainId];
|
|
133
143
|
if (seedTokens) {
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
144
|
+
// Re-add expired seeds, but avoid rewriting keys that are still present.
|
|
145
|
+
await Promise.all(Object.values(seedTokens).map(async (token) => {
|
|
146
|
+
const key = this.CACHE_KEY(this.chainId, token.address.toLowerCase());
|
|
147
|
+
if (!(await this.tokenCache.has(key))) {
|
|
148
|
+
await this.tokenCache.set(key, token);
|
|
149
|
+
}
|
|
150
|
+
}));
|
|
137
151
|
}
|
|
138
152
|
const addressToToken = {};
|
|
139
153
|
const symbolToToken = {};
|
|
@@ -143,11 +157,18 @@ class CachingTokenProviderWithFallback {
|
|
|
143
157
|
.value();
|
|
144
158
|
const addressesToFindInPrimary = [];
|
|
145
159
|
const addressesToFindInSecondary = [];
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
160
|
+
const cachedTokens = await Promise.all(addresses.map(async (address) => {
|
|
161
|
+
return [
|
|
162
|
+
address,
|
|
163
|
+
await this.tokenCache.get(this.CACHE_KEY(this.chainId, address)),
|
|
164
|
+
];
|
|
165
|
+
}));
|
|
166
|
+
for (const [address, token] of cachedTokens) {
|
|
167
|
+
if (token) {
|
|
168
|
+
addressToToken[address] = token;
|
|
169
|
+
if (token.symbol) {
|
|
170
|
+
symbolToToken[token.symbol.toLowerCase()] = token;
|
|
171
|
+
}
|
|
151
172
|
}
|
|
152
173
|
else {
|
|
153
174
|
addressesToFindInPrimary.push(address);
|
|
@@ -163,8 +184,10 @@ class CachingTokenProviderWithFallback {
|
|
|
163
184
|
const token = primaryTokenAccessor.getTokenByAddress(address);
|
|
164
185
|
if (token) {
|
|
165
186
|
addressToToken[address.toLowerCase()] = token;
|
|
166
|
-
|
|
167
|
-
|
|
187
|
+
if (token.symbol) {
|
|
188
|
+
symbolToToken[token.symbol.toLowerCase()] = token;
|
|
189
|
+
}
|
|
190
|
+
await this.tokenCache.set(this.CACHE_KEY(this.chainId, address.toLowerCase()), token);
|
|
168
191
|
}
|
|
169
192
|
else {
|
|
170
193
|
addressesToFindInSecondary.push(address);
|
|
@@ -180,8 +203,10 @@ class CachingTokenProviderWithFallback {
|
|
|
180
203
|
const token = secondaryTokenAccessor.getTokenByAddress(address);
|
|
181
204
|
if (token) {
|
|
182
205
|
addressToToken[address.toLowerCase()] = token;
|
|
183
|
-
|
|
184
|
-
|
|
206
|
+
if (token.symbol) {
|
|
207
|
+
symbolToToken[token.symbol.toLowerCase()] = token;
|
|
208
|
+
}
|
|
209
|
+
await this.tokenCache.set(this.CACHE_KEY(this.chainId, address.toLowerCase()), token);
|
|
185
210
|
}
|
|
186
211
|
}
|
|
187
212
|
}
|
|
@@ -199,4 +224,4 @@ class CachingTokenProviderWithFallback {
|
|
|
199
224
|
}
|
|
200
225
|
}
|
|
201
226
|
exports.CachingTokenProviderWithFallback = CachingTokenProviderWithFallback;
|
|
202
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
227
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"caching-token-provider.js","sourceRoot":"","sources":["../../../src/providers/caching-token-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -242,35 +242,41 @@ class OnChainQuoteProvider {
|
|
|
242
242
|
};
|
|
243
243
|
}
|
|
244
244
|
catch (err) {
|
|
245
|
-
|
|
245
|
+
const errMessage = typeof (err === null || err === void 0 ? void 0 : err.message) === 'string'
|
|
246
|
+
? err.message
|
|
247
|
+
: String(err !== null && err !== void 0 ? err : 'Unknown error');
|
|
248
|
+
log_1.log.error({
|
|
249
|
+
functionName,
|
|
250
|
+
error: errMessage.slice(0, 500),
|
|
251
|
+
}, `Failed to call callSameFunctionOnContractWithMultipleParams`);
|
|
246
252
|
// Error from providers have huge messages that include all the calldata and fill the logs.
|
|
247
253
|
// Catch them and rethrow with shorter message.
|
|
248
|
-
if (
|
|
254
|
+
if (errMessage.includes('header not found')) {
|
|
249
255
|
return {
|
|
250
256
|
status: 'failed',
|
|
251
257
|
inputs,
|
|
252
|
-
reason: new ProviderBlockHeaderError(
|
|
258
|
+
reason: new ProviderBlockHeaderError(errMessage.slice(0, 500)),
|
|
253
259
|
};
|
|
254
260
|
}
|
|
255
|
-
if (
|
|
261
|
+
if (/timeout/i.test(errMessage)) {
|
|
256
262
|
return {
|
|
257
263
|
status: 'failed',
|
|
258
264
|
inputs,
|
|
259
|
-
reason: new ProviderTimeoutError(`Req ${idx}/${quoteStates.length}. Request had ${inputs.length} inputs. ${
|
|
265
|
+
reason: new ProviderTimeoutError(`Req ${idx}/${quoteStates.length}. Request had ${inputs.length} inputs. ${errMessage.slice(0, 500)}`),
|
|
260
266
|
};
|
|
261
267
|
}
|
|
262
|
-
//
|
|
263
|
-
if (
|
|
268
|
+
// Some providers return "Out of gas", others "out of gas".
|
|
269
|
+
if (/out of gas/i.test(errMessage)) {
|
|
264
270
|
return {
|
|
265
271
|
status: 'failed',
|
|
266
272
|
inputs,
|
|
267
|
-
reason: new ProviderGasError(
|
|
273
|
+
reason: new ProviderGasError(errMessage.slice(0, 500)),
|
|
268
274
|
};
|
|
269
275
|
}
|
|
270
276
|
return {
|
|
271
277
|
status: 'failed',
|
|
272
278
|
inputs,
|
|
273
|
-
reason: new Error(`Unknown error from provider: ${
|
|
279
|
+
reason: new Error(`Unknown error from provider: ${errMessage.slice(0, 500)}`),
|
|
274
280
|
};
|
|
275
281
|
}
|
|
276
282
|
}));
|
|
@@ -422,6 +428,7 @@ class OnChainQuoteProvider {
|
|
|
422
428
|
processQuoteResults(quoteResults, routes, amounts) {
|
|
423
429
|
const routesQuotes = [];
|
|
424
430
|
const quotesResultsByRoute = lodash_1.default.chunk(quoteResults, amounts.length);
|
|
431
|
+
const logFailedQuotes = log_1.log.debug();
|
|
425
432
|
const debugFailedQuotes = [];
|
|
426
433
|
for (let i = 0; i < quotesResultsByRoute.length; i++) {
|
|
427
434
|
const route = routes[i];
|
|
@@ -429,14 +436,16 @@ class OnChainQuoteProvider {
|
|
|
429
436
|
const quotes = lodash_1.default.map(quoteResults, (quoteResult, index) => {
|
|
430
437
|
const amount = amounts[index];
|
|
431
438
|
if (!quoteResult.success) {
|
|
432
|
-
|
|
433
|
-
|
|
434
|
-
|
|
435
|
-
|
|
436
|
-
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
439
|
+
if (logFailedQuotes) {
|
|
440
|
+
const percent = (100 / amounts.length) * (index + 1);
|
|
441
|
+
const amountStr = amount.toFixed(Math.min(amount.currency.decimals, 2));
|
|
442
|
+
const routeStr = (0, routes_1.routeToString)(route);
|
|
443
|
+
debugFailedQuotes.push({
|
|
444
|
+
route: routeStr,
|
|
445
|
+
percent,
|
|
446
|
+
amount: amountStr,
|
|
447
|
+
});
|
|
448
|
+
}
|
|
440
449
|
return {
|
|
441
450
|
amount,
|
|
442
451
|
quote: null,
|
|
@@ -463,7 +472,7 @@ class OnChainQuoteProvider {
|
|
|
463
472
|
const failedFlat = lodash_1.default.mapValues(failedQuotesByRoute, (f) => (0, lodash_1.default)(f)
|
|
464
473
|
.map((f) => `${f.percent}%[${f.amount}]`)
|
|
465
474
|
.join(','));
|
|
466
|
-
log_1.log.
|
|
475
|
+
log_1.log.debug({
|
|
467
476
|
failedQuotes: lodash_1.default.map(failedFlat, (amounts, routeStr) => `${routeStr} : ${amounts}`),
|
|
468
477
|
}, `Failed on chain quotes for routes Part ${idx}/${Math.ceil(debugFailedQuotes.length / debugChunk)}`);
|
|
469
478
|
});
|
|
@@ -522,4 +531,4 @@ class OnChainQuoteProvider {
|
|
|
522
531
|
}
|
|
523
532
|
}
|
|
524
533
|
exports.OnChainQuoteProvider = OnChainQuoteProvider;
|
|
525
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"on-chain-quote-provider.js","sourceRoot":"","sources":["../../../src/providers/on-chain-quote-provider.ts"],"names":[],"mappings":"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"}
|
|
534
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"on-chain-quote-provider.js","sourceRoot":"","sources":["../../../src/providers/on-chain-quote-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,7 @@ export declare class CachingV2SubgraphProvider implements IV2SubgraphProvider {
|
|
|
12
12
|
protected subgraphProvider: IV2SubgraphProvider;
|
|
13
13
|
private cache;
|
|
14
14
|
private SUBGRAPH_KEY;
|
|
15
|
+
private inFlight;
|
|
15
16
|
/**
|
|
16
17
|
* Creates an instance of CachingV2SubgraphProvider.
|
|
17
18
|
* @param chainId The chain id to use.
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CachingV2SubgraphProvider = void 0;
|
|
4
|
+
const single_flight_1 = require("../../util/single-flight");
|
|
4
5
|
/**
|
|
5
6
|
* Provider for getting V2 pools, with functionality for caching the results.
|
|
6
7
|
*
|
|
@@ -19,16 +20,24 @@ class CachingV2SubgraphProvider {
|
|
|
19
20
|
this.subgraphProvider = subgraphProvider;
|
|
20
21
|
this.cache = cache;
|
|
21
22
|
this.SUBGRAPH_KEY = (chainId) => `subgraph-pools-v2-${chainId}`;
|
|
23
|
+
this.inFlight = new single_flight_1.SingleFlight();
|
|
22
24
|
}
|
|
23
25
|
async getPools() {
|
|
24
|
-
const
|
|
26
|
+
const key = this.SUBGRAPH_KEY(this.chainId);
|
|
27
|
+
const cachedPools = await this.cache.get(key);
|
|
25
28
|
if (cachedPools) {
|
|
26
29
|
return cachedPools;
|
|
27
30
|
}
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
+
return this.inFlight.run(key, async () => {
|
|
32
|
+
const cachedPoolsAfterWait = await this.cache.get(key);
|
|
33
|
+
if (cachedPoolsAfterWait) {
|
|
34
|
+
return cachedPoolsAfterWait;
|
|
35
|
+
}
|
|
36
|
+
const pools = await this.subgraphProvider.getPools();
|
|
37
|
+
await this.cache.set(key, pools);
|
|
38
|
+
return pools;
|
|
39
|
+
});
|
|
31
40
|
}
|
|
32
41
|
}
|
|
33
42
|
exports.CachingV2SubgraphProvider = CachingV2SubgraphProvider;
|
|
34
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
43
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FjaGluZy1zdWJncmFwaC1wcm92aWRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9wcm92aWRlcnMvdjIvY2FjaGluZy1zdWJncmFwaC1wcm92aWRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSw0REFBd0Q7QUFLeEQ7Ozs7O0dBS0c7QUFDSCxNQUFhLHlCQUF5QjtJQUlwQzs7Ozs7T0FLRztJQUNILFlBQ1UsT0FBZ0IsRUFDZCxnQkFBcUMsRUFDdkMsS0FBK0I7UUFGL0IsWUFBTyxHQUFQLE9BQU8sQ0FBUztRQUNkLHFCQUFnQixHQUFoQixnQkFBZ0IsQ0FBcUI7UUFDdkMsVUFBSyxHQUFMLEtBQUssQ0FBMEI7UUFaakMsaUJBQVksR0FBRyxDQUFDLE9BQWdCLEVBQUUsRUFBRSxDQUFDLHFCQUFxQixPQUFPLEVBQUUsQ0FBQztRQUNwRSxhQUFRLEdBQUcsSUFBSSw0QkFBWSxFQUFFLENBQUM7SUFZbkMsQ0FBQztJQUVHLEtBQUssQ0FBQyxRQUFRO1FBQ25CLE1BQU0sR0FBRyxHQUFHLElBQUksQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQzVDLE1BQU0sV0FBVyxHQUFHLE1BQU0sSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUM7UUFFOUMsSUFBSSxXQUFXLEVBQUU7WUFDZixPQUFPLFdBQVcsQ0FBQztTQUNwQjtRQUVELE9BQU8sSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFLEtBQUssSUFBSSxFQUFFO1lBQ3ZDLE1BQU0sb0JBQW9CLEdBQUcsTUFBTSxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUN2RCxJQUFJLG9CQUFvQixFQUFFO2dCQUN4QixPQUFPLG9CQUFvQixDQUFDO2FBQzdCO1lBRUQsTUFBTSxLQUFLLEdBQUcsTUFBTSxJQUFJLENBQUMsZ0JBQWdCLENBQUMsUUFBUSxFQUFFLENBQUM7WUFFckQsTUFBTSxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsS0FBSyxDQUFDLENBQUM7WUFFakMsT0FBTyxLQUFLLENBQUM7UUFDZixDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7Q0FDRjtBQXJDRCw4REFxQ0MifQ==
|
|
@@ -17,6 +17,7 @@ export declare class CachingV3PoolProvider implements IV3PoolProvider {
|
|
|
17
17
|
protected poolProvider: IV3PoolProvider;
|
|
18
18
|
private cache;
|
|
19
19
|
private POOL_KEY;
|
|
20
|
+
private inFlight;
|
|
20
21
|
/**
|
|
21
22
|
* Creates an instance of CachingV3PoolProvider.
|
|
22
23
|
* @param chainId The chain id to use.
|
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.CachingV3PoolProvider = void 0;
|
|
7
7
|
const lodash_1 = __importDefault(require("lodash"));
|
|
8
8
|
const log_1 = require("../../util/log");
|
|
9
|
+
const single_flight_1 = require("../../util/single-flight");
|
|
9
10
|
/**
|
|
10
11
|
* Provider for getting V3 pools, with functionality for caching the results.
|
|
11
12
|
* Does not cache by block because we compute quotes using the on-chain quoter
|
|
@@ -26,19 +27,24 @@ class CachingV3PoolProvider {
|
|
|
26
27
|
this.poolProvider = poolProvider;
|
|
27
28
|
this.cache = cache;
|
|
28
29
|
this.POOL_KEY = (chainId, address) => `pool-${chainId}-${address}`;
|
|
30
|
+
this.inFlight = new single_flight_1.SingleFlight();
|
|
29
31
|
}
|
|
30
32
|
async getPools(tokenPairs, providerConfig) {
|
|
31
33
|
const poolAddressSet = new Set();
|
|
32
|
-
const
|
|
33
|
-
const poolsToGetAddresses = [];
|
|
34
|
-
const poolAddressToPool = {};
|
|
34
|
+
const uniquePools = [];
|
|
35
35
|
for (const [tokenA, tokenB, feeAmount] of tokenPairs) {
|
|
36
36
|
const { poolAddress, token0, token1 } = this.getPoolAddress(tokenA, tokenB, feeAmount);
|
|
37
37
|
if (poolAddressSet.has(poolAddress)) {
|
|
38
38
|
continue;
|
|
39
39
|
}
|
|
40
40
|
poolAddressSet.add(poolAddress);
|
|
41
|
-
|
|
41
|
+
uniquePools.push({ poolAddress, token0, token1, feeAmount });
|
|
42
|
+
}
|
|
43
|
+
const poolsWithCacheResult = await Promise.all(uniquePools.map(async (pool) => (Object.assign(Object.assign({}, pool), { cachedPool: await this.cache.get(this.POOL_KEY(this.chainId, pool.poolAddress)) }))));
|
|
44
|
+
const poolsToGetTokenPairs = [];
|
|
45
|
+
const poolsToGetAddresses = [];
|
|
46
|
+
const poolAddressToPool = {};
|
|
47
|
+
for (const { poolAddress, token0, token1, feeAmount, cachedPool, } of poolsWithCacheResult) {
|
|
42
48
|
if (cachedPool) {
|
|
43
49
|
poolAddressToPool[poolAddress] = cachedPool;
|
|
44
50
|
continue;
|
|
@@ -46,17 +52,33 @@ class CachingV3PoolProvider {
|
|
|
46
52
|
poolsToGetTokenPairs.push([token0, token1, feeAmount]);
|
|
47
53
|
poolsToGetAddresses.push(poolAddress);
|
|
48
54
|
}
|
|
49
|
-
log_1.log.info({
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
55
|
+
if (log_1.log.info()) {
|
|
56
|
+
log_1.log.info({
|
|
57
|
+
poolsFound: lodash_1.default.map(Object.values(poolAddressToPool), (p) => `${p.token0.symbol} ${p.token1.symbol} ${p.fee}`),
|
|
58
|
+
poolsToGetTokenPairs: lodash_1.default.map(poolsToGetTokenPairs, (t) => `${t[0].symbol} ${t[1].symbol} ${t[2]}`),
|
|
59
|
+
}, `Found ${Object.keys(poolAddressToPool).length} V3 pools already in local cache. About to get liquidity and slot0s for ${poolsToGetTokenPairs.length} pools.`);
|
|
60
|
+
}
|
|
53
61
|
if (poolsToGetAddresses.length > 0) {
|
|
54
|
-
|
|
62
|
+
// Coalesce identical misses. Without this, a pool-cache TTL expiry makes
|
|
63
|
+
// every concurrent quote request fetch the same pool state on-chain.
|
|
64
|
+
const blockNumber = await (providerConfig === null || providerConfig === void 0 ? void 0 : providerConfig.blockNumber);
|
|
65
|
+
const fetchKey = `${this.chainId}:${blockNumber !== null && blockNumber !== void 0 ? blockNumber : 'latest'}:${poolsToGetAddresses.slice().sort().join(',')}`;
|
|
66
|
+
// Cache writes happen inside the coalesced work so the entry is populated
|
|
67
|
+
// before the single-flight key is released.
|
|
68
|
+
const poolAccessor = await this.inFlight.run(fetchKey, async () => {
|
|
69
|
+
const accessor = await this.poolProvider.getPools(poolsToGetTokenPairs, providerConfig);
|
|
70
|
+
await Promise.all(poolsToGetAddresses.map(async (address) => {
|
|
71
|
+
const pool = accessor.getPoolByAddress(address);
|
|
72
|
+
if (pool) {
|
|
73
|
+
await this.cache.set(this.POOL_KEY(this.chainId, address), pool);
|
|
74
|
+
}
|
|
75
|
+
}));
|
|
76
|
+
return accessor;
|
|
77
|
+
});
|
|
55
78
|
for (const address of poolsToGetAddresses) {
|
|
56
79
|
const pool = poolAccessor.getPoolByAddress(address);
|
|
57
80
|
if (pool) {
|
|
58
81
|
poolAddressToPool[address] = pool;
|
|
59
|
-
await this.cache.set(this.POOL_KEY(this.chainId, address), pool);
|
|
60
82
|
}
|
|
61
83
|
}
|
|
62
84
|
}
|
|
@@ -74,4 +96,4 @@ class CachingV3PoolProvider {
|
|
|
74
96
|
}
|
|
75
97
|
}
|
|
76
98
|
exports.CachingV3PoolProvider = CachingV3PoolProvider;
|
|
77
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
99
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FjaGluZy1wb29sLXByb3ZpZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3Byb3ZpZGVycy92My9jYWNoaW5nLXBvb2wtcHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBRUEsb0RBQXVCO0FBR3ZCLHdDQUFxQztBQUNyQyw0REFBd0Q7QUFNeEQ7Ozs7Ozs7R0FPRztBQUNILE1BQWEscUJBQXFCO0lBS2hDOzs7OztPQUtHO0lBQ0gsWUFDWSxPQUFnQixFQUNoQixZQUE2QixFQUMvQixLQUFtQjtRQUZqQixZQUFPLEdBQVAsT0FBTyxDQUFTO1FBQ2hCLGlCQUFZLEdBQVosWUFBWSxDQUFpQjtRQUMvQixVQUFLLEdBQUwsS0FBSyxDQUFjO1FBYnJCLGFBQVEsR0FBRyxDQUFDLE9BQWdCLEVBQUUsT0FBZSxFQUFFLEVBQUUsQ0FDdkQsUUFBUSxPQUFPLElBQUksT0FBTyxFQUFFLENBQUM7UUFDdkIsYUFBUSxHQUFHLElBQUksNEJBQVksRUFBRSxDQUFDO0lBWW5DLENBQUM7SUFFRyxLQUFLLENBQUMsUUFBUSxDQUNuQixVQUF1QyxFQUN2QyxjQUErQjtRQUUvQixNQUFNLGNBQWMsR0FBZ0IsSUFBSSxHQUFHLEVBQVUsQ0FBQztRQUN0RCxNQUFNLFdBQVcsR0FLWixFQUFFLENBQUM7UUFFUixLQUFLLE1BQU0sQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLFNBQVMsQ0FBQyxJQUFJLFVBQVUsRUFBRTtZQUNwRCxNQUFNLEVBQUUsV0FBVyxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsR0FBRyxJQUFJLENBQUMsY0FBYyxDQUN6RCxNQUFNLEVBQ04sTUFBTSxFQUNOLFNBQVMsQ0FDVixDQUFDO1lBRUYsSUFBSSxjQUFjLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxFQUFFO2dCQUNuQyxTQUFTO2FBQ1Y7WUFFRCxjQUFjLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxDQUFDO1lBQ2hDLFdBQVcs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
|
|
@@ -12,6 +12,7 @@ export declare class CachingV3SubgraphProvider implements IV3SubgraphProvider {
|
|
|
12
12
|
protected subgraphProvider: IV3SubgraphProvider;
|
|
13
13
|
private cache;
|
|
14
14
|
private SUBGRAPH_KEY;
|
|
15
|
+
private inFlight;
|
|
15
16
|
/**
|
|
16
17
|
* Creates an instance of CachingV3SubgraphProvider.
|
|
17
18
|
* @param chainId The chain id to use.
|