Merge branch 'main' into spike/noble-usdc

* main: feat(sequencer): make mempool balance aware (#1408) chore(sequencer): change test addresses to versions with known private keys (#1487) chore(chart): update geth tag (#1485) feat(sequencer): report deposit events (#1447) feat(proto, core, sequencer)!: add traceability to rollup deposits (#1410) fix(bridge-withdrawer, cli, sequencer-client): migrate from `broadcast_tx_commit` to `broadcast_tx_sync` (#1376) fix(sequencer): add `end_block` to `app_execute_transaction_with_every_action_snapshot` (#1455) release: end of iteration release cuts (#1456) chore(charts): rollupName templates (#1458) chore(sequencer-relayer): Add instrumentation (#1375) feat(proto, core, sequencer)!: permit bech32 compatible addresses (#1425) chore: memoize `address_bytes` of verification key (#1444) chore(ci): include `ibc-bridge-test` in `docker` CI target (#1438) chore(charts): bump celestia versions (#1431)
astriaorg · Sep 12, 2024 · c054ddf · c054ddf
2 parents f751003 + b401e4f
commit c054ddf
Show file tree

Hide file tree

Showing 112 changed files with 4,566 additions and 1,580 deletions.
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
@@ -213,7 +213,7 @@ jobs:
 
   docker:
     if: ${{ always() && !cancelled() }}
-    needs: [composer, conductor, sequencer, sequencer-relayer, evm-bridge-withdrawer, smoke-test, smoke-cli]
+    needs: [composer, conductor, sequencer, sequencer-relayer, evm-bridge-withdrawer, smoke-test, smoke-cli, ibc-bridge-test]
     uses: ./.github/workflows/reusable-success.yml
     with:
       success: ${{ !contains(needs.*.result, 'failure') }}
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/charts/celestia-local/Chart.yaml b/charts/celestia-local/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.6.1
+version: 0.6.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/celestia-local/files/scripts/init-celestia-appd.sh b/charts/celestia-local/files/scripts/init-celestia-appd.sh
@@ -27,6 +27,7 @@ celestia-appd gentx \
   "$validator_stake" \
   --keyring-backend="$keyring_backend" \
   --chain-id "$chainid" \
+  --fees "$fees" \
   --home "$home_dir"
 
 # add ibc account

diff --git a/charts/celestia-local/files/scripts/start-bridge.sh b/charts/celestia-local/files/scripts/start-bridge.sh
@@ -42,6 +42,6 @@ exec celestia bridge start \
   --gateway.port "$bridge_host_port" \
   --rpc.addr 0.0.0.0 \
   --rpc.port "$bridge_rpc_port" \
-  --keyring.accname "$validator_key_name" \
+  --keyring.keyname "$validator_key_name" \
   --log.level "debug" \
   --log.level.module "share/discovery:error"
diff --git a/charts/celestia-local/templates/configmap.yaml b/charts/celestia-local/templates/configmap.yaml
@@ -6,6 +6,7 @@ metadata:
 data:
   home_dir: "/home/celestia"
   coins: "{{ .Values.coins }}"
+  fees: "{{ .Values.fees }}"
   validator_stake: "{{ .Values.validatorStake }}"
   validator_mnemonic: "{{ .Values.validatorMnemonic }}"
   chainid: "{{ .Values.chainId }}"

diff --git a/charts/celestia-local/values.yaml b/charts/celestia-local/values.yaml
@@ -15,8 +15,8 @@ storage:
       persistentVolumeName: "celestia-shared-storage"
       path: "/data/celestia-data"
 
-celestiaAppImage: "ghcr.io/celestiaorg/celestia-app:v1.9.0"
-celestiaNodeImage: "ghcr.io/celestiaorg/celestia-node:v0.14.1"
+celestiaAppImage: "ghcr.io/celestiaorg/celestia-app:v2.0.0"
+celestiaNodeImage: "ghcr.io/celestiaorg/celestia-node:v0.16.0-rc0"
 
 podSecurityContext:
   runAsUser: 10001
@@ -35,6 +35,8 @@ validatorKeyName: "validator"
 validatorMnemonic: connect soon random stable toddler tired glove drastic comfort donor struggle island cactus pole shell alpha taste able story business cross dismiss book brass
 # Genesis amount
 coins: "10000000000000000000000000utia"
+# Default fee for genTx
+fees: "1utia"
 # Staking amount
 validatorStake: "5000000000utia"
 # ibc account

diff --git a/charts/celestia-node/Chart.yaml b/charts/celestia-node/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.3.5
+version: 0.3.6
 
 # 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/celestia-node/values.yaml b/charts/celestia-node/values.yaml
@@ -19,7 +19,7 @@ config:
 
 images:
   pullPolicy: IfNotPresent
-  node: ghcr.io/celestiaorg/celestia-node:v0.14.1
+  node: ghcr.io/celestiaorg/celestia-node:v0.16.0-rc0
 
 ports:
   celestia:

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: 0.26.1
+version: 0.27.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/evm-rollup/templates/storageclasses.yaml b/charts/evm-rollup/templates/storageclasses.yaml
@@ -5,20 +5,9 @@
 apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
-  name: {{ $.Values.config.rollup.name }}-{{ $value.persistentVolumeName }}-geth-local
+  name: {{ include "rollup.name" $ }}-{{ $value.persistentVolumeName }}-geth-local
 provisioner: kubernetes.io/no-provisioner
 volumeBindingMode: WaitForFirstConsumer
 reclaimPolicy: Retain
-    {{- if $.Values.config.blockscout.enabled }}
----
-apiVersion: storage.k8s.io/v1
-kind: StorageClass
-metadata:
-  name: {{ $.Values.config.rollup.name }}-{{ $value.persistentVolumeName }}-blockscout-local
-provisioner: kubernetes.io/no-provisioner
-volumeBindingMode: WaitForFirstConsumer
-reclaimPolicy: Retain
----
-    {{- end }}
   {{- end }}
 {{- end }}
diff --git a/charts/evm-rollup/templates/volumes.yaml b/charts/evm-rollup/templates/volumes.yaml
@@ -6,15 +6,15 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: {{ $.Values.config.rollup.name }}-{{ $value.persistentVolumeName }}-geth-pv
+  name: {{ include "rollup.name" $ }}-{{ $value.persistentVolumeName }}-geth-pv
 spec:
   capacity:
     storage: {{ $value.size }}
   volumeMode: Filesystem
   accessModes:
     - ReadWriteOnce
   persistentVolumeReclaimPolicy: Retain
-  storageClassName: {{ $.Values.config.rollup.name }}-{{ $value.persistentVolumeName }}-geth-local
+  storageClassName: {{ include "rollup.name" $ }}-{{ $value.persistentVolumeName }}-geth-local
   local:
     path: {{ $value.path }}
   nodeAffinity:
@@ -27,45 +27,19 @@ spec:
                 - astria-dev-cluster-control-plane
                 - astria-dev-cluster-worker
 ---
-        {{- if $.Values.config.blockscout.enabled }}
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: {{ $.Values.config.rollup.name }}-{{ $value.persistentVolumeName }}-blockscout-pv
-spec:
-  capacity:
-    storage: {{ $value.size }}
-  volumeMode: Filesystem
-  accessModes:
-    - ReadWriteOnce
-  persistentVolumeReclaimPolicy: Retain
-  storageClassName: {{ $.Values.config.rollup.name }}-{{ $value.persistentVolumeName }}-blockscout-local
-  local:
-    path: {{ $value.path }}
-  nodeAffinity:
-    required:
-      nodeSelectorTerms:
-        - matchExpressions:
-            - key: kubernetes.io/hostname
-              operator: In
-              values:
-                - astria-dev-cluster-control-plane
-                - astria-dev-cluster-worker
----
-      {{- end }}
     {{- end }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: {{ $.Values.config.rollup.name }}-{{ $value.persistentVolumeName }}-pvc-geth
+  name: {{ include "rollup.name" $ }}-{{ $value.persistentVolumeName }}-pvc-geth
   namespace: {{ include "rollup.namespace" $ }}
   labels:
-    "app.kubernetes.io/name": "{{ $.Values.config.rollup.name }}-{{ $.Chart.Name }}"
+    "app.kubernetes.io/name": "{{ include "rollup.name" $ }}-{{ $.Chart.Name }}"
     "app.kubernetes.io/managed-by": {{ $.Release.Service | quote }}
     "helm.sh/chart": {{ $.Chart.Name }}-{{ $.Chart.Version | replace "+" "_" }}
 spec:
   {{- if $.Values.storage.local }}
-  storageClassName: {{ $.Values.config.rollup.name }}-{{ $value.persistentVolumeName }}-geth-local
+  storageClassName: {{ include "rollup.name" $ }}-{{ $value.persistentVolumeName }}-geth-local
   {{- end }}
   {{- if $value.storageClassName }}
   storageClassName: {{ $value.storageClassName }}
@@ -76,29 +50,5 @@ spec:
     requests:
       storage: {{ $value.size }}
 ---
-  {{- if $.Values.config.blockscout.enabled }}
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: {{ $.Values.config.rollup.name }}-{{ $value.persistentVolumeName }}-pvc-blockscout
-  namespace: {{ include "rollup.namespace" $ }}
-  labels:
-    "app.kubernetes.io/name": {{ $.Values.config.rollup.name }}-{{ $.Chart.Name }}
-    "app.kubernetes.io/managed-by": {{ $.Release.Service | quote }}
-    "helm.sh/chart": {{ $.Chart.Name }}-{{ $.Chart.Version | replace "+" "_" }}
-spec:
-    {{- if $.Values.storage.local }}
-  storageClassName: {{ $.Values.config.rollup.name }}-{{ $value.persistentVolumeName }}-blockscout-local
-    {{- end }}
-    {{- if $value.storageClassName }}
-  storageClassName: {{ $value.storageClassName }}
-    {{- end }}
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: {{ $value.size }}
----
-    {{- end }}
   {{- end }}
 {{- end }}
diff --git a/charts/evm-stack/Chart.lock b/charts/evm-stack/Chart.lock
@@ -1,10 +1,10 @@
 dependencies:
 - name: celestia-node
   repository: file://../celestia-node
-  version: 0.3.5
+  version: 0.3.6
 - name: evm-rollup
   repository: file://../evm-rollup
-  version: 0.26.1
+  version: 0.27.1
 - name: composer
   repository: file://../composer
   version: 0.1.2
@@ -20,5 +20,5 @@ dependencies:
 - name: blockscout-stack
   repository: https://blockscout.github.io/helm-charts
   version: 1.6.2
-digest: sha256:6406abf0864a14a8268dc0c78512ca5d18779e9f20dac8ad540399ddcfbe062c
-generated: "2024-08-28T09:44:42.794673-04:00"
+digest: sha256:a10877e17ed14e2a28db0dd6a968e8eafdd7529c6aab84ca8e0b1a9f5302b189
+generated: "2024-09-11T11:05:50.356152-05:00"
diff --git a/charts/evm-stack/Chart.yaml b/charts/evm-stack/Chart.yaml
@@ -15,15 +15,15 @@ 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.1
+version: 0.5.1
 
 dependencies:
   - name: celestia-node
-    version: "0.3.5"
+    version: 0.3.6
     repository: "file://../celestia-node"
     condition: celestia-node.enabled
   - name: evm-rollup
-    version: 0.26.1
+    version: 0.27.1
     repository: "file://../evm-rollup"
   - name: composer
     version: 0.1.2

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: 0.22.0
+version: 0.22.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
 # follow Semantic Versioning. They should reflect the version the application is using.

diff --git a/charts/sequencer/files/cometbft/config/genesis.json b/charts/sequencer/files/cometbft/config/genesis.json
@@ -23,7 +23,8 @@
       "outbound_ics20_transfers_enabled": {{ .Values.genesis.ibc.outboundEnabled }}
     },
     "address_prefixes": {
-      "base": "{{ .Values.genesis.addressPrefixes.base }}"
+      "base": "{{ .Values.genesis.addressPrefixes.base }}",
+      "ibcCompat": "{{ .Values.genesis.addressPrefixes.ibcCompat }}"
     },
     "accounts": [
       {{- range $index, $value := .Values.genesis.genesisAccounts }}

diff --git a/charts/sequencer/values.yaml b/charts/sequencer/values.yaml
@@ -26,6 +26,7 @@ genesis:
   genesisTime: ""  # '2023-09-22T17:22:35.092832Z'
   addressPrefixes:
     base: "astria"
+    ibcCompat: "astriacompat"
   authoritySudoAddress: ""
   nativeAssetBaseDenomination: nria
   allowedFeeAssets: []

diff --git a/crates/astria-bridge-contracts/src/lib.rs b/crates/astria-bridge-contracts/src/lib.rs
@@ -420,6 +420,9 @@ where
             timeout_time: timeout_in_5_min(),
             source_channel,
             bridge_address: Some(self.bridge_address),
+            // FIXME: this needs a way to determine when to use compat address
+            // https://github.com/astriaorg/astria/issues/1424
+            use_compat_address: false,
         };
         Ok(Action::Ics20Withdrawal(action))
     }

diff --git a/crates/astria-bridge-withdrawer/Cargo.toml b/crates/astria-bridge-withdrawer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "astria-bridge-withdrawer"
-version = "0.2.1"
+version = "0.3.0"
 edition = "2021"
 rust-version = "1.76"
 license = "MIT OR Apache-2.0"

diff --git a/crates/astria-bridge-withdrawer/src/bridge_withdrawer/startup.rs b/crates/astria-bridge-withdrawer/src/bridge_withdrawer/startup.rs
@@ -480,7 +480,7 @@ fn rollup_height_from_signed_transaction(
     .expect("action is already checked to be either BridgeUnlock or Ics20Withdrawal");
 
     info!(
-        last_batch.tx_hash = %telemetry::display::hex(&signed_transaction.sha256_of_proto_encoding()),
+        last_batch.transaction_id = %signed_transaction.id(),
         last_batch.rollup_height = last_batch_rollup_height,
         "extracted rollup height from last batch of withdrawals",
     );