From 62726bcae93362035dc192efaba2a83111c5b698 Mon Sep 17 00:00:00 2001 From: Franklin Delehelle Date: Tue, 12 Dec 2023 18:30:29 +0100 Subject: [PATCH] hack: make loginfo counts closer to Geth --- .../net/consensys/linea/zktracer/module/hub/Hub.java | 8 ++++---- .../linea/zktracer/module/logInfo/LogInfo.java | 10 +--------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/arithmetization/src/main/java/net/consensys/linea/zktracer/module/hub/Hub.java b/arithmetization/src/main/java/net/consensys/linea/zktracer/module/hub/Hub.java index 6e08423a82..f05bdfa6d4 100644 --- a/arithmetization/src/main/java/net/consensys/linea/zktracer/module/hub/Hub.java +++ b/arithmetization/src/main/java/net/consensys/linea/zktracer/module/hub/Hub.java @@ -237,7 +237,7 @@ public Hub() { this.rom, this.shf, this.trm, -// this.txnData, + // this.txnData, this.stp, this.wcp), this.precompileLimitModules.stream()) @@ -270,7 +270,7 @@ public List getModulesToTrace() { this.romLex, this.shf, this.stp, -// this.txnData, + // this.txnData, this.wcp); } @@ -295,7 +295,7 @@ public List getModulesToCount() { this.rom, this.shf, this.trm, -// this.txnData, + // this.txnData, this.wcp), this.precompileLimitModules.stream()) .toList(); @@ -507,7 +507,7 @@ void triggerModules(MessageFrame frame) { // TODO: this.oob.tracePreOpcode(frame); } if (this.pch.signals().stp()) { -// this.stp.tracePreOpcode(frame); + // this.stp.tracePreOpcode(frame); } if (this.pch.signals().exp()) { this.modexp.tracePreOpcode(frame); diff --git a/arithmetization/src/main/java/net/consensys/linea/zktracer/module/logInfo/LogInfo.java b/arithmetization/src/main/java/net/consensys/linea/zktracer/module/logInfo/LogInfo.java index f693c2d640..cc8a93459f 100644 --- a/arithmetization/src/main/java/net/consensys/linea/zktracer/module/logInfo/LogInfo.java +++ b/arithmetization/src/main/java/net/consensys/linea/zktracer/module/logInfo/LogInfo.java @@ -85,15 +85,7 @@ public void commit(List buffers) { } private int txRowSize(RlpTxrcptChunk tx) { - int txRowSize = 0; - if (tx.logs().isEmpty()) { - return 1; - } else { - for (Log log : tx.logs()) { - txRowSize += ctMax(log) + 1; - } - return txRowSize; - } + return tx.logs().size(); } public void traceTxWoLog(