diff --git a/charts/rollup/Chart.yaml b/charts/rollup/Chart.yaml index 64af9d4..20e3b32 100644 --- a/charts/rollup/Chart.yaml +++ b/charts/rollup/Chart.yaml @@ -16,7 +16,7 @@ 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.0 +version: 0.9.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/rollup/charts/celestia-node-0.2.0.tgz b/charts/rollup/charts/celestia-node-0.2.0.tgz index 8ac8237..7c11302 100644 Binary files a/charts/rollup/charts/celestia-node-0.2.0.tgz and b/charts/rollup/charts/celestia-node-0.2.0.tgz differ diff --git a/charts/rollup/templates/configmap.yaml b/charts/rollup/templates/configmap.yaml index 88e1900..97fa397 100644 --- a/charts/rollup/templates/configmap.yaml +++ b/charts/rollup/templates/configmap.yaml @@ -12,7 +12,6 @@ data: {{- 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_SEQUENCER_URL: "{{ .Values.config.sequencer.websocket }}" ASTRIA_CONDUCTOR_INITIAL_SEQUENCER_BLOCK_HEIGHT: "{{ .Values.config.sequencer.initialBlockHeight }}" {{- if not .Values.global.dev }} ASTRIA_CONDUCTOR_CHAIN_ID: "{{ .Values.config.rollup.name }}" @@ -20,6 +19,7 @@ data: 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 }} @@ -33,6 +33,9 @@ data: 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 }}" ASTRIA_CONDUCTOR_NO_METRICS: "{{ not .Values.config.rollup.metrics.enabled }}" ASTRIA_CONDUCTOR_METRICS_HTTP_LISTENER_ADDR: "127.0.0.1:{{ .Values.ports.conductorMetrics }}" ASTRIA_CONDUCTOR_FORCE_STDOUT: "{{ .Values.global.useTTY }}" diff --git a/charts/rollup/values.yaml b/charts/rollup/values.yaml index f4654bc..1606566 100644 --- a/charts/rollup/values.yaml +++ b/charts/rollup/values.yaml @@ -8,17 +8,17 @@ global: images: geth: - repo: "ghcr.io/astriaorg/go-ethereum" - tag: "0.5.2" - devTag: "0.6.0" + repo: ghcr.io/astriaorg/go-ethereum + tag: "0.5.2" # 0.7.0 + devTag: latest conductor: - repo: "ghcr.io/astriaorg/conductor" - tag: "0.11.1" - devTag: "latest" + repo: ghcr.io/astriaorg/conductor + tag: "0.11.1" # 0.13.0 + devTag: latest composer: - repo: "ghcr.io/astriaorg/composer" - tag: "0.3.1" - devTag: "latest" + repo: ghcr.io/astriaorg/composer + tag: "0.3.1" # 0.5.0 + devTag: latest # Rollup faucet faucet: "ghcr.io/astriaorg/ria-faucet:0.0.1" @@ -129,10 +129,14 @@ config: sequencer: # Block height to start syncing rollup from initialBlockHeight: 2 + # Fastest block time possible in MS + blockTimeMs: 2000 # Websocket connection used for websocket: "ws://node0-sequencer-rpc-service.astria-dev-cluster.svc.cluster.local:26657/websocket" # URL path for the sequencer rpc: "http://node0-sequencer-rpc-service.astria-dev-cluster.svc.cluster.local:26657" + # gRPC path for the sequencer + grpc: "http://node0-sequencer-grpc-service.astria-dev-cluster.svc.cluster.local:8080" # Private key which is used for wrapping txs for sequencer submission # Note: When secretProvider.enabled is true the secret provided by # `sequencerPrivateKey` is used instead of this value. diff --git a/charts/sequencer-relayer/Chart.yaml b/charts/sequencer-relayer/Chart.yaml index aee9e32..8de27b9 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: 0.4.0 +version: 0.4.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 693bc68..81fdc37 100644 --- a/charts/sequencer-relayer/templates/configmaps.yaml +++ b/charts/sequencer-relayer/templates/configmaps.yaml @@ -5,7 +5,6 @@ metadata: namespace: {{ include "sequencer-relayer.namespace" . }} data: ASTRIA_SEQUENCER_RELAYER_LOG: "astria_sequencer_relayer=debug" - ASTRIA_SEQUENCER_RELAYER_SEQUENCER_ENDPOINT: "{{ .Values.config.relayer.sequencerRpc }}" ASTRIA_SEQUENCER_RELAYER_CELESTIA_ENDPOINT: "{{ .Values.config.relayer.celestiaRpc }}" ASTRIA_SEQUENCER_RELAYER_BLOCK_TIME: "1000" ASTRIA_SEQUENCER_RELAYER_VALIDATOR_KEY_FILE: /cometbft/config/priv_validator_key.json @@ -14,7 +13,10 @@ data: 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 }}" ASTRIA_SEQUENCER_RELAYER_PRE_SUBMIT_PATH: "{{ include "sequencer-relayer.storage.preSubmitPath" . }}" ASTRIA_SEQUENCER_RELAYER_POST_SUBMIT_PATH: "{{ include "sequencer-relayer.storage.postSubmitPath" . }}" diff --git a/charts/sequencer-relayer/templates/statefulset.yaml b/charts/sequencer-relayer/templates/statefulset.yaml index 484dd8e..6622d3a 100644 --- a/charts/sequencer-relayer/templates/statefulset.yaml +++ b/charts/sequencer-relayer/templates/statefulset.yaml @@ -19,7 +19,6 @@ spec: spec: containers: - name: sequencer-relayer - imagePullPolicy: IfNotPresent image: {{ include "sequencer-relayer.image" . }} command: [ "/scripts/start-relayer.sh" ] stdin: {{ .Values.global.useTTY }} diff --git a/charts/sequencer-relayer/values.yaml b/charts/sequencer-relayer/values.yaml index 43d598f..e054505 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" + tag: "0.9.1" # 0.11.0 devTag: latest config: @@ -21,7 +21,8 @@ config: celestiaBearerToken: "" celestiaRpc: http://celestia-service.astria-dev-cluster.svc.cluster.local:26658 tokenServer: http://celestia-service.astria-dev-cluster.svc.cluster.local:5353 - sequencerRpc: "" + cometbftRpc: "" + sequencerGrpc: "" metrics: enabled: false diff --git a/charts/sequencer/Chart.lock b/charts/sequencer/Chart.lock index a5a6467..4a5d1c6 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.0 -digest: sha256:03184a36655bfc3c7bc556dc8ac6d78281980ceb7723bec5b06128c94b5194cf -generated: "2024-02-15T14:14:12.699205-08:00" + version: 0.4.1 +digest: sha256:3c0aa045ffcdc16f1343d9f8b3e9dc43d316c776941b11a13698fdc77b80c4f2 +generated: "2024-03-15T20:09:55.604722-07:00" diff --git a/charts/sequencer/Chart.yaml b/charts/sequencer/Chart.yaml index 498382d..d854dea 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: 0.10.0 +version: 0.10.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 @@ -25,7 +25,7 @@ appVersion: "0.9.0" dependencies: - name: sequencer-relayer - version: "0.4.0" + version: "0.4.1" repository: "file://../sequencer-relayer" condition: sequencer-relayer.enabled diff --git a/charts/sequencer/charts/sequencer-relayer-0.4.0.tgz b/charts/sequencer/charts/sequencer-relayer-0.4.0.tgz deleted file mode 100644 index a653224..0000000 Binary files a/charts/sequencer/charts/sequencer-relayer-0.4.0.tgz and /dev/null differ diff --git a/charts/sequencer/charts/sequencer-relayer-0.4.1.tgz b/charts/sequencer/charts/sequencer-relayer-0.4.1.tgz new file mode 100644 index 0000000..f1b7912 Binary files /dev/null and b/charts/sequencer/charts/sequencer-relayer-0.4.1.tgz differ diff --git a/charts/sequencer/templates/configmaps.yaml b/charts/sequencer/templates/configmaps.yaml index a899e27..6e2d665 100644 --- a/charts/sequencer/templates/configmaps.yaml +++ b/charts/sequencer/templates/configmaps.yaml @@ -41,7 +41,7 @@ data: ASTRIA_SEQUENCER_DB_FILEPATH: "/sequencer/penumbra.db" ASTRIA_SEQUENCER_ENABLE_MINT: "false" # Socket address for gRPC server - ASTRIA_SEQUENCER_GRPC_ADDR: "127.0.0.1:{{ .Values.ports.sequencerGRPC }}" + 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 }}" diff --git a/charts/sequencer/templates/statefulsets.yaml b/charts/sequencer/templates/statefulsets.yaml index 36db158..4ad7f62 100644 --- a/charts/sequencer/templates/statefulsets.yaml +++ b/charts/sequencer/templates/statefulsets.yaml @@ -32,7 +32,6 @@ spec: subPath: {{ .Values.config.moniker }}/cometbft containers: - name: sequencer - imagePullPolicy: IfNotPresent image: {{ include "sequencer.image" . }} command: [ "/usr/local/bin/astria-sequencer" ] stdin: {{ .Values.global.useTTY }} diff --git a/charts/sequencer/values.yaml b/charts/sequencer/values.yaml index d9df2e2..d6bfb85 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" + tag: "0.8.0" # 0.10.0 devTag: latest config: diff --git a/values/validators/node0.yml b/values/validators/node0.yml index 4dd7a11..8fabd75 100644 --- a/values/validators/node0.yml +++ b/values/validators/node0.yml @@ -53,4 +53,5 @@ sequencer-relayer: config: relayer: celestiaRpc: http://celestia-service.astria-dev-cluster.svc.cluster.local:26658 - sequencerRpc: http://node0-sequencer-rpc-service.astria-dev-cluster.svc.cluster.local:26657 + 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 diff --git a/values/validators/single.yml b/values/validators/single.yml index fb5d72c..2e33a69 100644 --- a/values/validators/single.yml +++ b/values/validators/single.yml @@ -7,7 +7,7 @@ sequencer-relayer: config: relayer: celestiaRpc: http://celestia-service.astria-dev-cluster.svc.cluster.local:26658 - sequencerRpc: http://node0-sequencer-rpc-service.astria-dev-cluster.svc.cluster.local:26657 - + 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 storage: enabled: false