fix: add blob_gas_used after succesful tx execution (#4913)

Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
paradigmxyz · Oct 5, 2023 · 4dceabf · 4dceabf
1 parent 005ca66
commit 4dceabf
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 18 deletions.
diff --git a/crates/payload/basic/src/lib.rs b/crates/payload/basic/src/lib.rs
@@ -705,14 +705,6 @@ where
                 // the gas limit condition for regular transactions above.
                 best_txs.mark_invalid(&pool_tx);
                 continue
-            } else {
-                // add to the data gas if we're going to execute the transaction
-                sum_blob_gas_used += tx_blob_gas;
-
-                // if we've reached the max data gas per block, we can skip blob txs entirely
-                if sum_blob_gas_used == MAX_DATA_GAS_PER_BLOCK {
-                    best_txs.skip_blobs();
-                }
             }
         }
 
@@ -740,6 +732,7 @@ where
                             trace!(?err, ?tx, "skipping invalid transaction and its descendants");
                             best_txs.mark_invalid(&pool_tx);
                         }
+
                         continue
                     }
                     err => {
@@ -750,10 +743,22 @@ where
             }
         };
 
-        let gas_used = result.gas_used();
         // commit changes
         db.commit(state);
 
+        // add to the total blob gas used if the transaction successfully executed
+        if let Some(blob_tx) = tx.transaction.as_eip4844() {
+            let tx_blob_gas = blob_tx.blob_gas();
+            sum_blob_gas_used += tx_blob_gas;
+
+            // if we've reached the max data gas per block, we can skip blob txs entirely
+            if sum_blob_gas_used == MAX_DATA_GAS_PER_BLOCK {
+                best_txs.skip_blobs();
+            }
+        }
+
+        let gas_used = result.gas_used();
+
         // add gas used by the transaction to cumulative gas used, before creating the receipt
         cumulative_gas_used += gas_used;
 

diff --git a/crates/rpc/rpc/src/eth/api/pending_block.rs b/crates/rpc/rpc/src/eth/api/pending_block.rs
@@ -115,14 +115,6 @@ impl PendingBlockEnv {
                     // for regular transactions above.
                     best_txs.mark_invalid(&pool_tx);
                     continue
-                } else {
-                    // add to the data gas if we're going to execute the transaction
-                    sum_blob_gas_used += tx_blob_gas;
-
-                    // if we've reached the max data gas per block, we can skip blob txs entirely
-                    if sum_blob_gas_used == MAX_DATA_GAS_PER_BLOCK {
-                        best_txs.skip_blobs();
-                    }
                 }
             }
 
@@ -155,10 +147,22 @@ impl PendingBlockEnv {
                 }
             };
 
-            let gas_used = result.gas_used();
             // commit changes
             db.commit(state);
 
+            // add to the total blob gas used if the transaction successfully executed
+            if let Some(blob_tx) = tx.transaction.as_eip4844() {
+                let tx_blob_gas = blob_tx.blob_gas();
+                sum_blob_gas_used += tx_blob_gas;
+
+                // if we've reached the max data gas per block, we can skip blob txs entirely
+                if sum_blob_gas_used == MAX_DATA_GAS_PER_BLOCK {
+                    best_txs.skip_blobs();
+                }
+            }
+
+            let gas_used = result.gas_used();
+
             // add gas used by the transaction to cumulative gas used, before creating the receipt
             cumulative_gas_used += gas_used;