Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
github-merge-queue[bot] committed Feb 19, 2025
1 parent f8fbfec commit bddfde5
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 10 deletions.
2 changes: 1 addition & 1 deletion charts/evm-rollup/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: 1.1.0
version: 1.1.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
2 changes: 1 addition & 1 deletion 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: 1.0.2
version: 1.0.4
# 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.
Expand Down
2 changes: 1 addition & 1 deletion charts/sequencer/files/cometbft/config/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ version = "0.38.8"

# TCP or UNIX socket address of the ABCI application,
# or the name of an ABCI application compiled in with the CometBFT binary
proxy_app = "tcp://127.0.0.1:{{ .Values.ports.sequencerABCI }}"
proxy_app = "{{ include "sequencer.abci_url" . }}"

# A custom human readable name for this node
moniker = "{{ .Values.moniker }}"
Expand Down
2 changes: 0 additions & 2 deletions charts/sequencer/files/scripts/init-cometbft.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,3 @@ else
echo "Updating config directory..."
cp /config/* /cometbft/config/
fi

chmod -R 0777 /cometbft
18 changes: 16 additions & 2 deletions charts/sequencer/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,23 @@ name: {{ .Values.moniker }}-sequencer-metrics
{{- end }}

{{/* New sequencer address */}}
{{- define "sequencer.address"}}{ "bech32m": "{{ . }}" }
{{- define "sequencer.address" -}}
{ "bech32m": "{{ . }}" }
{{- end }}

{{/* uint64 fee converted to a astria proto Uint128 with only lo set */}}
{{- define "sequencer.toUint128Proto"}}{ "lo": {{ . }} }
{{- define "sequencer.toUint128Proto" -}}
{ "lo": {{ . }} }
{{- end }}

{{- define "sequencer.socket_directory" -}}
/sockets/
{{- end }}

{{- define "sequencer.abci_url" -}}
{{- if and .Values.global.dev .Values.sequencer.abciUDS -}}
unix://{{- include "sequencer.socket_directory" . }}abci.sock
{{- else -}}
tcp://127.0.0.1:{{ .Values.ports.sequencerABCI }}
{{- end }}
{{- end }}
5 changes: 3 additions & 2 deletions charts/sequencer/templates/configmaps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ metadata:
name: {{ .Values.moniker }}-sequencer-env
namespace: {{ include "sequencer.namespace" . }}
data:
ASTRIA_SEQUENCER_LOG: "astria_sequencer=debug"
ASTRIA_SEQUENCER_LISTEN_ADDR: "127.0.0.1:{{ .Values.ports.sequencerABCI }}"
ASTRIA_SEQUENCER_LOG: "info"
ASTRIA_SEQUENCER_DB_FILEPATH: "/sequencer/penumbra.db"
ASTRIA_SEQUENCER_MEMPOOL_PARKED_MAX_TX_COUNT: "{{ .Values.sequencer.mempool.parked.maxTxCount }}"
# Socket address for GRPC server
Expand All @@ -74,7 +73,9 @@ data:
OTEL_EXPORTER_OTLP_TRACE_HEADERS: "{{ .Values.sequencer.otel.traceHeaders }}"
OTEL_SERVICE_NAME: "{{ tpl .Values.sequencer.otel.serviceName . }}"
{{- if not .Values.global.dev }}
ASTRIA_SEQUENCER_LISTEN_ADDR: "127.0.0.1:{{ .Values.ports.sequencerABCI }}"
{{- else }}
ASTRIA_SEQUENCER_ABCI_LISTEN_URL: "{{ include "sequencer.abci_url" . }}"
ASTRIA_SEQUENCER_NO_OPTIMISTIC_BLOCKS: "{{ not .Values.sequencer.optimisticBlockApis.enabled }}"
{{- end }}
---
9 changes: 9 additions & 0 deletions charts/sequencer/templates/statefulsets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ spec:
labels:
app: {{ .Values.moniker }}-sequencer
spec:
securityContext:
runAsUser: 1000
fsGroup: 2000
initContainers:
- command: [ "/scripts/init-cometbft.sh" ]
name: config-cometbft
Expand Down Expand Up @@ -51,6 +54,8 @@ spec:
- mountPath: /sequencer
name: sequencer-shared-storage-vol
subPath: {{ .Values.moniker }}/sequencer
- mountPath: {{ include "sequencer.socket_directory" . }}
name: socket-volume
ports:
- containerPort: {{ .Values.ports.sequencerABCI }}
name: sequencer-abci
Expand Down Expand Up @@ -84,6 +89,8 @@ spec:
- mountPath: /secrets
readOnly: true
name: sequencer-secret-keys-vol
- mountPath: {{ include "sequencer.socket_directory" . }}
name: socket-volume
ports:
- containerPort: {{ .Values.ports.cometbftP2P }}
name: cometbft-p2p
Expand All @@ -101,6 +108,8 @@ spec:
cpu: {{ .Values.resources.cometbft.limits.cpu }}
memory: {{ .Values.resources.cometbft.limits.memory }}
volumes:
- name: socket-volume
emptyDir: {}
- name: cometbft-config-volume
configMap:
name: {{ .Values.moniker }}-cometbft-config
Expand Down
3 changes: 2 additions & 1 deletion charts/sequencer/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ genesis:
# pubKey: lV57+rGs2vac7mvkGHP1oBFGHPJM3a+WoAzeFDCJDNU=

sequencer:
abciUDS: true
mempool:
parked:
maxTxCount: 200
Expand Down Expand Up @@ -324,7 +325,7 @@ storage:
local: true
entities:
sequencerSharedStorage:
size: "5Gi"
size: "50Gi"
persistentVolumeName: "sequencer-shared-storage"
path: "/data/sequencer-data"

Expand Down

0 comments on commit bddfde5

Please sign in to comment.