Release v0.1.4-test34

# Conflicts: # acceptance-tests/src/test/java/linea/plugin/acc/test/TestCommandLineOptionsBuilder.java # acceptance-tests/src/test/java/linea/plugin/acc/test/rpc/linea/EthSendRawTransactionSimulationCheckTest.java # gradle.properties # sequencer/src/test/java/net/consensys/linea/sequencer/txpoolvalidation/validators/SimulationValidatorTest.java
Consensys · Sep 27, 2024 · 67d1e2d · 67d1e2d
2 parents 1e5ab84 + 950f48a
commit 67d1e2d
Show file tree

Hide file tree

Showing 17 changed files with 171 additions and 122 deletions.
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
@@ -6,5 +6,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: actions/checkout@v4
+      - uses: gradle/actions/wrapper-validation@v4
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -15,16 +15,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
 
       - name: Set up GCC
         uses: egor-tensin/setup-gcc@v1
 
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up JDK 21
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 21
           distribution: temurin
@@ -35,7 +35,7 @@ jobs:
           JAVA_OPTS: -Xmx2g -Dorg.gradle.daemon=false
 
       - name: Store distribution artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: distributions
           path: sequencer/build/libs
@@ -44,16 +44,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
 
       - name: Set up GCC
         uses: egor-tensin/setup-gcc@v1
 
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up JDK 21
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 21
           distribution: temurin
@@ -65,7 +65,7 @@ jobs:
 
       - name: Upload test report
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: acceptance-test-report
           path: acceptance-tests/build/reports/tests/
@@ -74,16 +74,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
 
       - name: Set up GCC
         uses: egor-tensin/setup-gcc@v1
 
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up JDK 21
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 21
           distribution: temurin
@@ -95,7 +95,7 @@ jobs:
 
       - name: Upload test report
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: compress-test-report
           path: compress/build/reports/tests/
@@ -104,9 +104,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 21

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -6,21 +6,53 @@ on:
       - 'v*'
 
 jobs:
-  build:
+  macosNativeLib:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v4
 
-    runs-on: ubuntu-latest
+      - uses: actions/setup-go@v5
+        with:
+          go-version: stable
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: temurin
 
+      - name: Build native lib
+        run: ./gradlew :native:compress:buildJNI
+
+      - name: List built files
+        run: ls -lR native/compress/build
+
+      - name: Upload macOS native lib asset
+        uses: actions/upload-artifact@v4
+        with:
+          name: libcompress_jni.dylib
+          path: 'native/compress/build/native/darwin-arm64/libcompress_jni.dylib'
+
+  build:
+    runs-on: ubuntu-latest
+    needs: macosNativeLib
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 21
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 21
           distribution: temurin
           cache: 'gradle'
 
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
+      - name: Create macOS native lib dir
+        run: mkdir -p native/compress/build/native/darwin-arm64
+
+      - name: Get the built macOS native lib
+        uses: actions/download-artifact@v4
+        with:
+          name: libcompress_jni.dylib
+          path: native/compress/build/native/darwin-arm64
 
       - name: Get the version
         id: get_version

diff --git a/acceptance-tests/build.gradle b/acceptance-tests/build.gradle
@@ -71,7 +71,6 @@ dependencies {
   testImplementation 'org.web3j:besu'
   testImplementation 'org.web3j:core'
 
-  testImplementation 'junit:junit'
   testImplementation 'org.awaitility:awaitility'
   testImplementation 'com.splunk.logging:splunk-library-javalogging'
 }

diff --git a/...c/test/java/linea/plugin/acc/test/rpc/linea/EthSendRawTransactionSimulationCheckTest.java b/...c/test/java/linea/plugin/acc/test/rpc/linea/EthSendRawTransactionSimulationCheckTest.java
@@ -78,7 +78,8 @@ public void transactionOverModuleLineCountNotAccepted() throws Exception {
 
     assertThat(signedTxContractInteractionResp.hasError()).isTrue();
     assertThat(signedTxContractInteractionResp.getError().getMessage())
-        .isEqualTo("Transaction line count for module ADD=4818 is above the limit 70");
+        .isEqualTo(
+            "Transaction 0xe813560d9a3aedff46be12fc32706d8fe9b6565dd7e2db47457a9c416f2d45d7 line count for module ADD=4818 is above the limit 70");
 
     assertThat(getTxPoolContent()).isEmpty();
 

diff --git a/...nce-tests/src/test/java/org/hyperledger/besu/tests/acceptance/dsl/AcceptanceTestBase.java b/...nce-tests/src/test/java/org/hyperledger/besu/tests/acceptance/dsl/AcceptanceTestBase.java
@@ -19,7 +19,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.io.BufferedReader;
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.lang.ProcessBuilder.Redirect;
@@ -58,15 +57,12 @@
 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.After;
-import org.junit.Rule;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Tag;
-import org.junit.rules.TestName;
-import org.junit.rules.TestWatcher;
-import org.junit.runner.Description;
-import org.slf4j.MDC;
+import org.junit.jupiter.api.extension.ExtendWith;
 
 /** Base class for acceptance tests. */
+@ExtendWith(AcceptanceTestBaseTestWatcher.class)
 @Tag("AcceptanceTest")
 @Slf4j
 public class AcceptanceTestBase {
@@ -131,9 +127,7 @@ protected AcceptanceTestBase() {
     exitedSuccessfully = new ExitedWithCode(0);
   }
 
-  @Rule public final TestName name = new TestName();
-
-  @After
+  @AfterEach
   public void tearDownAcceptanceTestBase() {
     reportMemory();
     cluster.close();
@@ -179,49 +173,6 @@ private void printOutput(final Process process) {
     }
   }
 
-  @Rule
-  public TestWatcher logEraser =
-      new TestWatcher() {
-
-        @Override
-        protected void starting(final Description description) {
-          MDC.put("test", description.getMethodName());
-          MDC.put("class", description.getClassName());
-
-          final String errorMessage = "Uncaught exception in thread \"{}\"";
-          Thread.currentThread()
-              .setUncaughtExceptionHandler(
-                  (thread, error) -> log.error(errorMessage, thread.getName(), error));
-          Thread.setDefaultUncaughtExceptionHandler(
-              (thread, error) -> log.error(errorMessage, thread.getName(), error));
-        }
-
-        @Override
-        protected void failed(final Throwable e, final Description description) {
-          // add the result at the end of the log so it is self-sufficient
-          log.error(
-              "==========================================================================================");
-          log.error("Test failed. Reported Throwable at the point of failure:", e);
-          log.error(e.getMessage());
-        }
-
-        @Override
-        protected void succeeded(final Description description) {
-          // if so configured, delete logs of successful tests
-          if (!Boolean.getBoolean("acctests.keepLogsOfPassingTests")) {
-            String pathname =
-                "build/acceptanceTestLogs/"
-                    + description.getClassName()
-                    + "."
-                    + description.getMethodName()
-                    + ".log";
-            log.info("Test successful, deleting log at {}", pathname);
-            File file = new File(pathname);
-            file.delete();
-          }
-        }
-      };
-
   protected void waitForBlockHeight(final Node node, final long blockchainHeight) {
     WaitUtils.waitFor(
         120,

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-releaseVersion=0.1.4-test33
+releaseVersion=0.1.4-test34
 besuVersion=24.9-delivery32
 besuArtifactGroup=io.consensys.linea-besu
 distributionIdentifier=besu-sequencer-plugins

diff --git a/gradle/allowed-licenses.json b/gradle/allowed-licenses.json
@@ -61,11 +61,6 @@
       "moduleVersion": "1.0.4",
       "moduleName": "org.reactivestreams:reactive-streams"
     },
-    {
-      "moduleLicense": "Eclipse Public License - v 1.0",
-      "moduleVersion": "4.13.2",
-      "moduleName": "junit:junit"
-    },
     {
       "moduleName": "org.jetbrains.kotlin:kotlin-stdlib-common",
       "moduleVersion": "1.9.22"

diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle
@@ -111,8 +111,6 @@ dependencyManagement {
 
     dependency 'io.vertx:vertx-core:4.5.9'
 
-    dependency 'junit:junit:4.13.2'
-
     dependency 'net.java.dev.jna:jna:5.14.0'
 
     dependency 'org.assertj:assertj-core:3.26.3'

diff --git a/native/build.sh b/native/build.sh
@@ -25,6 +25,8 @@ elif [ x"$OSTYPE" = x"GNU/Linux" ]; then
   ARCH_DIR="linux-$ARCHITECTURE"
 elif [ x"$OSTYPE" = x"Darwin" ]; then
   LIBRARY_EXTENSION=dylib
+  ARCHITECTURE="$(uname -m)"
+  ARCH_DIR="darwin-$ARCHITECTURE"
 else
   echo "*** Unknown OS: $OSTYPE"
   exit 1

diff --git a/native/compress/build.gradle b/native/compress/build.gradle
@@ -61,13 +61,13 @@ dependencies {
 
 
 tasks.register('macArmLibCopy', Copy) {
-  from 'build/native/libcompress_jni.dylib'
+  from 'build/native/darwin-arm64/libcompress_jni.dylib'
   into 'build/resources/main/darwin-aarch64'
 }
 processResources.dependsOn macArmLibCopy
 
 tasks.register('macLibCopy', Copy) {
-  from 'build/native/libcompress_jni.dylib'
+  from 'build/native/darwin-x86-64/libcompress_jni.dylib'
   into 'build/resources/main/darwin-x86-64'
 }
 processResources.dependsOn macLibCopy

diff --git a/sequencer/src/main/java/net/consensys/linea/AbstractLineaPrivateOptionsPlugin.java b/sequencer/src/main/java/net/consensys/linea/AbstractLineaPrivateOptionsPlugin.java
@@ -79,7 +79,7 @@ public LineaTransactionPoolValidatorConfiguration transactionPoolValidatorConfig
         getConfigurationByKey(LineaTransactionPoolValidatorCliOptions.CONFIG_KEY).optionsConfig();
   }
 
-  public LineaRpcConfiguration rpcConfiguration() {
+  public LineaRpcConfiguration lineaRpcConfiguration() {
     return (LineaRpcConfiguration)
         getConfigurationByKey(LineaRpcCliOptions.CONFIG_KEY).optionsConfig();
   }

diff --git a/sequencer/src/main/java/net/consensys/linea/config/LineaRpcCliOptions.java b/sequencer/src/main/java/net/consensys/linea/config/LineaRpcCliOptions.java
@@ -23,7 +23,7 @@
 
 /** The Linea RPC CLI options. */
 public class LineaRpcCliOptions implements LineaCliOptions {
-  public static final String CONFIG_KEY = "rpc-config";
+  public static final String CONFIG_KEY = "rpc-config-sequencer";
 
   private static final String ESTIMATE_GAS_COMPATIBILITY_MODE_ENABLED =
       "--plugin-linea-estimate-gas-compatibility-mode-enabled";