diff --git a/arithmetization/src/main/java/net/consensys/linea/zktracer/ZkTracer.java b/arithmetization/src/main/java/net/consensys/linea/zktracer/ZkTracer.java index 1734b8258d..1739244e0a 100644 --- a/arithmetization/src/main/java/net/consensys/linea/zktracer/ZkTracer.java +++ b/arithmetization/src/main/java/net/consensys/linea/zktracer/ZkTracer.java @@ -46,7 +46,6 @@ import org.hyperledger.besu.evm.worldstate.WorldView; import org.hyperledger.besu.plugin.data.BlockBody; import org.hyperledger.besu.plugin.data.BlockHeader; -import org.hyperledger.besu.plugin.data.ProcessableBlockHeader; @Slf4j public class ZkTracer implements LineCountingTracer { @@ -164,19 +163,6 @@ public void traceEndConflation(final WorldView state) { } } - @Override - public void traceStartBlock( - WorldView world, - final ProcessableBlockHeader processableBlockHeader, - final Address miningBeneficiary) { - try { - this.hub.traceStartBlock(world, processableBlockHeader, miningBeneficiary); - this.debugMode.ifPresent(DebugMode::traceEndConflation); - } catch (final Exception e) { - this.tracingExceptions.add(e); - } - } - @Override public void traceStartBlock( WorldView world, diff --git a/arithmetization/src/main/java/net/consensys/linea/zktracer/module/wcp/Wcp.java b/arithmetization/src/main/java/net/consensys/linea/zktracer/module/wcp/Wcp.java index 000b7ca097..caab09b8cf 100644 --- a/arithmetization/src/main/java/net/consensys/linea/zktracer/module/wcp/Wcp.java +++ b/arithmetization/src/main/java/net/consensys/linea/zktracer/module/wcp/Wcp.java @@ -37,10 +37,8 @@ import net.consensys.linea.zktracer.opcode.OpCode; import org.apache.tuweni.bytes.Bytes; import org.apache.tuweni.bytes.Bytes32; -import org.hyperledger.besu.datatypes.Address; import org.hyperledger.besu.evm.frame.MessageFrame; import org.hyperledger.besu.evm.worldstate.WorldView; -import org.hyperledger.besu.plugin.data.ProcessableBlockHeader; @RequiredArgsConstructor public class Wcp implements Module { @@ -101,14 +99,6 @@ public void popTransactionBundle() { additionalRows.popTransactionBundle(); } - @Override - public void traceStartBlock( - WorldView world, - final ProcessableBlockHeader processableBlockHeader, - final Address miningBeneficiary) { - additionalRows.commitTransactionBundle(); - } - @Override public void tracePreOpcode(MessageFrame frame, OpCode opcode) { if (opcode == LT diff --git a/arithmetization/src/test/java/net/consensys/linea/LineCountingTracerTest.java b/arithmetization/src/test/java/net/consensys/linea/LineCountingTracerTest.java index 164153b66e..f0e0883926 100644 --- a/arithmetization/src/test/java/net/consensys/linea/LineCountingTracerTest.java +++ b/arithmetization/src/test/java/net/consensys/linea/LineCountingTracerTest.java @@ -32,6 +32,7 @@ import net.consensys.linea.zktracer.Fork; import net.consensys.linea.zktracer.ZkCounter; import net.consensys.linea.zktracer.ZkTracer; +import org.hyperledger.besu.ethereum.core.BlockBody; import org.hyperledger.besu.ethereum.core.BlockHeader; import org.hyperledger.besu.evm.worldstate.WorldView; import org.junit.jupiter.api.Test; @@ -113,10 +114,11 @@ void startBlockStuffAreNotPopped() { .baseFee(DEFAULT_BASE_FEE) .parentBeaconBlockRoot(DEFAULT_BEACON_ROOT) .buildBlockHeader(); + final BlockBody blockBody = BlockBody.empty(); final ZkTracer tracer = new ZkTracer(chainConfig); tracer.traceStartConflation(1); - tracer.traceStartBlock(world, blockHeader, DEFAULT_COINBASE_ADDRESS); + tracer.traceStartBlock(world, blockHeader, blockBody, DEFAULT_COINBASE_ADDRESS); final Map sizeBeforeTracer = tracer.getModulesLineCount(); tracer.popTransactionBundle(); final Map sizeAfterTracer = tracer.getModulesLineCount(); @@ -128,7 +130,7 @@ void startBlockStuffAreNotPopped() { final ZkCounter counter = new ZkCounter(chainConfig.bridgeConfiguration); counter.traceStartConflation(1); - counter.traceStartBlock(world, blockHeader, DEFAULT_COINBASE_ADDRESS); + counter.traceStartBlock(world, blockHeader, blockBody, DEFAULT_COINBASE_ADDRESS); final Map sizeBeforeCounter = counter.getModulesLineCount(); counter.popTransactionBundle(); final Map sizeAfterCounter = counter.getModulesLineCount(); diff --git a/reference-tests/src/test/java/net/consensys/linea/BlockchainReferenceTestTools.java b/reference-tests/src/test/java/net/consensys/linea/BlockchainReferenceTestTools.java index 54763c82c2..10c57df42f 100644 --- a/reference-tests/src/test/java/net/consensys/linea/BlockchainReferenceTestTools.java +++ b/reference-tests/src/test/java/net/consensys/linea/BlockchainReferenceTestTools.java @@ -611,7 +611,8 @@ public static void executeTest(final BlockchainReferenceTestCaseSpec spec) { try { final Block block = candidateBlock.getBlock(); - zkTracer.traceStartBlock(worldState, block.getHeader(), block.getHeader().getCoinbase()); + zkTracer.traceStartBlock( + worldState, block.getHeader(), block.getBody(), block.getHeader().getCoinbase()); final ProtocolSpec protocolSpec = schedule.getByBlockHeader(block.getHeader());