Merge branch 'main' of github.com:Consensys/linea-monorepo into feat/mimc-connect-codehash-2

Author: AlexandreBelling

.github/workflows/coordinator-testing.yml

@@ -26,6 +26,7 @@ jobs:
       GITHUB_TOKEN: ${{ secrets._GITHUB_TOKEN_RELEASE_ACCESS }}
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
     runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-large
     name: Coordinator tests
     steps:
@@ -76,6 +77,7 @@ jobs:
           path: |
             ${{ github.workspace }}/build/reports/jacoco/jacocoRootReport/jacocoRootReport.xml
       - name: Upload coverage to Codecov
+        if: ${{ env.CODECOV_TOKEN != '' }}
         uses: codecov/codecov-action@v5
         with:
           fail_ci_if_error: true

.github/workflows/prover-testing.yml

@@ -1,13 +1,6 @@
 name: Prover testing CI
 
-on:
-  workflow_call:
-    secrets:
-      SLACK_WEBHOOK_CI_PROVER_FAIL:
-        required: true
-      SLACK_WEBHOOK_CI_PROVER_SUCCESS:
-        required: true
-
+on: workflow_call
 env:
   GOPROXY: "https://proxy.golang.org"
 
@@ -93,50 +86,3 @@ jobs:
       if: matrix.go-version == '1.20.x'
       run: |
           go test -p=1 -tags=nocorset,fuzzlight -timeout=30m -short -race  ./...
-
-  slack-workflow-status-failed:
-    if: failure()
-    name: Prover notify slack
-    needs:
-      - staticcheck
-      - test
-    runs-on: [self-hosted, ubuntu-20.04, X64, small]
-    steps:
-      - name: Notify slack -- workflow failed
-        id: slack
-        uses: slackapi/slack-github-action@v1.23.0
-        with:
-          payload: |
-            {
-              "actor": "${{ github.actor }}",
-              "repo": "${{ github.repository }}",
-              "status": "FAIL",
-              "title": "${{ github.event.pull_request.title }}",
-              "pr": "${{ github.event.pull_request.head.ref }}"
-            }
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_CI_PROVER_FAIL }}
-
-  slack-workflow-status-success:
-    if: success()
-    name: Prover notify slack
-    needs:
-      - staticcheck
-      - test
-    runs-on: [self-hosted, ubuntu-20.04, X64, small]
-    steps:
-      - name: Notify slack -- workflow succeeded
-        id: slack
-        uses: slackapi/slack-github-action@v1.23.0
-        with:
-          payload: |
-            {
-              "actor": "${{ github.actor }}",
-              "repo": "${{ github.repository }}",
-              "status": "SUCCESS",
-              "title": "${{ github.event.pull_request.title }}",
-              "pr": "${{ github.event.pull_request.head.ref }}"
-            }
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_CI_PROVER_SUCCESS }}
-

.github/workflows/run-smc-tests.yml

@@ -31,6 +31,8 @@ jobs:
   run-contract-tests:
     runs-on: [self-hosted, ubuntu-20.04, X64, small]
     name: Run smart contracts tests
+    env:
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -69,6 +71,7 @@ jobs:
         run: pnpm -F contracts run coverage
 
       - name: Upload coverage to Codecov
+        if: ${{ env.CODECOV_TOKEN != '' }}
         uses: codecov/codecov-action@v5
         with:
           fail_ci_if_error: true

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

build.gradle

@@ -87,7 +87,7 @@ allprojects {
     systemProperty("L1_RPC_URL", "http://localhost:8445")
     systemProperty("L2_RPC_URL", "http://localhost:8545")
     systemProperty("L1_GENESIS", "docker/config/l1-node/el/genesis.json")
-    systemProperty("L2_GENESIS", "docker/config/linea-local-dev-genesis.json")
+    systemProperty("L2_GENESIS", "docker/config/linea-local-dev-genesis-PoA.json")
 
     systemProperties["junit.jupiter.execution.timeout.default"] = "5 m" // 5 minutes
     systemProperties["junit.jupiter.execution.parallel.enabled"] = true
@@ -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

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
-

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
 

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
-# this a workaround to mitigate Geth fork issues with Clique PoA
+# Number of children blocks to wait before considering they won't be reverted and elegible for conflation.
+# this is 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
@@ -153,10 +152,10 @@ proof-submission-delay="PT1S"
 
 [proof-aggregation]
 aggregation-proofs-limit=3
-aggregation-deadline="PT1M"
+aggregation-deadline="PT10S"
 aggregation-coordinator-polling-interval="PT2S"
 deadline-check-interval="PT8S"
-target-end-blocks=[]
+#target-end-blocks=[33, 90, 93]
 
 [finalization-signer]
 # Web3j/Web3signer
@@ -267,8 +266,8 @@ num-of-blocks-before-latest=4
 storage-period="PT2M"
 
 [conflation]
-blocks-limit=2
-conflation-deadline="PT6S" # =3*l2_block_time
+blocks-limit=3
+conflation-deadline="PT6S"
 conflation-deadline-check-interval="PT3S"
 conflation-deadline-last-block-confirmation-delay="PT2S" # recommended: at least 2 * blockInterval
 

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>-->