@across-protocol/sdk 4.3.129 → 4.3.130
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/src/caching/Arweave/ArweaveClient.d.ts +2 -0
- package/dist/cjs/src/caching/Arweave/ArweaveClient.js +20 -16
- package/dist/cjs/src/caching/Arweave/ArweaveClient.js.map +1 -1
- package/dist/cjs/src/gasPriceOracle/oracle.d.ts +1 -3
- package/dist/cjs/src/gasPriceOracle/oracle.js +20 -39
- package/dist/cjs/src/gasPriceOracle/oracle.js.map +1 -1
- package/dist/esm/src/caching/Arweave/ArweaveClient.d.ts +2 -0
- package/dist/esm/src/caching/Arweave/ArweaveClient.js +20 -18
- package/dist/esm/src/caching/Arweave/ArweaveClient.js.map +1 -1
- package/dist/esm/src/gasPriceOracle/oracle.d.ts +1 -10
- package/dist/esm/src/gasPriceOracle/oracle.js +22 -40
- package/dist/esm/src/gasPriceOracle/oracle.js.map +1 -1
- package/dist/types/src/caching/Arweave/ArweaveClient.d.ts +2 -0
- package/dist/types/src/caching/Arweave/ArweaveClient.d.ts.map +1 -1
- package/dist/types/src/gasPriceOracle/oracle.d.ts +1 -10
- package/dist/types/src/gasPriceOracle/oracle.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/caching/Arweave/ArweaveClient.ts +8 -16
- package/src/gasPriceOracle/oracle.ts +6 -25
|
@@ -16,6 +16,8 @@ var ArweaveClient = (function () {
|
|
|
16
16
|
if (retryDelaySeconds === void 0) { retryDelaySeconds = 1; }
|
|
17
17
|
this.arweaveJWT = arweaveJWT;
|
|
18
18
|
this.logger = logger;
|
|
19
|
+
this.gatewayURL = gatewayURL;
|
|
20
|
+
this.protocol = protocol;
|
|
19
21
|
this.retries = retries;
|
|
20
22
|
this.retryDelaySeconds = retryDelaySeconds;
|
|
21
23
|
this.gatewayUrl = "".concat(protocol, "://").concat(gatewayURL, ":").concat(port);
|
|
@@ -90,24 +92,26 @@ var ArweaveClient = (function () {
|
|
|
90
92
|
};
|
|
91
93
|
ArweaveClient.prototype.get = function (transactionID, validator) {
|
|
92
94
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
93
|
-
var transactionUrl,
|
|
94
|
-
|
|
95
|
-
|
|
95
|
+
var transactionUrl, request, data;
|
|
96
|
+
var _this = this;
|
|
97
|
+
return tslib_1.__generator(this, function (_a) {
|
|
98
|
+
switch (_a.label) {
|
|
96
99
|
case 0:
|
|
97
100
|
transactionUrl = "".concat(this.gatewayUrl, "/").concat(transactionID);
|
|
98
|
-
return
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
data: data,
|
|
101
|
+
request = function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
|
|
102
|
+
var requestData;
|
|
103
|
+
return tslib_1.__generator(this, function (_a) {
|
|
104
|
+
switch (_a.label) {
|
|
105
|
+
case 0: return [4, axios_1.default.get(transactionUrl)];
|
|
106
|
+
case 1:
|
|
107
|
+
requestData = (_a.sent()).data;
|
|
108
|
+
return [2, requestData];
|
|
109
|
+
}
|
|
108
110
|
});
|
|
109
|
-
|
|
110
|
-
|
|
111
|
+
}); };
|
|
112
|
+
return [4, this._retryRequest(request, 0)];
|
|
113
|
+
case 1:
|
|
114
|
+
data = _a.sent();
|
|
111
115
|
try {
|
|
112
116
|
return [2, (0, superstruct_1.create)(data, validator)];
|
|
113
117
|
}
|
|
@@ -221,7 +225,7 @@ var ArweaveClient = (function () {
|
|
|
221
225
|
baseDelay = this.retryDelaySeconds * Math.pow(2, retryCount);
|
|
222
226
|
delayS = baseDelay + baseDelay * Math.random();
|
|
223
227
|
this.logger.debug({
|
|
224
|
-
at: "ArweaveClient:
|
|
228
|
+
at: "ArweaveClient:retryRequest",
|
|
225
229
|
message: "Arweave request failed, retrying after waiting ".concat(delayS, " seconds: ").concat(e_2),
|
|
226
230
|
retryCount: retryCount,
|
|
227
231
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ArweaveClient.js","sourceRoot":"","sources":["../../../../../src/caching/Arweave/ArweaveClient.ts"],"names":[],"mappings":";;;;AAAA,4DAA8B;AAE9B,wDAA0B;AAC1B,2CAA6C;AAE7C,6CAAiH;AACjH,qCAA4F;AAE5F;IAIE,uBACU,UAAwB,EACxB,MAAsB,
|
|
1
|
+
{"version":3,"file":"ArweaveClient.js","sourceRoot":"","sources":["../../../../../src/caching/Arweave/ArweaveClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import { Transport } from "viem";
|
|
2
|
-
import { providers } from "ethers";
|
|
3
2
|
import { BigNumber } from "../utils";
|
|
4
3
|
import { SVMProvider as SolanaProvider } from "../arch/svm";
|
|
5
|
-
import { EvmGasPriceEstimate,
|
|
4
|
+
import { EvmGasPriceEstimate, SvmGasPriceEstimate } from "./types";
|
|
6
5
|
import { EvmProvider } from "../arch/evm/types";
|
|
7
6
|
export interface GasPriceEstimateOptions {
|
|
8
7
|
baseFeeMultiplier: BigNumber;
|
|
@@ -14,4 +13,3 @@ export interface GasPriceEstimateOptions {
|
|
|
14
13
|
}
|
|
15
14
|
export declare function getGasPriceEstimate(provider: EvmProvider, opts?: Partial<GasPriceEstimateOptions>): Promise<EvmGasPriceEstimate>;
|
|
16
15
|
export declare function getGasPriceEstimate(provider: SolanaProvider, opts?: Partial<GasPriceEstimateOptions>): Promise<SvmGasPriceEstimate>;
|
|
17
|
-
export declare function _getViemGasPriceEstimate(providerOrChainId: providers.Provider | number, opts: GasPriceEstimateOptions): Promise<GasPriceEstimate>;
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getGasPriceEstimate = getGasPriceEstimate;
|
|
4
|
-
exports._getViemGasPriceEstimate = _getViemGasPriceEstimate;
|
|
5
4
|
var tslib_1 = require("tslib");
|
|
6
5
|
var assert_1 = tslib_1.__importDefault(require("assert"));
|
|
7
6
|
var constants_1 = require("../constants");
|
|
@@ -41,72 +40,54 @@ function getGasPriceEstimate(provider_1) {
|
|
|
41
40
|
chainId = _a;
|
|
42
41
|
optsWithDefaults = tslib_1.__assign(tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({}, GAS_PRICE_ESTIMATE_DEFAULTS), { baseFeeMultiplier: baseFeeMultiplier, priorityFeeMultiplier: priorityFeeMultiplier }), opts), { chainId: chainId });
|
|
43
42
|
useViem = VIEM_CHAINS.includes(chainId);
|
|
44
|
-
return [2, useViem
|
|
45
|
-
? _getViemGasPriceEstimate(chainId, optsWithDefaults)
|
|
46
|
-
: _getEthersGasPriceEstimate(provider, optsWithDefaults)];
|
|
43
|
+
return [2, useViem ? getGasPriceViem(chainId, optsWithDefaults) : getGasPriceEthers(provider, optsWithDefaults)];
|
|
47
44
|
}
|
|
48
45
|
});
|
|
49
46
|
});
|
|
50
47
|
}
|
|
51
|
-
function
|
|
48
|
+
function getGasPriceEthers(provider, opts) {
|
|
52
49
|
var _a;
|
|
53
50
|
var chainId = opts.chainId, legacyFallback = opts.legacyFallback;
|
|
54
51
|
(0, assert_1.default)(!VIEM_CHAINS.includes(chainId), "Chain ID ".concat(chainId, " will use Viem gas price estimation"));
|
|
55
52
|
var gasPriceFeeds = (_a = {},
|
|
56
53
|
_a[constants_1.CHAIN_IDs.ARBITRUM] = arbitrum.eip1559,
|
|
57
|
-
_a[constants_1.CHAIN_IDs.BSC] = ethereum.eip1559,
|
|
58
|
-
_a[constants_1.CHAIN_IDs.MAINNET] = ethereum.eip1559,
|
|
59
|
-
_a[constants_1.CHAIN_IDs.MEGAETH] = ethereum.eip1559,
|
|
60
|
-
_a[constants_1.CHAIN_IDs.MONAD] = ethereum.eip1559,
|
|
61
|
-
_a[constants_1.CHAIN_IDs.PLASMA] = ethereum.eip1559,
|
|
62
54
|
_a[constants_1.CHAIN_IDs.POLYGON] = polygon.gasStation,
|
|
63
55
|
_a[constants_1.CHAIN_IDs.SCROLL] = ethereum.legacy,
|
|
64
56
|
_a[constants_1.CHAIN_IDs.TEMPO] = ethereum.eip1559,
|
|
65
57
|
_a[constants_1.CHAIN_IDs.ZK_SYNC] = ethereum.legacy,
|
|
66
|
-
_a[constants_1.CHAIN_IDs.ARBITRUM_SEPOLIA] = arbitrum.eip1559,
|
|
67
58
|
_a[constants_1.CHAIN_IDs.POLYGON_AMOY] = polygon.gasStation,
|
|
68
|
-
_a[constants_1.CHAIN_IDs.SEPOLIA] = ethereum.eip1559,
|
|
69
59
|
_a);
|
|
70
60
|
var gasPriceFeed = gasPriceFeeds[chainId];
|
|
71
61
|
(0, assert_1.default)(gasPriceFeed || legacyFallback, "No suitable gas price oracle for Chain ID ".concat(chainId));
|
|
72
|
-
gasPriceFeed !== null && gasPriceFeed !== void 0 ? gasPriceFeed : (gasPriceFeed =
|
|
62
|
+
gasPriceFeed !== null && gasPriceFeed !== void 0 ? gasPriceFeed : (gasPriceFeed = ethereum.eip1559);
|
|
73
63
|
return gasPriceFeed(provider, opts);
|
|
74
64
|
}
|
|
75
|
-
function
|
|
65
|
+
function getGasPriceViem(chainId, opts) {
|
|
76
66
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
77
|
-
var baseFeeMultiplier, transport,
|
|
78
|
-
var _b, _c
|
|
79
|
-
return tslib_1.__generator(this, function (
|
|
80
|
-
switch (
|
|
67
|
+
var baseFeeMultiplier, transport, viemProvider, gasPriceFeeds, maxFeePerGas, maxPriorityFeePerGas, gasPrice;
|
|
68
|
+
var _a, _b, _c;
|
|
69
|
+
return tslib_1.__generator(this, function (_d) {
|
|
70
|
+
switch (_d.label) {
|
|
81
71
|
case 0:
|
|
82
72
|
baseFeeMultiplier = opts.baseFeeMultiplier, transport = opts.transport;
|
|
83
|
-
if (!(typeof providerOrChainId === "number")) return [3, 1];
|
|
84
|
-
_a = providerOrChainId;
|
|
85
|
-
return [3, 3];
|
|
86
|
-
case 1: return [4, providerOrChainId.getNetwork()];
|
|
87
|
-
case 2:
|
|
88
|
-
_a = (_e.sent()).chainId;
|
|
89
|
-
_e.label = 3;
|
|
90
|
-
case 3:
|
|
91
|
-
chainId = _a;
|
|
92
73
|
viemProvider = (0, util_1.getPublicClient)(chainId, transport);
|
|
93
|
-
gasPriceFeeds = (
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
if (!gasPriceFeeds[chainId]) return [3,
|
|
74
|
+
gasPriceFeeds = (_a = {},
|
|
75
|
+
_a[constants_1.CHAIN_IDs.LINEA] = lineaViem.eip1559,
|
|
76
|
+
_a);
|
|
77
|
+
if (!gasPriceFeeds[chainId]) return [3, 2];
|
|
97
78
|
return [4, gasPriceFeeds[chainId](viemProvider, opts)];
|
|
98
|
-
case
|
|
99
|
-
(
|
|
100
|
-
return [3,
|
|
101
|
-
case
|
|
79
|
+
case 1:
|
|
80
|
+
(_b = _d.sent(), maxFeePerGas = _b.maxFeePerGas, maxPriorityFeePerGas = _b.maxPriorityFeePerGas);
|
|
81
|
+
return [3, 4];
|
|
82
|
+
case 2:
|
|
102
83
|
gasPrice = void 0;
|
|
103
84
|
return [4, viemProvider.estimateFeesPerGas()];
|
|
104
|
-
case
|
|
105
|
-
(
|
|
85
|
+
case 3:
|
|
86
|
+
(_c = _d.sent(), maxFeePerGas = _c.maxFeePerGas, maxPriorityFeePerGas = _c.maxPriorityFeePerGas, gasPrice = _c.gasPrice);
|
|
106
87
|
maxFeePerGas !== null && maxFeePerGas !== void 0 ? maxFeePerGas : (maxFeePerGas = (gasPrice * BigInt(baseFeeMultiplier.toString())) / BigInt(utils_1.fixedPointAdjustment.toString()));
|
|
107
88
|
maxPriorityFeePerGas !== null && maxPriorityFeePerGas !== void 0 ? maxPriorityFeePerGas : (maxPriorityFeePerGas = BigInt(0));
|
|
108
|
-
|
|
109
|
-
case
|
|
89
|
+
_d.label = 4;
|
|
90
|
+
case 4: return [2, {
|
|
110
91
|
maxFeePerGas: utils_1.BigNumber.from(maxFeePerGas.toString()),
|
|
111
92
|
maxPriorityFeePerGas: utils_1.BigNumber.from(maxPriorityFeePerGas.toString()),
|
|
112
93
|
}];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oracle.js","sourceRoot":"","sources":["../../../../src/gasPriceOracle/oracle.ts"],"names":[],"mappings":";;AAuDA,
|
|
1
|
+
{"version":3,"file":"oracle.js","sourceRoot":"","sources":["../../../../src/gasPriceOracle/oracle.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,8 @@ var ArweaveClient = /** @class */ (function () {
|
|
|
13
13
|
if (retryDelaySeconds === void 0) { retryDelaySeconds = 1; }
|
|
14
14
|
this.arweaveJWT = arweaveJWT;
|
|
15
15
|
this.logger = logger;
|
|
16
|
+
this.gatewayURL = gatewayURL;
|
|
17
|
+
this.protocol = protocol;
|
|
16
18
|
this.retries = retries;
|
|
17
19
|
this.retryDelaySeconds = retryDelaySeconds;
|
|
18
20
|
this.gatewayUrl = "".concat(protocol, "://").concat(gatewayURL, ":").concat(port);
|
|
@@ -106,26 +108,26 @@ var ArweaveClient = /** @class */ (function () {
|
|
|
106
108
|
*/
|
|
107
109
|
ArweaveClient.prototype.get = function (transactionID, validator) {
|
|
108
110
|
return __awaiter(this, void 0, void 0, function () {
|
|
109
|
-
var transactionUrl,
|
|
110
|
-
|
|
111
|
-
|
|
111
|
+
var transactionUrl, request, data;
|
|
112
|
+
var _this = this;
|
|
113
|
+
return __generator(this, function (_a) {
|
|
114
|
+
switch (_a.label) {
|
|
112
115
|
case 0:
|
|
113
116
|
transactionUrl = "".concat(this.gatewayUrl, "/").concat(transactionID);
|
|
114
|
-
return
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
transactionID: transactionID,
|
|
124
|
-
responseStatus: responseStatus,
|
|
125
|
-
data: data,
|
|
117
|
+
request = function () { return __awaiter(_this, void 0, void 0, function () {
|
|
118
|
+
var requestData;
|
|
119
|
+
return __generator(this, function (_a) {
|
|
120
|
+
switch (_a.label) {
|
|
121
|
+
case 0: return [4 /*yield*/, axios.get(transactionUrl)];
|
|
122
|
+
case 1:
|
|
123
|
+
requestData = (_a.sent()).data;
|
|
124
|
+
return [2 /*return*/, requestData];
|
|
125
|
+
}
|
|
126
126
|
});
|
|
127
|
-
|
|
128
|
-
|
|
127
|
+
}); };
|
|
128
|
+
return [4 /*yield*/, this._retryRequest(request, 0)];
|
|
129
|
+
case 1:
|
|
130
|
+
data = _a.sent();
|
|
129
131
|
try {
|
|
130
132
|
// We should validate the data and perform any logical coercion here.
|
|
131
133
|
return [2 /*return*/, create(data, validator)];
|
|
@@ -262,7 +264,7 @@ var ArweaveClient = /** @class */ (function () {
|
|
|
262
264
|
baseDelay = this.retryDelaySeconds * Math.pow(2, retryCount);
|
|
263
265
|
delayS = baseDelay + baseDelay * Math.random();
|
|
264
266
|
this.logger.debug({
|
|
265
|
-
at: "ArweaveClient:
|
|
267
|
+
at: "ArweaveClient:retryRequest",
|
|
266
268
|
message: "Arweave request failed, retrying after waiting ".concat(delayS, " seconds: ").concat(e_2),
|
|
267
269
|
retryCount: retryCount,
|
|
268
270
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ArweaveClient.js","sourceRoot":"","sources":["../../../../../src/caching/Arweave/ArweaveClient.ts"],"names":[],"mappings":";AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAU,MAAM,EAAE,MAAM,aAAa,CAAC;AAE7C,OAAO,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,+BAA+B,EAAE,MAAM,iBAAiB,CAAC;AACjH,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,0BAA0B,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAE5F;IAIE,uBACU,UAAwB,EACxB,MAAsB,
|
|
1
|
+
{"version":3,"file":"ArweaveClient.js","sourceRoot":"","sources":["../../../../../src/caching/Arweave/ArweaveClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import { Transport } from "viem";
|
|
2
|
-
import { providers } from "ethers";
|
|
3
2
|
import { BigNumber } from "../utils";
|
|
4
3
|
import { SVMProvider as SolanaProvider } from "../arch/svm";
|
|
5
|
-
import { EvmGasPriceEstimate,
|
|
4
|
+
import { EvmGasPriceEstimate, SvmGasPriceEstimate } from "./types";
|
|
6
5
|
import { EvmProvider } from "../arch/evm/types";
|
|
7
6
|
export interface GasPriceEstimateOptions {
|
|
8
7
|
baseFeeMultiplier: BigNumber;
|
|
@@ -14,11 +13,3 @@ export interface GasPriceEstimateOptions {
|
|
|
14
13
|
}
|
|
15
14
|
export declare function getGasPriceEstimate(provider: EvmProvider, opts?: Partial<GasPriceEstimateOptions>): Promise<EvmGasPriceEstimate>;
|
|
16
15
|
export declare function getGasPriceEstimate(provider: SolanaProvider, opts?: Partial<GasPriceEstimateOptions>): Promise<SvmGasPriceEstimate>;
|
|
17
|
-
/**
|
|
18
|
-
* Provide an estimate for the current gas price for a particular chain.
|
|
19
|
-
* @param providerOrChainId A valid ethers provider or a chain ID.
|
|
20
|
-
* @param transport An optional Viem Transport object for custom gas price retrieval.
|
|
21
|
-
* @param unsignedTx Only used in Linea provider to estimate priority gas fee.
|
|
22
|
-
* @returns An object of type GasPriceEstimate.
|
|
23
|
-
*/
|
|
24
|
-
export declare function _getViemGasPriceEstimate(providerOrChainId: providers.Provider | number, opts: GasPriceEstimateOptions): Promise<GasPriceEstimate>;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { __assign, __awaiter, __generator } from "tslib";
|
|
2
2
|
import assert from "assert";
|
|
3
3
|
import { CHAIN_IDs } from "../constants";
|
|
4
|
-
import { BigNumber,
|
|
4
|
+
import { BigNumber, fixedPointAdjustment, isEvmProvider, toBNWei } from "../utils";
|
|
5
5
|
import { getPublicClient } from "./util";
|
|
6
6
|
import * as arbitrum from "./adapters/arbitrum";
|
|
7
7
|
import * as ethereum from "./adapters/ethereum";
|
|
@@ -45,9 +45,7 @@ export function getGasPriceEstimate(provider_1) {
|
|
|
45
45
|
chainId = _a;
|
|
46
46
|
optsWithDefaults = __assign(__assign(__assign(__assign({}, GAS_PRICE_ESTIMATE_DEFAULTS), { baseFeeMultiplier: baseFeeMultiplier, priorityFeeMultiplier: priorityFeeMultiplier }), opts), { chainId: chainId });
|
|
47
47
|
useViem = VIEM_CHAINS.includes(chainId);
|
|
48
|
-
return [2 /*return*/, useViem
|
|
49
|
-
? _getViemGasPriceEstimate(chainId, optsWithDefaults)
|
|
50
|
-
: _getEthersGasPriceEstimate(provider, optsWithDefaults)];
|
|
48
|
+
return [2 /*return*/, useViem ? getGasPriceViem(chainId, optsWithDefaults) : getGasPriceEthers(provider, optsWithDefaults)];
|
|
51
49
|
}
|
|
52
50
|
});
|
|
53
51
|
});
|
|
@@ -59,30 +57,23 @@ export function getGasPriceEstimate(provider_1) {
|
|
|
59
57
|
* @param legacyFallback In the case of an unrecognised chain, fall back to type 0 gas estimation.
|
|
60
58
|
* @returns An object of type GasPriceEstimate.
|
|
61
59
|
*/
|
|
62
|
-
function
|
|
60
|
+
function getGasPriceEthers(provider, opts) {
|
|
63
61
|
var _a;
|
|
64
62
|
var chainId = opts.chainId, legacyFallback = opts.legacyFallback;
|
|
65
63
|
// There shouldn't be any chains in here that we have a Viem adapter for because we'll always use Viem in that case.
|
|
66
64
|
assert(!VIEM_CHAINS.includes(chainId), "Chain ID ".concat(chainId, " will use Viem gas price estimation"));
|
|
67
65
|
var gasPriceFeeds = (_a = {},
|
|
68
66
|
_a[CHAIN_IDs.ARBITRUM] = arbitrum.eip1559,
|
|
69
|
-
_a[CHAIN_IDs.BSC] = ethereum.eip1559,
|
|
70
|
-
_a[CHAIN_IDs.MAINNET] = ethereum.eip1559,
|
|
71
|
-
_a[CHAIN_IDs.MEGAETH] = ethereum.eip1559,
|
|
72
|
-
_a[CHAIN_IDs.MONAD] = ethereum.eip1559,
|
|
73
|
-
_a[CHAIN_IDs.PLASMA] = ethereum.eip1559,
|
|
74
67
|
_a[CHAIN_IDs.POLYGON] = polygon.gasStation,
|
|
75
68
|
_a[CHAIN_IDs.SCROLL] = ethereum.legacy,
|
|
76
69
|
_a[CHAIN_IDs.TEMPO] = ethereum.eip1559,
|
|
77
70
|
_a[CHAIN_IDs.ZK_SYNC] = ethereum.legacy,
|
|
78
|
-
// Testnet
|
|
79
|
-
_a[CHAIN_IDs.ARBITRUM_SEPOLIA] = arbitrum.eip1559,
|
|
71
|
+
// Testnet
|
|
80
72
|
_a[CHAIN_IDs.POLYGON_AMOY] = polygon.gasStation,
|
|
81
|
-
_a[CHAIN_IDs.SEPOLIA] = ethereum.eip1559,
|
|
82
73
|
_a);
|
|
83
74
|
var gasPriceFeed = gasPriceFeeds[chainId];
|
|
84
75
|
assert(gasPriceFeed || legacyFallback, "No suitable gas price oracle for Chain ID ".concat(chainId));
|
|
85
|
-
gasPriceFeed !== null && gasPriceFeed !== void 0 ? gasPriceFeed : (gasPriceFeed =
|
|
76
|
+
gasPriceFeed !== null && gasPriceFeed !== void 0 ? gasPriceFeed : (gasPriceFeed = ethereum.eip1559);
|
|
86
77
|
return gasPriceFeed(provider, opts);
|
|
87
78
|
}
|
|
88
79
|
/**
|
|
@@ -92,41 +83,32 @@ function _getEthersGasPriceEstimate(provider, opts) {
|
|
|
92
83
|
* @param unsignedTx Only used in Linea provider to estimate priority gas fee.
|
|
93
84
|
* @returns An object of type GasPriceEstimate.
|
|
94
85
|
*/
|
|
95
|
-
|
|
86
|
+
function getGasPriceViem(chainId, opts) {
|
|
96
87
|
return __awaiter(this, void 0, void 0, function () {
|
|
97
|
-
var baseFeeMultiplier, transport,
|
|
98
|
-
var _b, _c
|
|
99
|
-
return __generator(this, function (
|
|
100
|
-
switch (
|
|
88
|
+
var baseFeeMultiplier, transport, viemProvider, gasPriceFeeds, maxFeePerGas, maxPriorityFeePerGas, gasPrice;
|
|
89
|
+
var _a, _b, _c;
|
|
90
|
+
return __generator(this, function (_d) {
|
|
91
|
+
switch (_d.label) {
|
|
101
92
|
case 0:
|
|
102
93
|
baseFeeMultiplier = opts.baseFeeMultiplier, transport = opts.transport;
|
|
103
|
-
if (!(typeof providerOrChainId === "number")) return [3 /*break*/, 1];
|
|
104
|
-
_a = providerOrChainId;
|
|
105
|
-
return [3 /*break*/, 3];
|
|
106
|
-
case 1: return [4 /*yield*/, providerOrChainId.getNetwork()];
|
|
107
|
-
case 2:
|
|
108
|
-
_a = (_e.sent()).chainId;
|
|
109
|
-
_e.label = 3;
|
|
110
|
-
case 3:
|
|
111
|
-
chainId = _a;
|
|
112
94
|
viemProvider = getPublicClient(chainId, transport);
|
|
113
|
-
gasPriceFeeds = (
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
if (!gasPriceFeeds[chainId]) return [3 /*break*/,
|
|
95
|
+
gasPriceFeeds = (_a = {},
|
|
96
|
+
_a[CHAIN_IDs.LINEA] = lineaViem.eip1559,
|
|
97
|
+
_a);
|
|
98
|
+
if (!gasPriceFeeds[chainId]) return [3 /*break*/, 2];
|
|
117
99
|
return [4 /*yield*/, gasPriceFeeds[chainId](viemProvider, opts)];
|
|
118
|
-
case
|
|
119
|
-
(
|
|
120
|
-
return [3 /*break*/,
|
|
121
|
-
case
|
|
100
|
+
case 1:
|
|
101
|
+
(_b = _d.sent(), maxFeePerGas = _b.maxFeePerGas, maxPriorityFeePerGas = _b.maxPriorityFeePerGas);
|
|
102
|
+
return [3 /*break*/, 4];
|
|
103
|
+
case 2:
|
|
122
104
|
gasPrice = void 0;
|
|
123
105
|
return [4 /*yield*/, viemProvider.estimateFeesPerGas()];
|
|
124
|
-
case
|
|
125
|
-
(
|
|
106
|
+
case 3:
|
|
107
|
+
(_c = _d.sent(), maxFeePerGas = _c.maxFeePerGas, maxPriorityFeePerGas = _c.maxPriorityFeePerGas, gasPrice = _c.gasPrice);
|
|
126
108
|
maxFeePerGas !== null && maxFeePerGas !== void 0 ? maxFeePerGas : (maxFeePerGas = (gasPrice * BigInt(baseFeeMultiplier.toString())) / BigInt(fixedPointAdjustment.toString()));
|
|
127
109
|
maxPriorityFeePerGas !== null && maxPriorityFeePerGas !== void 0 ? maxPriorityFeePerGas : (maxPriorityFeePerGas = BigInt(0));
|
|
128
|
-
|
|
129
|
-
case
|
|
110
|
+
_d.label = 4;
|
|
111
|
+
case 4: return [2 /*return*/, {
|
|
130
112
|
maxFeePerGas: BigNumber.from(maxFeePerGas.toString()),
|
|
131
113
|
maxPriorityFeePerGas: BigNumber.from(maxPriorityFeePerGas.toString()),
|
|
132
114
|
}];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oracle.js","sourceRoot":"","sources":["../../../../src/gasPriceOracle/oracle.ts"],"names":[],"mappings":";AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAG5B,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"oracle.js","sourceRoot":"","sources":["../../../../src/gasPriceOracle/oracle.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ArweaveClient.d.ts","sourceRoot":"","sources":["../../../../../src/caching/Arweave/ArweaveClient.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,OAAO,EAAE,MAAM,EAAU,MAAM,aAAa,CAAC;AAC7C,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,EAAE,SAAS,EAAsD,MAAM,aAAa,CAAC;AAE5F,qBAAa,aAAa;IAKtB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,MAAM;
|
|
1
|
+
{"version":3,"file":"ArweaveClient.d.ts","sourceRoot":"","sources":["../../../../../src/caching/Arweave/ArweaveClient.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,OAAO,EAAE,MAAM,EAAU,MAAM,aAAa,CAAC;AAC7C,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,EAAE,SAAS,EAAsD,MAAM,aAAa,CAAC;AAE5F,qBAAa,aAAa;IAKtB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,MAAM;IACP,UAAU;IACV,QAAQ;IAEf,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAVpC,OAAO,CAAC,MAAM,CAAU;IACxB,OAAO,CAAC,UAAU,CAAS;gBAGjB,UAAU,EAAE,YAAY,EACxB,MAAM,EAAE,OAAO,CAAC,MAAM,EACvB,UAAU,SAAgB,EAC1B,QAAQ,SAAU,EACzB,IAAI,SAAM,EACO,OAAO,SAAI,EACX,iBAAiB,SAAI;IAuBxC;;;;;;;;OAQG;IACG,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAwCrG;;;;;;OAMG;IACG,GAAG,CAAC,CAAC,EAAE,aAAa,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IAwB5E;;;;;;;;;;;OAWG;IACG,UAAU,CAAC,CAAC,EAChB,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,EACpB,kBAAkB,SAAkC,GACnD,OAAO,CAAC;QAAE,IAAI,EAAE,CAAC,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IA0DvC;;;;OAIG;IACG,WAAW,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;IAkBhF;;;OAGG;IACH,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;YAIf,aAAa;IAqB3B;;;OAGG;IACG,UAAU,IAAI,OAAO,CAAC,SAAS,CAAC;CAmBvC"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import { Transport } from "viem";
|
|
2
|
-
import { providers } from "ethers";
|
|
3
2
|
import { BigNumber } from "../utils";
|
|
4
3
|
import { SVMProvider as SolanaProvider } from "../arch/svm";
|
|
5
|
-
import { EvmGasPriceEstimate,
|
|
4
|
+
import { EvmGasPriceEstimate, SvmGasPriceEstimate } from "./types";
|
|
6
5
|
import { EvmProvider } from "../arch/evm/types";
|
|
7
6
|
export interface GasPriceEstimateOptions {
|
|
8
7
|
baseFeeMultiplier: BigNumber;
|
|
@@ -14,12 +13,4 @@ export interface GasPriceEstimateOptions {
|
|
|
14
13
|
}
|
|
15
14
|
export declare function getGasPriceEstimate(provider: EvmProvider, opts?: Partial<GasPriceEstimateOptions>): Promise<EvmGasPriceEstimate>;
|
|
16
15
|
export declare function getGasPriceEstimate(provider: SolanaProvider, opts?: Partial<GasPriceEstimateOptions>): Promise<SvmGasPriceEstimate>;
|
|
17
|
-
/**
|
|
18
|
-
* Provide an estimate for the current gas price for a particular chain.
|
|
19
|
-
* @param providerOrChainId A valid ethers provider or a chain ID.
|
|
20
|
-
* @param transport An optional Viem Transport object for custom gas price retrieval.
|
|
21
|
-
* @param unsignedTx Only used in Linea provider to estimate priority gas fee.
|
|
22
|
-
* @returns An object of type GasPriceEstimate.
|
|
23
|
-
*/
|
|
24
|
-
export declare function _getViemGasPriceEstimate(providerOrChainId: providers.Provider | number, opts: GasPriceEstimateOptions): Promise<GasPriceEstimate>;
|
|
25
16
|
//# sourceMappingURL=oracle.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oracle.d.ts","sourceRoot":"","sources":["../../../../src/gasPriceOracle/oracle.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"oracle.d.ts","sourceRoot":"","sources":["../../../../src/gasPriceOracle/oracle.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AAGjC,OAAO,EAAE,SAAS,EAAgD,MAAM,UAAU,CAAC;AACnF,OAAO,EAAE,WAAW,IAAI,cAAc,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAoB,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAOrF,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,WAAW,uBAAuB;IAEtC,iBAAiB,EAAE,SAAS,CAAC;IAE7B,qBAAqB,EAAE,SAAS,CAAC;IAEjC,cAAc,EAAE,OAAO,CAAC;IAExB,OAAO,EAAE,MAAM,CAAC;IAEhB,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB;AAUD,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,WAAW,EACrB,IAAI,CAAC,EAAE,OAAO,CAAC,uBAAuB,CAAC,GACtC,OAAO,CAAC,mBAAmB,CAAC,CAAC;AAGhC,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,cAAc,EACxB,IAAI,CAAC,EAAE,OAAO,CAAC,uBAAuB,CAAC,GACtC,OAAO,CAAC,mBAAmB,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -13,8 +13,8 @@ export class ArweaveClient {
|
|
|
13
13
|
public constructor(
|
|
14
14
|
private arweaveJWT: JWKInterface,
|
|
15
15
|
private logger: winston.Logger,
|
|
16
|
-
gatewayURL = "arweave.net",
|
|
17
|
-
protocol = "https",
|
|
16
|
+
public gatewayURL = "arweave.net",
|
|
17
|
+
public protocol = "https",
|
|
18
18
|
port = 443,
|
|
19
19
|
private readonly retries = 2,
|
|
20
20
|
private readonly retryDelaySeconds = 1
|
|
@@ -102,19 +102,11 @@ export class ArweaveClient {
|
|
|
102
102
|
// We should query in via Axios directly to the gateway URL. The reasoning behind this is
|
|
103
103
|
// that the Arweave SDK's `getData` method is too slow and does not provide a way to set a timeout.
|
|
104
104
|
// Therefore, something that could take milliseconds to complete could take tens of minutes.
|
|
105
|
-
const
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
at: "ArweaveClient:get",
|
|
111
|
-
message: "Failed to retrieve value from Arweave - network error or invalid response status",
|
|
112
|
-
transactionID,
|
|
113
|
-
responseStatus,
|
|
114
|
-
data,
|
|
115
|
-
});
|
|
116
|
-
return null;
|
|
117
|
-
}
|
|
105
|
+
const request = async () => {
|
|
106
|
+
const { data: requestData } = await axios.get(transactionUrl);
|
|
107
|
+
return requestData;
|
|
108
|
+
};
|
|
109
|
+
const data = await this._retryRequest(request, 0);
|
|
118
110
|
try {
|
|
119
111
|
// We should validate the data and perform any logical coercion here.
|
|
120
112
|
return create(data, validator);
|
|
@@ -242,7 +234,7 @@ export class ArweaveClient {
|
|
|
242
234
|
const baseDelay = this.retryDelaySeconds * Math.pow(2, retryCount); // ms; attempt = [0, 1, 2, ...]
|
|
243
235
|
const delayS = baseDelay + baseDelay * Math.random();
|
|
244
236
|
this.logger.debug({
|
|
245
|
-
at: "ArweaveClient:
|
|
237
|
+
at: "ArweaveClient:retryRequest",
|
|
246
238
|
message: `Arweave request failed, retrying after waiting ${delayS} seconds: ${e}`,
|
|
247
239
|
retryCount,
|
|
248
240
|
});
|
|
@@ -2,7 +2,7 @@ import assert from "assert";
|
|
|
2
2
|
import { Transport } from "viem";
|
|
3
3
|
import { providers } from "ethers";
|
|
4
4
|
import { CHAIN_IDs } from "../constants";
|
|
5
|
-
import { BigNumber,
|
|
5
|
+
import { BigNumber, fixedPointAdjustment, isEvmProvider, toBNWei } from "../utils";
|
|
6
6
|
import { SVMProvider as SolanaProvider } from "../arch/svm";
|
|
7
7
|
import { EvmGasPriceEstimate, GasPriceEstimate, SvmGasPriceEstimate } from "./types";
|
|
8
8
|
import { getPublicClient } from "./util";
|
|
@@ -84,9 +84,7 @@ export async function getGasPriceEstimate(
|
|
|
84
84
|
|
|
85
85
|
// We only use the unsignedTx in the viem flow.
|
|
86
86
|
const useViem = VIEM_CHAINS.includes(chainId);
|
|
87
|
-
return useViem
|
|
88
|
-
? _getViemGasPriceEstimate(chainId, optsWithDefaults)
|
|
89
|
-
: _getEthersGasPriceEstimate(provider, optsWithDefaults);
|
|
87
|
+
return useViem ? getGasPriceViem(chainId, optsWithDefaults) : getGasPriceEthers(provider, optsWithDefaults);
|
|
90
88
|
}
|
|
91
89
|
|
|
92
90
|
/**
|
|
@@ -96,35 +94,24 @@ export async function getGasPriceEstimate(
|
|
|
96
94
|
* @param legacyFallback In the case of an unrecognised chain, fall back to type 0 gas estimation.
|
|
97
95
|
* @returns An object of type GasPriceEstimate.
|
|
98
96
|
*/
|
|
99
|
-
function
|
|
100
|
-
provider: providers.Provider,
|
|
101
|
-
opts: GasPriceEstimateOptions
|
|
102
|
-
): Promise<GasPriceEstimate> {
|
|
97
|
+
function getGasPriceEthers(provider: providers.Provider, opts: GasPriceEstimateOptions): Promise<GasPriceEstimate> {
|
|
103
98
|
const { chainId, legacyFallback } = opts;
|
|
104
99
|
|
|
105
100
|
// There shouldn't be any chains in here that we have a Viem adapter for because we'll always use Viem in that case.
|
|
106
101
|
assert(!VIEM_CHAINS.includes(chainId), `Chain ID ${chainId} will use Viem gas price estimation`);
|
|
107
102
|
const gasPriceFeeds = {
|
|
108
103
|
[CHAIN_IDs.ARBITRUM]: arbitrum.eip1559,
|
|
109
|
-
[CHAIN_IDs.BSC]: ethereum.eip1559,
|
|
110
|
-
[CHAIN_IDs.MAINNET]: ethereum.eip1559,
|
|
111
|
-
[CHAIN_IDs.MEGAETH]: ethereum.eip1559,
|
|
112
|
-
[CHAIN_IDs.MONAD]: ethereum.eip1559,
|
|
113
|
-
[CHAIN_IDs.PLASMA]: ethereum.eip1559,
|
|
114
104
|
[CHAIN_IDs.POLYGON]: polygon.gasStation,
|
|
115
105
|
[CHAIN_IDs.SCROLL]: ethereum.legacy,
|
|
116
106
|
[CHAIN_IDs.TEMPO]: ethereum.eip1559,
|
|
117
107
|
[CHAIN_IDs.ZK_SYNC]: ethereum.legacy,
|
|
118
|
-
|
|
119
|
-
// Testnet Chains
|
|
120
|
-
[CHAIN_IDs.ARBITRUM_SEPOLIA]: arbitrum.eip1559,
|
|
108
|
+
// Testnet
|
|
121
109
|
[CHAIN_IDs.POLYGON_AMOY]: polygon.gasStation,
|
|
122
|
-
[CHAIN_IDs.SEPOLIA]: ethereum.eip1559,
|
|
123
110
|
} as const;
|
|
124
111
|
|
|
125
112
|
let gasPriceFeed = gasPriceFeeds[chainId];
|
|
126
113
|
assert(gasPriceFeed || legacyFallback, `No suitable gas price oracle for Chain ID ${chainId}`);
|
|
127
|
-
gasPriceFeed ??=
|
|
114
|
+
gasPriceFeed ??= ethereum.eip1559;
|
|
128
115
|
|
|
129
116
|
return gasPriceFeed(provider, opts);
|
|
130
117
|
}
|
|
@@ -136,16 +123,10 @@ function _getEthersGasPriceEstimate(
|
|
|
136
123
|
* @param unsignedTx Only used in Linea provider to estimate priority gas fee.
|
|
137
124
|
* @returns An object of type GasPriceEstimate.
|
|
138
125
|
*/
|
|
139
|
-
|
|
140
|
-
providerOrChainId: providers.Provider | number,
|
|
141
|
-
opts: GasPriceEstimateOptions
|
|
142
|
-
): Promise<GasPriceEstimate> {
|
|
126
|
+
async function getGasPriceViem(chainId: number, opts: GasPriceEstimateOptions): Promise<GasPriceEstimate> {
|
|
143
127
|
const { baseFeeMultiplier, transport } = opts;
|
|
144
128
|
|
|
145
|
-
const chainId =
|
|
146
|
-
typeof providerOrChainId === "number" ? providerOrChainId : (await providerOrChainId.getNetwork()).chainId;
|
|
147
129
|
const viemProvider = getPublicClient(chainId, transport);
|
|
148
|
-
|
|
149
130
|
const gasPriceFeeds = {
|
|
150
131
|
[CHAIN_IDs.LINEA]: lineaViem.eip1559,
|
|
151
132
|
};
|