Handle receiving PFM packets with invalid receivers

Cargo.toml

@@ -119,10 +119,10 @@ fs_extra = "1.2.0"
 futures = "0.3"
 git2 = { version = "0.18.1", default-features = false }
 # branch tiago/optional-ack
-ibc = { git = "https://github.com/heliaxdev/cosmos-ibc-rs", rev = "aa229566e6bb688cc2626dab276c3849abc0c583", features = ["serde"] }
-ibc-derive = { git = "https://github.com/heliaxdev/cosmos-ibc-rs", rev = "aa229566e6bb688cc2626dab276c3849abc0c583" }
-ibc-middleware-packet-forward = { git = "https://github.com/heliaxdev/ibc-middleware", tag = "pfm/v0.6.0", features = ["borsh"] }
-ibc-testkit = { git = "https://github.com/heliaxdev/cosmos-ibc-rs", rev = "aa229566e6bb688cc2626dab276c3849abc0c583", default-features = false }
+ibc = { git = "https://github.com/heliaxdev/cosmos-ibc-rs", rev = "38489943c4e75206eaffeeeec6153c039c2499d1", features = ["serde"] }
+ibc-derive = { git = "https://github.com/heliaxdev/cosmos-ibc-rs", rev = "38489943c4e75206eaffeeeec6153c039c2499d1" }
+ibc-middleware-packet-forward = { git = "https://github.com/heliaxdev/ibc-middleware", tag = "pfm/v0.8.0", features = ["borsh"] }
+ibc-testkit = { git = "https://github.com/heliaxdev/cosmos-ibc-rs", rev = "38489943c4e75206eaffeeeec6153c039c2499d1", default-features = false }
 ics23 = "0.12.0"
 index-set = { git = "https://github.com/heliaxdev/index-set", tag = "v0.8.1", features = ["serialize-borsh", "serialize-serde"] }
 indexmap = { git = "https://github.com/heliaxdev/indexmap", tag = "2.2.4-heliax-1", features = ["borsh-schema", "serde"] }

crates/core/src/address.rs

@@ -393,11 +393,10 @@ impl Debug for Address {
     }
 }
 
-// compute an Address from an IBC signer
-impl TryFrom<Signer> for Address {
+impl TryFrom<&Signer> for Address {
     type Error = DecodeError;
 
-    fn try_from(signer: Signer) -> Result<Self> {
+    fn try_from(signer: &Signer) -> Result<Self> {
         // The given address should be an address or payment address. When
         // sending a token from a spending key, it has been already
         // replaced with the MASP address.
@@ -412,6 +411,14 @@ impl TryFrom<Signer> for Address {
     }
 }
 
+impl TryFrom<Signer> for Address {
+    type Error = DecodeError;
+
+    fn try_from(signer: Signer) -> Result<Self> {
+        (&signer).try_into()
+    }
+}
+
 /// An established address is generated on-chain
 #[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))]
 #[derive(

crates/ibc/src/context/middlewares.rs

@@ -32,7 +32,7 @@ where
     C: IbcCommonContext + Debug,
     Params: namada_systems::parameters::Read<<C as IbcStorageContext>::Storage>,
 {
-    PacketForwardMiddleware::next(PfmTransferModule {
+    PacketForwardMiddleware::wrap(PfmTransferModule {
         transfer_module: TransferModule::new(ctx, verifiers),
         _phantom: PhantomData,
     })

crates/ibc/src/context/middlewares/pfm_mod.rs

@@ -225,7 +225,23 @@ where
         packet: &Packet,
         relayer: &Signer,
     ) -> (ModuleExtras, Option<Acknowledgement>) {
-        self.transfer_module.on_recv_packet_execute(packet, relayer)
+        let Ok(packet_data) =
+            serde_json::from_slice::<PacketData>(&packet.data)
+        else {
+            return self
+                .transfer_module
+                .on_recv_packet_execute(packet, relayer);
+        };
+
+        if crate::is_packet_forward(&packet_data) {
+            self.transfer_module.ctx.enable_parse_addr_as_governance();
+            let ret =
+                self.transfer_module.on_recv_packet_execute(packet, relayer);
+            self.transfer_module.ctx.disable_parse_addr_as_governance();
+            ret
+        } else {
+            self.transfer_module.on_recv_packet_execute(packet, relayer)
+        }
     }
 
     fn on_acknowledgement_packet_validate(