feat(sequencer)!: allow configuring base address prefix

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.19.2
+version: 0.20.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

charts/evm-rollup/templates/configmap.yaml

@@ -67,6 +67,7 @@ data:
   OTEL_SERVICE_NAME: "{{ tpl .Values.config.rollup.otel.serviceNamePrefix . }}-composer"
   {{- if not .Values.global.dev }}
   {{- else }}
+  ASTRIA_COMPOSER_SEQUENCER_ADDRESS_PREFIX: "{{ .Values.config.sequencer.addressPrefixes.base }}"
   {{- end }}
 ---
 {{- if .Values.config.faucet.enabled }}

charts/evm-rollup/values.yaml

@@ -168,6 +168,8 @@ config:
 
   # Configuration related to sequencer connection for rollup
   sequencer:
+    addressPrefixes:
+      base: "astria"
     chainId: ""
     # Block height to start syncing rollup from
     initialBlockHeight: "2"

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.15.8
+version: 0.16.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

charts/sequencer/files/cometbft/config/genesis.json

@@ -1,16 +1,6 @@
 {
   "app_hash": "",
   "app_state": {
-    "accounts": [
-      {{- range $index, $value := .Values.config.sequencer.genesisAccounts }}
-      {{- if $index }},{{- end }}
-      {
-        "address": "{{  $value.address }}",
-        "balance": {{ toString $value.balance | replace "\"" "" }}
-      }
-      {{- end }}
-    ],
-    "authority_sudo_address": "{{ .Values.config.sequencer.authoritySudoAddress }}",
     "native_asset_base_denomination": "{{ .Values.config.sequencer.nativeAssetBaseDenomination }}",
     "fees": {
       "transfer_base_fee": 12,
@@ -27,20 +17,50 @@
       "{{ $value }}"
       {{- end }}
     ],
-    "ibc_sudo_address": "{{ .Values.config.sequencer.ibc.sudoAddress }}",
-    "ibc_relayer_addresses": [
-      {{- range $index, $value := .Values.config.sequencer.ibc.relayerAddresses }}
-      {{- if $index }},{{- end }}
-      "{{ $value }}"
-      {{- end }}
-    ],
     "ibc_params": {
       "ibc_enabled": {{ .Values.config.sequencer.ibc.enabled }},
       "inbound_ics20_transfers_enabled": {{ .Values.config.sequencer.ibc.inboundEnabled }},
       "outbound_ics20_transfers_enabled": {{ .Values.config.sequencer.ibc.outboundEnabled }}
-    }
+    },
     {{- if not .Values.global.dev }}
+      "accounts": [
+        {{- range $index, $value := .Values.config.sequencer.genesisAccounts }}
+        {{- if $index }},{{- end }}
+        {
+          "address": "{{ $value.address }}",
+          "balance": {{ toString $value.balance | replace "\"" "" }}
+        }
+        {{- end }}
+      ],
+      "authority_sudo_address": "{{ .Values.config.sequencer.authoritySudoAddress }}",
+      "ibc_sudo_address": "{{ .Values.config.sequencer.ibc.sudoAddress }}",
+      "ibc_relayer_addresses": [
+        {{- range $index, $value := .Values.config.sequencer.ibc.relayerAddresses }}
+        {{- if $index }},{{- end }}
+        "{{ $value }}"
+        {{- end }}
+      ]
     {{- else }}
+      "address_prefixes": {
+        "base": "{{ .Values.config.sequencer.addressPrefixes.base }}"
+      },
+      "accounts": [
+        {{- range $index, $value := .Values.config.sequencer.genesisAccounts }}
+        {{- if $index }},{{- end }}
+        {
+          "address": {{ include "sequencer.address" $value.address }},
+          "balance": {{ toString $value.balance | replace "\"" "" }}
+        }
+        {{- end }}
+      ],
+      "authority_sudo_address": {{ include "sequencer.address" .Values.config.sequencer.authoritySudoAddress }},
+      "ibc_sudo_address": {{ include "sequencer.address" .Values.config.sequencer.ibc.sudoAddress }},
+      "ibc_relayer_addresses": [
+        {{- range $index, $value := .Values.config.sequencer.ibc.relayerAddresses }}
+        {{- if $index }},{{- end }}
+        {{ include "sequencer.address" $value }}
+        {{- end }}
+      ]
     {{- end}}
   },
   "chain_id": "{{ .Values.config.cometBFT.chainId }}",

charts/sequencer/templates/_helpers.tpl

@@ -67,3 +67,7 @@ Selector labels
 app: {{ include "sequencer.name" . }}
 name: {{ .Values.config.moniker }}-sequencer-metrics
 {{- end }}
+
+{{/* New sequencer address */}}
+{{- define "sequencer.address"}}{ "bech32m": "{{ . }}" }
+{{- end }}

charts/sequencer/values.yaml

@@ -23,6 +23,8 @@ images:
 config:
   moniker: "node"
   sequencer:
+    addressPrefixes:
+      base: "astria"
     authoritySudoAddress: 1c0c490f1b5528d8173c5de46d131160e4b2c0c3
     nativeAssetBaseDenomination: nria
     allowedFeeAssets:
@@ -37,15 +39,15 @@ config:
         - 34fec43c7fcab9aef3b3cf8aba855e41ee69ca3a
     # Note large balances must be strings support templating with the u128 size account balances
     genesisAccounts:
-    - address: 1c0c490f1b5528d8173c5de46d131160e4b2c0c3
-      balance: "333333333333333333"
-    - address: 34fec43c7fcab9aef3b3cf8aba855e41ee69ca3a
-      balance: "333333333333333333"
-    - address: 60709e2d391864b732b4f0f51e387abb76743871
-      balance: "333333333333333333"
-      # NOTE - the following address matches the privKey that funds the sequencer-faucet
-    - address: 00d75b270542084a54fcf0d0f6eab0402982d156
-      balance: "333333333333333333"
+      - address: 1c0c490f1b5528d8173c5de46d131160e4b2c0c3
+        balance: "333333333333333333"
+      - address: 34fec43c7fcab9aef3b3cf8aba855e41ee69ca3a
+        balance: "333333333333333333"
+      - address: 60709e2d391864b732b4f0f51e387abb76743871
+        balance: "333333333333333333"
+        # NOTE - the following address matches the privKey that funds the sequencer-faucet
+      - address: 00d75b270542084a54fcf0d0f6eab0402982d156
+        balance: "333333333333333333"
 
     metrics:
       enabled: false

crates/astria-bridge-withdrawer/local.env.example

@@ -31,6 +31,9 @@ ASTRIA_BRIDGE_WITHDRAWER_SEQUENCER_CHAIN_ID="astria"
 # transactions. The file should contain a hex-encoded Ed25519 secret key.
 ASTRIA_BRIDGE_WITHDRAWER_SEQUENCER_KEY_PATH=/path/to/priv_sequencer_key.json
 
+# The prefix that will be used to construct bech32m sequencer addresses.
+ASTRIA_BRIDGE_WITHDRAWER_SEQUENCER_ADDRESS_PREFIX=astria
+
 # The fee asset denomination to use for the bridge account's transactions.
 ASTRIA_BRIDGE_WITHDRAWER_FEE_ASSET_DENOMINATION="nria"
 

crates/astria-bridge-withdrawer/src/bridge_withdrawer/ethereum/convert.rs

@@ -9,7 +9,6 @@ use astria_core::{
             Denom,
         },
         Address,
-        ASTRIA_ADDRESS_PREFIX,
     },
     protocol::transaction::v1alpha1::{
         action::{
@@ -60,6 +59,7 @@ pub(crate) fn event_to_action(
     rollup_asset_denom: Denom,
     asset_withdrawal_divisor: u128,
     bridge_address: Address,
+    sequencer_address_prefix: &str,
 ) -> eyre::Result<Action> {
     let action = match event_with_metadata.event {
         WithdrawalEvent::Sequencer(event) => event_to_bridge_unlock(
@@ -78,6 +78,7 @@ pub(crate) fn event_to_action(
             rollup_asset_denom,
             asset_withdrawal_divisor,
             bridge_address,
+            sequencer_address_prefix,
         )
         .wrap_err("failed to convert ics20 withdrawal event to action")?,
     };
@@ -102,8 +103,10 @@ fn event_to_bridge_unlock(
         transaction_hash,
     };
     let action = BridgeUnlockAction {
-        to: Address::try_from_bech32m(&event.destination_chain_address)
-            .wrap_err("failed to parse destination chain address as bech32m")?,
+        to: event
+            .destination_chain_address
+            .parse()
+            .wrap_err("failed to parse destination chain address")?,
         amount: event
             .amount
             .as_u128()
@@ -119,6 +122,8 @@ fn event_to_bridge_unlock(
     Ok(Action::BridgeUnlock(action))
 }
 
+// FIXME: Get this to work for now, but replace this with a builder.
+#[allow(clippy::too_many_arguments)]
 fn event_to_ics20_withdrawal(
     event: Ics20WithdrawalFilter,
     block_number: U64,
@@ -127,6 +132,7 @@ fn event_to_ics20_withdrawal(
     rollup_asset_denom: Denom,
     asset_withdrawal_divisor: u128,
     bridge_address: Address,
+    sequencer_address_prefix: &str,
 ) -> eyre::Result<Action> {
     // TODO: make this configurable
     const ICS20_WITHDRAWAL_TIMEOUT: Duration = Duration::from_secs(300);
@@ -155,7 +161,7 @@ fn event_to_ics20_withdrawal(
         // bytes, but this won't work otherwise.
         return_address: Address::builder()
             .array(sender)
-            .prefix(ASTRIA_ADDRESS_PREFIX)
+            .prefix(sequencer_address_prefix)
             .try_build()
             .wrap_err("failed to construct return address")?,
         amount: event
@@ -204,12 +210,7 @@ mod tests {
             event: WithdrawalEvent::Sequencer(SequencerWithdrawalFilter {
                 sender: [0u8; 20].into(),
                 amount: 99.into(),
-                destination_chain_address: Address::builder()
-                    .array([1u8; 20])
-                    .prefix(ASTRIA_ADDRESS_PREFIX)
-                    .try_build()
-                    .unwrap()
-                    .to_string(),
+                destination_chain_address: crate::astria_address([1u8; 20]).to_string(),
             }),
             block_number: 1.into(),
             transaction_hash: [2u8; 32].into(),
@@ -220,6 +221,7 @@ mod tests {
             denom.clone(),
             1,
             crate::astria_address([99u8; 20]),
+            crate::ASTRIA_ADDRESS_PREFIX,
         )
         .unwrap();
         let Action::BridgeUnlock(action) = action else {
@@ -248,12 +250,7 @@ mod tests {
             event: WithdrawalEvent::Sequencer(SequencerWithdrawalFilter {
                 sender: [0u8; 20].into(),
                 amount: 990.into(),
-                destination_chain_address: Address::builder()
-                    .array([1u8; 20])
-                    .prefix(ASTRIA_ADDRESS_PREFIX)
-                    .try_build()
-                    .unwrap()
-                    .to_string(),
+                destination_chain_address: crate::astria_address([1u8; 20]).to_string(),
             }),
             block_number: 1.into(),
             transaction_hash: [2u8; 32].into(),
@@ -265,6 +262,7 @@ mod tests {
             denom.clone(),
             divisor,
             crate::astria_address([99u8; 20]),
+            crate::ASTRIA_ADDRESS_PREFIX,
         )
         .unwrap();
         let Action::BridgeUnlock(action) = action else {
@@ -289,7 +287,7 @@ mod tests {
     #[test]
     fn event_to_ics20_withdrawal() {
         let denom = "transfer/channel-0/utia".parse::<Denom>().unwrap();
-        let destination_chain_address = "address".to_string();
+        let destination_chain_address = crate::astria_address([1u8; 20]).to_string();
         let event_with_meta = EventWithMetadata {
             event: WithdrawalEvent::Ics20(Ics20WithdrawalFilter {
                 sender: [0u8; 20].into(),
@@ -308,6 +306,7 @@ mod tests {
             denom.clone(),
             1,
             bridge_address,
+            crate::ASTRIA_ADDRESS_PREFIX,
         )
         .unwrap();
         let Action::Ics20Withdrawal(mut action) = action else {

crates/astria-bridge-withdrawer/src/bridge_withdrawer/ethereum/test_utils.rs

@@ -3,7 +3,6 @@ use std::{
     time::Duration,
 };
 
-use astria_core::primitive::v1::ASTRIA_ADDRESS_PREFIX;
 use ethers::{
     abi::Tokenizable,
     core::utils::Anvil,
@@ -33,11 +32,7 @@ impl Default for ConfigureAstriaWithdrawerDeployer {
     fn default() -> Self {
         Self {
             base_chain_asset_precision: 18,
-            base_chain_bridge_address: astria_core::primitive::v1::Address::builder()
-                .array([0u8; 20])
-                .prefix(ASTRIA_ADDRESS_PREFIX)
-                .try_build()
-                .unwrap(),
+            base_chain_bridge_address: crate::astria_address([0u8; 20]),
             base_chain_asset_denomination: "test-denom".to_string(),
         }
     }
@@ -122,11 +117,7 @@ impl Default for ConfigureAstriaBridgeableERC20Deployer {
         Self {
             bridge_address: Address::zero(),
             base_chain_asset_precision: 18,
-            base_chain_bridge_address: astria_core::primitive::v1::Address::builder()
-                .array([0u8; 20])
-                .prefix(ASTRIA_ADDRESS_PREFIX)
-                .try_build()
-                .unwrap(),
+            base_chain_bridge_address: crate::astria_address([0u8; 20]),
             base_chain_asset_denomination: "testdenom".to_string(),
             name: "test-token".to_string(),
             symbol: "TT".to_string(),