ToyExecutionEnvironment can run transactions by starting a besu node (#1981)

* ToyExecutionEnvironment can run transactions by starting a besu node

* Update build script

* Enable trace service

* Generate trace file

* fix build

* Fix Genesis Config and refactor

* Fix build

Author: gauravahuja

arithmetization/src/main/java/net/consensys/linea/plugins/rpc/tracegeneration/TraceRequestParams.java

@@ -24,7 +24,8 @@ public record TraceRequestParams(
     long startBlockNumber, long endBlockNumber, String expectedTracesEngineVersion) {
 
   public void validate() {
-    if (!expectedTracesEngineVersion.equals(getTracerRuntime())) {
+    if (!expectedTracesEngineVersion.equals("test")
+        && !expectedTracesEngineVersion.equals(getTracerRuntime())) {
       throw new InvalidParameterException(
           "INVALID_TRACES_VERSION: Runtime version is %s, requesting version %s"
               .formatted(getTracerRuntime(), expectedTracesEngineVersion));

arithmetization/src/main/java/net/consensys/linea/plugins/rpc/tracegeneration/TracesEndpointCliOptions.java

@@ -19,7 +19,7 @@
 import net.consensys.linea.plugins.LineaCliOptions;
 import picocli.CommandLine;
 
-class TracesEndpointCliOptions implements LineaCliOptions {
+public class TracesEndpointCliOptions implements LineaCliOptions {
 
   static final String CONFIG_KEY = "traces-endpoint-config";
 
@@ -44,7 +44,7 @@ private TracesEndpointCliOptions() {}
    *
    * @return the Linea cli options
    */
-  static TracesEndpointCliOptions create() {
+  public static TracesEndpointCliOptions create() {
     return new TracesEndpointCliOptions();
   }
 

arithmetization/src/test/java/net/consensys/linea/zktracer/ExampleBesuTest.java

@@ -0,0 +1,65 @@
+/*
+ * Copyright Consensys Software Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package net.consensys.linea.zktracer;
+
+import java.util.List;
+
+import net.consensys.linea.testing.BytecodeCompiler;
+import net.consensys.linea.testing.ToyAccount;
+import net.consensys.linea.testing.ToyExecutionEnvironmentV2;
+import net.consensys.linea.testing.ToyTransaction;
+import net.consensys.linea.zktracer.opcode.OpCode;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SECP256K1;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.junit.jupiter.api.Test;
+
+public class ExampleBesuTest {
+  @Test
+  void test() {
+    KeyPair keyPair = new SECP256K1().generateKeyPair();
+    Address senderAddress = Address.extract(Hash.hash(keyPair.getPublicKey().getEncodedBytes()));
+
+    ToyAccount senderAccount =
+        ToyAccount.builder().balance(Wei.fromEth(1)).nonce(5).address(senderAddress).build();
+
+    ToyAccount receiverAccount =
+        ToyAccount.builder()
+            .balance(Wei.ONE)
+            .nonce(6)
+            .address(Address.fromHexString("0x111111"))
+            .code(
+                BytecodeCompiler.newProgram()
+                    .push(32, 0xbeef)
+                    .push(32, 0xdead)
+                    .op(OpCode.ADD)
+                    .compile())
+            .build();
+
+    Transaction tx =
+        ToyTransaction.builder().sender(senderAccount).to(receiverAccount).keyPair(keyPair).build();
+
+    ToyExecutionEnvironmentV2.builder()
+        .accounts(List.of(senderAccount, receiverAccount))
+        .transaction(tx)
+        .runWithBesuNode(true)
+        .build()
+        .run();
+  }
+}

gradle.properties

@@ -1,5 +1,5 @@
 releaseVersion=beta-v2.1-rc16
-besuVersion=25.4.1-linea1
+besuVersion=25.4.1-linea2
 besuArtifactGroup=org.hyperledger.besu
 distributionIdentifier=linea-tracer
 distributionBaseUrl=https://github.com/Consensys/linea-besu-upstream/releases/download/

gradle/dependency-management.gradle

@@ -26,6 +26,12 @@ repositories {
     url 'https://artifacts.consensys.net/public/maven/maven/'
     content { includeGroupByRegex('tech\\.pegasys(\\..*)?') }
   }
+
+  maven {
+    url 'https://splunk.jfrog.io/splunk/ext-releases-local'
+    content { includeGroupByRegex('com\\.splunk\\..*') }
+  }
+
   mavenCentral()
   mavenLocal()
 }

gradle/dist.gradle

@@ -124,4 +124,4 @@ tasks.register('distPlugin', Zip) {
 
 static def dependencyNamePattern() {
   /(.*)(\-.*?)\.jar/
-}
+}

gradle/tests.gradle

@@ -127,7 +127,25 @@ jacocoTestReport {
 }
 
 tasks.test.configure {
-  dependsOn(buildZkevmBin)
+  dependsOn(buildZkevmBin, "copyPlugins")
+
+  delete("${project.getLayout().getBuildDirectory().get()}/besu/traces")
+  mkdir("${project.getLayout().getBuildDirectory().get()}/besu/traces")
+  mkdir("${project.getLayout().getBuildDirectory().get()}/besu/plugins")
+  System.setProperty("besu.plugins.dir",
+          System.getenv().getOrDefault("besu.plugins.dir",
+                  "${project.getLayout().getBuildDirectory().get().toString()}/besu/plugins/"
+          )
+  )
+  System.setProperty("besu.traces.dir",
+          System.getenv().getOrDefault("besu.traces.dir",
+                  "${project.getLayout().getBuildDirectory().get().toString()}/besu/traces/"
+          )
+  )
+
+  systemProperty("besu.traces.dir", System.getProperty("besu.traces.dir"))
+  systemProperty("besu.plugins.dir", System.getProperty("besu.plugins.dir"))
+
 
   systemProperty("junit.jupiter.execution.parallel.enabled", true)
   systemProperty("junit.jupiter.execution.parallel.mode.default", "concurrent")
@@ -145,6 +163,12 @@ tasks.test.configure {
   finalizedBy(jacocoTestReport)
 }
 
+tasks.register("copyPlugins", Copy) {
+  dependsOn(project(":plugins").tasks.findByPath("jar"))
+  from project(":plugins").tasks.findByPath("jar").outputs.files.collect()
+  into "${System.getProperty("besu.plugins.dir")}"
+}
+
 tasks.register("fastReplayTests", Test) {
   dependsOn(buildZkevmBin)
     //

plugins/src/main/java/net/consensys/linea/plugins/rpc/tracegeneration/TracesEndpointServicePlugin.java

@@ -19,6 +19,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 
@@ -48,9 +49,10 @@ public class TracesEndpointServicePlugin extends AbstractLineaPrivateOptionsPlug
 
   @Override
   public Map<String, LineaOptionsPluginConfiguration> getLineaPluginConfigMap() {
+    final var configMap = new HashMap<>(super.getLineaPluginConfigMap());
     final TracesEndpointCliOptions tracesEndpointCliOptions = TracesEndpointCliOptions.create();
-
-    return Map.of(TracesEndpointCliOptions.CONFIG_KEY, tracesEndpointCliOptions.asPluginConfig());
+    configMap.put(TracesEndpointCliOptions.CONFIG_KEY, tracesEndpointCliOptions.asPluginConfig());
+    return configMap;
   }
 
   /**

reference-tests/src/test/java/net/consensys/linea/CorsetBlockProcessor.java

@@ -30,12 +30,11 @@
 import org.hyperledger.besu.ethereum.BlockProcessingResult;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.BlockBody;
+import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
-import org.hyperledger.besu.ethereum.core.Withdrawal;
 import org.hyperledger.besu.ethereum.mainnet.*;
 import org.hyperledger.besu.ethereum.privacy.storage.PrivateMetadataUpdater;
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
@@ -74,14 +73,18 @@ public BlockProcessingResult processBlock(
       final ProtocolContext protocolContext,
       final Blockchain blockchain,
       final MutableWorldState worldState,
-      final BlockHeader blockHeader,
-      final List<Transaction> transactions,
-      final List<BlockHeader> ommers,
-      final Optional<List<Withdrawal>> maybeWithdrawals,
-      final PrivateMetadataUpdater privateMetadataUpdater) {
+      final Block block,
+      final Optional<PrivateMetadataUpdater> privateMetadataUpdater,
+      final PreprocessingFunction preprocessingBlockFunction) {
+
+    var blockHeader = block.getHeader();
+    var blockBody = block.getBody();
+    var ommers = blockBody.getOmmers();
+    var transactions = blockBody.getTransactions();
+    var maybeWithdrawals = blockBody.getWithdrawals();
+
     final List<TransactionReceipt> receipts = new ArrayList<>();
     long currentGasUsed = 0;
-    BlockBody blockBody = new BlockBody(transactions, new ArrayList<>());
 
     final ProtocolSpec protocolSpec = protocolSchedule.getByBlockHeader(blockHeader);
 

testing/build.gradle

@@ -18,6 +18,7 @@ dependencies {
   implementation "${besuArtifactGroup}:besu-datatypes"
   implementation "${besuArtifactGroup}:evm"
   implementation "${besuArtifactGroup}:plugin-api"
+  implementation "${besuArtifactGroup}.internal:api"
   implementation "${besuArtifactGroup}.internal:clique"
   implementation "${besuArtifactGroup}.internal:common"
   implementation "${besuArtifactGroup}.internal:config"
@@ -28,6 +29,9 @@ dependencies {
   implementation "${besuArtifactGroup}.internal:services"
   implementation "${besuArtifactGroup}.internal:testutil"
   implementation "${besuArtifactGroup}.internal:algorithms"
+  implementation "${besuArtifactGroup}.internal:dsl"
+  implementation "org.awaitility:awaitility"
+  testImplementation group: "${besuArtifactGroup}.internal", name: "core", classifier: "test-support"
 
   implementation 'com.google.code.gson:gson'
   implementation 'com.google.guava:guava'