@pimlico/alto 0.0.4 → 0.0.5

package/lib/executor/utils.js

@@ -24,20 +24,21 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.flushStuckTransaction = exports.filterOpsAndEstimateGas = exports.createCompressedCalldata = exports.simulatedOpsToResults = void 0;
+// biome-ignore lint/style/noNamespaceImport: explicitly make it clear when sentry is used
+const sentry = __importStar(require("@sentry/node"));
 const types_1 = require("../types/index.js");
 const utils_1 = require("../utils/index.js");
-const sentry = __importStar(require("@sentry/node"));
 const viem_1 = require("viem");
 function simulatedOpsToResults(simulatedOps, transactionInfo) {
-    return simulatedOps.map((sop) => {
-        if (sop.reason === undefined) {
+    return simulatedOps.map(({ reason, owh }) => {
+        if (reason === undefined) {
             return {
                 status: "success",
                 value: {
                     userOperation: {
                         entryPoint: transactionInfo.entryPoint,
-                        mempoolUserOperation: sop.owh.mempoolUserOperation,
-                        userOperationHash: sop.owh.userOperationHash,
+                        mempoolUserOperation: owh.mempoolUserOperation,
+                        userOperationHash: owh.userOperationHash,
                         lastReplaced: Date.now(),
                         firstSubmitted: Date.now()
                     },
@@ -49,9 +50,9 @@ function simulatedOpsToResults(simulatedOps, transactionInfo) {
             status: "failure",
             error: {
                 entryPoint: transactionInfo.entryPoint,
-                userOperation: sop.owh.mempoolUserOperation,
-                userOpHash: sop.owh.userOperationHash,
-                reason: sop.reason
+                userOperation: owh.mempoolUserOperation,
+                userOpHash: owh.userOperationHash,
+                reason: reason
             }
         };
     });
@@ -78,16 +79,17 @@ async function filterOpsAndEstimateGas(entryPoint, callContext, wallet, ops, non
     });
     let gasLimit;
     // TODO compressed ops are not supported in V07
-    const isUserOpV06 = callContext.type === "default"
-        ? (0, utils_1.isVersion06)(simulatedOps[0].owh.mempoolUserOperation)
-        : true;
+    const isUserOpV06 = callContext.type !== "default" || // All compressed ops are v6 by default
+        (0, utils_1.isVersion06)(simulatedOps[0].owh.mempoolUserOperation);
+    const gasOptions = onlyPre1559
+        ? { gasPrice: maxFeePerGas }
+        : { maxFeePerGas, maxPriorityFeePerGas };
+    let fixedEstimationGasLimit = fixedGasLimitForEstimation;
+    let retriesLeft = 5;
     while (simulatedOps.filter((op) => op.reason === undefined).length > 0) {
         try {
-            const gasOptions = onlyPre1559
-                ? { gasPrice: maxFeePerGas }
-                : { maxFeePerGas, maxPriorityFeePerGas };
             if (callContext.type === "default") {
-                const ep = callContext.ep;
+                const { ep } = callContext;
                 const opsToSend = simulatedOps
                     .filter((op) => op.reason === undefined)
                     .map((op) => {
@@ -102,8 +104,8 @@ async function filterOpsAndEstimateGas(entryPoint, callContext, wallet, ops, non
                     account: wallet,
                     nonce: nonce,
                     blockTag: blockTag,
-                    ...(fixedGasLimitForEstimation !== undefined && {
-                        gas: fixedGasLimitForEstimation
+                    ...(fixedEstimationGasLimit !== undefined && {
+                        gas: fixedEstimationGasLimit
                     }),
                     ...gasOptions
                 });
@@ -118,13 +120,15 @@ async function filterOpsAndEstimateGas(entryPoint, callContext, wallet, ops, non
                     to: bundleBulker,
                     account: wallet,
                     data: createCompressedCalldata(opsToSend, perOpInflatorId),
-                    gas: fixedGasLimitForEstimation,
+                    ...(fixedEstimationGasLimit !== undefined && {
+                        gas: fixedEstimationGasLimit
+                    }),
                     nonce: nonce,
                     blockTag: blockTag,
                     ...gasOptions
                 });
             }
-            return { simulatedOps, gasLimit, resubmitAllOps: false };
+            return { simulatedOps, gasLimit };
         }
         catch (err) {
             logger.error({ err, blockTag }, "error estimating gas");
@@ -140,6 +144,12 @@ async function filterOpsAndEstimateGas(entryPoint, callContext, wallet, ops, non
                     errorData = failedOpWithRevertError.data.args;
                 }
                 if (errorData) {
+                    if (errorData.reason.indexOf("AA95 out of gas") !== -1 &&
+                        retriesLeft > 0) {
+                        retriesLeft--;
+                        fixedEstimationGasLimit = (0, utils_1.scaleBigIntByPercent)(fixedEstimationGasLimit || BigInt(30_000_000), 110);
+                        continue;
+                    }
                     logger.debug({
                         errorData,
                         userOpHashes: simulatedOps
@@ -159,20 +169,26 @@ async function filterOpsAndEstimateGas(entryPoint, callContext, wallet, ops, non
                     }, "failed to parse failedOpError");
                     return {
                         simulatedOps: [],
-                        gasLimit: 0n,
-                        resubmitAllOps: false
+                        gasLimit: 0n
                     };
                 }
             }
             else if (e instanceof viem_1.EstimateGasExecutionError ||
                 err instanceof viem_1.EstimateGasExecutionError) {
-                if (e?.cause instanceof viem_1.FeeCapTooLowError) {
+                if (e?.cause instanceof viem_1.FeeCapTooLowError && retriesLeft > 0) {
+                    retriesLeft--;
                     logger.info({ error: e.shortMessage }, "error estimating gas due to max fee < basefee");
-                    return {
-                        simulatedOps: simulatedOps,
-                        gasLimit: 0n,
-                        resubmitAllOps: true
-                    };
+                    if ("gasPrice" in gasOptions) {
+                        gasOptions.gasPrice = (0, utils_1.scaleBigIntByPercent)(gasOptions.gasPrice || maxFeePerGas, 125);
+                    }
+                    if ("maxFeePerGas" in gasOptions) {
+                        gasOptions.maxFeePerGas = (0, utils_1.scaleBigIntByPercent)(gasOptions.maxFeePerGas || maxFeePerGas, 125);
+                    }
+                    if ("maxPriorityFeePerGas" in gasOptions) {
+                        gasOptions.maxPriorityFeePerGas = (0, utils_1.scaleBigIntByPercent)(gasOptions.maxPriorityFeePerGas ||
+                            maxPriorityFeePerGas, 125);
+                    }
+                    continue;
                 }
                 try {
                     let errorHexData = "0x";
@@ -201,8 +217,7 @@ async function filterOpsAndEstimateGas(entryPoint, callContext, wallet, ops, non
                         }, "unexpected error result");
                         return {
                             simulatedOps: [],
-                            gasLimit: 0n,
-                            resubmitAllOps: false
+                            gasLimit: 0n
                         };
                     }
                     const failingOp = simulatedOps.filter((op) => op.reason === undefined)[Number(errorResult.args[0])];
@@ -212,22 +227,21 @@ async function filterOpsAndEstimateGas(entryPoint, callContext, wallet, ops, non
                     logger.error({ error: JSON.stringify(err) }, "failed to parse error result");
                     return {
                         simulatedOps: [],
-                        gasLimit: 0n,
-                        resubmitAllOps: false
+                        gasLimit: 0n
                     };
                 }
             }
             else {
                 sentry.captureException(err);
                 logger.error({ error: JSON.stringify(err), blockTag }, "error estimating gas");
-                return { simulatedOps: [], gasLimit: 0n, resubmitAllOps: false };
+                return { simulatedOps: [], gasLimit: 0n };
             }
         }
     }
-    return { simulatedOps, gasLimit: 0n, resubmitAllOps: false };
+    return { simulatedOps, gasLimit: 0n };
 }
 exports.filterOpsAndEstimateGas = filterOpsAndEstimateGas;
-async function flushStuckTransaction(publicClient, walletClient, wallet, gasPrice, logger, entryPoint) {
+async function flushStuckTransaction(publicClient, walletClient, wallet, gasPrice, logger) {
     const latestNonce = await publicClient.getTransactionCount({
         address: wallet.address,
         blockTag: "latest"
@@ -257,9 +271,6 @@ async function flushStuckTransaction(publicClient, walletClient, wallet, gasPric
                 maxPriorityFeePerGas: gasPrice
             });
             logger.debug({ txHash, nonce: nonceToFlush, wallet: wallet.address }, "flushed stuck transaction");
-            // TODO: We don't know if the entrypoint is the V06 or V07. So we try and catch both.
-            await (0, utils_1.transactionIncluded)(true, txHash, publicClient, entryPoint);
-            await (0, utils_1.transactionIncluded)(false, txHash, publicClient, entryPoint);
         }
         catch (e) {
             sentry.captureException(e);

package/lib/executor/utils.js.map

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

package/lib/handlers/compressionHandler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"compressionHandler.js","sourceRoot":"","sources":["../../handlers/compressionHandler.ts"],"names":[],"mappings":";;;AAAA,uCAA6E;AAC7E,+BAAkE;AAElE,MAAa,kBAAkB;IAC3B,mBAAmB,CAAS;IAC5B,oBAAoB,CAAS;IAC7B,eAAe,CAAQ;IAEvB,YACI,mBAA4B,EAC5B,oBAA6B,EAC7B,eAAuB;QAEvB,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAA;QAC9C,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAA;QAChD,IAAI,CAAC,eAAe,GAAG,eAAe,CAAA;IAC1C,CAAC;IAEM,MAAM,CAAC,WAAW,GAAG,KAAK,EAC7B,mBAA4B,EAC5B,oBAA6B,EAC7B,YAA0B,EAC5B,EAAE;QACA,MAAM,kBAAkB,GAAG,IAAI,kBAAkB,CAC7C,mBAAmB,EACnB,oBAAoB,EACpB,CAAC,CACJ,CAAA;QAED,MAAM,YAAY,GAAG,IAAA,kBAAW,EAAC;YAC7B,OAAO,EAAE,mBAAmB;YAC5B,GAAG,EAAE,uBAAe;YACpB,MAAM,EAAE;gBACJ,MAAM,EAAE,YAAY;aACvB;SACJ,CAAC,CAAA;QAEF,kBAAkB,CAAC,eAAe;YAC9B,MAAM,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAA;QAEhE,IAAI,kBAAkB,CAAC,eAAe,KAAK,CAAC,EAAE,CAAC;YAC3C,MAAM,IAAI,KAAK,CACX,kBAAkB,oBAAoB,0CAA0C,mBAAmB,GAAG,CACzG,CAAA;QACL,CAAC;QAED,OAAO,kBAAkB,CAAA;IAC7B,CAAC,CAAA;IAEM,KAAK,CAAC,uBAAuB,CAChC,QAAiB,EACjB,YAAoB;QAEpB,MAAM,aAAa,GAAG,IAAA,kBAAW,EAAC;YAC9B,OAAO,EAAE,IAAI,CAAC,oBAAoB;YAClC,GAAG,EAAE,wBAAgB;YACrB,MAAM,EAAE;gBACJ,MAAM,EAAE,YAAY;aACvB;SACJ,CAAC,CAAA;QAEF,OAAO,MAAM,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAA;IAC5D,CAAC;;AA3DL,gDA4DC"}

package/lib/handlers/eventManager.d.ts

@@ -0,0 +1,21 @@
+import type { Hex } from "viem";
+import type { Logger, Metrics } from "../utils/index.js";
+export declare class EventManager {
+    private redis;
+    private chainId;
+    private logger;
+    private metrics;
+    constructor(endpoint: string | undefined, chainId: number, logger: Logger, metrics: Metrics);
+    emitExecutionRevertedOnChain(userOperationHash: Hex, transactionHash: Hex, reason: Hex, blockNumber: bigint): Promise<void>;
+    emitFailedOnChain(userOperationHash: Hex, transactionHash: Hex, blockNumber: bigint): Promise<void>;
+    emitFrontranOnChain(userOperationHash: Hex, transactionHash: Hex, blockNumber: bigint): Promise<void>;
+    emitIncludedOnChain(userOperationHash: Hex, transactionHash: Hex, blockNumber: bigint): Promise<void>;
+    emitQueued(userOperationHash: Hex): Promise<void>;
+    emitReceived(userOperationHash: Hex, timestamp?: number): Promise<void>;
+    emitFailedValidation(userOperationHash: Hex, reason?: string, aaError?: string): Promise<void>;
+    emitSubmitted(userOperationHash: Hex, transactionHash: Hex): Promise<void>;
+    emitDropped(userOperationHash: Hex, reason?: string, aaError?: string): Promise<void>;
+    emitAddedToMempool(userOperationHash: Hex): Promise<void>;
+    private emitEvent;
+}
+//# sourceMappingURL=eventManager.d.ts.map

package/lib/handlers/eventManager.js

@@ -0,0 +1,196 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EventManager = void 0;
+// biome-ignore lint/style/noNamespaceImport: explicitly make it clear when sentry is used
+const sentry = __importStar(require("@sentry/node"));
+const ioredis_1 = __importDefault(require("ioredis"));
+class EventManager {
+    redis;
+    chainId;
+    logger;
+    metrics;
+    constructor(endpoint, chainId, logger, metrics) {
+        this.chainId = chainId;
+        this.logger = logger;
+        this.metrics = metrics;
+        if (endpoint) {
+            this.redis = new ioredis_1.default(endpoint);
+            return;
+        }
+        this.redis = undefined;
+    }
+    // emits when the userOperation was mined onchain but reverted during the callphase
+    async emitExecutionRevertedOnChain(userOperationHash, transactionHash, reason, blockNumber) {
+        await this.emitEvent({
+            userOperationHash,
+            event: {
+                eventType: "execution_reverted_onchain",
+                transactionHash,
+                data: {
+                    blockNumber: Number(blockNumber),
+                    reason
+                }
+            }
+        });
+    }
+    // emits when the userOperation was mined onchain but failed EntryPoint validation
+    async emitFailedOnChain(userOperationHash, transactionHash, blockNumber) {
+        await this.emitEvent({
+            userOperationHash,
+            event: {
+                eventType: "failed_onchain",
+                transactionHash,
+                data: {
+                    blockNumber: Number(blockNumber)
+                }
+            }
+        });
+    }
+    // emits when the userOperation has been included onchain but bundled by a frontrunner
+    async emitFrontranOnChain(userOperationHash, transactionHash, blockNumber) {
+        await this.emitEvent({
+            userOperationHash,
+            event: {
+                eventType: "frontran_onchain",
+                transactionHash,
+                data: {
+                    blockNumber: Number(blockNumber)
+                }
+            }
+        });
+    }
+    // emits when the userOperation is included onchain
+    async emitIncludedOnChain(userOperationHash, transactionHash, blockNumber) {
+        await this.emitEvent({
+            userOperationHash,
+            event: {
+                eventType: "included_onchain",
+                transactionHash,
+                data: {
+                    blockNumber: Number(blockNumber)
+                }
+            }
+        });
+    }
+    // emits when the userOperation is placed in the nonce queue
+    async emitQueued(userOperationHash) {
+        await this.emitEvent({
+            userOperationHash,
+            event: {
+                eventType: "queued"
+            }
+        });
+    }
+    // emits when the userOperation is first seen
+    async emitReceived(userOperationHash, timestamp) {
+        await this.emitEvent({
+            userOperationHash,
+            event: {
+                eventType: "received"
+            },
+            timestamp
+        });
+    }
+    // emits when the userOperation failed to get added to the mempool
+    async emitFailedValidation(userOperationHash, reason, aaError) {
+        await this.emitEvent({
+            userOperationHash,
+            event: {
+                eventType: "failed_validation",
+                data: {
+                    reason,
+                    aaError
+                }
+            }
+        });
+    }
+    // emits when the userOperation has been submitted to the network
+    async emitSubmitted(userOperationHash, transactionHash) {
+        await this.emitEvent({
+            userOperationHash,
+            event: {
+                eventType: "submitted",
+                transactionHash
+            }
+        });
+    }
+    // emits when the userOperation was dropped from the internal mempool
+    async emitDropped(userOperationHash, reason, aaError) {
+        await this.emitEvent({
+            userOperationHash,
+            event: {
+                eventType: "dropped",
+                data: {
+                    reason,
+                    aaError
+                }
+            }
+        });
+    }
+    // emits when the userOperation was added to the internal mempool
+    async emitAddedToMempool(userOperationHash) {
+        await this.emitEvent({
+            userOperationHash,
+            event: {
+                eventType: "added_to_mempool"
+            }
+        });
+    }
+    async emitEvent({ userOperationHash, event, timestamp }) {
+        if (!this.redis) {
+            return;
+        }
+        const entry = {
+            userOperationHash,
+            eventTimestamp: timestamp ?? Date.now(),
+            chainId: this.chainId,
+            ...event
+        };
+        // log to redis here
+        let lpushStatus;
+        try {
+            await this.redis.lpush("UserOperationStatusEventsQueue", JSON.stringify(entry));
+            lpushStatus = "success";
+        }
+        catch (e) {
+            this.logger.error("Failed to send userOperation status event due to ", JSON.stringify(e));
+            sentry.captureException(e);
+            lpushStatus = "failed";
+        }
+        this.metrics.emittedOpEvents
+            .labels({
+            // biome-ignore lint/style/useNamingConvention: event_type
+            event_type: event.eventType,
+            status: lpushStatus
+        })
+            .inc();
+    }
+}
+exports.EventManager = EventManager;
+//# sourceMappingURL=eventManager.js.map

package/lib/handlers/eventManager.js.map

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

package/{esm/utils → lib/handlers}/gasPriceManager.d.ts

@@ -1,5 +1,5 @@
-import { type GasPriceParameters } from "../types/index.js";
-import { type Logger } from "./index.js";
+import { type GasPriceParameters, type ChainType } from "../types/index.js";
+import { type Logger } from "../utils/index.js";
 import { type Chain, type PublicClient } from "viem";
 export declare class GasPriceManager {
     private chain;
@@ -11,7 +11,13 @@ export declare class GasPriceManager {
     private queueMaxPriorityFeePerGas;
     private maxQueueSize;
     private gasBumpMultiplier;
-    constructor(chain: Chain, publicClient: PublicClient, legacyTransactions: boolean, logger: Logger, gasBumpMultiplier: bigint, gasPriceTimeValidityInSeconds?: number);
+    private gasPriceRefreshIntervalInSeconds;
+    private chainType;
+    constructor(chain: Chain, publicClient: PublicClient, legacyTransactions: boolean, logger: Logger, gasBumpMultiplier: bigint, gasPriceTimeValidityInSeconds: number, gasPriceRefreshIntervalInSeconds: number, chainType: ChainType);
+    init(): Promise<[{
+        maxFeePerGas: bigint;
+        maxPriorityFeePerGas: bigint;
+    }, bigint | void]>;
     private getDefaultGasFee;
     private getPolygonGasPriceParameters;
     private bumpTheGasPrice;
@@ -24,8 +30,16 @@ export declare class GasPriceManager {
     private saveMaxPriorityFeePerGas;
     private saveGasPrice;
     private innerGetGasPrice;
-    getBaseFee(): Promise<bigint>;
-    getGasPrice(): Promise<GasPriceParameters>;
+    private updateBaseFee;
+    getBaseFee(): bigint | Promise<bigint>;
+    private updateGasPrice;
+    getGasPrice(): Promise<{
+        maxFeePerGas: bigint;
+        maxPriorityFeePerGas: bigint;
+    }> | {
+        maxFeePerGas: bigint;
+        maxPriorityFeePerGas: bigint;
+    };
     getMaxBaseFeePerGas(): Promise<bigint>;
     private getMinMaxFeePerGas;
     private getMinMaxPriorityFeePerGas;

package/lib/{utils → handlers}/gasPriceManager.js

@@ -25,10 +25,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GasPriceManager = void 0;
 const types_1 = require("../types/index.js");
-const utils_1 = require("./index.js");
+const utils_1 = require("../utils/index.js");
 const sentry = __importStar(require("@sentry/node"));
 const viem_1 = require("viem");
-const chains = __importStar(require("viem/chains"));
+const chains_1 = require("viem/chains");
 var ChainId;
 (function (ChainId) {
     ChainId[ChainId["Goerli"] = 5] = "Goerli";
@@ -57,13 +57,34 @@ class GasPriceManager {
     queueMaxPriorityFeePerGas = []; // Store pairs of [price, timestamp]
     maxQueueSize;
     gasBumpMultiplier;
-    constructor(chain, publicClient, legacyTransactions, logger, gasBumpMultiplier, gasPriceTimeValidityInSeconds = 10) {
+    gasPriceRefreshIntervalInSeconds;
+    chainType;
+    constructor(chain, publicClient, legacyTransactions, logger, gasBumpMultiplier, gasPriceTimeValidityInSeconds, gasPriceRefreshIntervalInSeconds, chainType) {
         this.maxQueueSize = gasPriceTimeValidityInSeconds;
         this.chain = chain;
         this.publicClient = publicClient;
         this.legacyTransactions = legacyTransactions;
         this.logger = logger;
         this.gasBumpMultiplier = gasBumpMultiplier;
+        this.gasPriceRefreshIntervalInSeconds = gasPriceRefreshIntervalInSeconds;
+        this.chainType = chainType;
+        // Periodically update gas prices if specified
+        if (this.gasPriceRefreshIntervalInSeconds > 0) {
+            setInterval(() => {
+                if (this.legacyTransactions === false) {
+                    this.updateBaseFee();
+                }
+                this.updateGasPrice();
+            }, this.gasPriceRefreshIntervalInSeconds * 1000);
+        }
+    }
+    init() {
+        return Promise.all([
+            this.updateGasPrice(),
+            this.legacyTransactions === false
+                ? this.updateBaseFee()
+                : Promise.resolve()
+        ]);
     }
     getDefaultGasFee(chainId) {
         switch (chainId) {
@@ -96,15 +117,14 @@ class GasPriceManager {
             maxFeePerGas: (maxFeePerGas * bumpAmount) / 100n,
             maxPriorityFeePerGas: (maxPriorityFeePerGas * bumpAmount) / 100n
         };
-        if (this.chain.id === chains.celo.id ||
-            this.chain.id === chains.celoAlfajores.id) {
+        if (this.chain.id === chains_1.celo.id || this.chain.id === chains_1.celoAlfajores.id) {
             const maxFee = (0, utils_1.maxBigInt)(result.maxFeePerGas, result.maxPriorityFeePerGas);
             return {
                 maxFeePerGas: maxFee,
                 maxPriorityFeePerGas: maxFee
             };
         }
-        if (this.chain.id === chains.dfk.id) {
+        if (this.chain.id === chains_1.dfk.id) {
             const maxFeePerGas = (0, utils_1.maxBigInt)(5000000000n, result.maxFeePerGas);
             const maxPriorityFeePerGas = (0, utils_1.maxBigInt)(5000000000n, result.maxPriorityFeePerGas);
             return {
@@ -113,7 +133,7 @@ class GasPriceManager {
             };
         }
         // set a minimum maxPriorityFee & maxFee to 1.5gwei on avalanche (because eth_maxPriorityFeePerGas returns 0)
-        if (this.chain.id === chains.avalanche.id) {
+        if (this.chain.id === chains_1.avalanche.id) {
             const maxFeePerGas = (0, utils_1.maxBigInt)((0, viem_1.parseGwei)("1.5"), result.maxFeePerGas);
             const maxPriorityFeePerGas = (0, utils_1.maxBigInt)((0, viem_1.parseGwei)("1.5"), result.maxPriorityFeePerGas);
             return {
@@ -282,8 +302,8 @@ class GasPriceManager {
     async innerGetGasPrice() {
         let maxFeePerGas = 0n;
         let maxPriorityFeePerGas = 0n;
-        if (this.chain.id === chains.polygon.id ||
-            this.chain.id === chains.polygonMumbai.id) {
+        if (this.chain.id === chains_1.polygon.id ||
+            this.chain.id === chains_1.polygonMumbai.id) {
             const polygonEstimate = await this.getPolygonGasPriceParameters();
             if (polygonEstimate) {
                 const gasPrice = this.bumpTheGasPrice({
@@ -315,7 +335,7 @@ class GasPriceManager {
             maxPriorityFeePerGas: (0, utils_1.maxBigInt)(gasPrice.maxPriorityFeePerGas, maxPriorityFeePerGas)
         };
     }
-    async getBaseFee() {
+    async updateBaseFee() {
         const latestBlock = await this.publicClient.getBlock();
         if (latestBlock.baseFeePerGas === null) {
             throw new types_1.RpcError("block does not have baseFeePerGas");
@@ -324,7 +344,17 @@ class GasPriceManager {
         this.saveBaseFeePerGas(baseFee, Date.now());
         return baseFee;
     }
-    async getGasPrice() {
+    getBaseFee() {
+        if (this.legacyTransactions) {
+            throw new types_1.RpcError("baseFee is not available for legacy transactions");
+        }
+        if (this.gasPriceRefreshIntervalInSeconds === 0) {
+            return this.updateBaseFee();
+        }
+        const { baseFeePerGas } = this.queueBaseFeePerGas[this.queueBaseFeePerGas.length - 1];
+        return baseFeePerGas;
+    }
+    async updateGasPrice() {
         const gasPrice = await this.innerGetGasPrice();
         this.saveGasPrice({
             maxFeePerGas: gasPrice.maxFeePerGas,
@@ -332,6 +362,17 @@ class GasPriceManager {
         }, Date.now());
         return gasPrice;
     }
+    getGasPrice() {
+        if (this.gasPriceRefreshIntervalInSeconds === 0) {
+            return this.updateGasPrice();
+        }
+        const { maxPriorityFeePerGas } = this.queueMaxPriorityFeePerGas[this.queueMaxPriorityFeePerGas.length - 1];
+        const { maxFeePerGas } = this.queueMaxFeePerGas[this.queueMaxFeePerGas.length - 1];
+        return {
+            maxFeePerGas,
+            maxPriorityFeePerGas
+        };
+    }
     async getMaxBaseFeePerGas() {
         if (this.queueBaseFeePerGas.length === 0) {
             await this.getBaseFee();
@@ -351,8 +392,12 @@ class GasPriceManager {
         return this.queueMaxPriorityFeePerGas.reduce((acc, cur) => (0, utils_1.minBigInt)(cur.maxPriorityFeePerGas, acc), this.queueMaxPriorityFeePerGas[0].maxPriorityFeePerGas);
     }
     async validateGasPrice(gasPrice) {
-        const lowestMaxFeePerGas = await this.getMinMaxFeePerGas();
-        const lowestMaxPriorityFeePerGas = await this.getMinMaxPriorityFeePerGas();
+        let lowestMaxFeePerGas = await this.getMinMaxFeePerGas();
+        let lowestMaxPriorityFeePerGas = await this.getMinMaxPriorityFeePerGas();
+        if (this.chainType === "hedera") {
+            lowestMaxFeePerGas /= 10n ** 9n;
+            lowestMaxPriorityFeePerGas /= 10n ** 9n;
+        }
         if (gasPrice.maxFeePerGas < lowestMaxFeePerGas) {
             throw new types_1.RpcError(`maxFeePerGas must be at least ${lowestMaxFeePerGas} (current maxFeePerGas: ${gasPrice.maxFeePerGas}) - use pimlico_getUserOperationGasPrice to get the current gas price`);
         }