Merge pull request #279 from pimlicolabs/effectiveGasPrice

fix in rpc call too
pimlicolabs · Aug 5, 2024 · 91a2968 · 91a2968
2 parents 000b8c4 + f1136fe
commit 91a2968
Showing 1 changed file with 22 additions and 3 deletions.
diff --git a/src/rpc/rpcHandler.ts b/src/rpc/rpcHandler.ts
@@ -713,9 +713,28 @@ export class RpcHandler implements IRpcEndpoint {
         ): Promise<TransactionReceipt> => {
             while (true) {
                 try {
-                    return await this.publicClient.getTransactionReceipt({
-                        hash: txHash
-                    })
+                    const transactionReceipt =
+                        await this.publicClient.getTransactionReceipt({
+                            hash: txHash
+                        })
+
+                    let effectiveGasPrice: bigint | undefined =
+                        transactionReceipt.effectiveGasPrice ??
+                        (transactionReceipt as any).gasPrice ??
+                        undefined
+
+                    if (effectiveGasPrice === undefined) {
+                        const tx = await this.publicClient.getTransaction({
+                            hash: txHash
+                        })
+                        effectiveGasPrice = tx.gasPrice ?? undefined
+                    }
+
+                    if (effectiveGasPrice) {
+                        transactionReceipt.effectiveGasPrice = effectiveGasPrice
+                    }
+
+                    return transactionReceipt
                 } catch (e) {
                     if (e instanceof TransactionReceiptNotFoundError) {
                         continue