@across-protocol/sdk 3.3.32 → 3.4.0

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>;
     /**

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

@@ -1,9 +1,11 @@
-import { __awaiter, __generator } from "tslib";
-import assert from "assert";
+import { __assign, __awaiter, __generator } from "tslib";
+import { isL2Provider as isOptimismL2Provider } from "@eth-optimism/sdk/dist/l2-provider";
+import { VoidSigner } from "ethers";
 import { Coingecko } from "../../coingecko";
 import { CHAIN_IDs, DEFAULT_SIMULATED_RELAYER_ADDRESS } from "../../constants";
 import { SpokePool__factory } from "../../typechain";
-import { estimateTotalGasRequiredByUnsignedTransaction, fixedPointAdjustment, populateV3Relay, toBNWei, } from "../../utils";
+import { populateV3Relay, BigNumber, toBNWei, bnZero, assert, chainIsOPStack, } from "../../utils";
+import { getGasPriceEstimate } from "../../gasPriceOracle/oracle";
 /**
  * A unified QueryBase for querying gas costs, token prices, and decimals of various tokens
  * on a blockchain.
@@ -15,19 +17,17 @@ var QueryBase = /** @class */ (function () {
      * @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
      */
-    function QueryBase(provider, symbolMapping, spokePoolAddress, simulatedRelayerAddress, gasMarkup, logger, coingeckoProApiKey, fixedGasPrice, coingeckoBaseCurrency) {
+    function QueryBase(provider, symbolMapping, spokePoolAddress, simulatedRelayerAddress, logger, coingeckoProApiKey, fixedGasPrice, coingeckoBaseCurrency) {
         if (coingeckoBaseCurrency === void 0) { coingeckoBaseCurrency = "eth"; }
         this.provider = provider;
         this.symbolMapping = symbolMapping;
         this.spokePoolAddress = spokePoolAddress;
         this.simulatedRelayerAddress = simulatedRelayerAddress;
-        this.gasMarkup = gasMarkup;
         this.logger = logger;
         this.coingeckoProApiKey = coingeckoProApiKey;
         this.fixedGasPrice = fixedGasPrice;
@@ -41,7 +41,6 @@ var QueryBase = /** @class */ (function () {
      * @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).
      */
@@ -49,33 +48,87 @@ var QueryBase = /** @class */ (function () {
         if (relayer === void 0) { relayer = DEFAULT_SIMULATED_RELAYER_ADDRESS; }
         if (options === void 0) { options = {}; }
         return __awaiter(this, void 0, void 0, function () {
-            var _a, gasPrice, gasUnits, omitMarkup, transport, gasMarkup, gasTotalMultiplier, tx, _b, nativeGasCost, tokenGasCost, impliedGasPrice;
+            var _a, gasPrice, gasUnits, baseFeeMultiplier, transport, tx, _b, nativeGasCost, tokenGasCost, impliedGasPrice;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
-                        _a = options.gasPrice, gasPrice = _a === void 0 ? this.fixedGasPrice : _a, gasUnits = options.gasUnits, omitMarkup = options.omitMarkup, transport = options.transport;
-                        gasMarkup = omitMarkup ? 0 : this.gasMarkup;
-                        assert(gasMarkup > -1 && gasMarkup <= 4, "Require -1.0 < Gas Markup (".concat(gasMarkup, ") <= 4.0 for a total gas multiplier within (0, +5.0]"));
-                        gasTotalMultiplier = toBNWei(1.0 + gasMarkup);
+                        _a = options.gasPrice, gasPrice = _a === void 0 ? this.fixedGasPrice : _a, gasUnits = options.gasUnits, baseFeeMultiplier = options.baseFeeMultiplier, transport = options.transport;
                         return [4 /*yield*/, populateV3Relay(this.spokePool, deposit, relayer)];
                     case 1:
                         tx = _c.sent();
-                        return [4 /*yield*/, estimateTotalGasRequiredByUnsignedTransaction(tx, relayer, this.provider, {
+                        return [4 /*yield*/, this.estimateGas(tx, relayer, this.provider, {
                                 gasPrice: gasPrice,
                                 gasUnits: gasUnits,
+                                baseFeeMultiplier: baseFeeMultiplier,
                                 transport: transport,
                             })];
                     case 2:
                         _b = _c.sent(), nativeGasCost = _b.nativeGasCost, tokenGasCost = _b.tokenGasCost, impliedGasPrice = _b.gasPrice;
                         return [2 /*return*/, {
-                                nativeGasCost: nativeGasCost.mul(gasTotalMultiplier).div(fixedPointAdjustment),
-                                tokenGasCost: tokenGasCost.mul(gasTotalMultiplier).div(fixedPointAdjustment),
+                                nativeGasCost: nativeGasCost,
+                                tokenGasCost: tokenGasCost,
                                 gasPrice: impliedGasPrice,
                             }];
                 }
             });
         });
     };
+    /**
+     * 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).
+     */
+    QueryBase.prototype.estimateGas = function (unsignedTx, senderAddress, provider, options) {
+        if (options === void 0) { options = {}; }
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, _gasPrice, gasUnits, _b, baseFeeMultiplier, transport, chainId, voidSigner, queries, _c, nativeGasCost, gasPrice, tokenGasCost, populatedTransaction, l1GasCost, l2GasCost;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
+                    case 0:
+                        _a = options || {}, _gasPrice = _a.gasPrice, gasUnits = _a.gasUnits, _b = _a.baseFeeMultiplier, baseFeeMultiplier = _b === void 0 ? toBNWei("1") : _b, transport = _a.transport;
+                        return [4 /*yield*/, provider.getNetwork()];
+                    case 1:
+                        chainId = (_d.sent()).chainId;
+                        voidSigner = new VoidSigner(senderAddress, provider);
+                        queries = [
+                            gasUnits ? Promise.resolve(BigNumber.from(gasUnits)) : voidSigner.estimateGas(unsignedTx),
+                            _gasPrice
+                                ? Promise.resolve({ maxFeePerGas: _gasPrice })
+                                : getGasPriceEstimate(provider, { chainId: chainId, baseFeeMultiplier: baseFeeMultiplier, transport: transport, unsignedTx: unsignedTx }),
+                        ];
+                        return [4 /*yield*/, Promise.all(queries)];
+                    case 2:
+                        _c = _d.sent(), nativeGasCost = _c[0], gasPrice = _c[1].maxFeePerGas;
+                        assert(nativeGasCost.gt(bnZero), "Gas cost should not be 0");
+                        if (!chainIsOPStack(chainId)) return [3 /*break*/, 5];
+                        assert(isOptimismL2Provider(provider), "Unexpected provider for chain ID ".concat(chainId, "."));
+                        return [4 /*yield*/, voidSigner.populateTransaction(__assign(__assign({}, unsignedTx), { gasLimit: nativeGasCost }))];
+                    case 3:
+                        populatedTransaction = _d.sent();
+                        return [4 /*yield*/, provider.estimateL1GasCost(populatedTransaction)];
+                    case 4:
+                        l1GasCost = _d.sent();
+                        l2GasCost = nativeGasCost.mul(gasPrice);
+                        tokenGasCost = l1GasCost.add(l2GasCost);
+                        return [3 /*break*/, 6];
+                    case 5:
+                        tokenGasCost = nativeGasCost.mul(gasPrice);
+                        _d.label = 6;
+                    case 6: return [2 /*return*/, {
+                            nativeGasCost: nativeGasCost,
+                            tokenGasCost: tokenGasCost,
+                            gasPrice: tokenGasCost.div(nativeGasCost), // Units: wei/gas
+                        }];
+                }
+            });
+        });
+    };
     /**
      * Retrieves the current price of a token
      * @param tokenSymbol A valid [CoinGecko-ID](https://api.coingecko.com/api/v3/coins/list)

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

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

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

@@ -228,5 +228,5 @@ export declare class QueryBase__factory {
             };
             coingeckoId: string;
         };
-    }, spokePoolAddress?: string | undefined, simulatedRelayerAddress?: string, coingeckoProApiKey?: string, logger?: Logger, gasMarkup?: number, coingeckoBaseCurrency?: string): QueryBase;
+    }, spokePoolAddress?: string | undefined, simulatedRelayerAddress?: string, coingeckoProApiKey?: string, logger?: Logger, coingeckoBaseCurrency?: string): QueryBase;
 }

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

@@ -19,23 +19,22 @@ var fixedGasPrice = (_a = {},
 var QueryBase__factory = /** @class */ (function () {
     function QueryBase__factory() {
     }
-    QueryBase__factory.create = function (chainId, provider, symbolMapping, spokePoolAddress, simulatedRelayerAddress, coingeckoProApiKey, logger, gasMarkup, coingeckoBaseCurrency) {
+    QueryBase__factory.create = function (chainId, provider, symbolMapping, spokePoolAddress, simulatedRelayerAddress, coingeckoProApiKey, logger, coingeckoBaseCurrency) {
         if (symbolMapping === void 0) { symbolMapping = TOKEN_SYMBOLS_MAP; }
         if (spokePoolAddress === void 0) { spokePoolAddress = getDeployedAddress("SpokePool", chainId); }
         if (simulatedRelayerAddress === void 0) { simulatedRelayerAddress = DEFAULT_SIMULATED_RELAYER_ADDRESS; }
         if (logger === void 0) { logger = DEFAULT_LOGGER; }
-        if (gasMarkup === void 0) { gasMarkup = 0; }
         if (coingeckoBaseCurrency === void 0) { coingeckoBaseCurrency = "eth"; }
         assert(isDefined(spokePoolAddress));
         if (chainIsMatic(chainId)) {
-            return new PolygonQueries(provider, symbolMapping, spokePoolAddress, simulatedRelayerAddress, coingeckoProApiKey, logger, gasMarkup);
+            return new PolygonQueries(provider, symbolMapping, spokePoolAddress, simulatedRelayerAddress, logger, coingeckoProApiKey, fixedGasPrice[chainId], "usd");
         }
         if (chainIsAlephZero(chainId)) {
-            return new AlephZeroQueries(provider, symbolMapping, spokePoolAddress, simulatedRelayerAddress, coingeckoProApiKey, logger, gasMarkup);
+            return new AlephZeroQueries(provider, symbolMapping, spokePoolAddress, simulatedRelayerAddress, logger, coingeckoProApiKey, fixedGasPrice[chainId], "usd");
         }
         // For OPStack chains, we need to wrap the provider in an L2Provider
         provider = chainIsOPStack(chainId) ? asL2Provider(provider) : provider;
-        return new QueryBase(provider, symbolMapping, spokePoolAddress, simulatedRelayerAddress, gasMarkup, logger, coingeckoProApiKey, fixedGasPrice[chainId], coingeckoBaseCurrency);
+        return new QueryBase(provider, symbolMapping, spokePoolAddress, simulatedRelayerAddress, logger, coingeckoProApiKey, fixedGasPrice[chainId], coingeckoBaseCurrency);
     };
     return QueryBase__factory;
 }());

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

@@ -1 +1 @@
-{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../../../src/relayFeeCalculator/chain-queries/factory.ts"],"names":[],"mappings":";AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,EAAE,iCAAiC,EAAE,MAAM,iBAAiB,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxF,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAU,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE/C;;;GAGG;AACH,IAAM,aAAa;IACjB,GAAC,SAAS,CAAC,IAAI,IAAG,GAAG;OACtB,CAAC;AAEF;IAAA;IAqDA,CAAC;IApDQ,yBAAM,GAAb,UACE,OAAe,EACf,QAA4B,EAC5B,aAAiC,EACjC,gBAA2D,EAC3D,uBAA2D,EAC3D,kBAA2B,EAC3B,MAA+B,EAC/B,SAAa,EACb,qBAA6B;QAN7B,8BAAA,EAAA,iCAAiC;QACjC,iCAAA,EAAA,mBAAmB,kBAAkB,CAAC,WAAW,EAAE,OAAO,CAAC;QAC3D,wCAAA,EAAA,2DAA2D;QAE3D,uBAAA,EAAA,uBAA+B;QAC/B,0BAAA,EAAA,aAAa;QACb,sCAAA,EAAA,6BAA6B;QAE7B,MAAM,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAEpC,IAAI,YAAY,CAAC,OAAO,CAAC,EAAE;YACzB,OAAO,IAAI,cAAc,CACvB,QAAQ,EACR,aAAa,EACb,gBAAgB,EAChB,uBAAuB,EACvB,kBAAkB,EAClB,MAAM,EACN,SAAS,CACV,CAAC;SACH;QAED,IAAI,gBAAgB,CAAC,OAAO,CAAC,EAAE;YAC7B,OAAO,IAAI,gBAAgB,CACzB,QAAQ,EACR,aAAa,EACb,gBAAgB,EAChB,uBAAuB,EACvB,kBAAkB,EAClB,MAAM,EACN,SAAS,CACV,CAAC;SACH;QAED,oEAAoE;QACpE,QAAQ,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;QAEvE,OAAO,IAAI,SAAS,CAClB,QAAQ,EACR,aAAa,EACb,gBAAgB,EAChB,uBAAuB,EACvB,SAAS,EACT,MAAM,EACN,kBAAkB,EAClB,aAAa,CAAC,OAAO,CAAC,EACtB,qBAAqB,CACtB,CAAC;IACJ,CAAC;IACH,yBAAC;AAAD,CAAC,AArDD,IAqDC"}
+{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../../../src/relayFeeCalculator/chain-queries/factory.ts"],"names":[],"mappings":";AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,EAAE,iCAAiC,EAAE,MAAM,iBAAiB,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxF,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAU,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE/C;;;GAGG;AACH,IAAM,aAAa;IACjB,GAAC,SAAS,CAAC,IAAI,IAAG,GAAG;OACtB,CAAC;AAEF;IAAA;IAqDA,CAAC;IApDQ,yBAAM,GAAb,UACE,OAAe,EACf,QAA4B,EAC5B,aAAiC,EACjC,gBAA2D,EAC3D,uBAA2D,EAC3D,kBAA2B,EAC3B,MAA+B,EAC/B,qBAA6B;QAL7B,8BAAA,EAAA,iCAAiC;QACjC,iCAAA,EAAA,mBAAmB,kBAAkB,CAAC,WAAW,EAAE,OAAO,CAAC;QAC3D,wCAAA,EAAA,2DAA2D;QAE3D,uBAAA,EAAA,uBAA+B;QAC/B,sCAAA,EAAA,6BAA6B;QAE7B,MAAM,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAEpC,IAAI,YAAY,CAAC,OAAO,CAAC,EAAE;YACzB,OAAO,IAAI,cAAc,CACvB,QAAQ,EACR,aAAa,EACb,gBAAgB,EAChB,uBAAuB,EACvB,MAAM,EACN,kBAAkB,EAClB,aAAa,CAAC,OAAO,CAAC,EACtB,KAAK,CACN,CAAC;SACH;QAED,IAAI,gBAAgB,CAAC,OAAO,CAAC,EAAE;YAC7B,OAAO,IAAI,gBAAgB,CACzB,QAAQ,EACR,aAAa,EACb,gBAAgB,EAChB,uBAAuB,EACvB,MAAM,EACN,kBAAkB,EAClB,aAAa,CAAC,OAAO,CAAC,EACtB,KAAK,CACN,CAAC;SACH;QAED,oEAAoE;QACpE,QAAQ,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;QAEvE,OAAO,IAAI,SAAS,CAClB,QAAQ,EACR,aAAa,EACb,gBAAgB,EAChB,uBAAuB,EACvB,MAAM,EACN,kBAAkB,EAClB,aAAa,CAAC,OAAO,CAAC,EACtB,qBAAqB,CACtB,CAAC;IACJ,CAAC;IACH,yBAAC;AAAD,CAAC,AArDD,IAqDC"}