From c47bff66b655e98f4a61bc30405028f3bb60367d Mon Sep 17 00:00:00 2001 From: lunar-mining Date: Sun, 19 Sep 2021 09:26:02 +0200 Subject: [PATCH] bin/cashierd2: added 'bridge' to initializer --- src/bin/cashierd2.rs | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/bin/cashierd2.rs b/src/bin/cashierd2.rs index a97a06617..752076d76 100644 --- a/src/bin/cashierd2.rs +++ b/src/bin/cashierd2.rs @@ -21,6 +21,7 @@ use drk::{ jsonrpc::{error as jsonerr, response as jsonresp}, jsonrpc::{ErrorCode::*, JsonRequest, JsonResult}, }, + serial::deserialize, service::{bridge, CashierService}, util::join_config_path, wallet::{CashierDb, WalletDb}, @@ -59,7 +60,7 @@ impl Cashierd { config, cashier_wallet, client_wallet, - //bridge, + bridge, }) } @@ -153,7 +154,6 @@ impl Cashierd { } let token = token.as_str().unwrap(); - let token = jubjub::Fr::from_str(token); if token.is_none() { return JsonResult::Err(jsonerr(InvalidParams, None, id)); @@ -161,8 +161,17 @@ impl Cashierd { let token = token.unwrap(); + let pubkey = pubkey.as_str().unwrap(); + // TODO: implement SubgroupPoint + //let pubkey: jubjub::SubgroupPoint = deserialize(pubkey).unwrap(); + //let pubkey = jubjub::SubgroupPoint::from_str(pubkey); + //if pubkey.is_none() { + // return JsonResult::Err(jsonerr(InvalidParams, None, id)); + //}; + + //let pubkey = pubkey.unwrap(); //// TODO: Sanity check. - //debug!(target: "CASHIER", "PROCESSING INPUT"); + debug!(target: "CASHIER", "PROCESSING INPUT"); //let _check = self // .cashier_wallet // .get_deposit_coin_keys_by_dkey_public(&pubkey, &serialize(&1));