From 5e0487cc436548d9f1d334c85d45cd158ce6cbf0 Mon Sep 17 00:00:00 2001 From: Jordan Oroshiba Date: Fri, 26 Apr 2024 18:52:22 -0700 Subject: [PATCH] release: chart upgrades for new releases (#1019) ## Summary Upgrades all our charts to utilize latest releases, including updates celestia-node. Additionally removes the token server from celestia-node & celestia-local which is not needed now that we submit directly to app. Some secret information has been moved from the core chart into the dev values to avoid someone actually deploying with these values in production. ## Background New releases of core services are cut, this upgrades the charts to support those. ## Changes - List changes which were made. ## Testing Local testing of setitngs with charts both in dev mode and not. CI smoke test for dev-mode. ## Breaking Changelist - Charts are upgraded, new releases that are major updates --- charts/celestia-local/Chart.yaml | 4 +- .../files/scripts/start-bridge.sh | 19 +----- .../celestia-local/templates/deployment.yaml | 16 ----- charts/celestia-local/templates/service.yaml | 3 - charts/celestia-local/values.yaml | 4 +- charts/celestia-node/Chart.yaml | 4 +- .../celestia-node/files/scripts/start-node.sh | 13 ++-- .../celestia-node/templates/statefulset.yaml | 18 ------ charts/celestia-node/values.yaml | 6 +- charts/evm-rollup/Chart.lock | 6 +- charts/evm-rollup/Chart.yaml | 5 +- charts/evm-rollup/templates/configmap.yaml | 25 ++------ charts/evm-rollup/templates/statefulsets.yaml | 10 +-- charts/evm-rollup/values.yaml | 12 ++-- charts/hermes/Chart.yaml | 2 +- charts/hermes/templates/configmaps.yaml | 2 +- charts/hermes/values.yaml | 34 ++-------- charts/sequencer-relayer/Chart.yaml | 4 +- .../templates/configmaps.yaml | 7 +- charts/sequencer-relayer/values.yaml | 9 +-- charts/sequencer/Chart.lock | 6 +- charts/sequencer/Chart.yaml | 6 +- charts/sequencer/values.yaml | 22 +++---- dev/values/hermes/local.yml | 64 ++----------------- dev/values/rollup/dev.yaml | 1 - dev/values/validators/node0.yml | 8 ++- dev/values/validators/node1.yml | 4 +- dev/values/validators/node2.yml | 4 +- dev/values/validators/single.yml | 32 +++++++++- justfile | 10 +-- 30 files changed, 113 insertions(+), 247 deletions(-) diff --git a/charts/celestia-local/Chart.yaml b/charts/celestia-local/Chart.yaml index 52b734b2fe..244995a093 100644 --- a/charts/celestia-local/Chart.yaml +++ b/charts/celestia-local/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.7 +version: 0.4.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: "1.6.0" +appVersion: "1.8.0" maintainers: - name: wafflesvonmaple diff --git a/charts/celestia-local/files/scripts/start-bridge.sh b/charts/celestia-local/files/scripts/start-bridge.sh index cac9771ee9..f6891170bc 100755 --- a/charts/celestia-local/files/scripts/start-bridge.sh +++ b/charts/celestia-local/files/scripts/start-bridge.sh @@ -2,18 +2,6 @@ set -o errexit -o nounset -o pipefail -function set_token() { - # NOTE - this is a hack to get the token to the token-server directory. - TOKEN=$(celestia bridge auth admin \ - --node.store "$home_dir/bridge" \ - --keyring.accname $validator_key_name) - - # Busybox's httpd doesn't support url rewriting, so it's not simple to server another file. - # To support an ingress rule path of `/`, we write the token to index.html, which httpd serves by default. - mkdir -p "$home_dir"/token-server - echo "$TOKEN" >"$home_dir"/token-server/index.html -} - function get_genesis() { local genesis_hash=$(curl -s -S -X GET "http://127.0.0.1:$celestia_app_host_port/block?height=1" | jq -r '.result.block_id.hash') echo "$genesis_hash" @@ -30,12 +18,6 @@ function wait_for_genesis() { echo "$genesis_hash" } -# only create token if it does not already exist -# FIXME - would it be bad to get a new token on every start? -if [ ! -f "$home_dir"/token-server/index.html ]; then - set_token -fi - echo "waiting for genesis hash from celestia..." genesis_hash=$(wait_for_genesis) echo "genesis hash received: $genesis_hash" @@ -50,6 +32,7 @@ find "$home_dir/bridge/keys" -type f -exec chmod 0600 {} \; echo "staring bridge!" exec celestia bridge start \ + --rpc.skip-auth \ --node.store "$home_dir/bridge" \ --core.ip 0.0.0.0 \ --core.rpc.port "$celestia_app_host_port" \ diff --git a/charts/celestia-local/templates/deployment.yaml b/charts/celestia-local/templates/deployment.yaml index ed26cc64c6..91b740cc4d 100644 --- a/charts/celestia-local/templates/deployment.yaml +++ b/charts/celestia-local/templates/deployment.yaml @@ -92,22 +92,6 @@ spec: limits: cpu: 2 memory: 8Gi - - name: token-server - image: {{ .Values.tokenServerImage }} - command: [ "/bin/httpd", "-v", "-f", "-p", "5353", "-h", "/home/celestia/token-server/" ] - ports: - - containerPort: {{ .Values.ports.celestiaTokenService }} - name: token-svc - volumeMounts: - - mountPath: /home/celestia - name: celestia-home-vol - readOnly: true - startupProbe: - httpGet: - path: / - port: token-svc - failureThreshold: 30 - periodSeconds: 5 volumes: - name: bridge-scripts-volume configMap: diff --git a/charts/celestia-local/templates/service.yaml b/charts/celestia-local/templates/service.yaml index 4fd1b78182..dff906974a 100644 --- a/charts/celestia-local/templates/service.yaml +++ b/charts/celestia-local/templates/service.yaml @@ -13,9 +13,6 @@ spec: - name: bridge-jsonrpc port: {{ .Values.ports.bridgeRPC }} targetPort: bridge-jsonrpc - - name: token-svc - port: {{ .Values.ports.celestiaTokenService }} - targetPort: token-svc --- apiVersion: v1 kind: Service diff --git a/charts/celestia-local/values.yaml b/charts/celestia-local/values.yaml index bcf9a72089..396e81778f 100644 --- a/charts/celestia-local/values.yaml +++ b/charts/celestia-local/values.yaml @@ -16,8 +16,7 @@ storage: path: "/data/celestia-data" celestiaAppImage: "ghcr.io/celestiaorg/celestia-app:v1.8.0" -celestiaNodeImage: "ghcr.io/celestiaorg/celestia-node:v0.12.4" -tokenServerImage: "busybox:1.35.0-musl" +celestiaNodeImage: "ghcr.io/celestiaorg/celestia-node:v0.13.4" podSecurityContext: runAsUser: 10001 @@ -43,6 +42,5 @@ validatorStake: "5000000000utia" ports: celestiaAppHostPort: 26657 celestiaAppGrpcPort: 9090 - celestiaTokenService: 5353 bridgeRPC: 26658 bridgeHTTP: 26659 diff --git a/charts/celestia-node/Chart.yaml b/charts/celestia-node/Chart.yaml index a5f3a08cda..0b5349d630 100644 --- a/charts/celestia-node/Chart.yaml +++ b/charts/celestia-node/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.2.1 +version: 0.3.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.12.4" +appVersion: "0.13.4" maintainers: - name: wafflesvonmaple diff --git a/charts/celestia-node/files/scripts/start-node.sh b/charts/celestia-node/files/scripts/start-node.sh index 6f28657beb..144463271d 100644 --- a/charts/celestia-node/files/scripts/start-node.sh +++ b/charts/celestia-node/files/scripts/start-node.sh @@ -5,16 +5,14 @@ set -o errexit -o nounset -o pipefail {{- if .Values.config.tokenAuthLevel }} function set_token() { - # NOTE - this is a hack to get the token to the token-server directory. + # NOTE - this is a hack to give access to a token generated on startup to people with ssh access TOKEN=$(/bin/celestia {{ .Values.config.type }} auth {{ .Values.config.tokenAuthLevel }} --node.store "/celestia") - # Busybox's httpd doesn't support url rewriting, so it's not simple to server another file. - # To support an ingress rule path of `/`, we write the token to index.html, which httpd serves by default. - mkdir -p /celestia/token-server - echo "$TOKEN" > /celestia/token-server/index.html + mkdir -p /celestia/token + echo "$TOKEN" > /celestia/token/token.key } -if [ ! -f /celestia/token-server/index.html ]; then +if [ ! -f /celestia/token/token.key ]; then set_token fi {{- end }} @@ -25,6 +23,9 @@ export CELESTIA_CUSTOM=$CELESTIA_CUSTOM_TO_BE exec /bin/celestia {{ .Values.config.type }} start \ --node.store /celestia \ + {{- if not .Values.config.tokenAuthLevel }} + --rpc.skipAuth \ + {{- end }} {{- if not $isCustomNetwork }} --core.ip {{ .Values.config.coreIp }} \ --core.grpc.port "{{ .Values.config.coreGrpcPort }}" \ diff --git a/charts/celestia-node/templates/statefulset.yaml b/charts/celestia-node/templates/statefulset.yaml index de13278cd7..9dc7e364f9 100644 --- a/charts/celestia-node/templates/statefulset.yaml +++ b/charts/celestia-node/templates/statefulset.yaml @@ -72,24 +72,6 @@ spec: subPath: {{ $secret.filename }} {{- end }} {{- end }} - {{- if .Values.config.tokenAuthLevel }} - - name: token-server - image: {{ .Values.images.tokenServer }} - command: [ "/bin/httpd", "-v", "-f", "-p", "{{ .Values.ports.tokenServer }}", "-h", "/celestia/token-server/" ] - ports: - - containerPort: {{ .Values.ports.tokenServer }} - name: token-svc - volumeMounts: - - mountPath: /celestia - name: {{ $label }}-vol - readOnly: true - startupProbe: - httpGet: - path: / - port: token-svc - failureThreshold: 30 - periodSeconds: 5 - {{- end }} volumes: # ------------ Startup scripts ------------- - name: {{ $label }}-scripts-vol diff --git a/charts/celestia-node/values.yaml b/charts/celestia-node/values.yaml index c28826bf20..a5752127c4 100644 --- a/charts/celestia-node/values.yaml +++ b/charts/celestia-node/values.yaml @@ -11,15 +11,13 @@ config: chainId: mocha-4 coreIp: "full.consensus.mocha-4.celestia-mocha.com" type: light + tokenAuthLevel: read # can set to nil or false to disable rpc auth coreGrpcPort: 9090 - tokenAuthLevel: 'read' customInfo: '' images: pullPolicy: IfNotPresent - node: ghcr.io/celestiaorg/celestia-node:v0.12.4 - tokenServer: "busybox:1.35.0-musl" - + node: ghcr.io/celestiaorg/celestia-node:v0.13.4 ports: celestia: diff --git a/charts/evm-rollup/Chart.lock b/charts/evm-rollup/Chart.lock index b63051ae59..eca5156bbe 100644 --- a/charts/evm-rollup/Chart.lock +++ b/charts/evm-rollup/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: celestia-node repository: file://../celestia-node - version: 0.2.1 -digest: sha256:42e3beb2b8dac70b3288ba9bea36cf87d1d51357f84197847895f5056aaafef5 -generated: "2024-03-20T15:44:26.418305-04:00" + version: 0.3.0 +digest: sha256:11880d5ac9449bd674625fe78e6af327ba9b8fadacbfe2b43d53f849c80a9860 +generated: "2024-04-26T14:51:12.590892-07:00" diff --git a/charts/evm-rollup/Chart.yaml b/charts/evm-rollup/Chart.yaml index 4f2745913c..dfb7f647a0 100644 --- a/charts/evm-rollup/Chart.yaml +++ b/charts/evm-rollup/Chart.yaml @@ -15,8 +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.13.1 +version: 0.14.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 @@ -26,7 +25,7 @@ appVersion: "0.9.1" dependencies: - name: celestia-node - version: "0.2.1" + version: "0.3.0" repository: "file://../celestia-node" condition: celestia-node.enabled diff --git a/charts/evm-rollup/templates/configmap.yaml b/charts/evm-rollup/templates/configmap.yaml index faea972bbf..53aa30bfc7 100644 --- a/charts/evm-rollup/templates/configmap.yaml +++ b/charts/evm-rollup/templates/configmap.yaml @@ -12,6 +12,7 @@ data: TOKEN_SERVER_URL: "{{ .Values.config.celestia.token }}" ASTRIA_CONDUCTOR_CELESTIA_NODE_HTTP_URL: "{{ .Values.config.celestia.rpc }}" {{- end }} + 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.rollup.executionCommitLevel }}" ASTRIA_CONDUCTOR_INITIAL_SEQUENCER_BLOCK_HEIGHT: "{{ .Values.config.sequencer.initialBlockHeight }}" @@ -23,6 +24,7 @@ data: ASTRIA_CONDUCTOR_FORCE_STDOUT: "{{ .Values.global.useTTY }}" ASTRIA_CONDUCTOR_PRETTY_PRINT: "{{ .Values.global.useTTY }}" ASTRIA_CONDUCTOR_NO_OTEL: "{{ not .Values.config.rollup.otel.enabled }}" + ASTRIA_CONDUCTOR_CELESTIA_BEARER_TOKEN: "{{ .Values.config.celestia.token }}" OTEL_EXPORTER_OTLP_ENDPOINT: "{{ .Values.config.rollup.otel.endpoint }}" OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: "{{ .Values.config.rollup.otel.tracesEndpoint }}" OTEL_EXPORTER_OTLP_TRACES_TIMEOUT: "{{ .Values.config.rollup.otel.tracesTimeout }}" @@ -30,36 +32,19 @@ data: OTEL_EXPORTER_OTLP_HEADERS: "{{ .Values.config.rollup.otel.otlpHeaders }}" OTEL_EXPORTER_OTLP_TRACE_HEADERS: "{{ .Values.config.rollup.otel.traceHeaders }}" {{- if not .Values.global.dev }} - - # This block is for removing `ASTRIA_CONDUCTOR_CELESTIA_NODE_WEBSOCKET_URL`. - # - {{- if (index .Values "celestia-node").enabled }} - ASTRIA_CONDUCTOR_CELESTIA_NODE_WEBSOCKET_URL: "{{ include "celestiaNode.service.addresses.ws" (index .Subcharts "celestia-node") }}" {{- else }} - ASTRIA_CONDUCTOR_CELESTIA_NODE_WEBSOCKET_URL: "{{ .Values.config.celestia.ws }}" - {{- end }} - - {{- else }} - ASTRIA_CONDUCTOR_CELESTIA_BLOCK_TIME_MS: "12000" {{- end }} --- apiVersion: v1 kind: ConfigMap -metadata: - name: {{ .Values.config.rollup.name }}-conductor-scripts - namespace: {{ include "rollup.namespace" . }} -data: - start-conductor.sh: | - {{- .Files.Get "files/scripts/start-conductor.sh" | nindent 4 }} ---- -apiVersion: v1 -kind: ConfigMap metadata: name: {{ .Values.config.rollup.name }}-composer-env namespace: {{ include "rollup.namespace" . }} data: ASTRIA_COMPOSER_LOG: "astria_composer={{ .Values.config.logLevel }}" ASTRIA_COMPOSER_API_LISTEN_ADDR: "0.0.0.0:0" + ASTRIA_COMPOSER_GRPC_ADDR: "0.0.0.0:{{ .Values.ports.composerGRPC }}" + ASTRIA_COMPOSER_SEQUENCER_CHAIN_ID: "{{ .Values.config.sequencer.chainId }}" ASTRIA_COMPOSER_SEQUENCER_URL: "{{ .Values.config.sequencer.rpc }}" ASTRIA_COMPOSER_ROLLUPS: "{{ .Values.config.rollup.name }}::ws://127.0.0.1:{{ .Values.ports.wsRPC }}" ASTRIA_COMPOSER_MAX_BYTES_PER_BUNDLE: "{{ .Values.config.rollup.maxBytesPerBundle }}" @@ -81,8 +66,6 @@ data: {{- end }} {{- if not .Values.global.dev }} {{- else }} - ASTRIA_COMPOSER_GRPC_ADDR: "0.0.0.0:0" - ASTRIA_COMPOSER_SEQUENCER_CHAIN_ID: "{{ .Values.config.sequencer.chainId }}" {{- end }} --- apiVersion: v1 diff --git a/charts/evm-rollup/templates/statefulsets.yaml b/charts/evm-rollup/templates/statefulsets.yaml index 536ecef4dc..609354fb67 100644 --- a/charts/evm-rollup/templates/statefulsets.yaml +++ b/charts/evm-rollup/templates/statefulsets.yaml @@ -115,13 +115,9 @@ spec: {{- toYaml .Values.resources.composer | trim | nindent 12 }} - name: conductor image: {{ include "conductor.image" . }} - command: [ "/scripts/start-conductor.sh" ] + command: [ "/usr/local/bin/astria-conductor" ] stdin: {{ .Values.global.useTTY }} tty: {{ .Values.global.useTTY }} - volumeMounts: - - mountPath: /scripts/ - name: {{ .Values.config.rollup.name }}-conductor-scripts-volume - readOnly: true envFrom: - configMapRef: name: {{ .Values.config.rollup.name }}-conductor-env @@ -137,10 +133,6 @@ spec: configMap: name: {{ .Values.config.rollup.name }}-executor-scripts defaultMode: 0500 - - name: {{ .Values.config.rollup.name }}-conductor-scripts-volume - configMap: - name: {{ .Values.config.rollup.name }}-conductor-scripts - defaultMode: 0500 - name: {{ $.Values.config.rollup.name }}-rollup-shared-storage-vol {{- if .Values.storage.enabled }} persistentVolumeClaim: diff --git a/charts/evm-rollup/values.yaml b/charts/evm-rollup/values.yaml index 1dab57433b..11f3726163 100644 --- a/charts/evm-rollup/values.yaml +++ b/charts/evm-rollup/values.yaml @@ -8,16 +8,16 @@ global: images: geth: - repo: ghcr.io/astriaorg/go-ethereum - tag: "0.9.1" + repo: ghcr.io/astriaorg/astria-geth + tag: 0.9.1 devTag: latest conductor: repo: ghcr.io/astriaorg/conductor - tag: "0.13.1" + tag: "0.14.0" devTag: latest composer: repo: ghcr.io/astriaorg/composer - tag: "0.5.0" + tag: "0.6.0" devTag: latest # Rollup faucet @@ -165,7 +165,6 @@ config: # if config.rollup.executionLevel is NOT 'SoftOnly' AND celestia-node is not enabled # the rpc, ws, and token fields must be set to access celestia network. rpc: "" - ws: "" token: "" initialBlockHeight: "2" heightVariance: "10" @@ -180,7 +179,7 @@ celestia-node: config: labelPrefix: astria type: light - tokenAuthLevel: read + tokenAuthLevel: false # Set to false to disable auth # You can deploy on top of a custom celestia network, uncomment below and # update fields with notes # network: custom @@ -326,6 +325,7 @@ ports: jsonRPC: 8545 wsRPC: 8546 executionGRPC: 50051 + composerGRPC: 50052 gossipnet: 2451 faucet: 8080 blockscout: 4000 diff --git a/charts/hermes/Chart.yaml b/charts/hermes/Chart.yaml index 0d942c69b1..c25069bfc6 100644 --- a/charts/hermes/Chart.yaml +++ b/charts/hermes/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.2.0 +version: 0.3.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 diff --git a/charts/hermes/templates/configmaps.yaml b/charts/hermes/templates/configmaps.yaml index 525e7f6ada..4fdee17151 100644 --- a/charts/hermes/templates/configmaps.yaml +++ b/charts/hermes/templates/configmaps.yaml @@ -16,7 +16,7 @@ metadata: namespace: {{ include "hermes.namespace" $ }} data: {{ $chain.key.name }}.json: | - {{- toPrettyJson $chain.key.content | nindent 4 }} + {{- toPrettyJson $chain.key.devContent | nindent 4 }} --- {{- end }} {{- end }} diff --git a/charts/hermes/values.yaml b/charts/hermes/values.yaml index 05cba6bbae..73e5bc4bec 100644 --- a/charts/hermes/values.yaml +++ b/charts/hermes/values.yaml @@ -16,7 +16,7 @@ createChannel: chainA: '' # For local test is equencer-test-chain-0 portA: '' # likely "transfer" chainB: '' # For default local test celestia-local-0 - portB: '' # likely "transfer" + portB: '' # likely "transfer" rest: enabled: false @@ -63,7 +63,7 @@ chains: # storePrefix: ibc_data # key: # name: astria-wallet - # content: + # devContent: # signing_key: [43, 216, 6, 201, 127, 14, 0, 175, 26, 31, 195, 50, 143, 167, 99, 169, 38, 151, 35, 200, 219, 143, 172, 79, 147, 175, 113, 219, 24, 109, 110, 144] # address_type: Astria # secret: @@ -87,31 +87,10 @@ chains: # accountPrefix: celestia # key: # name: celestia - # content: + # devContent: # private_key: 8241386890823ca14743e5d4d583f879a5236af29f454ed4da6fe62b8439e2ab # public_key: 03b0effa59e7eee365a888b4d2fa4c9be82a4925df255d4443151d61b11ac63714 - # address: [ - # 39, - # 166, - # 219, - # 243, - # 73, - # 131, - # 245, - # 143, - # 2, - # 206, - # 64, - # 203, - # 217, - # 165, - # 252, - # 194, - # 189, - # 5, - # 171, - # 220 - # ] + # address: [39, 166, 219, 243, 73, 131, 245, 143, 2, 206, 64, 203, 217, 165, 252, 194, 189, 5, 171, 220] # address_type: Cosmos # account: celestia1y7ndhu6fs06c7qkwgr9anf0uc27st27uwdj6vq # secret: @@ -131,8 +110,9 @@ secretProvider: provider: gcp # May need to update this template to match the secret provider # it will be passed an object of the form: - # { key: { - # name: , + # { + # key: { + # name: , # secret: { resourceName: } # } # } diff --git a/charts/sequencer-relayer/Chart.yaml b/charts/sequencer-relayer/Chart.yaml index 13b8483555..03cb9f389d 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.5.2 +version: 0.6.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.11.0" +appVersion: "0.12.0" maintainers: - name: wafflesvonmaple diff --git a/charts/sequencer-relayer/templates/configmaps.yaml b/charts/sequencer-relayer/templates/configmaps.yaml index 935d4e1239..29ecfcc2e0 100644 --- a/charts/sequencer-relayer/templates/configmaps.yaml +++ b/charts/sequencer-relayer/templates/configmaps.yaml @@ -8,9 +8,10 @@ data: ASTRIA_SEQUENCER_RELAYER_BLOCK_TIME: "1000" ASTRIA_SEQUENCER_RELAYER_VALIDATOR_KEY_FILE: /cometbft/config/priv_validator_key.json ASTRIA_SEQUENCER_RELAYER_RELAY_ONLY_VALIDATOR_KEY_BLOCKS: "false" - TOKEN_SERVER: "{{ .Values.config.relayer.tokenServer }}" 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 }}" + ASTRIA_SEQUENCER_RELAYER_CELESTIA_APP_KEY_FILE: "/celestia-key/{{ .Values.config.celestiaAppPrivateKey.secret.filename }}" ASTRIA_SEQUENCER_RELAYER_API_ADDR: "127.0.0.1:{{ .Values.ports.relayerRPC }}" ASTRIA_SEQUENCER_RELAYER_PRE_SUBMIT_PATH: "{{ include "sequencer-relayer.storage.preSubmitPath" . }}" ASTRIA_SEQUENCER_RELAYER_POST_SUBMIT_PATH: "{{ include "sequencer-relayer.storage.postSubmitPath" . }}" @@ -26,11 +27,7 @@ data: OTEL_EXPORTER_OTLP_HEADERS: "{{ .Values.config.relayer.otel.otlpHeaders }}" OTEL_EXPORTER_OTLP_TRACE_HEADERS: "{{ .Values.config.relayer.otel.traceHeaders }}" {{- if not .Values.global.dev }} - ASTRIA_SEQUENCER_RELAYER_CELESTIA_ENDPOINT: "{{ .Values.config.relayer.celestiaRpc }}" - ASTRIA_SEQUENCER_RELAYER_CELESTIA_BEARER_TOKEN: "{{ .Values.config.relayer.celestiaBearerToken }}" {{- else }} - ASTRIA_SEQUENCER_RELAYER_CELESTIA_APP_GRPC_ENDPOINT: "{{ .Values.config.relayer.celestiaAppGrpc }}" - ASTRIA_SEQUENCER_RELAYER_CELESTIA_APP_KEY_FILE: "/celestia-key/{{ .Values.config.celestiaAppPrivateKey.secret.filename }}" {{- end }} --- apiVersion: v1 diff --git a/charts/sequencer-relayer/values.yaml b/charts/sequencer-relayer/values.yaml index 5abc607ba2..a3f59ba0d9 100644 --- a/charts/sequencer-relayer/values.yaml +++ b/charts/sequencer-relayer/values.yaml @@ -13,15 +13,12 @@ global: images: sequencerRelayer: repo: ghcr.io/astriaorg/sequencer-relayer - tag: "0.11.0" + tag: "0.12.0" devTag: latest config: relayer: - celestiaBearerToken: "" - celestiaRpc: http://celestia-service.astria-dev-cluster.svc.cluster.local:26658 - celestiaAppGrpc: http://celestia-app-service.astria-dev-cluster.svc.cluster.local:9090 - tokenServer: http://celestia-service.astria-dev-cluster.svc.cluster.local:5353 + celestiaAppGrpc: "" cometbftRpc: "" sequencerGrpc: "" @@ -38,7 +35,7 @@ config: traceHeaders: celestiaAppPrivateKey: - devContent: "8241386890823ca14743e5d4d583f879a5236af29f454ed4da6fe62b8439e2ab" + devContent: "" secret: filename: "key.hex" resourceName: "projects/$PROJECT_ID/secrets/celestiaPrivateKey/versions/latest" diff --git a/charts/sequencer/Chart.lock b/charts/sequencer/Chart.lock index c4b92acf49..4e39126a06 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.5.2 -digest: sha256:7cc96c8209ea8b84ed5ee2493c02ada12a8fb514fc847ca198284264142d6c33 -generated: "2024-04-26T15:51:58.454369-07:00" + version: 0.6.0 +digest: sha256:634e5149be8b93abed2d4db930c45b8ecff7f28a2f1439d263607d5b28290237 +generated: "2024-04-26T13:35:20.77244-07:00" diff --git a/charts/sequencer/Chart.yaml b/charts/sequencer/Chart.yaml index c3022605a7..acd01666c7 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.12.2 +version: 0.13.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.1" +appVersion: "0.11.0" dependencies: - name: sequencer-relayer - version: "0.5.2" + version: "0.6.0" repository: "file://../sequencer-relayer" condition: sequencer-relayer.enabled diff --git a/charts/sequencer/values.yaml b/charts/sequencer/values.yaml index 82ac71b8b6..43d412890c 100644 --- a/charts/sequencer/values.yaml +++ b/charts/sequencer/values.yaml @@ -17,11 +17,11 @@ images: devTag: v0.38.6 sequencer: repo: ghcr.io/astriaorg/sequencer - tag: "0.10.1" + tag: "0.11.0" devTag: latest config: - moniker: "node0" + moniker: "node" sequencer: authoritySudoAddress: 1c0c490f1b5528d8173c5de46d131160e4b2c0c3 nativeAssetBaseDenomination: nria @@ -96,30 +96,30 @@ config: devContent: priv_key: type: tendermint/PrivKeyEd25519 - value: HGWRtLbV8WLGFgbYhaGyaLe++DC+DBoc7O3bri81vs2ZlpR28IFfQScoO1aNOE/ygs8LIPM9UzLzbaab4VMggQ== + value: "" # can override with a value for local testing secret: resourceName: "projects/$PROJECT_ID/secrets/privValidatorKey/versions/latest" privValidatorKey: filename: privValidatorKey.json devContent: # Ed25519 address of validator - address: 091E47761C58C474534F4D414AF104A6CAF90C22 + address: "" # can override with a value for local testing # public key for the validator address pub_key: type: tendermint/PubKeyEd25519 - value: lV57+rGs2vac7mvkGHP1oBFGHPJM3a+WoAzeFDCJDNU= + value: "" # can override with a value for local testing # private key for the validator address # This is a secret key, should use a secret manager for production deployments priv_key: type: tendermint/PrivKeyEd25519 - value: dGOTAweQV8Do9P2n+A8m5EnboDrlxgD3dg4vrYpdIRqVXnv6saza9pzua+QYc/WgEUYc8kzdr5agDN4UMIkM1Q== + value: "" # can override with a value for local testing secret: resourceName: "projects/$PROJECT_ID/secrets/privValidatorKey/versions/latest" - validators: - - name: core - power: '1' - address: 091E47761C58C474534F4D414AF104A6CAF90C22 - pubKey: lV57+rGs2vac7mvkGHP1oBFGHPJM3a+WoAzeFDCJDNU= + validators: [] + # - name: core + # power: '1' + # address: 091E47761C58C474534F4D414AF104A6CAF90C22 + # pubKey: lV57+rGs2vac7mvkGHP1oBFGHPJM3a+WoAzeFDCJDNU= sequencer-relayer: enabled: false diff --git a/dev/values/hermes/local.yml b/dev/values/hermes/local.yml index b6f508b541..c3c4d930e8 100644 --- a/dev/values/hermes/local.yml +++ b/dev/values/hermes/local.yml @@ -15,42 +15,8 @@ chains: storePrefix: ibc_data key: name: astria-wallet - content: - signing_key: - [ - 43, - 216, - 6, - 201, - 127, - 14, - 0, - 175, - 26, - 31, - 195, - 50, - 143, - 167, - 99, - 169, - 38, - 151, - 35, - 200, - 219, - 143, - 172, - 79, - 147, - 175, - 113, - 219, - 24, - 109, - 110, - 144, - ] + devContent: + signing_key: [43, 216, 6, 201, 127, 14, 0, 175, 26, 31, 195, 50, 143, 167, 99, 169, 38, 151, 35, 200, 219, 143, 172, 79, 147, 175, 113, 219, 24, 109, 110, 144] address_type: Astria secret: resourceName: projects/$PROJECT_ID/secrets/astria-ibc-relay-key/versions/latest @@ -76,32 +42,10 @@ chains: accountPrefix: celestia key: name: celestia - content: + devContent: private_key: 8241386890823ca14743e5d4d583f879a5236af29f454ed4da6fe62b8439e2ab public_key: 03b0effa59e7eee365a888b4d2fa4c9be82a4925df255d4443151d61b11ac63714 - address: - [ - 39, - 166, - 219, - 243, - 73, - 131, - 245, - 143, - 2, - 206, - 64, - 203, - 217, - 165, - 252, - 194, - 189, - 5, - 171, - 220, - ] + address: [39, 166, 219, 243, 73, 131, 245, 143, 2, 206, 64, 203, 217, 165, 252, 194, 189, 5, 171, 220] address_type: Cosmos account: celestia1y7ndhu6fs06c7qkwgr9anf0uc27st27uwdj6vq secret: diff --git a/dev/values/rollup/dev.yaml b/dev/values/rollup/dev.yaml index c11f7ca5c4..765de0d9bf 100644 --- a/dev/values/rollup/dev.yaml +++ b/dev/values/rollup/dev.yaml @@ -7,7 +7,6 @@ config: chainId: sequencer-test-chain-0 celestia: rpc: "http://celestia-service.astria-dev-cluster.svc.cluster.local:26658" - ws: "ws://celestia-service.astria-dev-cluster.svc.cluster.local:26658" token: "http://celestia-service.astria-dev-cluster.svc.cluster.local:5353" resources: diff --git a/dev/values/validators/node0.yml b/dev/values/validators/node0.yml index b92d63336b..907ce45e05 100644 --- a/dev/values/validators/node0.yml +++ b/dev/values/validators/node0.yml @@ -9,11 +9,11 @@ config: # Values for CometBFT node configuration cometBFT: secrets: - node_key: + nodeKey: devContent: priv_key: value: HGWRtLbV8WLGFgbYhaGyaLe++DC+DBoc7O3bri81vs2ZlpR28IFfQScoO1aNOE/ygs8LIPM9UzLzbaab4VMggQ== - priv_validator_key: + privValidatorKey: devContent: address: 091E47761C58C474534F4D414AF104A6CAF90C22 pub_key: @@ -57,6 +57,8 @@ sequencer-relayer: enabled: true config: relayer: - celestiaRpc: http://celestia-service.astria-dev-cluster.svc.cluster.local:26658 + celestiaAppGrpc: http://celestia-app-service.astria-dev-cluster.svc.cluster.local:9090 cometbftRpc: http://node0-sequencer-rpc-service.astria-dev-cluster.svc.cluster.local:26657 sequencerGrpc: http://node0-sequencer-grpc-service.astria-dev-cluster.svc.cluster.local:8080 + celestiaAppPrivateKey: + devContent: 8241386890823ca14743e5d4d583f879a5236af29f454ed4da6fe62b8439e2ab diff --git a/dev/values/validators/node1.yml b/dev/values/validators/node1.yml index 8a87edc7a0..9285d72106 100644 --- a/dev/values/validators/node1.yml +++ b/dev/values/validators/node1.yml @@ -8,11 +8,11 @@ config: # Values for CometBFT node configuration cometBFT: secrets: - node_key: + nodeKey: devContent: priv_key: value: YhbLhsKYUexcVOPBHUS6nNy7AOjVX0DxvIQW0mZBHwjbGbIgGlfuzuswG+uetk5zhPHYZMMCz77fa5/B/KP0lw== - priv_validator_key: + privValidatorKey: devContent: address: E82D827830B163D5179291FB27BB58E605DF2FA2 pub_key: diff --git a/dev/values/validators/node2.yml b/dev/values/validators/node2.yml index da6be542eb..ef0c706e1d 100644 --- a/dev/values/validators/node2.yml +++ b/dev/values/validators/node2.yml @@ -8,11 +8,11 @@ config: # Values for CometBFT node configuration cometBFT: secrets: - node_key: + nodeKey: devContent: priv_key: value: 1yh4XrMHn75sSW5cOhGDTVgv5BbqXlhrLduxHcE2t1osbwKQzo7xlvSK1vh5CVDvHESPYK/56uTKXM/1ifqHbw== - priv_validator_key: + privValidatorKey: devContent: address: 8C17BBDC7C350C83C550163458FC9B7A5B54A64E pub_key: diff --git a/dev/values/validators/single.yml b/dev/values/validators/single.yml index 0adeb2abd4..506ce8a560 100644 --- a/dev/values/validators/single.yml +++ b/dev/values/validators/single.yml @@ -2,13 +2,43 @@ global: namespaceOverride: astria-dev-cluster dev: true +config: + moniker: node0 + cometBFT: + validators: + - name: core + power: '1' + address: 091E47761C58C474534F4D414AF104A6CAF90C22 + pubKey: lV57+rGs2vac7mvkGHP1oBFGHPJM3a+WoAzeFDCJDNU= + secrets: + nodeKey: + filename: nodeKey.json + devContent: + priv_key: + value: HGWRtLbV8WLGFgbYhaGyaLe++DC+DBoc7O3bri81vs2ZlpR28IFfQScoO1aNOE/ygs8LIPM9UzLzbaab4VMggQ== + privValidatorKey: + filename: privValidatorKey.json + devContent: + # Ed25519 address of validator + address: 091E47761C58C474534F4D414AF104A6CAF90C22 + # public key for the validator address + pub_key: + value: lV57+rGs2vac7mvkGHP1oBFGHPJM3a+WoAzeFDCJDNU= + # private key for the validator address + # This is a secret key, should use a secret manager for production deployments + priv_key: + value: dGOTAweQV8Do9P2n+A8m5EnboDrlxgD3dg4vrYpdIRqVXnv6saza9pzua+QYc/WgEUYc8kzdr5agDN4UMIkM1Q== + sequencer-relayer: enabled: true config: relayer: - celestiaRpc: http://celestia-service.astria-dev-cluster.svc.cluster.local:26658 + celestiaAppGrpc: http://celestia-app-service.astria-dev-cluster.svc.cluster.local:9090 cometbftRpc: http://node0-sequencer-rpc-service.astria-dev-cluster.svc.cluster.local:26657 sequencerGrpc: http://node0-sequencer-grpc-service.astria-dev-cluster.svc.cluster.local:8080 + celestiaAppPrivateKey: + devContent: 8241386890823ca14743e5d4d583f879a5236af29f454ed4da6fe62b8439e2ab + storage: enabled: false diff --git a/justfile b/justfile index bd620f7008..f34b27e6ad 100644 --- a/justfile +++ b/justfile @@ -136,7 +136,7 @@ wait-for-ingress-controller: validatorName := "single" deploy-sequencer name=validatorName: - helm dependency build charts/sequencer > /dev/null + helm dependency update charts/sequencer > /dev/null helm install --debug \ {{ replace('-f dev/values/validators/#.yml' , '#', name) }} \ -n astria-validator-{{name}} --create-namespace \ @@ -164,7 +164,7 @@ defaultGenesisAllocAddress := "" defaultPrivateKey := "" defaultSequencerStartBlock := "" deploy-rollup rollupName=defaultRollupName networkId=defaultNetworkId genesisAllocAddress=defaultGenesisAllocAddress privateKey=defaultPrivateKey sequencerStartBlock=defaultSequencerStartBlock: - helm dependency build charts/evm-rollup > /dev/null + helm dependency update charts/evm-rollup > /dev/null helm install \ {{ if rollupName != '' { replace('--set config.rollup.name=# --set celestia-node.config.labelPrefix=#', '#', rollupName) } else { '' } }} \ {{ if networkId != '' { replace('--set config.rollup.networkId=#', '#', networkId) } else { '' } }} \ @@ -174,7 +174,7 @@ deploy-rollup rollupName=defaultRollupName networkId=defaultNetworkId genesisAll {{rollupName}}-chain-chart ./charts/evm-rollup --namespace astria-dev-cluster deploy-dev-rollup rollupName=defaultRollupName networkId=defaultNetworkId genesisAllocAddress=defaultGenesisAllocAddress privateKey=defaultPrivateKey sequencerStartBlock=defaultSequencerStartBlock: - helm dependency build charts/evm-rollup > /dev/null + helm dependency update charts/evm-rollup > /dev/null helm install \ {{ if rollupName != '' { replace('--set config.rollup.name=# --set celestia-node.config.labelPrefix=#', '#', rollupName) } else { '' } }} \ {{ if networkId != '' { replace('--set config.rollup.networkId=#', '#', networkId) } else { '' } }} \ @@ -219,8 +219,8 @@ deploy-smoke-test tag=defaultTag: @echo "Deploying ingress controller..." && just deploy-ingress-controller > /dev/null @just wait-for-ingress-controller > /dev/null @echo "Deploying local celestia instance..." && just deploy celestia-local > /dev/null - @helm dependency build charts/sequencer > /dev/null - @helm dependency build charts/evm-rollup > /dev/null + @helm dependency update charts/sequencer > /dev/null + @helm dependency update charts/evm-rollup > /dev/null @echo "Setting up single astria sequencer..." && helm install \ -n astria-validator-single single-sequencer-chart ./charts/sequencer \ -f dev/values/validators/single.yml \