Merge pull request #337 from 0xPolygonHermez/feature/read-write-final…

…-root set read wrire addresses from final root
0xPolygonHermez · Apr 18, 2024 · f3d9824 · f3d9824
1 parent ebba680
commit f3d9824
Showing 1 changed file with 21 additions and 5 deletions.
diff --git a/src/sm/sm_main/debug/full-tracer.js b/src/sm/sm_main/debug/full-tracer.js
@@ -7,8 +7,8 @@
 /* eslint-disable camelcase */
 const fs = require('fs');
 const path = require('path');
-const { fea2scalar, fea2String } = require('@0xpolygonhermez/zkevm-commonjs').smtUtils;
-const { Constants } = require('@0xpolygonhermez/zkevm-commonjs');
+const { fea2scalar, fea2String, stringToH4 } = require('@0xpolygonhermez/zkevm-commonjs').smtUtils;
+const { Constants, stateUtils } = require('@0xpolygonhermez/zkevm-commonjs');
 const { ethers } = require('ethers');
 const { Scalar } = require('ffjavascript');
 const {
@@ -89,6 +89,7 @@ class FullTracer {
         this.options = options;
         this.setTracerOptions();
 
+        this.smt = smt;
         this.verbose = new Verbose(options.verbose, smt, logFileName);
         this.reservedCounters = reservedCounters;
 
@@ -143,6 +144,7 @@ class FullTracer {
         try {
             if (tag.params[0].varName === 'onFinishBatch') {
                 await this.printStates();
+                await this.fillInReadWriteAddresses();
             }
         } catch (e) {
             console.log(e);
@@ -653,9 +655,6 @@ class FullTracer {
             cnt_reserve_arithmetics: Number(this.reservedCounters.outOfCountersArith.reserved),
             cnt_reserve_binaries: Number(this.reservedCounters.outOfCountersBinary.reserved),
         };
-
-        // Create output files and dirs
-        this.exportTrace();
     }
 
     /**
@@ -1004,6 +1003,23 @@ class FullTracer {
         }
     }
 
+    async fillInReadWriteAddresses() {
+        const keys = Object.keys(this.finalTrace.read_write_addresses);
+        const rootArray = stringToH4(this.finalTrace.new_state_root);
+
+        // get balance and nonce
+        for (const address of keys) {
+            const state = await stateUtils.getState(address, this.smt, rootArray);
+            this.finalTrace.read_write_addresses[address] = {
+                balance: Scalar.e(state.balance).toString(),
+                nonce: Number(Scalar.e(state.nonce)).toString(),
+            };
+        }
+
+        // Create output files and dirs
+        this.exportTrace();
+    }
+
     /**
      * Export the current trace to a file
      */