vacp2p/linea-monorepo
1
0
Fork 0
mirror of https://github.com/vacp2p/linea-monorepo.git synced 2026-01-08 03:43:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Besu packgae update sequencer version (#1026)

Browse Source 
* besu-package: update sequencer version

* besu-package: update sequencer version

* besu-package: update sequencer version

* besu-package: sequencer plugin update to v2.1-rc16.2.3

* besu-package: update besu package

* localstack: update coordinator version

* localstack: remove unnecessary

* localstack: revert l2 node configs on profitability check

* localstack: update e2e README

* besu-package: update sequencer plugin

* Revert "localstack: revert l2 node configs on profitability check"

This reverts commit 24ac5f6b746b85c4f27c02aaa63d992549aa44ac.

* besu-package: update plugins

* besu-package: update besu image

* fix flaky test

* besu-package: remove besu/plugins from classpath

* expected-traces-api-version-v2="beta-v2.1-rc16.2"

* update shomei plugin

* update besu-package image

* besu-package add back plugins folder to classpath

* localstack: update besu package
This commit is contained in:
Fluent Crafter
2025-05-21 14:39:50 +01:00
committed by GitHub
parent 7d4765cc4f
commit f6cb0f2a05
7 changed files with 52 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/coordinator/coordinator-docker.config.toml
View File

@@ -58,7 +58,7 @@ fs-responses-directory = "/data/prover/v2/aggregation/responses"
[traces]
blob-compressor-version="V1_2"
raw-execution-traces-version="0.2.0"
expected-traces-api-version-v2="beta-v2.1-rc16"
expected-traces-api-version-v2="beta-v2.1-rc16.2"
[traces.counters-v2]
endpoints=["http://traces-node:8545/"]
request-limit-per-endpoint=1

2
docker/compose-spec-l1-services.yml
View File

@@ -2,7 +2,7 @@ services:
l1-el-node:
container_name: l1-el-node
hostname: l1-el-node
image: consensys/linea-besu-package:${BESU_PACKAGE_TAG:-beta-v2.1-rc16-20250519095346-8289dbe}
image: consensys/linea-besu-package:${BESU_PACKAGE_TAG:-beta-v2.1-rc16.2-20250521124830-4d89458}
profiles: [ "l1", "debug", "external-to-monorepo" ]
depends_on:
l1-node-genesis-generator:

15
docker/compose-spec-l2-services.yml
View File

@@ -5,7 +5,7 @@ services:
sequencer:
hostname: sequencer
container_name: sequencer
image: consensys/linea-besu-package:${BESU_PACKAGE_TAG:-beta-v2.1-rc16-20250519095346-8289dbe}
image: consensys/linea-besu-package:${BESU_PACKAGE_TAG:-beta-v2.1-rc16.2-20250521124830-4d89458}
profiles: [ "l2", "l2-bc", "debug", "external-to-monorepo" ]
ports:
- "8545:8545"
@@ -79,7 +79,7 @@ services:
l2-node-besu:
hostname: l2-node-besu
container_name: l2-node-besu
image: consensys/linea-besu-package:${BESU_PACKAGE_TAG:-beta-v2.1-rc16-20250519095346-8289dbe}
image: consensys/linea-besu-package:${BESU_PACKAGE_TAG:-beta-v2.1-rc16.2-20250521124830-4d89458}
profiles: [ "l2", "l2-bc", "debug", "external-to-monorepo" ]
depends_on:
sequencer:
@@ -123,7 +123,7 @@ services:
traces-node:
hostname: traces-node
container_name: traces-node
image: consensys/linea-besu-package:${BESU_PACKAGE_TAG:-beta-v2.1-rc16-20250519095346-8289dbe}
image: consensys/linea-besu-package:${BESU_PACKAGE_TAG:-beta-v2.1-rc16.2-20250521124830-4d89458}
profiles: [ "l2", "l2-bc", "debug", "external-to-monorepo" ]
depends_on:
sequencer:
@@ -202,7 +202,7 @@ services:
coordinator:
hostname: coordinator
container_name: coordinator
image: consensys/linea-coordinator:${COORDINATOR_TAG:-8a0bcc8}
image: consensys/linea-coordinator:${COORDINATOR_TAG:-c3eb71d}
platform: linux/amd64
profiles: [ "l2", "debug" ]
depends_on:
@@ -286,7 +286,7 @@ services:
- l1network
zkbesu-shomei:
image: consensys/linea-besu-package:${BESU_PACKAGE_TAG:-beta-v2.1-rc16-20250519095346-8289dbe}
image: consensys/linea-besu-package:${BESU_PACKAGE_TAG:-beta-v2.1-rc16.2-20250521124830-4d89458}
hostname: zkbesu-shomei
container_name: zkbesu-shomei
profiles: [ "l2", "l2-bc", "external-to-monorepo" ]
@@ -502,7 +502,7 @@ services:
ipv4_address: 10.10.10.205
zkbesu-shomei-sr:
image: consensys/linea-besu-package:${BESU_PACKAGE_TAG:-beta-v2.1-rc16-20250519095346-8289dbe}
image: consensys/linea-besu-package:${BESU_PACKAGE_TAG:-beta-v2.1-rc16.2-20250521124830-4d89458}
hostname: zkbesu-shomei-sr
container_name: zkbesu-shomei-sr
profiles: [ "external-to-monorepo", "staterecovery" ]
@@ -535,6 +535,7 @@ services:
(rm /opt/besu/plugins/linea-staterecovery-besu-plugin-v* || true) && \
(rm /opt/besu/plugins/linea-finalized-tag-updater* || true) && \
ls -lh /opt/besu/plugins && \
sed -i '/^CLASSPATH/c\CLASSPATH=/opt/besu/lib/\*\:/opt/besu/plugins/\*' /opt/besu/bin/besu-untuned && \
/opt/besu/bin/besu-untuned \
--config-file=/var/lib/besu/zkbesu-config.toml \
--genesis-file=/var/lib/besu/genesis.json \
@@ -544,7 +545,7 @@ services:
--plugin-shomei-http-host="11.11.11.117" \
--plugin-shomei-http-port=8888 \
--plugin-staterecovery-l1-endpoint=http://l1-el-node:8545 \
--plugin-staterecovery-l1-polling-interval=PT1S \
--plugin-staterecovery-l1-polling-interval=PT0.5S \
--plugin-staterecovery-l1-earliest-search-block=EARLIEST \
--plugin-staterecovery-l1-highest-search-block=LATEST \
--plugin-staterecovery-shomei-endpoint=http://shomei-sr:8888 \

6
docker/config/l2-node-besu/l2-node-besu-config.toml
View File

@@ -41,10 +41,10 @@ plugin-linea-module-limit-file-path="/var/lib/besu/traces-limits.toml"
plugin-linea-deny-list-path="/var/lib/besu/deny-list.txt"
plugin-linea-l1l2-bridge-contract="0xe537D669CA013d86EBeF1D64e40fC74CADC91987"
plugin-linea-l1l2-bridge-topic="e856c2b8bd4eb0027ce32eeaf595c21b0b6b4644b326e5b7bd80a1cf8db72e6c"
plugin-linea-tx-pool-profitability-check-p2p-enabled=false
plugin-linea-tx-pool-profitability-check-api-enabled=false
plugin-linea-tx-pool-profitability-check-p2p-enabled=true
plugin-linea-tx-pool-profitability-check-api-enabled=true
plugin-linea-tx-pool-simulation-check-api-enabled=true
plugin-linea-tx-pool-simulation-check-p2p-enabled=false
plugin-linea-tx-pool-simulation-check-p2p-enabled=true
plugin-linea-extra-data-pricing-enabled=true
plugin-linea-tx-pool-min-margin="0.8"
plugin-linea-min-margin="1.0"

24
e2e/README.md
View File

@@ -2,15 +2,17 @@
## Setup
Run `pnpm install` to setup typechain
Run `make fresh-start-all` from root directory to spin up local environment
Run `make start-env-with-tracing-v2-ci` from root directory to spin up local environment
## Run tests
| ENV | Command | Description |
|----|---|---|
| Local | `pnpm run test:e2e:local` | Uses already running docker environment and deployed smart contracts |
| DEV | `pnpm run test:e2e:dev` | Uses DEV env, may need to update constants in `constants.dev.ts` |
| UAT | `pnpm run test:e2e:uat` | Uses UAT env, may need to update constants in `constants.uat.ts` |
| ENV | Command | Description |
|-------|-----------------------------------------------|----------------------------------------------------------------------|
| Local | `pnpm run test:e2e:local` | Uses already running docker environment and deployed smart contracts |
| Local | `pnpm run test:e2e:local -t "test suite"` | Runs a test suite |
| Local | `pnpm run test:e2e:local -t "specific test"` | Runs a single test |
| DEV | `pnpm run test:e2e:dev` | Uses DEV env, may need to update constants in `constants.dev.ts` |
| UAT | `pnpm run test:e2e:uat` | Uses UAT env, may need to update constants in `constants.uat.ts` |
## Remote workflows
Workflow options:
@@ -22,15 +24,15 @@ the steps output, can be used to debug containers.
- `e2e-tests-logs-dump` - Enable to print logs after e2e tests have ran
## Debugging test in vscode
Install the `vscode-jest` plugin and open `linea-monorepo/e2e/` directory. Use the following config in `linea-monorepo/e2e/.vscode/settings.json`
## Debugging test in vscode
Install the `vscode-jest` plugin and open `linea-monorepo/e2e/` directory. Use the following config in `linea-monorepo/e2e/.vscode/settings.json`
```
{
"jest.autoRun": { "watch": false },
"jest.jestCommandLine": "pnpm run test:e2e:vscode --",
}
```
and the following config in `linea-monorepo/e2e/.vscode/launch.json`
and the following config in `linea-monorepo/e2e/.vscode/launch.json`
```
{
"configurations": [
@@ -58,8 +60,8 @@ and the following config in `linea-monorepo/e2e/.vscode/launch.json`
"program": "${workspaceFolder}/node_modules/jest/bin/jest"
}
}
]
}
```
Now you should be able to run and debug individual tests from the `Testing` explorer tab.
Now you should be able to run and debug individual tests from the `Testing` explorer tab.

28
jvm-libs/generic/json-rpc/src/test/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcV2ClientImplTest.kt
View File

@@ -87,8 +87,26 @@ class JsonRpcV2ClientImplTest {
wiremock = WireMockServer(WireMockConfiguration.options().dynamicPort())
wiremock.start()
val uris = listOf(URI(wiremock.baseUrl() + path))
return createClient(
uris = uris,
responseObjectMapper = responseObjectMapper,
requestObjectMapper = requestObjectMapper,
retryConfig = retryConfig,
shallRetryRequestsClientBasePredicate = shallRetryRequestsClientBasePredicate
)
}
private fun createClient(
uris: List<URI>,
responseObjectMapper: ObjectMapper = defaultObjectMapper,
requestObjectMapper: ObjectMapper = defaultObjectMapper,
retryConfig: RequestRetryConfig = defaultRetryConfig,
shallRetryRequestsClientBasePredicate: Predicate<Result<Any?, Throwable>> = Predicate { false }
): JsonRpcV2Client {
return factory.createJsonRpcV2Client(
endpoints = listOf(URI(wiremock.baseUrl() + path)),
endpoints = uris,
retryConfig = retryConfig,
requestObjectMapper = requestObjectMapper,
responseObjectMapper = responseObjectMapper,
@@ -539,12 +557,10 @@ class JsonRpcV2ClientImplTest {
@Test
fun `when it has connection error propagates to shallRetryRequestPredicate and retries until retry config elapses`() {
createClientAndSetupWireMockServer(
createClient(
uris = listOf(URI.create("http://127.0.0.1:19472")),
retryConfig = retryConfig(maxRetries = 2u, timeout = 8.seconds, backoffDelay = 5.milliseconds)
).also { client ->
// stop the server to simulate connection error
wiremock.stop()
val retryPredicateCalls = mutableListOf<Result<String?, Throwable>>()
val reqFuture = client.makeRequest(
@@ -560,7 +576,7 @@ class JsonRpcV2ClientImplTest {
assertThatThrownBy { reqFuture.get() }
.isInstanceOfSatisfying(ExecutionException::class.java) {
assertThat(it.cause).isInstanceOfSatisfying(ConnectException::class.java) {
assertThat(it.message).contains("Connection refused: localhost/127.0.0.1:")
assertThat(it.message).contains("Connection refused: /127.0.0.1:19472")
}
}
assertThat(retryPredicateCalls).hasSizeBetween(1, 3)

8
linea-besu-package/versions.env
View File

@@ -1,9 +1,9 @@
LINEA_BESU_TAR_GZ=25.4.1-linea1
LINEA_SEQUENCER_PLUGIN_VERSION=2.1-rc16.1.2
LINEA_TRACER_PLUGIN_VERSION=beta-v2.1-rc16
LINEA_BESU_TAR_GZ=25.5.0-linea2
LINEA_SEQUENCER_PLUGIN_VERSION=2.1-rc16.2.4
LINEA_TRACER_PLUGIN_VERSION=beta-v2.1-rc16.2
LINEA_FINALIZED_TAG_UPDATER_PLUGIN_VERSION=0.2.2
LINEA_STATERECOVERY_PLUGIN_VERSION=1.0.3
SHOMEI_PLUGIN_VERSION=0.5.0
SHOMEI_PLUGIN_VERSION=0.7.0-SNAPSHOT
LINEA_BESU_BASE_URL=https://github.com/Consensys/linea-besu-upstream/releases/download/
LINEA_BESU_FILENAME_PREFIX=besu