Merge pull request #7 from heliaxdev/tomas/update-namada

update namada 0.31.7
heliaxdev · Mar 3, 2024 · 767af6f · 767af6f
2 parents 2ec46ec + 4b4d733
commit 767af6f
Show file tree

Hide file tree

Showing 12 changed files with 79 additions and 72 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,7 +11,8 @@ rand = {version = "0.8", default-features = false}
 rand_core = {version = "0.6", default-features = false}
 serde = { version = "1.0.188", features = ["derive"] }
 serde_json = "1.0.107"
-namada_sdk = { git = "https://github.com/anoma/namada", rev = "v0.31.5", default-features = false, features = ["tendermint-rpc", "std", "async-send", "download-params", "rand"] }
+namada_sdk = { git = "https://github.com/anoma/namada", rev = "v0.31.7", default-features = false, features = ["tendermint-rpc", "std", "async-send", "download-params", "rand"] }
+namada_core = { git = "https://github.com/anoma/namada", rev = "v0.31.7" }
 tendermint-config = "0.34.0"
 tendermint-rpc = { version = "0.34.0", features = ["http-client"]}
 tokio = {version = "1.8.2", default-features = false}

diff --git a/src/entity/address.rs b/src/entity/address.rs
@@ -1,16 +1,14 @@
 use std::str::FromStr;
 
 use namada_sdk::{
-    types::{
-        address::Address,
-        key::common::{self, PublicKey},
-    },
+    address::Address,
+    key::common::{self, PublicKey},
     rpc, Namada,
 };
 
 use crate::{sdk::namada::Sdk, state::state::StateAddress};
 
-pub const ADDRESS_PREFIX: &str = namada_sdk::types::string_encoding::ADDRESS_HRP;
+pub const ADDRESS_PREFIX: &str = namada_sdk::string_encoding::ADDRESS_HRP;
 
 #[derive(Clone, Debug)]
 pub enum AccountIndentifier {

diff --git a/src/queries/bonded_stake.rs b/src/queries/bonded_stake.rs
@@ -1,5 +1,5 @@
 use async_trait::async_trait;
-use namada_sdk::{types::storage::Epoch, rpc, Namada};
+use namada_sdk::{rpc, storage::Epoch, Namada};
 use serde::Deserialize;
 
 use crate::{

diff --git a/src/queries/proposal.rs b/src/queries/proposal.rs
@@ -1,5 +1,5 @@
 use async_trait::async_trait;
-use namada_sdk::{types::storage::Epoch, rpc, Namada};
+use namada_sdk::{rpc, storage::Epoch, Namada};
 use serde::Deserialize;
 
 use crate::{

diff --git a/src/queries/validators.rs b/src/queries/validators.rs
@@ -41,7 +41,7 @@ impl Query for ValidatorsQuery {
 
     async fn execute(&self, sdk: &Sdk, parameters: Self::P, _state: &Storage) -> StepResult {
         let current_epoch = match parameters.epoch {
-            Some(value) => namada_sdk::types::storage::Epoch::from(value),
+            Some(value) => namada_sdk::storage::Epoch::from(value),
             None => rpc::query_epoch(sdk.namada.client()).await.unwrap(),
         };
         let validators = rpc::get_all_validators(sdk.namada.client(), current_epoch)

diff --git a/src/sdk/namada.rs b/src/sdk/namada.rs
@@ -2,15 +2,15 @@ use std::{path::PathBuf, str::FromStr};
 
 use namada_sdk::{
     args::TxBuilder,
-    types::{
-        address::{Address, ImplicitAddress},
-        chain::ChainId,
-        key::common::{PublicKey, SecretKey},
-    },
     io::NullIo,
     masp::{fs::FsShieldedUtils, ShieldedContext},
     wallet::{fs::FsWalletUtils, Wallet},
     NamadaImpl,
+    {
+        address::{Address, ImplicitAddress},
+        chain::ChainId,
+        key::common::{PublicKey, SecretKey},
+    },
 };
 use tendermint_rpc::HttpClient;
 

diff --git a/src/tasks/bond.rs b/src/tasks/bond.rs
@@ -1,5 +1,5 @@
 use async_trait::async_trait;
-use namada_sdk::{args::TxBuilder, types::token::Amount, signing::default_sign, Namada};
+use namada_sdk::{args::TxBuilder, signing::default_sign, token::Amount, Namada};
 use serde::Deserialize;
 
 use crate::{

diff --git a/src/tasks/redelegate.rs b/src/tasks/redelegate.rs
@@ -1,5 +1,5 @@
 use async_trait::async_trait;
-use namada_sdk::{args::TxBuilder, types::token::Amount, signing::default_sign, Namada};
+use namada_sdk::{args::TxBuilder, signing::default_sign, token::Amount, Namada};
 use serde::Deserialize;
 
 use super::{Task, TaskParam};

diff --git a/src/tasks/reveal_pk.rs b/src/tasks/reveal_pk.rs
@@ -1,6 +1,6 @@
 use async_trait::async_trait;
 
-use namada_sdk::{args::TxBuilder, types::address::Address, signing::default_sign, Namada};
+use namada_sdk::{address::Address, args::TxBuilder, signing::default_sign, Namada};
 
 use serde::Deserialize;