upgrade to 0.37.0 (#37)

anoma · May 28, 2024 · 0d72988 · 0d72988
1 parent daf09f3
commit 0d72988
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -39,12 +39,12 @@ axum-macros = "0.3.8"
 chrono = { version = "0.4.30", features = ["serde"] }
 async-trait = "0.1.73"
 anyhow = "1.0.75"
-namada_core = { git = "https://github.com/anoma/namada", tag = "v0.36.0" }
-namada_sdk = { git = "https://github.com/anoma/namada", tag = "v0.36.0" }
-namada_tx = { git = "https://github.com/anoma/namada", tag = "v0.36.0" }
-namada_governance = { git = "https://github.com/anoma/namada", tag = "v0.36.0" }
-namada_ibc = { git = "https://github.com/anoma/namada", tag = "v0.36.0" }
-namada_token = { git = "https://github.com/anoma/namada", tag = "v0.36.0" }
+namada_core = { git = "https://github.com/anoma/namada", tag = "v0.37.0" }
+namada_sdk = { git = "https://github.com/anoma/namada", tag = "v0.37.0" }
+namada_tx = { git = "https://github.com/anoma/namada", tag = "v0.37.0" }
+namada_governance = { git = "https://github.com/anoma/namada", tag = "v0.37.0" }
+namada_ibc = { git = "https://github.com/anoma/namada", tag = "v0.37.0" }
+namada_token = { git = "https://github.com/anoma/namada", tag = "v0.37.0" }
 tendermint = "0.36.0"
 tendermint-config = "0.36.0"
 tendermint-rpc = { version = "0.36.0", features = ["http-client"] }

diff --git a/shared/src/id.rs b/shared/src/id.rs
@@ -1,8 +1,12 @@
 use std::fmt::Display;
 use std::str::FromStr;
 
-use namada_core::address::Address as NamadaAddress;
-use namada_core::hash::Hash as NamadaHash;
+
+use namada_sdk::address::Address as NamadaAddress;
+use namada_core::address::Address as NamadaCoreAddress; // what
+// use namada_core::address::Address as NamadaAddress;
+// use namada_core::hash::Hash as NamadaHash;
+use namada_sdk::hash::Hash as NamadaHash;
 use namada_sdk::key::common;
 use serde::{Deserialize, Serialize};
 use tendermint::account::Id as TendermintAccountId;
@@ -66,6 +70,12 @@ impl From<NamadaAddress> for Id {
     }
 }
 
+impl From<NamadaCoreAddress> for Id {
+    fn from(value: NamadaCoreAddress) -> Self {
+        Self::Account(value.to_string().to_lowercase())
+    }
+}
+
 impl From<Id> for NamadaAddress {
     fn from(value: Id) -> Self {
         match value {

diff --git a/shared/src/proposal.rs b/shared/src/proposal.rs
@@ -1,4 +1,5 @@
 use std::collections::BTreeSet;
+use std::str::FromStr;
 
 use fake::Fake;
 use namada_governance::storage::proposal::{
@@ -116,7 +117,7 @@ impl GovernanceProposal {
                 )));
                 data.insert(PGFAction::Retro(PGFTarget::Internal(
                     PGFInternalTarget {
-                        target: address_retro,
+                        target: namada_sdk::address::Address::from_str(&address_retro.to_string()).unwrap(),
                         amount: Amount::from_u64((0..1000).fake::<u64>()),
                     },
                 )));