Skip to content
This repository has been archived by the owner on Jul 29, 2024. It is now read-only.

Commit

Permalink
feat: updates to use sequencer api (#186)
Browse files Browse the repository at this point in the history
All updates for dev features with sequencer API.

New image releases to follow with primary cluster to update.
  • Loading branch information
joroshiba authored Mar 19, 2024
1 parent c8cb074 commit a4a240a
Show file tree
Hide file tree
Showing 17 changed files with 36 additions and 27 deletions.
2 changes: 1 addition & 1 deletion charts/rollup/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified charts/rollup/charts/celestia-node-0.2.0.tgz
Binary file not shown.
5 changes: 4 additions & 1 deletion charts/rollup/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ 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 }}"
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 }}
Expand All @@ -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 }}"
Expand Down
22 changes: 13 additions & 9 deletions charts/rollup/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion charts/sequencer-relayer/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion charts/sequencer-relayer/templates/configmaps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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" . }}"
Expand Down
1 change: 0 additions & 1 deletion charts/sequencer-relayer/templates/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
5 changes: 3 additions & 2 deletions charts/sequencer-relayer/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,16 @@ global:
images:
sequencerRelayer:
repo: ghcr.io/astriaorg/sequencer-relayer
tag: "0.9.1"
tag: "0.9.1" # 0.11.0
devTag: latest

config:
relayer:
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
Expand Down
6 changes: 3 additions & 3 deletions charts/sequencer/Chart.lock
Original file line number Diff line number Diff line change
@@ -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"
4 changes: 2 additions & 2 deletions charts/sequencer/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
Binary file removed charts/sequencer/charts/sequencer-relayer-0.4.0.tgz
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion charts/sequencer/templates/configmaps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
1 change: 0 additions & 1 deletion charts/sequencer/templates/statefulsets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion charts/sequencer/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion values/validators/node0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions values/validators/single.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit a4a240a

Please sign in to comment.