From 701d7e54883578397feac804c00d1a7a82bd9c7f Mon Sep 17 00:00:00 2001 From: "github-merge-queue[bot]" Date: Thu, 17 Oct 2024 18:10:05 +0000 Subject: [PATCH] Changes from astriaorg/astria@44b6da5d9ef5ec3d44c6dd17a8cc6de5302992e2 --- charts/composer/Chart.yaml | 4 ++-- charts/composer/templates/configmap.yaml | 5 ++--- charts/composer/values.yaml | 2 +- charts/evm-bridge-withdrawer/Chart.yaml | 4 ++-- charts/evm-bridge-withdrawer/values.yaml | 2 +- charts/evm-rollup/Chart.yaml | 4 ++-- charts/evm-rollup/files/genesis/geth-genesis.json | 1 - charts/evm-rollup/templates/configmap.yaml | 5 ++--- charts/evm-rollup/values.yaml | 4 ++-- charts/evm-stack/Chart.lock | 10 +++++----- charts/evm-stack/Chart.yaml | 10 +++++----- charts/sequencer-relayer/Chart.yaml | 4 ++-- charts/sequencer/Chart.lock | 6 +++--- charts/sequencer/Chart.yaml | 6 +++--- charts/sequencer/files/cometbft/config/genesis.json | 10 ---------- charts/sequencer/templates/configmaps.yaml | 2 +- charts/sequencer/values.yaml | 2 +- 17 files changed, 34 insertions(+), 47 deletions(-) diff --git a/charts/composer/Chart.yaml b/charts/composer/Chart.yaml index dd68073..2011b20 100644 --- a/charts/composer/Chart.yaml +++ b/charts/composer/Chart.yaml @@ -15,13 +15,13 @@ 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.1.6 +version: 1.0.0-rc.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. # It is recommended to use it with quotes. -appVersion: "0.8.3" +appVersion: "1.0.0-rc.1" maintainers: - name: wafflesvonmaple diff --git a/charts/composer/templates/configmap.yaml b/charts/composer/templates/configmap.yaml index d11e419..cb74fa5 100644 --- a/charts/composer/templates/configmap.yaml +++ b/charts/composer/templates/configmap.yaml @@ -8,6 +8,8 @@ data: ASTRIA_COMPOSER_API_LISTEN_ADDR: "0.0.0.0:{{ .Values.ports.healthApi }}" ASTRIA_COMPOSER_GRPC_ADDR: "0.0.0.0:{{ .Values.ports.grpc }}" ASTRIA_COMPOSER_SEQUENCER_CHAIN_ID: "{{ tpl .Values.config.sequencerChainId . }}" + ASTRIA_COMPOSER_SEQUENCER_ABCI_ENDPOINT: "{{ tpl .Values.config.sequencerRpc . }}" + ASTRIA_COMPOSER_SEQUENCER_GRPC_ENDPOINT: "{{ tpl .Values.config.sequencerGrpc . }}" ASTRIA_COMPOSER_ROLLUPS: "{{ include "composer.rollups" . }}" ASTRIA_COMPOSER_PRIVATE_KEY_FILE: "/var/secrets/{{ .Values.config.privateKey.secret.filename }}" ASTRIA_COMPOSER_MAX_BYTES_PER_BUNDLE: "{{ .Values.config.maxBytesPerBundle }}" @@ -29,10 +31,7 @@ data: OTEL_EXPORTER_OTLP_TRACE_HEADERS: "{{ tpl .Values.otel.traceHeaders . }}" OTEL_SERVICE_NAME: "{{ tpl .Values.otel.serviceName . }}" {{- if not .Values.global.dev }} - ASTRIA_COMPOSER_SEQUENCER_URL: "{{ tpl .Values.config.sequencerRpc . }}" {{- else }} - ASTRIA_COMPOSER_SEQUENCER_ABCI_ENDPOINT: "{{ tpl .Values.config.sequencerRpc . }}" - ASTRIA_COMPOSER_SEQUENCER_GRPC_ENDPOINT: "{{ tpl .Values.config.sequencerGrpc . }}" {{- end }} --- {{- if not .Values.secretProvider.enabled }} diff --git a/charts/composer/values.yaml b/charts/composer/values.yaml index 7dd3f3e..49eee75 100644 --- a/charts/composer/values.yaml +++ b/charts/composer/values.yaml @@ -9,7 +9,7 @@ images: composer: repo: ghcr.io/astriaorg/composer pullPolicy: IfNotPresent - tag: "0.8.3" + tag: 1.0.0-rc.1 devTag: latest config: diff --git a/charts/evm-bridge-withdrawer/Chart.yaml b/charts/evm-bridge-withdrawer/Chart.yaml index 667ef89..b7a7c79 100644 --- a/charts/evm-bridge-withdrawer/Chart.yaml +++ b/charts/evm-bridge-withdrawer/Chart.yaml @@ -15,13 +15,13 @@ 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.3.1 +version: 1.0.0-rc.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. # It is recommended to use it with quotes. -appVersion: "0.3.0" +appVersion: "1.0.0-rc.1" maintainers: - name: wafflesvonmaple diff --git a/charts/evm-bridge-withdrawer/values.yaml b/charts/evm-bridge-withdrawer/values.yaml index 62a723a..b70c7f6 100644 --- a/charts/evm-bridge-withdrawer/values.yaml +++ b/charts/evm-bridge-withdrawer/values.yaml @@ -12,7 +12,7 @@ images: evmBridgeWithdrawer: repo: ghcr.io/astriaorg/evm-bridge-withdrawer pullPolicy: IfNotPresent - tag: "0.3.0" + tag: 1.0.0-rc.1 devTag: latest config: diff --git a/charts/evm-rollup/Chart.yaml b/charts/evm-rollup/Chart.yaml index a991b2d..59d1567 100644 --- a/charts/evm-rollup/Chart.yaml +++ b/charts/evm-rollup/Chart.yaml @@ -15,13 +15,13 @@ 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.27.8 +version: 0.28.0 # 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. # It is recommended to use it with quotes. -appVersion: "0.14.3" +appVersion: "0.16.0" maintainers: - name: wafflesvonmaple diff --git a/charts/evm-rollup/files/genesis/geth-genesis.json b/charts/evm-rollup/files/genesis/geth-genesis.json index b0f1c01..6802719 100644 --- a/charts/evm-rollup/files/genesis/geth-genesis.json +++ b/charts/evm-rollup/files/genesis/geth-genesis.json @@ -40,7 +40,6 @@ "astriaEIP1559Params": {{ toPrettyJson .Values.genesis.eip1559Params | indent 8 | trim }}, "astriaSequencerAddressPrefix": "{{ .Values.genesis.sequencerAddressPrefix }}" {{- if not .Values.global.dev }} - "astriaBridgeSenderAddress": "{{ .Values.genesis.bridgeSenderAddress }}", {{- else }} {{- end }} }, diff --git a/charts/evm-rollup/templates/configmap.yaml b/charts/evm-rollup/templates/configmap.yaml index a8e38f5..5a5d52a 100644 --- a/charts/evm-rollup/templates/configmap.yaml +++ b/charts/evm-rollup/templates/configmap.yaml @@ -6,12 +6,14 @@ metadata: data: ASTRIA_CONDUCTOR_LOG: "astria_conductor={{ .Values.config.logLevel }}" 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_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 . }}" ASTRIA_CONDUCTOR_SEQUENCER_COMETBFT_URL: "{{ tpl .Values.config.conductor.sequencerRpc . }}" + ASTRIA_CONDUCTOR_EXPECTED_SEQUENCER_CHAIN_ID: "{{ tpl .Values.config.conductor.sequencerChainId . }}" ASTRIA_CONDUCTOR_SEQUENCER_BLOCK_TIME_MS: "{{ .Values.config.conductor.sequencerBlockTimeMs }}" ASTRIA_CONDUCTOR_NO_METRICS: "{{ not .Values.metrics.enabled }}" ASTRIA_CONDUCTOR_METRICS_HTTP_LISTENER_ADDR: "0.0.0.0:{{ .Values.ports.conductorMetrics }}" @@ -21,7 +23,6 @@ data: NO_COLOR: "{{ .Values.global.useTTY }}" ASTRIA_CONDUCTOR_NO_OTEL: "{{ not .Values.otel.enabled }}" ASTRIA_CONDUCTOR_NO_CELESTIA_AUTH: "{{ not .Values.config.celestia.token }}" - ASTRIA_CONDUCTOR_CELESTIA_BEARER_TOKEN: "{{ .Values.config.celestia.token }}" OTEL_EXPORTER_OTLP_ENDPOINT: "{{ tpl .Values.otel.endpoint . }}" OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: "{{ tpl .Values.otel.tracesEndpoint . }}" OTEL_EXPORTER_OTLP_TRACES_TIMEOUT: "{{ tpl .Values.otel.tracesTimeout . }}" @@ -31,8 +32,6 @@ data: OTEL_SERVICE_NAME: "{{ tpl .Values.otel.serviceNamePrefix . }}-conductor" {{- if not .Values.global.dev }} {{- else }} - ASTRIA_CONDUCTOR_EXPECTED_SEQUENCER_CHAIN_ID: "{{ tpl .Values.config.conductor.sequencerChainId . }}" - ASTRIA_CONDUCTOR_EXPECTED_CELESTIA_CHAIN_ID: "{{ tpl .Values.config.conductor.celestiaChainId . }}" {{- end }} --- apiVersion: v1 diff --git a/charts/evm-rollup/values.yaml b/charts/evm-rollup/values.yaml index 310e84a..d6c9000 100644 --- a/charts/evm-rollup/values.yaml +++ b/charts/evm-rollup/values.yaml @@ -10,13 +10,13 @@ images: geth: repo: ghcr.io/astriaorg/astria-geth pullPolicy: IfNotPresent - tag: 0.14.3 + tag: v0.16.0 devTag: latest overrideTag: "" conductor: repo: ghcr.io/astriaorg/conductor pullPolicy: IfNotPresent - tag: "0.21.0" + tag: 1.0.0-rc.1 devTag: latest diff --git a/charts/evm-stack/Chart.lock b/charts/evm-stack/Chart.lock index 2b79134..a122982 100644 --- a/charts/evm-stack/Chart.lock +++ b/charts/evm-stack/Chart.lock @@ -4,21 +4,21 @@ dependencies: version: 0.3.6 - name: evm-rollup repository: file://../evm-rollup - version: 0.27.8 + version: 0.28.0 - name: composer repository: file://../composer - version: 0.1.6 + version: 1.0.0-rc.1 - name: evm-faucet repository: file://../evm-faucet version: 0.1.2 - name: evm-bridge-withdrawer repository: file://../evm-bridge-withdrawer - version: 0.3.1 + version: 1.0.0-rc.1 - name: postgresql repository: https://charts.bitnami.com/bitnami version: 15.2.4 - name: blockscout-stack repository: https://blockscout.github.io/helm-charts version: 1.6.2 -digest: sha256:05842ed4276a5eeb84b1743b2e48d8434f21fd5192fcef27d61eb3682ae918de -generated: "2024-10-17T07:55:32.06074-07:00" +digest: sha256:8278238cbd6ebd24cfe5ace8027cbb1fe9abc58a23c25af119d8102a13d99a64 +generated: "2024-10-17T08:07:03.063773-07:00" diff --git a/charts/evm-stack/Chart.yaml b/charts/evm-stack/Chart.yaml index bce8492..e3c0b9e 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: 0.6.6 +version: 0.7.0 dependencies: - name: celestia-node @@ -23,10 +23,10 @@ dependencies: repository: "file://../celestia-node" condition: celestia-node.enabled - name: evm-rollup - version: 0.27.8 + version: 0.28.0 repository: "file://../evm-rollup" - name: composer - version: 0.1.6 + version: 1.0.0-rc.1 repository: "file://../composer" condition: composer.enabled - name: evm-faucet @@ -34,7 +34,7 @@ dependencies: repository: "file://../evm-faucet" condition: evm-faucet.enabled - name: evm-bridge-withdrawer - version: 0.3.1 + version: 1.0.0-rc.1 repository: "file://../evm-bridge-withdrawer" condition: evm-bridge-withdrawer.enabled - name: postgresql @@ -51,7 +51,7 @@ dependencies: # 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. # It is recommended to use it with quotes. -appVersion: "0.1.0" +appVersion: "1.0.0-rc.1" maintainers: - name: wafflesvonmaple diff --git a/charts/sequencer-relayer/Chart.yaml b/charts/sequencer-relayer/Chart.yaml index 9517742..9f823f3 100644 --- a/charts/sequencer-relayer/Chart.yaml +++ b/charts/sequencer-relayer/Chart.yaml @@ -15,13 +15,13 @@ 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.12.2 +version: 1.0.0-rc.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. # It is recommended to use it with quotes. -appVersion: "0.16.1" +appVersion: "1.0.0-rc.1" maintainers: - name: wafflesvonmaple diff --git a/charts/sequencer/Chart.lock b/charts/sequencer/Chart.lock index d1b2282..42a710b 100644 --- a/charts/sequencer/Chart.lock +++ b/charts/sequencer/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: sequencer-relayer repository: file://../sequencer-relayer - version: 0.12.2 -digest: sha256:3ee234bbedc042030976130a12c0fe364ff171a40d341fec820c49720fef9378 -generated: "2024-09-30T11:40:37.590749-04:00" + version: 1.0.0-rc.1 +digest: sha256:17c4c58b99028b06cfec526f851e275ecbfb07ec6b998ca0c2f8a512ca7b6840 +generated: "2024-10-16T10:10:51.035117-07:00" diff --git a/charts/sequencer/Chart.yaml b/charts/sequencer/Chart.yaml index dcd5a63..ca175a5 100644 --- a/charts/sequencer/Chart.yaml +++ b/charts/sequencer/Chart.yaml @@ -15,16 +15,16 @@ 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.25.1 +version: 1.0.0-rc.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. # It is recommended to use it with quotes. -appVersion: "0.18.0" +appVersion: "1.0.0-rc.1" dependencies: - name: sequencer-relayer - version: "0.12.2" + version: "1.0.0-rc.1" repository: "file://../sequencer-relayer" condition: sequencer-relayer.enabled diff --git a/charts/sequencer/files/cometbft/config/genesis.json b/charts/sequencer/files/cometbft/config/genesis.json index 80c8b88..0992b8b 100644 --- a/charts/sequencer/files/cometbft/config/genesis.json +++ b/charts/sequencer/files/cometbft/config/genesis.json @@ -3,15 +3,6 @@ "app_state": { "native_asset_base_denomination": "{{ .Values.genesis.nativeAssetBaseDenomination }}", "fees": { - {{- if not .Values.global.dev }} - "transfer_base_fee": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.transfer.base }}, - "sequence_base_fee": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.rollupDataSubmission.base }}, - "sequence_byte_cost_multiplier": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.rollupDataSubmission.multiplier }}, - "init_bridge_account_base_fee": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.initBridgeAccount.base }}, - "bridge_lock_byte_cost_multiplier": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.bridgeLock.multiplier }}, - "bridge_sudo_change_fee": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.bridgeSudoChange.base }}, - "ics20_withdrawal_base_fee": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.ics20Withdrawal.base }} - {{- else }} "bridge_lock": { "base": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.bridgeLock.base }}, "multiplier": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.bridgeLock.multiplier }} @@ -68,7 +59,6 @@ "base": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.validatorUpdate.base }}, "multiplier": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.validatorUpdate.multiplier }} } - {{- end }} }, "allowed_fee_assets": [ {{- range $index, $value := .Values.genesis.allowedFeeAssets }} diff --git a/charts/sequencer/templates/configmaps.yaml b/charts/sequencer/templates/configmaps.yaml index 94615a7..89f9dee 100644 --- a/charts/sequencer/templates/configmaps.yaml +++ b/charts/sequencer/templates/configmaps.yaml @@ -57,6 +57,7 @@ data: ASTRIA_SEQUENCER_LOG: "astria_sequencer=debug" ASTRIA_SEQUENCER_LISTEN_ADDR: "127.0.0.1:{{ .Values.ports.sequencerABCI }}" ASTRIA_SEQUENCER_DB_FILEPATH: "/sequencer/penumbra.db" + ASTRIA_SEQUENCER_MEMPOOL_PARKED_MAX_TX_COUNT: "{{ .Values.sequencer.mempool.parked.maxTxCount }}" # Socket address for GRPC server ASTRIA_SEQUENCER_GRPC_ADDR: "0.0.0.0:{{ .Values.ports.sequencerGrpc }}" ASTRIA_SEQUENCER_NO_METRICS: "{{ not .Values.sequencer.metrics.enabled }}" @@ -74,6 +75,5 @@ data: OTEL_SERVICE_NAME: "{{ tpl .Values.sequencer.otel.serviceName . }}" {{- if not .Values.global.dev }} {{- else }} - ASTRIA_SEQUENCER_MEMPOOL_PARKED_MAX_TX_COUNT: "{{ .Values.sequencer.mempool.parked.maxTxCount }}" {{- end }} --- diff --git a/charts/sequencer/values.yaml b/charts/sequencer/values.yaml index 9428ed4..66ef5ad 100644 --- a/charts/sequencer/values.yaml +++ b/charts/sequencer/values.yaml @@ -23,7 +23,7 @@ images: sequencer: repo: ghcr.io/astriaorg/sequencer pullPolicy: IfNotPresent - tag: "0.18.0" + tag: 1.0.0-rc.1 devTag: latest moniker: ""