diff --git a/charts/evm-rollup/Chart.yaml b/charts/evm-rollup/Chart.yaml index fd614d5..4423fe6 100644 --- a/charts/evm-rollup/Chart.yaml +++ b/charts/evm-rollup/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: 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 diff --git a/charts/sequencer/Chart.yaml b/charts/sequencer/Chart.yaml index 5107f39..1bac505 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: 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. diff --git a/charts/sequencer/files/cometbft/config/config.toml b/charts/sequencer/files/cometbft/config/config.toml index b6d8ae6..586227f 100644 --- a/charts/sequencer/files/cometbft/config/config.toml +++ b/charts/sequencer/files/cometbft/config/config.toml @@ -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 }}" diff --git a/charts/sequencer/files/scripts/init-cometbft.sh b/charts/sequencer/files/scripts/init-cometbft.sh index 4c9ddb4..2cd23ae 100644 --- a/charts/sequencer/files/scripts/init-cometbft.sh +++ b/charts/sequencer/files/scripts/init-cometbft.sh @@ -39,5 +39,3 @@ else echo "Updating config directory..." cp /config/* /cometbft/config/ fi - -chmod -R 0777 /cometbft diff --git a/charts/sequencer/templates/_helpers.tpl b/charts/sequencer/templates/_helpers.tpl index 2dc1da2..109bf5c 100644 --- a/charts/sequencer/templates/_helpers.tpl +++ b/charts/sequencer/templates/_helpers.tpl @@ -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 }} diff --git a/charts/sequencer/templates/configmaps.yaml b/charts/sequencer/templates/configmaps.yaml index d9ef853..db61994 100644 --- a/charts/sequencer/templates/configmaps.yaml +++ b/charts/sequencer/templates/configmaps.yaml @@ -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 @@ -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 }} --- diff --git a/charts/sequencer/templates/statefulsets.yaml b/charts/sequencer/templates/statefulsets.yaml index aa1fdf7..6e412d6 100644 --- a/charts/sequencer/templates/statefulsets.yaml +++ b/charts/sequencer/templates/statefulsets.yaml @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/charts/sequencer/values.yaml b/charts/sequencer/values.yaml index c1415b1..f9ada05 100644 --- a/charts/sequencer/values.yaml +++ b/charts/sequencer/values.yaml @@ -115,6 +115,7 @@ genesis: # pubKey: lV57+rGs2vac7mvkGHP1oBFGHPJM3a+WoAzeFDCJDNU= sequencer: + abciUDS: true mempool: parked: maxTxCount: 200 @@ -324,7 +325,7 @@ storage: local: true entities: sequencerSharedStorage: - size: "5Gi" + size: "50Gi" persistentVolumeName: "sequencer-shared-storage" path: "/data/sequencer-data"