From 1f5667c6bb06773d7a5b88172d489df16e695c61 Mon Sep 17 00:00:00 2001 From: Satinder Grewal Date: Thu, 9 Mar 2017 08:00:10 +1300 Subject: [PATCH 1/2] test --- assets/scripts/iguana_api/IguanaEDEX.js | 24 +++++++++++---------- assets/scripts/iguana_api/IguanaShepherd.js | 2 +- 2 files changed, 14 insertions(+), 12 deletions(-) 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); }); }); From a3abb31ce092b83baac18d1ab73bf884286085c3 Mon Sep 17 00:00:00 2001 From: Satinder Grewal Date: Thu, 9 Mar 2017 08:25:03 +1300 Subject: [PATCH 2/2] refresh data update code try 2 --- assets/scripts/iguana_api/IguanaEDEX.js | 30 ++++++++++++------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/assets/scripts/iguana_api/IguanaEDEX.js b/assets/scripts/iguana_api/IguanaEDEX.js index e79e103..0f540e8 100644 --- a/assets/scripts/iguana_api/IguanaEDEX.js +++ b/assets/scripts/iguana_api/IguanaEDEX.js @@ -285,36 +285,34 @@ 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(new_utxos_set) { + var get_data_cache_contents = function(get_txid_list) { return new Promise(function(resolve, reject) { - console.log(new_utxos_set) + console.log(get_txid_list) //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; - resolve(result); - /*var save_this_data = EDEX_RemoveTXID(result, get_txid_list); + var save_this_data = result;*/ + var save_this_data = EDEX_RemoveTXID(result, get_txid_list); console.log(save_this_data) - resolve(save_this_data);*/ - - + //resolve(result); + resolve(save_this_data); }); }); } @@ -961,10 +959,11 @@ function EDEX_GetTxIDList(gettxdata) { }) } + + function EDEX_RemoveTXID(_obj, txidArray) { var txidToStr = txidArray.join(':'); console.log(txidToStr); - if (_obj, _obj.basilisk) { if (Object.keys(_obj.basilisk).length === 0) { console.log('no coin nodes to parse'); @@ -977,7 +976,7 @@ function EDEX_RemoveTXID(_obj, txidArray) { _obj.basilisk[key][coinAddr].refresh.data.length > 0) { for (var i = 0; i < _obj.basilisk[key][coinAddr].refresh.data.length; i++) { if (txidToStr.indexOf(_obj.basilisk[key][coinAddr].refresh.data[i].txid) > -1) { - delete _obj.basilisk[key][coinAddr].refresh.data[i]; + _obj.basilisk[key][coinAddr].refresh.data.splice(i, 1); } } } @@ -988,6 +987,5 @@ function EDEX_RemoveTXID(_obj, txidArray) { } else { console.log('basilisk node is missing'); } - return _obj; } \ No newline at end of file