From 6183b878e6675950aa387100c8c1df00b9e39ef0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Zemanovi=C4=8D?= Date: Mon, 24 Jun 2024 12:03:53 +0100 Subject: [PATCH] chore: switch to use namada_sdk instead of namada --- packages/shared/lib/Cargo.toml | 4 +- packages/shared/lib/src/query.rs | 40 +++++++++---------- packages/shared/lib/src/rpc_client.rs | 16 ++++---- packages/shared/lib/src/sdk/io.rs | 2 +- packages/shared/lib/src/sdk/masp/masp_node.rs | 4 +- packages/shared/lib/src/sdk/masp/masp_web.rs | 10 ++--- packages/shared/lib/src/sdk/mod.rs | 28 ++++++------- packages/shared/lib/src/sdk/signature.rs | 6 +-- packages/shared/lib/src/sdk/tx.rs | 34 ++++++++-------- packages/shared/lib/src/sdk/wallet/mod.rs | 8 ++-- .../shared/lib/src/sdk/wallet/wallet_node.rs | 8 ++-- .../shared/lib/src/sdk/wallet/wallet_web.rs | 8 ++-- packages/shared/lib/src/types/address.rs | 4 +- packages/shared/lib/src/types/masp.rs | 6 +-- packages/shared/lib/src/types/query.rs | 6 +-- 15 files changed, 91 insertions(+), 93 deletions(-) diff --git a/packages/shared/lib/Cargo.toml b/packages/shared/lib/Cargo.toml index d46925c680..d10645bc66 100644 --- a/packages/shared/lib/Cargo.toml +++ b/packages/shared/lib/Cargo.toml @@ -13,7 +13,7 @@ crate-type = ["cdylib", "rlib"] [features] default = [] dev = [] -multicore = ["wasm-bindgen-rayon", "namada/multicore"] +multicore = ["wasm-bindgen-rayon", "namada_sdk/multicore"] nodejs = [] web = [] @@ -24,7 +24,7 @@ chrono = "0.4.22" getrandom = { version = "0.2.7", features = ["js"] } gloo-utils = { version = "0.1.5", features = ["serde"] } js-sys = "0.3.60" -namada = { git = "https://github.com/anoma/namada", version = "0.39.0", default-features = false, features = ["namada-sdk"] } +namada_sdk = { git = "https://github.com/anoma/namada", version = "0.40.0", default-features = false } rand = "0.8.5" rexie = "0.5" serde = "^1.0.181" diff --git a/packages/shared/lib/src/query.rs b/packages/shared/lib/src/query.rs index 24b7fb4acd..a8c70de810 100644 --- a/packages/shared/lib/src/query.rs +++ b/packages/shared/lib/src/query.rs @@ -1,30 +1,30 @@ use js_sys::Uint8Array; -use namada::address::Address; -use namada::core::borsh::BorshSerialize; -use namada::core::collections::{HashMap, HashSet}; -use namada::eth_bridge_pool::TransferToEthereum; -use namada::governance::storage::keys as governance_storage; -use namada::governance::utils::{ +use namada_sdk::address::Address; +use namada_sdk::borsh::BorshSerialize; +use namada_sdk::collections::{HashMap, HashSet}; +use namada_sdk::eth_bridge_pool::TransferToEthereum; +use namada_sdk::governance::storage::keys as governance_storage; +use namada_sdk::governance::utils::{ compute_proposal_result, ProposalVotes, TallyResult, TallyType, VotePower, }; -use namada::governance::{ProposalType, ProposalVote}; -use namada::ledger::eth_bridge::bridge_pool::query_signed_bridge_pool; -use namada::ledger::parameters::storage; -use namada::ledger::queries::RPC; -use namada::masp::ExtendedViewingKey; -use namada::proof_of_stake::Epoch; -use namada::sdk::masp::{DefaultLogger, ShieldedContext}; -use namada::sdk::masp_primitives::asset_type::AssetType; -use namada::sdk::masp_primitives::sapling::ViewingKey; -use namada::sdk::masp_primitives::transaction::components::ValueSum; -use namada::sdk::masp_primitives::zip32::ExtendedFullViewingKey; -use namada::sdk::rpc::{ +use namada_sdk::governance::{ProposalType, ProposalVote}; +use namada_sdk::eth_bridge::bridge_pool::query_signed_bridge_pool; +use namada_sdk::parameters::storage; +use namada_sdk::queries::RPC; +use namada_sdk::masp::ExtendedViewingKey; +use namada_sdk::proof_of_stake::Epoch; +use namada_sdk::masp::{DefaultLogger, ShieldedContext}; +use namada_sdk::masp_primitives::asset_type::AssetType; +use namada_sdk::masp_primitives::sapling::ViewingKey; +use namada_sdk::masp_primitives::transaction::components::ValueSum; +use namada_sdk::masp_primitives::zip32::ExtendedFullViewingKey; +use namada_sdk::rpc::{ format_denominated_amount, get_public_key_at, get_token_balance, get_total_staked_tokens, is_steward, query_epoch, query_masp_epoch, query_native_token, query_proposal_by_id, query_proposal_votes, query_storage_value, }; -use namada::token; -use namada::uint::I256; +use namada_sdk::token; +use namada_sdk::uint::I256; use std::collections::BTreeMap; use std::str::FromStr; use wasm_bindgen::prelude::*; diff --git a/packages/shared/lib/src/rpc_client.rs b/packages/shared/lib/src/rpc_client.rs index 681e2eb275..573ff76c05 100644 --- a/packages/shared/lib/src/rpc_client.rs +++ b/packages/shared/lib/src/rpc_client.rs @@ -1,5 +1,5 @@ use js_sys::JSON::stringify; -use namada::storage::BlockHeight; +use namada_sdk::storage::BlockHeight; use std::fmt::Debug; use std::fmt::Display; use thiserror::Error; @@ -8,9 +8,9 @@ use wasm_bindgen::JsCast; use wasm_bindgen_futures::JsFuture; use web_sys::Response; -use namada::ledger::queries::{Client, EncodedResponseQuery}; -use namada::tendermint::{self, abci::Code}; -use namada::tendermint_rpc::{ +use namada_sdk::queries::{Client, EncodedResponseQuery}; +use namada_sdk::tendermint::{self, abci::Code}; +use namada_sdk::tendermint_rpc::{ error::Error as TendermintRpcError, Response as RpcResponse, SimpleRequest, }; @@ -41,14 +41,14 @@ impl From for RpcError { } } -impl From for RpcError { - fn from(error: namada::tendermint::Error) -> Self { +impl From for RpcError { + fn from(error: namada_sdk::tendermint::Error) -> Self { RpcError::new(&error.to_string()) } } -impl From for RpcError { - fn from(error: namada::tendermint_rpc::Error) -> Self { +impl From for RpcError { + fn from(error: namada_sdk::tendermint_rpc::Error) -> Self { RpcError::new(&error.to_string()) } } diff --git a/packages/shared/lib/src/sdk/io.rs b/packages/shared/lib/src/sdk/io.rs index b4e01ce451..eaa7f7b1ef 100644 --- a/packages/shared/lib/src/sdk/io.rs +++ b/packages/shared/lib/src/sdk/io.rs @@ -1,4 +1,4 @@ -use namada::io::Io; +use namada_sdk::io::Io; use wasm_bindgen::JsValue; fn read(question: Option<&str>) -> std::io::Result { diff --git a/packages/shared/lib/src/sdk/masp/masp_node.rs b/packages/shared/lib/src/sdk/masp/masp_node.rs index f104ce4a78..0bf7810f3a 100644 --- a/packages/shared/lib/src/sdk/masp/masp_node.rs +++ b/packages/shared/lib/src/sdk/masp/masp_node.rs @@ -1,5 +1,5 @@ use async_trait::async_trait; -use namada::sdk::{ +use namada_sdk::{ borsh::{BorshDeserialize, BorshSerialize}, masp::{ContextSyncStatus, ShieldedContext, ShieldedUtils}, masp_proofs::prover::LocalTxProver, @@ -25,7 +25,7 @@ const SPECULATIVE_TMP_FILE_NAME: &str = "speculative_shielded.tmp"; /// Mostly copied from the Namada CLI #[derive(Default, Debug, BorshSerialize, BorshDeserialize, Clone)] -#[borsh(crate = "namada::core::borsh")] +#[borsh(crate = "namada_sdk::borsh")] pub struct NodeShieldedUtils { #[borsh(skip)] context_dir: PathBuf, diff --git a/packages/shared/lib/src/sdk/masp/masp_web.rs b/packages/shared/lib/src/sdk/masp/masp_web.rs index f7f3505beb..22ff1df179 100644 --- a/packages/shared/lib/src/sdk/masp/masp_web.rs +++ b/packages/shared/lib/src/sdk/masp/masp_web.rs @@ -1,20 +1,20 @@ use async_trait::async_trait; use gloo_utils::format::JsValueSerdeExt; -use namada::core::borsh::{BorshDeserialize, BorshSerialize}; -use namada::sdk::masp::{ContextSyncStatus, ShieldedContext, ShieldedUtils}; -use namada::sdk::masp_proofs::prover::LocalTxProver; +use namada_sdk::borsh::{BorshDeserialize, BorshSerialize}; +use namada_sdk::masp::{ContextSyncStatus, ShieldedContext, ShieldedUtils}; +use namada_sdk::masp_proofs::prover::LocalTxProver; use rexie::{Error, ObjectStore, Rexie, TransactionMode}; use wasm_bindgen::{JsError, JsValue}; use crate::utils::to_bytes; -const DB_PREFIX: &str = "Namada::MASP"; +const DB_PREFIX: &str = "namada_sdk::MASP"; const SHIELDED_CONTEXT_TABLE: &str = "ShieldedContext"; const SHIELDED_CONTEXT_KEY_CONFIRMED: &str = "shielded-context-confirmed"; const SHIELDED_CONTEXT_KEY_SPECULATIVE: &str = "shielded-context-speculative"; #[derive(Default, Debug, BorshSerialize, BorshDeserialize, Clone)] -#[borsh(crate = "namada::core::borsh")] +#[borsh(crate = "namada_sdk::borsh")] pub struct WebShieldedUtils { spend_param_bytes: Vec, output_param_bytes: Vec, diff --git a/packages/shared/lib/src/sdk/mod.rs b/packages/shared/lib/src/sdk/mod.rs index ebac6416cd..4b8ce08542 100644 --- a/packages/shared/lib/src/sdk/mod.rs +++ b/packages/shared/lib/src/sdk/mod.rs @@ -9,23 +9,23 @@ use crate::rpc_client::HttpClient; use crate::utils::set_panic_hook; use crate::utils::to_js_result; use js_sys::Uint8Array; -use namada::address::Address; -use namada::core::borsh::{self, BorshDeserialize}; -use namada::hash::Hash; -use namada::key::{common, ed25519, SigScheme}; -use namada::ledger::eth_bridge::bridge_pool::build_bridge_pool_tx; -use namada::sdk::masp::ShieldedContext; -use namada::sdk::rpc::query_epoch; -use namada::sdk::signing::SigningTxData; -use namada::sdk::tx::build_redelegation; -use namada::sdk::tx::{ +use namada_sdk::address::Address; +use namada_sdk::borsh::{self, BorshDeserialize}; +use namada_sdk::hash::Hash; +use namada_sdk::key::{common, ed25519, SigScheme}; +use namada_sdk::eth_bridge::bridge_pool::build_bridge_pool_tx; +use namada_sdk::masp::ShieldedContext; +use namada_sdk::rpc::query_epoch; +use namada_sdk::signing::SigningTxData; +use namada_sdk::tx::build_redelegation; +use namada_sdk::tx::{ build_bond, build_ibc_transfer, build_reveal_pk, build_transparent_transfer, build_unbond, build_vote_proposal, build_withdraw, is_reveal_pk_needed, process_tx, }; -use namada::sdk::wallet::{Store, Wallet}; -use namada::sdk::{Namada, NamadaImpl}; -use namada::string_encoding::Format; -use namada::tx::Tx; +use namada_sdk::wallet::{Store, Wallet}; +use namada_sdk::{Namada, NamadaImpl}; +use namada_sdk::string_encoding::Format; +use namada_sdk::tx::Tx; use std::str::FromStr; use wasm_bindgen::{prelude::wasm_bindgen, JsError, JsValue}; diff --git a/packages/shared/lib/src/sdk/signature.rs b/packages/shared/lib/src/sdk/signature.rs index a6933b7de7..4479510c4c 100644 --- a/packages/shared/lib/src/sdk/signature.rs +++ b/packages/shared/lib/src/sdk/signature.rs @@ -1,5 +1,5 @@ -use namada::core::borsh::{BorshDeserialize, BorshSerialize}; -use namada::{ +use namada_sdk::borsh::{BorshDeserialize, BorshSerialize}; +use namada_sdk::{ key::common::{PublicKey, Signature}, tx::{CompressedAuthorization, Section, Signer, Tx}, }; @@ -7,7 +7,7 @@ use std::collections::BTreeMap; use wasm_bindgen::JsError; #[derive(BorshSerialize, BorshDeserialize)] -#[borsh(crate = "namada::core::borsh")] +#[borsh(crate = "namada_sdk::borsh")] pub struct SignatureMsg { pub pubkey: Vec, pub raw_indices: Vec, diff --git a/packages/shared/lib/src/sdk/tx.rs b/packages/shared/lib/src/sdk/tx.rs index 7a67547fd4..eb1e318281 100644 --- a/packages/shared/lib/src/sdk/tx.rs +++ b/packages/shared/lib/src/sdk/tx.rs @@ -1,23 +1,23 @@ use std::{path::PathBuf, str::FromStr}; -use namada::core::borsh::{self, BorshDeserialize, BorshSerialize}; -use namada::core::ibc::core::host::types::identifiers::{ChannelId, PortId}; -use namada::sdk::signing::SigningTxData; -use namada::tendermint_rpc; -use namada::tx::data::GasLimit; -use namada::{ +use namada_sdk::borsh::{self, BorshDeserialize, BorshSerialize}; +use namada_sdk::ibc::core::host::types::identifiers::{ChannelId, PortId}; +use namada_sdk::signing::SigningTxData; +use namada_sdk::tendermint_rpc; +use namada_sdk::tx::data::GasLimit; +use namada_sdk::{ address::Address, + args::{self, InputAmount, TxExpiration}, chain::ChainId, ethereum_events::EthAddress, key::common::PublicKey, masp::TransferSource, - sdk::args::{self, InputAmount, TxExpiration}, token::{Amount, DenominatedAmount, NATIVE_MAX_DECIMAL_PLACES}, }; use wasm_bindgen::JsError; #[derive(BorshSerialize, BorshDeserialize)] -#[borsh(crate = "namada::core::borsh")] +#[borsh(crate = "namada_sdk::borsh")] pub struct SigningData { owner: Option, public_keys: Vec, @@ -78,7 +78,7 @@ impl SigningData { } #[derive(BorshSerialize, BorshDeserialize)] -#[borsh(crate = "namada::core::borsh")] +#[borsh(crate = "namada_sdk::borsh")] pub struct WrapperTxMsg { token: String, fee_amount: String, @@ -90,7 +90,7 @@ pub struct WrapperTxMsg { } #[derive(BorshSerialize, BorshDeserialize)] -#[borsh(crate = "namada::core::borsh")] +#[borsh(crate = "namada_sdk::borsh")] pub struct BondMsg { source: String, validator: String, @@ -136,7 +136,7 @@ pub fn bond_tx_args(bond_msg: &[u8], tx_msg: &[u8]) -> Result Result Result(&self, wallet: &Wallet) -> Result<(), namada::sdk::wallet::LoadStoreError> { + fn save(&self, wallet: &Wallet) -> Result<(), namada_sdk::wallet::LoadStoreError> { let data = wallet.store().encode(); let wallet_path = self.store_dir().join(FILE_NAME); @@ -57,7 +57,7 @@ impl WalletStorage for NodeWalletUtils { Ok(()) } - fn load(&self, wallet: &mut Wallet) -> Result<(), namada::sdk::wallet::LoadStoreError> { + fn load(&self, wallet: &mut Wallet) -> Result<(), namada_sdk::wallet::LoadStoreError> { let wallet_file = self.store_dir().join(FILE_NAME); let stored_data: Vec = diff --git a/packages/shared/lib/src/sdk/wallet/wallet_web.rs b/packages/shared/lib/src/sdk/wallet/wallet_web.rs index 876f631df0..5ae274d8cc 100644 --- a/packages/shared/lib/src/sdk/wallet/wallet_web.rs +++ b/packages/shared/lib/src/sdk/wallet/wallet_web.rs @@ -1,11 +1,11 @@ -use namada::sdk::{ +use namada_sdk::{ borsh::{BorshDeserialize, BorshSerialize}, wallet::{Wallet, WalletIo, WalletStorage}, }; use rand::rngs::OsRng; #[derive(Debug, BorshSerialize, BorshDeserialize, Clone)] -#[borsh(crate = "namada::core::borsh")] +#[borsh(crate = "namada_sdk::borsh")] pub struct BrowserWalletUtils { #[borsh(skip)] _name: String, @@ -25,11 +25,11 @@ impl WalletIo for BrowserWalletUtils { //TODO: We can't implement it until namada changes trait to be async impl WalletStorage for BrowserWalletUtils { - fn save(&self, _wallet: &Wallet) -> Result<(), namada::sdk::wallet::LoadStoreError> { + fn save(&self, _wallet: &Wallet) -> Result<(), namada_sdk::wallet::LoadStoreError> { todo!() } - fn load(&self, _wallet: &mut Wallet) -> Result<(), namada::sdk::wallet::LoadStoreError> { + fn load(&self, _wallet: &mut Wallet) -> Result<(), namada_sdk::wallet::LoadStoreError> { todo!() } } diff --git a/packages/shared/lib/src/types/address.rs b/packages/shared/lib/src/types/address.rs index 0fd020fab8..85f48490b5 100644 --- a/packages/shared/lib/src/types/address.rs +++ b/packages/shared/lib/src/types/address.rs @@ -1,5 +1,5 @@ -use namada::core::borsh::BorshDeserialize; -use namada::{ +use namada_sdk::borsh::BorshDeserialize; +use namada_sdk::{ address, key::{ self, diff --git a/packages/shared/lib/src/types/masp.rs b/packages/shared/lib/src/types/masp.rs index 4a2e30f91c..be95b596ba 100644 --- a/packages/shared/lib/src/types/masp.rs +++ b/packages/shared/lib/src/types/masp.rs @@ -1,8 +1,8 @@ //! PaymentAddress - Provide wasm_bindgen bindings for shielded addresses //! See @namada/crypto for zip32 HD wallet functionality. -use namada::core::borsh::BorshDeserialize; -use namada::masp; -use namada::sdk::masp_primitives::{sapling, zip32}; +use namada_sdk::borsh::BorshDeserialize; +use namada_sdk::masp; +use namada_sdk::masp_primitives::{sapling, zip32}; use thiserror::Error; use wasm_bindgen::prelude::*; diff --git a/packages/shared/lib/src/types/query.rs b/packages/shared/lib/src/types/query.rs index 086b18d46b..9f4c2185f8 100644 --- a/packages/shared/lib/src/types/query.rs +++ b/packages/shared/lib/src/types/query.rs @@ -1,7 +1,7 @@ -use namada::core::borsh::BorshSerialize; +use namada_sdk::borsh::BorshSerialize; #[derive(BorshSerialize)] -#[borsh(crate = "namada::core::borsh")] +#[borsh(crate = "namada_sdk::borsh")] pub struct ProposalInfo { pub id: u64, pub content: String, @@ -11,5 +11,5 @@ pub struct ProposalInfo { pub grace_epoch: u64, pub tally_type: String, pub proposal_type: String, - pub data: Option + pub data: Option, }