Merge branch 'main' into linea-estimateGas-chainId-eip1559

Consensys · Dec 13, 2024 · 0faf500 · 0faf500
2 parents c0c0e6d + 60fb288
commit 0faf500
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 165 deletions.
diff --git a/README.md b/README.md
@@ -37,10 +37,13 @@ Linea abstracts away the complexity of this technical architecture to allow deve
 
 ## How to contribute
 
-Contributions of any kind are welcome!
+Contributions are welcome!
+
+### Guidelines for Non-Code and other Trivial Contributions
+Please keep in mind that we do not accept non-code contributions like fixing comments, typos or some other trivial fixes. Although we appreciate the extra help, managing lots of these small contributions is unfeasible, and puts extra pressure in our continuous delivery systems (running all tests, etc). Feel free to open an issue pointing any of those errors, and we will batch them into a single change.
 
 1. [Create an issue](https://github.com/Consensys/linea-sequencer/issues).
-> If the proposed update is non-trivial, also tag us for discussion.
+> If the proposed update requires input, also tag us for discussion.
 2. Submit the update as a pull request from your [fork of this repo](https://github.com/Consensys/linea-sequencer/fork), and tag us for review. 
 > Include the issue number in the pull request description and (optionally) in the branch name.
 

diff --git a/acceptance-tests/build.gradle b/acceptance-tests/build.gradle
@@ -52,27 +52,14 @@ tasks.register('acceptanceTests', Test) {
 
 dependencies {
   testImplementation project(":native:compress")
-  testImplementation project(":sequencer")
 
-  testImplementation "${besuArtifactGroup}:besu-datatypes"
-  testImplementation "${besuArtifactGroup}:evm"
-  testImplementation "${besuArtifactGroup}:plugin-api"
+  testImplementation project(":sequencer")
 
-  testImplementation "${besuArtifactGroup}.internal:algorithms"
-  testImplementation "${besuArtifactGroup}.internal:api"
-  testImplementation "${besuArtifactGroup}.internal:core"
   testImplementation "${besuArtifactGroup}.internal:dsl"
-  testImplementation "${besuArtifactGroup}.internal:eth"
-
-  testImplementation 'io.tmio:tuweni-bytes'
-  testImplementation 'io.tmio:tuweni-units'
 
-  testImplementation 'org.web3j:abi'
-  testImplementation 'org.web3j:besu'
-  testImplementation 'org.web3j:core'
+  testImplementation 'net.consensys.linea.zktracer:arithmetization'
 
   testImplementation 'org.awaitility:awaitility'
-  testImplementation 'com.splunk.logging:splunk-library-javalogging'
 }
 
 test.enabled = false
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
-releaseVersion=0.8.0-rc6.1
+releaseVersion=0.8.0-rc8.3
 besuVersion=24.12-delivery40
-arithmetizationVersion=0.8.0-rc6
+arithmetizationVersion=0.8.0-rc8
 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/allowed-licenses.json b/gradle/allowed-licenses.json
@@ -32,6 +32,10 @@
       "moduleLicense": "Eclipse Distribution License - v 1.0",
       "moduleLicenseUrl": "http://www.eclipse.org/legal/epl-v10.html"
     },
+    {
+      "moduleLicense": "Eclipse Public License - v 1.0",
+      "moduleLicenseUrl": "http://www.eclipse.org/legal/epl-v10.html"
+    },
     {
       "moduleLicense": "Eclipse Public License - v 2.0",
       "moduleLicenseUrl": "https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt"
@@ -64,6 +68,16 @@
     {
       "moduleName": "org.jetbrains.kotlin:kotlin-stdlib-common",
       "moduleVersion": "1.9.22"
+    },
+    {
+      "moduleLicense": "CDDL-1.0",
+      "moduleVersion": "3.0.2",
+      "moduleName": "org.jupnp:org.jupnp"
+    },
+    {
+      "moduleLicense": "CDDL-1.0",
+      "moduleVersion": "3.0.2",
+      "moduleName": "org.jupnp:org.jupnp.support"
     }
   ]
 }
diff --git a/gradle/common-dependencies.gradle b/gradle/common-dependencies.gradle
@@ -16,24 +16,21 @@
 dependencies {
   api 'org.slf4j:slf4j-api'
 
-  implementation 'org.apache.logging.log4j:log4j-api'
-  implementation 'org.apache.logging.log4j:log4j-core'
-  implementation 'org.apache.logging.log4j:log4j-slf4j2-impl'
-
-  implementation 'commons-io:commons-io'
-  implementation 'com.slack.api:slack-api-client'
-
   testImplementation 'org.apache.commons:commons-lang3'
   testImplementation 'com.google.guava:guava'
   testImplementation 'org.assertj:assertj-core'
 
   testImplementation 'org.junit.jupiter:junit-jupiter-api'
-  testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
   testImplementation 'org.junit.jupiter:junit-jupiter-params'
-  testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
 
   testImplementation 'org.mockito:mockito-core'
   testImplementation 'org.mockito:mockito-junit-jupiter'
 
-  testImplementation "org.wiremock:wiremock"
+  testImplementation 'org.wiremock:wiremock'
+
+  testRuntimeOnly 'org.apache.logging.log4j:log4j-api'
+  testRuntimeOnly 'org.apache.logging.log4j:log4j-core'
+  testRuntimeOnly 'org.apache.logging.log4j:log4j-slf4j2-impl'
+
+  testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
 }
diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle
@@ -44,121 +44,26 @@ repositories {
   mavenLocal()
 }
 
-configurations.all {
-  resolutionStrategy {
-    cacheChangingModulesFor 0, 'seconds'
-  }
-}
-
 apply plugin: 'io.spring.dependency-management'
 
 dependencyManagement {
   applyMavenExclusions = false
   generatedPomCustomization {
     enabled = false
   }
+  imports {
+    mavenBom "${besuArtifactGroup}:bom:${besuVersion}"
+  }
 
   dependencies {
     dependencySet(group: "net.consensys.linea.zktracer", version: "${arithmetizationVersion}") {
       entry "arithmetization"
     }
 
-    // Besu dependencies
-    dependencySet(group: "${besuArtifactGroup}", version: "${besuVersion}") {
-      entry "besu-datatypes"
-      entry "evm"
-      entry "plugin-api"
-    }
-
-    // Besu internal dependencies
-    dependencySet(group: "${besuArtifactGroup}.internal", version: "${besuVersion}") {
-      entry "algorithms"
-      entry "api"
-      entry "core"
-      entry "dsl"
-      entry "eth"
-      entry "rlp"
-      entry "besu"
-    }
-
-    dependencySet(group: 'ch.qos.logback', version: '1.5.6') {
-      entry 'logback-core'
-      entry 'logback-classic'
-    }
-
-    dependency 'com.fasterxml.jackson.core:jackson-databind:2.17.2'
-    dependency 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.17.2'
-    dependency 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.17.2'
-
-    dependency 'com.google.auto.service:auto-service:1.1.1'
-
-    dependency 'com.google.guava:guava:33.3.0-jre'
-
-    dependency 'commons-io:commons-io:2.16.1'
-
-    dependency 'com.slack.api:slack-api-client:1.32.1'
-
-    dependency 'com.splunk.logging:splunk-library-javalogging:1.11.8'
-
-    dependencySet(group: 'info.picocli', version: '4.7.6') {
-      entry 'picocli'
-      entry 'picocli-codegen'
-    }
-
-    dependency 'com.squareup.okhttp3:okhttp:4.12.0'
-
-    dependencySet(group: 'io.tmio', version: '2.4.2') {
-      entry 'tuweni-bytes'
-      entry 'tuweni-net'
-      entry 'tuweni-toml'
-      entry 'tuweni-units'
-    }
-
-    dependency 'io.vertx:vertx-core:4.5.9'
-
-    dependency 'net.java.dev.jna:jna:5.14.0'
-
-    dependency 'org.assertj:assertj-core:3.26.3'
-
-    dependency 'org.apache.commons:commons-lang3:3.17.0'
-
-    dependencySet(group: 'org.apache.logging.log4j', version: '2.23.1') {
-      entry 'log4j-api'
-      entry 'log4j-core'
-      entry 'log4j-slf4j2-impl'
-    }
-
-    dependency 'org.awaitility:awaitility:4.2.2'
-
-    dependencySet(group: 'org.bouncycastle', version: '1.78.1') {
-      entry 'bcpkix-jdk18on'
-      entry 'bcprov-jdk18on'
-      entry 'jcajce'
-    }
-
-    dependency 'org.hibernate.validator:hibernate-validator:8.0.1.Final'
-
-    dependencySet(group: 'org.junit.jupiter', version: '5.11.0') {
-      entry 'junit-jupiter-api'
-      entry 'junit-jupiter-engine'
-      entry 'junit-jupiter-params'
-    }
-    dependency 'org.junit.vintage:junit-vintage-engine:5.11.0'
-
-    dependencySet(group: 'org.mockito', version: '5.13.0') {
-      entry 'mockito-core'
-      entry 'mockito-junit-jupiter'
-    }
-
-    dependency 'org.slf4j:slf4j-api:2.0.16'
-
-    dependencySet(group: 'org.web3j', version: '4.12.1') {
-      entry 'abi'
-      entry 'besu'
-      entry 'core'
-      entry 'crypto'
-    }
+    dependency 'com.google.code.gson:gson:2.11.0'
 
-    dependency "org.wiremock:wiremock:3.9.1"
+    // ToDo: remove when fixed in Besu, force version to avoid conflict with previous version
+    dependency 'org.apache.logging.log4j:log4j-api:2.24.1'
+    dependency 'org.apache.logging.log4j:log4j-core:2.24.1'
   }
 }
diff --git a/gradle/dist.gradle b/gradle/dist.gradle
@@ -32,10 +32,10 @@ jar {
 
   manifest {
     attributes(
-      'Specification-Title': archiveBaseName.get(),
-      'Specification-Version': rootProject.version,
-      'Implementation-Title': archiveBaseName.get(),
-      'Implementation-Version': calculateVersion()
+      'Specification-Title': 'arithmetization',
+      'Specification-Version': "v${arithmetizationVersion}",
+      'Implementation-Title': 'arithmetization',
+      'Implementation-Version': "v${arithmetizationVersion}"
     )
   }
 

diff --git a/sequencer/build.gradle b/sequencer/build.gradle
@@ -32,49 +32,35 @@ dependencies {
   // annotationProcessor generates the file META-INF/services/org.hyperledger.besu.plugin.BesuPlugin
   annotationProcessor 'com.google.auto.service:auto-service'
 
-  compileOnly "${besuArtifactGroup}:besu-datatypes"
-  compileOnly "${besuArtifactGroup}:evm"
-  compileOnly "${besuArtifactGroup}:plugin-api"
-  compileOnly "${besuArtifactGroup}.internal:algorithms"
-  compileOnly "${besuArtifactGroup}.internal:api"
-  compileOnly "${besuArtifactGroup}.internal:core"
-  compileOnly "${besuArtifactGroup}.internal:rlp"
-
-  compileOnly 'com.google.auto.service:auto-service'
-  compileOnly 'com.google.auto.service:auto-service-annotations'
+  implementation project(":native:compress")
 
-  compileOnly 'info.picocli:picocli'
+  implementation "${besuArtifactGroup}:besu-datatypes"
+  implementation "${besuArtifactGroup}:evm"
+  implementation "${besuArtifactGroup}:plugin-api"
+  implementation "${besuArtifactGroup}.internal:algorithms"
+  implementation "${besuArtifactGroup}.internal:api"
+  implementation "${besuArtifactGroup}.internal:core"
+  implementation "${besuArtifactGroup}.internal:rlp"
 
-  compileOnly 'io.vertx:vertx-core'
+  implementation 'com.google.auto.service:auto-service'
 
-  compileOnly 'com.squareup.okhttp3:okhttp'
+  implementation 'com.google.code.gson:gson'
 
-  implementation project(":native:compress")
-
-  implementation 'com.fasterxml.jackson.core:jackson-databind'
-  implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
+  implementation 'info.picocli:picocli'
 
   implementation 'io.tmio:tuweni-bytes'
   implementation 'io.tmio:tuweni-units'
   implementation 'io.tmio:tuweni-toml'
 
-  implementation 'org.bouncycastle:bcprov-jdk18on'
-  implementation 'org.hibernate.validator:hibernate-validator'
+  implementation 'net.consensys.linea.zktracer:arithmetization'
 
-  implementation ('net.consensys.linea.zktracer:arithmetization') {
-    transitive = false
-  }
+  implementation 'org.hibernate.validator:hibernate-validator'
 
-  testImplementation "${besuArtifactGroup}:evm"
-  testImplementation "${besuArtifactGroup}:besu-datatypes"
-  testImplementation "${besuArtifactGroup}.internal:core"
-  testImplementation "${besuArtifactGroup}.internal:rlp"
-  testImplementation "${besuArtifactGroup}:plugin-api"
   testImplementation "${besuArtifactGroup}.internal:besu"
-  testImplementation "org.awaitility:awaitility"
 
-  // workaround for bug https://github.com/dnsjava/dnsjava/issues/329, remove when upgraded upstream
-  testImplementation 'dnsjava:dnsjava:3.6.1'
+
+
+  testImplementation 'org.awaitility:awaitility'
 }
 
 configurations {