fix weird merge

crates/astria-cli/src/utils.rs

@@ -58,10 +58,10 @@ pub(crate) async fn submit_transaction(
         .await
         .wrap_err("failed to submit transaction")?;
 
-    let tx_response = sequencer_client.wait_for_tx_inclusion(res.hash).await;
-
     ensure!(res.code.is_ok(), "failed to check tx: {}", res.log);
 
+    let tx_response = sequencer_client.wait_for_tx_inclusion(res.hash).await;
+
     ensure!(
         tx_response.tx_result.code.is_ok(),
         "failed to execute tx: {}",

crates/astria-core/src/primitive/v1/asset/denom.rs

@@ -1,4 +1,5 @@
 use std::{
+    borrow::Cow,
     collections::VecDeque,
     str::FromStr,
 };
@@ -140,6 +141,27 @@ impl<'a> From<&'a IbcPrefixed> for IbcPrefixed {
     }
 }
 
+impl<'a> From<&'a IbcPrefixed> for Cow<'a, IbcPrefixed> {
+    fn from(ibc_prefixed: &'a IbcPrefixed) -> Self {
+        Cow::Borrowed(ibc_prefixed)
+    }
+}
+
+impl<'a> From<&'a TracePrefixed> for Cow<'a, IbcPrefixed> {
+    fn from(trace_prefixed: &'a TracePrefixed) -> Self {
+        Cow::Owned(trace_prefixed.to_ibc_prefixed())
+    }
+}
+
+impl<'a> From<&'a Denom> for Cow<'a, IbcPrefixed> {
+    fn from(value: &'a Denom) -> Self {
+        match value {
+            Denom::TracePrefixed(trace_prefixed) => Cow::from(trace_prefixed),
+            Denom::IbcPrefixed(ibc_prefixed) => Cow::from(ibc_prefixed),
+        }
+    }
+}
+
 impl FromStr for Denom {
     type Err = ParseDenomError;
 
@@ -543,20 +565,22 @@ pub struct IbcPrefixed {
 }
 
 impl IbcPrefixed {
+    pub const ENCODED_HASH_LEN: usize = 32;
+
     #[must_use]
-    pub fn new(id: [u8; 32]) -> Self {
+    pub const fn new(id: [u8; Self::ENCODED_HASH_LEN]) -> Self {
         Self {
             id,
         }
     }
 
     #[must_use]
-    pub fn as_bytes(&self) -> &[u8; 32] {
+    pub const fn as_bytes(&self) -> &[u8; Self::ENCODED_HASH_LEN] {
         &self.id
     }
 
     #[must_use]
-    pub fn display_len(&self) -> usize {
+    pub const fn display_len(&self) -> usize {
         68 // "ibc/" + 64 hex characters
     }
 }
@@ -586,7 +610,7 @@ impl FromStr for IbcPrefixed {
         if segments.next().is_some() {
             return Err(ParseIbcPrefixedError::too_many_segments());
         }
-        let id = <[u8; 32]>::from_hex(hex).map_err(Self::Err::hex)?;
+        let id = <[u8; Self::ENCODED_HASH_LEN]>::from_hex(hex).map_err(Self::Err::hex)?;
         Ok(Self {
             id,
         })

crates/astria-core/src/primitive/v1/mod.rs

@@ -8,7 +8,7 @@ use std::{
 
 use base64::{
     display::Base64Display,
-    prelude::BASE64_STANDARD,
+    prelude::BASE64_URL_SAFE,
 };
 use bytes::Bytes;
 use sha2::{
@@ -231,7 +231,7 @@ impl From<&RollupId> for RollupId {
 
 impl std::fmt::Display for RollupId {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        Base64Display::new(self.as_ref(), &BASE64_STANDARD).fmt(f)
+        Base64Display::new(self.as_ref(), &BASE64_URL_SAFE).fmt(f)
     }
 }
 

crates/astria-sequencer/Cargo.toml

@@ -47,6 +47,7 @@ tower-actor = "0.1.0"
 tower-http = { version = "0.4", features = ["cors"] }
 
 async-trait = { workspace = true }
+base64 = { workspace = true }
 bytes = { workspace = true }
 divan = { workspace = true, optional = true }
 futures = { workspace = true }

crates/astria-sequencer/src/accounts/state_ext.rs

@@ -1,4 +1,5 @@
 use std::{
+    borrow::Cow,
     fmt::Display,
     pin::Pin,
     task::{
@@ -27,44 +28,18 @@ use futures::Stream;
 use pin_project_lite::pin_project;
 use tracing::instrument;
 
-use super::storage;
+use super::storage::{
+    self,
+    keys::{
+        self,
+        extract_asset_from_key,
+    },
+};
 use crate::{
     accounts::AddressBytes,
     storage::StoredValue,
 };
 
-const ACCOUNTS_PREFIX: &str = "accounts";
-const TRANSFER_BASE_FEE_STORAGE_KEY: &str = "transferfee";
-
-struct StorageKey<'a, T>(&'a T);
-impl<'a, T: AddressBytes> std::fmt::Display for StorageKey<'a, T> {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.write_str(ACCOUNTS_PREFIX)?;
-        f.write_str("/")?;
-        for byte in self.0.address_bytes() {
-            f.write_fmt(format_args!("{byte:02x}"))?;
-        }
-        Ok(())
-    }
-}
-
-fn balance_storage_key<'a, TAddress, TAsset>(address: &TAddress, asset: &'a TAsset) -> String
-where
-    TAddress: AddressBytes,
-    asset::IbcPrefixed: From<&'a TAsset>,
-{
-    let asset: asset::IbcPrefixed = asset.into();
-    format!(
-        "{}/balance/{}",
-        StorageKey(address),
-        crate::storage_keys::hunks::Asset::from(asset)
-    )
-}
-
-fn nonce_storage_key<T: AddressBytes>(address: &T) -> String {
-    format!("{}/nonce", StorageKey(address))
-}
-
 pin_project! {
     /// A stream of IBC prefixed assets for a given account.
     pub(crate) struct AccountAssetsStream<St> {
@@ -141,23 +116,14 @@ where
     }
 }
 
-fn extract_asset_from_key(s: &str) -> Result<asset::IbcPrefixed> {
-    Ok(s.strip_prefix("accounts/")
-        .and_then(|s| s.split_once("/balance/").map(|(_, asset)| asset))
-        .ok_or_eyre("failed to strip prefix from account balance key")?
-        .parse::<crate::storage_keys::hunks::Asset>()
-        .context("failed to parse storage key suffix as address hunk")?
-        .get())
-}
-
 #[async_trait]
 pub(crate) trait StateReadExt: StateRead + crate::assets::StateReadExt {
     #[instrument(skip_all)]
     fn account_asset_keys<T: AddressBytes>(
         &self,
         address: &T,
     ) -> AccountAssetsStream<Self::PrefixKeysStream> {
-        let prefix = format!("{}/balance/", StorageKey(address));
+        let prefix = keys::balance_prefix(address);
         AccountAssetsStream {
             underlying: self.prefix_keys(&prefix),
         }
@@ -168,7 +134,7 @@ pub(crate) trait StateReadExt: StateRead + crate::assets::StateReadExt {
         &self,
         address: &T,
     ) -> AccountAssetBalancesStream<Self::PrefixRawStream> {
-        let prefix = format!("{}/balance/", StorageKey(address));
+        let prefix = keys::balance_prefix(address);
         AccountAssetBalancesStream {
             underlying: self.prefix_raw(&prefix),
         }
@@ -183,10 +149,10 @@ pub(crate) trait StateReadExt: StateRead + crate::assets::StateReadExt {
     where
         TAddress: AddressBytes,
         TAsset: Sync + Display,
-        asset::IbcPrefixed: From<&'a TAsset> + Send + Sync,
+        &'a TAsset: Into<Cow<'a, asset::IbcPrefixed>>,
     {
         let Some(bytes) = self
-            .get_raw(&balance_storage_key(address, asset))
+            .get_raw(&keys::balance(address, asset))
             .await
             .map_err(anyhow_to_eyre)
             .wrap_err("failed reading raw account balance from state")?
@@ -201,7 +167,7 @@ pub(crate) trait StateReadExt: StateRead + crate::assets::StateReadExt {
     #[instrument(skip_all)]
     async fn get_account_nonce<T: AddressBytes>(&self, address: &T) -> Result<u32> {
         let bytes = self
-            .get_raw(&nonce_storage_key(address))
+            .get_raw(&keys::nonce(address))
             .await
             .map_err(anyhow_to_eyre)
             .wrap_err("failed reading raw account nonce from state")?;
@@ -217,7 +183,7 @@ pub(crate) trait StateReadExt: StateRead + crate::assets::StateReadExt {
     #[instrument(skip_all)]
     async fn get_transfer_base_fee(&self) -> Result<u128> {
         let bytes = self
-            .get_raw(TRANSFER_BASE_FEE_STORAGE_KEY)
+            .get_raw(keys::TRANSFER_BASE_FEE)
             .await
             .map_err(anyhow_to_eyre)
             .wrap_err("failed reading raw transfer base fee from state")?;
@@ -244,12 +210,12 @@ pub(crate) trait StateWriteExt: StateWrite {
     where
         TAddress: AddressBytes,
         TAsset: Display,
-        asset::IbcPrefixed: From<&'a TAsset> + Send,
+        &'a TAsset: Into<Cow<'a, asset::IbcPrefixed>>,
     {
         let bytes = StoredValue::from(storage::Balance::from(balance))
             .serialize()
             .wrap_err("failed to serialize balance")?;
-        self.put_raw(balance_storage_key(address, asset), bytes);
+        self.put_raw(keys::balance(address, asset), bytes);
         Ok(())
     }
 
@@ -258,7 +224,7 @@ pub(crate) trait StateWriteExt: StateWrite {
         let bytes = StoredValue::from(storage::Nonce::from(nonce))
             .serialize()
             .wrap_err("failed to serialize nonce")?;
-        self.put_raw(nonce_storage_key(address), bytes);
+        self.put_raw(keys::nonce(address), bytes);
         Ok(())
     }
 
@@ -272,7 +238,7 @@ pub(crate) trait StateWriteExt: StateWrite {
     where
         TAddress: AddressBytes,
         TAsset: Sync + Display,
-        asset::IbcPrefixed: From<&'a TAsset> + Send,
+        &'a TAsset: Into<Cow<'a, asset::IbcPrefixed>>,
     {
         let balance = self
             .get_account_balance(address, asset)
@@ -299,7 +265,7 @@ pub(crate) trait StateWriteExt: StateWrite {
     where
         TAddress: AddressBytes,
         TAsset: Sync + Display,
-        asset::IbcPrefixed: From<&'a TAsset> + Send,
+        &'a TAsset: Into<Cow<'a, asset::IbcPrefixed>>,
     {
         let balance = self
             .get_account_balance(address, asset)
@@ -321,7 +287,7 @@ pub(crate) trait StateWriteExt: StateWrite {
         let bytes = StoredValue::from(storage::Fee::from(fee))
             .serialize()
             .wrap_err("failed to serialize fee")?;
-        self.put_raw(TRANSFER_BASE_FEE_STORAGE_KEY.to_string(), bytes);
+        self.put_raw(keys::TRANSFER_BASE_FEE.to_string(), bytes);
         Ok(())
     }
 }
@@ -330,17 +296,10 @@ impl<T: StateWrite> StateWriteExt for T {}
 
 #[cfg(test)]
 mod tests {
-    use astria_core::primitive::v1::Address;
     use cnidarium::StateDelta;
     use futures::TryStreamExt as _;
-    use insta::assert_snapshot;
 
-    use super::{
-        balance_storage_key,
-        nonce_storage_key,
-        StateReadExt as _,
-        StateWriteExt as _,
-    };
+    use super::*;
     use crate::{
         assets::{
             StateReadExt as _,
@@ -352,14 +311,15 @@ mod tests {
         },
     };
 
-    fn asset_0() -> astria_core::primitive::v1::asset::Denom {
+    fn asset_0() -> asset::Denom {
         "asset_0".parse().unwrap()
     }
 
-    fn asset_1() -> astria_core::primitive::v1::asset::Denom {
+    fn asset_1() -> asset::Denom {
         "asset_1".parse().unwrap()
     }
-    fn asset_2() -> astria_core::primitive::v1::asset::Denom {
+
+    fn asset_2() -> asset::Denom {
         "asset_2".parse().unwrap()
     }
 
@@ -834,20 +794,4 @@ mod tests {
         let retrieved_fee = state.get_transfer_base_fee().await.unwrap();
         assert_eq!(retrieved_fee, 123);
     }
-
-    #[test]
-    fn storage_keys_have_not_changed() {
-        let address: Address = "astria1rsxyjrcm255ds9euthjx6yc3vrjt9sxrm9cfgm"
-            .parse()
-            .unwrap();
-        let asset = "an/asset/with/a/prefix"
-            .parse::<astria_core::primitive::v1::asset::Denom>()
-            .unwrap();
-        assert_eq!(
-            balance_storage_key(&address, &asset),
-            balance_storage_key(&address, &asset.to_ibc_prefixed())
-        );
-        assert_snapshot!(balance_storage_key(&address, &asset));
-        assert_snapshot!(nonce_storage_key(&address));
-    }
 }