Skip to content

clean: rm unused duplicate traceStartBlock in ZkTracer #2374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 4 commits into
base: arith-dev
Choose a base branch
from
Draft

clean: rm unused duplicate traceStartBlock in ZkTracer #2374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
01f64b2
clean: rm unused duplicate traceStartBlock in ZkTracer
letypequividelespoubelles Oct 1, 2025
a259e7a
rebase
letypequividelespoubelles Oct 1, 2025
d39cad4
update in the ef test tools
letypequividelespoubelles Oct 1, 2025
7f7f0b0
Merge branch 'arith-dev' into 2373-rm-tracestartblock-duplicate
letypequividelespoubelles Oct 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions arithmetization/src/main/java/net/consensys/linea/zktracer/ZkTracer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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,
Expand Down
10 changes: 0 additions & 10 deletions arithmetization/src/main/java/net/consensys/linea/zktracer/module/wcp/Wcp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions arithmetization/src/test/java/net/consensys/linea/LineCountingTracerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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<String, Integer> sizeBeforeTracer = tracer.getModulesLineCount();
tracer.popTransactionBundle();
final Map<String, Integer> sizeAfterTracer = tracer.getModulesLineCount();
Expand All @@ -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<String, Integer> sizeBeforeCounter = counter.getModulesLineCount();
counter.popTransactionBundle();
final Map<String, Integer> sizeAfterCounter = counter.getModulesLineCount();
Expand Down
3 changes: 2 additions & 1 deletion reference-tests/src/test/java/net/consensys/linea/BlockchainReferenceTestTools.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());

Expand Down