diff --git a/charts/rollup/Chart.yaml b/charts/rollup/Chart.yaml index 20e3b32..7c6fa72 100644 --- a/charts/rollup/Chart.yaml +++ b/charts/rollup/Chart.yaml @@ -16,13 +16,13 @@ type: application # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.9.1 +version: 0.10.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.5.2" +appVersion: "0.7.0" dependencies: - name: celestia-node diff --git a/charts/rollup/files/genesis/geth-genesis.json b/charts/rollup/files/genesis/geth-genesis.json index 9ae9c8e..faf2a58 100644 --- a/charts/rollup/files/genesis/geth-genesis.json +++ b/charts/rollup/files/genesis/geth-genesis.json @@ -19,13 +19,11 @@ {{- end }} "astriaOverrideGenesisExtraData": {{ .Values.config.rollup.genesis.overrideGenesisExtraData }}, "astriaSequencerInitialHeight": {{ .Values.config.sequencer.initialBlockHeight }}, - {{- if not .Values.global.dev }} - "astriaDataAvailabilityInitialHeight": {{ .Values.config.celestia.initialBlockHeight }}, - "astriaDataAvailabilityHeightVariance": {{ .Values.config.celestia.heightVariance }} - {{- else }} "astriaRollupName": "{{ .Values.config.rollup.name }}", "astriaCelestiaInitialHeight": {{ .Values.config.celestia.initialBlockHeight }}, "astriaCelestiaHeightVariance": {{ .Values.config.celestia.heightVariance }} + {{- if not .Values.global.dev }} + {{- else }} {{- end }} }, "difficulty": "10000000", diff --git a/charts/rollup/templates/configmap.yaml b/charts/rollup/templates/configmap.yaml index 97fa397..6a2aa74 100644 --- a/charts/rollup/templates/configmap.yaml +++ b/charts/rollup/templates/configmap.yaml @@ -7,32 +7,16 @@ data: ASTRIA_CONDUCTOR_LOG: "astria_conductor={{ .Values.config.logLevel }}" {{- if (index .Values "celestia-node").enabled }} TOKEN_SERVER_URL: "{{ include "celestiaNode.service.addresses.token" (index .Subcharts "celestia-node") }}" + ASTRIA_CONDUCTOR_CELESTIA_NODE_HTTP_URL: "{{ include "celestiaNode.service.addresses.rpc" (index .Subcharts "celestia-node") }}" + ASTRIA_CONDUCTOR_CELESTIA_NODE_WEBSOCKET_URL: "{{ include "celestiaNode.service.addresses.ws" (index .Subcharts "celestia-node") }}" {{- else }} TOKEN_SERVER_URL: "{{ .Values.config.celestia.token }}" + ASTRIA_CONDUCTOR_CELESTIA_NODE_HTTP_URL: "{{ .Values.config.celestia.rpc }}" + ASTRIA_CONDUCTOR_CELESTIA_NODE_WEBSOCKET_URL: "{{ .Values.config.celestia.ws }}" {{- end }} ASTRIA_CONDUCTOR_EXECUTION_RPC_URL: "http://127.0.0.1:{{ .Values.ports.executionGRPC }}" ASTRIA_CONDUCTOR_EXECUTION_COMMIT_LEVEL: "{{ .Values.config.rollup.executionCommitLevel }}" ASTRIA_CONDUCTOR_INITIAL_SEQUENCER_BLOCK_HEIGHT: "{{ .Values.config.sequencer.initialBlockHeight }}" - {{- if not .Values.global.dev }} - ASTRIA_CONDUCTOR_CHAIN_ID: "{{ .Values.config.rollup.name }}" - ASTRIA_CONDUCTOR_ENABLE_OPTIMISM: "{{ .Values.config.rollup.optimism.enabled }}" - ASTRIA_CONDUCTOR_ETHEREUM_L1_URL: "{{ .Values.config.rollup.optimism.ethereumL1Websocket }}" - ASTRIA_CONDUCTOR_OPTIMISM_PORTAL_CONTRACT_ADDRESS: "{{ .Values.config.rollup.optimism.portalContractAddress }}" - ASTRIA_CONDUCTOR_INITIAL_ETHEREUM_L1_BLOCK_HEIGHT: "{{ .Values.config.rollup.optimism.initialEthereumL1BlockHeight }}" - ASTRIA_CONDUCTOR_SEQUENCER_URL: "{{ .Values.config.sequencer.websocket }}" - {{- if (index .Values "celestia-node").enabled }} - ASTRIA_CONDUCTOR_CELESTIA_NODE_URL: "{{ include "celestiaNode.service.addresses.rpc" (index .Subcharts "celestia-node") }}" - {{- else }} - ASTRIA_CONDUCTOR_CELESTIA_NODE_URL: "{{ .Values.config.celestia.rpc }}" - {{- end }} - {{- else }} - {{- if (index .Values "celestia-node").enabled }} - ASTRIA_CONDUCTOR_CELESTIA_NODE_HTTP_URL: "{{ include "celestiaNode.service.addresses.rpc" (index .Subcharts "celestia-node") }}" - ASTRIA_CONDUCTOR_CELESTIA_NODE_WEBSOCKET_URL: "{{ include "celestiaNode.service.addresses.ws" (index .Subcharts "celestia-node") }}" - {{- else }} - ASTRIA_CONDUCTOR_CELESTIA_NODE_HTTP_URL: "{{ .Values.config.celestia.rpc }}" - ASTRIA_CONDUCTOR_CELESTIA_NODE_WEBSOCKET_URL: "{{ .Values.config.celestia.ws }}" - {{- end }} ASTRIA_CONDUCTOR_SEQUENCER_GRPC_URL: "{{ .Values.config.sequencer.grpc }}" ASTRIA_CONDUCTOR_SEQUENCER_COMETBFT_URL: "{{ .Values.config.sequencer.rpc }}" ASTRIA_CONDUCTOR_SEQUENCER_BLOCK_TIME_MS: "{{ .Values.config.sequencer.blockTimeMs }}" @@ -47,6 +31,8 @@ data: OTEL_EXPORTER_OTLP_TRACES_COMPRESSION: "{{ .Values.config.rollup.otel.tracesCompression }}" OTEL_EXPORTER_OTLP_HEADERS: "{{ .Values.config.rollup.otel.otlpHeaders }}" OTEL_EXPORTER_OTLP_TRACE_HEADERS: "{{ .Values.config.rollup.otel.traceHeaders }}" + {{- if not .Values.global.dev }} + {{- else }} {{- end }} --- apiVersion: v1 @@ -68,11 +54,6 @@ data: ASTRIA_COMPOSER_API_LISTEN_ADDR: "0.0.0.0:0" ASTRIA_COMPOSER_SEQUENCER_URL: "{{ .Values.config.sequencer.rpc }}" ASTRIA_COMPOSER_ROLLUPS: "{{ .Values.config.rollup.name }}::ws://127.0.0.1:{{ .Values.ports.wsRPC }}" - {{- if not .Values.secretProvider.enabled }} - ASTRIA_COMPOSER_PRIVATE_KEY: "{{ .Values.config.sequencer.privateKey }}" - {{- end }} - {{- if not .Values.global.dev }} - {{- else }} ASTRIA_COMPOSER_MAX_BYTES_PER_BUNDLE: "{{ .Values.config.rollup.maxBytesPerBundle }}" ASTRIA_COMPOSER_MAX_SUBMIT_INTERVAL_MS: "{{ .Values.config.rollup.maxSubmitInterval }}" ASTRIA_COMPOSER_NO_METRICS: "{{ not .Values.config.rollup.metrics.enabled }}" @@ -86,6 +67,11 @@ data: OTEL_EXPORTER_OTLP_TRACES_COMPRESSION: "{{ .Values.config.rollup.otel.tracesCompression }}" OTEL_EXPORTER_OTLP_HEADERS: "{{ .Values.config.rollup.otel.otlpHeaders }}" OTEL_EXPORTER_OTLP_TRACE_HEADERS: "{{ .Values.config.rollup.otel.traceHeaders }}" + {{- if not .Values.secretProvider.enabled }} + ASTRIA_COMPOSER_PRIVATE_KEY: "{{ .Values.config.sequencer.privateKey }}" + {{- end }} + {{- if not .Values.global.dev }} + {{- else }} {{- end }} --- apiVersion: v1 diff --git a/charts/rollup/values.yaml b/charts/rollup/values.yaml index 1606566..7a40c1e 100644 --- a/charts/rollup/values.yaml +++ b/charts/rollup/values.yaml @@ -9,15 +9,15 @@ global: images: geth: repo: ghcr.io/astriaorg/go-ethereum - tag: "0.5.2" # 0.7.0 + tag: "0.7.0" devTag: latest conductor: repo: ghcr.io/astriaorg/conductor - tag: "0.11.1" # 0.13.0 + tag: "0.13.0" devTag: latest composer: repo: ghcr.io/astriaorg/composer - tag: "0.3.1" # 0.5.0 + tag: "0.5.0" devTag: latest # Rollup faucet diff --git a/charts/sequencer-relayer/Chart.yaml b/charts/sequencer-relayer/Chart.yaml index 8de27b9..9c5069d 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.4.1 +version: 0.5.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.10.0" +appVersion: "0.11.0" maintainers: - name: wafflesvonmaple diff --git a/charts/sequencer-relayer/templates/configmaps.yaml b/charts/sequencer-relayer/templates/configmaps.yaml index 81fdc37..cc6b901 100644 --- a/charts/sequencer-relayer/templates/configmaps.yaml +++ b/charts/sequencer-relayer/templates/configmaps.yaml @@ -11,10 +11,6 @@ data: ASTRIA_SEQUENCER_RELAYER_RELAY_ONLY_VALIDATOR_KEY_BLOCKS: "false" ASTRIA_SEQUENCER_RELAYER_CELESTIA_BEARER_TOKEN: "{{ .Values.config.relayer.celestiaBearerToken }}" TOKEN_SERVER: "{{ .Values.config.relayer.tokenServer }}" - {{- if not .Values.global.dev }} - ASTRIA_SEQUENCER_RELAYER_RPC_PORT: "{{ .Values.ports.relayerRPC }}" - ASTRIA_SEQUENCER_RELAYER_SEQUENCER_ENDPOINT: "{{ .Values.config.relayer.cometbftRpc }}" - {{- else }} ASTRIA_SEQUENCER_RELAYER_COMETBFT_ENDPOINT: "{{ .Values.config.relayer.cometbftRpc }}" ASTRIA_SEQUENCER_RELAYER_SEQUENCER_GRPC_ENDPOINT: "{{ .Values.config.relayer.sequencerGrpc }}" ASTRIA_SEQUENCER_RELAYER_API_ADDR: "127.0.0.1:{{ .Values.ports.relayerRPC }}" @@ -31,6 +27,8 @@ data: OTEL_EXPORTER_OTLP_TRACES_COMPRESSION: "{{ .Values.config.relayer.otel.tracesCompression }}" OTEL_EXPORTER_OTLP_HEADERS: "{{ .Values.config.relayer.otel.otlpHeaders }}" OTEL_EXPORTER_OTLP_TRACE_HEADERS: "{{ .Values.config.relayer.otel.traceHeaders }}" + {{- if not .Values.global.dev }} + {{- else }} {{- end }} --- apiVersion: v1 diff --git a/charts/sequencer-relayer/values.yaml b/charts/sequencer-relayer/values.yaml index e054505..5809f91 100644 --- a/charts/sequencer-relayer/values.yaml +++ b/charts/sequencer-relayer/values.yaml @@ -13,7 +13,7 @@ global: images: sequencerRelayer: repo: ghcr.io/astriaorg/sequencer-relayer - tag: "0.9.1" # 0.11.0 + tag: "0.11.0" devTag: latest config: diff --git a/charts/sequencer/Chart.lock b/charts/sequencer/Chart.lock index 4a5d1c6..39aa407 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.4.1 -digest: sha256:3c0aa045ffcdc16f1343d9f8b3e9dc43d316c776941b11a13698fdc77b80c4f2 -generated: "2024-03-15T20:09:55.604722-07:00" + version: 0.5.0 +digest: sha256:87682039537a0eb948d855e6ad8afb5fc15a9c55799023fa0fe85dfe1e3d9456 +generated: "2024-03-19T15:53:53.609181-04:00" diff --git a/charts/sequencer/Chart.yaml b/charts/sequencer/Chart.yaml index d854dea..8963ffc 100644 --- a/charts/sequencer/Chart.yaml +++ b/charts/sequencer/Chart.yaml @@ -15,17 +15,17 @@ 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.10.1 +version: 0.11.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.9.0" +appVersion: "0.10.0" dependencies: - name: sequencer-relayer - version: "0.4.1" + version: "0.5.0" repository: "file://../sequencer-relayer" condition: sequencer-relayer.enabled diff --git a/charts/sequencer/charts/sequencer-relayer-0.4.1.tgz b/charts/sequencer/charts/sequencer-relayer-0.4.1.tgz deleted file mode 100644 index f1b7912..0000000 Binary files a/charts/sequencer/charts/sequencer-relayer-0.4.1.tgz and /dev/null differ diff --git a/charts/sequencer/charts/sequencer-relayer-0.5.0.tgz b/charts/sequencer/charts/sequencer-relayer-0.5.0.tgz new file mode 100644 index 0000000..d0b4182 Binary files /dev/null and b/charts/sequencer/charts/sequencer-relayer-0.5.0.tgz differ diff --git a/charts/sequencer/files/cometbft/config/genesis.json b/charts/sequencer/files/cometbft/config/genesis.json index 03b1adf..e2c17e7 100644 --- a/charts/sequencer/files/cometbft/config/genesis.json +++ b/charts/sequencer/files/cometbft/config/genesis.json @@ -10,10 +10,6 @@ } {{- end }} ], - {{- if not .Values.global.dev }} - "authority_sudo_key": "{{ .Values.config.sequencer.authoritySudoAddress }}", - "native_asset_base_denomination": "nria" - {{- else }} "authority_sudo_address": "{{ .Values.config.sequencer.authoritySudoAddress }}", "native_asset_base_denomination": "{{ .Values.config.sequencer.nativeAssetBaseDenomination }}", "allowed_fee_assets": [ @@ -34,6 +30,8 @@ "inbound_ics20_transfers_enabled": {{ .Values.config.sequencer.ibc.inboundEnabled }}, "outbound_ics20_transfers_enabled": {{ .Values.config.sequencer.ibc.outboundEnabled }} } + {{- if not .Values.global.dev }} + {{- else }} {{- end}} }, "chain_id": "{{ .Values.config.cometBFT.chainId }}", diff --git a/charts/sequencer/templates/configmaps.yaml b/charts/sequencer/templates/configmaps.yaml index 6e2d665..cecbd4f 100644 --- a/charts/sequencer/templates/configmaps.yaml +++ b/charts/sequencer/templates/configmaps.yaml @@ -42,8 +42,6 @@ data: ASTRIA_SEQUENCER_ENABLE_MINT: "false" # Socket address for gRPC server ASTRIA_SEQUENCER_GRPC_ADDR: "0.0.0.0:{{ .Values.ports.sequencerGRPC }}" - {{- if not .Values.global.dev }} - {{- else }} ASTRIA_SEQUENCER_NO_METRICS: "{{ not .Values.config.sequencer.metrics.enabled }}" ASTRIA_SEQUENCER_METRICS_HTTP_LISTENER_ADDR: "127.0.0.1:{{ .Values.ports.sequencerMetrics }}" ASTRIA_SEQUENCER_FORCE_STDOUT: "{{ .Values.global.useTTY }}" @@ -55,5 +53,7 @@ data: OTEL_EXPORTER_OTLP_TRACES_COMPRESSION: "{{ .Values.config.sequencer.otel.tracesCompression }}" OTEL_EXPORTER_OTLP_HEADERS: "{{ .Values.config.sequencer.otel.otlpHeaders }}" OTEL_EXPORTER_OTLP_TRACE_HEADERS: "{{ .Values.config.sequencer.otel.traceHeaders }}" + {{- if not .Values.global.dev }} + {{- else }} {{- end }} --- diff --git a/charts/sequencer/values.yaml b/charts/sequencer/values.yaml index d6bfb85..feba2ce 100644 --- a/charts/sequencer/values.yaml +++ b/charts/sequencer/values.yaml @@ -17,7 +17,7 @@ images: devTag: v0.37.x sequencer: repo: ghcr.io/astriaorg/sequencer - tag: "0.8.0" # 0.10.0 + tag: "0.10.0" devTag: latest config: