@across-protocol/sdk 3.3.32 → 3.4.0

package/dist/cjs/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/cjs/relayFeeCalculator/chain-queries/alephZero.js

@@ -2,23 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AlephZeroQueries = void 0;
 var tslib_1 = require("tslib");
-var assert_1 = tslib_1.__importDefault(require("assert"));
-var DeploymentUtils_1 = require("../../utils/DeploymentUtils");
-var relayFeeCalculator_1 = require("../relayFeeCalculator");
 var constants_1 = require("../../constants");
 var Coingecko_1 = require("../../coingecko/Coingecko");
-var utils_1 = require("../../utils");
 var baseQuery_1 = require("./baseQuery");
 var AlephZeroQueries = (function (_super) {
     tslib_1.__extends(AlephZeroQueries, _super);
-    function AlephZeroQueries(provider, symbolMapping, spokePoolAddress, simulatedRelayerAddress, coingeckoProApiKey, logger, gasMarkup) {
-        if (symbolMapping === void 0) { symbolMapping = constants_1.TOKEN_SYMBOLS_MAP; }
-        if (spokePoolAddress === void 0) { spokePoolAddress = (0, DeploymentUtils_1.getDeployedAddress)("SpokePool", constants_1.CHAIN_IDs.ALEPH_ZERO); }
-        if (simulatedRelayerAddress === void 0) { simulatedRelayerAddress = constants_1.DEFAULT_SIMULATED_RELAYER_ADDRESS; }
-        if (logger === void 0) { logger = relayFeeCalculator_1.DEFAULT_LOGGER; }
-        if (gasMarkup === void 0) { gasMarkup = 0; }
-        (0, assert_1.default)((0, utils_1.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 tslib_1.__awaiter(this, void 0, void 0, function () {

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

@@ -1 +1 @@
-{"version":3,"file":"alephZero.js","sourceRoot":"","sources":["../../../../src/relayFeeCalculator/chain-queries/alephZero.ts"],"names":[],"mappings":";;;;AAAA,0DAA4B;AAC5B,+DAAiE;AACjE,4DAA+D;AAE/D,6CAAkG;AAClG,uDAAsD;AACtD,qCAAwC;AACxC,yCAAwC;AAExC;IAAsC,4CAAS;IAC7C,0BACE,QAA4B,EAC5B,aAAiC,EACjC,gBAAwE,EACxE,uBAA2D,EAC3D,kBAA2B,EAC3B,MAA+B,EAC/B,SAAa;QALb,8BAAA,EAAA,gBAAgB,6BAAiB;QACjC,iCAAA,EAAA,uBAAmB,oCAAkB,EAAC,WAAW,EAAE,qBAAS,CAAC,UAAU,CAAC;QACxE,wCAAA,EAAA,0BAA0B,6CAAiC;QAE3D,uBAAA,EAAA,SAAiB,mCAAc;QAC/B,0BAAA,EAAA,aAAa;QAEb,IAAA,gBAAM,EAAC,IAAA,iBAAS,EAAC,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,qBAAS,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;wBACvD,WAAM,iBAAiB,CAAC,yBAAyB,CACtE,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC,SAAS,CAAC,qBAAS,CAAC,OAAO,CAAC,EAC5D,KAAK,CACN,EAAA;;wBAHK,KAAiB,SAGtB,EAHQ,UAAU,QAAA;wBAKQ,WAAM,iBAAiB,CAAC,yBAAyB,CAC1E,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,qBAAS,CAAC,OAAO,CAAC,EACxD,KAAK,CACN,EAAA;;wBAHK,KAAqB,SAG1B,EAHQ,cAAc,QAAA;wBAIvB,WAAO,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,qBAAS,GAsC9C;AAtCY,4CAAgB"}
+{"version":3,"file":"alephZero.js","sourceRoot":"","sources":["../../../../src/relayFeeCalculator/chain-queries/alephZero.ts"],"names":[],"mappings":";;;;AAAA,6CAA4C;AAC5C,uDAAsD;AACtD,yCAAwC;AAExC;IAAsC,4CAAS;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,qBAAS,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;wBACvD,WAAM,iBAAiB,CAAC,yBAAyB,CACtE,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC,SAAS,CAAC,qBAAS,CAAC,OAAO,CAAC,EAC5D,KAAK,CACN,EAAA;;wBAHK,KAAiB,SAGtB,EAHQ,UAAU,QAAA;wBAKQ,WAAM,iBAAiB,CAAC,yBAAyB,CAC1E,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,qBAAS,CAAC,OAAO,CAAC,EACxD,KAAK,CACN,EAAA;;wBAHK,KAAqB,SAG1B,EAHQ,cAAc,QAAA;wBAIvB,WAAO,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,qBAAS,GAe9C;AAfY,4CAAgB"}

package/dist/cjs/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;
@@ -16,17 +16,22 @@ 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;
     readonly coingeckoBaseCurrency: string;
     readonly spokePool: SpokePool;
-    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);
     getGasCosts(deposit: Deposit, relayer?: string, options?: Partial<{
         gasPrice: BigNumberish;
         gasUnits: BigNumberish;
-        omitMarkup: boolean;
+        baseFeeMultiplier: BigNumber;
+        transport: Transport;
+    }>): Promise<TransactionCostEstimate>;
+    estimateGas(unsignedTx: PopulatedTransaction, senderAddress: string, provider: providers.Provider | L2Provider<providers.Provider>, options?: Partial<{
+        gasPrice: BigNumberish;
+        gasUnits: BigNumberish;
+        baseFeeMultiplier: BigNumber;
         transport: Transport;
     }>): Promise<TransactionCostEstimate>;
     getTokenPrice(tokenSymbol: string): Promise<number>;

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

@@ -2,19 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QueryBase = void 0;
 var tslib_1 = require("tslib");
-var assert_1 = tslib_1.__importDefault(require("assert"));
+var l2_provider_1 = require("@eth-optimism/sdk/dist/l2-provider");
+var ethers_1 = require("ethers");
 var coingecko_1 = require("../../coingecko");
 var constants_1 = require("../../constants");
 var typechain_1 = require("../../typechain");
 var utils_1 = require("../../utils");
+var oracle_1 = require("../../gasPriceOracle/oracle");
 var QueryBase = (function () {
-    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;
@@ -25,33 +26,76 @@ var QueryBase = (function () {
         if (relayer === void 0) { relayer = constants_1.DEFAULT_SIMULATED_RELAYER_ADDRESS; }
         if (options === void 0) { options = {}; }
         return tslib_1.__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 tslib_1.__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;
-                        (0, assert_1.default)(gasMarkup > -1 && gasMarkup <= 4, "Require -1.0 < Gas Markup (".concat(gasMarkup, ") <= 4.0 for a total gas multiplier within (0, +5.0]"));
-                        gasTotalMultiplier = (0, utils_1.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, (0, utils_1.populateV3Relay)(this.spokePool, deposit, relayer)];
                     case 1:
                         tx = _c.sent();
-                        return [4, (0, utils_1.estimateTotalGasRequiredByUnsignedTransaction)(tx, relayer, this.provider, {
+                        return [4, 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, {
-                                nativeGasCost: nativeGasCost.mul(gasTotalMultiplier).div(utils_1.fixedPointAdjustment),
-                                tokenGasCost: tokenGasCost.mul(gasTotalMultiplier).div(utils_1.fixedPointAdjustment),
+                                nativeGasCost: nativeGasCost,
+                                tokenGasCost: tokenGasCost,
                                 gasPrice: impliedGasPrice,
                             }];
                 }
             });
         });
     };
+    QueryBase.prototype.estimateGas = function (unsignedTx, senderAddress, provider, options) {
+        if (options === void 0) { options = {}; }
+        return tslib_1.__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 tslib_1.__generator(this, function (_d) {
+                switch (_d.label) {
+                    case 0:
+                        _a = options || {}, _gasPrice = _a.gasPrice, gasUnits = _a.gasUnits, _b = _a.baseFeeMultiplier, baseFeeMultiplier = _b === void 0 ? (0, utils_1.toBNWei)("1") : _b, transport = _a.transport;
+                        return [4, provider.getNetwork()];
+                    case 1:
+                        chainId = (_d.sent()).chainId;
+                        voidSigner = new ethers_1.VoidSigner(senderAddress, provider);
+                        queries = [
+                            gasUnits ? Promise.resolve(utils_1.BigNumber.from(gasUnits)) : voidSigner.estimateGas(unsignedTx),
+                            _gasPrice
+                                ? Promise.resolve({ maxFeePerGas: _gasPrice })
+                                : (0, oracle_1.getGasPriceEstimate)(provider, { chainId: chainId, baseFeeMultiplier: baseFeeMultiplier, transport: transport, unsignedTx: unsignedTx }),
+                        ];
+                        return [4, Promise.all(queries)];
+                    case 2:
+                        _c = _d.sent(), nativeGasCost = _c[0], gasPrice = _c[1].maxFeePerGas;
+                        (0, utils_1.assert)(nativeGasCost.gt(utils_1.bnZero), "Gas cost should not be 0");
+                        if (!(0, utils_1.chainIsOPStack)(chainId)) return [3, 5];
+                        (0, utils_1.assert)((0, l2_provider_1.isL2Provider)(provider), "Unexpected provider for chain ID ".concat(chainId, "."));
+                        return [4, voidSigner.populateTransaction(tslib_1.__assign(tslib_1.__assign({}, unsignedTx), { gasLimit: nativeGasCost }))];
+                    case 3:
+                        populatedTransaction = _d.sent();
+                        return [4, provider.estimateL1GasCost(populatedTransaction)];
+                    case 4:
+                        l1GasCost = _d.sent();
+                        l2GasCost = nativeGasCost.mul(gasPrice);
+                        tokenGasCost = l1GasCost.add(l2GasCost);
+                        return [3, 6];
+                    case 5:
+                        tokenGasCost = nativeGasCost.mul(gasPrice);
+                        _d.label = 6;
+                    case 6: return [2, {
+                            nativeGasCost: nativeGasCost,
+                            tokenGasCost: tokenGasCost,
+                            gasPrice: tokenGasCost.div(nativeGasCost),
+                        }];
+                }
+            });
+        });
+    };
     QueryBase.prototype.getTokenPrice = function (tokenSymbol) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var coingeckoInstance, _a, price;

package/dist/cjs/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/cjs/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/cjs/relayFeeCalculator/chain-queries/factory.js

@@ -19,22 +19,21 @@ var fixedGasPrice = (_a = {},
 var QueryBase__factory = (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 = constants_1.TOKEN_SYMBOLS_MAP; }
         if (spokePoolAddress === void 0) { spokePoolAddress = (0, contracts_1.getDeployedAddress)("SpokePool", chainId); }
         if (simulatedRelayerAddress === void 0) { simulatedRelayerAddress = constants_2.DEFAULT_SIMULATED_RELAYER_ADDRESS; }
         if (logger === void 0) { logger = relayFeeCalculator_1.DEFAULT_LOGGER; }
-        if (gasMarkup === void 0) { gasMarkup = 0; }
         if (coingeckoBaseCurrency === void 0) { coingeckoBaseCurrency = "eth"; }
         (0, assert_1.default)((0, utils_1.isDefined)(spokePoolAddress));
         if ((0, utils_1.chainIsMatic)(chainId)) {
-            return new polygon_1.PolygonQueries(provider, symbolMapping, spokePoolAddress, simulatedRelayerAddress, coingeckoProApiKey, logger, gasMarkup);
+            return new polygon_1.PolygonQueries(provider, symbolMapping, spokePoolAddress, simulatedRelayerAddress, logger, coingeckoProApiKey, fixedGasPrice[chainId], "usd");
         }
         if ((0, utils_1.chainIsAlephZero)(chainId)) {
-            return new alephZero_1.AlephZeroQueries(provider, symbolMapping, spokePoolAddress, simulatedRelayerAddress, coingeckoProApiKey, logger, gasMarkup);
+            return new alephZero_1.AlephZeroQueries(provider, symbolMapping, spokePoolAddress, simulatedRelayerAddress, logger, coingeckoProApiKey, fixedGasPrice[chainId], "usd");
         }
         provider = (0, utils_1.chainIsOPStack)(chainId) ? (0, sdk_1.asL2Provider)(provider) : provider;
-        return new baseQuery_1.QueryBase(provider, symbolMapping, spokePoolAddress, simulatedRelayerAddress, gasMarkup, logger, coingeckoProApiKey, fixedGasPrice[chainId], coingeckoBaseCurrency);
+        return new baseQuery_1.QueryBase(provider, symbolMapping, spokePoolAddress, simulatedRelayerAddress, logger, coingeckoProApiKey, fixedGasPrice[chainId], coingeckoBaseCurrency);
     };
     return QueryBase__factory;
 }());

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

@@ -1 +1 @@
-{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../../../src/relayFeeCalculator/chain-queries/factory.ts"],"names":[],"mappings":";;;;;AAAA,0DAA4B;AAC5B,wDAA0E;AAC1E,wDAAgE;AAChE,yCAAiD;AAEjD,6CAAoE;AACpE,qCAAwF;AACxF,yCAAwC;AACxC,qCAA2C;AAC3C,4DAA+D;AAC/D,yCAA+C;AAM/C,IAAM,aAAa;IACjB,GAAC,qBAAS,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,gBAAgB,6BAAiB;QACjC,iCAAA,EAAA,uBAAmB,8BAAkB,EAAC,WAAW,EAAE,OAAO,CAAC;QAC3D,wCAAA,EAAA,0BAA0B,6CAAiC;QAE3D,uBAAA,EAAA,SAAiB,mCAAc;QAC/B,0BAAA,EAAA,aAAa;QACb,sCAAA,EAAA,6BAA6B;QAE7B,IAAA,gBAAM,EAAC,IAAA,iBAAS,EAAC,gBAAgB,CAAC,CAAC,CAAC;QAEpC,IAAI,IAAA,oBAAY,EAAC,OAAO,CAAC,EAAE;YACzB,OAAO,IAAI,wBAAc,CACvB,QAAQ,EACR,aAAa,EACb,gBAAgB,EAChB,uBAAuB,EACvB,kBAAkB,EAClB,MAAM,EACN,SAAS,CACV,CAAC;SACH;QAED,IAAI,IAAA,wBAAgB,EAAC,OAAO,CAAC,EAAE;YAC7B,OAAO,IAAI,4BAAgB,CACzB,QAAQ,EACR,aAAa,EACb,gBAAgB,EAChB,uBAAuB,EACvB,kBAAkB,EAClB,MAAM,EACN,SAAS,CACV,CAAC;SACH;QAGD,QAAQ,GAAG,IAAA,sBAAc,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAA,kBAAY,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;QAEvE,OAAO,IAAI,qBAAS,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;AArDY,gDAAkB"}
+{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../../../src/relayFeeCalculator/chain-queries/factory.ts"],"names":[],"mappings":";;;;;AAAA,0DAA4B;AAC5B,wDAA0E;AAC1E,wDAAgE;AAChE,yCAAiD;AAEjD,6CAAoE;AACpE,qCAAwF;AACxF,yCAAwC;AACxC,qCAA2C;AAC3C,4DAA+D;AAC/D,yCAA+C;AAM/C,IAAM,aAAa;IACjB,GAAC,qBAAS,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,gBAAgB,6BAAiB;QACjC,iCAAA,EAAA,uBAAmB,8BAAkB,EAAC,WAAW,EAAE,OAAO,CAAC;QAC3D,wCAAA,EAAA,0BAA0B,6CAAiC;QAE3D,uBAAA,EAAA,SAAiB,mCAAc;QAC/B,sCAAA,EAAA,6BAA6B;QAE7B,IAAA,gBAAM,EAAC,IAAA,iBAAS,EAAC,gBAAgB,CAAC,CAAC,CAAC;QAEpC,IAAI,IAAA,oBAAY,EAAC,OAAO,CAAC,EAAE;YACzB,OAAO,IAAI,wBAAc,CACvB,QAAQ,EACR,aAAa,EACb,gBAAgB,EAChB,uBAAuB,EACvB,MAAM,EACN,kBAAkB,EAClB,aAAa,CAAC,OAAO,CAAC,EACtB,KAAK,CACN,CAAC;SACH;QAED,IAAI,IAAA,wBAAgB,EAAC,OAAO,CAAC,EAAE;YAC7B,OAAO,IAAI,4BAAgB,CACzB,QAAQ,EACR,aAAa,EACb,gBAAgB,EAChB,uBAAuB,EACvB,MAAM,EACN,kBAAkB,EAClB,aAAa,CAAC,OAAO,CAAC,EACtB,KAAK,CACN,CAAC;SACH;QAGD,QAAQ,GAAG,IAAA,sBAAc,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAA,kBAAY,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;QAEvE,OAAO,IAAI,qBAAS,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;AArDY,gDAAkB"}