From c1fd3e46c7b8051a33cfd2f0efc078186b9367f2 Mon Sep 17 00:00:00 2001 From: quasystaty Date: Thu, 12 Dec 2024 19:26:28 +0200 Subject: [PATCH] fix(charts): configurable components block times variables (#1827) ## Summary Configurable block time environment variables for conductor and sequencer-relayer components ## Background Currently, `ASTRIA_CONDUCTOR_CELESTIA_BLOCK_TIME_MS` and `ASTRIA_SEQUENCER_RELAYER_BLOCK_TIME` environment variables are hard coded in the charts, the variables determines polling frequency and thus should be easily configurable. ## Changes - configurable blocktime variables for conductor and sequencer relayer components. ## Testing locally templating the chart with new default values. ## Changelogs No updates required --- charts/celestia-local/Chart.yaml | 2 +- charts/celestia-local/files/scripts/init-celestia-appd.sh | 5 ++++- charts/celestia-local/values.yaml | 2 +- charts/evm-rollup/Chart.yaml | 2 +- charts/evm-rollup/templates/configmap.yaml | 2 +- charts/evm-rollup/values.yaml | 2 ++ charts/evm-stack/Chart.lock | 6 +++--- charts/evm-stack/Chart.yaml | 5 ++--- charts/sequencer-relayer/Chart.yaml | 2 +- charts/sequencer-relayer/templates/configmaps.yaml | 2 +- charts/sequencer-relayer/values.yaml | 1 + charts/sequencer/Chart.lock | 6 +++--- charts/sequencer/Chart.yaml | 4 ++-- 13 files changed, 23 insertions(+), 18 deletions(-) diff --git a/charts/celestia-local/Chart.yaml b/charts/celestia-local/Chart.yaml index 797cb6d7da..43318780ce 100644 --- a/charts/celestia-local/Chart.yaml +++ b/charts/celestia-local/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.7.0 +version: 0.7.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/celestia-local/files/scripts/init-celestia-appd.sh b/charts/celestia-local/files/scripts/init-celestia-appd.sh index 80ac2bd74a..10b4945a93 100755 --- a/charts/celestia-local/files/scripts/init-celestia-appd.sh +++ b/charts/celestia-local/files/scripts/init-celestia-appd.sh @@ -62,6 +62,9 @@ sed -i'.bak' 's#"null"#"kv"#g' "${home_dir}"/config/config.toml sed -i'.bak' 's#discard_abci_responses = true#discard_abci_responses = false#g' "${home_dir}"/config/config.toml # Override the VotingPeriod from 1 week to 1 minute sed -i'.bak' 's#"604800s"#"60s"#g' "${home_dir}"/config/genesis.json +# Set the CommitTimeout to 5 second +sed -i'.bak' 's#timeout_commit = "11s"#timeout_commit = "5s"#g' "${home_dir}"/config/config.toml + if $fast; then - sed -i'.bak' 's#timeout_commit = "11s"#timeout_commit = "1s"#g' "${home_dir}"/config/config.toml + sed -i'.bak' 's#timeout_commit = "5s"#timeout_commit = "1s"#g' "${home_dir}"/config/config.toml fi diff --git a/charts/celestia-local/values.yaml b/charts/celestia-local/values.yaml index 48766020bc..68ef2a3dd3 100644 --- a/charts/celestia-local/values.yaml +++ b/charts/celestia-local/values.yaml @@ -16,7 +16,7 @@ storage: path: "/data/celestia-data" celestiaAppImage: "ghcr.io/celestiaorg/celestia-app:v2.3.1" -celestiaNodeImage: "ghcr.io/celestiaorg/celestia-node:v0.18.3-mocha" +celestiaNodeImage: "ghcr.io/celestiaorg/celestia-node:v0.20.4" podSecurityContext: runAsUser: 10001 diff --git a/charts/evm-rollup/Chart.yaml b/charts/evm-rollup/Chart.yaml index c55081c828..482a162569 100644 --- a/charts/evm-rollup/Chart.yaml +++ b/charts/evm-rollup/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.0 +version: 1.0.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/evm-rollup/templates/configmap.yaml b/charts/evm-rollup/templates/configmap.yaml index 5a5d52ae57..bf733912bf 100644 --- a/charts/evm-rollup/templates/configmap.yaml +++ b/charts/evm-rollup/templates/configmap.yaml @@ -8,7 +8,7 @@ data: ASTRIA_CONDUCTOR_CELESTIA_NODE_HTTP_URL: "{{ .Values.config.celestia.rpc }}" ASTRIA_CONDUCTOR_EXPECTED_CELESTIA_CHAIN_ID: "{{ tpl .Values.config.conductor.celestiaChainId . }}" ASTRIA_CONDUCTOR_CELESTIA_BEARER_TOKEN: "{{ .Values.config.celestia.token }}" - ASTRIA_CONDUCTOR_CELESTIA_BLOCK_TIME_MS: "12000" + ASTRIA_CONDUCTOR_CELESTIA_BLOCK_TIME_MS: "{{ .Values.config.conductor.celestiaBlockTimeMs }}" ASTRIA_CONDUCTOR_EXECUTION_RPC_URL: "http://127.0.0.1:{{ .Values.ports.executionGRPC }}" ASTRIA_CONDUCTOR_EXECUTION_COMMIT_LEVEL: "{{ .Values.config.conductor.executionCommitLevel }}" ASTRIA_CONDUCTOR_SEQUENCER_GRPC_URL: "{{ tpl .Values.config.conductor.sequencerGrpc . }}" diff --git a/charts/evm-rollup/values.yaml b/charts/evm-rollup/values.yaml index 1f2472c022..5437e0c07d 100644 --- a/charts/evm-rollup/values.yaml +++ b/charts/evm-rollup/values.yaml @@ -172,6 +172,8 @@ config: # The expected fastest block time possible from sequencer, determines polling # rate. sequencerBlockTimeMs: 2000 + # The expected fastest block time possible from DA, determines polling rate. + celestiaBlockTimeMs: 6000 # URL path for the sequencer sequencerRpc: "" # gRPC path for the sequencer diff --git a/charts/evm-stack/Chart.lock b/charts/evm-stack/Chart.lock index a1fab2d482..b2152edebc 100644 --- a/charts/evm-stack/Chart.lock +++ b/charts/evm-stack/Chart.lock @@ -4,7 +4,7 @@ dependencies: version: 0.4.0 - name: evm-rollup repository: file://../evm-rollup - version: 1.0.0 + version: 1.0.1 - name: composer repository: file://../composer version: 1.0.0 @@ -20,5 +20,5 @@ dependencies: - name: blockscout-stack repository: https://blockscout.github.io/helm-charts version: 1.6.8 -digest: sha256:037f984f43d4eb0616c27f8a36a359680d4d745f4687a4ca54f7d77fb5119d99 -generated: "2024-12-11T11:48:47.334728-08:00" +digest: sha256:d89234a3481aa511fb32e38b9d5799efb5848f490e67dc67e837e4eb6af670d1 +generated: "2024-12-12T18:24:37.475398+02:00" diff --git a/charts/evm-stack/Chart.yaml b/charts/evm-stack/Chart.yaml index e0df534b99..e11034ce73 100644 --- a/charts/evm-stack/Chart.yaml +++ b/charts/evm-stack/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.4 +version: 1.0.5 dependencies: - name: celestia-node @@ -23,7 +23,7 @@ dependencies: repository: "file://../celestia-node" condition: celestia-node.enabled - name: evm-rollup - version: 1.0.0 + version: 1.0.1 repository: "file://../evm-rollup" - name: composer version: 1.0.0 @@ -46,7 +46,6 @@ dependencies: version: "1.6.8" condition: blockscout-stack.enabled - # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. diff --git a/charts/sequencer-relayer/Chart.yaml b/charts/sequencer-relayer/Chart.yaml index dab7178563..77ff6e351c 100644 --- a/charts/sequencer-relayer/Chart.yaml +++ b/charts/sequencer-relayer/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.0 +version: 1.0.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/sequencer-relayer/templates/configmaps.yaml b/charts/sequencer-relayer/templates/configmaps.yaml index c59838009e..97738d36e6 100644 --- a/charts/sequencer-relayer/templates/configmaps.yaml +++ b/charts/sequencer-relayer/templates/configmaps.yaml @@ -6,7 +6,7 @@ metadata: data: ASTRIA_SEQUENCER_RELAYER_LOG: "astria_sequencer_relayer=debug" ASTRIA_SEQUENCER_RELAYER_SUBMISSION_STATE_PATH: "{{ include "sequencer-relayer.storage.submissionStatePath" . }}" - ASTRIA_SEQUENCER_RELAYER_BLOCK_TIME: "1000" + ASTRIA_SEQUENCER_RELAYER_BLOCK_TIME: "{{ .Values.config.relayer.blockTimeMs }}" ASTRIA_SEQUENCER_RELAYER_COMETBFT_ENDPOINT: "{{ .Values.config.relayer.cometbftRpc }}" ASTRIA_SEQUENCER_RELAYER_SEQUENCER_GRPC_ENDPOINT: "{{ .Values.config.relayer.sequencerGrpc }}" ASTRIA_SEQUENCER_RELAYER_CELESTIA_APP_GRPC_ENDPOINT: "{{ .Values.config.relayer.celestiaAppGrpc }}" diff --git a/charts/sequencer-relayer/values.yaml b/charts/sequencer-relayer/values.yaml index ba46a53ca2..16b9494776 100644 --- a/charts/sequencer-relayer/values.yaml +++ b/charts/sequencer-relayer/values.yaml @@ -25,6 +25,7 @@ config: cometbftRpc: "" sequencerGrpc: "" onlyIncludeRollups: "" + blockTimeMs: "1000" metrics: enabled: false diff --git a/charts/sequencer/Chart.lock b/charts/sequencer/Chart.lock index 8261e7086a..7523dc332c 100644 --- a/charts/sequencer/Chart.lock +++ b/charts/sequencer/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: sequencer-relayer repository: file://../sequencer-relayer - version: 1.0.0 -digest: sha256:6f65d48d295fde2acca7ea368fa319add42cd33eff18ddb9768eef09ea97bf57 -generated: "2024-10-27T10:01:12.181193-07:00" + version: 1.0.1 +digest: sha256:3b3ce65ff473606fcc86027653cadd212ba45ac8b39d5806d713b48f695ad235 +generated: "2024-11-20T11:24:11.85775+02:00" diff --git a/charts/sequencer/Chart.yaml b/charts/sequencer/Chart.yaml index cd718ae1dc..832ce7df76 100644 --- a/charts/sequencer/Chart.yaml +++ b/charts/sequencer/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.0 +version: 1.0.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. @@ -24,7 +24,7 @@ appVersion: "1.0.0" dependencies: - name: sequencer-relayer - version: "1.0.0" + version: "1.0.1" repository: "file://../sequencer-relayer" condition: sequencer-relayer.enabled