for Namada 0.40.0 draft

heliaxdev · Jul 4, 2024 · f401175 · f401175
1 parent 1dd59c3
commit f401175
Show file tree

Hide file tree

Showing 6 changed files with 83 additions and 44 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -39,10 +39,10 @@ tendermint-rpc                   = { version = "=0.36.0" }
 tendermint-testgen               = { version = "=0.36.0" }
 
 # Namada dependencies
-namada_ibc        = { git = "https://github.com/anoma/namada", rev = "da7aff487fb7cd6d48c84e5c21192f8be52bf9bb" }
-namada_parameters = { git = "https://github.com/anoma/namada", rev = "da7aff487fb7cd6d48c84e5c21192f8be52bf9bb" }
-namada_sdk        = { git = "https://github.com/anoma/namada", rev = "da7aff487fb7cd6d48c84e5c21192f8be52bf9bb" }
-namada_token      = { git = "https://github.com/anoma/namada", rev = "da7aff487fb7cd6d48c84e5c21192f8be52bf9bb" }
+namada_ibc        = { git = "https://github.com/anoma/namada", rev = "59332a22943e47c74cfcec4a2d08281822ba75f9" }
+namada_parameters = { git = "https://github.com/anoma/namada", rev = "59332a22943e47c74cfcec4a2d08281822ba75f9" }
+namada_sdk        = { git = "https://github.com/anoma/namada", rev = "59332a22943e47c74cfcec4a2d08281822ba75f9" }
+namada_token      = { git = "https://github.com/anoma/namada", rev = "59332a22943e47c74cfcec4a2d08281822ba75f9" }
 
 # Other dependencies
 abscissa_core            = "=0.6.0"

diff --git a/crates/relayer/src/chain/namada/query.rs b/crates/relayer/src/chain/namada/query.rs
@@ -136,12 +136,12 @@ impl NamadaChain {
                         height,
                     )]);
                 }
-                let events = tx_result.batch_results.0.into_iter().filter_map(|(_, r)| {
-                    r.map(|batched_tx_result| {
+                let events = tx_result.batch_results.iter().filter_map(|(_, r)| {
+                    r.as_ref().map(|batched_tx_result| {
                         // Get IBC events when the transaction was accepted
                         if batched_tx_result.is_accepted() {
-                            batched_tx_result.events.into_iter().filter_map(|event| {
-                                ibc_event_try_from_abci_event(&event.into()).ok()
+                            batched_tx_result.events.iter().filter_map(|event| {
+                                ibc_event_try_from_abci_event(&event.clone().into()).ok()
                             }).map(|ibc_event| IbcEventWithHeight::new(ibc_event, height)).collect()
                         } else {
                             vec![IbcEventWithHeight::new(