Parameterize accounts ids and amounts in ORM

crates/overflow-receive/src/lib.rs

@@ -100,14 +100,14 @@ pub trait OverflowRecvContext {
     /// Mint coins.
     fn mint_coins_execute(
         &mut self,
-        receiver: &Signer,
+        receiver: &<Self::PacketMetadata as PacketMetadata>::AccountId,
         coin: &Coin<PrefixedDenom>,
     ) -> Result<(), Self::Error>;
 
     /// Unescrow coins.
     fn unescrow_coins_execute(
         &mut self,
-        receiver: &Signer,
+        receiver: &<Self::PacketMetadata as PacketMetadata>::AccountId,
         port: &PortId,
         channel: &ChannelId,
         coin: &Coin<PrefixedDenom>,
@@ -163,9 +163,9 @@ where
         let (override_amount, remainder_amount) = match transfer_pkt
             .token
             .amount
-            .checked_sub(*orm_metadata.target_amount())
+            .checked_sub((*orm_metadata.target_amount()).into())
         {
-            Some(amt) if *amt != [0u64, 0, 0, 0] => (*orm_metadata.target_amount(), amt),
+            Some(amt) if *amt != [0u64, 0, 0, 0] => ((*orm_metadata.target_amount()).into(), amt),
             Some(_ /* = 0 */) => return Err(MiddlewareError::ForwardToNextMiddleware),
             None => {
                 return Err(MiddlewareError::Message(format!(

crates/overflow-receive/src/msg.rs

@@ -1,3 +1,4 @@
+use alloc::fmt::Display;
 use alloc::string::String;
 
 use ibc_app_transfer_types::Amount;
@@ -6,6 +7,12 @@ use ibc_primitives::Signer;
 /// Metadata included in ICS-20 packet memos,
 /// related with the overflow receive middleware.
 pub trait PacketMetadata {
+    /// Account identifier.
+    type AccountId: Display + Into<Signer>;
+
+    /// Amount type.
+    type Amount: Copy + Display + Into<Amount>;
+
     /// Determine if the value `msg` is a valid `PacketMetadata`.
     fn is_overflow_receive_msg(msg: &serde_json::Map<String, serde_json::Value>) -> bool;
 
@@ -16,9 +23,9 @@ pub trait PacketMetadata {
 
     /// Account that shall receive the funds in case of an
     /// overflow.
-    fn overflow_receiver(&self) -> &Signer;
+    fn overflow_receiver(&self) -> &Self::AccountId;
 
     /// The target amount that the original receiver will
     /// receive.
-    fn target_amount(&self) -> &Amount;
+    fn target_amount(&self) -> &Self::Amount;
 }

crates/overflow-receive/src/tests/utils.rs

@@ -46,6 +46,9 @@ pub struct OverflowReceiveMetadata {
 }
 
 impl msg::PacketMetadata for OrmPacketMetadata {
+    type AccountId = Signer;
+    type Amount = Amount;
+
     fn is_overflow_receive_msg(msg: &serde_json::Map<String, serde_json::Value>) -> bool {
         msg.contains_key("overflow_receive")
     }