cashierd, darkfid: fix parsing erros

src/bin/cashierd.rs

@@ -317,11 +317,11 @@ impl Cashierd {
         let address = address.as_str().unwrap();
 
 
-        if amount.as_str().is_none() {
+        if amount.as_u64().is_none() {
             return JsonResult::Err(jsonerr(InvalidAmountParam, None, id));
         }
 
-        let _amount = amount.as_str().unwrap();
+        let _amount = amount.as_u64().unwrap();
 
         if !self.features.contains_key(&network.clone()) {
             return JsonResult::Err(jsonerr(

src/bin/darkfid.rs

@@ -281,11 +281,11 @@ impl Darkfid {
 
         let network = network.as_str().unwrap();
 
-        if amount.as_str().is_none() {
+        if amount.as_f64().is_none() {
             return JsonResult::Err(jsonerr(InvalidAmountParam, None, id));
         }
 
-        let amount = amount.as_str().unwrap();
+        let amount = amount.as_f64().unwrap();
 
         let decimals = match decimals(network, token, self.tokenlist.clone()) {
             Ok(d) => d,
@@ -294,7 +294,7 @@ impl Darkfid {
             }
         };
 
-        let amount_in_apo = match decode_base10(amount, decimals, true) {
+        let amount_in_apo = match decode_base10(&amount.to_string(), decimals, true) {
             Ok(a) => a,
             Err(e) => {
                 return JsonResult::Err(jsonerr(InternalError, Some(e.to_string()), id));

src/util/parse.rs

@@ -17,7 +17,7 @@ pub fn generate_id(tkn_str: &str, network: &NetworkName) -> Result<jubjub::Fr> {
 
     id_string.push_str(tkn_str);
 
-    let mut data = bs58::decode(serialize(&id_string)).into_vec()?;
+    let mut data: Vec<u8> = serialize(&id_string);
 
     let token_id = match deserialize::<jubjub::Fr>(&data) {
         Ok(v) => v,