Merge branch 'yuji/store-ibc-trace' (#3319)

* origin/yuji/store-ibc-trace:
  fix func name
  add changelog
  new is_receiving_success
  store ibc traces when minting

Author: brentstone

.changelog/unreleased/improvements/3317-store-ibc-trace-when-minting.md

@@ -0,0 +1,2 @@
+- Store IBC denom when minting the IBC token
+  ([\#3317](https://github.com/anoma/namada/issues/3317))

crates/ibc/src/actions.rs

@@ -13,7 +13,7 @@ use namada_core::ibc::core::channel::types::timeout::TimeoutHeight;
 use namada_core::ibc::MsgTransfer;
 use namada_core::tendermint::Time as TmTime;
 use namada_core::token::Amount;
-use namada_events::{EmitEvents, EventTypeBuilder};
+use namada_events::EmitEvents;
 use namada_governance::storage::proposal::PGFIbcTarget;
 use namada_parameters::read_epoch_duration_parameter;
 use namada_state::{
@@ -124,23 +124,6 @@ where
         Ok(())
     }
 
-    /// Get IBC events
-    fn get_ibc_events(
-        &self,
-        event_type: impl AsRef<str>,
-    ) -> Result<Vec<IbcEvent>, StorageError> {
-        let event_type = EventTypeBuilder::new_of::<IbcEvent>()
-            .with_segment(event_type)
-            .build();
-
-        Ok(self
-            .state
-            .write_log()
-            .lookup_events_with_prefix(&event_type)
-            .filter_map(|event| IbcEvent::try_from(event).ok())
-            .collect())
-    }
-
     /// Transfer token
     fn transfer_token(
         &mut self,

crates/ibc/src/context/nft_transfer.rs

@@ -89,6 +89,26 @@ where
             .store_withdraw(token, added_withdraw)
             .map_err(NftTransferError::from)
     }
+
+    fn store_ibc_trace(
+        &self,
+        owner: &Address,
+        class_id: &PrefixedClassId,
+        token_id: &TokenId,
+    ) -> Result<(), NftTransferError> {
+        let ibc_trace = format!("{class_id}/{token_id}");
+        let trace_hash = storage::calc_hash(&ibc_trace);
+
+        self.inner
+            .borrow_mut()
+            .store_ibc_trace(owner.to_string(), &trace_hash, &ibc_trace)
+            .map_err(NftTransferError::from)?;
+
+        self.inner
+            .borrow_mut()
+            .store_ibc_trace(token_id, &trace_hash, &ibc_trace)
+            .map_err(NftTransferError::from)
+    }
 }
 
 impl<C> NftTransferValidationContext for NftTransferContext<C>
@@ -342,6 +362,10 @@ where
         self.update_mint_amount(&ibc_token, true)?;
         self.add_deposit(&ibc_token)?;
 
+        // Store the IBC trace with the token hash to be able to retrieve it
+        // later
+        self.store_ibc_trace(account, class_id, token_id)?;
+
         self.inner
             .borrow_mut()
             .mint_token(account, &ibc_token, Amount::from_u64(1))

crates/ibc/src/context/storage.rs

@@ -12,12 +12,6 @@ pub trait IbcStorageContext: StorageRead + StorageWrite {
     /// Emit an IBC event
     fn emit_ibc_event(&mut self, event: IbcEvent) -> Result<(), Error>;
 
-    /// Get IBC events
-    fn get_ibc_events(
-        &self,
-        event_type: impl AsRef<str>,
-    ) -> Result<Vec<IbcEvent>, Error>;
-
     /// Transfer token
     fn transfer_token(
         &mut self,

crates/ibc/src/context/token_transfer.rs

@@ -141,6 +141,32 @@ where
             .store_withdraw(token, added_withdraw)
             .map_err(TokenTransferError::from)
     }
+
+    fn maybe_store_ibc_denom(
+        &self,
+        owner: &Address,
+        coin: &PrefixedCoin,
+    ) -> Result<(), TokenTransferError> {
+        if coin.denom.trace_path.is_empty() {
+            // It isn't an IBC denom
+            return Ok(());
+        }
+        let ibc_denom = coin.denom.to_string();
+        let trace_hash = storage::calc_hash(&ibc_denom);
+
+        self.inner
+            .borrow_mut()
+            .store_ibc_trace(owner.to_string(), &trace_hash, &ibc_denom)
+            .map_err(TokenTransferError::from)?;
+
+        let base_token = Address::decode(coin.denom.base_denom.as_str())
+            .map(|a| a.to_string())
+            .unwrap_or(coin.denom.base_denom.to_string());
+        self.inner
+            .borrow_mut()
+            .store_ibc_trace(base_token, &trace_hash, &ibc_denom)
+            .map_err(TokenTransferError::from)
+    }
 }
 
 impl<C> TokenTransferValidationContext for TokenTransferContext<C>
@@ -277,6 +303,10 @@ where
             self.insert_verifier(&ibc_token);
         }
 
+        // Store the IBC denom with the token hash to be able to retrieve it
+        // later
+        self.maybe_store_ibc_denom(account, coin)?;
+
         self.inner
             .borrow_mut()
             .mint_token(account, &ibc_token, amount)

crates/ibc/src/event.rs

@@ -19,7 +19,7 @@ use namada_core::ibc::core::host::types::identifiers::{
 use namada_core::ibc::primitives::Timestamp;
 use namada_core::tendermint::abci::Event as AbciEvent;
 use namada_events::extend::{
-    event_domain_of, AttributesMap, EventAttributeEntry, ExtendAttributesMap,
+    event_domain_of, AttributesMap, EventAttributeEntry,
     ReadFromEventAttributes as _,
 };
 use namada_events::{
@@ -140,63 +140,6 @@ pub struct IbcEvent {
     pub attributes: HashMap<String, String>,
 }
 
-fn validate_ibc_event_type(
-    namada_event: &Event,
-) -> Result<IbcEventType, EventError> {
-    if namada_event.kind().domain() != IbcEvent::DOMAIN {
-        return Err(EventError::InvalidEventType);
-    }
-
-    let event_type = namada_event.kind().sub_domain();
-
-    // TODO(namada#3229): validate IBC event types. eg:
-    //
-    // ```ignore
-    // if !matches!(
-    //    event_type,
-    //    "update_client" | "send_packet" | "write_acknowledgement"
-    // ) {
-    //     return Err(EventError::InvalidEventType);
-    // }
-    // ```
-
-    Ok(IbcEventType(event_type.to_owned()))
-}
-
-impl TryFrom<&Event> for IbcEvent {
-    type Error = EventError;
-
-    fn try_from(
-        namada_event: &Event,
-    ) -> std::result::Result<Self, Self::Error> {
-        Ok(Self {
-            event_type: validate_ibc_event_type(namada_event)?,
-            #[allow(deprecated)]
-            attributes: namada_event
-                .attributes()
-                .iter()
-                .map(|(k, v)| (k.clone(), v.clone()))
-                .collect(),
-        })
-    }
-}
-
-impl TryFrom<Event> for IbcEvent {
-    type Error = EventError;
-
-    fn try_from(namada_event: Event) -> std::result::Result<Self, Self::Error> {
-        Ok(Self {
-            event_type: validate_ibc_event_type(&namada_event)?,
-            attributes: {
-                let mut attrs: HashMap<_, _> =
-                    namada_event.into_attributes().into_iter().collect();
-                attrs.with_attribute(event_domain_of::<Self>());
-                attrs
-            },
-        })
-    }
-}
-
 impl std::cmp::PartialOrd for IbcEvent {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
         Some(self.cmp(other))