Consensys · jpnovais · Nov 20, 2024 · Nov 20, 2024 · Nov 20, 2024 · Nov 20, 2024
diff --git a/.github/workflows/coordinator-build-and-publish.yml b/.github/workflows/coordinator-build-and-publish.yml
@@ -51,7 +51,7 @@ concurrency:
 
 jobs:
   build-and-publish:
-    runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-med
+    runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-large
     name: Coordinator build
     env:
       COMMIT_TAG: ${{ inputs.commit_tag }}
@@ -78,7 +78,7 @@ jobs:
         uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 #v4.2.1
       - name: Build dist
         run: |
-          ./gradlew coordinator:app:installDist --no-daemon
+          ./gradlew coordinator:app:installDist
       - name: Login to Docker Hub
         if: ${{ env.DOCKERHUB_USERNAME != '' && env.DOCKERHUB_TOKEN != '' }}
         uses: docker/login-action@v3

diff --git a/Makefile b/Makefile
@@ -158,10 +158,12 @@ deploy-l2-evm-opcode-tester:
 		RPC_URL=http:\\localhost:8545/ \
 		npx ts-node local-deployments-artifacts/deployLondonEvmTestingFramework.ts
 
-execute-all-opcodes:
+
+evm-opcode-tester-execute-all-opcodes: OPCODE_TEST_CONTRACT_ADDRESS:=0x997FC3aF1F193Cbdc013060076c67A13e218980e
+evm-opcode-tester-execute-all-opcodes:
 		# WARNING: FOR LOCAL DEV ONLY - DO NOT REUSE THESE KEYS ELSEWHERE
 		cd contracts/; \
-		OPCODE_TEST_CONTRACT_ADDRESS=0x997FC3aF1F193Cbdc013060076c67A13e218980e \
+		OPCODE_TEST_CONTRACT_ADDRESS=$(OPCODE_TEST_CONTRACT_ADDRESS) \
 		NUMBER_OF_RUNS=3 \
 		PRIVATE_KEY=0x1dd171cec7e2995408b5513004e8207fe88d6820aeff0d82463b3e41df251aae \
 		RPC_URL=http:\\localhost:8545/ \
@@ -216,11 +218,17 @@ deploy-contracts-minimal:
 	cd .. && \
 	$(MAKE) -j6 deploy-linea-rollup-v$(L1_CONTRACT_VERSION) deploy-l2messageservice
 
-start-all-staterecover: L1_CONTRACT_VERSION:=6
-start-all-staterecover: COMPOSE_PROFILES:=l1,l2,staterecover
-start-all-staterecover:
-		L1_GENESIS_TIME=$(get_future_time) make start-whole-environment COMPOSE_PROFILES=$(COMPOSE_PROFILES)
-		make deploy-contracts-minimal L1_CONTRACT_VERSION=$(L1_CONTRACT_VERSION)
+fresh-start-all-staterecover: COMPOSE_PROFILES:=l1,l2,staterecover
+fresh-start-all-staterecover: L1_CONTRACT_VERSION:=6
+fresh-start-all-staterecover:
+	make clean-environment
+	L1_GENESIS_TIME=$(get_future_time) make start-whole-environment-traces-v2 COMPOSE_PROFILES=$(COMPOSE_PROFILES)
+	$(MAKE) deploy-contracts-minimal L1_CONTRACT_VERSION=$(L1_CONTRACT_VERSION)
+
+fresh-start-staterecover-for-replay-only: COMPOSE_PROFILES:=l1,staterecover
+fresh-start-staterecover-for-replay-only:
+		make clean-environment
+		L1_GENESIS_TIME=$(get_future_time) make start-whole-environment-traces-v2 COMPOSE_PROFILES=$(COMPOSE_PROFILES)
 
 testnet-start-l2:
 		docker compose -f docker/compose.yml -f docker/compose-testnet-sync.overrides.yml --profile l2 up -d

diff --git a/build.gradle b/build.gradle
@@ -203,7 +203,8 @@ dockerCompose {
       "staterecover"
     ]
     useComposeFiles = [
-      "${project.rootDir.path}/docker/compose.yml"
+      "${project.rootDir.path}/docker/compose.yml",
+      "${project.rootDir.path}/docker/compose-local-dev-traces-v2.overrides.yml"
     ]
     waitForHealthyStateTimeout = Duration.ofMinutes(3)
     waitForTcpPorts = false

diff --git a/config/common/traces-limits-v2.toml b/config/common/traces-limits-v2.toml
@@ -10,34 +10,34 @@ BLOCK_HASH = 512
 EC_DATA = 262144
 EUC = 65536
 EXP = 8192
-EXT = 65536
+EXT = 1048576
 GAS = 65536
 HUB = 2097152
 LOG_DATA = 65536
 LOG_INFO = 4096
-MMIO = 2097152
+MMIO = 4194304
 MMU = 4194304
 MOD = 131072
 MUL = 65536
 MXP = 524288
 OOB = 262144
 RLP_ADDR = 4096
 RLP_TXN = 131072
-RLP_TXN_RCPT = 32768
-ROM = 8388608
+RLP_TXN_RCPT = 65536
+ROM = 4194304
 ROM_LEX = 1024
 SHAKIRA_DATA = 32768
 SHF = 65536
-STP = 32768
-TRM = 8192
+STP = 16384
+TRM = 32768
 TXN_DATA = 8192
 WCP = 262144
 #
-# Reference table limits
+# Reference table limits, set to UInt.MAX_VALUE
 #
-BIN_REFERENCE_TABLE = 196864
-SHF_REFERENCE_TABLE = 4096
-INSTRUCTION_DECODER = 512
+BIN_REFERENCE_TABLE = 4294967295
+SHF_REFERENCE_TABLE = 4294967295
+INSTRUCTION_DECODER = 4294967295
 #
 # Precompiles limits
 #
@@ -48,7 +48,7 @@ PRECOMPILE_MODEXP_EFFECTIVE_CALLS = 4
 PRECOMPILE_ECADD_EFFECTIVE_CALLS = 16384
 PRECOMPILE_ECMUL_EFFECTIVE_CALLS = 32
 PRECOMPILE_ECPAIRING_FINAL_EXPONENTIATIONS = 16
-PRECOMPILE_ECPAIRING_G2_MEMBERSHIP_CALLS    = 64
+PRECOMPILE_ECPAIRING_G2_MEMBERSHIP_CALLS = 64
 PRECOMPILE_ECPAIRING_MILLER_LOOPS = 64
 PRECOMPILE_BLAKE_EFFECTIVE_CALLS = 600
 PRECOMPILE_BLAKE_ROUNDS = 600
@@ -59,4 +59,3 @@ BLOCK_KECCAK = 8192
 BLOCK_L1_SIZE = 1000000
 BLOCK_L2_L1_LOGS = 16
 BLOCK_TRANSACTIONS = 200
-
diff --git a/config/coordinator/coordinator-docker-traces-v2-override.config.toml b/config/coordinator/coordinator-docker-traces-v2-override.config.toml
@@ -18,12 +18,12 @@ blob-compressor-version="V1_0_1"
 expected-traces-api-version-v2="v0.8.0-rc8"
 [traces.counters-v2]
 endpoints=["http://traces-node-v2:8545/"]
-request-limit-per-endpoint=2
+request-limit-per-endpoint=1
 request-retry.backoff-delay="PT1S"
 request-retry.failures-warning-threshold=2
 [traces.conflation-v2]
 endpoints=["http://traces-node-v2:8545/"]
-request-limit-per-endpoint=2
+request-limit-per-endpoint=1
 request-retry.backoff-delay="PT1S"
 request-retry.failures-warning-threshold=2
 

diff --git a/config/coordinator/coordinator-docker.config.toml b/config/coordinator/coordinator-docker.config.toml
@@ -126,12 +126,11 @@ fee-history-reward-percentile=15
 last-hash-search-window=25
 anchoring-receipt-polling-interval="PT01S"
 max-receipt-retries=120
-# Number of children blocks to wait before considering a block "finalized"
-# and elegible for conflation and
+# Number of children blocks to wait before considering a won't be reverted and elegible for conflation.
 # this a workaround to mitigate Geth fork issues with Clique PoA
 # Coordinator will consider block as finalized after being included in the chain wtih children blocks-to-finalization
-# Recommended minimum of 2
-blocks-to-finalization=2
+# Recommended: Geth sequencer minimum of 2, Besu sequencer minimum of 1, 0 is safe localy
+blocks-to-finalization=0
 
 [blob-submission]
 disabled=true

diff --git a/config/coordinator/log4j2-dev.xml b/config/coordinator/log4j2-dev.xml
@@ -100,6 +100,10 @@
       <DebouncingFilter/>
       <appender-ref ref="rewrite"/>
     </Logger>
+    <Logger name="net.consensys.linea.ethereum.gaspricing.staticcap" level="ERROR" additivity="false">
+      <DebouncingFilter/>
+      <appender-ref ref="rewrite"/>
+    </Logger>
     <Logger name="net.consensys.zkevm.ethereum.finalization" level="INFO" additivity="false">
       <DebouncingFilter/>
       <appender-ref ref="rewrite"/>
@@ -112,6 +116,10 @@
       <DebouncingFilter/>
       <appender-ref ref="console"/>
     </Logger>
+    <!--    <Logger name="clients.TracesCounters" level="TRACE" additivity="false">-->
+    <!--      <DebouncingFilter/>-->
+    <!--      <appender-ref ref="console"/>-->
+    <!--    </Logger>-->
     <!--    <Logger name="clients.l2" level="DEBUG" additivity="false">-->
     <!--      <appender-ref ref="console"/>-->
     <!--    </Logger>-->

diff --git a/coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/app/L1DependentApp.kt b/coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/app/L1DependentApp.kt
@@ -4,6 +4,7 @@ import build.linea.clients.StateManagerClientV1
 import build.linea.clients.StateManagerV1JsonRpcClient
 import build.linea.contract.l1.LineaRollupSmartContractClientReadOnly
 import build.linea.contract.l1.Web3JLineaRollupSmartContractClientReadOnly
+import build.linea.web3j.Web3JLogsClient
 import io.vertx.core.Vertx
 import kotlinx.datetime.Clock
 import linea.encoding.BlockRLPEncoder
@@ -12,7 +13,6 @@ import net.consensys.linea.blob.ShnarfCalculatorVersion
 import net.consensys.linea.contract.LineaRollupAsyncFriendly
 import net.consensys.linea.contract.Web3JL2MessageService
 import net.consensys.linea.contract.Web3JL2MessageServiceLogsClient
-import net.consensys.linea.contract.Web3JLogsClient
 import net.consensys.linea.contract.l1.GenesisStateProvider
 import net.consensys.linea.ethereum.gaspricing.BoundableFeeCalculator
 import net.consensys.linea.ethereum.gaspricing.FeesCalculator

diff --git a/...dinator/app/src/test/kotlin/net/consensys/zkevm/coordinator/app/SwitchProviderImplTest.kt b/...dinator/app/src/test/kotlin/net/consensys/zkevm/coordinator/app/SwitchProviderImplTest.kt
@@ -2,12 +2,12 @@
 
 package net.consensys.zkevm.coordinator.app
 
+import build.linea.web3j.Web3JLogsClient
 import io.vertx.junit5.Timeout
 import io.vertx.junit5.VertxExtension
 import io.vertx.junit5.VertxTestContext
 import net.consensys.linea.contract.EIP1559GasProvider
 import net.consensys.linea.contract.L2MessageService
-import net.consensys.linea.contract.Web3JLogsClient
 import net.consensys.toULong
 import net.consensys.zkevm.ethereum.coordination.conflation.upgrade.SwitchProvider
 import net.consensys.zkevm.ethereum.signing.ECKeypairSigner

diff --git a/...r/app/src/test/kotlin/net/consensys/zkevm/coordinator/app/config/CoordinatorConfigTest.kt b/...r/app/src/test/kotlin/net/consensys/zkevm/coordinator/app/config/CoordinatorConfigTest.kt
@@ -100,31 +100,31 @@ class CoordinatorConfigTest {
           TracingModuleV2.EC_DATA to 262144u,
           TracingModuleV2.EUC to 65536u,
           TracingModuleV2.EXP to 8192u,
-          TracingModuleV2.EXT to 65536u,
+          TracingModuleV2.EXT to 1048576u,
           TracingModuleV2.GAS to 65536u,
           TracingModuleV2.HUB to 2097152u,
           TracingModuleV2.LOG_DATA to 65536u,
           TracingModuleV2.LOG_INFO to 4096u,
-          TracingModuleV2.MMIO to 2097152u,
+          TracingModuleV2.MMIO to 4194304u,
           TracingModuleV2.MMU to 4194304u,
           TracingModuleV2.MOD to 131072u,
           TracingModuleV2.MUL to 65536u,
           TracingModuleV2.MXP to 524288u,
           TracingModuleV2.OOB to 262144u,
           TracingModuleV2.RLP_ADDR to 4096u,
           TracingModuleV2.RLP_TXN to 131072u,
-          TracingModuleV2.RLP_TXN_RCPT to 32768u,
-          TracingModuleV2.ROM to 8388608u,
+          TracingModuleV2.RLP_TXN_RCPT to 65536u,
+          TracingModuleV2.ROM to 4194304u,
           TracingModuleV2.ROM_LEX to 1024u,
           TracingModuleV2.SHAKIRA_DATA to 32768u,
           TracingModuleV2.SHF to 65536u,
-          TracingModuleV2.STP to 32768u,
-          TracingModuleV2.TRM to 8192u,
+          TracingModuleV2.STP to 16384u,
+          TracingModuleV2.TRM to 32768u,
           TracingModuleV2.TXN_DATA to 8192u,
           TracingModuleV2.WCP to 262144u,
-          TracingModuleV2.BIN_REFERENCE_TABLE to 196864u,
-          TracingModuleV2.SHF_REFERENCE_TABLE to 4096u,
-          TracingModuleV2.INSTRUCTION_DECODER to 512u,
+          TracingModuleV2.BIN_REFERENCE_TABLE to 4294967295u,
+          TracingModuleV2.SHF_REFERENCE_TABLE to 4294967295u,
+          TracingModuleV2.INSTRUCTION_DECODER to 4294967295u,
           TracingModuleV2.PRECOMPILE_ECRECOVER_EFFECTIVE_CALLS to 128u,
           TracingModuleV2.PRECOMPILE_SHA2_BLOCKS to 671u,
           TracingModuleV2.PRECOMPILE_RIPEMD_BLOCKS to 671u,
@@ -359,7 +359,7 @@ class CoordinatorConfigTest {
       maxFeePerGasCap = 100000000000u,
       feeHistoryBlockCount = 4U,
       feeHistoryRewardPercentile = 15.0,
-      blocksToFinalization = 2U,
+      blocksToFinalization = 0U,
       lastHashSearchWindow = 25U,
       anchoringReceiptPollingInterval = Duration.parse("PT01S"),
       maxReceiptRetries = 120U
@@ -837,13 +837,14 @@ class CoordinatorConfigTest {
               blobCompressorVersion = BlobCompressorVersion.V1_0_1,
               expectedTracesApiVersionV2 = "v0.8.0-rc8",
               conflationV2 = tracesConfig.conflation.copy(
-                endpoints = listOf(URI("http://traces-node-v2:8545/").toURL())
+                endpoints = listOf(URI("http://traces-node-v2:8545/").toURL()),
+                requestLimitPerEndpoint = 1U
               ),
               countersV2 = TracesConfig.FunctionalityEndpoint(
                 listOf(
                   URI("http://traces-node-v2:8545/").toURL()
                 ),
-                requestLimitPerEndpoint = 2U,
+                requestLimitPerEndpoint = 1U,
                 requestRetry = RequestRetryConfigTomlFriendly(
                   backoffDelay = Duration.parse("PT1S"),
                   failuresWarningThreshold = 2

diff --git a/...kotlin/net/consensys/zkevm/coordinator/clients/prover/FileBasedExecutionProverClientV2.kt b/...kotlin/net/consensys/zkevm/coordinator/clients/prover/FileBasedExecutionProverClientV2.kt
@@ -57,7 +57,7 @@ internal class ExecutionProofRequestDataDecorator(
 
     return SafeFuture.collectAll(bridgeLogsSfList.stream())
       .thenCombine(
-        getBlockStateRootHash(request.blocks.first().number.toULong() - 1UL)
+        getBlockStateRootHash(request.blocks.first().number - 1UL)
       ) { blocksAndBridgeLogs, previousKeccakStateRootHash ->
         BatchExecutionProofRequestDto(
           zkParentStateRootHash = request.type2StateData.zkParentStateRootHash.encodeHex(),

diff --git a/coordinator/clients/smart-contract-client/build.gradle b/coordinator/clients/smart-contract-client/build.gradle
@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
   implementation project(":jvm-libs:generic:extensions:kotlin")
-  implementation project(':jvm-libs:linea:web3j-extensions')
+  api project(':jvm-libs:linea:web3j-extensions')
   api project(':jvm-libs:linea:clients:linea-l1-contract-client')
   api 'build.linea:l2-message-service-contract-client:0.0.1'
 
@@ -15,5 +15,4 @@ dependencies {
   implementation project(path: ':coordinator:core')
   implementation project(path: ':coordinator:ethereum:common')
   testImplementation "io.vertx:vertx-junit5"
-  testImplementation "com.github.tomakehurst:wiremock-jre8:${libs.versions.wiremock.get()}"
 }
diff --git a/...-contract-client/src/main/kotlin/net/consensys/linea/contract/Web3JContractAsyncHelper.kt b/...-contract-client/src/main/kotlin/net/consensys/linea/contract/Web3JContractAsyncHelper.kt
@@ -254,7 +254,7 @@ class Web3JContractAsyncHelper(
     dynamicMaxFeePerGas: ULong?,
     dynamicMaxFeePerBlobGas: ULong? = null
   ) {
-    val withBlob = maxFeePerBlobGas != null && dynamicMaxFeePerBlobGas != null
+    val withBlob = maxFeePerBlobGas != null || dynamicMaxFeePerBlobGas != null
     log.info(
       "$logMessagePrefix gas price caps: " +
         "blobCarrying=$withBlob " +
@@ -263,8 +263,8 @@ class Web3JContractAsyncHelper(
         "maxFeePerGas=${maxFeePerGas.toGWei()} GWei, " +
         "dynamicMaxFeePerGas=${dynamicMaxFeePerGas?.toGWei()} GWei, " +
         if (withBlob) {
-          "maxFeePerBlobGas=${maxFeePerBlobGas!!.toGWei()} GWei, " +
-            "dynamicMaxFeePerBlobGas=${dynamicMaxFeePerBlobGas!!.toGWei()} GWei"
+          "maxFeePerBlobGas=${maxFeePerBlobGas?.toGWei()} GWei, " +
+            "dynamicMaxFeePerBlobGas=${dynamicMaxFeePerBlobGas?.toGWei()} GWei"
         } else {
           ""
         }

diff --git a/...ct-client/src/main/kotlin/net/consensys/linea/contract/Web3JL2MessageServiceLogsClient.kt b/...ct-client/src/main/kotlin/net/consensys/linea/contract/Web3JL2MessageServiceLogsClient.kt
@@ -1,5 +1,6 @@
 package net.consensys.linea.contract
 
+import build.linea.web3j.Web3JLogsClient
 import net.consensys.toULong
 import net.consensys.zkevm.coordinator.clients.L2MessageServiceLogsClient
 import net.consensys.zkevm.domain.BridgeLogsData

diff --git a/...kotlin/net/consensys/zkevm/ethereum/finalization/BlobAndAggregationFinalizationIntTest.kt b/...kotlin/net/consensys/zkevm/ethereum/finalization/BlobAndAggregationFinalizationIntTest.kt
@@ -185,7 +185,8 @@ class BlobAndAggregationFinalizationIntTest : CleanDbTestSuiteParallel() {
     val blobsEndTime = blobs.last().endBlockTime
     val endTime = if (aggEndTime > blobsEndTime) aggEndTime else blobsEndTime
 
-    fakeClock.setTimeTo(endTime.plus(10.seconds))
+    // submission do the cutoff by minutes, so we need to add 1 minute to the end time
+    fakeClock.setTimeTo(endTime.plus(1.minutes))
 
     blobSubmissionCoordinator.start()
     aggregationFinalizationCoordinator.start()

diff --git a/...b-submitter/src/main/kotlin/net/consensys/zkevm/ethereum/submission/SwitchProviderImpl.kt b/...b-submitter/src/main/kotlin/net/consensys/zkevm/ethereum/submission/SwitchProviderImpl.kt
@@ -2,8 +2,8 @@
 
 package net.consensys.zkevm.ethereum.submission
 
+import build.linea.web3j.Web3JLogsClient
 import net.consensys.linea.contract.L2MessageService
-import net.consensys.linea.contract.Web3JLogsClient
 import net.consensys.toULong
 import net.consensys.zkevm.ethereum.coordination.conflation.upgrade.SwitchProvider
 import org.apache.logging.log4j.LogManager