Merge branch 'main' into prover/fix-PolyEval-over-Product

Consensys · Oct 21, 2024 · f3678e6 · f3678e6
2 parents d86cb1d + 8bb5fe7
commit f3678e6
Show file tree

Hide file tree

Showing 178 changed files with 155 additions and 160 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -35,7 +35,6 @@ jobs:
               - 'testdata/**'
               - 'buildSrc/**'
               - 'jvm-libs/**'
-              - 'prover/lib/compressor/**'
               - 'gradle/**'
               - 'build.gradle'
               - 'gradle.properties'
@@ -48,8 +47,6 @@ jobs:
               - 'config/common/traces-limits-v2.toml'
               - 'config/coordinator/**'
               - 'e2e/**'
-              - 'contracts/abi/**'
-              - 'contracts/contracts/**'
               - 'docker/compose.yml'
               - 'docker/compose-local-dev.overrides.yml'
               - 'docker/compose-local-dev-traces-v2.overrides.yml'
@@ -68,13 +65,14 @@ jobs:
               - 'constraints'
             traces-api-facade:
               - 'traces-api-facade/**'
-              - 'jvm-libs/core/domain-models/**'
-              - 'jvm-libs/json-rpc/**'
-              - 'jvm-libs/kotlin-extensions/**'
-              - 'jvm-libs/future-extensions/**'
-              - 'jvm-libs/vertx-helper/**'
-              - 'jvm-libs/traces/**'
-              - 'jvm-libs/metrics/**'
+              - 'jvm-libs/linea/core/domain-models/**'
+              - 'jvm-libs/linea/core/traces/**'
+              - 'jvm-libs/linea/core/metrics/**'
+              - 'jvm-libs/generic/json-rpc/**'
+              - 'jvm-libs/generic/extensions/kotlin/**'
+              - 'jvm-libs/generic/extensions/futures/**'
+              - 'jvm-libs/generic/vertx-helper/**'
+              - 'jvm-libs/linea/metrics/**'
               - 'config/common/traces-limits-v1.toml'
               - '.github/workflows/traces-api-facade-*.yml'
               - '.github/workflows/build-and-publish.yml'
@@ -86,10 +84,10 @@ jobs:
               - 'gradle.properties'
               - 'settings.gradle'
             finalized-tag-updater:
-              - 'jvm-libs/core/long-running-service/**'
-              - 'jvm-libs/kotlin-extensions/**'
-              - 'jvm-libs/future-extensions/**'
-              - 'jvm-libs/web3j-extensions/**'
+              - 'jvm-libs/linea/core/long-running-service/**'
+              - 'jvm-libs/linea/web3j-extensions/**'
+              - 'jvm-libs/extensions/kotlin/**'
+              - 'jvm-libs/extensions/futures/**'
               - 'finalized-tag-updater/**'
               - '.github/workflows/main.yml'
               - '.github/workflows/finalized-tag-updater-github-release.yml'

diff --git a/coordinator/app/build.gradle b/coordinator/app/build.gradle
@@ -10,14 +10,14 @@ configurations.configureEach {
 }
 
 dependencies {
-  implementation project(':jvm-libs:json-rpc')
-  implementation project(':jvm-libs:http-rest')
-  implementation project(':jvm-libs:vertx-helper')
-  implementation project(':jvm-libs:future-extensions')
-  implementation project(':jvm-libs:web3j-extensions')
-  implementation project(':jvm-libs:core:metrics')
-  implementation project(':jvm-libs:metrics:micrometer')
-  implementation project(':jvm-libs:core:domain-models')
+  implementation project(':jvm-libs:generic:json-rpc')
+  implementation project(':jvm-libs:generic:http-rest')
+  implementation project(':jvm-libs:generic:vertx-helper')
+  implementation project(':jvm-libs:generic:extensions:futures')
+  implementation project(':jvm-libs:linea:web3j-extensions')
+  implementation project(':jvm-libs:linea:core:metrics')
+  implementation project(':jvm-libs:linea:metrics:micrometer')
+  implementation project(':jvm-libs:linea:core:domain-models')
   implementation project(':coordinator:utilities')
   implementation project(':coordinator:core')
   implementation project(':coordinator:clients:shomei-client')
@@ -36,7 +36,7 @@ dependencies {
   implementation project(':coordinator:persistence:aggregation')
   implementation project(':coordinator:persistence:batch')
   implementation project(':coordinator:persistence:feehistory')
-  implementation project(":jvm-libs:teku-execution-client")
+  implementation project(":jvm-libs:linea:teku-execution-client")
   implementation "tech.pegasys.teku.internal:bytes:${libs.versions.teku.get()}"
 
   implementation project(':coordinator:ethereum:gas-pricing:static-cap')

diff --git a/coordinator/clients/prover-client/file-based-client/build.gradle b/coordinator/clients/prover-client/file-based-client/build.gradle
@@ -8,10 +8,10 @@ dependencies {
   implementation project(':coordinator:clients:smart-contract-client')
   api project(':coordinator:clients:prover-client:serialization')
   implementation project(':coordinator:utilities')
-  implementation project(':jvm-libs:metrics:micrometer')
-  implementation project(':jvm-libs:future-extensions')
-  implementation project(':jvm-libs:kotlin-extensions')
-  implementation project(':jvm-libs:core:domain-models')
+  implementation project(':jvm-libs:linea:metrics:micrometer')
+  implementation project(':jvm-libs:generic:extensions:futures')
+  implementation project(':jvm-libs:generic:extensions:kotlin')
+  implementation project(':jvm-libs:linea:core:domain-models')
   implementation project(':coordinator:ethereum:models-helper')
 
   implementation "io.vertx:vertx-core"
@@ -25,7 +25,7 @@ dependencies {
   implementation "com.fasterxml.jackson.module:jackson-module-kotlin:${libs.versions.jackson.get()}"
   implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${libs.versions.jackson.get()}")
 
-  testImplementation project(':jvm-libs:testing-teku-helper')
+  testImplementation project(':jvm-libs:linea:testing:teku-helper')
   testImplementation "io.vertx:vertx-junit5"
   testImplementation "tech.pegasys.teku.internal:spec:${libs.versions.teku.get()}"
   testImplementation "tech.pegasys.teku.internal:spec:${libs.versions.teku.get()}:test-fixtures"

diff --git a/coordinator/clients/prover-client/serialization/build.gradle b/coordinator/clients/prover-client/serialization/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     api "com.fasterxml.jackson.core:jackson-databind:${libs.versions.jackson.get()}"
     api "com.fasterxml.jackson.module:jackson-module-kotlin:${libs.versions.jackson.get()}"
     api("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${libs.versions.jackson.get()}")
-    api(project(":jvm-libs:kotlin-extensions"))
+    api(project(":jvm-libs:generic:extensions:kotlin"))
     api(project(":coordinator:core"))
 }
 

diff --git a/coordinator/clients/shomei-client/build.gradle b/coordinator/clients/shomei-client/build.gradle
@@ -4,11 +4,11 @@ plugins {
 
 dependencies {
     implementation project(':coordinator:core')
-    implementation project(':jvm-libs:future-extensions')
-    implementation project(':jvm-libs:json-rpc')
-    implementation project(':jvm-libs:metrics:micrometer')
-    implementation project(':jvm-libs:traces')
-    implementation project(":jvm-libs:teku-execution-client")
+    implementation project(':jvm-libs:generic:extensions:futures')
+    implementation project(':jvm-libs:generic:json-rpc')
+    implementation project(':jvm-libs:linea:metrics:micrometer')
+    implementation project(':jvm-libs:linea:core:traces')
+    implementation project(":jvm-libs:linea:teku-execution-client")
     implementation "tech.pegasys.teku.internal:unsigned:${libs.versions.teku.get()}"
 
     api "io.vertx:vertx-core"

diff --git a/coordinator/clients/smart-contract-client/build.gradle b/coordinator/clients/smart-contract-client/build.gradle
@@ -3,8 +3,8 @@ plugins {
 }
 
 dependencies {
-  implementation project(":jvm-libs:kotlin-extensions")
-  implementation project(':jvm-libs:web3j-extensions')
+  implementation project(":jvm-libs:generic:extensions:kotlin")
+  implementation project(':jvm-libs:linea:web3j-extensions')
   api 'build.linea:l1-rollup-contract-client:0.0.1'
   api 'build.linea:l2-message-service-contract-client:0.0.1'
 

diff --git a/coordinator/clients/traces-generator-api-client/build.gradle b/coordinator/clients/traces-generator-api-client/build.gradle
@@ -4,10 +4,10 @@ plugins {
 
 dependencies {
   implementation project(':coordinator:core')
-  implementation project(':jvm-libs:future-extensions')
-  implementation project(':jvm-libs:json-rpc')
-  implementation project(':jvm-libs:metrics:micrometer')
-  implementation project(':jvm-libs:traces')
+  implementation project(':jvm-libs:generic:extensions:futures')
+  implementation project(':jvm-libs:generic:json-rpc')
+  implementation project(':jvm-libs:linea:metrics:micrometer')
+  implementation project(':jvm-libs:linea:core:traces')
   implementation "com.fasterxml.jackson.core:jackson-databind:${libs.versions.jackson.get()}"
 
   api "io.vertx:vertx-core"

diff --git a/coordinator/clients/type2-state-manager-client/build.gradle b/coordinator/clients/type2-state-manager-client/build.gradle
@@ -4,9 +4,9 @@ plugins {
 
 dependencies {
   implementation project(':coordinator:core')
-  implementation project(':jvm-libs:json-rpc')
-  implementation project(':jvm-libs:metrics:micrometer')
-  implementation project(':jvm-libs:future-extensions')
+  implementation project(':jvm-libs:generic:json-rpc')
+  implementation project(':jvm-libs:linea:metrics:micrometer')
+  implementation project(':jvm-libs:generic:extensions:futures')
 
   implementation "tech.pegasys.teku.internal:bytes:${libs.versions.teku.get()}"
   implementation "io.vertx:vertx-core"

diff --git a/coordinator/clients/web3signer-client/build.gradle b/coordinator/clients/web3signer-client/build.gradle
@@ -8,7 +8,7 @@ plugins {
 
 dependencies {
   implementation project(':coordinator:core')
-  implementation project(':jvm-libs:http-rest')
+  implementation project(':jvm-libs:generic:http-rest')
 
   implementation "io.vertx:vertx-core"
   implementation "io.vertx:vertx-web-client"

diff --git a/coordinator/core/build.gradle b/coordinator/core/build.gradle
@@ -6,16 +6,16 @@ plugins {
 dependencies {
   api "build.linea:blob-compressor:${libs.versions.blobCompressor.get()}"
   api "build.linea:blob-shnarf-calculator:${libs.versions.blobShnarfCalculator.get()}"
-  api project(':jvm-libs:core:domain-models')
-  api project(':jvm-libs:core:metrics')
-  api project(':jvm-libs:core:long-running-service')
-  api project(':jvm-libs:traces')
-  api project(':jvm-libs:errors')
-  api project(':jvm-libs:kotlin-extensions')
-  api project(':jvm-libs:future-extensions')
+  api project(':jvm-libs:linea:core:domain-models')
+  api project(':jvm-libs:linea:core:metrics')
+  api project(':jvm-libs:linea:core:long-running-service')
+  api project(':jvm-libs:linea:core:traces')
+  api project(':jvm-libs:generic:errors')
+  api project(':jvm-libs:generic:extensions:kotlin')
+  api project(':jvm-libs:generic:extensions:futures')
   api "tech.pegasys.teku.internal:unsigned:${libs.versions.teku.get()}"
   api "org.jetbrains.kotlinx:kotlinx-datetime:${libs.versions.kotlinxDatetime.get()}"
-  implementation project(":jvm-libs:teku-execution-client")
+  implementation project(":jvm-libs:linea:teku-execution-client")
   implementation "io.vertx:vertx-core"
   // jackson shall never be used in the core module
   // however, it is used already :( but was as transitive through Teku Execution Client
@@ -31,10 +31,10 @@ dependencies {
   testFixturesImplementation("org.web3j:core:${libs.versions.web3j.get()}") {
     exclude group: 'org.slf4j', module: 'slf4j-nop'
   }
-  testImplementation project(":jvm-libs:testing-teku-helper")
-  testImplementation project(':jvm-libs:metrics:micrometer')
-  testImplementation(testFixtures(project(':jvm-libs:traces')))
-  testImplementation(testFixtures(project(':jvm-libs:kotlin-extensions')))
+  testImplementation project(":jvm-libs:linea:testing:teku-helper")
+  testImplementation project(':jvm-libs:linea:metrics:micrometer')
+  testImplementation(testFixtures(project(':jvm-libs:linea:core:traces')))
+  testImplementation(testFixtures(project(':jvm-libs:generic:extensions:kotlin')))
   testImplementation("io.vertx:vertx-junit5")
 }
 

diff --git a/coordinator/ethereum/blob-submitter/build.gradle b/coordinator/ethereum/blob-submitter/build.gradle
@@ -21,14 +21,14 @@ dependencies {
   implementation("org.web3j:core:${libs.versions.web3j.get()}") {
     exclude group: "org.slf4j", module: "slf4j-nop"
   }
-  implementation project(":jvm-libs:teku-execution-client")
+  implementation project(":jvm-libs:linea:teku-execution-client")
 
-  testImplementation(project(":jvm-libs:testing:l1-blob-and-proof-submission"))
+  testImplementation(project(":jvm-libs:linea:testing:l1-blob-and-proof-submission"))
   testImplementation(project(":coordinator:persistence:aggregation"))
   testImplementation(testFixtures(project(":coordinator:persistence:db")))
   testImplementation(testFixtures(project(":coordinator:ethereum:gas-pricing")))
   testImplementation(testFixtures(project(":coordinator:core")))
-  testImplementation(testFixtures(project(":jvm-libs:kotlin-extensions")))
+  testImplementation(testFixtures(project(":jvm-libs:generic:extensions:kotlin")))
   testImplementation("io.vertx:vertx-junit5")
   testImplementation("com.fasterxml.jackson.core:jackson-databind:${libs.versions.jackson.get()}")
   testImplementation("com.fasterxml.jackson.core:jackson-annotations:${libs.versions.jackson.get()}")

diff --git a/coordinator/ethereum/common/build.gradle b/coordinator/ethereum/common/build.gradle
@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
   implementation(project(':coordinator:core'))
-  implementation project(':jvm-libs:web3j-extensions')
+  implementation project(':jvm-libs:linea:web3j-extensions')
   implementation("org.web3j:core:${libs.versions.web3j.get()}") {
     exclude group: "org.slf4j", module: "slf4j-nop"
   }

diff --git a/coordinator/ethereum/finalization-monitor/build.gradle b/coordinator/ethereum/finalization-monitor/build.gradle
@@ -14,11 +14,11 @@ dependencies {
     exclude group: "org.slf4j", module: "slf4j-nop"
   }
   implementation(project(":coordinator:clients:smart-contract-client"))
-  implementation(project(":jvm-libs:future-extensions"))
+  implementation(project(":jvm-libs:generic:extensions:futures"))
 
   testImplementation(project(":coordinator:ethereum:test-utils"))
-  testImplementation(project(":jvm-libs:web3j-extensions"))
-  testImplementation(testFixtures(project(":jvm-libs:kotlin-extensions")))
+  testImplementation(project(":jvm-libs:linea:web3j-extensions"))
+  testImplementation(testFixtures(project(":jvm-libs:generic:extensions:kotlin")))
   testImplementation("io.vertx:vertx-junit5")
 }
 

diff --git a/coordinator/ethereum/gas-pricing/build.gradle b/coordinator/ethereum/gas-pricing/build.gradle
@@ -4,9 +4,9 @@ plugins {
 }
 
 dependencies {
-  implementation project(':jvm-libs:kotlin-extensions')
-  implementation project(':jvm-libs:core:domain-models')
-  implementation project(':jvm-libs:web3j-extensions')
+  implementation project(':jvm-libs:generic:extensions:kotlin')
+  implementation project(':jvm-libs:linea:core:domain-models')
+  implementation project(':jvm-libs:linea:web3j-extensions')
 
   testFixturesImplementation "tech.pegasys.teku.internal:async:${libs.versions.teku.get()}"
   testFixturesImplementation project(":coordinator:core")

diff --git a/coordinator/ethereum/gas-pricing/dynamic-cap/build.gradle b/coordinator/ethereum/gas-pricing/dynamic-cap/build.gradle
@@ -3,10 +3,10 @@ plugins {
 }
 
 dependencies {
-  implementation project(':jvm-libs:vertx-helper')
-  implementation project(':jvm-libs:kotlin-extensions')
-  implementation project(':jvm-libs:web3j-extensions')
-  implementation project(':jvm-libs:core:domain-models')
+  implementation project(':jvm-libs:generic:vertx-helper')
+  implementation project(':jvm-libs:generic:extensions:kotlin')
+  implementation project(':jvm-libs:linea:web3j-extensions')
+  implementation project(':jvm-libs:linea:core:domain-models')
   implementation(project(":coordinator:core"))
   implementation(project(":coordinator:ethereum:gas-pricing"))
 

diff --git a/coordinator/ethereum/gas-pricing/static-cap/build.gradle b/coordinator/ethereum/gas-pricing/static-cap/build.gradle
@@ -5,11 +5,11 @@ plugins {
 dependencies {
   implementation(project(":coordinator:core"))
   implementation(project(":coordinator:ethereum:gas-pricing"))
-  implementation project(':jvm-libs:kotlin-extensions')
-  implementation project(':jvm-libs:core:domain-models')
-  implementation project(':jvm-libs:vertx-helper')
-  implementation project(':jvm-libs:web3j-extensions')
-  implementation project(':jvm-libs:json-rpc')
+  implementation project(':jvm-libs:generic:extensions:kotlin')
+  implementation project(':jvm-libs:linea:core:domain-models')
+  implementation project(':jvm-libs:generic:vertx-helper')
+  implementation project(':jvm-libs:linea:web3j-extensions')
+  implementation project(':jvm-libs:generic:json-rpc')
 
   testImplementation("io.vertx:vertx-junit5")
   testImplementation "com.github.tomakehurst:wiremock-jre8:${libs.versions.wiremock.get()}"

diff --git a/coordinator/ethereum/message-anchoring/build.gradle b/coordinator/ethereum/message-anchoring/build.gradle
@@ -5,9 +5,9 @@ plugins {
 dependencies {
   // TODO: review dependencies
   implementation "io.vertx:vertx-core"
-  implementation project(':jvm-libs:vertx-helper')
-  implementation project(':jvm-libs:future-extensions')
-  implementation project(':jvm-libs:web3j-extensions')
+  implementation project(':jvm-libs:generic:vertx-helper')
+  implementation project(':jvm-libs:generic:extensions:futures')
+  implementation project(':jvm-libs:linea:web3j-extensions')
   implementation project(':coordinator:utilities')
   implementation project(':coordinator:core')
   implementation project(':coordinator:clients:smart-contract-client')

diff --git a/coordinator/ethereum/models-helper/build.gradle b/coordinator/ethereum/models-helper/build.gradle
@@ -4,11 +4,11 @@ plugins {
 
 dependencies {
   api (project(":coordinator:core"))
-  api project(":jvm-libs:teku-execution-client")
+  api project(":jvm-libs:linea:teku-execution-client")
   implementation "org.hyperledger.besu:besu-datatypes:${libs.versions.besu.get()}"
   implementation "org.hyperledger.besu:evm:${libs.versions.besu.get()}"
   implementation "org.hyperledger.besu.internal:rlp:${libs.versions.besu.get()}"
   implementation "org.hyperledger.besu.internal:core:${libs.versions.besu.get()}"
 
-  testImplementation project(":jvm-libs:testing-teku-helper")
+  testImplementation project(":jvm-libs:linea:testing:teku-helper")
 }
diff --git a/coordinator/ethereum/test-utils/build.gradle b/coordinator/ethereum/test-utils/build.gradle
@@ -8,9 +8,9 @@ plugins {
 dependencies {
   implementation(project(":coordinator:core"))
   implementation(project(":coordinator:clients:smart-contract-client"))
-  implementation(project(":jvm-libs:web3j-extensions"))
+  implementation(project(":jvm-libs:linea:web3j-extensions"))
   implementation(project(":coordinator:ethereum:common"))
-  implementation(project(":jvm-libs:testing:file-system"))
+  implementation(project(":jvm-libs:linea:testing:file-system"))
   implementation("org.web3j:core:${libs.versions.web3j.get()}") {
     exclude group: 'org.slf4j', module: 'slf4j-nop'
   }

diff --git a/coordinator/persistence/aggregation/build.gradle b/coordinator/persistence/aggregation/build.gradle
@@ -12,7 +12,7 @@ dependencies {
   testImplementation(project(":coordinator:persistence:blob"))
   testImplementation(testFixtures(project(":coordinator:persistence:db")))
   testImplementation(testFixtures(project(":coordinator:core")))
-  testImplementation(testFixtures(project(":jvm-libs:kotlin-extensions")))
+  testImplementation(testFixtures(project(":jvm-libs:generic:extensions:kotlin")))
   testImplementation("io.vertx:vertx-junit5")
 }
 

diff --git a/coordinator/persistence/batch/build.gradle b/coordinator/persistence/batch/build.gradle
@@ -7,14 +7,14 @@ plugins {
 dependencies {
   api(project(":coordinator:core"))
   implementation(project(":coordinator:persistence:db"))
-  implementation(project(":jvm-libs:core:metrics"))
+  implementation(project(":jvm-libs:linea:core:metrics"))
   implementation(project(":coordinator:clients:prover-client:file-based-client")) {
     because "ProverResponseIndex is a part of it"
   }
 
   testImplementation(testFixtures(project(":coordinator:core")))
   testImplementation(testFixtures(project(":coordinator:persistence:db")))
-  testImplementation(testFixtures(project(":jvm-libs:kotlin-extensions")))
+  testImplementation(testFixtures(project(":jvm-libs:generic:extensions:kotlin")))
   testImplementation("io.vertx:vertx-junit5")
 
   testFixturesImplementation(testFixtures(project(":coordinator:persistence:db")))

diff --git a/coordinator/persistence/blob/build.gradle b/coordinator/persistence/blob/build.gradle
@@ -17,7 +17,7 @@ dependencies {
   testImplementation("tech.pegasys.teku.internal:executionclient:${libs.versions.teku.get()}")
   testImplementation(testFixtures(project(":coordinator:persistence:db")))
   testImplementation(testFixtures(project(":coordinator:core")))
-  testImplementation(testFixtures(project(":jvm-libs:kotlin-extensions")))
+  testImplementation(testFixtures(project(":jvm-libs:generic:extensions:kotlin")))
   testImplementation("io.vertx:vertx-junit5")
 
   testFixturesImplementation('tech.pegasys.teku.internal:async:23.1.1')

diff --git a/coordinator/persistence/db/build.gradle b/coordinator/persistence/db/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     because("Flyway DB and other dependencies use SLF4J")
   }
 
-  testImplementation testFixtures(project(':jvm-libs:kotlin-extensions'))
+  testImplementation testFixtures(project(':jvm-libs:generic:extensions:kotlin'))
   testFixturesApi(platform("org.junit:junit-bom:${libs.versions.junit.get()}"))
   testFixturesApi("io.vertx:vertx-junit5:${libs.versions.vertx.get()}")
 }