lukechilds
/
EasyDEX-GUI
mirror of https://github.com/lukechilds/EasyDEX-GUI.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

some Dashboard EasyDEX Wallets are now using updated js code for better performance

master
Satinder Grewal 8 years ago
parent
9cd18e155d
commit
ec8e02ed37
5 changed files with 406 additions and 304 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      assets/css/dashboard-wallet-widgets.css
  2. 397
      assets/scripts/dashboard.js
  3. 295
      assets/scripts/iguana_api.js
  4. 10
      assets/scripts/login.js
  5. 4
      index.html

2
assets/css/dashboard-wallet-widgets.css
View File

@ -171,7 +171,7 @@
margin-left: 450px !important; margin-left: 450px !important;
} }
.page-main, #edex-footer { .page-main, #edex-footer {
margin-left: 450px !important; /*margin-left: 450px !important;*/
} }
} }

397
assets/scripts/dashboard.js
View File

@ -55,19 +55,21 @@ var Dashboard = function() {
var selected_coinmode = sessionStorage.getItem('edexTmpMode') var selected_coinmode = sessionStorage.getItem('edexTmpMode')
if ( selected_coinmode == 'Basilisk' ) { if ( selected_coinmode == 'Basilisk' ) {
var coinwalletbalance = getDEXCoinBalance(active_edexcoin) getDEXGetBalance(active_edexcoin).then(function(result){
console.log(coinwalletbalance) //console.log(result)
//coinwalletbalance = coinwalletbalance.total $('#edex_total_balance').text(result.total);
$('#edex_total_balance').text(coinwalletbalance.total); });
} else { } else {
var tmp_get_coin_balance = EDEXlistunspent(active_edexcoin) EDEXlistunspent(active_edexcoin).then(function(result){
if (tmp_get_coin_balance[0] != undefined) { //console.log(result)
//console.log(tmp_get_coin_balance[0]) if (result[0] != undefined) {
$('#edex_total_balance').text(tmp_get_coin_balance[0].total.toFixed(8)); //console.log(result[0])
//console.log(tmp_get_coin_balance[0].total) $('#edex_total_balance').text(result[0].total.toFixed(8));
} else { //console.log(result[0].total)
$('#edex_total_balance').text('0'); } else {
} $('#edex_total_balance').text('0');
}
});
} }
EdexfillTxHistory(active_edexcoin); EdexfillTxHistory(active_edexcoin);
//getCoinBalance(active_edexcoin); //getCoinBalance(active_edexcoin);
@ -704,19 +706,21 @@ function edexCoinBtnAction() {
//populate selected coin's balance //populate selected coin's balance
if ( selected_coinmode == 'Basilisk' ) { if ( selected_coinmode == 'Basilisk' ) {
var coinwalletbalance = getDEXCoinBalance(coincode) getDEXGetBalance(selected_coin).then(function(result){
//console.log(coinwalletbalance.total) //console.log(result)
coinwalletbalance = coinwalletbalance.total $('#edex_total_balance').text(result.total);
$('#edex_total_balance').text(coinwalletbalance); });
} else { } else {
var tmp_get_coin_balance = EDEXlistunspent(coincode) EDEXlistunspent(selected_coin).then(function(result){
if (tmp_get_coin_balance[0] != undefined) { //console.log(result)
//console.log(tmp_get_coin_balance[0]) if (result[0] != undefined) {
$('#edex_total_balance').text(tmp_get_coin_balance[0].total.toFixed(8)); //console.log(result[0])
//console.log(tmp_get_coin_balance[0].total) $('#edex_total_balance').text(result[0].total.toFixed(8));
} else { //console.log(result[0].total)
$('#edex_total_balance').text('0'); } else {
} $('#edex_total_balance').text('0');
}
});
} }
//getCoinBalance(active_edexcoin); //getCoinBalance(active_edexcoin);
@ -755,21 +759,22 @@ function EdexfillTxHistory(coin) {
template: '<div class="bar nprogress-bar-header nprogress-bar-info" role="bar"></div><div class="spinner" role="spinner"><div class="spinner-icon"></div></div>' template: '<div class="bar nprogress-bar-header nprogress-bar-info" role="bar"></div><div class="spinner" role="spinner"><div class="spinner-icon"></div></div>'
}); });
NProgress.start(); NProgress.start();
var txhistorydata = EdexGetTxList(coin); EdexGetTxList(coin).then(function(result){
//console.log(txhistorydata); //console.log(result)
var edex_txhistory_table = ''; var edex_txhistory_table = '';
edex_txhistory_table = $('#edex-tx-history-tbl').DataTable( { data: txhistorydata, edex_txhistory_table = $('#edex-tx-history-tbl').DataTable( { data: result,
"order": [[ 3, "desc" ]], "order": [[ 3, "desc" ]],
select: true, select: true,
retrieve: true retrieve: true
}); });
edex_txhistory_table.destroy(); edex_txhistory_table.destroy();
edex_txhistory_table = $('#edex-tx-history-tbl').DataTable( { data: txhistorydata, edex_txhistory_table = $('#edex-tx-history-tbl').DataTable( { data: result,
"order": [[ 3, "desc" ]], "order": [[ 3, "desc" ]],
select: true, select: true,
retrieve: true retrieve: true
});
}); });
NProgress.done(); NProgress.done();
@ -922,103 +927,94 @@ function ShowCoinHistory(getData) {
} }
/*function getCoinBalance(coin) {
var tmpIguanaRPCAuth = 'tmpIgRPCUser@'+sessionStorage.getItem('IguanaRPCAuth');
var ajax_data = {'userpass':tmpIguanaRPCAuth,"agent":"bitcoinrpc","method":"getbalance","coin": coin};
//console.log(ajax_data);
$.ajax({
//async: false,
type: 'POST',
data: JSON.stringify(ajax_data),
url: 'http://127.0.0.1:7778',
//dataType: 'text',
success: function(data, textStatus, jqXHR) {
var AjaxOutputData = JSON.parse(data);
//console.log('== Data OutPut getCoinBalance ==');
//console.log(AjaxOutputData);
$('span[data-edexcoincode="' + coin + '"][id="edexcoin-balance"]').text(AjaxOutputData.result);
},
error: function(xhr, textStatus, error) {
console.log('failed getting Coin History.');
console.log(xhr.statusText);
if ( xhr.readyState == 0 ) {
Iguana_ServiceUnavailable();
}
console.log(textStatus);
console.log(error);
}
});
}*/
function getDEXCoinBalance(coin) { function getDEXCoinBalance(coin) {
NProgress.done(true); getDEXGetBalance(coin).then(function(result){
NProgress.configure({ console.log(result)
template: '<div class="bar nprogress-bar-header nprogress-bar-info" role="bar"></div><div class="spinner" role="spinner"><div class="spinner-icon"></div></div>' });
}); }
NProgress.start();
var result = [];
var coinmainaddr = EDEXMainAddr(coin);
var tmpIguanaRPCAuth = 'tmpIgRPCUser@'+sessionStorage.getItem('IguanaRPCAuth');
var ajax_data = {'userpass':tmpIguanaRPCAuth,"agent":"dex","method":"listunspent","address":coinmainaddr[0],"symbol":coin}
//console.log(ajax_data);
$.ajax({
async: false,
type: 'POST',
data: JSON.stringify(ajax_data),
url: 'http://127.0.0.1:7778',
//dataType: 'text',
success: function(data, textStatus, jqXHR) {
var AjaxOutputData = JSON.parse(data); //Ajax output gets the whole list of unspent coin with addresses
//console.log('== getDEXCoinBalance Data OutPut ==');
//console.log(AjaxOutputData);
if (AjaxOutputData.error === 'less than required responses') {
toastr.error("Less than required responses. Please try again.", "Basilisk Notification")
}
var tmpcalcnum = 0; function getDEXGetBalance(coin) {
$.each(AjaxOutputData, function(index) { NProgress.done(true);
if ( AjaxOutputData[index].interest !== undefined ) { NProgress.configure({
//console.log('interest is available for this currency. Adding to total balance.'); template: '<div class="bar nprogress-bar-header nprogress-bar-info" role="bar"></div><div class="spinner" role="spinner"><div class="spinner-icon"></div></div>'
tmpcalcnum = tmpcalcnum + AjaxOutputData[index].amount + AjaxOutputData[index].interest; });
} NProgress.start();
if ( AjaxOutputData[index].interest === undefined ) { return new Promise((resolve) =>{
tmpcalcnum = tmpcalcnum + AjaxOutputData[index].amount; var tmpIguanaRPCAuth = 'tmpIgRPCUser@'+sessionStorage.getItem('IguanaRPCAuth');
} var ajax_data_1 = {'userpass':tmpIguanaRPCAuth,"agent":"SuperNET","method":"activehandle"}
var tmp_coin_addr = null
var ajax_call_1 = $.ajax({
data: JSON.stringify(ajax_data_1),
url: 'http://127.0.0.1:7778',
type: 'POST',
dataType: 'json',
}),
ajax_call_2 = ajax_call_1.then(function(data) {
// .then() returns a new promise
tmp_coin_addr = data[coin]
//console.log(tmp_coin_addr);
var ajax_data_2 = {'userpass':tmpIguanaRPCAuth,"agent":"dex","method":"listunspent","address":data[coin],"symbol":coin}
return $.ajax({
data: JSON.stringify(ajax_data_2),
url: 'http://127.0.0.1:7778',
type: 'POST',
dataType: 'json',
});
}); });
var tmp_addr_total_balance_output = {"addr": coinmainaddr[0], "total": tmpcalcnum.toFixed(8)}; ajax_call_2.done(function(data) {
//console.log(tmp_addr_total_balance_output); //console.log(tmp_coin_addr);
//console.log(data);
if (data.error === 'less than required responses') {
toastr.error("Less than required responses. Please try again.", "Basilisk Notification")
}
if (AjaxOutputData == '' ) { var tmpcalcnum = 0;
result.push([{"addr": coinmainaddr[0], "amount":0}]); $.each(data, function(index) {
if ( data[index].interest !== undefined ) {
//console.log('interest is available for this currency. Adding to total balance.');
tmpcalcnum = tmpcalcnum + data[index].amount + data[index].interest;
} }
result.push(tmp_addr_total_balance_output); if ( data[index].interest === undefined ) {
}, tmpcalcnum = tmpcalcnum + data[index].amount;
error: function(xhr, textStatus, error) { }
});
var tmp_addr_total_balance_output = {"addr": tmp_coin_addr, "total": tmpcalcnum.toFixed(8)};
//console.log(tmp_addr_total_balance_output);
if (data == '' ) {
tmp_addr_total_balance_output = [{"addr": tmp_coin_addr, "amount":0}];
}
//console.log(tmp_addr_total_balance_output)
resolve(tmp_addr_total_balance_output)
NProgress.done();
}).fail(function(xhr, textStatus, error) {
// handle request failures
console.log(xhr.statusText); console.log(xhr.statusText);
if ( xhr.readyState == 0 ) { if ( xhr.readyState == 0 ) {
Iguana_ServiceUnavailable(); Iguana_ServiceUnavailable();
} }
console.log(textStatus); console.log(textStatus);
console.log(error); console.log(error);
} });
}); })
//console.log(result);
NProgress.done();
return result[0];
} }
function getCoinBalance(coin) { function getCoinBalance(coin) {
var tmp_get_coin_balance = EDEXlistunspent(coin) var active_edexcoin = $('[data-edexcoin]').attr("data-edexcoin");
if (tmp_get_coin_balance[0] != undefined) { EDEXlistunspent(active_edexcoin).then(function(result){
//console.log(tmp_get_coin_balance[0]) console.log(result)
$('span[data-edexcoincode="' + coin + '"][id="edexcoin-balance"]').text(tmp_get_coin_balance[0].total); if (result[0] != undefined) {
//console.log(tmp_get_coin_balance[0].total) //console.log(result[0])
} else { $('span[data-edexcoincode="' + coin + '"][id="edexcoin-balance"]').text(result[0].total);
$('span[data-edexcoincode="' + coin + '"][id="edexcoin-balance"]').text('0'); //console.log(result[0].total)
} } else {
$('span[data-edexcoincode="' + coin + '"][id="edexcoin-balance"]').text('0');
}
});
} }
function getBasiliskCoinBalance(coin) { function getBasiliskCoinBalance(coin) {
@ -1348,95 +1344,102 @@ function ShowCoinProgressBar(coin) {
}); });
} }
function EdexGetTxList(coin) { function EdexGetTxList(coin) {
NProgress.done(true); return new Promise((resolve) =>{
NProgress.configure({
template: '<div class="bar nprogress-bar-header nprogress-bar-info" role="bar"></div><div class="spinner" role="spinner"><div class="spinner-icon"></div></div>'
});
NProgress.start();
var result = [];
var tmpIguanaRPCAuth = 'tmpIgRPCUser@'+sessionStorage.getItem('IguanaRPCAuth'); var tmpIguanaRPCAuth = 'tmpIgRPCUser@'+sessionStorage.getItem('IguanaRPCAuth');
var ajax_data_1 = {'userpass':tmpIguanaRPCAuth,"agent":"SuperNET","method":"activehandle"}
var tmp_coin_addr = null
var active_edexcoinmodecode = sessionStorage.getItem('edexTmpMode'); var active_edexcoinmodecode = sessionStorage.getItem('edexTmpMode');
if ( active_edexcoinmodecode == 'Basilisk' ) {
var getCoinMainAddr = EDEXMainAddr(coin)
var ajax_data = {'userpass':tmpIguanaRPCAuth,"agent":"dex","method":"listtransactions","address":getCoinMainAddr[0],"count":100,"skip":0,"symbol":coin}
} else {
var ajax_data = {'userpass':tmpIguanaRPCAuth,"coin":coin,"method":"listtransactions","params":[0, 9999999, []]}
}
//console.log(ajax_data);
$.ajax({
async: false,
type: 'POST',
data: JSON.stringify(ajax_data),
url: 'http://127.0.0.1:7778',
//dataType: 'text',
success: function(data, textStatus, jqXHR) {
var AjaxOutputData = JSON.parse(data); //Ajax output gets the whole list of unspent coin with addresses
if ( active_edexcoinmodecode !== 'Basilisk' ) {
AjaxOutputData = AjaxOutputData.result;
}
//console.log('== Data OutPut of listtransactions ==');
//console.log(AjaxOutputData);
$.each(AjaxOutputData, function(index, value) { var ajax_call_1 = $.ajax({
data: JSON.stringify(ajax_data_1),
url: 'http://127.0.0.1:7778',
type: 'POST',
dataType: 'json',
}),
ajax_call_2 = ajax_call_1.then(function(data) {
// .then() returns a new promise
tmp_coin_addr = data[coin]
//console.log(tmp_coin_addr);
if ( active_edexcoinmodecode == 'Basilisk' ) {
var ajax_data_2 = {'userpass':tmpIguanaRPCAuth,"agent":"dex","method":"listtransactions","address":data[coin],"count":100,"skip":0,"symbol":coin}
} else {
var ajax_data_2 = {'userpass':tmpIguanaRPCAuth,"coin":coin,"method":"listtransactions","params":[0, 9999999, []]}
}
return $.ajax({
data: JSON.stringify(ajax_data_2),
url: 'http://127.0.0.1:7778',
type: 'POST',
dataType: 'json',
});
});
ajax_call_2.done(function(data) {
//console.log(tmp_coin_addr);
//console.log(data);
if ( active_edexcoinmodecode == 'Full' ) {
data = data.result;
}
var result = [];
$.each(data, function(index, value) {
//console.log(value); //console.log(value);
var tmp_category = ''; var tmp_category = '';
var tmp_amount = AjaxOutputData[index].amount; var tmp_amount = data[index].amount;
if(!("amount" in AjaxOutputData[index])) { if(!("amount" in data[index])) {
tmp_amount = '<span class="label label-dark">Unknown</span>' tmp_amount = '<span class="label label-dark">Unknown</span>'
} }
var tmp_addr = AjaxOutputData[index].address; var tmp_addr = data[index].address;
if(!("address" in AjaxOutputData[index])) { if(!("address" in data[index])) {
tmp_addr = '<i class="icon fa-bullseye"></i> <span class="label label-dark">Z Address not listed by wallet!</span>' tmp_addr = '<i class="icon fa-bullseye"></i> <span class="label label-dark">Z Address not listed by wallet!</span>'
} }
//tmp_secondsToString = '<i class="icon fa-meh-o"></i> Unknown' //tmp_secondsToString = '<i class="icon fa-meh-o"></i> Unknown'
//if(("blocktime" in AjaxOutputData[index])) { //if(("blocktime" in data[index])) {
//console.log('blocktime FOUND'); //console.log('blocktime FOUND');
//var tmp_secondsToString = secondsToString(AjaxOutputData[index].blocktime) //var tmp_secondsToString = secondsToString(data[index].blocktime)
//} //}
var tmp_secondsToString = secondsToString(AjaxOutputData[index].blocktime) var tmp_secondsToString = secondsToString(data[index].blocktime)
if (isNaN(tmp_secondsToString)) { if (isNaN(tmp_secondsToString)) {
//tmp_secondsToString = 'Unknown'; //tmp_secondsToString = 'Unknown';
} }
if ( AjaxOutputData[index].category == 'send' ) { if ( data[index].category == 'send' ) {
tmp_category = '<i class="icon fa-arrow-circle-left"></i> OUT'; tmp_category = '<i class="icon fa-arrow-circle-left"></i> OUT';
} }
if ( AjaxOutputData[index].category == 'receive' ) { if ( data[index].category == 'receive' ) {
tmp_category = '<i class="icon fa-arrow-circle-right"></i> IN'; tmp_category = '<i class="icon fa-arrow-circle-right"></i> IN';
} }
if ( AjaxOutputData[index].category == 'generate' ) { if ( data[index].category == 'generate' ) {
tmp_category = '<i class="icon fa-cogs"></i> Mined'; tmp_category = '<i class="icon fa-cogs"></i> Mined';
}if ( AjaxOutputData[index].category == 'immature' ) { }if ( data[index].category == 'immature' ) {
tmp_category = '<i class="icon fa-clock-o"></i> Immature'; tmp_category = '<i class="icon fa-clock-o"></i> Immature';
} }
if ( AjaxOutputData[index].category == 'unknown' ) { if ( data[index].category == 'unknown' ) {
tmp_category = '<i class="icon fa-meh-o"></i> Unknown'; tmp_category = '<i class="icon fa-meh-o"></i> Unknown';
} }
//console.log(tmp_addr); //console.log(tmp_addr);
//tmplisttransactions = {"category": AjaxOutputData[index].category,"confirmations": AjaxOutputData[index].confirmations,"amount": AjaxOutputData[index].amount,"time": AjaxOutputData[index].time,"address": AjaxOutputData[index].address,"txid": AjaxOutputData[index].txid} //tmplisttransactions = {"category": data[index].category,"confirmations": data[index].confirmations,"amount": data[index].amount,"time": data[index].time,"address": data[index].address,"txid": data[index].txid}
tmplisttransactions = [tmp_category,AjaxOutputData[index].confirmations,tmp_amount,tmp_secondsToString,tmp_addr,'<button type="button" class="btn btn-xs white btn-info waves-effect waves-light kmd-txid-details-btn" data-edexcoin="' + coin + '" data-txidtype="public" data-txid="'+AjaxOutputData[index].txid+'"><i class="icon fa-search"></i></button>'] tmplisttransactions = [tmp_category,data[index].confirmations,tmp_amount,tmp_secondsToString,tmp_addr,'<button type="button" class="btn btn-xs white btn-info waves-effect waves-light kmd-txid-details-btn" data-edexcoin="' + coin + '" data-txidtype="public" data-txid="'+data[index].txid+'"><i class="icon fa-search"></i></button>']
//console.log(tmplisttransactions); //console.log(tmplisttransactions);
result.push(tmplisttransactions); result.push(tmplisttransactions);
}); });
}, //console.log(result)
error: function(xhr, textStatus, error) { resolve(result);
console.log('failed getting Coin History.'); }).fail(function(xhr, textStatus, error) {
console.log(xhr.statusText); // handle request failures
if ( xhr.readyState == 0 ) { console.log(xhr.statusText);
Iguana_ServiceUnavailable(); if ( xhr.readyState == 0 ) {
} Iguana_ServiceUnavailable();
console.log(textStatus); }
console.log(error); console.log(textStatus);
} console.log(error);
}); });
//console.log(result); });
NProgress.done();
return result;
} }
function clearEdexSendFieldData() { function clearEdexSendFieldData() {

295
assets/scripts/iguana_api.js
View File

@ -1,3 +1,26 @@
function IguanaAJAX(url,ajax_data) {
return $.ajax({
data: JSON.stringify(ajax_data),
url: url,
type: 'POST',
dataType: 'json',
//beforeSend: showLoadingImgFn
})
.fail(function(xhr, textStatus, error) {
// handle request failures
console.log(xhr.statusText);
if ( xhr.readyState == 0 ) {
Iguana_ServiceUnavailable();
}
console.log(textStatus);
console.log(error);
});
}
function Iguana_dumpwallet() { function Iguana_dumpwallet() {
var tmpIguanaRPCAuth = 'tmpIgRPCUser@'+sessionStorage.getItem('IguanaRPCAuth'); var tmpIguanaRPCAuth = 'tmpIgRPCUser@'+sessionStorage.getItem('IguanaRPCAuth');
var ajax_data = {'userpass':tmpIguanaRPCAuth,"agent":"bitcoinrpc","method":"dumpwallet","filename": ""}; var ajax_data = {'userpass':tmpIguanaRPCAuth,"agent":"bitcoinrpc","method":"dumpwallet","filename": ""};
@ -513,27 +536,30 @@ function EDEXlistunspent(coin) {
template: '<div class="bar nprogress-bar-header nprogress-bar-info" role="bar"></div><div class="spinner" role="spinner"><div class="spinner-icon"></div></div>' template: '<div class="bar nprogress-bar-header nprogress-bar-info" role="bar"></div><div class="spinner" role="spinner"><div class="spinner-icon"></div></div>'
}); });
NProgress.start(); NProgress.start();
var result = [];
var tmpIguanaRPCAuth = 'tmpIgRPCUser@'+sessionStorage.getItem('IguanaRPCAuth'); return new Promise((resolve) =>{
var ajax_data = {'userpass':tmpIguanaRPCAuth,"coin":coin,"method":"listunspent","params":[]} var tmpIguanaRPCAuth = 'tmpIgRPCUser@'+sessionStorage.getItem('IguanaRPCAuth');
//console.log(ajax_data); var ajax_data = {'userpass':tmpIguanaRPCAuth,"coin":coin,"method":"listunspent","params":[]}
$.ajax({ var active_edexcoinmodecode = sessionStorage.getItem('edexTmpMode');
async: false,
type: 'POST', var ajaxCall = $.ajax({
data: JSON.stringify(ajax_data), data: JSON.stringify(ajax_data),
url: 'http://127.0.0.1:7778', url: 'http://127.0.0.1:7778',
//dataType: 'text', type: 'POST',
success: function(data, textStatus, jqXHR) { dataType: 'json',
var AjaxOutputData = JSON.parse(data); //Ajax output gets the whole list of unspent coin with addresses });
//console.log('== Data OutPut ==');
//console.log(AjaxOutputData); ajaxCall.done(function(data) {
var unique_addresses = _.keys(_.countBy(AjaxOutputData, function(data) { return data.address; })); //This code using undscore.js takes only the address into an array which are unique in that list //console.log(data);
var result = [];
// This code using undscore.js takes only the address into an array which are unique in that list
var unique_addresses = _.keys(_.countBy(data, function(data) { return data.address; }));
// This function calls each unique address and calculates the total amount of coins in it. // This function calls each unique address and calculates the total amount of coins in it.
$.each(unique_addresses, function(index) { $.each(unique_addresses, function(index) {
//console.log(unique_addresses[index]); //console.log(unique_addresses[index]);
var unique_addr_tmp_array = _.where(AjaxOutputData, {address: unique_addresses[index]}); var unique_addr_tmp_array = _.where(data, {address: unique_addresses[index]});
//console.log(unique_addr_tmp_array); //console.log(unique_addr_tmp_array);
var tmpcalcnum = 0; var tmpcalcnum = 0;
@ -550,21 +576,20 @@ function EDEXlistunspent(coin) {
var tmp_addr_total_balance_output = {"addr": unique_addr_tmp_array[0].address, "total": tmpcalcnum}; var tmp_addr_total_balance_output = {"addr": unique_addr_tmp_array[0].address, "total": tmpcalcnum};
//console.log(tmp_addr_total_balance_output); //console.log(tmp_addr_total_balance_output);
result.push(tmp_addr_total_balance_output); result.push(tmp_addr_total_balance_output);
}); });
}, //console.log(result)
error: function(xhr, textStatus, error) { resolve(result)
}).fail(function(xhr, textStatus, error) {
// handle request failures
console.log(xhr.statusText); console.log(xhr.statusText);
if ( xhr.readyState == 0 ) { if ( xhr.readyState == 0 ) {
Iguana_ServiceUnavailable(); Iguana_ServiceUnavailable();
} }
console.log(textStatus); console.log(textStatus);
console.log(error); console.log(error);
} });
}); });
//console.log(result);
NProgress.done(); NProgress.done();
return result;
} }
@ -581,35 +606,34 @@ function EDEXMainAddr(coin) {
template: '<div class="bar nprogress-bar-header nprogress-bar-info" role="bar"></div><div class="spinner" role="spinner"><div class="spinner-icon"></div></div>' template: '<div class="bar nprogress-bar-header nprogress-bar-info" role="bar"></div><div class="spinner" role="spinner"><div class="spinner-icon"></div></div>'
}); });
NProgress.start(); NProgress.start();
var result = []; return new Promise((resolve) =>{
var tmpIguanaRPCAuth = 'tmpIgRPCUser@'+sessionStorage.getItem('IguanaRPCAuth');
var ajax_data = {'userpass':tmpIguanaRPCAuth,"agent":"SuperNET","method":"activehandle"}
var tmpIguanaRPCAuth = 'tmpIgRPCUser@'+sessionStorage.getItem('IguanaRPCAuth'); var ajaxCall = $.ajax({
var ajax_data = {'userpass':tmpIguanaRPCAuth,"agent":"SuperNET","method":"activehandle"} data: JSON.stringify(ajax_data),
//console.log(ajax_data); url: 'http://127.0.0.1:7778',
$.ajax({ type: 'POST',
async: false, dataType: 'json',
type: 'POST', });
data: JSON.stringify(ajax_data),
url: 'http://127.0.0.1:7778', ajaxCall.done(function(data) {
//dataType: 'text', tmp_coin_addr = data[coin]
success: function(data, textStatus, jqXHR) { //console.log(tmp_coin_addr)
var AjaxOutputData = JSON.parse(data); //Ajax output gets the whole list of unspent coin with addresses resolve(tmp_coin_addr);
//console.log('== Data OutPut =='); NProgress.done();
//console.log(AjaxOutputData[coin]); }).fail(function(xhr, textStatus, error) {
result.push(AjaxOutputData[coin]); // handle request failures
},
error: function(xhr, textStatus, error) {
console.log(xhr.statusText); console.log(xhr.statusText);
if ( xhr.readyState == 0 ) { if ( xhr.readyState == 0 ) {
Iguana_ServiceUnavailable(); Iguana_ServiceUnavailable();
} }
console.log(textStatus); console.log(textStatus);
console.log(error); console.log(error);
} NProgress.done();
});
}); });
//console.log(result);
NProgress.done();
return result;
} }
@ -969,6 +993,9 @@ function Iguana_DEXImportAll() {
$.each(AjaxOutputData['basilisk'], function(basilisk_index) { $.each(AjaxOutputData['basilisk'], function(basilisk_index) {
//console.log(AjaxOutputData['basilisk'][basilisk_index]); //console.log(AjaxOutputData['basilisk'][basilisk_index]);
EDEXMainAddr('KMD').then(function(result){
console.log(result)
});
tmp_coinaddr = EDEXMainAddr(AjaxOutputData['basilisk'][basilisk_index]) tmp_coinaddr = EDEXMainAddr(AjaxOutputData['basilisk'][basilisk_index])
//console.log(tmp_coinaddr[index]); //console.log(tmp_coinaddr[index]);
tmp_deximport_output = Iguana_DEXImportAddr(AjaxOutputData['basilisk'][basilisk_index], tmp_coinaddr[index]) tmp_deximport_output = Iguana_DEXImportAddr(AjaxOutputData['basilisk'][basilisk_index], tmp_coinaddr[index])
@ -1151,7 +1178,7 @@ function EDEX_DEXnotarychains() {
} }
function EDEX_DEXgetinfoAll() { function IguanaAJAX0() {
NProgress.done(true); NProgress.done(true);
NProgress.configure({ NProgress.configure({
template: '<div class="bar nprogress-bar-header nprogress-bar-info" role="bar"></div><div class="spinner" role="spinner"><div class="spinner-icon"></div></div>' template: '<div class="bar nprogress-bar-header nprogress-bar-info" role="bar"></div><div class="spinner" role="spinner"><div class="spinner-icon"></div></div>'
@ -1159,61 +1186,139 @@ function EDEX_DEXgetinfoAll() {
NProgress.start(); NProgress.start();
var result = []; var result = [];
var get_dex_notarychains = EDEX_DEXnotarychains(); var tmpIguanaRPCAuth = 'tmpIgRPCUser@'+sessionStorage.getItem('IguanaRPCAuth');
console.log(get_dex_notarychains.length) var ajax_data = {'userpass':tmpIguanaRPCAuth,"agent":"dpow","method":"notarychains"}
console.log(ajax_data);
$.ajax({
//async: false,
type: 'POST',
data: JSON.stringify(ajax_data),
url: 'http://127.0.0.1:7778',
//dataType: 'text',
/*success: function(data, textStatus, jqXHR) {
var AjaxOutputData = JSON.parse(data); //Ajax output gets the whole list of unspent coin with addresses
console.log('== EDEX_DEXnotarychains Data OutPut ==');
//console.log(AjaxOutputData);
result.push(AjaxOutputData);
},
error: function(xhr, textStatus, error) {
console.log(xhr.statusText);
if ( xhr.readyState == 0 ) {
Iguana_ServiceUnavailable();
}
console.log(textStatus);
console.log(error);
}*/
});
//console.log(result);
NProgress.done();
return result[0];
}
var refresh_percent = '';
$.each(get_dex_notarychains, function( coin_index, coin_value ) { function EDEX_DEXgetinfoAll() {
console.log(coin_index + ': ' + coin_value); NProgress.done(true);
var tmpIguanaRPCAuth = 'tmpIgRPCUser@'+sessionStorage.getItem('IguanaRPCAuth'); NProgress.configure({
var ajax_data = {'userpass':tmpIguanaRPCAuth,"agent":"dex","method":"getinfo","symbol":coin_value} template: '<div class="bar nprogress-bar-header nprogress-bar-info" role="bar"></div><div class="spinner" role="spinner"><div class="spinner-icon"></div></div>'
//console.log(ajax_data); });
$.ajax({ NProgress.start();
//async: false, var result = [];
type: 'POST',
data: JSON.stringify(ajax_data), var tmpIguanaRPCAuth = 'tmpIgRPCUser@'+sessionStorage.getItem('IguanaRPCAuth');
url: 'http://127.0.0.1:7778', var ajax_data = {'userpass':tmpIguanaRPCAuth,"agent":"dpow","method":"notarychains"}
//dataType: 'text', var get_dex_notarychains = IguanaAJAX('http://127.0.0.1:7778',ajax_data).done(function(data) {
success: function(data, textStatus, jqXHR) { //console.log(get_dex_notarychains.responseText);
var AjaxOutputData = JSON.parse(data); //Ajax output gets the whole list of unspent coin with addresses get_dex_notarychains = JSON.parse(get_dex_notarychains.responseText)
console.log('== EDEX_DEXgetinfoAll Data OutPut =='); //console.log(get_dex_notarychains)
console.log(AjaxOutputData);
var refresh_percent = '';
var tmp_index = parseInt(coin_index) + 1
var refresh_percent = parseFloat(parseInt(coin_index, 10) * 100)/ parseInt(get_dex_notarychains.length, 10); $.each(get_dex_notarychains, function( coin_index, coin_value ) {
console.log(refresh_percent) console.log(coin_index + ': ' + coin_value);
$('#basilisk-connections-refresh-title').text('Connection status... ' + tmp_index + '/' + get_dex_notarychains.length + ': ' + coin_value); var tmpIguanaRPCAuth = 'tmpIgRPCUser@'+sessionStorage.getItem('IguanaRPCAuth');
$('#basilisk-connections-refresh-percent').text(refresh_percent+'%'); var ajax_data = {'userpass':tmpIguanaRPCAuth,"agent":"dex","method":"getinfo","symbol":coin_value}
$('#basilisk-connections-refresh-progress-bar').width(refresh_percent+'%') console.log(ajax_data);
if (AjaxOutputData == '' ) { if (coin_value !== 'MESH') {
result.push([{"amount":0}]); var getinfo_each_chain = IguanaAJAX('http://127.0.0.1:7778',ajax_data).done(function(data) {
} getinfo_each_chain = JSON.parse(getinfo_each_chain.responseText)
result.push(AjaxOutputData); console.log('== EDEX_DEXgetinfoAll Data OutPut ==');
if (AjaxOutputData.error === 'less than required responses') { console.log(getinfo_each_chain);
toastr.info("Less than required responses for "+coin_value+".", "Basilisk Notification")
$('#basilisk-connections-refresh-status-output').text('Output: ' + AjaxOutputData.error) var tmp_index = parseInt(coin_index) + 1
} else { var refresh_percent = parseFloat(parseInt(coin_index, 10) * 100)/ parseInt(get_dex_notarychains.length, 10);
$('#basilisk-connections-refresh-status-output').text('Output: Connected') console.log(refresh_percent)
} $('#basilisk-connections-refresh-title').text('Connection status... ' + tmp_index + '/' + get_dex_notarychains.length + ': ' + coin_value);
if ( tmp_index == get_dex_notarychains.length ) { $('#basilisk-connections-refresh-percent').text(refresh_percent+'%');
$('#basilisk-connections-refresh-progress-bar').width('100%') $('#basilisk-connections-refresh-progress-bar').width(refresh_percent+'%')
$('#RefreshBasiliskConnectionsMdl').modal('hide')
toastr.success("Basilsk nodes connections refreshed.", "Basilisk Notification") if (getinfo_each_chain == '' ) {
} result.push([{"amount":0}]);
}, }
error: function(xhr, textStatus, error) { result.push(getinfo_each_chain);
console.log(xhr.statusText); if (getinfo_each_chain.error === 'less than required responses') {
if ( xhr.readyState == 0 ) { toastr.info("Less than required responses for "+coin_value+".", "Basilisk Notification")
Iguana_ServiceUnavailable(); $('#basilisk-connections-refresh-status-output').text('Output: ' + getinfo_each_chain.error)
} } else {
console.log(textStatus); $('#basilisk-connections-refresh-status-output').text('Output: Connected')
console.log(error); }
if ( tmp_index == get_dex_notarychains.length-1 ) {
$('#basilisk-connections-refresh-progress-bar').width('100%')
$('#RefreshBasiliskConnectionsMdl').modal('hide')
toastr.success("Basilsk nodes connections refreshed.", "Basilisk Notification")
}
});
} }
/*$.ajax({
//async: false,
type: 'POST',
data: JSON.stringify(ajax_data),
url: 'http://127.0.0.1:7778',
//dataType: 'text',
success: function(data, textStatus, jqXHR) {
var AjaxOutputData = JSON.parse(data); //Ajax output gets the whole list of unspent coin with addresses
console.log('== EDEX_DEXgetinfoAll Data OutPut ==');
console.log(AjaxOutputData);
var tmp_index = parseInt(coin_index) + 1
var refresh_percent = parseFloat(parseInt(coin_index, 10) * 100)/ parseInt(get_dex_notarychains.length, 10);
console.log(refresh_percent)
$('#basilisk-connections-refresh-title').text('Connection status... ' + tmp_index + '/' + get_dex_notarychains.length + ': ' + coin_value);
$('#basilisk-connections-refresh-percent').text(refresh_percent+'%');
$('#basilisk-connections-refresh-progress-bar').width(refresh_percent+'%')
if (AjaxOutputData == '' ) {
result.push([{"amount":0}]);
}
result.push(AjaxOutputData);
if (AjaxOutputData.error === 'less than required responses') {
toastr.info("Less than required responses for "+coin_value+".", "Basilisk Notification")
$('#basilisk-connections-refresh-status-output').text('Output: ' + AjaxOutputData.error)
} else {
$('#basilisk-connections-refresh-status-output').text('Output: Connected')
}
if ( tmp_index == get_dex_notarychains.length ) {
$('#basilisk-connections-refresh-progress-bar').width('100%')
$('#RefreshBasiliskConnectionsMdl').modal('hide')
toastr.success("Basilsk nodes connections refreshed.", "Basilisk Notification")
}
},
error: function(xhr, textStatus, error) {
console.log(xhr.statusText);
if ( xhr.readyState == 0 ) {
Iguana_ServiceUnavailable();
}
console.log(textStatus);
console.log(error);
}
});*/
}); });
}); });
//var get_dex_notarychains = EDEX_DEXnotarychains();
//console.log(get_dex_notarychains.length)
//console.log(result); //console.log(result);
NProgress.done(); NProgress.done();
return result[0]; return result[0];
@ -1305,3 +1410,7 @@ function Shepherd_herd(coin) {
return result; return result;
} }

10
assets/scripts/login.js
View File

@ -52,16 +52,6 @@ var Login = function() {
}, },
submitHandler: function(form) { submitHandler: function(form) {
var tmpIguanaRPCAuth = 'tmpIgRPCUser@'+sessionStorage.getItem('IguanaRPCAuth');
var IguanaLoginData = {
'userpass':tmpIguanaRPCAuth,
'handle': $('#wallet-handle').val(),
'password': $('#password').val(),
'timeout': '2592000'
}
//console.log('== Data Collected ==');
console.log(IguanaLoginData);
// Use AJAX to post the object to login user
var tmpIguanaRPCAuth = 'tmpIgRPCUser@'+sessionStorage.getItem('IguanaRPCAuth'); var tmpIguanaRPCAuth = 'tmpIgRPCUser@'+sessionStorage.getItem('IguanaRPCAuth');
var ajax_data = {'userpass':tmpIguanaRPCAuth,'handle': $('#wallet-handle').val(),'password': $('#password').val(),'timeout': '2592000',"agent":"bitcoinrpc","method":"walletpassphrase"} var ajax_data = {'userpass':tmpIguanaRPCAuth,'handle': $('#wallet-handle').val(),'password': $('#password').val(),'timeout': '2592000',"agent":"bitcoinrpc","method":"walletpassphrase"}
$.ajax({ $.ajax({

4
index.html
View File

@ -830,11 +830,11 @@
<thead> <thead>
<tr> <tr>
<th>Direction</th> <th>Direction</th>
<th>Confirmations</th> <th class="hidden-xs hidden-sm">Confirmations</th>
<th>Amount</th> <th>Amount</th>
<th>Time</th> <th>Time</th>
<th>Dest. Address</th> <th>Dest. Address</th>
<th>Tx Detail</th> <th class="hidden-xs hidden-sm">Tx Detail</th>
</tr> </tr>
</thead> </thead>
<tfoot> <tfoot>

Write Preview
Loading…
Cancel
Save