diff --git a/apps/src/lib/cli/context.rs b/apps/src/lib/cli/context.rs index 590fdae744c..f66e953f4b6 100644 --- a/apps/src/lib/cli/context.rs +++ b/apps/src/lib/cli/context.rs @@ -6,8 +6,8 @@ use std::path::{Path, PathBuf}; use std::str::FromStr; use color_eyre::eyre::Result; -use namada::ledger::wallet::Wallet; use namada::sdk::masp::ShieldedContext; +use namada::sdk::wallet::Wallet; use namada::types::address::{Address, InternalAddress}; use namada::types::chain::ChainId; use namada::types::ethereum_events::EthAddress; diff --git a/apps/src/lib/cli/wallet.rs b/apps/src/lib/cli/wallet.rs index 64cf120cc87..a8fbfc3c975 100644 --- a/apps/src/lib/cli/wallet.rs +++ b/apps/src/lib/cli/wallet.rs @@ -7,8 +7,8 @@ use borsh::BorshSerialize; use color_eyre::eyre::Result; use itertools::sorted; use masp_primitives::zip32::ExtendedFullViewingKey; -use namada::ledger::wallet::{DecryptionError, FindKeyError}; use namada::sdk::masp::find_valid_diversifier; +use namada::sdk::wallet::{DecryptionError, FindKeyError}; use namada::types::key::*; use namada::types::masp::{MaspValue, PaymentAddress}; use rand_core::OsRng; diff --git a/apps/src/lib/client/rpc.rs b/apps/src/lib/client/rpc.rs index 7ad413d584b..f8ab74ff28b 100644 --- a/apps/src/lib/client/rpc.rs +++ b/apps/src/lib/client/rpc.rs @@ -33,7 +33,6 @@ use namada::ledger::parameters::{storage as param_storage, EpochDuration}; use namada::ledger::pos::{CommissionPair, PosParams, Slash}; use namada::ledger::queries::RPC; use namada::ledger::storage::ConversionState; -use namada::ledger::wallet::{AddressVpType, Wallet}; use namada::proof_of_stake::types::{ValidatorState, WeightedValidator}; use namada::sdk::masp::{ Conversions, MaspAmount, MaspChange, ShieldedContext, ShieldedUtils, @@ -42,6 +41,7 @@ use namada::sdk::rpc::{ self, enriched_bonds_and_unbonds, format_denominated_amount, query_epoch, TxResponse, }; +use namada::sdk::wallet::{AddressVpType, Wallet}; use namada::types::address::{masp, Address}; use namada::types::control_flow::ProceedOrElse; use namada::types::error::{is_pinned_error, Error, PinnedBalanceError}; diff --git a/apps/src/lib/client/tx.rs b/apps/src/lib/client/tx.rs index c93e27106b4..a4441df373c 100644 --- a/apps/src/lib/client/tx.rs +++ b/apps/src/lib/client/tx.rs @@ -14,10 +14,10 @@ use namada::core::ledger::governance::cli::onchain::{ DefaultProposal, PgfFundingProposal, PgfStewardProposal, ProposalVote, }; use namada::ledger::pos; -use namada::ledger::wallet::{Wallet, WalletUtils}; use namada::proof_of_stake::parameters::PosParams; use namada::proto::Tx; use namada::sdk::rpc::{TxBroadcastData, TxResponse}; +use namada::sdk::wallet::{Wallet, WalletUtils}; use namada::sdk::{masp, signing, tx}; use namada::tendermint_rpc::HttpClient; use namada::types::address::{Address, ImplicitAddress}; diff --git a/apps/src/lib/client/utils.rs b/apps/src/lib/client/utils.rs index 77b18f9136f..0eedb23968a 100644 --- a/apps/src/lib/client/utils.rs +++ b/apps/src/lib/client/utils.rs @@ -10,7 +10,7 @@ use borsh::BorshSerialize; use flate2::read::GzDecoder; use flate2::write::GzEncoder; use flate2::Compression; -use namada::ledger::wallet::Wallet; +use namada::sdk::wallet::Wallet; use namada::types::address; use namada::types::chain::ChainId; use namada::types::dec::Dec; diff --git a/apps/src/lib/wallet/cli_utils.rs b/apps/src/lib/wallet/cli_utils.rs index 405b3a99fa3..72bb0acaab2 100644 --- a/apps/src/lib/wallet/cli_utils.rs +++ b/apps/src/lib/wallet/cli_utils.rs @@ -4,8 +4,8 @@ use std::io::{self, Write}; use borsh::BorshSerialize; use itertools::sorted; use masp_primitives::zip32::ExtendedFullViewingKey; -use namada::ledger::wallet::{DecryptionError, FindKeyError}; use namada::sdk::masp::find_valid_diversifier; +use namada::sdk::wallet::{DecryptionError, FindKeyError}; use namada::types::key::{PublicKeyHash, RefTo}; use namada::types::masp::{MaspValue, PaymentAddress}; use rand_core::OsRng; diff --git a/apps/src/lib/wallet/defaults.rs b/apps/src/lib/wallet/defaults.rs index 88d9589e69e..00b0f49d269 100644 --- a/apps/src/lib/wallet/defaults.rs +++ b/apps/src/lib/wallet/defaults.rs @@ -8,8 +8,8 @@ pub use dev::{ validator_keys, }; use namada::core::ledger::eth_bridge::storage::bridge_pool::BRIDGE_POOL_ADDRESS; -use namada::ledger::wallet::alias::Alias; use namada::ledger::{eth_bridge, governance, pgf, pos}; +use namada::sdk::wallet::alias::Alias; use namada::types::address::Address; use namada::types::key::*; @@ -77,8 +77,8 @@ mod dev { use std::collections::HashMap; use borsh::BorshDeserialize; - use namada::ledger::wallet::alias::Alias; use namada::ledger::{governance, pgf, pos}; + use namada::sdk::wallet::alias::Alias; use namada::types::address::{ apfel, btc, dot, eth, kartoffel, nam, schnitzel, Address, }; diff --git a/apps/src/lib/wallet/mod.rs b/apps/src/lib/wallet/mod.rs index 7c9c193087e..f6611ebe180 100644 --- a/apps/src/lib/wallet/mod.rs +++ b/apps/src/lib/wallet/mod.rs @@ -9,12 +9,12 @@ use std::str::FromStr; use std::{env, fs}; use namada::bip39::{Language, Mnemonic}; -pub use namada::ledger::wallet::alias::Alias; -use namada::ledger::wallet::{ +pub use namada::sdk::wallet::alias::Alias; +use namada::sdk::wallet::{ AddressVpType, ConfirmationResponse, FindKeyError, GenRestoreKeyError, Wallet, WalletUtils, }; -pub use namada::ledger::wallet::{ValidatorData, ValidatorKeys}; +pub use namada::sdk::wallet::{ValidatorData, ValidatorKeys}; use namada::types::address::Address; use namada::types::key::*; use rand_core::OsRng; @@ -309,7 +309,7 @@ pub fn read_and_confirm_encryption_password( #[cfg(test)] mod tests { use namada::bip39::MnemonicType; - use namada::ledger::wallet::WalletUtils; + use namada::sdk::wallet::WalletUtils; use rand_core; use super::CliWalletUtils; diff --git a/apps/src/lib/wallet/pre_genesis.rs b/apps/src/lib/wallet/pre_genesis.rs index 3b05bb214fe..21a80267f1d 100644 --- a/apps/src/lib/wallet/pre_genesis.rs +++ b/apps/src/lib/wallet/pre_genesis.rs @@ -3,10 +3,10 @@ use std::path::{Path, PathBuf}; use ark_serialize::{Read, Write}; use fd_lock::RwLock; -use namada::ledger::wallet::pre_genesis::{ +use namada::sdk::wallet::pre_genesis::{ ReadError, ValidatorStore, ValidatorWallet, }; -use namada::ledger::wallet::{gen_key_to_store, WalletUtils}; +use namada::sdk::wallet::{gen_key_to_store, WalletUtils}; use namada::types::key::SchemeType; use zeroize::Zeroizing; diff --git a/apps/src/lib/wallet/store.rs b/apps/src/lib/wallet/store.rs index 6ae0d023d94..0f2aa86b7be 100644 --- a/apps/src/lib/wallet/store.rs +++ b/apps/src/lib/wallet/store.rs @@ -9,10 +9,10 @@ use ark_std::rand::prelude::*; use ark_std::rand::SeedableRng; use fd_lock::RwLock; #[cfg(not(feature = "dev"))] -use namada::ledger::wallet::store::AddressVpType; +use namada::sdk::wallet::store::AddressVpType; #[cfg(feature = "dev")] -use namada::ledger::wallet::StoredKeypair; -use namada::ledger::wallet::{gen_sk_rng, Store, ValidatorKeys}; +use namada::sdk::wallet::StoredKeypair; +use namada::sdk::wallet::{gen_sk_rng, Store, ValidatorKeys}; #[cfg(not(feature = "dev"))] use namada::types::address::Address; use namada::types::key::*; diff --git a/benches/lib.rs b/benches/lib.rs index 2223cc8f3a8..d9fed603e76 100644 --- a/benches/lib.rs +++ b/benches/lib.rs @@ -71,7 +71,7 @@ use namada::sdk::masp::{ use namada::ledger::queries::{ Client, EncodedResponseQuery, RequestCtx, RequestQuery, Router, RPC, }; -use namada::ledger::wallet::Wallet; +use namada::sdk::wallet::Wallet; use namada::proof_of_stake; use namada::proto::{Code, Data, Section, Signature, Tx}; use namada::tendermint::Hash; diff --git a/shared/src/ledger/eth_bridge/bridge_pool.rs b/shared/src/ledger/eth_bridge/bridge_pool.rs index 78a7b1c1bc8..bc7d1694b92 100644 --- a/shared/src/ledger/eth_bridge/bridge_pool.rs +++ b/shared/src/ledger/eth_bridge/bridge_pool.rs @@ -21,12 +21,12 @@ use crate::eth_bridge::structs::RelayProof; use crate::ledger::queries::{ Client, GenBridgePoolProofReq, GenBridgePoolProofRsp, RPC, }; -use crate::ledger::wallet::{Wallet, WalletUtils}; use crate::proto::Tx; use crate::sdk::args; use crate::sdk::masp::{ShieldedContext, ShieldedUtils}; use crate::sdk::rpc::{query_wasm_code_hash, validate_amount}; use crate::sdk::tx::prepare_tx; +use crate::sdk::wallet::{Wallet, WalletUtils}; use crate::types::address::Address; use crate::types::control_flow::time::{Duration, Instant}; use crate::types::control_flow::{ diff --git a/shared/src/ledger/mod.rs b/shared/src/ledger/mod.rs index e62fd648872..04b5809bc27 100644 --- a/shared/src/ledger/mod.rs +++ b/shared/src/ledger/mod.rs @@ -13,7 +13,6 @@ pub mod protocol; pub mod queries; pub mod storage; pub mod vp_host_fns; -pub mod wallet; pub use namada_core::ledger::{ gas, parameters, replay_protection, storage_api, tx_env, vp_env, diff --git a/shared/src/sdk/mod.rs b/shared/src/sdk/mod.rs index 69e32f087d3..cf7236af5f5 100644 --- a/shared/src/sdk/mod.rs +++ b/shared/src/sdk/mod.rs @@ -8,3 +8,4 @@ pub mod signing; pub mod tx; pub mod queries; +pub mod wallet; diff --git a/shared/src/sdk/signing.rs b/shared/src/sdk/signing.rs index fd4ceb13ae5..639e3f28c5d 100644 --- a/shared/src/sdk/signing.rs +++ b/shared/src/sdk/signing.rs @@ -27,8 +27,6 @@ use zeroize::Zeroizing; use crate::ibc::applications::transfer::msgs::transfer::MsgTransfer; use crate::ibc_proto::google::protobuf::Any; use crate::ledger::parameters::storage as parameter_storage; -pub use crate::ledger::wallet::store::AddressVpType; -use crate::ledger::wallet::{Wallet, WalletUtils}; use crate::proto::{MaspBuilder, Section, Tx}; use crate::sdk::masp::{ make_asset_type, ShieldedContext, ShieldedTransfer, ShieldedUtils, @@ -42,6 +40,8 @@ use crate::sdk::tx::{ TX_UNBOND_WASM, TX_UPDATE_ACCOUNT_WASM, TX_VOTE_PROPOSAL, TX_WITHDRAW_WASM, VP_USER_WASM, }; +pub use crate::sdk::wallet::store::AddressVpType; +use crate::sdk::wallet::{Wallet, WalletUtils}; use crate::sdk::{args, rpc}; use crate::types::error::{EncodingError, Error, TxError}; use crate::types::key::*; diff --git a/shared/src/sdk/tx.rs b/shared/src/sdk/tx.rs index dff903bd34f..fa26619e9f1 100644 --- a/shared/src/sdk/tx.rs +++ b/shared/src/sdk/tx.rs @@ -42,7 +42,6 @@ use crate::ibc::core::timestamp::Timestamp as IbcTimestamp; use crate::ibc::core::Msg; use crate::ibc::Height as IbcHeight; use crate::ledger::ibc::storage::ibc_denom_key; -use crate::ledger::wallet::{Wallet, WalletUtils}; use crate::proto::{MaspBuilder, Tx}; use crate::sdk::args::{self, InputAmount}; use crate::sdk::masp::TransferErr::Build; @@ -52,6 +51,7 @@ use crate::sdk::rpc::{ TxBroadcastData, TxResponse, }; use crate::sdk::signing::{self, TxSourcePostBalance}; +use crate::sdk::wallet::{Wallet, WalletUtils}; use crate::tendermint_rpc::endpoint::broadcast::tx_sync::Response; use crate::tendermint_rpc::error::Error as RpcError; use crate::types::control_flow::{time, ProceedOrElse}; diff --git a/shared/src/ledger/wallet/alias.rs b/shared/src/sdk/wallet/alias.rs similarity index 100% rename from shared/src/ledger/wallet/alias.rs rename to shared/src/sdk/wallet/alias.rs diff --git a/shared/src/ledger/wallet/derivation_path.rs b/shared/src/sdk/wallet/derivation_path.rs similarity index 100% rename from shared/src/ledger/wallet/derivation_path.rs rename to shared/src/sdk/wallet/derivation_path.rs diff --git a/shared/src/ledger/wallet/keys.rs b/shared/src/sdk/wallet/keys.rs similarity index 99% rename from shared/src/ledger/wallet/keys.rs rename to shared/src/sdk/wallet/keys.rs index d13ebbd07c2..867a2b1ad0c 100644 --- a/shared/src/ledger/wallet/keys.rs +++ b/shared/src/sdk/wallet/keys.rs @@ -11,7 +11,7 @@ use serde::{Deserialize, Serialize}; use thiserror::Error; use zeroize::Zeroizing; -use crate::ledger::wallet::WalletUtils; +use crate::sdk::wallet::WalletUtils; const ENCRYPTED_KEY_PREFIX: &str = "encrypted:"; const UNENCRYPTED_KEY_PREFIX: &str = "unencrypted:"; diff --git a/shared/src/ledger/wallet/mod.rs b/shared/src/sdk/wallet/mod.rs similarity index 100% rename from shared/src/ledger/wallet/mod.rs rename to shared/src/sdk/wallet/mod.rs diff --git a/shared/src/ledger/wallet/pre_genesis.rs b/shared/src/sdk/wallet/pre_genesis.rs similarity index 97% rename from shared/src/ledger/wallet/pre_genesis.rs rename to shared/src/sdk/wallet/pre_genesis.rs index dc19c8bfe54..fd66dedbfec 100644 --- a/shared/src/ledger/wallet/pre_genesis.rs +++ b/shared/src/sdk/wallet/pre_genesis.rs @@ -3,8 +3,8 @@ use serde::{Deserialize, Serialize}; use thiserror::Error; use zeroize::Zeroizing; -use crate::ledger::wallet; -use crate::ledger::wallet::{store, StoredKeypair}; +use crate::sdk::wallet; +use crate::sdk::wallet::{store, StoredKeypair}; use crate::types::key::{common, SchemeType}; /// Ways in which wallet store operations can fail diff --git a/shared/src/ledger/wallet/store.rs b/shared/src/sdk/wallet/store.rs similarity index 99% rename from shared/src/ledger/wallet/store.rs rename to shared/src/sdk/wallet/store.rs index 09e04ed836f..509ff5afe68 100644 --- a/shared/src/ledger/wallet/store.rs +++ b/shared/src/sdk/wallet/store.rs @@ -17,7 +17,7 @@ use zeroize::Zeroizing; use super::alias::{self, Alias}; use super::derivation_path::DerivationPath; use super::pre_genesis; -use crate::ledger::wallet::{StoredKeypair, WalletUtils}; +use crate::sdk::wallet::{StoredKeypair, WalletUtils}; use crate::types::address::{Address, ImplicitAddress}; use crate::types::key::dkg_session_keys::DkgKeypair; use crate::types::key::*;