add using collector API to get correct transactionIndex for eth_getTr…

…ansactionByHash and eth_getTransactionReceipt
shardeum · May 9, 2024 · 432d07c · 432d07c
1 parent 3d06c61
commit 432d07c
Showing 1 changed file with 47 additions and 1 deletion.
diff --git a/src/api.ts b/src/api.ts
@@ -2253,6 +2253,29 @@ export const methods = {
       // result found, skipping querying from archiver, validator and explorer.
       success = true
       retry = 100
+      // start to query getBlock to get transactionIndex
+      if (result) {
+        try {
+          // getBlock
+          const txBlockNumber = result.blockNumber
+          const blockResp = await collectorAPI.getBlock(txBlockNumber, 'hex_num', true)
+          if (blockResp) {
+            const txIndex = blockResp.transactions.findIndex((tx) => tx === txHash)
+            if (txIndex !== -1) {
+              result.transactionIndex = '0x' + txIndex.toString(16)
+            }
+          }
+        } catch (e) {
+          if (verbose)
+            console.log(
+              'try to get transactionIndex using collector but fail. Return default transactionIndex'
+            )
+          logEventEmitter.emit('fn_end', ticket, { success: true }, performance.now())
+          callback(null, result)
+          countSuccessResponse(api_name, 'success', 'collector')
+          return
+        }
+      }
       logEventEmitter.emit('fn_end', ticket, { success: true }, performance.now())
       callback(null, result)
       countSuccessResponse(api_name, 'success', 'collector')
@@ -2506,6 +2529,29 @@ export const methods = {
       } else if (!isErr(result)) {
         // result found, skipping querying from archiver, validator and explorer.
         result = extractTransactionReceiptObject(result)
+        // start to query getBlock to get transactionIndex
+        if (result) {
+          try {
+            // getBlock
+            const txBlockNumber = result.blockNumber
+            const blockResp = await collectorAPI.getBlock(txBlockNumber, 'hex_num', true)
+            if (blockResp) {
+              const txIndex = blockResp.transactions.findIndex((tx) => tx === txHash)
+              if (txIndex !== -1) {
+                result.transactionIndex = '0x' + txIndex.toString(16)
+              }
+            }
+          } catch (e) {
+            if (verbose)
+              console.log(
+                'try to get transactionIndex using collector but fail. Return default transactionIndex'
+              )
+            logEventEmitter.emit('fn_end', ticket, { success: true }, performance.now())
+            callback(null, result)
+            countSuccessResponse(api_name, 'success', 'collector')
+            return
+          }
+        }
         logEventEmitter.emit('fn_end', ticket, { success: true }, performance.now())
         callback(null, result)
         countSuccessResponse(api_name, 'success', 'collector')
@@ -3632,7 +3678,7 @@ export const methods = {
       countFailedResponse(api_name, 'Invalid address')
       return
     }
-    
+
     if (!isValidAddress(callObj.from)) {
       if (verbose) console.log('Invalid params: `from` is not valid address', callObj.from)
       callback({ code: -32000, message: 'Invalid params: `from` is not valid address' }, null)