Merge remote-tracking branch 'upstream/main' into rej_tx_reporting_po…

…ol_validator

acceptance-tests/src/test/java/linea/plugin/acc/test/TestCommandLineOptionsBuilder.java

@@ -40,8 +40,13 @@ public TestCommandLineOptionsBuilder() {
     cliOptions.setProperty(
         "--plugin-linea-l1l2-bridge-contract=", "0x00000000000000000000000000000000DEADBEEF");
     cliOptions.setProperty("--plugin-linea-l1l2-bridge-topic=", "0x123456");
+    // temporarily specify tracer mandatory options, until we improve the ATs to accept a list of
+    // enabled plugins
     cliOptions.setProperty("--plugin-linea-conflated-trace-generation-traces-output-path=", ".");
     cliOptions.setProperty("--plugin-linea-rpc-concurrent-requests-limit=", "1");
+    cliOptions.setProperty("--plugin-linea-tracer-readiness-server-port=", "1234");
+    cliOptions.setProperty("--plugin-linea-tracer-readiness-server-host=", "localhost");
+    cliOptions.setProperty("--plugin-linea-tracer-readiness-max-blocks-behind=", "1");
   }
 
   public TestCommandLineOptionsBuilder set(String option, String value) {

acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/dsl/AcceptanceTestBase.java

@@ -36,7 +36,6 @@
 import org.hyperledger.besu.tests.acceptance.dsl.condition.login.LoginConditions;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.net.NetConditions;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.perm.PermissioningConditions;
-import org.hyperledger.besu.tests.acceptance.dsl.condition.priv.PrivConditions;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.process.ExitedWithCode;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.txpool.TxPoolConditions;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.web3.Web3Conditions;
@@ -54,7 +53,6 @@
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.miner.MinerTransactions;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.net.NetTransactions;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.perm.PermissioningTransactions;
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.privacy.PrivacyTransactions;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.txpool.TxPoolTransactions;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.web3.Web3Transactions;
 import org.junit.jupiter.api.AfterEach;
@@ -88,8 +86,6 @@ public class AcceptanceTestBase {
   protected final PermissioningTransactions permissioningTransactions;
   protected final MinerTransactions minerTransactions;
   protected final Web3Conditions web3;
-  protected final PrivConditions priv;
-  protected final PrivacyTransactions privacyTransactions;
   protected final TxPoolConditions txPoolConditions;
   protected final TxPoolTransactions txPoolTransactions;
   protected final ExitedWithCode exitedSuccessfully;
@@ -104,7 +100,6 @@ protected AcceptanceTestBase() {
     bftTransactions = new BftTransactions();
     accountTransactions = new AccountTransactions(accounts);
     permissioningTransactions = new PermissioningTransactions();
-    privacyTransactions = new PrivacyTransactions();
     contractTransactions = new ContractTransactions();
     minerTransactions = new MinerTransactions();
 
@@ -116,7 +111,6 @@ protected AcceptanceTestBase() {
     net = new NetConditions(new NetTransactions());
     cluster = new Cluster(net);
     perm = new PermissioningConditions(permissioningTransactions);
-    priv = new PrivConditions(privacyTransactions);
     admin = new AdminConditions(adminTransactions);
     web3 = new Web3Conditions(new Web3Transactions());
     besu = new BesuNodeFactory();

gradle.properties

@@ -1,6 +1,6 @@
-releaseVersion=0.6.0-rc8.1
-besuVersion=24.9-delivery32
-arithmetizationVersion=0.6.0-rc8
+releaseVersion=0.8.0-rc1.1
+besuVersion=24.10-delivery34
+arithmetizationVersion=0.8.0-rc1
 besuArtifactGroup=io.consensys.linea-besu
 distributionIdentifier=linea-sequencer
 distributionBaseUrl=https://artifacts.consensys.net/public/linea-besu/raw/names/linea-besu.tar.gz/versions/