fix leading 0 in gasUsed (#142)

Author: urnotsam

src/external/Collector.ts

@@ -18,6 +18,8 @@ import { sleep } from '../utils'
 import { BaseTrie } from 'merkle-patricia-tree'
 import * as RLP from 'rlp'
 import { BigNumber } from '@ethersproject/bignumber'
+import { calculateBlockGasUsed } from '../utils/gasCalculator'
+
 class Collector extends BaseExternal {
   private blockCacheManager: BlockCacheManager
 
@@ -349,21 +351,7 @@ class Collector extends BaseExternal {
 
         if (txResponse.data.success && txResponse.data.transactions) {
           resultBlock.transactions = txResponse.data.transactions.map((tx: any) => this.decodeTransaction(tx))
-          // Calculate block gas used with proper hex value handling
-          let blockGasUsed = BigNumber.from(0)
-          txResponse.data.transactions.forEach((tx: any) => {
-            const gasUsedHex = tx.wrappedEVMAccount?.readableReceipt?.gasUsed
-            if (gasUsedHex && gasUsedHex !== '0x' && gasUsedHex !== '0x0') {
-              try {
-                // Normalize if necessary before converting to BigNumber
-                const gasUsed = BigNumber.from(gasUsedHex)
-                blockGasUsed = blockGasUsed.add(gasUsed)
-              } catch (gasError) {
-                console.warn('Invalid gas value in transaction:', tx.hash, gasUsedHex)
-              }
-            }
-          })
-          resultBlock.gasUsed = blockGasUsed.toHexString()
+          resultBlock.gasUsed = calculateBlockGasUsed(txResponse.data.transactions)
 
           // Extract transaction hash array
           const transactionHashes = resultBlock.transactions.map((tx: any) => tx.hash)

src/utils/gasCalculator.ts

@@ -0,0 +1,30 @@
+import { BigNumber } from '@ethersproject/bignumber'
+
+/**
+ * Calculates the total gas used from an array of transactions
+ * @param transactions Array of transactions with optional gas values
+ * @returns Hex string of total gas used, without leading zeros (except for 0x0)
+ */
+export function calculateBlockGasUsed(transactions: any[]): string {
+  let blockGasUsed = BigNumber.from(0)
+  transactions.forEach((tx: any) => {
+    const gasUsedHex = tx.wrappedEVMAccount?.readableReceipt?.gasUsed
+    if (gasUsedHex && gasUsedHex !== '0x' && gasUsedHex !== '0x0') {
+      try {
+        const gasValue = BigNumber.from(gasUsedHex)
+        blockGasUsed = blockGasUsed.add(gasValue)
+      } catch (gasError) {
+        console.warn('Invalid gas value in transaction:', tx.hash, gasUsedHex)
+      }
+    }
+  })
+
+  // Handle special case for zero
+  if (blockGasUsed.isZero()) {
+    return '0x0'
+  }
+
+  // Convert to hex and remove leading zeros
+  const hexString = blockGasUsed.toHexString()
+  return hexString.replace(/0x0+/, '0x')
+}

test/unit/utils/gasCalculator.test.ts

@@ -0,0 +1,157 @@
+import { calculateBlockGasUsed } from '../../../src/utils/gasCalculator'
+
+describe('gasCalculator', () => {
+  describe('calculateBlockGasUsed', () => {
+    it('should return 0x0 for empty transactions', () => {
+      const result = calculateBlockGasUsed([])
+      expect(result).toBe('0x0')
+    })
+
+    it('should handle single transaction with valid gas', () => {
+      const transactions = [
+        {
+          wrappedEVMAccount: {
+            readableReceipt: {
+              gasUsed: '0x123',
+              hash: '0xabc',
+            },
+          },
+        },
+      ]
+      const result = calculateBlockGasUsed(transactions)
+      expect(result).toBe('0x123')
+    })
+
+    it('should sum multiple transactions with valid gas', () => {
+      const transactions = [
+        {
+          wrappedEVMAccount: {
+            readableReceipt: {
+              gasUsed: '0x123',
+              hash: '0xabc',
+            },
+          },
+        },
+        {
+          wrappedEVMAccount: {
+            readableReceipt: {
+              gasUsed: '0x456',
+              hash: '0xdef',
+            },
+          },
+        },
+      ]
+      const result = calculateBlockGasUsed(transactions)
+      expect(result).toBe('0x579')
+    })
+
+    it('should handle zero gas values', () => {
+      const transactions = [
+        {
+          wrappedEVMAccount: {
+            readableReceipt: {
+              gasUsed: '0x0',
+              hash: '0xabc',
+            },
+          },
+        },
+        {
+          wrappedEVMAccount: {
+            readableReceipt: {
+              gasUsed: '0x123',
+              hash: '0xdef',
+            },
+          },
+        },
+      ]
+      const result = calculateBlockGasUsed(transactions)
+      expect(result).toBe('0x123')
+    })
+
+    it('should handle empty gas values', () => {
+      const transactions = [
+        {
+          wrappedEVMAccount: {
+            readableReceipt: {
+              gasUsed: '',
+              hash: '0xabc',
+            },
+          },
+        },
+        {
+          wrappedEVMAccount: {
+            readableReceipt: {
+              gasUsed: '0x123',
+              hash: '0xdef',
+            },
+          },
+        },
+      ]
+      const result = calculateBlockGasUsed(transactions)
+      expect(result).toBe('0x123')
+    })
+
+    it('should handle invalid gas values', () => {
+      const transactions = [
+        {
+          wrappedEVMAccount: {
+            readableReceipt: {
+              gasUsed: 'invalid',
+              hash: '0xabc',
+            },
+          },
+        },
+        {
+          wrappedEVMAccount: {
+            readableReceipt: {
+              gasUsed: '0x123',
+              hash: '0xdef',
+            },
+          },
+        },
+      ]
+      const result = calculateBlockGasUsed(transactions)
+      expect(result).toBe('0x123')
+    })
+
+    it('should handle missing gas values', () => {
+      const transactions = [
+        {
+          wrappedEVMAccount: {
+            readableReceipt: {
+              hash: '0xabc',
+            },
+          },
+        },
+        {
+          wrappedEVMAccount: {
+            readableReceipt: {
+              gasUsed: '0x123',
+              hash: '0xdef',
+            },
+          },
+        },
+      ]
+      const result = calculateBlockGasUsed(transactions)
+      expect(result).toBe('0x123')
+    })
+
+    it('should handle missing wrappedEVMAccount', () => {
+      const transactions = [
+        {
+          hash: '0xabc',
+        },
+        {
+          wrappedEVMAccount: {
+            readableReceipt: {
+              gasUsed: '0x123',
+              hash: '0xdef',
+            },
+          },
+        },
+      ]
+      const result = calculateBlockGasUsed(transactions)
+      expect(result).toBe('0x123')
+    })
+  })
+})