sdk 0.30.2

Author: Gianmarco Fraccaroli

Cargo.lock

@@ -37,7 +37,7 @@ rand = "0.8.5"
 rand_chacha = "0.3.1"
 dotenvy = "0.15.7"
 hex = "0.4.3"
-namada_sdk = { git = "https://github.com/anoma/namada", tag = "v0.30.2", default-features = false, features = ["tendermint-rpc", "std", "async-client", "async-send", "download-params"] }
+namada_sdk = { git = "https://github.com/anoma/namada", tag = "v0.30.2", default-features = false, features = ["tendermint-rpc", "std", "async-client", "async-send", "download-params", "rand"] }
 tendermint-config = "0.34.0"
 tendermint-rpc = { version = "0.34.0", features = ["http-client"]}
 orion = "0.17.5"

Cargo.toml

@@ -4,4 +4,4 @@ use vergen::EmitBuilder;
 fn main() -> Result<(), Box<dyn Error>> {
     EmitBuilder::builder().all_git().emit()?;
     Ok(())
-}
+}

build.rs

@@ -17,9 +17,9 @@ use axum::{
 use lazy_static::lazy_static;
 use namada_sdk::{
     args::TxBuilder,
-    core::types::{address::Address, chain::ChainId, key::RefTo},
     io::NullIo,
     masp::fs::FsShieldedUtils,
+    types::{address::Address, chain::ChainId, key::RefTo},
     wallet::fs::FsWalletUtils,
     NamadaImpl,
 };
@@ -75,7 +75,7 @@ impl ApplicationServer {
                 tracing::info!("Sleeping until: {}", chain_start);
                 sleep(Duration::from_secs(60)).await;
             }
-        };
+        }
 
         let url = Url::from_str(&rpc).expect("invalid RPC address");
         let http_client = HttpClient::new(url).unwrap();
@@ -116,7 +116,7 @@ impl ApplicationServer {
                 difficulty,
                 chain_id,
                 chain_start,
-                withdraw_limit
+                withdraw_limit,
             );
 
             Router::new()

src/app.rs

@@ -57,5 +57,5 @@ pub struct FaucetSettingResponse {
     pub chain_id: String,
     pub start_at: i64,
     pub withdraw_limit: u64,
-    pub tokens_alias_to_address: HashMap<String, String>
+    pub tokens_alias_to_address: HashMap<String, String>,
 }

src/dto/faucet.rs

@@ -20,7 +20,7 @@ pub enum FaucetError {
     #[error("Error while sending transfer: {0}")]
     SdkError(String),
     #[error("Withdraw limit must be less then {0}")]
-    InvalidWithdrawLimit(u64)
+    InvalidWithdrawLimit(u64),
 }
 
 impl IntoResponse for FaucetError {

src/error/faucet.rs

@@ -4,19 +4,21 @@ use axum::{extract::State, Json};
 use axum_macros::debug_handler;
 use namada_sdk::{
     args::InputAmount,
-    core::types::{
-        address::Address,
-        masp::{TransferSource, TransferTarget},
-    },
     rpc,
     signing::default_sign,
     tendermint::abci::Code,
+    tx::data::ResultCode,
+    types::{
+        address::Address,
+        masp::{TransferSource, TransferTarget},
+    },
     Namada,
-    core::types::transaction::ResultCode
 };
 
 use crate::{
-    dto::faucet::{FaucetRequestDto, FaucetResponseDto, FaucetResponseStatusDto, FaucetSettingResponse},
+    dto::faucet::{
+        FaucetRequestDto, FaucetResponseDto, FaucetResponseStatusDto, FaucetSettingResponse,
+    },
     error::{api::ApiError, faucet::FaucetError, validate::ValidatedRequest},
     repository::faucet::FaucetRepositoryTrait,
     state::faucet::FaucetState,
@@ -32,7 +34,10 @@ pub async fn faucet_settings(
         chain_id: state.chain_id,
         start_at: state.chain_start,
         withdraw_limit: state.withdraw_limit,
-        tokens_alias_to_address: HashMap::from([("NAM".to_string(), nam_token_address.to_string())])
+        tokens_alias_to_address: HashMap::from([(
+            "NAM".to_string(),
+            nam_token_address.to_string(),
+        )]),
     };
 
     Ok(Json(response))
@@ -58,7 +63,7 @@ pub async fn request_transfer(
     let auth_key: String = state.auth_key.clone();
 
     if payload.transfer.amount > state.withdraw_limit {
-        return Err(FaucetError::InvalidWithdrawLimit(state.withdraw_limit).into())
+        return Err(FaucetError::InvalidWithdrawLimit(state.withdraw_limit).into());
     }
 
     let token_address = Address::decode(payload.transfer.token.clone());
@@ -133,7 +138,9 @@ pub async fn request_transfer(
 
     let (transfer_result, tx_hash) = if let Ok(response) = process_tx_response {
         match response {
-            namada_sdk::tx::ProcessTxResponse::Applied(r) => (r.code.eq(&ResultCode::Ok), Some(r.hash)),
+            namada_sdk::tx::ProcessTxResponse::Applied(r) => {
+                (r.code.eq(&ResultCode::Ok), Some(r.hash))
+            }
             namada_sdk::tx::ProcessTxResponse::Broadcast(r) => {
                 (r.code.eq(&Code::Ok), Some(r.hash.to_string()))
             }

src/handler/faucet.rs

@@ -1,7 +1,7 @@
 use namada_sdk::{
-    core::types::key::common::SecretKey,
     io::NullIo,
     masp::{fs::FsShieldedUtils, ShieldedContext},
+    types::key::common::SecretKey,
     wallet::{fs::FsWalletUtils, Wallet},
     NamadaImpl,
 };

src/sdk/namada.rs

@@ -1,6 +1,6 @@
 use std::str::FromStr;
 
-use namada_sdk::core::types::{address::Address, key::common::SecretKey};
+use namada_sdk::types::{address::Address, key::common::SecretKey};
 
 pub fn sk_from_str(sk: &str) -> SecretKey {
     SecretKey::from_str(sk).expect("Should be able to decode secret key.")

src/sdk/utils.rs

@@ -6,8 +6,8 @@ use std::sync::Arc;
 use tokio::sync::RwLock;
 
 use namada_sdk::{
-    core::types::address::Address, io::NullIo, masp::fs::FsShieldedUtils,
-    wallet::fs::FsWalletUtils, NamadaImpl,
+    io::NullIo, masp::fs::FsShieldedUtils, types::address::Address, wallet::fs::FsWalletUtils,
+    NamadaImpl,
 };
 use tendermint_rpc::HttpClient;
 
@@ -21,7 +21,7 @@ pub struct FaucetState {
     pub difficulty: u64,
     pub chain_id: String,
     pub chain_start: i64,
-    pub withdraw_limit: u64
+    pub withdraw_limit: u64,
 }
 
 impl FaucetState {
@@ -33,7 +33,7 @@ impl FaucetState {
         difficulty: u64,
         chain_id: String,
         chain_start: i64,
-        withdraw_limit: u64
+        withdraw_limit: u64,
     ) -> Self {
         Self {
             faucet_service: FaucetService::new(data),
@@ -44,7 +44,7 @@ impl FaucetState {
             difficulty,
             chain_id,
             chain_start,
-            withdraw_limit: withdraw_limit * 10_u64.pow(6)
+            withdraw_limit: withdraw_limit * 10_u64.pow(6),
         }
     }
 }