v-swap-smart-order-router 3.13.0 → 3.13.1
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 +0 -1
- package/build/main/providers/multicall-uniswap-provider.js +44 -40
- package/build/main/tsconfig.tsbuildinfo +1 -1
- package/build/module/providers/multicall-uniswap-provider.d.ts +0 -1
- package/build/module/providers/multicall-uniswap-provider.js +44 -44
- package/build/module/tsconfig.module.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -24,7 +24,6 @@ export declare class UniswapMulticallProvider extends IMulticallProvider<Uniswap
|
|
|
24
24
|
blockNumber: BigNumber;
|
|
25
25
|
results: Result<TReturn>[];
|
|
26
26
|
}>;
|
|
27
|
-
private customMulticall;
|
|
28
27
|
callSameFunctionOnContractWithMultipleParams<TFunctionParams extends any[] | undefined, TReturn>(params: CallSameFunctionOnContractWithMultipleParams<TFunctionParams, UniswapMulticallConfig>): Promise<{
|
|
29
28
|
blockNumber: BigNumber;
|
|
30
29
|
results: Result<TReturn>[];
|
|
@@ -4,23 +4,23 @@ 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");
|
|
8
7
|
const lodash_1 = __importDefault(require("lodash"));
|
|
9
8
|
const stats_lite_1 = __importDefault(require("stats-lite"));
|
|
10
9
|
const UniswapInterfaceMulticall__factory_1 = require("../types/v3/factories/UniswapInterfaceMulticall__factory");
|
|
11
10
|
const addresses_1 = require("../util/addresses");
|
|
12
11
|
const log_1 = require("../util/log");
|
|
13
12
|
const multicall_provider_1 = require("./multicall-provider");
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
}
|
|
13
|
+
// @ts-nocheck
|
|
14
|
+
// const STAKING_CONTRACT_OVERRIDES = {
|
|
15
|
+
// 1030: {
|
|
16
|
+
// "0x50caddc77c6727bdd3c78b428c149bf110b4f595": {
|
|
17
|
+
// "stateDiff": {
|
|
18
|
+
// "0x0000000000000000000000000000000000000000000000000000000000000006": "0x00000000000000000000000086e01175a5569c970cfb7a44e224120ddc85901a",
|
|
19
|
+
// }
|
|
20
|
+
// }
|
|
21
|
+
// },
|
|
22
|
+
// 71: {},
|
|
23
|
+
// };
|
|
24
24
|
/**
|
|
25
25
|
* The UniswapMulticall contract has added functionality for limiting the amount of gas
|
|
26
26
|
* that each call within the multicall can consume. This is useful for operations where
|
|
@@ -56,11 +56,9 @@ class UniswapMulticallProvider extends multicall_provider_1.IMulticallProvider {
|
|
|
56
56
|
};
|
|
57
57
|
});
|
|
58
58
|
log_1.log.debug({ calls }, `About to multicall for ${functionName} across ${addresses.length} addresses`);
|
|
59
|
-
|
|
60
|
-
const stateOverride = STAKING_CONTRACT_OVERRIDES[this.chainId] || {};
|
|
61
|
-
const { blockNumber, returnData: aggregateResults } = await this.customMulticall(calls, {
|
|
59
|
+
const { blockNumber, returnData: aggregateResults } = await this.multicallContract.callStatic.multicall(calls, {
|
|
62
60
|
blockTag: blockNumberOverride,
|
|
63
|
-
}
|
|
61
|
+
});
|
|
64
62
|
const results = [];
|
|
65
63
|
for (let i = 0; i < aggregateResults.length; i++) {
|
|
66
64
|
const { success, returnData } = aggregateResults[i];
|
|
@@ -82,22 +80,32 @@ class UniswapMulticallProvider extends multicall_provider_1.IMulticallProvider {
|
|
|
82
80
|
return { blockNumber, results };
|
|
83
81
|
}
|
|
84
82
|
// support state overrides
|
|
85
|
-
async customMulticall(calls, overrides = {}, stateOverride = {}) {
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
83
|
+
/*private async customMulticall(calls: any, overrides: any = {}, stateOverride: any = {}): Promise<{blockNumber: BigNumber; returnData: any[]}> {
|
|
84
|
+
let blockNumberOverride = overrides?.blockTag ? overrides.blockTag : 'latest';
|
|
85
|
+
if (typeof blockNumberOverride === 'number') {
|
|
86
|
+
blockNumberOverride = BigNumber.from(blockNumberOverride).toHexString();
|
|
87
|
+
blockNumberOverride = '0x' + blockNumberOverride.replace(/^0x0+/, '');
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
const contractInterface = this.multicallContract.interface;
|
|
91
|
+
const callData = contractInterface.encodeFunctionData('multicall', [calls]);
|
|
92
|
+
const address = this.multicallContract.address;
|
|
93
|
+
const tx = {
|
|
94
|
+
to: address,
|
|
95
|
+
data: callData,
|
|
96
|
+
...overrides,
|
|
97
|
+
};
|
|
98
|
+
|
|
99
|
+
// @ts-ignore
|
|
100
|
+
const rawResult = await this.provider.send("eth_call", [tx, blockNumberOverride, stateOverride]);
|
|
101
|
+
|
|
102
|
+
const decodedResult = contractInterface.decodeFunctionResult(
|
|
103
|
+
'multicall',
|
|
104
|
+
rawResult
|
|
105
|
+
);
|
|
106
|
+
// @ts-ignore
|
|
107
|
+
return decodedResult;
|
|
108
|
+
}*/
|
|
101
109
|
async callSameFunctionOnContractWithMultipleParams(params) {
|
|
102
110
|
var _a, _b;
|
|
103
111
|
const { address, contractInterface, functionName, functionParams, additionalConfig, providerConfig, } = params;
|
|
@@ -114,12 +122,10 @@ class UniswapMulticallProvider extends multicall_provider_1.IMulticallProvider {
|
|
|
114
122
|
};
|
|
115
123
|
});
|
|
116
124
|
log_1.log.debug({ calls }, `About to multicall for ${functionName} at address ${address} with ${functionParams.length} different sets of params`);
|
|
117
|
-
|
|
118
|
-
const stateOverride = STAKING_CONTRACT_OVERRIDES[this.chainId] || {};
|
|
119
|
-
const { blockNumber, returnData: aggregateResults } = await this.customMulticall(calls, {
|
|
125
|
+
const { blockNumber, returnData: aggregateResults } = await this.multicallContract.callStatic.multicall(calls, {
|
|
120
126
|
blockTag: blockNumberOverride,
|
|
121
127
|
// gasLimit: 15000000,
|
|
122
|
-
}
|
|
128
|
+
});
|
|
123
129
|
const results = [];
|
|
124
130
|
const gasUsedForSuccess = [];
|
|
125
131
|
for (let i = 0; i < aggregateResults.length; i++) {
|
|
@@ -162,11 +168,9 @@ class UniswapMulticallProvider extends multicall_provider_1.IMulticallProvider {
|
|
|
162
168
|
};
|
|
163
169
|
});
|
|
164
170
|
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`);
|
|
165
|
-
|
|
166
|
-
const stateOverride = STAKING_CONTRACT_OVERRIDES[this.chainId] || {};
|
|
167
|
-
const { blockNumber, returnData: aggregateResults } = await this.customMulticall(calls, {
|
|
171
|
+
const { blockNumber, returnData: aggregateResults } = await this.multicallContract.callStatic.multicall(calls, {
|
|
168
172
|
blockTag: blockNumberOverride,
|
|
169
|
-
}
|
|
173
|
+
});
|
|
170
174
|
const results = [];
|
|
171
175
|
const gasUsedForSuccess = [];
|
|
172
176
|
for (let i = 0; i < aggregateResults.length; i++) {
|
|
@@ -196,4 +200,4 @@ class UniswapMulticallProvider extends multicall_provider_1.IMulticallProvider {
|
|
|
196
200
|
}
|
|
197
201
|
}
|
|
198
202
|
exports.UniswapMulticallProvider = UniswapMulticallProvider;
|
|
199
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
203
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"multicall-uniswap-provider.js","sourceRoot":"","sources":["../../../src/providers/multicall-uniswap-provider.ts"],"names":[],"mappings":";;;;;;AAEA,oDAAuB;AACvB,4DAA+B;AAG/B,iHAA8G;AAE9G,iDAAgE;AAChE,qCAAkC;AAElC,6DAM8B;AAM9B,cAAc;AACd,uCAAuC;AACvC,YAAY;AACZ,sDAAsD;AACtD,uBAAuB;AACvB,sJAAsJ;AACtJ,UAAU;AACV,QAAQ;AACR,OAAO;AACP,YAAY;AACZ,KAAK;AAEL;;;;;;;;GAQG;AACH,MAAa,wBAAyB,SAAQ,uCAA0C;IAGtF,YACY,OAAgB,EAChB,QAAsB,EACtB,kBAAkB,OAAS;QAErC,KAAK,EAAE,CAAC;QAJE,YAAO,GAAP,OAAO,CAAS;QAChB,aAAQ,GAAR,QAAQ,CAAc;QACtB,oBAAe,GAAf,eAAe,CAAY;QAGrC,MAAM,gBAAgB,GAAG,uCAA2B,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAEnE,IAAI,CAAC,gBAAgB,EAAE;YACrB,MAAM,IAAI,KAAK,CACb,0DAA0D,OAAO,EAAE,CACpE,CAAC;SACH;QAED,IAAI,CAAC,iBAAiB,GAAG,uEAAkC,CAAC,OAAO,CACjE,gBAAgB,EAChB,IAAI,CAAC,QAAQ,CACd,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,mCAAmC,CAI9C,MAAkE;;QAKlE,MAAM,EACJ,SAAS,EACT,iBAAiB,EACjB,YAAY,EACZ,cAAc,EACd,cAAc,GACf,GAAG,MAAM,CAAC;QAEX,MAAM,mBAAmB,GAAG,MAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,WAAW,mCAAI,SAAS,CAAC;QAErE,MAAM,QAAQ,GAAG,iBAAiB,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;QAC7D,MAAM,QAAQ,GAAG,iBAAiB,CAAC,kBAAkB,CACnD,QAAQ,EACR,cAAc,CACf,CAAC;QAEF,MAAM,KAAK,GAAG,gBAAC,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE;YACzC,OAAO;gBACL,MAAM,EAAE,OAAO;gBACf,QAAQ;gBACR,QAAQ,EAAE,IAAI,CAAC,eAAe;aAC/B,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,SAAG,CAAC,KAAK,CACP,EAAE,KAAK,EAAE,EACT,0BAA0B,YAAY,WAAW,SAAS,CAAC,MAAM,YAAY,CAC9E,CAAC;QAEF,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,gBAAgB,EAAE,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,EAAE;YAC7G,QAAQ,EAAE,mBAAmB;SAC9B,CAAC,CAAC;QAEH,MAAM,OAAO,GAAsB,EAAE,CAAC;QAEtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,gBAAgB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAChD,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,gBAAgB,CAAC,CAAC,CAAE,CAAC;YAErD,4DAA4D;YAC5D,IAAI,CAAC,OAAO,IAAI,UAAU,CAAC,MAAM,IAAI,CAAC,EAAE;gBACtC,SAAG,CAAC,KAAK,CACP,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,EAC/B,0BAA0B,YAAY,eAAe,SAAS,CAAC,CAAC,CAAC,EAAE,CACpE,CAAC;gBACF,OAAO,CAAC,IAAI,CAAC;oBACX,OAAO,EAAE,KAAK;oBACd,UAAU;iBACX,CAAC,CAAC;gBACH,SAAS;aACV;YAED,OAAO,CAAC,IAAI,CAAC;gBACX,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE,iBAAiB,CAAC,oBAAoB,CAC5C,QAAQ,EACR,UAAU,CACW;aACxB,CAAC,CAAC;SACJ;QAED,SAAG,CAAC,KAAK,CACP,EAAE,OAAO,EAAE,EACX,4BAA4B,YAAY,WAAW,SAAS,CAAC,MAAM,0BAA0B,WAAW,EAAE,CAC3G,CAAC;QAEF,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC;IAClC,CAAC;IAED,0BAA0B;IAC1B;;;;;;;;;;;;;;;;;;;;;;;;;OAyBG;IAEI,KAAK,CAAC,4CAA4C,CAIvD,MAGC;;QAMD,MAAM,EACJ,OAAO,EACP,iBAAiB,EACjB,YAAY,EACZ,cAAc,EACd,gBAAgB,EAChB,cAAc,GACf,GAAG,MAAM,CAAC;QACX,MAAM,QAAQ,GAAG,iBAAiB,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;QAE7D,MAAM,eAAe,GACnB,MAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,uBAAuB,mCAAI,IAAI,CAAC,eAAe,CAAC;QACpE,MAAM,mBAAmB,GAAG,MAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,WAAW,mCAAI,SAAS,CAAC;QACzE,mFAAmF;QAE/E,MAAM,KAAK,GAAG,gBAAC,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC,aAAa,EAAE,EAAE;YACpD,MAAM,QAAQ,GAAG,iBAAiB,CAAC,kBAAkB,CACnD,QAAQ,EACR,aAAa,CACd,CAAC;YAEF,OAAO;gBACL,MAAM,EAAE,OAAO;gBACf,QAAQ;gBACR,QAAQ,EAAE,eAAe;aAC1B,CAAC;QACJ,CAAC,CAAC,CAAC;QAGH,SAAG,CAAC,KAAK,CACP,EAAE,KAAK,EAAE,EACT,0BAA0B,YAAY,eAAe,OAAO,SAAS,cAAc,CAAC,MAAM,2BAA2B,CACtH,CAAC;QAEF,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,gBAAgB,EAAE,GACnD,MAAM,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,EAAE;YACrD,QAAQ,EAAE,mBAAmB;YACrC,6BAA6B;SACxB,CAAC,CAAC;QACH,MAAM,OAAO,GAAsB,EAAE,CAAC;QAEtC,MAAM,iBAAiB,GAAa,EAAE,CAAC;QACvC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,gBAAgB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAChD,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,gBAAgB,CAAC,CAAC,CAAE,CAAC;YAE9D,4DAA4D;YAC5D,IAAI,CAAC,OAAO,IAAI,UAAU,CAAC,MAAM,IAAI,CAAC,EAAE;gBACtC,SAAG,CAAC,KAAK,CACP,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,EAC/B,0BAA0B,YAAY,gBAAgB,cAAc,CAAC,CAAC,CAAC,EAAE,CAC1E,CAAC;gBACF,OAAO,CAAC,IAAI,CAAC;oBACX,OAAO,EAAE,KAAK;oBACd,UAAU;iBACX,CAAC,CAAC;gBACH,SAAS;aACV;YAED,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;YAE3C,OAAO,CAAC,IAAI,CAAC;gBACX,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE,iBAAiB,CAAC,oBAAoB,CAC5C,QAAQ,EACR,UAAU,CACW;aACxB,CAAC,CAAC;SACJ;QAED,SAAG,CAAC,KAAK,CACP,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,EAClC,6BAA6B,YAAY,eAAe,OAAO,SAAS,cAAc,CAAC,MAAM,kDAAkD,WAAW,EAAE,CAC7J,CAAC;QACF,OAAO;YACL,WAAW;YACX,OAAO;YACP,2BAA2B,EAAE,oBAAK,CAAC,UAAU,CAAC,iBAAiB,EAAE,EAAE,CAAC;SACrE,CAAC;IAEJ,CAAC;IAEM,KAAK,CAAC,mCAAmC,CAI9C,MAGC;;QAMD,MAAM,EACJ,OAAO,EACP,iBAAiB,EACjB,aAAa,EACb,cAAc,EACd,gBAAgB,EAChB,cAAc,GACf,GAAG,MAAM,CAAC;QAEX,MAAM,eAAe,GACnB,MAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,uBAAuB,mCAAI,IAAI,CAAC,eAAe,CAAC;QACpE,MAAM,mBAAmB,GAAG,MAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,WAAW,mCAAI,SAAS,CAAC;QAErE,MAAM,KAAK,GAAG,gBAAC,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,YAAY,EAAE,CAAC,EAAE,EAAE;YACrD,MAAM,QAAQ,GAAG,iBAAiB,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;YAC7D,MAAM,KAAK,GAAG,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACtD,MAAM,QAAQ,GAAG,iBAAiB,CAAC,kBAAkB,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;YACvE,OAAO;gBACL,MAAM,EAAE,OAAO;gBACf,QAAQ;gBACR,QAAQ,EAAE,eAAe;aAC1B,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,SAAG,CAAC,KAAK,CACP,EAAE,KAAK,EAAE,EACT,0BAA0B,aAAa,CAAC,MAAM,yBAAyB,OAAO,SAAS,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,MAAM,2BAA2B,CACzI,CAAC;QAEF,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,gBAAgB,EAAE,GACjD,MAAM,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,EAAE;YACvD,QAAQ,EAAE,mBAAmB;SAC9B,CAAC,CAAC;QAEL,MAAM,OAAO,GAAsB,EAAE,CAAC;QAEtC,MAAM,iBAAiB,GAAa,EAAE,CAAC;QACvC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,gBAAgB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAChD,MAAM,QAAQ,GAAG,iBAAiB,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,CAAE,CAAC,CAAC;YAClE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,gBAAgB,CAAC,CAAC,CAAE,CAAC;YAE9D,4DAA4D;YAC5D,IAAI,CAAC,OAAO,IAAI,UAAU,CAAC,MAAM,IAAI,CAAC,EAAE;gBACtC,SAAG,CAAC,KAAK,CACP,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,EAC/B,0BAA0B,aAAa,CAAC,CAAC,CAAC,SACxC,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GACvC,SAAS,CACV,CAAC;gBACF,OAAO,CAAC,IAAI,CAAC;oBACX,OAAO,EAAE,KAAK;oBACd,UAAU;iBACX,CAAC,CAAC;gBACH,SAAS;aACV;YAED,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;YAE3C,OAAO,CAAC,IAAI,CAAC;gBACX,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE,iBAAiB,CAAC,oBAAoB,CAC5C,QAAQ,EACR,UAAU,CACW;aACxB,CAAC,CAAC;SACJ;QAED,SAAG,CAAC,KAAK,CACP,EAAE,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,EACnC,6BACE,aAAa,CAAC,MAChB,yBAAyB,OAAO,SAC9B,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,IAC3C,kDAAkD,WAAW,EAAE,CAChE,CAAC;QACF,OAAO;YACL,WAAW;YACX,OAAO;YACP,2BAA2B,EAAE,oBAAK,CAAC,UAAU,CAAC,iBAAiB,EAAE,EAAE,CAAC;SACrE,CAAC;IACJ,CAAC;CACF;AA5TD,4DA4TC"}
|