@across-protocol/sdk 3.3.26 → 3.3.28
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/dist/cjs/clients/BundleDataClient/BundleDataClient.js.map +1 -1
- package/dist/cjs/clients/BundleDataClient/utils/SuperstructUtils.d.ts +28 -28
- package/dist/cjs/clients/SpokePoolClient.d.ts +0 -4
- package/dist/cjs/clients/SpokePoolClient.js +1 -4
- package/dist/cjs/clients/SpokePoolClient.js.map +1 -1
- package/dist/cjs/constants.d.ts +1 -0
- package/dist/cjs/constants.js +2 -1
- package/dist/cjs/constants.js.map +1 -1
- package/dist/cjs/gasPriceOracle/adapters/arbitrum.js +1 -7
- package/dist/cjs/gasPriceOracle/adapters/arbitrum.js.map +1 -1
- package/dist/cjs/gasPriceOracle/adapters/ethereum.d.ts +2 -0
- package/dist/cjs/gasPriceOracle/adapters/ethereum.js +30 -2
- package/dist/cjs/gasPriceOracle/adapters/ethereum.js.map +1 -1
- package/dist/cjs/gasPriceOracle/oracle.js +27 -43
- package/dist/cjs/gasPriceOracle/oracle.js.map +1 -1
- package/dist/cjs/utils/BlockUtils.js +1 -0
- package/dist/cjs/utils/BlockUtils.js.map +1 -1
- package/dist/cjs/utils/Multicall.js +3 -1
- package/dist/cjs/utils/Multicall.js.map +1 -1
- package/dist/cjs/utils/SpokeUtils.d.ts +1 -0
- package/dist/cjs/utils/SpokeUtils.js +6 -1
- package/dist/cjs/utils/SpokeUtils.js.map +1 -1
- package/dist/cjs/utils/common.d.ts +0 -51
- package/dist/cjs/utils/common.js +31 -96
- package/dist/cjs/utils/common.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/BundleDataClient.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.d.ts +28 -28
- package/dist/esm/clients/SpokePoolClient.d.ts +0 -19
- package/dist/esm/clients/SpokePoolClient.js +1 -19
- package/dist/esm/clients/SpokePoolClient.js.map +1 -1
- package/dist/esm/constants.d.ts +1 -0
- package/dist/esm/constants.js +3 -0
- package/dist/esm/constants.js.map +1 -1
- package/dist/esm/gasPriceOracle/adapters/arbitrum.js +4 -12
- package/dist/esm/gasPriceOracle/adapters/arbitrum.js.map +1 -1
- package/dist/esm/gasPriceOracle/adapters/ethereum.d.ts +19 -0
- package/dist/esm/gasPriceOracle/adapters/ethereum.js +44 -1
- package/dist/esm/gasPriceOracle/adapters/ethereum.js.map +1 -1
- package/dist/esm/gasPriceOracle/oracle.js +27 -43
- package/dist/esm/gasPriceOracle/oracle.js.map +1 -1
- package/dist/esm/utils/BlockUtils.js +1 -0
- package/dist/esm/utils/BlockUtils.js.map +1 -1
- package/dist/esm/utils/Multicall.js +3 -1
- package/dist/esm/utils/Multicall.js.map +1 -1
- package/dist/esm/utils/SpokeUtils.d.ts +1 -0
- package/dist/esm/utils/SpokeUtils.js +10 -1
- package/dist/esm/utils/SpokeUtils.js.map +1 -1
- package/dist/esm/utils/common.d.ts +0 -62
- package/dist/esm/utils/common.js +31 -105
- package/dist/esm/utils/common.js.map +1 -1
- package/dist/types/clients/BundleDataClient/BundleDataClient.d.ts.map +1 -1
- package/dist/types/clients/BundleDataClient/utils/SuperstructUtils.d.ts +28 -28
- package/dist/types/clients/SpokePoolClient.d.ts +0 -19
- package/dist/types/clients/SpokePoolClient.d.ts.map +1 -1
- package/dist/types/constants.d.ts +1 -0
- package/dist/types/constants.d.ts.map +1 -1
- package/dist/types/gasPriceOracle/adapters/arbitrum.d.ts.map +1 -1
- package/dist/types/gasPriceOracle/adapters/ethereum.d.ts +19 -0
- package/dist/types/gasPriceOracle/adapters/ethereum.d.ts.map +1 -1
- package/dist/types/gasPriceOracle/oracle.d.ts.map +1 -1
- package/dist/types/utils/BlockUtils.d.ts.map +1 -1
- package/dist/types/utils/Multicall.d.ts.map +1 -1
- package/dist/types/utils/SpokeUtils.d.ts +1 -0
- package/dist/types/utils/SpokeUtils.d.ts.map +1 -1
- package/dist/types/utils/common.d.ts +0 -62
- package/dist/types/utils/common.d.ts.map +1 -1
- package/package.json +3 -3
- package/src/clients/BundleDataClient/BundleDataClient.ts +7 -0
- package/src/clients/SpokePoolClient.ts +3 -29
- package/src/constants.ts +4 -0
- package/src/gasPriceOracle/adapters/arbitrum.ts +3 -12
- package/src/gasPriceOracle/adapters/ethereum.ts +39 -2
- package/src/gasPriceOracle/oracle.ts +7 -19
- package/src/utils/BlockUtils.ts +1 -0
- package/src/utils/Multicall.ts +3 -1
- package/src/utils/SpokeUtils.ts +11 -1
- package/src/utils/common.ts +19 -123
|
@@ -1,10 +1,38 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.legacy = exports.eip1559 = void 0;
|
|
3
|
+
exports.legacy = exports.eip1559Bad = exports.eip1559Raw = exports.eip1559 = void 0;
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
|
+
var assert_1 = tslib_1.__importDefault(require("assert"));
|
|
5
6
|
var utils_1 = require("../../utils");
|
|
6
7
|
var util_1 = require("../util");
|
|
7
8
|
function eip1559(provider, chainId) {
|
|
9
|
+
var useRaw = process.env["GAS_PRICE_EIP1559_RAW_".concat(chainId)] === "true";
|
|
10
|
+
return useRaw ? eip1559Raw(provider, chainId) : eip1559Bad(provider, chainId);
|
|
11
|
+
}
|
|
12
|
+
exports.eip1559 = eip1559;
|
|
13
|
+
function eip1559Raw(provider, chainId) {
|
|
14
|
+
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
15
|
+
var _a, baseFeePerGas, _maxPriorityFeePerGas, maxPriorityFeePerGas;
|
|
16
|
+
return tslib_1.__generator(this, function (_b) {
|
|
17
|
+
switch (_b.label) {
|
|
18
|
+
case 0: return [4, Promise.all([
|
|
19
|
+
provider.getBlock("pending"),
|
|
20
|
+
provider.send("eth_maxPriorityFeePerGas", []),
|
|
21
|
+
])];
|
|
22
|
+
case 1:
|
|
23
|
+
_a = _b.sent(), baseFeePerGas = _a[0].baseFeePerGas, _maxPriorityFeePerGas = _a[1];
|
|
24
|
+
maxPriorityFeePerGas = utils_1.BigNumber.from(_maxPriorityFeePerGas);
|
|
25
|
+
(0, assert_1.default)(utils_1.BigNumber.isBigNumber(baseFeePerGas), "No baseFeePerGas received on ".concat((0, utils_1.getNetworkName)(chainId)));
|
|
26
|
+
return [2, {
|
|
27
|
+
maxFeePerGas: maxPriorityFeePerGas.add(baseFeePerGas),
|
|
28
|
+
maxPriorityFeePerGas: maxPriorityFeePerGas,
|
|
29
|
+
}];
|
|
30
|
+
}
|
|
31
|
+
});
|
|
32
|
+
});
|
|
33
|
+
}
|
|
34
|
+
exports.eip1559Raw = eip1559Raw;
|
|
35
|
+
function eip1559Bad(provider, chainId) {
|
|
8
36
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
9
37
|
var feeData, maxPriorityFeePerGas, maxFeePerGas;
|
|
10
38
|
return tslib_1.__generator(this, function (_a) {
|
|
@@ -23,7 +51,7 @@ function eip1559(provider, chainId) {
|
|
|
23
51
|
});
|
|
24
52
|
});
|
|
25
53
|
}
|
|
26
|
-
exports.
|
|
54
|
+
exports.eip1559Bad = eip1559Bad;
|
|
27
55
|
function legacy(provider, chainId) {
|
|
28
56
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
29
57
|
var gasPrice;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ethereum.js","sourceRoot":"","sources":["../../../../src/gasPriceOracle/adapters/ethereum.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"ethereum.js","sourceRoot":"","sources":["../../../../src/gasPriceOracle/adapters/ethereum.ts"],"names":[],"mappings":";;;;AAAA,0DAA4B;AAE5B,qCAAgE;AAEhE,gCAAwC;AAOxC,SAAgB,OAAO,CAAC,QAA4B,EAAE,OAAe;IACnE,IAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,gCAAyB,OAAO,CAAE,CAAC,KAAK,MAAM,CAAC;IAC1E,OAAO,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;AAChF,CAAC;AAHD,0BAGC;AAQD,SAAsB,UAAU,CAAC,QAA4B,EAAE,OAAe;;;;;wBACzB,WAAM,OAAO,CAAC,GAAG,CAAC;wBACnE,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC;wBAC3B,QAAsC,CAAC,IAAI,CAAC,0BAA0B,EAAE,EAAE,CAAC;qBAC7E,CAAC,EAAA;;oBAHI,KAA6C,SAGjD,EAHO,aAAa,sBAAA,EAAI,qBAAqB,QAAA;oBAIzC,oBAAoB,GAAG,iBAAS,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;oBACnE,IAAA,gBAAM,EAAC,iBAAS,CAAC,WAAW,CAAC,aAAa,CAAC,EAAE,uCAAgC,IAAA,sBAAc,EAAC,OAAO,CAAC,CAAE,CAAC,CAAC;oBAExG,WAAO;4BACL,YAAY,EAAE,oBAAoB,CAAC,GAAG,CAAC,aAAa,CAAC;4BACrD,oBAAoB,sBAAA;yBACrB,EAAC;;;;CACH;AAZD,gCAYC;AAQD,SAAsB,UAAU,CAAC,QAA4B,EAAE,OAAe;;;;;wBAC5D,WAAM,QAAQ,CAAC,UAAU,EAAE,EAAA;;oBAArC,OAAO,GAAG,SAA2B;oBAE3C,CAAC,OAAO,CAAC,iBAAiB,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC,UAAC,KAAuB;wBACxF,IAAI,CAAC,iBAAS,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC,cAAM,CAAC;4BAAE,IAAA,oBAAa,EAAC,cAAc,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;oBACzG,CAAC,CAAC,CAAC;oBAEG,oBAAoB,GAAG,OAAO,CAAC,oBAAiC,CAAC;oBACjE,YAAY,GAAG,oBAAoB,CAAC,GAAG,CAAC,OAAO,CAAC,iBAA8B,CAAC,CAAC;oBAEtF,WAAO,EAAE,oBAAoB,sBAAA,EAAE,YAAY,cAAA,EAAE,EAAC;;;;CAC/C;AAXD,gCAWC;AAED,SAAsB,MAAM,CAAC,QAA4B,EAAE,OAAe;;;;;wBACvD,WAAM,QAAQ,CAAC,WAAW,EAAE,EAAA;;oBAAvC,QAAQ,GAAG,SAA4B;oBAE7C,IAAI,CAAC,iBAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,EAAE,CAAC,cAAM,CAAC;wBAAE,IAAA,oBAAa,EAAC,eAAe,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;oBAE/G,WAAO;4BACL,YAAY,EAAE,QAAQ;4BACtB,oBAAoB,EAAE,cAAM;yBAC7B,EAAC;;;;CACH;AATD,wBASC"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getViemGasPriceEstimate = exports.getGasPriceEstimate = void 0;
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
|
+
var assert_1 = tslib_1.__importDefault(require("assert"));
|
|
5
6
|
var constants_1 = require("../constants");
|
|
6
7
|
var utils_1 = require("../utils");
|
|
7
8
|
var util_1 = require("./util");
|
|
@@ -15,16 +16,20 @@ var polygonViem = tslib_1.__importStar(require("./adapters/polygon-viem"));
|
|
|
15
16
|
function getGasPriceEstimate(provider, chainId, transport, legacyFallback) {
|
|
16
17
|
if (legacyFallback === void 0) { legacyFallback = true; }
|
|
17
18
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
18
|
-
var useViem;
|
|
19
|
-
|
|
20
|
-
|
|
19
|
+
var _a, useViem;
|
|
20
|
+
var _b;
|
|
21
|
+
return tslib_1.__generator(this, function (_c) {
|
|
22
|
+
switch (_c.label) {
|
|
21
23
|
case 0:
|
|
22
|
-
if (!(chainId
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
_a.label = 2;
|
|
24
|
+
if (!(chainId !== null && chainId !== void 0)) return [3, 1];
|
|
25
|
+
_a = chainId;
|
|
26
|
+
return [3, 3];
|
|
27
|
+
case 1: return [4, provider.getNetwork()];
|
|
27
28
|
case 2:
|
|
29
|
+
_a = (_b = _c.sent(), chainId = _b.chainId, _b);
|
|
30
|
+
_c.label = 3;
|
|
31
|
+
case 3:
|
|
32
|
+
_a;
|
|
28
33
|
useViem = process.env["NEW_GAS_PRICE_ORACLE_".concat(chainId)] === "true";
|
|
29
34
|
return [2, useViem
|
|
30
35
|
? getViemGasPriceEstimate(chainId, transport)
|
|
@@ -35,42 +40,21 @@ function getGasPriceEstimate(provider, chainId, transport, legacyFallback) {
|
|
|
35
40
|
}
|
|
36
41
|
exports.getGasPriceEstimate = getGasPriceEstimate;
|
|
37
42
|
function getEthersGasPriceEstimate(provider, chainId, legacyFallback) {
|
|
43
|
+
var _a;
|
|
38
44
|
if (legacyFallback === void 0) { legacyFallback = true; }
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
_a[constants_1.CHAIN_IDs.ALEPH_ZERO] = arbitrum.eip1559,
|
|
53
|
-
_a[constants_1.CHAIN_IDs.ARBITRUM] = arbitrum.eip1559,
|
|
54
|
-
_a[constants_1.CHAIN_IDs.BASE] = ethereum.eip1559,
|
|
55
|
-
_a[constants_1.CHAIN_IDs.LINEA] = linea.eip1559,
|
|
56
|
-
_a[constants_1.CHAIN_IDs.MAINNET] = ethereum.eip1559,
|
|
57
|
-
_a[constants_1.CHAIN_IDs.MODE] = ethereum.eip1559,
|
|
58
|
-
_a[constants_1.CHAIN_IDs.OPTIMISM] = ethereum.eip1559,
|
|
59
|
-
_a[constants_1.CHAIN_IDs.POLYGON] = polygon.gasStation,
|
|
60
|
-
_a[constants_1.CHAIN_IDs.ZK_SYNC] = ethereum.legacy,
|
|
61
|
-
_a[constants_1.CHAIN_IDs.SCROLL] = ethereum.legacy,
|
|
62
|
-
_a);
|
|
63
|
-
gasPriceFeed = gasPriceFeeds[chainId];
|
|
64
|
-
if (gasPriceFeed === undefined) {
|
|
65
|
-
if (!legacyFallback) {
|
|
66
|
-
throw new Error("No suitable gas price oracle for Chain ID ".concat(chainId));
|
|
67
|
-
}
|
|
68
|
-
gasPriceFeed = (0, utils_1.chainIsOPStack)(chainId) ? ethereum.eip1559 : ethereum.legacy;
|
|
69
|
-
}
|
|
70
|
-
return [2, gasPriceFeed(provider, chainId)];
|
|
71
|
-
}
|
|
72
|
-
});
|
|
73
|
-
});
|
|
45
|
+
var gasPriceFeeds = (_a = {},
|
|
46
|
+
_a[constants_1.CHAIN_IDs.ALEPH_ZERO] = arbitrum.eip1559,
|
|
47
|
+
_a[constants_1.CHAIN_IDs.ARBITRUM] = arbitrum.eip1559,
|
|
48
|
+
_a[constants_1.CHAIN_IDs.LINEA] = linea.eip1559,
|
|
49
|
+
_a[constants_1.CHAIN_IDs.MAINNET] = ethereum.eip1559,
|
|
50
|
+
_a[constants_1.CHAIN_IDs.POLYGON] = polygon.gasStation,
|
|
51
|
+
_a[constants_1.CHAIN_IDs.SCROLL] = ethereum.legacy,
|
|
52
|
+
_a[constants_1.CHAIN_IDs.ZK_SYNC] = ethereum.legacy,
|
|
53
|
+
_a);
|
|
54
|
+
var gasPriceFeed = gasPriceFeeds[chainId];
|
|
55
|
+
(0, assert_1.default)(gasPriceFeed || legacyFallback, "No suitable gas price oracle for Chain ID ".concat(chainId));
|
|
56
|
+
gasPriceFeed !== null && gasPriceFeed !== void 0 ? gasPriceFeed : (gasPriceFeed = (0, utils_1.chainIsOPStack)(chainId) ? ethereum.eip1559 : ethereum.legacy);
|
|
57
|
+
return gasPriceFeed(provider, chainId);
|
|
74
58
|
}
|
|
75
59
|
function getViemGasPriceEstimate(providerOrChainId, transport) {
|
|
76
60
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oracle.js","sourceRoot":"","sources":["../../../src/gasPriceOracle/oracle.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"oracle.js","sourceRoot":"","sources":["../../../src/gasPriceOracle/oracle.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@ var defaultHighBlockOffset = 10;
|
|
|
15
15
|
var cacheTTL = 60 * 15;
|
|
16
16
|
var now = (0, TimeUtils_1.getCurrentTime)();
|
|
17
17
|
var blockTimes = (_a = {},
|
|
18
|
+
_a[constants_1.CHAIN_IDs.INK] = { average: 1, timestamp: now, blockRange: 1 },
|
|
18
19
|
_a[constants_1.CHAIN_IDs.LINEA] = { average: 3, timestamp: now, blockRange: 1 },
|
|
19
20
|
_a[constants_1.CHAIN_IDs.MAINNET] = { average: 12.5, timestamp: now, blockRange: 1 },
|
|
20
21
|
_a[constants_1.CHAIN_IDs.OPTIMISM] = { average: 2, timestamp: now, blockRange: 1 },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BlockUtils.js","sourceRoot":"","sources":["../../../src/utils/BlockUtils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"BlockUtils.js","sourceRoot":"","sources":["../../../src/utils/BlockUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,17 +8,19 @@ var NetworkUtils_1 = require("./NetworkUtils");
|
|
|
8
8
|
var typechain_1 = require("./abi/typechain");
|
|
9
9
|
var DETERMINISTIC_MULTICALL_ADDRESS = "0xcA11bde05977b3631167028862bE2a173976CA11";
|
|
10
10
|
var NON_DETERMINISTIC_MULTICALL_ADDRESSES = (_a = {},
|
|
11
|
-
_a[constants_1.CHAIN_IDs.ALEPH_ZERO] = "0x3CA11702f7c0F28e0b4e03C31F7492969862C569",
|
|
12
11
|
_a[constants_1.CHAIN_IDs.ZK_SYNC] = "0xF9cda624FBC7e059355ce98a31693d299FACd963",
|
|
13
12
|
_a);
|
|
14
13
|
var DETERMINISTIC_MULTICALL_CHAINS = [
|
|
14
|
+
constants_1.CHAIN_IDs.ALEPH_ZERO,
|
|
15
15
|
constants_1.CHAIN_IDs.ARBITRUM,
|
|
16
|
+
constants_1.CHAIN_IDs.INK,
|
|
16
17
|
constants_1.CHAIN_IDs.LINEA,
|
|
17
18
|
constants_1.CHAIN_IDs.MAINNET,
|
|
18
19
|
constants_1.CHAIN_IDs.POLYGON,
|
|
19
20
|
constants_1.CHAIN_IDs.SCROLL,
|
|
20
21
|
constants_1.CHAIN_IDs.BASE_SEPOLIA,
|
|
21
22
|
constants_1.CHAIN_IDs.BLAST_SEPOLIA,
|
|
23
|
+
constants_1.CHAIN_IDs.INK_SEPOLIA,
|
|
22
24
|
constants_1.CHAIN_IDs.POLYGON_AMOY,
|
|
23
25
|
constants_1.CHAIN_IDs.SCROLL_SEPOLIA,
|
|
24
26
|
constants_1.CHAIN_IDs.SEPOLIA,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Multicall.js","sourceRoot":"","sources":["../../../src/utils/Multicall.ts"],"names":[],"mappings":";;;;;AACA,wDAAuD;AACvD,+CAAgD;AAEhD,6CAAkE;AAalE,IAAM,+BAA+B,GAAG,4CAA4C,CAAC;AAErF,IAAM,qCAAqC;IACzC,GAAC,qBAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"Multicall.js","sourceRoot":"","sources":["../../../src/utils/Multicall.ts"],"names":[],"mappings":";;;;;AACA,wDAAuD;AACvD,+CAAgD;AAEhD,6CAAkE;AAalE,IAAM,+BAA+B,GAAG,4CAA4C,CAAC;AAErF,IAAM,qCAAqC;IACzC,GAAC,qBAAS,CAAC,OAAO,IAAG,4CAA4C;OAClE,CAAC;AAGF,IAAM,8BAA8B,GAAG;IACrC,qBAAS,CAAC,UAAU;IACpB,qBAAS,CAAC,QAAQ;IAClB,qBAAS,CAAC,GAAG;IACb,qBAAS,CAAC,KAAK;IACf,qBAAS,CAAC,OAAO;IACjB,qBAAS,CAAC,OAAO;IACjB,qBAAS,CAAC,MAAM;IAEhB,qBAAS,CAAC,YAAY;IACtB,qBAAS,CAAC,aAAa;IACvB,qBAAS,CAAC,WAAW;IACrB,qBAAS,CAAC,YAAY;IACtB,qBAAS,CAAC,cAAc;IACxB,qBAAS,CAAC,OAAO;CAClB,CAAC;AAEF,SAAgB,mBAAmB,CAAC,OAAe;IACjD,IAAI,IAAA,6BAAc,EAAC,OAAO,CAAC,IAAI,8BAA8B,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;QAC/E,OAAO,+BAA+B,CAAC;KACxC;IACD,OAAO,qCAAqC,CAAC,OAAO,CAAC,CAAC;AACxD,CAAC;AALD,kDAKC;AAED,SAAgB,aAAa,CAAC,OAAe,EAAE,gBAAmC;IAChF,IAAM,OAAO,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAC7C,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,SAAS,CAAC;KAClB;IAED,OAAO,+BAAmB,CAAC,OAAO,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;AAChE,CAAC;AAPD,sCAOC;AAED,SAAsB,SAAS,CAAC,UAAoB,EAAE,KAAc,EAAE,QAAmB;;;;;;oBACjF,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,UAAC,EAA0B;4BAAxB,QAAQ,cAAA,EAAE,MAAM,YAAA,EAAE,IAAI,UAAA;wBAAO,OAAA,CAAC;4BACxD,MAAM,EAAE,QAAQ,CAAC,OAAO;4BACxB,QAAQ,EAAE,QAAQ,CAAC,SAAS,CAAC,kBAAkB,CAAC,MAAM,EAAE,IAAI,CAAC;yBAC9D,CAAC;oBAHuD,CAGvD,CAAC,CAAC;oBAEgB,WAAO,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,QAAQ,UAAA,EAAE,CAAoC,EAAA;;oBAA7G,KAAc,SAA+F,EAA1G,OAAO,QAAA;oBAEhB,WAAO,OAAO,CAAC,GAAG,CAAC,UAAC,MAAM,EAAE,GAAG;4BACvB,IAAA,KAAuB,KAAK,CAAC,GAAG,CAAC,EAA/B,QAAQ,cAAA,EAAE,MAAM,YAAe,CAAC;4BACxC,OAAO,QAAQ,CAAC,SAAS,CAAC,oBAAoB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;wBACjE,CAAC,CAAC,EAAC;;;;CACJ;AAZD,8BAYC"}
|
|
@@ -10,6 +10,7 @@ export declare function getBlockRangeForDepositId(targetDepositId: number, initL
|
|
|
10
10
|
export declare function getDepositIdAtBlock(contract: Contract, blockTag: number): Promise<number>;
|
|
11
11
|
export declare function getRelayDataHash(relayData: RelayData, destinationChainId: number): string;
|
|
12
12
|
export declare function getRelayHashFromEvent(e: Deposit | Fill | SlowFillRequest): string;
|
|
13
|
+
export declare function isUnsafeDepositId(depositId: number): boolean;
|
|
13
14
|
export declare function relayFillStatus(spokePool: Contract, relayData: RelayData, blockTag?: number | "latest", destinationChainId?: number): Promise<FillStatus>;
|
|
14
15
|
export declare function fillStatusArray(spokePool: Contract, relayData: RelayData[], blockTag?: BlockTag): Promise<(FillStatus | undefined)[]>;
|
|
15
16
|
export declare function findFillBlock(spokePool: Contract, relayData: RelayData, lowBlockNumber: number, highBlockNumber?: number): Promise<number | undefined>;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.findFillBlock = exports.fillStatusArray = exports.relayFillStatus = exports.getRelayHashFromEvent = exports.getRelayDataHash = exports.getDepositIdAtBlock = exports.getBlockRangeForDepositId = exports.populateV3Relay = void 0;
|
|
3
|
+
exports.findFillBlock = exports.fillStatusArray = exports.relayFillStatus = exports.isUnsafeDepositId = exports.getRelayHashFromEvent = exports.getRelayDataHash = exports.getDepositIdAtBlock = exports.getBlockRangeForDepositId = exports.populateV3Relay = void 0;
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
5
|
var assert_1 = tslib_1.__importDefault(require("assert"));
|
|
6
6
|
var ethers_1 = require("ethers");
|
|
@@ -162,6 +162,11 @@ function getRelayHashFromEvent(e) {
|
|
|
162
162
|
return getRelayDataHash(e, e.destinationChainId);
|
|
163
163
|
}
|
|
164
164
|
exports.getRelayHashFromEvent = getRelayHashFromEvent;
|
|
165
|
+
function isUnsafeDepositId(depositId) {
|
|
166
|
+
var maxSafeDepositId = BigNumberUtils_1.BigNumber.from(constants_1.MAX_SAFE_DEPOSIT_ID);
|
|
167
|
+
return maxSafeDepositId.lt(depositId);
|
|
168
|
+
}
|
|
169
|
+
exports.isUnsafeDepositId = isUnsafeDepositId;
|
|
165
170
|
function relayFillStatus(spokePool, relayData, blockTag, destinationChainId) {
|
|
166
171
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
167
172
|
var _a, hash, _fillStatus, fillStatus, originChainId, depositId;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SpokeUtils.js","sourceRoot":"","sources":["../../../src/utils/SpokeUtils.ts"],"names":[],"mappings":";;;;AAAA,0DAA4B;AAC5B,iCAAoG;AACpG,
|
|
1
|
+
{"version":3,"file":"SpokeUtils.js","sourceRoot":"","sources":["../../../src/utils/SpokeUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { L2Provider } from "@eth-optimism/sdk/dist/interfaces/l2-provider";
|
|
2
2
|
import Decimal from "decimal.js";
|
|
3
3
|
import { ethers, PopulatedTransaction, providers } from "ethers";
|
|
4
|
-
import { TypedMessage } from "../interfaces/TypedData";
|
|
5
4
|
import { BigNumber, BigNumberish, BN } from "./BigNumberUtils";
|
|
6
5
|
import { Transport } from "viem";
|
|
7
6
|
export type Decimalish = string | number | Decimal;
|
|
@@ -32,54 +31,4 @@ export declare function estimateTotalGasRequiredByUnsignedTransaction(unsignedTx
|
|
|
32
31
|
gasUnits: BigNumberish;
|
|
33
32
|
transport: Transport;
|
|
34
33
|
}>): Promise<TransactionCostEstimate>;
|
|
35
|
-
export type UpdateDepositDetailsMessageType = {
|
|
36
|
-
UpdateDepositDetails: [
|
|
37
|
-
{
|
|
38
|
-
name: "depositId";
|
|
39
|
-
type: "uint32";
|
|
40
|
-
},
|
|
41
|
-
{
|
|
42
|
-
name: "originChainId";
|
|
43
|
-
type: "uint256";
|
|
44
|
-
},
|
|
45
|
-
{
|
|
46
|
-
name: "updatedRelayerFeePct";
|
|
47
|
-
type: "int64";
|
|
48
|
-
},
|
|
49
|
-
{
|
|
50
|
-
name: "updatedRecipient";
|
|
51
|
-
type: "address";
|
|
52
|
-
},
|
|
53
|
-
{
|
|
54
|
-
name: "updatedMessage";
|
|
55
|
-
type: "bytes";
|
|
56
|
-
}
|
|
57
|
-
];
|
|
58
|
-
};
|
|
59
|
-
export type UpdateV3DepositDetailsMessageType = {
|
|
60
|
-
UpdateDepositDetails: [
|
|
61
|
-
{
|
|
62
|
-
name: "depositId";
|
|
63
|
-
type: "uint32";
|
|
64
|
-
},
|
|
65
|
-
{
|
|
66
|
-
name: "originChainId";
|
|
67
|
-
type: "uint256";
|
|
68
|
-
},
|
|
69
|
-
{
|
|
70
|
-
name: "updatedOutputAmount";
|
|
71
|
-
type: "uint256";
|
|
72
|
-
},
|
|
73
|
-
{
|
|
74
|
-
name: "updatedRecipient";
|
|
75
|
-
type: "address";
|
|
76
|
-
},
|
|
77
|
-
{
|
|
78
|
-
name: "updatedMessage";
|
|
79
|
-
type: "bytes";
|
|
80
|
-
}
|
|
81
|
-
];
|
|
82
|
-
};
|
|
83
|
-
export declare function getUpdateDepositTypedData(depositId: number, originChainId: number, updatedRelayerFeePct: BigNumber, updatedRecipient: string, updatedMessage: string): TypedMessage<UpdateDepositDetailsMessageType>;
|
|
84
|
-
export declare function getUpdateV3DepositTypedData(depositId: number, originChainId: number, updatedOutputAmount: BigNumber, updatedRecipient: string, updatedMessage: string): TypedMessage<UpdateV3DepositDetailsMessageType>;
|
|
85
34
|
export declare function randomAddress(): string;
|
package/dist/cjs/utils/common.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.randomAddress = exports.
|
|
3
|
+
exports.randomAddress = exports.estimateTotalGasRequiredByUnsignedTransaction = exports.retry = exports.delay = exports.getSamplesBetween = exports.calcApr = exports.calcPeriodicCompoundInterest = exports.calcContinuousCompoundInterest = exports.percent = exports.calculateGasFees = exports.gasCost = exports.nativeToToken = exports.fixedPointAdjustment = exports.max = exports.min = exports.fromWei = exports.toBNWei = exports.MAX_BIG_INT = exports.AddressZero = void 0;
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
5
|
var l2_provider_1 = require("@eth-optimism/sdk/dist/l2-provider");
|
|
6
6
|
var assert_1 = tslib_1.__importDefault(require("assert"));
|
|
@@ -116,58 +116,47 @@ exports.retry = retry;
|
|
|
116
116
|
function estimateTotalGasRequiredByUnsignedTransaction(unsignedTx, senderAddress, provider, options) {
|
|
117
117
|
if (options === void 0) { options = {}; }
|
|
118
118
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
119
|
-
var _a, _gasPrice, gasUnits, transport, chainId, voidSigner,
|
|
120
|
-
|
|
121
|
-
|
|
119
|
+
var _a, _gasPrice, gasUnits, transport, chainId, voidSigner, queries, _b, nativeGasCost, gasPrice, tokenGasCost, populatedTransaction, l1GasCost, l2GasCost, baseFeePerGas, priorityFeePerGas;
|
|
120
|
+
var _c;
|
|
121
|
+
return tslib_1.__generator(this, function (_d) {
|
|
122
|
+
switch (_d.label) {
|
|
122
123
|
case 0:
|
|
123
124
|
_a = options || {}, _gasPrice = _a.gasPrice, gasUnits = _a.gasUnits, transport = _a.transport;
|
|
124
125
|
return [4, provider.getNetwork()];
|
|
125
126
|
case 1:
|
|
126
|
-
chainId = (
|
|
127
|
+
chainId = (_d.sent()).chainId;
|
|
127
128
|
voidSigner = new ethers_1.VoidSigner(senderAddress, provider);
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
(0, assert_1.default)(nativeGasCost.gt(0), "Gas cost should not be 0");
|
|
138
|
-
if (!(0, NetworkUtils_1.chainIsOPStack)(chainId)) return [3, 7];
|
|
129
|
+
queries = [
|
|
130
|
+
gasUnits ? Promise.resolve(BigNumberUtils_1.BigNumber.from(gasUnits)) : voidSigner.estimateGas(unsignedTx),
|
|
131
|
+
_gasPrice ? Promise.resolve({ maxFeePerGas: _gasPrice }) : (0, gasPriceOracle_1.getGasPriceEstimate)(provider, chainId, transport),
|
|
132
|
+
];
|
|
133
|
+
return [4, Promise.all(queries)];
|
|
134
|
+
case 2:
|
|
135
|
+
_b = _d.sent(), nativeGasCost = _b[0], gasPrice = _b[1].maxFeePerGas;
|
|
136
|
+
(0, assert_1.default)(nativeGasCost.gt(BigNumberUtils_1.bnZero), "Gas cost should not be 0");
|
|
137
|
+
if (!(0, NetworkUtils_1.chainIsOPStack)(chainId)) return [3, 5];
|
|
139
138
|
(0, assert_1.default)((0, l2_provider_1.isL2Provider)(provider), "Unexpected provider for chain ID ".concat(chainId, "."));
|
|
140
139
|
return [4, voidSigner.populateTransaction(tslib_1.__assign(tslib_1.__assign({}, unsignedTx), { gasLimit: nativeGasCost }))];
|
|
140
|
+
case 3:
|
|
141
|
+
populatedTransaction = _d.sent();
|
|
142
|
+
return [4, provider.estimateL1GasCost(populatedTransaction)];
|
|
143
|
+
case 4:
|
|
144
|
+
l1GasCost = _d.sent();
|
|
145
|
+
l2GasCost = nativeGasCost.mul(gasPrice);
|
|
146
|
+
tokenGasCost = l1GasCost.add(l2GasCost);
|
|
147
|
+
return [3, 8];
|
|
141
148
|
case 5:
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
_gasPrice || provider.getGasPrice(),
|
|
146
|
-
])];
|
|
149
|
+
if (!(chainId === constants_1.CHAIN_IDs.LINEA && process.env["NEW_GAS_PRICE_ORACLE_".concat(chainId)] === "true")) return [3, 7];
|
|
150
|
+
baseFeePerGas = void 0, priorityFeePerGas = void 0;
|
|
151
|
+
return [4, getLineaGasFees(chainId, transport, unsignedTx)];
|
|
147
152
|
case 6:
|
|
148
|
-
_c =
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
return [3, 12];
|
|
153
|
+
(_c = _d.sent(), nativeGasCost = _c.gasLimit, baseFeePerGas = _c.baseFeePerGas, priorityFeePerGas = _c.priorityFeePerGas);
|
|
154
|
+
gasPrice = baseFeePerGas.add(priorityFeePerGas);
|
|
155
|
+
_d.label = 7;
|
|
152
156
|
case 7:
|
|
153
|
-
if (!(chainId === constants_1.CHAIN_IDs.LINEA && process.env["NEW_GAS_PRICE_ORACLE_".concat(chainId)] === "true")) return [3, 9];
|
|
154
|
-
return [4, getLineaGasFees(chainId, transport, unsignedTx)];
|
|
155
|
-
case 8:
|
|
156
|
-
_d = _e.sent(), nativeGasCost_1 = _d.gasLimit, baseFeePerGas = _d.baseFeePerGas, priorityFeePerGas = _d.priorityFeePerGas;
|
|
157
|
-
tokenGasCost = baseFeePerGas.add(priorityFeePerGas).mul(nativeGasCost_1);
|
|
158
|
-
return [3, 12];
|
|
159
|
-
case 9:
|
|
160
|
-
gasPrice = _gasPrice;
|
|
161
|
-
if (!!gasPrice) return [3, 11];
|
|
162
|
-
return [4, (0, gasPriceOracle_1.getGasPriceEstimate)(provider, chainId, transport)];
|
|
163
|
-
case 10:
|
|
164
|
-
gasPriceEstimate = _e.sent();
|
|
165
|
-
gasPrice = gasPriceEstimate.maxFeePerGas;
|
|
166
|
-
_e.label = 11;
|
|
167
|
-
case 11:
|
|
168
157
|
tokenGasCost = nativeGasCost.mul(gasPrice);
|
|
169
|
-
|
|
170
|
-
case
|
|
158
|
+
_d.label = 8;
|
|
159
|
+
case 8: return [2, {
|
|
171
160
|
nativeGasCost: nativeGasCost,
|
|
172
161
|
tokenGasCost: tokenGasCost,
|
|
173
162
|
gasPrice: tokenGasCost.div(nativeGasCost),
|
|
@@ -199,60 +188,6 @@ function getLineaGasFees(chainId, transport, unsignedTx) {
|
|
|
199
188
|
});
|
|
200
189
|
});
|
|
201
190
|
}
|
|
202
|
-
function getUpdateDepositTypedData(depositId, originChainId, updatedRelayerFeePct, updatedRecipient, updatedMessage) {
|
|
203
|
-
return {
|
|
204
|
-
types: {
|
|
205
|
-
UpdateDepositDetails: [
|
|
206
|
-
{ name: "depositId", type: "uint32" },
|
|
207
|
-
{ name: "originChainId", type: "uint256" },
|
|
208
|
-
{ name: "updatedRelayerFeePct", type: "int64" },
|
|
209
|
-
{ name: "updatedRecipient", type: "address" },
|
|
210
|
-
{ name: "updatedMessage", type: "bytes" },
|
|
211
|
-
],
|
|
212
|
-
},
|
|
213
|
-
primaryType: "UpdateDepositDetails",
|
|
214
|
-
domain: {
|
|
215
|
-
name: "ACROSS-V2",
|
|
216
|
-
version: "1.0.0",
|
|
217
|
-
chainId: originChainId,
|
|
218
|
-
},
|
|
219
|
-
message: {
|
|
220
|
-
depositId: depositId,
|
|
221
|
-
originChainId: originChainId,
|
|
222
|
-
updatedRelayerFeePct: updatedRelayerFeePct,
|
|
223
|
-
updatedRecipient: updatedRecipient,
|
|
224
|
-
updatedMessage: updatedMessage,
|
|
225
|
-
},
|
|
226
|
-
};
|
|
227
|
-
}
|
|
228
|
-
exports.getUpdateDepositTypedData = getUpdateDepositTypedData;
|
|
229
|
-
function getUpdateV3DepositTypedData(depositId, originChainId, updatedOutputAmount, updatedRecipient, updatedMessage) {
|
|
230
|
-
return {
|
|
231
|
-
types: {
|
|
232
|
-
UpdateDepositDetails: [
|
|
233
|
-
{ name: "depositId", type: "uint32" },
|
|
234
|
-
{ name: "originChainId", type: "uint256" },
|
|
235
|
-
{ name: "updatedOutputAmount", type: "uint256" },
|
|
236
|
-
{ name: "updatedRecipient", type: "address" },
|
|
237
|
-
{ name: "updatedMessage", type: "bytes" },
|
|
238
|
-
],
|
|
239
|
-
},
|
|
240
|
-
primaryType: "UpdateDepositDetails",
|
|
241
|
-
domain: {
|
|
242
|
-
name: "ACROSS-V2",
|
|
243
|
-
version: "1.0.0",
|
|
244
|
-
chainId: originChainId,
|
|
245
|
-
},
|
|
246
|
-
message: {
|
|
247
|
-
depositId: depositId,
|
|
248
|
-
originChainId: originChainId,
|
|
249
|
-
updatedOutputAmount: updatedOutputAmount,
|
|
250
|
-
updatedRecipient: updatedRecipient,
|
|
251
|
-
updatedMessage: updatedMessage,
|
|
252
|
-
},
|
|
253
|
-
};
|
|
254
|
-
}
|
|
255
|
-
exports.getUpdateV3DepositTypedData = getUpdateV3DepositTypedData;
|
|
256
191
|
function randomAddress() {
|
|
257
192
|
return ethers_1.ethers.utils.getAddress(ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.randomBytes(20)));
|
|
258
193
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/utils/common.ts"],"names":[],"mappings":";;;;AACA,kEAA0F;AAC1F,0DAA4B;AAC5B,kEAAiC;AACjC,iCAA6E;AAC7E,oDAAwD;
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/utils/common.ts"],"names":[],"mappings":"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"}
|