From 566957137f4025483b21aa9cdfd4586f5e4671ce Mon Sep 17 00:00:00 2001 From: Petr Balashov Date: Wed, 26 Apr 2017 16:05:46 +0200 Subject: [PATCH] manual basilisk refresh update --- assets/scripts/dashboard.js | 13 +- assets/scripts/iguana_api/IguanaShepherd.js | 301 ++++++++++---------- assets/scripts/templates/dashboardInfo.js | 5 + 3 files changed, 171 insertions(+), 148 deletions(-) diff --git a/assets/scripts/dashboard.js b/assets/scripts/dashboard.js index d435a2d..1411b1f 100644 --- a/assets/scripts/dashboard.js +++ b/assets/scripts/dashboard.js @@ -933,11 +933,11 @@ var Dashboard = function() { $('#addcoin_mdl_full_mode').prop('disabled', true); } if (tmp_coin_val == 'BTC') { - $('#addcoin_mdl_basilisk_mode').prop('disabled', true) + $('#addcoin_mdl_basilisk_mode') + .prop('disabled', false) + .prop('checked', true); $('#addcoin_mdl_native_mode').prop('disabled', true); - $('#addcoin_mdl_full_mode') - .prop('disabled', false) - .prop('checked', true); + $('#addcoin_mdl_full_mode').prop('disabled', false); } if (tmp_coin_val == 'ZEC') { $('#addcoin_mdl_basilisk_mode').prop('disabled', true); @@ -1008,6 +1008,11 @@ var Dashboard = function() { }); }); + $('.btn_edexcoin_dashboard_update_utxo').click(function() { + var selected_coin = $(this).data('edexcoin'); + Shepherd_RefreshUTXO(); + }); + $('.btn_edexcoin_dashboard_refresh_basilisk_conn').click(function() { var show_mdl = setTimeout(function() { var selected_coin = $(this).data('edexcoin'); diff --git a/assets/scripts/iguana_api/IguanaShepherd.js b/assets/scripts/iguana_api/IguanaShepherd.js index f144ab0..fa0bec3 100644 --- a/assets/scripts/iguana_api/IguanaShepherd.js +++ b/assets/scripts/iguana_api/IguanaShepherd.js @@ -1,103 +1,103 @@ function Shepherd_getConf(coin) { - var result = [], - ajax_data = { 'chain': coin }; - - console.log(ajax_data); - $.ajax({ - async: false, - type: 'POST', - data: JSON.stringify(ajax_data), - url: 'http://127.0.0.1:17777/shepherd/getconf', - contentType: 'application/json', // send as JSON - success: function(data, textStatus, jqXHR) { - var AjaxOutputData = JSON.parse(data); - console.log(AjaxOutputData.result); - result.push({ 'path': AjaxOutputData.result }); - }, - error: function(xhr, textStatus, error) { - } - }); - - return result; + var result = [], + ajax_data = { 'chain': coin }; + + console.log(ajax_data); + $.ajax({ + async: false, + type: 'POST', + data: JSON.stringify(ajax_data), + url: 'http://127.0.0.1:17777/shepherd/getconf', + contentType: 'application/json', // send as JSON + success: function(data, textStatus, jqXHR) { + var AjaxOutputData = JSON.parse(data); + console.log(AjaxOutputData.result); + result.push({ 'path': AjaxOutputData.result }); + }, + error: function(xhr, textStatus, error) { + } + }); + + return result; } function Shepherd_setConf(coin) { - var result = [], - ajax_data = { 'chain': coin }; - - console.log(ajax_data); - $.ajax({ - async: false, - type: 'POST', - data: JSON.stringify(ajax_data), - url: 'http://127.0.0.1:17777/shepherd/setconf', - contentType: 'application/json', // send as JSON - success: function(data, textStatus, jqXHR) { - var AjaxOutputData = JSON.parse(data); - console.log(AjaxOutputData); - result.push({ 'result': AjaxOutputData.msg }); - }, - error: function(xhr, textStatus, error) { - } - }); - - return result; + var result = [], + ajax_data = { 'chain': coin }; + + console.log(ajax_data); + $.ajax({ + async: false, + type: 'POST', + data: JSON.stringify(ajax_data), + url: 'http://127.0.0.1:17777/shepherd/setconf', + contentType: 'application/json', // send as JSON + success: function(data, textStatus, jqXHR) { + var AjaxOutputData = JSON.parse(data); + console.log(AjaxOutputData); + result.push({ 'result': AjaxOutputData.msg }); + }, + error: function(xhr, textStatus, error) { + } + }); + + return result; } function Shepherd_herd(coin,herd_data) { - var result = []; - ajax_data = { - 'herd': coin, - 'options': herd_data - }; - - console.log(ajax_data); - $.ajax({ - async: false, - type: 'POST', - data: JSON.stringify(ajax_data), - url: 'http://127.0.0.1:17777/shepherd/herd', - contentType: 'application/json', // send as JSON - success: function(data, textStatus, jqXHR) { - var AjaxOutputData = JSON.parse(data); - console.log(AjaxOutputData); - result.push({ 'result': AjaxOutputData.msg }); - }, - error: function(xhr, textStatus, error) { - } - }); - - return result; + var result = []; + ajax_data = { + 'herd': coin, + 'options': herd_data + }; + + console.log(ajax_data); + $.ajax({ + async: false, + type: 'POST', + data: JSON.stringify(ajax_data), + url: 'http://127.0.0.1:17777/shepherd/herd', + contentType: 'application/json', // send as JSON + success: function(data, textStatus, jqXHR) { + var AjaxOutputData = JSON.parse(data); + console.log(AjaxOutputData); + result.push({ 'result': AjaxOutputData.msg }); + }, + error: function(xhr, textStatus, error) { + } + }); + + return result; } function Shepherd_herdlist(data) { - return new Promise((resolve) => { - var ajax_data_1 = { 'herdname': data }, - ajax_call_1 = $.ajax({ - data: JSON.stringify(ajax_data_1), - url: 'http://127.0.0.1:17777/shepherd/herdlist', - type: 'POST', - contentType: 'application/json' - }); - - ajax_call_1.done(function(data) { - resolve(data); - }); - }); + return new Promise((resolve) => { + var ajax_data_1 = { 'herdname': data }, + ajax_call_1 = $.ajax({ + data: JSON.stringify(ajax_data_1), + url: 'http://127.0.0.1:17777/shepherd/herdlist', + type: 'POST', + contentType: 'application/json' + }); + + ajax_call_1.done(function(data) { + resolve(data); + }); + }); } function Shepherd_FetchBasiliskData(req_data) { - return new Promise((resolve) => { - var tmpIguanaRPCAuth = 'tmpIgRPCUser@' + sessionStorage.getItem('IguanaRPCAuth'), - parse_session_data = sessionStorage.getItem('IguanaActiveAccount'); + return new Promise((resolve) => { + var tmpIguanaRPCAuth = 'tmpIgRPCUser@' + sessionStorage.getItem('IguanaRPCAuth'), + parse_session_data = sessionStorage.getItem('IguanaActiveAccount'); - parse_session_data = JSON.parse(JSON.parse(parse_session_data)); + parse_session_data = JSON.parse(JSON.parse(parse_session_data)); - var session_pubkey = parse_session_data.pubkey, - ajax_data = { - 'userpass': tmpIguanaRPCAuth, - 'pubkey': session_pubkey - }; + var session_pubkey = parse_session_data.pubkey, + ajax_data = { + 'userpass': tmpIguanaRPCAuth, + 'pubkey': session_pubkey + }; console.log(req_data); if (req_data.allcoins !== false ) { @@ -106,20 +106,21 @@ function Shepherd_FetchBasiliskData(req_data) { var req_url = 'http://127.0.0.1:17777/shepherd/cache-one'; ajax_data.coin = req_data.coin; ajax_data.calls = req_data.calls; + ajax_data.address = req_data.address; } console.log(ajax_data); - $.ajax({ - type: 'GET', - data: ajax_data, - url: req_url, - contentType: 'application/json', // send as JSON - }) + $.ajax({ + type: 'GET', + data: ajax_data, + url: req_url, + contentType: 'application/json', // send as JSON + }) .done(function(data) { - resolve(data); - }); - }); + resolve(data); + }); + }); } function Shepherd_GroomData_Get() { @@ -128,9 +129,9 @@ function Shepherd_GroomData_Get() { parse_session_data = JSON.parse(JSON.parse(parse_session_data)); var request_method = '', - session_pubkey = parse_session_data.pubkey, - ajax_data = { 'filename': session_pubkey }, - req_url = 'http://127.0.0.1:17777/shepherd/groom'; + session_pubkey = parse_session_data.pubkey, + ajax_data = { 'filename': session_pubkey }, + req_url = 'http://127.0.0.1:17777/shepherd/groom'; console.log(ajax_data); $.ajax({ @@ -152,12 +153,12 @@ function Shepherd_GroomData_Post(req_data) { parse_session_data = JSON.parse(JSON.parse(parse_session_data)); var request_method = '', - session_pubkey = parse_session_data.pubkey, - ajax_data = { - 'filename': session_pubkey, - 'payload': JSON.stringify(req_data) - }, - req_url = 'http://127.0.0.1:17777/shepherd/groom'; + session_pubkey = parse_session_data.pubkey, + ajax_data = { + 'filename': session_pubkey, + 'payload': JSON.stringify(req_data) + }, + req_url = 'http://127.0.0.1:17777/shepherd/groom'; console.log(req_data); console.log(ajax_data); @@ -200,19 +201,19 @@ function Shepherd_GroomData_Delete() { } function Shepherd_GetBasiliskCache() { - return new Promise((resolve) => { - var parse_session_data = sessionStorage.getItem('IguanaActiveAccount'); - parse_session_data = JSON.parse(JSON.parse(parse_session_data)); + return new Promise((resolve) => { + var parse_session_data = sessionStorage.getItem('IguanaActiveAccount'); + parse_session_data = JSON.parse(JSON.parse(parse_session_data)); var session_pubkey = parse_session_data.pubkey, - ajax_data = { 'pubkey': session_pubkey }; - - $.ajax({ - type: 'GET', - data: ajax_data, - url: 'http://127.0.0.1:17777/shepherd/cache', - contentType: 'application/json' // send as JSON - }) + ajax_data = { 'pubkey': session_pubkey }; + + $.ajax({ + type: 'GET', + data: ajax_data, + url: 'http://127.0.0.1:17777/shepherd/cache', + contentType: 'application/json' // send as JSON + }) .done(function(data) { resolve(data); data = JSON.parse(data); @@ -223,8 +224,23 @@ function Shepherd_GetBasiliskCache() { console.log('error reading cache, flushing...'); }); } - }); - }); + }); + }); +} + +function Shepherd_RefreshUTXO(coin, address) { + coin = 'KMD'; + address = 'RDbGxL8QYdEp8sMULaVZS2E6XThcTKT9Jd'; + var call_data = { + 'allcoins': false, + 'coin': coin, + 'address': address, + 'calls': 'refresh' + }; + Shepherd_FetchBasiliskData(call_data) + .then(function(result) { + console.log(result); + }); } function Shepherd_CheckBasiliskCacheData(coin) { @@ -232,7 +248,7 @@ function Shepherd_CheckBasiliskCacheData(coin) { Shepherd_GetBasiliskCache() .then(function(result) { var _data = JSON.parse(result), - query = _data.result.basilisk, + query = _data.result.basilisk, coin_exists = true, addresses_exists = true, getbalance_exists = true, @@ -243,35 +259,35 @@ function Shepherd_CheckBasiliskCacheData(coin) { if (!query) { console.log('data not found.'); var res_data = { - 'coin': false, - 'addresses': false, - 'getbalance': false, - 'listtransactions': false, - 'listunspent': false, - 'refresh': false - }; + 'coin': false, + 'addresses': false, + 'getbalance': false, + 'listtransactions': false, + 'listunspent': false, + 'refresh': false + }; resolve(res_data); } else if (!query[coin]) { console.log(coin + ' not found.'); coin_exists = false; var res_data = { - 'coin': coin_exists, - 'addresses': false, - 'getbalance': false, - 'listtransactions': false, - 'listunspent': false, - 'refresh': false - }; + 'coin': coin_exists, + 'addresses': false, + 'getbalance': false, + 'listtransactions': false, + 'listunspent': false, + 'refresh': false + }; resolve(res_data); } else if (!('addresses' in query[coin])) { console.log(coin + ' addresses not found.'); addresses_exists = false; res_data = { - 'coin': coin_exists, - 'getbalance': false, - 'listtransactions': false, - 'listunspent': false, - 'refresh': false + 'coin': coin_exists, + 'getbalance': false, + 'listtransactions': false, + 'listunspent': false, + 'refresh': false }; resolve(res_data); } else { @@ -296,10 +312,10 @@ function Shepherd_CheckBasiliskCacheData(coin) { } pass_data = { - 'getbalance': getbalance_exists, - 'listtransactions': listtransactions_exists, - 'listunspent': listunspent_exists, - 'refresh': refresh_exists + 'getbalance': getbalance_exists, + 'listtransactions': listtransactions_exists, + 'listunspent': listunspent_exists, + 'refresh': refresh_exists }; resolve(pass_data); }); @@ -341,7 +357,4 @@ function Shepherd_SendPendValue() { } else { pend_val = 1; } sessionStorage.setItem('IguanaPendValue', pend_val); }); -} - - - +} \ No newline at end of file diff --git a/assets/scripts/templates/dashboardInfo.js b/assets/scripts/templates/dashboardInfo.js index 5c74bbb..c52ef3e 100644 --- a/assets/scripts/templates/dashboardInfo.js +++ b/assets/scripts/templates/dashboardInfo.js @@ -41,6 +41,11 @@ templates.dashboardInfo = +
  • + + Refresh UTXO + +