upgrade to 0.38.1 (#38)

anoma · May 31, 2024 · 9b1f96c · 9b1f96c
1 parent 0d72988
commit 9b1f96c
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 25 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.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" }
+namada_core = { git = "https://github.com/anoma/namada", tag = "v0.38.1" }
+namada_sdk = { git = "https://github.com/anoma/namada", tag = "v0.38.1" }
+namada_tx = { git = "https://github.com/anoma/namada", tag = "v0.38.1" }
+namada_governance = { git = "https://github.com/anoma/namada", tag = "v0.38.1" }
+namada_ibc = { git = "https://github.com/anoma/namada", tag = "v0.38.1" }
+namada_token = { git = "https://github.com/anoma/namada", tag = "v0.38.1" }
 tendermint = "0.36.0"
 tendermint-config = "0.36.0"
 tendermint-rpc = { version = "0.36.0", features = ["http-client"] }

diff --git a/orm/src/schema.rs b/orm/src/schema.rs
@@ -1,15 +1,27 @@
 // @generated automatically by Diesel CLI.
 
 pub mod sql_types {
-    #[derive(diesel::query_builder::QueryId, std::fmt::Debug, diesel::sql_types::SqlType)]
+    #[derive(
+        diesel::query_builder::QueryId,
+        std::fmt::Debug,
+        diesel::sql_types::SqlType,
+    )]
     #[diesel(postgres_type(name = "governance_kind"))]
     pub struct GovernanceKind;
 
-    #[derive(diesel::query_builder::QueryId, std::fmt::Debug, diesel::sql_types::SqlType)]
+    #[derive(
+        diesel::query_builder::QueryId,
+        std::fmt::Debug,
+        diesel::sql_types::SqlType,
+    )]
     #[diesel(postgres_type(name = "governance_result"))]
     pub struct GovernanceResult;
 
-    #[derive(diesel::query_builder::QueryId, std::fmt::Debug, diesel::sql_types::SqlType)]
+    #[derive(
+        diesel::query_builder::QueryId,
+        std::fmt::Debug,
+        diesel::sql_types::SqlType,
+    )]
     #[diesel(postgres_type(name = "vote_kind"))]
     pub struct VoteKind;
 }

diff --git a/pos/src/services/namada.rs b/pos/src/services/namada.rs
@@ -41,9 +41,9 @@ pub async fn get_validator_set_at_epoch(
                     .await
                     .with_context(|| {
                         format!(
-                        "Failed to query commission of validator {address} \
-                             at epoch {namada_epoch}"
-                    )
+                            "Failed to query commission of validator \
+                             {address} at epoch {namada_epoch}"
+                        )
                     })
             };
 

diff --git a/shared/Cargo.toml b/shared/Cargo.toml
@@ -19,7 +19,7 @@ bimap.workspace = true
 futures-core.workspace = true
 futures-util.workspace = true
 futures.workspace = true
-namada_core = { git = "https://github.com/anoma/namada", tag = "v0.36.0", features = ["testing"]}
+namada_core.workspace = true
 namada_governance.workspace = true
 namada_ibc.workspace = true
 namada_sdk.workspace = true

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