store tx hash in trace just after provider response

previously it is being done during printing, hence it was not always being inferred
zemse · Aug 5, 2024 · fea860a · fea860a
1 parent 23273e6
commit fea860a
Showing 1 changed file with 18 additions and 15 deletions.
diff --git a/src/wrapper.ts b/src/wrapper.ts
@@ -34,7 +34,7 @@ class TracerWrapper extends ProviderWrapper {
     let error: any;
     // console.log("wrapper->args.method", args.method);
 
-    // take decision whether to print last trace or not
+    // print trace for verbosity 3 and 4
     const traceWhitelist = [
       "eth_sendTransaction",
       "eth_sendRawTransaction",
@@ -44,6 +44,14 @@ class TracerWrapper extends ProviderWrapper {
       "evm_mine",
     ];
 
+    // print trace for verbosity 1 and 2
+    const traceErrorWhitelist = [
+      "eth_sendTransaction",
+      "eth_sendRawTransaction",
+      "eth_call",
+      "eth_estimateGas",
+    ];
+
     const shouldTrace =
       tracerEnv.enabled &&
       traceWhitelist.includes(args.method) &&
@@ -53,6 +61,7 @@ class TracerWrapper extends ProviderWrapper {
       await tracerEnv.switch!.enable();
       debug("Tracing switch enabled");
     }
+
     try {
       result = await this.dependencies.provider.send(
         args.method,
@@ -61,20 +70,21 @@ class TracerWrapper extends ProviderWrapper {
     } catch (_error) {
       error = _error;
     }
+
     if (shouldTrace) {
       await tracerEnv.switch!.disable();
       debug("Tracing switch disabled");
     }
 
-    const traceErrorWhitelist = [
-      "eth_sendTransaction",
-      "eth_sendRawTransaction",
-      "eth_call",
-      "eth_estimateGas",
-    ];
+    // infer tx hash and store in the trace
+    const lastTrace = tracerEnv.lastTrace();
+    const txHash = getTxHash(args, result);
+    if (lastTrace && txHash) {
+      tracerEnv.recorder?.storeLastTrace(txHash);
+      lastTrace.hash = txHash;
+    }
 
     let shouldPrint: boolean;
-
     switch (tracerEnv.verbosity) {
       case 0:
         shouldPrint = !!tracerEnv.printNext;
@@ -102,14 +112,7 @@ class TracerWrapper extends ProviderWrapper {
       if (tracerEnv.ignoreNext) {
         tracerEnv.ignoreNext = false;
       } else {
-        const lastTrace = tracerEnv.lastTrace();
         if (lastTrace) {
-          const hash = getTxHash(args, result);
-          if (hash) {
-            tracerEnv.recorder?.storeLastTrace(hash);
-            lastTrace.hash = hash;
-          }
-
           // TODO first check if this trace is what we want to print, i.e. tally the transaction hash.
           tracerEnv.printNext = false;