v-swap-smart-order-router 3.13.1 → 3.13.2
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/multicall-uniswap-provider.d.ts +1 -0
- package/build/main/providers/multicall-uniswap-provider.js +44 -43
- package/build/main/tsconfig.tsbuildinfo +1 -1
- package/build/module/providers/multicall-uniswap-provider.d.ts +1 -0
- package/build/module/providers/multicall-uniswap-provider.js +44 -43
- package/build/module/tsconfig.module.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -24,6 +24,7 @@ export declare class UniswapMulticallProvider extends IMulticallProvider<Uniswap
|
|
|
24
24
|
blockNumber: BigNumber;
|
|
25
25
|
results: Result<TReturn>[];
|
|
26
26
|
}>;
|
|
27
|
+
private customMulticall;
|
|
27
28
|
callSameFunctionOnContractWithMultipleParams<TFunctionParams extends any[] | undefined, TReturn>(params: CallSameFunctionOnContractWithMultipleParams<TFunctionParams, UniswapMulticallConfig>): Promise<{
|
|
28
29
|
blockNumber: BigNumber;
|
|
29
30
|
results: Result<TReturn>[];
|
|
@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.UniswapMulticallProvider = void 0;
|
|
7
|
+
const bignumber_1 = require("@ethersproject/bignumber");
|
|
7
8
|
const lodash_1 = __importDefault(require("lodash"));
|
|
8
9
|
const stats_lite_1 = __importDefault(require("stats-lite"));
|
|
9
10
|
const UniswapInterfaceMulticall__factory_1 = require("../types/v3/factories/UniswapInterfaceMulticall__factory");
|
|
@@ -11,16 +12,16 @@ const addresses_1 = require("../util/addresses");
|
|
|
11
12
|
const log_1 = require("../util/log");
|
|
12
13
|
const multicall_provider_1 = require("./multicall-provider");
|
|
13
14
|
// @ts-nocheck
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
15
|
+
const STAKING_CONTRACT_OVERRIDES = {
|
|
16
|
+
1030: {
|
|
17
|
+
"0x50caddc77c6727bdd3c78b428c149bf110b4f595": {
|
|
18
|
+
"stateDiff": {
|
|
19
|
+
"0x0000000000000000000000000000000000000000000000000000000000000006": "0x00000000000000000000000086e01175a5569c970cfb7a44e224120ddc85901a",
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
},
|
|
23
|
+
71: {},
|
|
24
|
+
};
|
|
24
25
|
/**
|
|
25
26
|
* The UniswapMulticall contract has added functionality for limiting the amount of gas
|
|
26
27
|
* that each call within the multicall can consume. This is useful for operations where
|
|
@@ -56,9 +57,11 @@ class UniswapMulticallProvider extends multicall_provider_1.IMulticallProvider {
|
|
|
56
57
|
};
|
|
57
58
|
});
|
|
58
59
|
log_1.log.debug({ calls }, `About to multicall for ${functionName} across ${addresses.length} addresses`);
|
|
59
|
-
|
|
60
|
+
// @ts-ignore
|
|
61
|
+
const stateOverride = STAKING_CONTRACT_OVERRIDES[this.chainId] || {};
|
|
62
|
+
const { blockNumber, returnData: aggregateResults } = await this.customMulticall(calls, {
|
|
60
63
|
blockTag: blockNumberOverride,
|
|
61
|
-
});
|
|
64
|
+
}, stateOverride);
|
|
62
65
|
const results = [];
|
|
63
66
|
for (let i = 0; i < aggregateResults.length; i++) {
|
|
64
67
|
const { success, returnData } = aggregateResults[i];
|
|
@@ -80,32 +83,26 @@ class UniswapMulticallProvider extends multicall_provider_1.IMulticallProvider {
|
|
|
80
83
|
return { blockNumber, results };
|
|
81
84
|
}
|
|
82
85
|
// support state overrides
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
'multicall',
|
|
104
|
-
rawResult
|
|
105
|
-
);
|
|
106
|
-
// @ts-ignore
|
|
107
|
-
return decodedResult;
|
|
108
|
-
}*/
|
|
86
|
+
async customMulticall(calls, overrides = {}, stateOverride = {}) {
|
|
87
|
+
let blockNumberOverride = (overrides === null || overrides === void 0 ? void 0 : overrides.blockTag) ? overrides.blockTag : 'latest';
|
|
88
|
+
if (typeof blockNumberOverride === 'number') {
|
|
89
|
+
blockNumberOverride = bignumber_1.BigNumber.from(blockNumberOverride).toHexString();
|
|
90
|
+
blockNumberOverride = '0x' + blockNumberOverride.replace(/^0x0+/, '');
|
|
91
|
+
}
|
|
92
|
+
const contractInterface = this.multicallContract.interface;
|
|
93
|
+
const callData = contractInterface.encodeFunctionData('multicall', [calls]);
|
|
94
|
+
const address = this.multicallContract.address;
|
|
95
|
+
const tx = {
|
|
96
|
+
to: address,
|
|
97
|
+
data: callData,
|
|
98
|
+
// ...overrides,
|
|
99
|
+
};
|
|
100
|
+
// @ts-ignore
|
|
101
|
+
const rawResult = await this.provider.send("eth_call", [tx, blockNumberOverride, stateOverride]);
|
|
102
|
+
const decodedResult = contractInterface.decodeFunctionResult('multicall', rawResult);
|
|
103
|
+
// @ts-ignore
|
|
104
|
+
return decodedResult;
|
|
105
|
+
}
|
|
109
106
|
async callSameFunctionOnContractWithMultipleParams(params) {
|
|
110
107
|
var _a, _b;
|
|
111
108
|
const { address, contractInterface, functionName, functionParams, additionalConfig, providerConfig, } = params;
|
|
@@ -122,10 +119,12 @@ class UniswapMulticallProvider extends multicall_provider_1.IMulticallProvider {
|
|
|
122
119
|
};
|
|
123
120
|
});
|
|
124
121
|
log_1.log.debug({ calls }, `About to multicall for ${functionName} at address ${address} with ${functionParams.length} different sets of params`);
|
|
125
|
-
|
|
122
|
+
// @ts-ignore
|
|
123
|
+
const stateOverride = STAKING_CONTRACT_OVERRIDES[this.chainId] || {};
|
|
124
|
+
const { blockNumber, returnData: aggregateResults } = await this.customMulticall(calls, {
|
|
126
125
|
blockTag: blockNumberOverride,
|
|
127
126
|
// gasLimit: 15000000,
|
|
128
|
-
});
|
|
127
|
+
}, stateOverride);
|
|
129
128
|
const results = [];
|
|
130
129
|
const gasUsedForSuccess = [];
|
|
131
130
|
for (let i = 0; i < aggregateResults.length; i++) {
|
|
@@ -168,9 +167,11 @@ class UniswapMulticallProvider extends multicall_provider_1.IMulticallProvider {
|
|
|
168
167
|
};
|
|
169
168
|
});
|
|
170
169
|
log_1.log.debug({ calls }, `About to multicall for ${functionNames.length} functions at address ${address} with ${functionParams === null || functionParams === void 0 ? void 0 : functionParams.length} different sets of params`);
|
|
171
|
-
|
|
170
|
+
// @ts-ignore
|
|
171
|
+
const stateOverride = STAKING_CONTRACT_OVERRIDES[this.chainId] || {};
|
|
172
|
+
const { blockNumber, returnData: aggregateResults } = await this.customMulticall(calls, {
|
|
172
173
|
blockTag: blockNumberOverride,
|
|
173
|
-
});
|
|
174
|
+
}, stateOverride);
|
|
174
175
|
const results = [];
|
|
175
176
|
const gasUsedForSuccess = [];
|
|
176
177
|
for (let i = 0; i < aggregateResults.length; i++) {
|
|
@@ -200,4 +201,4 @@ class UniswapMulticallProvider extends multicall_provider_1.IMulticallProvider {
|
|
|
200
201
|
}
|
|
201
202
|
}
|
|
202
203
|
exports.UniswapMulticallProvider = UniswapMulticallProvider;
|
|
203
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
204
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"multicall-uniswap-provider.js","sourceRoot":"","sources":["../../../src/providers/multicall-uniswap-provider.ts"],"names":[],"mappings":"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"}
|