Merge branch 'main' into eoroshiba/storage_snapshots

astriaorg · Feb 20, 2025 · f4522e1 · f4522e1
2 parents a4ebb28 + 941a130
commit f4522e1
Show file tree

Hide file tree

Showing 25 changed files with 390 additions and 161 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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.1
+version: 1.1.2
 
 # 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/evm-rollup/files/genesis/geth-genesis.json b/charts/evm-rollup/files/genesis/geth-genesis.json
@@ -15,10 +15,10 @@
         {{- if .Values.genesis.cancunTime }}
         "cancunTime": {{ toString .Values.genesis.cancunTime | replace "\"" "" }},
         {{- end }}
-        {{- if .Values.genesis.cancunTime }}
+        {{- if .Values.genesis.pragueTime }}
         "pragueTime": {{ toString .Values.genesis.pragueTime | replace "\"" "" }},
         {{- end }}
-        {{- if .Values.genesis.cancunTime }}
+        {{- if .Values.genesis.verkleTime }}
         "verkleTime": {{ toString .Values.genesis.verkleTime | replace "\"" "" }},
         {{- end }}
         "terminalTotalDifficulty": 0,

diff --git a/charts/evm-stack/Chart.lock b/charts/evm-stack/Chart.lock
@@ -4,10 +4,10 @@ dependencies:
   version: 0.4.0
 - name: evm-rollup
   repository: file://../evm-rollup
-  version: 1.1.1
+  version: 1.1.2
 - name: flame-rollup
   repository: file://../flame-rollup
-  version: 0.0.1
+  version: 0.0.2
 - name: composer
   repository: file://../composer
   version: 1.0.0
@@ -26,5 +26,5 @@ dependencies:
 - name: blockscout-stack
   repository: https://blockscout.github.io/helm-charts
   version: 1.6.8
-digest: sha256:03f8e53fd90f307d09aa02db8e65d2838af3c9cea285272f06d800329a92a813
-generated: "2025-02-17T17:05:09.027931+02:00"
+digest: sha256:feffdb4dbba53d3261e49eeb082718be4e3673ae7bc7c6118dddff2f19218273
+generated: "2025-02-19T10:43:16.548953+02:00"
diff --git a/charts/evm-stack/Chart.yaml b/charts/evm-stack/Chart.yaml
@@ -15,18 +15,18 @@ 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.10
+version: 1.0.11
 dependencies:
   - name: celestia-node
     version: 0.4.0
     repository: "file://../celestia-node"
     condition: celestia-node.enabled
   - name: evm-rollup
-    version: 1.1.1
+    version: 1.1.2
     repository: "file://../evm-rollup"
     condition: evm-rollup.enabled
   - name: flame-rollup
-    version: 0.0.1
+    version: 0.0.2
     repository: "file://../flame-rollup"
     condition: flame-rollup.enabled
   - name: composer

diff --git a/charts/flame-rollup/Chart.yaml b/charts/flame-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.0.1
+version: 0.0.2
 # 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/flame-rollup/files/genesis/geth-genesis.json b/charts/flame-rollup/files/genesis/geth-genesis.json
@@ -15,10 +15,10 @@
         {{- if .Values.genesis.cancunTime }}
         "cancunTime": {{ toString .Values.genesis.cancunTime | replace "\"" "" }},
         {{- end }}
-        {{- if .Values.genesis.cancunTime }}
+        {{- if .Values.genesis.pragueTime }}
         "pragueTime": {{ toString .Values.genesis.pragueTime | replace "\"" "" }},
         {{- end }}
-        {{- if .Values.genesis.cancunTime }}
+        {{- if .Values.genesis.verkleTime }}
         "verkleTime": {{ toString .Values.genesis.verkleTime | replace "\"" "" }},
         {{- end }}
         "terminalTotalDifficulty": 0,

diff --git a/charts/hermes/Chart.yaml b/charts/hermes/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.3.0"
+appVersion: "0.4.0"
 
 maintainers:
   - name: wafflesvonmaple

diff --git a/charts/hermes/values.yaml b/charts/hermes/values.yaml
@@ -3,7 +3,7 @@ global:
   replicaCount: 1
   logLevel: debug
 
-image: ghcr.io/astriaorg/hermes:0.3.0
+image: ghcr.io/astriaorg/hermes:0.4.0
 imagePullPolicy: IfNotPresent
 
 fullnameOverride: ""

diff --git 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.3
+version: 1.0.5
 # 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -28,8 +28,8 @@ images:
   cometBFT:
     repo: docker.io/cometbft/cometbft
     pullPolicy: IfNotPresent
-    tag: v0.38.8
-    devTag: v0.38.8
+    tag: v0.38.17
+    devTag: v0.38.17
   sequencer:
     repo: ghcr.io/astriaorg/sequencer
     pullPolicy: IfNotPresent
@@ -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"
 

diff --git a/crates/astria-sequencer/CHANGELOG.md b/crates/astria-sequencer/CHANGELOG.md
@@ -26,6 +26,14 @@ of signer [#1905](https://github.com/astriaorg/astria/pull/1905).
 - Add more thorough unit tests for all actions [#1916](https://github.com/astriaorg/astria/pull/1916).
 - Implement `BridgeTransfer` action [#1934](https://github.com/astriaorg/astria/pull/1934).
 
+### Removed
+
+- Remove ASTRIA_SEQUENCER_LISTEN_ADDR config variable [#1877](https://github.com/astriaorg/astria/pull/1877)
+
+### Added
+
+- Add ASTRIA_SEQUENCER_ABCI_LISTEN_URL config variable [#1877](https://github.com/astriaorg/astria/pull/1877)
+
 ## [1.0.0] - 2024-10-25
 
 ### Changed

diff --git a/crates/astria-sequencer/Cargo.toml b/crates/astria-sequencer/Cargo.toml
@@ -42,6 +42,7 @@ tower = "0.4"
 tower-abci = "0.12.0"
 tower-actor = "0.1.0"
 tower-http = { version = "0.4", features = ["cors"] }
+url = "2.5.4"
 
 async-trait = { workspace = true }
 base64 = { workspace = true }

diff --git a/crates/astria-sequencer/local.env.example b/crates/astria-sequencer/local.env.example
@@ -1,7 +1,9 @@
 # Socket address to listen for ABCI requests from cometbft.
-# This address corresponds to the `--proxy_app "tcp://<ASTRIA_SEQUENCER_LISTEN_ADDR>"`,
-# where `tcp://127.0.0.1:26658` is comebft's default.
-ASTRIA_SEQUENCER_LISTEN_ADDR="127.0.0.1:26658"
+# This address corresponds to the `--proxy_app "<ASTRIA_SEQUENCER_ABCI_LISTEN_URL>"`,
+# where `tcp://127.0.0.1:26658` is comebft's default. Can also be configured to
+# use a unix address ie `unix:///socket/astria_abci.sock`. Generally will see
+# much higher performance with a unix socket.
+ASTRIA_SEQUENCER_ABCI_LISTEN_URL="tcp://127.0.0.1:26658"
 
 # Path to rocksdb
 ASTRIA_SEQUENCER_DB_FILEPATH="/tmp/astria_db"

diff --git a/...src/app/snapshots/astria_sequencer__app__tests_breaking_changes__app_hash_at_genesis.snap b/...src/app/snapshots/astria_sequencer__app__tests_breaking_changes__app_hash_at_genesis.snap
@@ -3,36 +3,36 @@ source: crates/astria-sequencer/src/app/tests_breaking_changes.rs
 expression: app.app_hash.as_bytes()
 ---
 [
-  236,
-  212,
-  100,
-  47,
-  191,
-  2,
-  11,
-  43,
-  159,
-  43,
-  239,
-  162,
-  79,
-  57,
-  36,
-  115,
-  251,
-  145,
-  205,
-  230,
-  115,
   163,
-  142,
-  124,
-  154,
-  22,
-  225,
-  211,
-  113,
-  50,
-  182,
-  221
+  247,
+  139,
+  47,
+  78,
+  129,
+  169,
+  19,
+  217,
+  165,
+  120,
+  82,
+  190,
+  249,
+  77,
+  186,
+  153,
+  51,
+  213,
+  253,
+  37,
+  38,
+  99,
+  100,
+  91,
+  245,
+  28,
+  150,
+  61,
+  214,
+  212,
+  12
 ]
-Original file line number
+Diff line change
@@ Expand Up @@
     expression: app.app_hash.as_bytes()
     ---
     [
-,
-,
-,
-,
-,
-,
-,
-,
-,
-,
-,
-,
-,
-,
-,
-,
-,
-,
-,
-,
-,
 ,
-,
-,
-,
-,
-,
-,
-,
-,
-,
+,
+,
+,
+,
+,
+,
+,
+,
+,
+,
+,
+,
+,
+,
+,
+,
+,
+,
+,
+,
+,
+,
+,
+,
+,
+,
+,
+,
+,
+,
     ]