@across-protocol/sdk 3.3.31 → 3.4.0

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

@@ -1,6 +1,6 @@
 import { __awaiter, __extends, __generator } from "tslib";
 import { BaseHTTPAdapter } from "../../priceClient/adapters/baseAdapter";
-import { bnZero, isDefined, parseUnits } from "../../utils";
+import { bnZero, fixedPointAdjustment, isDefined, parseUnits } from "../../utils";
 import { CHAIN_IDs } from "../../constants";
 import { gasPriceError } from "../util";
 import { eip1559 } from "./ethereum";
@@ -51,24 +51,68 @@ var PolygonGasStation = /** @class */ (function (_super) {
     };
     return PolygonGasStation;
 }(BaseHTTPAdapter));
-export function gasStation(provider, chainId) {
+export { PolygonGasStation };
+var MockRevertingPolygonGasStation = /** @class */ (function (_super) {
+    __extends(MockRevertingPolygonGasStation, _super);
+    function MockRevertingPolygonGasStation() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    MockRevertingPolygonGasStation.prototype.getFeeData = function () {
+        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 () {
+        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 GasPriceEstimate
+ */
+export function gasStation(provider, opts) {
     return __awaiter(this, void 0, void 0, function () {
-        var gasStation, maxPriorityFeePerGas, maxFeePerGas, err_1, minPriorityFee, priorityDelta;
+        var chainId, baseFeeMultiplier, gasStation, maxPriorityFeePerGas, maxFeePerGas, baseFeeMinusPriorityFee, scaledBaseFee, err_1, minPriorityFee, priorityDelta;
         var _a, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
-                    gasStation = new PolygonGasStation({ chainId: chainId, timeout: 2000, retries: 0 });
+                    chainId = opts.chainId, baseFeeMultiplier = opts.baseFeeMultiplier;
+                    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);
+                    maxFeePerGas = scaledBaseFee.add(maxPriorityFeePerGas);
                     return [3 /*break*/, 5];
                 case 3:
                     err_1 = _c.sent();
-                    return [4 /*yield*/, eip1559(provider, chainId)];
+                    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);

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":"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"}

package/dist/esm/gasPriceOracle/oracle.d.ts

@@ -1,18 +1,26 @@
 import { Transport } from "viem";
-import { providers } from "ethers";
+import { PopulatedTransaction, providers } from "ethers";
+import { BigNumber } from "../utils";
 import { GasPriceEstimate } from "./types";
+export interface GasPriceEstimateOptions {
+    baseFeeMultiplier: BigNumber;
+    legacyFallback: boolean;
+    chainId: number;
+    unsignedTx?: PopulatedTransaction;
+    transport?: Transport;
+}
 /**
  * Provide an estimate for the current gas price for a particular chain.
- * @param chainId The chain ID to query for gas prices.
  * @param provider A valid ethers provider.
- * @param legacyFallback In the case of an unrecognised chain, fall back to type 0 gas estimation.
- * @returns Am object of type GasPriceEstimate.
+ * @param {opts} GasPriceEstimateOptions optional parameters.
+ * @returns An  object of type GasPriceEstimate.
  */
-export declare function getGasPriceEstimate(provider: providers.Provider, chainId?: number, transport?: Transport, legacyFallback?: boolean): Promise<GasPriceEstimate>;
+export declare function getGasPriceEstimate(provider: providers.Provider, opts?: Partial<GasPriceEstimateOptions>): Promise<GasPriceEstimate>;
 /**
  * Provide an estimate for the current gas price for a particular chain.
  * @param providerOrChainId A valid ethers provider or a chain ID.
- * @param transport An optional transport object for custom gas price retrieval.
- * @returns Am object of type GasPriceEstimate.
+ * @param transport An optional Viem Transport object for custom gas price retrieval.
+ * @param unsignedTx Only used in Linea provider to estimate priority gas fee.
+ * @returns An object of type GasPriceEstimate.
  */
-export declare function getViemGasPriceEstimate(providerOrChainId: providers.Provider | number, transport?: Transport): Promise<GasPriceEstimate>;
+export declare function _getViemGasPriceEstimate(providerOrChainId: providers.Provider | number, opts: GasPriceEstimateOptions): Promise<GasPriceEstimate>;

package/dist/esm/gasPriceOracle/oracle.js

@@ -1,43 +1,46 @@
-import { __awaiter, __generator } from "tslib";
+import { __assign, __awaiter, __generator } from "tslib";
 import assert from "assert";
 import { CHAIN_IDs } from "../constants";
-import { BigNumber, chainIsOPStack } from "../utils";
+import { BigNumber, chainIsOPStack, fixedPointAdjustment, toBNWei } from "../utils";
 import { getPublicClient } from "./util";
 import * as arbitrum from "./adapters/arbitrum";
 import * as ethereum from "./adapters/ethereum";
 import * as linea from "./adapters/linea";
 import * as polygon from "./adapters/polygon";
-import * as arbitrumViem from "./adapters/arbitrum-viem";
 import * as lineaViem from "./adapters/linea-viem";
-import * as polygonViem from "./adapters/polygon-viem";
+var GAS_PRICE_ESTIMATE_DEFAULTS = {
+    legacyFallback: true,
+};
 /**
  * Provide an estimate for the current gas price for a particular chain.
- * @param chainId The chain ID to query for gas prices.
  * @param provider A valid ethers provider.
- * @param legacyFallback In the case of an unrecognised chain, fall back to type 0 gas estimation.
- * @returns Am object of type GasPriceEstimate.
+ * @param {opts} GasPriceEstimateOptions optional parameters.
+ * @returns An  object of type GasPriceEstimate.
  */
-export function getGasPriceEstimate(provider, chainId, transport, legacyFallback) {
-    if (legacyFallback === void 0) { legacyFallback = true; }
+export function getGasPriceEstimate(provider, opts) {
+    var _a, _b;
+    if (opts === void 0) { opts = {}; }
     return __awaiter(this, void 0, void 0, function () {
-        var _a, useViem;
-        var _b;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
+        var baseFeeMultiplier, chainId, _c, optsWithDefaults, useViem;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
                 case 0:
-                    if (!(chainId !== null && chainId !== void 0)) return [3 /*break*/, 1];
-                    _a = chainId;
+                    baseFeeMultiplier = (_a = opts.baseFeeMultiplier) !== null && _a !== void 0 ? _a : toBNWei("1");
+                    assert(baseFeeMultiplier.gte(toBNWei("1.0")) && baseFeeMultiplier.lte(toBNWei("5")), "Require 1.0 < base fee multiplier (".concat(baseFeeMultiplier, ") <= 5.0 for a total gas multiplier within [+1.0, +5.0]"));
+                    if (!((_b = opts.chainId) !== null && _b !== void 0)) return [3 /*break*/, 1];
+                    _c = _b;
                     return [3 /*break*/, 3];
                 case 1: return [4 /*yield*/, provider.getNetwork()];
                 case 2:
-                    _a = (_b = _c.sent(), chainId = _b.chainId, _b);
-                    _c.label = 3;
+                    _c = (_d.sent()).chainId;
+                    _d.label = 3;
                 case 3:
-                    _a;
+                    chainId = _c;
+                    optsWithDefaults = __assign(__assign(__assign(__assign({}, GAS_PRICE_ESTIMATE_DEFAULTS), { baseFeeMultiplier: baseFeeMultiplier }), opts), { chainId: chainId });
                     useViem = process.env["NEW_GAS_PRICE_ORACLE_".concat(chainId)] === "true";
                     return [2 /*return*/, useViem
-                            ? getViemGasPriceEstimate(chainId, transport)
-                            : getEthersGasPriceEstimate(provider, chainId, legacyFallback)];
+                            ? _getViemGasPriceEstimate(chainId, optsWithDefaults)
+                            : _getEthersGasPriceEstimate(provider, optsWithDefaults)];
             }
         });
     });
@@ -47,11 +50,11 @@ export function getGasPriceEstimate(provider, chainId, transport, legacyFallback
  * @param chainId The chain ID to query for gas prices.
  * @param provider A valid ethers provider.
  * @param legacyFallback In the case of an unrecognised chain, fall back to type 0 gas estimation.
- * @returns Am object of type GasPriceEstimate.
+ * @returns An object of type GasPriceEstimate.
  */
-function getEthersGasPriceEstimate(provider, chainId, legacyFallback) {
+function _getEthersGasPriceEstimate(provider, opts) {
     var _a;
-    if (legacyFallback === void 0) { legacyFallback = true; }
+    var chainId = opts.chainId, legacyFallback = opts.legacyFallback;
     var gasPriceFeeds = (_a = {},
         _a[CHAIN_IDs.ALEPH_ZERO] = arbitrum.eip1559,
         _a[CHAIN_IDs.ARBITRUM] = arbitrum.eip1559,
@@ -64,21 +67,23 @@ function getEthersGasPriceEstimate(provider, chainId, legacyFallback) {
     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);
-    return gasPriceFeed(provider, chainId);
+    return gasPriceFeed(provider, opts);
 }
 /**
  * Provide an estimate for the current gas price for a particular chain.
  * @param providerOrChainId A valid ethers provider or a chain ID.
- * @param transport An optional transport object for custom gas price retrieval.
- * @returns Am object of type GasPriceEstimate.
+ * @param transport An optional Viem Transport object for custom gas price retrieval.
+ * @param unsignedTx Only used in Linea provider to estimate priority gas fee.
+ * @returns An object of type GasPriceEstimate.
  */
-export function getViemGasPriceEstimate(providerOrChainId, transport) {
+export function _getViemGasPriceEstimate(providerOrChainId, opts) {
     return __awaiter(this, void 0, void 0, function () {
-        var chainId, _a, viemProvider, gasPriceFeeds, maxFeePerGas, maxPriorityFeePerGas, gasPrice;
+        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];
@@ -90,13 +95,10 @@ export function getViemGasPriceEstimate(providerOrChainId, transport) {
                     chainId = _a;
                     viemProvider = getPublicClient(chainId, transport);
                     gasPriceFeeds = (_b = {},
-                        _b[CHAIN_IDs.ALEPH_ZERO] = arbitrumViem.eip1559,
-                        _b[CHAIN_IDs.ARBITRUM] = arbitrumViem.eip1559,
                         _b[CHAIN_IDs.LINEA] = lineaViem.eip1559,
-                        _b[CHAIN_IDs.POLYGON] = polygonViem.gasStation,
                         _b);
                     if (!gasPriceFeeds[chainId]) return [3 /*break*/, 5];
-                    return [4 /*yield*/, gasPriceFeeds[chainId](viemProvider, chainId)];
+                    return [4 /*yield*/, gasPriceFeeds[chainId](viemProvider, opts)];
                 case 4:
                     (_c = _e.sent(), maxFeePerGas = _c.maxFeePerGas, maxPriorityFeePerGas = _c.maxPriorityFeePerGas);
                     return [3 /*break*/, 7];
@@ -105,7 +107,7 @@ export function getViemGasPriceEstimate(providerOrChainId, transport) {
                     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);
+                    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*/, {

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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"}

package/dist/esm/providers/types.d.ts

@@ -1,19 +1,19 @@
 export type RPCProvider = "ALCHEMY" | "DRPC" | "INFURA" | "INFURA_DIN";
 export type RPCTransport = "https" | "wss";
 export declare const JsonRpcError: import("superstruct").Struct<{
-    id: string | number;
     error: {
-        code: number;
         message: string;
+        code: number;
         data?: any;
     };
+    id: string | number;
     jsonrpc: "2.0";
 }, {
     jsonrpc: import("superstruct").Struct<"2.0", "2.0">;
     id: import("superstruct").Struct<string | number, null>;
     error: import("superstruct").Struct<{
-        code: number;
         message: string;
+        code: number;
         data?: any;
     }, {
         code: import("superstruct").Struct<number, null>;

package/dist/esm/relayFeeCalculator/chain-queries/alephZero.d.ts

@@ -1,233 +1,4 @@
-import { Logger } from "../relayFeeCalculator";
-import { providers } from "ethers";
 import { QueryBase } from "./baseQuery";
 export declare class AlephZeroQueries extends QueryBase {
-    constructor(provider: providers.Provider, symbolMapping?: {
-        ACX: {
-            name: string;
-            symbol: string;
-            decimals: number;
-            addresses: {
-                [x: number]: string;
-            };
-            coingeckoId: string;
-        };
-        ARB: {
-            name: string;
-            symbol: string;
-            decimals: number;
-            addresses: {
-                [x: number]: string;
-            };
-            coingeckoId: string;
-        };
-        AZERO: {
-            name: string;
-            symbol: string;
-            decimals: number;
-            addresses: {
-                [x: number]: string;
-            };
-            coingeckoId: string;
-        };
-        BAL: {
-            name: string;
-            symbol: string;
-            decimals: number;
-            addresses: {
-                [x: number]: string;
-            };
-            coingeckoId: string;
-        };
-        BADGER: {
-            name: string;
-            symbol: string;
-            decimals: number;
-            addresses: {
-                [x: number]: string;
-            };
-            coingeckoId: string;
-        };
-        BOBA: {
-            name: string;
-            symbol: string;
-            decimals: number;
-            addresses: {
-                [x: number]: string;
-            };
-            coingeckoId: string;
-        };
-        DAI: {
-            name: string;
-            symbol: string;
-            decimals: number;
-            addresses: {
-                [x: number]: string;
-            };
-            coingeckoId: string;
-        };
-        ETH: {
-            name: string;
-            symbol: string;
-            decimals: number;
-            addresses: {
-                [x: number]: string;
-            };
-            coingeckoId: string;
-        };
-        GHO: {
-            name: string;
-            symbol: string;
-            decimals: number;
-            addresses: {
-                [x: number]: string;
-            };
-            coingeckoId: string;
-        };
-        LSK: {
-            name: string;
-            symbol: string;
-            decimals: number;
-            addresses: {
-                [x: number]: string;
-            };
-            coingeckoId: string;
-        };
-        MATIC: {
-            name: string;
-            symbol: string;
-            decimals: number;
-            addresses: {
-                [x: number]: string;
-            };
-            coingeckoId: string;
-        };
-        OP: {
-            name: string;
-            symbol: string;
-            decimals: number;
-            addresses: {
-                [x: number]: string;
-            };
-            coingeckoId: string;
-        };
-        POOL: {
-            name: string;
-            symbol: string;
-            decimals: number;
-            addresses: {
-                [x: number]: string;
-            };
-            coingeckoId: string;
-        };
-        SNX: {
-            name: string;
-            symbol: string;
-            decimals: number;
-            addresses: {
-                [x: number]: string;
-            };
-            coingeckoId: string;
-        };
-        UMA: {
-            name: string;
-            symbol: string;
-            decimals: number;
-            addresses: {
-                [x: number]: string;
-            };
-            coingeckoId: string;
-        };
-        USDB: {
-            name: string;
-            symbol: string;
-            decimals: number;
-            addresses: {
-                [x: number]: string;
-            };
-            coingeckoId: string;
-        };
-        USDC: {
-            name: string;
-            symbol: string;
-            decimals: number;
-            addresses: {
-                [x: number]: string;
-            };
-            coingeckoId: string;
-        };
-        "USDC.e": {
-            name: string;
-            symbol: string;
-            decimals: number;
-            addresses: {
-                [x: number]: string;
-            };
-            coingeckoId: string;
-        };
-        USDbC: {
-            name: string;
-            symbol: string;
-            decimals: number;
-            addresses: {
-                [x: number]: string;
-            };
-            coingeckoId: string;
-        };
-        USDzC: {
-            name: string;
-            symbol: string;
-            decimals: number;
-            addresses: {
-                [x: number]: string;
-            };
-            coingeckoId: string;
-        };
-        USDT: {
-            name: string;
-            symbol: string;
-            decimals: number;
-            addresses: {
-                [x: number]: string;
-            };
-            coingeckoId: string;
-        };
-        WAZERO: {
-            name: string;
-            symbol: string;
-            decimals: number;
-            addresses: {
-                [x: number]: string;
-            };
-            coingeckoId: string;
-        };
-        WBTC: {
-            name: string;
-            symbol: string;
-            decimals: number;
-            addresses: {
-                [x: number]: string;
-            };
-            coingeckoId: string;
-        };
-        WETH: {
-            name: string;
-            symbol: string;
-            decimals: number;
-            addresses: {
-                [x: number]: string;
-            };
-            coingeckoId: string;
-        };
-        WMATIC: {
-            name: string;
-            symbol: string;
-            decimals: number;
-            addresses: {
-                [x: number]: string;
-            };
-            coingeckoId: string;
-        };
-    }, spokePoolAddress?: string | undefined, simulatedRelayerAddress?: string, coingeckoProApiKey?: string, logger?: Logger, gasMarkup?: number);
     getTokenPrice(tokenSymbol: string): Promise<number>;
 }

package/dist/esm/relayFeeCalculator/chain-queries/alephZero.js

@@ -1,21 +1,11 @@
 import { __awaiter, __extends, __generator } from "tslib";
-import assert from "assert";
-import { getDeployedAddress } from "../../utils/DeploymentUtils";
-import { DEFAULT_LOGGER } from "../relayFeeCalculator";
-import { CHAIN_IDs, DEFAULT_SIMULATED_RELAYER_ADDRESS, TOKEN_SYMBOLS_MAP } from "../../constants";
+import { CHAIN_IDs } from "../../constants";
 import { Coingecko } from "../../coingecko/Coingecko";
-import { isDefined } from "../../utils";
 import { QueryBase } from "./baseQuery";
 var AlephZeroQueries = /** @class */ (function (_super) {
     __extends(AlephZeroQueries, _super);
-    function AlephZeroQueries(provider, symbolMapping, spokePoolAddress, simulatedRelayerAddress, coingeckoProApiKey, logger, gasMarkup) {
-        if (symbolMapping === void 0) { symbolMapping = TOKEN_SYMBOLS_MAP; }
-        if (spokePoolAddress === void 0) { spokePoolAddress = getDeployedAddress("SpokePool", CHAIN_IDs.ALEPH_ZERO); }
-        if (simulatedRelayerAddress === void 0) { simulatedRelayerAddress = DEFAULT_SIMULATED_RELAYER_ADDRESS; }
-        if (logger === void 0) { logger = DEFAULT_LOGGER; }
-        if (gasMarkup === void 0) { gasMarkup = 0; }
-        assert(isDefined(spokePoolAddress));
-        return _super.call(this, provider, symbolMapping, spokePoolAddress, simulatedRelayerAddress, gasMarkup, logger, coingeckoProApiKey, undefined, "usd") || this;
+    function AlephZeroQueries() {
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     AlephZeroQueries.prototype.getTokenPrice = function (tokenSymbol) {
         return __awaiter(this, void 0, void 0, function () {

package/dist/esm/relayFeeCalculator/chain-queries/alephZero.js.map

@@ -1 +1 @@
-{"version":3,"file":"alephZero.js","sourceRoot":"","sources":["../../../../src/relayFeeCalculator/chain-queries/alephZero.ts"],"names":[],"mappings":";AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,cAAc,EAAU,MAAM,uBAAuB,CAAC;AAE/D,OAAO,EAAE,SAAS,EAAE,iCAAiC,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAClG,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC;IAAsC,oCAAS;IAC7C,0BACE,QAA4B,EAC5B,aAAiC,EACjC,gBAAwE,EACxE,uBAA2D,EAC3D,kBAA2B,EAC3B,MAA+B,EAC/B,SAAa;QALb,8BAAA,EAAA,iCAAiC;QACjC,iCAAA,EAAA,mBAAmB,kBAAkB,CAAC,WAAW,EAAE,SAAS,CAAC,UAAU,CAAC;QACxE,wCAAA,EAAA,2DAA2D;QAE3D,uBAAA,EAAA,uBAA+B;QAC/B,0BAAA,EAAA,aAAa;QAEb,MAAM,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC,CAAC;eACpC,kBACE,QAAQ,EACR,aAAa,EACb,gBAAgB,EAChB,uBAAuB,EACvB,SAAS,EACT,MAAM,EACN,kBAAkB,EAClB,SAAS,EACT,KAAK,CACN;IACH,CAAC;IAEc,wCAAa,GAA5B,UAA6B,WAAmB;;;;;;wBAC9C,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC;4BAAE,MAAM,IAAI,KAAK,CAAC,UAAG,WAAW,+BAA4B,CAAC,CAAC;wBAC5F,iBAAiB,GAAG,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;wBACvD,qBAAM,iBAAiB,CAAC,yBAAyB,CACtE,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAC5D,KAAK,CACN,EAAA;;wBAHK,KAAiB,SAGtB,EAHQ,UAAU,QAAA;wBAKQ,qBAAM,iBAAiB,CAAC,yBAAyB,CAC1E,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EACxD,KAAK,CACN,EAAA;;wBAHK,KAAqB,SAG1B,EAHQ,cAAc,QAAA;wBAIvB,sBAAO,MAAM,CAAC,CAAC,UAAU,GAAG,cAAc,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAC;;;;KAC5F;IACH,uBAAC;AAAD,CAAC,AAtCD,CAAsC,SAAS,GAsC9C"}
+{"version":3,"file":"alephZero.js","sourceRoot":"","sources":["../../../../src/relayFeeCalculator/chain-queries/alephZero.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC;IAAsC,oCAAS;IAA/C;;IAeA,CAAC;IAdgB,wCAAa,GAA5B,UAA6B,WAAmB;;;;;;wBAC9C,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC;4BAAE,MAAM,IAAI,KAAK,CAAC,UAAG,WAAW,+BAA4B,CAAC,CAAC;wBAC5F,iBAAiB,GAAG,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;wBACvD,qBAAM,iBAAiB,CAAC,yBAAyB,CACtE,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAC5D,KAAK,CACN,EAAA;;wBAHK,KAAiB,SAGtB,EAHQ,UAAU,QAAA;wBAKQ,qBAAM,iBAAiB,CAAC,yBAAyB,CAC1E,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EACxD,KAAK,CACN,EAAA;;wBAHK,KAAqB,SAG1B,EAHQ,cAAc,QAAA;wBAIvB,sBAAO,MAAM,CAAC,CAAC,UAAU,GAAG,cAAc,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAC;;;;KAC5F;IACH,uBAAC;AAAD,CAAC,AAfD,CAAsC,SAAS,GAe9C"}

package/dist/esm/relayFeeCalculator/chain-queries/baseQuery.d.ts

@@ -1,8 +1,8 @@
 import { L2Provider } from "@eth-optimism/sdk/dist/interfaces/l2-provider";
-import { providers } from "ethers";
+import { PopulatedTransaction, providers } from "ethers";
 import { Deposit } from "../../interfaces";
 import { SpokePool } from "../../typechain";
-import { BigNumberish, TransactionCostEstimate } from "../../utils";
+import { BigNumberish, TransactionCostEstimate, BigNumber } from "../../utils";
 import { Logger, QueryInterface } from "../relayFeeCalculator";
 import { Transport } from "viem";
 type Provider = providers.Provider;
@@ -20,7 +20,6 @@ export declare class QueryBase implements QueryInterface {
     readonly symbolMapping: SymbolMappingType;
     readonly spokePoolAddress: string;
     readonly simulatedRelayerAddress: string;
-    readonly gasMarkup: number;
     readonly logger: Logger;
     readonly coingeckoProApiKey?: string | undefined;
     readonly fixedGasPrice?: BigNumberish | undefined;
@@ -32,13 +31,12 @@ export declare class QueryBase implements QueryInterface {
      * @param symbolMapping A mapping to valid ERC20 tokens and their respective characteristics
      * @param spokePoolAddress The valid address of the Spoke Pool deployment
      * @param simulatedRelayerAddress The address that these queries will reference as the sender. Note: This address must be approved for USDC
-     * @param gasMarkup A multiplier that is applied to the total gas estimate
      * @param logger A logging utility to report logs
      * @param coingeckoProApiKey An optional CoinGecko API key that links to a PRO account
      * @param fixedGasPrice Overrides the gas price with a fixed value. Note: primarily used for the Boba blockchain
      * @param coingeckoBaseCurrency The basis currency that CoinGecko will use to resolve pricing
      */
-    constructor(provider: Provider | OptimismProvider, symbolMapping: SymbolMappingType, spokePoolAddress: string, simulatedRelayerAddress: string, gasMarkup: number, logger: Logger, coingeckoProApiKey?: string | undefined, fixedGasPrice?: BigNumberish | undefined, coingeckoBaseCurrency?: string);
+    constructor(provider: Provider | OptimismProvider, symbolMapping: SymbolMappingType, spokePoolAddress: string, simulatedRelayerAddress: string, logger: Logger, coingeckoProApiKey?: string | undefined, fixedGasPrice?: BigNumberish | undefined, coingeckoBaseCurrency?: string);
     /**
      * Retrieves the current gas costs of performing a fillRelay contract at the referenced SpokePool.
      * @param deposit V3 deposit instance.
@@ -46,14 +44,30 @@ export declare class QueryBase implements QueryInterface {
      * @param options
      * @param options.gasPrice Optional gas price to use for the simulation.
      * @param options.gasUnits Optional gas units to use for the simulation.
-     * @param options.omitMarkup Optional flag to omit the gas markup.
      * @param options.transport Optional transport object for custom gas price retrieval.
      * @returns The gas estimate for this function call (multiplied with the optional buffer).
      */
     getGasCosts(deposit: Deposit, relayer?: string, options?: Partial<{
         gasPrice: BigNumberish;
         gasUnits: BigNumberish;
-        omitMarkup: boolean;
+        baseFeeMultiplier: BigNumber;
+        transport: Transport;
+    }>): Promise<TransactionCostEstimate>;
+    /**
+     * Estimates the total gas cost required to submit an unsigned (populated) transaction on-chain.
+     * @param unsignedTx The unsigned transaction that this function will estimate.
+     * @param senderAddress The address that the transaction will be submitted from.
+     * @param provider A valid ethers provider - will be used to reason the gas price.
+     * @param options
+     * @param options.gasPrice A manually provided gas price - if set, this function will not resolve the current gas price.
+     * @param options.gasUnits A manually provided gas units - if set, this function will not estimate the gas units.
+     * @param options.transport A custom transport object for custom gas price retrieval.
+     * @returns Estimated cost in units of gas and the underlying gas token (gasPrice * estimatedGasUnits).
+     */
+    estimateGas(unsignedTx: PopulatedTransaction, senderAddress: string, provider: providers.Provider | L2Provider<providers.Provider>, options?: Partial<{
+        gasPrice: BigNumberish;
+        gasUnits: BigNumberish;
+        baseFeeMultiplier: BigNumber;
         transport: Transport;
     }>): Promise<TransactionCostEstimate>;
     /**