Merge branch 'main' into rel/0.3.0-rc2.1

# Conflicts: # gradle.properties
Consensys · Aug 1, 2024 · f3bfe70 · f3bfe70
2 parents 86e9cb0 + d52c581
commit f3bfe70
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.3.0-rc2.1
+* bump linea-arithmetization version to 0.3.0-rc2 [#62](https://github.com/Consensys/linea-sequencer/pull/62)
+* bump Linea-Besu version to 24.7-develop-c0029e6 (delivery-28) [#62](https://github.com/Consensys/linea-sequencer/pull/62)
+
 ## 0.3.0-rc1.1
 * bump linea-arithmetization version to 0.3.0-rc1 [#54](https://github.com/Consensys/linea-sequencer/pull/54)
 * bump Linea-Besu version to 24.7-develop-f812936 (delivery-27) [#54](https://github.com/Consensys/linea-sequencer/pull/54)

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 releaseVersion=0.3.0-rc2.1
-besuVersion=24.7-develop-f812936
-arithmetizationVersion=0.3.0-rc1
+besuVersion=24.7-develop-c0029e6
+arithmetizationVersion=0.3.0-rc2
 besuArtifactGroup=io.consensys.linea-besu
 distributionIdentifier=linea-sequencer
 distributionBaseUrl=https://artifacts.consensys.net/public/linea-besu/raw/names/linea-besu.tar.gz/versions/

diff --git a/gradle/dist.gradle b/gradle/dist.gradle
@@ -27,7 +27,7 @@ tasks.register('javadocJar', Jar) {
   from javadoc.destinationDir
 }
 
-def lineaBesuDistTar = new File(buildDir, rootProject.besuFilename)
+def lineaBesuDistTar = new File(new File(buildDir, "tmp"), rootProject.besuFilename)
 
 tasks.register('copyLocalLineaBesu', Copy) {
   onlyIf {

diff --git a/sequencer/build.gradle b/sequencer/build.gradle
@@ -70,6 +70,9 @@ dependencies {
   testImplementation "${besuArtifactGroup}.internal:core:${besuVersion}"
   testImplementation "${besuArtifactGroup}.internal:rlp:${besuVersion}"
   testImplementation "${besuArtifactGroup}.internal:core:${besuVersion}"
+
+  // workaround for bug https://github.com/dnsjava/dnsjava/issues/329, remove when upgraded upstream
+  testImplementation 'dnsjava:dnsjava:3.6.1'
 }
 
 configurations {

diff --git a/sequencer/src/main/java/net/consensys/linea/extradata/LineaExtraDataHandler.java b/sequencer/src/main/java/net/consensys/linea/extradata/LineaExtraDataHandler.java
@@ -24,8 +24,8 @@
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.units.bigints.UInt32;
 import org.hyperledger.besu.datatypes.Wei;
-import org.hyperledger.besu.datatypes.rpc.JsonRpcResponseType;
 import org.hyperledger.besu.plugin.services.RpcEndpointService;
+import org.hyperledger.besu.plugin.services.rpc.RpcResponseType;
 
 /**
  * Handles the Linea extra data custom extension.
@@ -143,7 +143,7 @@ void updateMinGasPrice(final Long minGasPriceKWei) {
         final var resp =
             rpcEndpointService.call(
                 "miner_setMinGasPrice", new Object[] {minGasPriceWei.toShortHexString()});
-        if (!resp.getType().equals(JsonRpcResponseType.SUCCESS)) {
+        if (!resp.getType().equals(RpcResponseType.SUCCESS)) {
           throw new LineaExtraDataException(
               LineaExtraDataException.ErrorType.FAILED_CALLING_SET_MIN_GAS_PRICE,
               "Internal setMinGasPrice method failed: " + resp);

diff --git a/sequencer/src/main/java/net/consensys/linea/extradata/LineaExtraDataPlugin.java b/sequencer/src/main/java/net/consensys/linea/extradata/LineaExtraDataPlugin.java
@@ -31,7 +31,7 @@
 @AutoService(BesuPlugin.class)
 public class LineaExtraDataPlugin extends AbstractLineaRequiredPlugin {
   public static final String NAME = "linea";
-  private BesuEvents besuEventsService;
+  private BesuContext besuContext;
   private RpcEndpointService rpcEndpointService;
   private BlockchainService blockchainService;
 
@@ -42,11 +42,7 @@ public Optional<String> getName() {
 
   @Override
   public void doRegister(final BesuContext context) {
-    besuEventsService =
-        context
-            .getService(BesuEvents.class)
-            .orElseThrow(
-                () -> new RuntimeException("Failed to obtain BesuEvents from the BesuContext."));
+    besuContext = context;
     rpcEndpointService =
         context
             .getService(RpcEndpointService.class)
@@ -86,6 +82,13 @@ public void start() {
             chainHeadHeader.getBlockHash(),
             e);
       }
+
+      final var besuEventsService =
+          besuContext
+              .getService(BesuEvents.class)
+              .orElseThrow(
+                  () -> new RuntimeException("Failed to obtain BesuEvents from the BesuContext."));
+
       besuEventsService.addBlockAddedListener(
           addedBlockContext -> {
             final var importedBlockHeader = addedBlockContext.getBlockHeader();

diff --git a/sequencer/src/main/java/net/consensys/linea/rpc/LineaEstimateGas.java b/sequencer/src/main/java/net/consensys/linea/rpc/LineaEstimateGas.java
@@ -43,7 +43,6 @@
 import org.bouncycastle.crypto.params.ECDomainParameters;
 import org.hyperledger.besu.crypto.SECPSignature;
 import org.hyperledger.besu.datatypes.Wei;
-import org.hyperledger.besu.datatypes.rpc.RpcMethodError;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonCallParameter;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter;
@@ -56,6 +55,7 @@
 import org.hyperledger.besu.plugin.services.TransactionSimulationService;
 import org.hyperledger.besu.plugin.services.exception.PluginRpcEndpointException;
 import org.hyperledger.besu.plugin.services.rpc.PluginRpcRequest;
+import org.hyperledger.besu.plugin.services.rpc.RpcMethodError;
 
 @Slf4j
 public class LineaEstimateGas {

diff --git a/sequencer/src/main/java/net/consensys/linea/rpc/LineaSetExtraData.java b/sequencer/src/main/java/net/consensys/linea/rpc/LineaSetExtraData.java
@@ -25,12 +25,12 @@
 import net.consensys.linea.extradata.LineaExtraDataHandler;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
-import org.hyperledger.besu.datatypes.rpc.JsonRpcResponseType;
-import org.hyperledger.besu.datatypes.rpc.RpcMethodError;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter;
 import org.hyperledger.besu.plugin.services.RpcEndpointService;
 import org.hyperledger.besu.plugin.services.exception.PluginRpcEndpointException;
 import org.hyperledger.besu.plugin.services.rpc.PluginRpcRequest;
+import org.hyperledger.besu.plugin.services.rpc.RpcMethodError;
+import org.hyperledger.besu.plugin.services.rpc.RpcResponseType;
 
 @Slf4j
 public class LineaSetExtraData {
@@ -78,7 +78,7 @@ public Boolean execute(final PluginRpcRequest request) {
   private void updateStandardExtraData(final Bytes32 extraData) {
     final var resp =
         rpcEndpointService.call("miner_setExtraData", new Object[] {extraData.toHexString()});
-    if (!resp.getType().equals(JsonRpcResponseType.SUCCESS)) {
+    if (!resp.getType().equals(RpcResponseType.SUCCESS)) {
       throw new LineaExtraDataException(
           FAILED_CALLING_SET_EXTRA_DATA, "Internal setExtraData method failed: " + resp);
     }