diff --git a/assets/scripts/iguana_api/IguanaEDEX.js b/assets/scripts/iguana_api/IguanaEDEX.js index d6ec2fa..e79e103 100644 --- a/assets/scripts/iguana_api/IguanaEDEX.js +++ b/assets/scripts/iguana_api/IguanaEDEX.js @@ -285,34 +285,36 @@ function EDEXSendutxoRawTx(data) { return new Promise(function(resolve, reject) { //console.log(gettxdata) //console.log(utxos_set) - EDEX_GetTxIDList(gettxdata).then(function(get_txid_list){ + /*EDEX_GetTxIDList(gettxdata).then(function(get_txid_list){ console.log(get_txid_list) resolve(get_txid_list); - }) - /*EDEX_ProcessRefreshData(gettxdata,utxos_set).then(function(new_utxos_set) { + })*/ + EDEX_ProcessRefreshData(gettxdata,utxos_set).then(function(new_utxos_set) { console.log(new_utxos_set); resolve(new_utxos_set); - });*/ + }); }); } - var get_data_cache_contents = function(get_txid_list) { + var get_data_cache_contents = function(new_utxos_set) { return new Promise(function(resolve, reject) { - console.log(get_txid_list) + console.log(new_utxos_set) //console.log(send_data) //console.log(send_data.sendfrom) Shepherd_GroomData_Get().then(function(result) { console.log(result); - /*console.log(result.basilisk.KMD[send_data.sendfrom].refresh); + console.log(result.basilisk.KMD[send_data.sendfrom].refresh); delete result.basilisk.KMD[send_data.sendfrom].refresh.data; console.log(result.basilisk.KMD[send_data.sendfrom].refresh); result.basilisk.KMD[send_data.sendfrom].refresh.data = new_utxos_set; console.log(result.basilisk.KMD[send_data.sendfrom].refresh); - var save_this_data = result;*/ - var save_this_data = EDEX_RemoveTXID(result, get_txid_list); + var save_this_data = result; + resolve(result); + /*var save_this_data = EDEX_RemoveTXID(result, get_txid_list); console.log(save_this_data) - //resolve(result); - resolve(save_this_data); + resolve(save_this_data);*/ + + }); }); } diff --git a/assets/scripts/iguana_api/IguanaShepherd.js b/assets/scripts/iguana_api/IguanaShepherd.js index b8e9331..01c3d0b 100644 --- a/assets/scripts/iguana_api/IguanaShepherd.js +++ b/assets/scripts/iguana_api/IguanaShepherd.js @@ -179,7 +179,7 @@ function Shepherd_GroomData_Post(req_data) { url: req_url, dataType: 'json' }).done(function(data) { - var res_data = JSON.parse(data); + var res_data = data; resolve(res_data); }); });