fix sdk initialization

Author: Fraccaman

Cargo.toml

@@ -51,16 +51,4 @@ zeroize = "1.6.0"
 axum-macros = "0.3.8"
 
 [build-dependencies]
-vergen = { version = "8.0.0", features = ["build", "git", "gitcl"] }
-
-[profile.ephemeral-build]
-inherits = "release"
-incremental = false
-lto = "thin"
-opt-level = 2
-codegen-units = 64
-strip = "symbols"
-debug = false
-
-[profile.release]
-incremental = false
+vergen = { version = "8.0.0", features = ["build", "git", "gitcl"] }

scripts/faucet.py

@@ -2,13 +2,16 @@
 from hashlib import sha256
 import argparse
 
-DEFAULT_URL = "http://0.0.0.0:5000/api/v1/faucet"
+DEFAULT_URL = "http://0.0.0.0:5000"
+
+def request_settings(url):
+    return get("{}/api/v1/faucet/setting".format(url)).json()
 
 def request_challenge(url):
-    return get(url).json()
+    return get("{}/api/v1/faucet".format(url)).json()
 
 def request_transfer(url, data):
-    return post(url, json=data)
+    return post("{}/api/v1/faucet".format(url), json=data)
 
 def is_valid_pow(solution, difficulty):
     for i in range(0, difficulty):
@@ -32,24 +35,28 @@ def compute_pow_solution(challenge, difficulty):
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(description='Request from an amount of token from faucet.')
-    parser.add_argument('url', action='store', type=str, required=False, default=DEFAULT_URL, help='The faucet url.')
-    parser.add_argument('token', action='store', type=int, required=False, help='The token address.')
-    parser.add_argument('amount', action='store', type=int, required=False, default=1000, help='The token amount.')
-    parser.add_argument('target', action='store', type=str, required=True, help='The target address.')
+    parser.add_argument('url', action='store', type=str, default=DEFAULT_URL, help='The faucet url.')
+    parser.add_argument('token', action='store', type=str, help='The token address.')
+    parser.add_argument('amount', action='store', type=int, default=1000, help='The token amount.')
+    parser.add_argument('target', action='store', type=str, help='The target address.')
 
     args = parser.parse_args()
 
+    response = request_settings(args.url)
+    difficulty = int(response['difficulty'])
+
     response = request_challenge(args.url)
-    solution = compute_pow_solution(args.url, response['challenge'], 2)
-    response = request_transfer({
+    solution = compute_pow_solution(response['challenge'], difficulty)
+    
+    response = request_transfer(args.url, {
         'solution': solution,
         'tag': response['tag'],
         'challenge': response['challenge'],
         'transfer': {
             'target': args.target,
             'token': args.token,
-            'amount': args.amounr * 10**6
+            'amount': args.amount * 10**6
         }
     })
 
-    print(response.json())
+    # print(response.json())

src/app.rs

@@ -16,8 +16,8 @@ use axum::{
 };
 use lazy_static::lazy_static;
 use namada_sdk::{
-    address::Address, io::NullIo, key::RefTo, masp::fs::FsShieldedUtils, wallet::fs::FsWalletUtils,
-    NamadaImpl,
+    address::Address, args::TxBuilder, chain::ChainId, io::NullIo, key::RefTo,
+    masp::fs::FsShieldedUtils, wallet::fs::FsWalletUtils, NamadaImpl,
 };
 use rand::{distributions::Alphanumeric, thread_rng, Rng};
 use serde_json::json;
@@ -82,7 +82,10 @@ impl ApplicationServer {
             let null_io = NullIo;
 
             match NamadaImpl::new(http_client.clone(), wallet, shielded_ctx, null_io).await {
-                Ok(sdk) => break sdk,
+                Ok(mut sdk) => {
+                    sdk = sdk.chain_id(ChainId(chain_id.clone()));
+                    break sdk;
+                }
                 Err(_) => {
                     tracing::warn!("Retrying to connect to the RPC at {url} in 10s...");
                     sleep(Duration::from_secs(10)).await;

src/handler/faucet.rs

@@ -4,7 +4,7 @@ use axum::{extract::State, Json};
 use axum_macros::debug_handler;
 use namada_sdk::{
     address::Address,
-    args::{InputAmount, TxTransparentSource, TxTransparentTarget},
+    args::{InputAmount, TxBuilder, TxTransparentSource, TxTransparentTarget},
     io::NullIo,
     rpc,
     signing::default_sign,
@@ -202,17 +202,16 @@ pub async fn request_transfer(
     }];
 
     let mut transfer_tx_builder = state.sdk.new_transparent_transfer(sources, targets);
-
-    transfer_tx_builder.tx.memo = Some("Transfer from faucet".to_string().as_bytes().to_vec());
-
-    let tx_result = transfer_tx_builder.build(&*state.sdk).await;
-
-    let (mut transfer_tx, signing_data) = match tx_result {
-        Ok(res) => res,
-        Err(e) => {
-            return Err(FaucetError::SdkError(format!("unable to build transfer tx: {}", e)).into())
-        }
-    };
+    transfer_tx_builder =
+        transfer_tx_builder.memo("Transfer from faucet".to_string().as_bytes().to_vec());
+
+    let (mut transfer_tx, signing_data) = match transfer_tx_builder.build(&*state.sdk).await {
+        Ok(res) => Ok(res),
+        Err(e) => Err(FaucetError::SdkError(format!(
+            "unable to build transfer tx: {}",
+            e
+        ))),
+    }?;
 
     state
         .sdk