@across-protocol/sdk 4.3.111-alpha.0 → 4.3.111-alpha.1

package/dist/esm/gasPriceOracle/adapters/linea-viem.js

@@ -1,4 +1,3 @@
-import { __awaiter, __generator } from "tslib";
 import { estimateGas } from "viem/linea";
 import { DEFAULT_SIMULATED_RELAYER_ADDRESS as account } from "../../constants";
 import { fixedPointAdjustment } from "../../utils";
@@ -19,30 +18,19 @@ import { fixedPointAdjustment } from "../../utils";
  * here: https://docs.linea.build/api/reference/linea-estimategas#parameters
  * @returns
  */
-export function eip1559(provider, opts) {
-    return __awaiter(this, void 0, void 0, function () {
-        var _unsignedTx, priorityFeeMultiplier, unsignedTx, _a, baseFeePerGas, _priorityFeePerGas, priorityFeePerGas;
-        var _b, _c, _d, _e, _f;
-        return __generator(this, function (_g) {
-            switch (_g.label) {
-                case 0:
-                    _unsignedTx = opts.unsignedTx, priorityFeeMultiplier = opts.priorityFeeMultiplier;
-                    unsignedTx = _unsignedTx;
-                    return [4 /*yield*/, estimateGas(provider, {
-                            account: (_b = unsignedTx === null || unsignedTx === void 0 ? void 0 : unsignedTx.from) !== null && _b !== void 0 ? _b : account,
-                            to: (_c = unsignedTx === null || unsignedTx === void 0 ? void 0 : unsignedTx.to) !== null && _c !== void 0 ? _c : account,
-                            value: BigInt((_e = (_d = unsignedTx === null || unsignedTx === void 0 ? void 0 : unsignedTx.value) === null || _d === void 0 ? void 0 : _d.toString()) !== null && _e !== void 0 ? _e : "0"),
-                            data: (_f = unsignedTx === null || unsignedTx === void 0 ? void 0 : unsignedTx.data) !== null && _f !== void 0 ? _f : "0x",
-                        })];
-                case 1:
-                    _a = _g.sent(), baseFeePerGas = _a.baseFeePerGas, _priorityFeePerGas = _a.priorityFeePerGas;
-                    priorityFeePerGas = (_priorityFeePerGas * BigInt(priorityFeeMultiplier.toString())) / BigInt(fixedPointAdjustment.toString());
-                    return [2 /*return*/, {
-                            maxFeePerGas: baseFeePerGas + priorityFeePerGas,
-                            maxPriorityFeePerGas: priorityFeePerGas,
-                        }];
-            }
-        });
+export async function eip1559(provider, opts) {
+    const { unsignedTx: _unsignedTx, priorityFeeMultiplier } = opts;
+    const unsignedTx = _unsignedTx; // Cast the opaque unsignedTx type to an ethers PopulatedTransaction.
+    const { baseFeePerGas, priorityFeePerGas: _priorityFeePerGas } = await estimateGas(provider, {
+        account: unsignedTx?.from ?? account,
+        to: unsignedTx?.to ?? account,
+        value: BigInt(unsignedTx?.value?.toString() ?? "0"),
+        data: unsignedTx?.data ?? "0x",
     });
+    const priorityFeePerGas = (_priorityFeePerGas * BigInt(priorityFeeMultiplier.toString())) / BigInt(fixedPointAdjustment.toString());
+    return {
+        maxFeePerGas: baseFeePerGas + priorityFeePerGas,
+        maxPriorityFeePerGas: priorityFeePerGas,
+    };
 }
 //# sourceMappingURL=linea-viem.js.map

package/dist/esm/gasPriceOracle/adapters/linea-viem.js.map

@@ -1 +1 @@
-{"version":3,"file":"linea-viem.js","sourceRoot":"","sources":["../../../../src/gasPriceOracle/adapters/linea-viem.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,iCAAiC,IAAI,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAG/E,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnD;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,UAAgB,OAAO,CAC3B,QAAsB,EACtB,IAA6B;;;;;;;oBAET,WAAW,GAA4B,IAAI,WAAhC,EAAE,qBAAqB,GAAK,IAAI,sBAAT,CAAU;oBAC1D,UAAU,GAAG,WAAmC,CAAC;oBACU,qBAAM,WAAW,CAAC,QAAQ,EAAE;4BAC3F,OAAO,EAAE,MAAC,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAgB,mCAAI,OAAO;4BACjD,EAAE,EAAE,MAAC,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,EAAc,mCAAI,OAAO;4BAC1C,KAAK,EAAE,MAAM,CAAC,MAAA,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,KAAK,0CAAE,QAAQ,EAAE,mCAAI,GAAG,CAAC;4BACnD,IAAI,EAAE,MAAC,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAY,mCAAI,IAAI;yBACxC,CAAC,EAAA;;oBALI,KAA2D,SAK/D,EALM,aAAa,mBAAA,EAAqB,kBAAkB,uBAAA;oBAMtD,iBAAiB,GACrB,CAAC,kBAAkB,GAAG,MAAM,CAAC,qBAAqB,CAAC,QAAQ,EAAE,CAAC,CAAC,GAAG,MAAM,CAAC,oBAAoB,CAAC,QAAQ,EAAE,CAAC,CAAC;oBAE5G,sBAAO;4BACL,YAAY,EAAE,aAAa,GAAG,iBAAiB;4BAC/C,oBAAoB,EAAE,iBAAiB;yBACxC,EAAC;;;;CACH"}
+{"version":3,"file":"linea-viem.js","sourceRoot":"","sources":["../../../../src/gasPriceOracle/adapters/linea-viem.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,iCAAiC,IAAI,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAG/E,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnD;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,CAAC,KAAK,UAAU,OAAO,CAC3B,QAAsB,EACtB,IAA6B;IAE7B,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,qBAAqB,EAAE,GAAG,IAAI,CAAC;IAChE,MAAM,UAAU,GAAG,WAAmC,CAAC,CAAC,qEAAqE;IAC7H,MAAM,EAAE,aAAa,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,GAAG,MAAM,WAAW,CAAC,QAAQ,EAAE;QAC3F,OAAO,EAAG,UAAU,EAAE,IAAgB,IAAI,OAAO;QACjD,EAAE,EAAG,UAAU,EAAE,EAAc,IAAI,OAAO;QAC1C,KAAK,EAAE,MAAM,CAAC,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,GAAG,CAAC;QACnD,IAAI,EAAG,UAAU,EAAE,IAAY,IAAI,IAAI;KACxC,CAAC,CAAC;IACH,MAAM,iBAAiB,GACrB,CAAC,kBAAkB,GAAG,MAAM,CAAC,qBAAqB,CAAC,QAAQ,EAAE,CAAC,CAAC,GAAG,MAAM,CAAC,oBAAoB,CAAC,QAAQ,EAAE,CAAC,CAAC;IAE5G,OAAO;QACL,YAAY,EAAE,aAAa,GAAG,iBAAiB;QAC/C,oBAAoB,EAAE,iBAAiB;KACxC,CAAC;AACJ,CAAC"}

package/dist/esm/gasPriceOracle/adapters/polygon.js

@@ -1,133 +1,97 @@
-import { __awaiter, __extends, __generator } from "tslib";
 import { BaseHTTPAdapter } from "../../priceClient/adapters/baseAdapter";
 import { bnZero, fixedPointAdjustment, isDefined, parseUnits } from "../../utils";
 import { CHAIN_IDs } from "../../constants";
 import { gasPriceError } from "../util";
 import { eip1559 } from "./ethereum";
-var POLYGON = CHAIN_IDs.POLYGON;
-var PolygonGasStation = /** @class */ (function (_super) {
-    __extends(PolygonGasStation, _super);
-    function PolygonGasStation(_a) {
-        var _b = _a === void 0 ? {} : _a, _c = _b.chainId, chainId = _c === void 0 ? POLYGON : _c, host = _b.host, _d = _b.timeout, timeout = _d === void 0 ? 1500 : _d, _e = _b.retries, retries = _e === void 0 ? 1 : _e;
-        var _this = this;
-        host = (host !== null && host !== void 0 ? host : chainId === POLYGON) ? "gasstation.polygon.technology" : "gasstation-testnet.polygon.technology";
-        _this = _super.call(this, "Polygon Gas Station", host, { timeout: timeout, retries: retries }) || this;
-        _this.chainId = chainId;
-        return _this;
+const { POLYGON } = CHAIN_IDs;
+export class PolygonGasStation extends BaseHTTPAdapter {
+    chainId;
+    constructor({ chainId = POLYGON, host, timeout = 1500, retries = 1 } = {}) {
+        host = host ?? chainId === POLYGON ? "gasstation.polygon.technology" : "gasstation-testnet.polygon.technology";
+        super("Polygon Gas Station", host, { timeout, retries });
+        this.chainId = chainId;
     }
-    PolygonGasStation.prototype.getFeeData = function () {
-        return __awaiter(this, arguments, void 0, function (strategy) {
-            var gas, gasPrice, maxPriorityFeePerGas, maxFeePerGas;
-            var _this = this;
-            if (strategy === void 0) { strategy = "fast"; }
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.query("v2", {})];
-                    case 1:
-                        gas = _a.sent();
-                        gasPrice = gas === null || gas === void 0 ? void 0 : gas[strategy];
-                        if (!this.isPolygon1559GasPrice(gasPrice)) {
-                            // @todo: generalise gasPriceError() to accept a reason/cause?
-                            gasPriceError("getFeeData()", this.chainId, bnZero);
-                        }
-                        [gasPrice.maxFee, gasPrice.maxPriorityFee].forEach(function (gasPrice) {
-                            if (Number(gasPrice) < 0) {
-                                gasPriceError("getFeeData()", _this.chainId, parseUnits(gasPrice.toString(), 9));
-                            }
-                        });
-                        maxPriorityFeePerGas = parseUnits(gasPrice.maxPriorityFee.toString(), 9);
-                        maxFeePerGas = parseUnits(gasPrice.maxFee.toString(), 9);
-                        return [2 /*return*/, { maxPriorityFeePerGas: maxPriorityFeePerGas, maxFeePerGas: maxFeePerGas }];
-                }
-            });
+    async getFeeData(strategy = "fast") {
+        const gas = await this.query("v2", {});
+        const gasPrice = gas?.[strategy];
+        if (!this.isPolygon1559GasPrice(gasPrice)) {
+            // @todo: generalise gasPriceError() to accept a reason/cause?
+            gasPriceError("getFeeData()", this.chainId, bnZero);
+        }
+        [gasPrice.maxFee, gasPrice.maxPriorityFee].forEach((gasPrice) => {
+            if (Number(gasPrice) < 0) {
+                gasPriceError("getFeeData()", this.chainId, parseUnits(gasPrice.toString(), 9));
+            }
         });
-    };
-    PolygonGasStation.prototype.isPolygon1559GasPrice = function (gasPrice) {
+        const maxPriorityFeePerGas = parseUnits(gasPrice.maxPriorityFee.toString(), 9);
+        const maxFeePerGas = parseUnits(gasPrice.maxFee.toString(), 9);
+        return { maxPriorityFeePerGas, maxFeePerGas };
+    }
+    isPolygon1559GasPrice(gasPrice) {
         if (!isDefined(gasPrice)) {
             return false;
         }
-        var _gasPrice = gasPrice;
-        return [_gasPrice.maxPriorityFee, _gasPrice.maxFee].every(function (field) { return ["number", "string"].includes(typeof field); });
-    };
-    return PolygonGasStation;
-}(BaseHTTPAdapter));
-export { PolygonGasStation };
-var MockRevertingPolygonGasStation = /** @class */ (function (_super) {
-    __extends(MockRevertingPolygonGasStation, _super);
-    function MockRevertingPolygonGasStation() {
-        return _super !== null && _super.apply(this, arguments) || this;
+        const _gasPrice = gasPrice;
+        return [_gasPrice.maxPriorityFee, _gasPrice.maxFee].every((field) => ["number", "string"].includes(typeof field));
     }
-    MockRevertingPolygonGasStation.prototype.getFeeData = function () {
+}
+class MockRevertingPolygonGasStation extends PolygonGasStation {
+    getFeeData() {
         throw new Error();
-    };
-    return MockRevertingPolygonGasStation;
-}(PolygonGasStation));
-export var MockPolygonGasStationBaseFee = function () { return parseUnits("12", 9); };
-export var MockPolygonGasStationPriorityFee = function () { return parseUnits("1", 9); };
-var MockPolygonGasStation = /** @class */ (function (_super) {
-    __extends(MockPolygonGasStation, _super);
-    function MockPolygonGasStation() {
-        return _super !== null && _super.apply(this, arguments) || this;
     }
-    MockPolygonGasStation.prototype.getFeeData = function () {
+}
+export const MockPolygonGasStationBaseFee = () => parseUnits("12", 9);
+export const MockPolygonGasStationPriorityFee = () => parseUnits("1", 9);
+class MockPolygonGasStation extends PolygonGasStation {
+    getFeeData() {
         return Promise.resolve({
             maxPriorityFeePerGas: MockPolygonGasStationPriorityFee(),
             maxFeePerGas: MockPolygonGasStationBaseFee().add(MockPolygonGasStationPriorityFee()),
         });
-    };
-    return MockPolygonGasStation;
-}(PolygonGasStation));
+    }
+}
 /**
  * @notice Returns the gas price suggested by the Polygon GasStation API or reconstructs it using
  * the eip1559() method as a fallback.
  * @param provider Ethers Provider.
  * @returns EvmGasPriceEstimate
  */
-export function gasStation(provider, opts) {
-    return __awaiter(this, void 0, void 0, function () {
-        var chainId, baseFeeMultiplier, priorityFeeMultiplier, gasStation, maxPriorityFeePerGas, maxFeePerGas, baseFeeMinusPriorityFee, scaledBaseFee, scaledPriorityFee, err_1, minPriorityFee, priorityDelta;
-        var _a, _b;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
-                case 0:
-                    chainId = opts.chainId, baseFeeMultiplier = opts.baseFeeMultiplier, priorityFeeMultiplier = opts.priorityFeeMultiplier;
-                    if (process.env.TEST_POLYGON_GAS_STATION === "true") {
-                        gasStation = new MockPolygonGasStation();
-                    }
-                    else if (process.env.TEST_REVERTING_POLYGON_GAS_STATION === "true") {
-                        gasStation = new MockRevertingPolygonGasStation();
-                    }
-                    else {
-                        gasStation = new PolygonGasStation({ chainId: chainId, timeout: 2000, retries: 0 });
-                    }
-                    _c.label = 1;
-                case 1:
-                    _c.trys.push([1, 3, , 5]);
-                    return [4 /*yield*/, gasStation.getFeeData()];
-                case 2:
-                    (_a = _c.sent(), maxPriorityFeePerGas = _a.maxPriorityFeePerGas, maxFeePerGas = _a.maxFeePerGas);
-                    baseFeeMinusPriorityFee = maxFeePerGas.sub(maxPriorityFeePerGas);
-                    scaledBaseFee = baseFeeMinusPriorityFee.mul(baseFeeMultiplier).div(fixedPointAdjustment);
-                    scaledPriorityFee = maxPriorityFeePerGas.mul(priorityFeeMultiplier).div(fixedPointAdjustment);
-                    maxFeePerGas = scaledBaseFee.add(scaledPriorityFee);
-                    maxPriorityFeePerGas = scaledPriorityFee;
-                    return [3 /*break*/, 5];
-                case 3:
-                    err_1 = _c.sent();
-                    return [4 /*yield*/, eip1559(provider, opts)];
-                case 4:
-                    // Fall back to the RPC provider. May be less accurate.
-                    (_b = _c.sent(), maxPriorityFeePerGas = _b.maxPriorityFeePerGas, maxFeePerGas = _b.maxFeePerGas);
-                    minPriorityFee = parseUnits("30", 9).mul(priorityFeeMultiplier).div(fixedPointAdjustment);
-                    if (maxPriorityFeePerGas.lt(minPriorityFee)) {
-                        priorityDelta = minPriorityFee.sub(maxPriorityFeePerGas);
-                        maxPriorityFeePerGas = minPriorityFee;
-                        maxFeePerGas = maxFeePerGas.add(priorityDelta);
-                    }
-                    return [3 /*break*/, 5];
-                case 5: return [2 /*return*/, { maxPriorityFeePerGas: maxPriorityFeePerGas, maxFeePerGas: maxFeePerGas }];
-            }
-        });
-    });
+export async function gasStation(provider, opts) {
+    const { chainId, baseFeeMultiplier, priorityFeeMultiplier } = opts;
+    let gasStation;
+    if (process.env.TEST_POLYGON_GAS_STATION === "true") {
+        gasStation = new MockPolygonGasStation();
+    }
+    else if (process.env.TEST_REVERTING_POLYGON_GAS_STATION === "true") {
+        gasStation = new MockRevertingPolygonGasStation();
+    }
+    else {
+        gasStation = new PolygonGasStation({ chainId: chainId, timeout: 2000, retries: 0 });
+    }
+    let maxPriorityFeePerGas;
+    let maxFeePerGas;
+    try {
+        ({ maxPriorityFeePerGas, maxFeePerGas } = await gasStation.getFeeData());
+        // Assume that the maxFeePerGas already includes the priority fee, so back out the priority fee before applying
+        // the baseFeeMultiplier.
+        const baseFeeMinusPriorityFee = maxFeePerGas.sub(maxPriorityFeePerGas);
+        const scaledBaseFee = baseFeeMinusPriorityFee.mul(baseFeeMultiplier).div(fixedPointAdjustment);
+        const scaledPriorityFee = maxPriorityFeePerGas.mul(priorityFeeMultiplier).div(fixedPointAdjustment);
+        maxFeePerGas = scaledBaseFee.add(scaledPriorityFee);
+        maxPriorityFeePerGas = scaledPriorityFee;
+    }
+    catch (err) {
+        // Fall back to the RPC provider. May be less accurate.
+        ({ maxPriorityFeePerGas, maxFeePerGas } = await eip1559(provider, opts));
+        // Per the GasStation docs, the minimum priority fee on Polygon is 30 Gwei.
+        // https://docs.polygon.technology/tools/gas/polygon-gas-station/#interpretation
+        const minPriorityFee = parseUnits("30", 9).mul(priorityFeeMultiplier).div(fixedPointAdjustment);
+        if (maxPriorityFeePerGas.lt(minPriorityFee)) {
+            const priorityDelta = minPriorityFee.sub(maxPriorityFeePerGas);
+            maxPriorityFeePerGas = minPriorityFee;
+            maxFeePerGas = maxFeePerGas.add(priorityDelta);
+        }
+    }
+    return { maxPriorityFeePerGas, maxFeePerGas };
 }
 //# sourceMappingURL=polygon.js.map

package/dist/esm/gasPriceOracle/adapters/polygon.js.map

@@ -1 +1 @@
-{"version":3,"file":"polygon.js","sourceRoot":"","sources":["../../../../src/gasPriceOracle/adapters/polygon.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"polygon.js","sourceRoot":"","sources":["../../../../src/gasPriceOracle/adapters/polygon.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAuB,MAAM,wCAAwC,CAAC;AAC9F,OAAO,EAAa,MAAM,EAAE,oBAAoB,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC7F,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAsBrC,MAAM,EAAE,OAAO,EAAE,GAAG,SAAS,CAAC;AAE9B,MAAM,OAAO,iBAAkB,SAAQ,eAAe;IAC3C,OAAO,CAAS;IAEzB,YAAY,EAAE,OAAO,GAAG,OAAO,EAAE,IAAI,EAAE,OAAO,GAAG,IAAI,EAAE,OAAO,GAAG,CAAC,KAAqB,EAAE;QACvF,IAAI,GAAG,IAAI,IAAI,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,+BAA+B,CAAC,CAAC,CAAC,uCAAuC,CAAC;QAE/G,KAAK,CAAC,qBAAqB,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QACzD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,WAA4C,MAAM;QACjE,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAEvC,MAAM,QAAQ,GAAI,GAA4B,EAAE,CAAC,QAAQ,CAAC,CAAC;QAC3D,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC1C,8DAA8D;YAC9D,aAAa,CAAC,cAAc,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACtD,CAAC;QAED,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;YAC9D,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBACzB,aAAa,CAAC,cAAc,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;YAClF,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,oBAAoB,GAAG,UAAU,CAAC,QAAQ,CAAC,cAAc,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;QAC/E,MAAM,YAAY,GAAG,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;QAE/D,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,CAAC;IAChD,CAAC;IAES,qBAAqB,CAAC,QAAiB;QAC/C,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;YACzB,OAAO,KAAK,CAAC;QACf,CAAC;QACD,MAAM,SAAS,GAAG,QAA+B,CAAC;QAClD,OAAO,CAAC,SAAS,CAAC,cAAc,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC;IACpH,CAAC;CACF;AAED,MAAM,8BAA+B,SAAQ,iBAAiB;IAC5D,UAAU;QACR,MAAM,IAAI,KAAK,EAAE,CAAC;IACpB,CAAC;CACF;AAED,MAAM,CAAC,MAAM,4BAA4B,GAAG,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;AACtE,MAAM,CAAC,MAAM,gCAAgC,GAAG,GAAG,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;AAEzE,MAAM,qBAAsB,SAAQ,iBAAiB;IACnD,UAAU;QACR,OAAO,OAAO,CAAC,OAAO,CAAC;YACrB,oBAAoB,EAAE,gCAAgC,EAAE;YACxD,YAAY,EAAE,4BAA4B,EAAE,CAAC,GAAG,CAAC,gCAAgC,EAAE,CAAC;SACrF,CAAC,CAAC;IACL,CAAC;CACF;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,QAA4B,EAC5B,IAA6B;IAE7B,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,GAAG,IAAI,CAAC;IACnE,IAAI,UAA6B,CAAC;IAClC,IAAI,OAAO,CAAC,GAAG,CAAC,wBAAwB,KAAK,MAAM,EAAE,CAAC;QACpD,UAAU,GAAG,IAAI,qBAAqB,EAAE,CAAC;IAC3C,CAAC;SAAM,IAAI,OAAO,CAAC,GAAG,CAAC,kCAAkC,KAAK,MAAM,EAAE,CAAC;QACrE,UAAU,GAAG,IAAI,8BAA8B,EAAE,CAAC;IACpD,CAAC;SAAM,CAAC;QACN,UAAU,GAAG,IAAI,iBAAiB,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;IACtF,CAAC;IACD,IAAI,oBAA+B,CAAC;IACpC,IAAI,YAAuB,CAAC;IAC5B,IAAI,CAAC;QACH,CAAC,EAAE,oBAAoB,EAAE,YAAY,EAAE,GAAG,MAAM,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC;QACzE,+GAA+G;QAC/G,yBAAyB;QACzB,MAAM,uBAAuB,GAAG,YAAY,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;QACvE,MAAM,aAAa,GAAG,uBAAuB,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;QAC/F,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;QACpG,YAAY,GAAG,aAAa,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QACpD,oBAAoB,GAAG,iBAAiB,CAAC;IAC3C,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,uDAAuD;QACvD,CAAC,EAAE,oBAAoB,EAAE,YAAY,EAAE,GAAG,MAAM,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;QAEzE,2EAA2E;QAC3E,gFAAgF;QAChF,MAAM,cAAc,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;QAChG,IAAI,oBAAoB,CAAC,EAAE,CAAC,cAAc,CAAC,EAAE,CAAC;YAC5C,MAAM,aAAa,GAAG,cAAc,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;YAC/D,oBAAoB,GAAG,cAAc,CAAC;YACtC,YAAY,GAAG,YAAY,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QACjD,CAAC;IACH,CAAC;IAED,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,CAAC;AAChD,CAAC"}

package/dist/esm/gasPriceOracle/adapters/solana.js

@@ -1,39 +1,30 @@
-import { __awaiter, __generator } from "tslib";
 import { toBN, dedupArray } from "../../utils";
 import { compileTransaction } from "@solana/kit";
 /**
  * @notice Returns result of getFeeForMessage and getRecentPrioritizationFees RPC calls.
  * @returns GasPriceEstimate
  */
-export function messageFee(provider, opts) {
-    return __awaiter(this, void 0, void 0, function () {
-        var _unsignedTx, unsignedTx, compiledTransaction, encodedTransactionMessage, baseFeeResponse, instructionAddresses, recentPriorityFees, nonzeroPrioritizationFees, totalPrioritizationFees, microLamportsPerComputeUnit;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    _unsignedTx = opts.unsignedTx;
-                    unsignedTx = _unsignedTx;
-                    compiledTransaction = compileTransaction(unsignedTx);
-                    encodedTransactionMessage = Buffer.from(compiledTransaction.messageBytes).toString("base64");
-                    return [4 /*yield*/, provider.getFeeForMessage(encodedTransactionMessage).send()];
-                case 1:
-                    baseFeeResponse = _a.sent();
-                    instructionAddresses = dedupArray(unsignedTx.instructions.map(function (instruction) { return instruction.programAddress; }));
-                    return [4 /*yield*/, provider.getRecentPrioritizationFees(instructionAddresses).send()];
-                case 2:
-                    recentPriorityFees = _a.sent();
-                    nonzeroPrioritizationFees = recentPriorityFees
-                        .slice(125)
-                        .map(function (value) { return value.prioritizationFee; })
-                        .filter(function (fee) { return fee > 0; });
-                    totalPrioritizationFees = nonzeroPrioritizationFees.reduce(function (acc, fee) { return acc + fee; }, BigInt(0));
-                    microLamportsPerComputeUnit = toBN(totalPrioritizationFees / BigInt(Math.max(nonzeroPrioritizationFees.length, 1)));
-                    return [2 /*return*/, {
-                            baseFee: toBN(baseFeeResponse.value),
-                            microLamportsPerComputeUnit: microLamportsPerComputeUnit,
-                        }];
-            }
-        });
-    });
+export async function messageFee(provider, opts) {
+    const { unsignedTx: _unsignedTx } = opts;
+    // Cast the opaque unsignedTx type to a solana-kit CompilableTransactionMessage.
+    const unsignedTx = _unsignedTx;
+    const compiledTransaction = compileTransaction(unsignedTx);
+    // Get this base fee. This should result in LAMPORTS_PER_SIGNATURE * nSignatures.
+    const encodedTransactionMessage = Buffer.from(compiledTransaction.messageBytes).toString("base64");
+    const baseFeeResponse = await provider.getFeeForMessage(encodedTransactionMessage).send();
+    // Get the priority fee by calling `getRecentPrioritzationFees` on all the addresses in the transaction's instruction array.
+    const instructionAddresses = dedupArray(unsignedTx.instructions.map((instruction) => instruction.programAddress));
+    const recentPriorityFees = await provider.getRecentPrioritizationFees(instructionAddresses).send();
+    // Take the most recent 25 slots and find the average of the nonzero priority fees.
+    const nonzeroPrioritizationFees = recentPriorityFees
+        .slice(125)
+        .map((value) => value.prioritizationFee)
+        .filter((fee) => fee > 0);
+    const totalPrioritizationFees = nonzeroPrioritizationFees.reduce((acc, fee) => acc + fee, BigInt(0));
+    const microLamportsPerComputeUnit = toBN(totalPrioritizationFees / BigInt(Math.max(nonzeroPrioritizationFees.length, 1)));
+    return {
+        baseFee: toBN(baseFeeResponse.value),
+        microLamportsPerComputeUnit,
+    };
 }
 //# sourceMappingURL=solana.js.map

package/dist/esm/gasPriceOracle/adapters/solana.js.map

@@ -1 +1 @@
-{"version":3,"file":"solana.js","sourceRoot":"","sources":["../../../../src/gasPriceOracle/adapters/solana.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAG/C,OAAO,EAA+D,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAE9G;;;GAGG;AACH,MAAM,UAAgB,UAAU,CAAC,QAAqB,EAAE,IAA6B;;;;;;oBAC/D,WAAW,GAAK,IAAI,WAAT,CAAU;oBAGnC,UAAU,GAAG,WAA2C,CAAC;oBACzD,mBAAmB,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;oBAGrD,yBAAyB,GAAG,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAC,QAAQ,CACtF,QAAQ,CACwB,CAAC;oBACX,qBAAM,QAAQ,CAAC,gBAAgB,CAAC,yBAAyB,CAAC,CAAC,IAAI,EAAE,EAAA;;oBAAnF,eAAe,GAAG,SAAiE;oBAGnF,oBAAoB,GAAG,UAAU,CAAC,UAAU,CAAC,YAAY,CAAC,GAAG,CAAC,UAAC,WAAW,IAAK,OAAA,WAAW,CAAC,cAAc,EAA1B,CAA0B,CAAC,CAAC,CAAC;oBACvF,qBAAM,QAAQ,CAAC,2BAA2B,CAAC,oBAAoB,CAAC,CAAC,IAAI,EAAE,EAAA;;oBAA5F,kBAAkB,GAAG,SAAuE;oBAG5F,yBAAyB,GAAG,kBAAkB;yBACjD,KAAK,CAAC,GAAG,CAAC;yBACV,GAAG,CAAC,UAAC,KAAK,IAAK,OAAA,KAAK,CAAC,iBAAiB,EAAvB,CAAuB,CAAC;yBACvC,MAAM,CAAC,UAAC,GAAG,IAAK,OAAA,GAAG,GAAG,CAAC,EAAP,CAAO,CAAC,CAAC;oBACtB,uBAAuB,GAAG,yBAAyB,CAAC,MAAM,CAAC,UAAC,GAAG,EAAE,GAAG,IAAK,OAAA,GAAG,GAAG,GAAG,EAAT,CAAS,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;oBAE/F,2BAA2B,GAAG,IAAI,CACtC,uBAAuB,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,yBAAyB,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAChF,CAAC;oBACF,sBAAO;4BACL,OAAO,EAAE,IAAI,CAAC,eAAgB,CAAC,KAAM,CAAC;4BACtC,2BAA2B,6BAAA;yBAC5B,EAAC;;;;CACH"}
+{"version":3,"file":"solana.js","sourceRoot":"","sources":["../../../../src/gasPriceOracle/adapters/solana.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAG/C,OAAO,EAA+D,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAE9G;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,QAAqB,EAAE,IAA6B;IACnF,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;IAEzC,gFAAgF;IAChF,MAAM,UAAU,GAAG,WAA2C,CAAC;IAC/D,MAAM,mBAAmB,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;IAE3D,iFAAiF;IACjF,MAAM,yBAAyB,GAAG,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAC,QAAQ,CACtF,QAAQ,CACwB,CAAC;IACnC,MAAM,eAAe,GAAG,MAAM,QAAQ,CAAC,gBAAgB,CAAC,yBAAyB,CAAC,CAAC,IAAI,EAAE,CAAC;IAE1F,4HAA4H;IAC5H,MAAM,oBAAoB,GAAG,UAAU,CAAC,UAAU,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC;IAClH,MAAM,kBAAkB,GAAG,MAAM,QAAQ,CAAC,2BAA2B,CAAC,oBAAoB,CAAC,CAAC,IAAI,EAAE,CAAC;IAEnG,mFAAmF;IACnF,MAAM,yBAAyB,GAAG,kBAAkB;SACjD,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,iBAAiB,CAAC;SACvC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;IAC5B,MAAM,uBAAuB,GAAG,yBAAyB,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAErG,MAAM,2BAA2B,GAAG,IAAI,CACtC,uBAAuB,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,yBAAyB,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAChF,CAAC;IACF,OAAO;QACL,OAAO,EAAE,IAAI,CAAC,eAAgB,CAAC,KAAM,CAAC;QACtC,2BAA2B;KAC5B,CAAC;AACJ,CAAC"}

package/dist/esm/gasPriceOracle/oracle.js

@@ -1,4 +1,3 @@
-import { __assign, __awaiter, __generator } from "tslib";
 import assert from "assert";
 import { CHAIN_IDs } from "../constants";
 import { BigNumber, chainIsOPStack, fixedPointAdjustment, isEvmProvider, toBNWei } from "../utils";
@@ -8,49 +7,45 @@ import * as ethereum from "./adapters/ethereum";
 import * as polygon from "./adapters/polygon";
 import * as lineaViem from "./adapters/linea-viem";
 import * as solana from "./adapters/solana";
-var GAS_PRICE_ESTIMATE_DEFAULTS = {
+const GAS_PRICE_ESTIMATE_DEFAULTS = {
     legacyFallback: true,
 };
 // Chains that use the Viem gas price oracle.
-var VIEM_CHAINS = [CHAIN_IDs.LINEA];
+const VIEM_CHAINS = [CHAIN_IDs.LINEA];
 /**
  * Provide an estimate for the current gas price for a particular chain.
  * @param provider A valid ethers provider.
  * @param {GasPriceEstimateOptions} opts optional parameters.
  * @returns An  object of type GasPriceEstimate.
  */
-export function getGasPriceEstimate(provider_1) {
-    return __awaiter(this, arguments, void 0, function (provider, opts) {
-        var baseFeeMultiplier, priorityFeeMultiplier, optsWithDefaults_1, chainId, _a, optsWithDefaults, useViem;
-        var _b, _c, _d, _e;
-        if (opts === void 0) { opts = {}; }
-        return __generator(this, function (_f) {
-            switch (_f.label) {
-                case 0:
-                    baseFeeMultiplier = (_b = opts.baseFeeMultiplier) !== null && _b !== void 0 ? _b : toBNWei("1");
-                    priorityFeeMultiplier = (_c = opts.priorityFeeMultiplier) !== null && _c !== void 0 ? _c : toBNWei("1");
-                    // Exit here if we need to estimate on Solana.
-                    if (!isEvmProvider(provider)) {
-                        optsWithDefaults_1 = __assign(__assign(__assign(__assign({}, GAS_PRICE_ESTIMATE_DEFAULTS), { baseFeeMultiplier: baseFeeMultiplier, priorityFeeMultiplier: priorityFeeMultiplier }), opts), { chainId: (_d = opts.chainId) !== null && _d !== void 0 ? _d : CHAIN_IDs.SOLANA });
-                        return [2 /*return*/, solana.messageFee(provider, optsWithDefaults_1)];
-                    }
-                    if (!((_e = opts.chainId) !== null && _e !== void 0)) return [3 /*break*/, 1];
-                    _a = _e;
-                    return [3 /*break*/, 3];
-                case 1: return [4 /*yield*/, provider.getNetwork()];
-                case 2:
-                    _a = (_f.sent()).chainId;
-                    _f.label = 3;
-                case 3:
-                    chainId = _a;
-                    optsWithDefaults = __assign(__assign(__assign(__assign({}, GAS_PRICE_ESTIMATE_DEFAULTS), { baseFeeMultiplier: baseFeeMultiplier, priorityFeeMultiplier: priorityFeeMultiplier }), opts), { chainId: chainId });
-                    useViem = VIEM_CHAINS.includes(chainId);
-                    return [2 /*return*/, useViem
-                            ? _getViemGasPriceEstimate(chainId, optsWithDefaults)
-                            : _getEthersGasPriceEstimate(provider, optsWithDefaults)];
-            }
-        });
-    });
+export async function getGasPriceEstimate(provider, opts = {}) {
+    const baseFeeMultiplier = opts.baseFeeMultiplier ?? toBNWei("1");
+    const priorityFeeMultiplier = opts.priorityFeeMultiplier ?? toBNWei("1");
+    // Exit here if we need to estimate on Solana.
+    if (!isEvmProvider(provider)) {
+        const optsWithDefaults = {
+            ...GAS_PRICE_ESTIMATE_DEFAULTS,
+            baseFeeMultiplier,
+            priorityFeeMultiplier,
+            ...opts,
+            chainId: opts.chainId ?? CHAIN_IDs.SOLANA,
+        };
+        return solana.messageFee(provider, optsWithDefaults);
+    }
+    // Cast the provider to an ethers provider, which should be given to the oracle when querying an EVM network.
+    const chainId = opts.chainId ?? (await provider.getNetwork()).chainId;
+    const optsWithDefaults = {
+        ...GAS_PRICE_ESTIMATE_DEFAULTS,
+        baseFeeMultiplier,
+        priorityFeeMultiplier,
+        ...opts,
+        chainId,
+    };
+    // We only use the unsignedTx in the viem flow.
+    const useViem = VIEM_CHAINS.includes(chainId);
+    return useViem
+        ? _getViemGasPriceEstimate(chainId, optsWithDefaults)
+        : _getEthersGasPriceEstimate(provider, optsWithDefaults);
 }
 /**
  * Provide an estimate for the current gas price for a particular chain.
@@ -60,28 +55,26 @@ export function getGasPriceEstimate(provider_1) {
  * @returns An object of type GasPriceEstimate.
  */
 function _getEthersGasPriceEstimate(provider, opts) {
-    var _a;
-    var chainId = opts.chainId, legacyFallback = opts.legacyFallback;
+    const { chainId, legacyFallback } = opts;
     // There shouldn't be any chains in here that we have a Viem adapter for because we'll always use Viem in that case.
-    assert(!VIEM_CHAINS.includes(chainId), "Chain ID ".concat(chainId, " will use Viem gas price estimation"));
-    var gasPriceFeeds = (_a = {},
-        _a[CHAIN_IDs.ARBITRUM] = arbitrum.eip1559,
-        _a[CHAIN_IDs.BSC] = ethereum.eip1559,
-        _a[CHAIN_IDs.MAINNET] = ethereum.eip1559,
-        _a[CHAIN_IDs.MEGAETH] = ethereum.eip1559,
-        _a[CHAIN_IDs.MONAD] = ethereum.eip1559,
-        _a[CHAIN_IDs.PLASMA] = ethereum.eip1559,
-        _a[CHAIN_IDs.POLYGON] = polygon.gasStation,
-        _a[CHAIN_IDs.SCROLL] = ethereum.legacy,
-        _a[CHAIN_IDs.ZK_SYNC] = ethereum.legacy,
+    assert(!VIEM_CHAINS.includes(chainId), `Chain ID ${chainId} will use Viem gas price estimation`);
+    const gasPriceFeeds = {
+        [CHAIN_IDs.ARBITRUM]: arbitrum.eip1559,
+        [CHAIN_IDs.BSC]: ethereum.eip1559,
+        [CHAIN_IDs.MAINNET]: ethereum.eip1559,
+        [CHAIN_IDs.MONAD]: ethereum.eip1559,
+        [CHAIN_IDs.PLASMA]: ethereum.eip1559,
+        [CHAIN_IDs.POLYGON]: polygon.gasStation,
+        [CHAIN_IDs.SCROLL]: ethereum.legacy,
+        [CHAIN_IDs.ZK_SYNC]: ethereum.legacy,
         // Testnet Chains
-        _a[CHAIN_IDs.ARBITRUM_SEPOLIA] = arbitrum.eip1559,
-        _a[CHAIN_IDs.POLYGON_AMOY] = polygon.gasStation,
-        _a[CHAIN_IDs.SEPOLIA] = ethereum.eip1559,
-        _a);
-    var gasPriceFeed = gasPriceFeeds[chainId];
-    assert(gasPriceFeed || legacyFallback, "No suitable gas price oracle for Chain ID ".concat(chainId));
-    gasPriceFeed !== null && gasPriceFeed !== void 0 ? gasPriceFeed : (gasPriceFeed = chainIsOPStack(chainId) ? ethereum.eip1559 : ethereum.legacy);
+        [CHAIN_IDs.ARBITRUM_SEPOLIA]: arbitrum.eip1559,
+        [CHAIN_IDs.POLYGON_AMOY]: polygon.gasStation,
+        [CHAIN_IDs.SEPOLIA]: ethereum.eip1559,
+    };
+    let gasPriceFeed = gasPriceFeeds[chainId];
+    assert(gasPriceFeed || legacyFallback, `No suitable gas price oracle for Chain ID ${chainId}`);
+    gasPriceFeed ??= chainIsOPStack(chainId) ? ethereum.eip1559 : ethereum.legacy;
     return gasPriceFeed(provider, opts);
 }
 /**
@@ -91,46 +84,27 @@ function _getEthersGasPriceEstimate(provider, opts) {
  * @param unsignedTx Only used in Linea provider to estimate priority gas fee.
  * @returns An object of type GasPriceEstimate.
  */
-export function _getViemGasPriceEstimate(providerOrChainId, opts) {
-    return __awaiter(this, void 0, void 0, function () {
-        var baseFeeMultiplier, transport, chainId, _a, viemProvider, gasPriceFeeds, maxFeePerGas, maxPriorityFeePerGas, gasPrice;
-        var _b, _c, _d;
-        return __generator(this, function (_e) {
-            switch (_e.label) {
-                case 0:
-                    baseFeeMultiplier = opts.baseFeeMultiplier, transport = opts.transport;
-                    if (!(typeof providerOrChainId === "number")) return [3 /*break*/, 1];
-                    _a = providerOrChainId;
-                    return [3 /*break*/, 3];
-                case 1: return [4 /*yield*/, providerOrChainId.getNetwork()];
-                case 2:
-                    _a = (_e.sent()).chainId;
-                    _e.label = 3;
-                case 3:
-                    chainId = _a;
-                    viemProvider = getPublicClient(chainId, transport);
-                    gasPriceFeeds = (_b = {},
-                        _b[CHAIN_IDs.LINEA] = lineaViem.eip1559,
-                        _b);
-                    if (!gasPriceFeeds[chainId]) return [3 /*break*/, 5];
-                    return [4 /*yield*/, gasPriceFeeds[chainId](viemProvider, opts)];
-                case 4:
-                    (_c = _e.sent(), maxFeePerGas = _c.maxFeePerGas, maxPriorityFeePerGas = _c.maxPriorityFeePerGas);
-                    return [3 /*break*/, 7];
-                case 5:
-                    gasPrice = void 0;
-                    return [4 /*yield*/, viemProvider.estimateFeesPerGas()];
-                case 6:
-                    (_d = _e.sent(), maxFeePerGas = _d.maxFeePerGas, maxPriorityFeePerGas = _d.maxPriorityFeePerGas, gasPrice = _d.gasPrice);
-                    maxFeePerGas !== null && maxFeePerGas !== void 0 ? maxFeePerGas : (maxFeePerGas = (gasPrice * BigInt(baseFeeMultiplier.toString())) / BigInt(fixedPointAdjustment.toString()));
-                    maxPriorityFeePerGas !== null && maxPriorityFeePerGas !== void 0 ? maxPriorityFeePerGas : (maxPriorityFeePerGas = BigInt(0));
-                    _e.label = 7;
-                case 7: return [2 /*return*/, {
-                        maxFeePerGas: BigNumber.from(maxFeePerGas.toString()),
-                        maxPriorityFeePerGas: BigNumber.from(maxPriorityFeePerGas.toString()),
-                    }];
-            }
-        });
-    });
+export async function _getViemGasPriceEstimate(providerOrChainId, opts) {
+    const { baseFeeMultiplier, transport } = opts;
+    const chainId = typeof providerOrChainId === "number" ? providerOrChainId : (await providerOrChainId.getNetwork()).chainId;
+    const viemProvider = getPublicClient(chainId, transport);
+    const gasPriceFeeds = {
+        [CHAIN_IDs.LINEA]: lineaViem.eip1559,
+    };
+    let maxFeePerGas;
+    let maxPriorityFeePerGas;
+    if (gasPriceFeeds[chainId]) {
+        ({ maxFeePerGas, maxPriorityFeePerGas } = await gasPriceFeeds[chainId](viemProvider, opts));
+    }
+    else {
+        let gasPrice;
+        ({ maxFeePerGas, maxPriorityFeePerGas, gasPrice } = await viemProvider.estimateFeesPerGas());
+        maxFeePerGas ??= (gasPrice * BigInt(baseFeeMultiplier.toString())) / BigInt(fixedPointAdjustment.toString());
+        maxPriorityFeePerGas ??= BigInt(0);
+    }
+    return {
+        maxFeePerGas: BigNumber.from(maxFeePerGas.toString()),
+        maxPriorityFeePerGas: BigNumber.from(maxPriorityFeePerGas.toString()),
+    };
 }
 //# sourceMappingURL=oracle.js.map

package/dist/esm/gasPriceOracle/oracle.js.map

@@ -1 +1 @@
-{"version":3,"file":"oracle.js","sourceRoot":"","sources":["../../../src/gasPriceOracle/oracle.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"oracle.js","sourceRoot":"","sources":["../../../src/gasPriceOracle/oracle.ts"],"names":[],"mappings":"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"}