diff --git a/assets/css/dashboard-wallet-widgets.css b/assets/css/dashboard-wallet-widgets.css
index 1298c42..437c4c0 100644
--- a/assets/css/dashboard-wallet-widgets.css
+++ b/assets/css/dashboard-wallet-widgets.css
@@ -171,7 +171,7 @@
margin-left: 450px !important;
}
.page-main, #edex-footer {
- margin-left: 450px !important;
+ /*margin-left: 450px !important;*/
}
}
diff --git a/assets/scripts/dashboard.js b/assets/scripts/dashboard.js
index f52f816..9d808e9 100644
--- a/assets/scripts/dashboard.js
+++ b/assets/scripts/dashboard.js
@@ -55,19 +55,21 @@ var Dashboard = function() {
var selected_coinmode = sessionStorage.getItem('edexTmpMode')
if ( selected_coinmode == 'Basilisk' ) {
- var coinwalletbalance = getDEXCoinBalance(active_edexcoin)
- console.log(coinwalletbalance)
- //coinwalletbalance = coinwalletbalance.total
- $('#edex_total_balance').text(coinwalletbalance.total);
+ getDEXGetBalance(active_edexcoin).then(function(result){
+ //console.log(result)
+ $('#edex_total_balance').text(result.total);
+ });
} else {
- var tmp_get_coin_balance = EDEXlistunspent(active_edexcoin)
- if (tmp_get_coin_balance[0] != undefined) {
- //console.log(tmp_get_coin_balance[0])
- $('#edex_total_balance').text(tmp_get_coin_balance[0].total.toFixed(8));
- //console.log(tmp_get_coin_balance[0].total)
- } else {
- $('#edex_total_balance').text('0');
- }
+ EDEXlistunspent(active_edexcoin).then(function(result){
+ //console.log(result)
+ if (result[0] != undefined) {
+ //console.log(result[0])
+ $('#edex_total_balance').text(result[0].total.toFixed(8));
+ //console.log(result[0].total)
+ } else {
+ $('#edex_total_balance').text('0');
+ }
+ });
}
EdexfillTxHistory(active_edexcoin);
//getCoinBalance(active_edexcoin);
@@ -704,19 +706,21 @@ function edexCoinBtnAction() {
//populate selected coin's balance
if ( selected_coinmode == 'Basilisk' ) {
- var coinwalletbalance = getDEXCoinBalance(coincode)
- //console.log(coinwalletbalance.total)
- coinwalletbalance = coinwalletbalance.total
- $('#edex_total_balance').text(coinwalletbalance);
+ getDEXGetBalance(selected_coin).then(function(result){
+ //console.log(result)
+ $('#edex_total_balance').text(result.total);
+ });
} else {
- var tmp_get_coin_balance = EDEXlistunspent(coincode)
- if (tmp_get_coin_balance[0] != undefined) {
- //console.log(tmp_get_coin_balance[0])
- $('#edex_total_balance').text(tmp_get_coin_balance[0].total.toFixed(8));
- //console.log(tmp_get_coin_balance[0].total)
- } else {
- $('#edex_total_balance').text('0');
- }
+ EDEXlistunspent(selected_coin).then(function(result){
+ //console.log(result)
+ if (result[0] != undefined) {
+ //console.log(result[0])
+ $('#edex_total_balance').text(result[0].total.toFixed(8));
+ //console.log(result[0].total)
+ } else {
+ $('#edex_total_balance').text('0');
+ }
+ });
}
//getCoinBalance(active_edexcoin);
@@ -755,21 +759,22 @@ function EdexfillTxHistory(coin) {
template: '
'
});
NProgress.start();
- var txhistorydata = EdexGetTxList(coin);
- //console.log(txhistorydata);
-
- var edex_txhistory_table = '';
- edex_txhistory_table = $('#edex-tx-history-tbl').DataTable( { data: txhistorydata,
- "order": [[ 3, "desc" ]],
- select: true,
- retrieve: true
- });
+ EdexGetTxList(coin).then(function(result){
+ //console.log(result)
+
+ var edex_txhistory_table = '';
+ edex_txhistory_table = $('#edex-tx-history-tbl').DataTable( { data: result,
+ "order": [[ 3, "desc" ]],
+ select: true,
+ retrieve: true
+ });
- edex_txhistory_table.destroy();
- edex_txhistory_table = $('#edex-tx-history-tbl').DataTable( { data: txhistorydata,
- "order": [[ 3, "desc" ]],
- select: true,
- retrieve: true
+ edex_txhistory_table.destroy();
+ edex_txhistory_table = $('#edex-tx-history-tbl').DataTable( { data: result,
+ "order": [[ 3, "desc" ]],
+ select: true,
+ retrieve: true
+ });
});
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) {
- NProgress.done(true);
- NProgress.configure({
- template: ''
- });
- NProgress.start();
- var result = [];
+ getDEXGetBalance(coin).then(function(result){
+ console.log(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")
+function getDEXGetBalance(coin) {
+ NProgress.done(true);
+ NProgress.configure({
+ template: ''
+ });
+ NProgress.start();
+ return new Promise((resolve) =>{
+ 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',
+ });
+ });
+
+ ajax_call_2.done(function(data) {
+ //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")
+ }
+
+ var tmpcalcnum = 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;
+ }
+ if ( data[index].interest === undefined ) {
+ tmpcalcnum = tmpcalcnum + data[index].amount;
}
+ });
- var tmpcalcnum = 0;
- $.each(AjaxOutputData, function(index) {
- if ( AjaxOutputData[index].interest !== undefined ) {
- //console.log('interest is available for this currency. Adding to total balance.');
- tmpcalcnum = tmpcalcnum + AjaxOutputData[index].amount + AjaxOutputData[index].interest;
- }
- if ( AjaxOutputData[index].interest === undefined ) {
- tmpcalcnum = tmpcalcnum + AjaxOutputData[index].amount;
- }
- });
-
- var tmp_addr_total_balance_output = {"addr": coinmainaddr[0], "total": tmpcalcnum.toFixed(8)};
+ var tmp_addr_total_balance_output = {"addr": tmp_coin_addr, "total": tmpcalcnum.toFixed(8)};
//console.log(tmp_addr_total_balance_output);
- if (AjaxOutputData == '' ) {
- result.push([{"addr": coinmainaddr[0], "amount":0}]);
- }
- result.push(tmp_addr_total_balance_output);
- },
- error: function(xhr, textStatus, error) {
+ 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);
if ( xhr.readyState == 0 ) {
Iguana_ServiceUnavailable();
}
console.log(textStatus);
console.log(error);
- }
- });
- //console.log(result);
- NProgress.done();
- return result[0];
+ });
+ })
}
function getCoinBalance(coin) {
- var tmp_get_coin_balance = EDEXlistunspent(coin)
- if (tmp_get_coin_balance[0] != undefined) {
- //console.log(tmp_get_coin_balance[0])
- $('span[data-edexcoincode="' + coin + '"][id="edexcoin-balance"]').text(tmp_get_coin_balance[0].total);
- //console.log(tmp_get_coin_balance[0].total)
- } else {
- $('span[data-edexcoincode="' + coin + '"][id="edexcoin-balance"]').text('0');
- }
+ var active_edexcoin = $('[data-edexcoin]').attr("data-edexcoin");
+ EDEXlistunspent(active_edexcoin).then(function(result){
+ console.log(result)
+ if (result[0] != undefined) {
+ //console.log(result[0])
+ $('span[data-edexcoincode="' + coin + '"][id="edexcoin-balance"]').text(result[0].total);
+ //console.log(result[0].total)
+ } else {
+ $('span[data-edexcoincode="' + coin + '"][id="edexcoin-balance"]').text('0');
+ }
+ });
}
function getBasiliskCoinBalance(coin) {
@@ -1348,95 +1344,102 @@ function ShowCoinProgressBar(coin) {
});
}
+
+
function EdexGetTxList(coin) {
- NProgress.done(true);
- NProgress.configure({
- template: ''
- });
- NProgress.start();
- var result = [];
+ return new Promise((resolve) =>{
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');
- 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);
- var tmp_category = '';
- var tmp_amount = AjaxOutputData[index].amount;
- if(!("amount" in AjaxOutputData[index])) {
- tmp_amount = 'Unknown'
- }
- var tmp_addr = AjaxOutputData[index].address;
- if(!("address" in AjaxOutputData[index])) {
- tmp_addr = ' Z Address not listed by wallet!'
- }
-
- //tmp_secondsToString = ' Unknown'
- //if(("blocktime" in AjaxOutputData[index])) {
- //console.log('blocktime FOUND');
- //var tmp_secondsToString = secondsToString(AjaxOutputData[index].blocktime)
- //}
+ var tmp_category = '';
+ var tmp_amount = data[index].amount;
+ if(!("amount" in data[index])) {
+ tmp_amount = 'Unknown'
+ }
+ var tmp_addr = data[index].address;
+ if(!("address" in data[index])) {
+ tmp_addr = ' Z Address not listed by wallet!'
+ }
- var tmp_secondsToString = secondsToString(AjaxOutputData[index].blocktime)
+ //tmp_secondsToString = ' Unknown'
+ //if(("blocktime" in data[index])) {
+ //console.log('blocktime FOUND');
+ //var tmp_secondsToString = secondsToString(data[index].blocktime)
+ //}
- if (isNaN(tmp_secondsToString)) {
- //tmp_secondsToString = 'Unknown';
- }
- if ( AjaxOutputData[index].category == 'send' ) {
- tmp_category = ' OUT';
- }
- if ( AjaxOutputData[index].category == 'receive' ) {
- tmp_category = ' IN';
- }
- if ( AjaxOutputData[index].category == 'generate' ) {
- tmp_category = ' Mined';
- }if ( AjaxOutputData[index].category == 'immature' ) {
- tmp_category = ' Immature';
- }
- if ( AjaxOutputData[index].category == 'unknown' ) {
- tmp_category = ' Unknown';
- }
- //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 = [tmp_category,AjaxOutputData[index].confirmations,tmp_amount,tmp_secondsToString,tmp_addr,'']
- //console.log(tmplisttransactions);
- result.push(tmplisttransactions);
+ var tmp_secondsToString = secondsToString(data[index].blocktime)
+
+ if (isNaN(tmp_secondsToString)) {
+ //tmp_secondsToString = 'Unknown';
+ }
+ if ( data[index].category == 'send' ) {
+ tmp_category = ' OUT';
+ }
+ if ( data[index].category == 'receive' ) {
+ tmp_category = ' IN';
+ }
+ if ( data[index].category == 'generate' ) {
+ tmp_category = ' Mined';
+ }if ( data[index].category == 'immature' ) {
+ tmp_category = ' Immature';
+ }
+ if ( data[index].category == 'unknown' ) {
+ tmp_category = ' Unknown';
+ }
+ //console.log(tmp_addr);
+ //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,data[index].confirmations,tmp_amount,tmp_secondsToString,tmp_addr,'']
+ //console.log(tmplisttransactions);
+ result.push(tmplisttransactions);
});
- },
- 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);
- }
+ //console.log(result)
+ resolve(result);
+ }).fail(function(xhr, textStatus, error) {
+ // handle request failures
+ console.log(xhr.statusText);
+ if ( xhr.readyState == 0 ) {
+ Iguana_ServiceUnavailable();
+ }
+ console.log(textStatus);
+ console.log(error);
});
- //console.log(result);
- NProgress.done();
- return result;
+ });
}
function clearEdexSendFieldData() {
diff --git a/assets/scripts/iguana_api.js b/assets/scripts/iguana_api.js
index 682cca8..4773463 100644
--- a/assets/scripts/iguana_api.js
+++ b/assets/scripts/iguana_api.js
@@ -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() {
var tmpIguanaRPCAuth = 'tmpIgRPCUser@'+sessionStorage.getItem('IguanaRPCAuth');
var ajax_data = {'userpass':tmpIguanaRPCAuth,"agent":"bitcoinrpc","method":"dumpwallet","filename": ""};
@@ -513,27 +536,30 @@ function EDEXlistunspent(coin) {
template: ''
});
NProgress.start();
- var result = [];
- var tmpIguanaRPCAuth = 'tmpIgRPCUser@'+sessionStorage.getItem('IguanaRPCAuth');
- var ajax_data = {'userpass':tmpIguanaRPCAuth,"coin":coin,"method":"listunspent","params":[]}
- //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('== Data OutPut ==');
- //console.log(AjaxOutputData);
- 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
+ return new Promise((resolve) =>{
+ var tmpIguanaRPCAuth = 'tmpIgRPCUser@'+sessionStorage.getItem('IguanaRPCAuth');
+ var ajax_data = {'userpass':tmpIguanaRPCAuth,"coin":coin,"method":"listunspent","params":[]}
+ var active_edexcoinmodecode = sessionStorage.getItem('edexTmpMode');
+
+ var ajaxCall = $.ajax({
+ data: JSON.stringify(ajax_data),
+ url: 'http://127.0.0.1:7778',
+ type: 'POST',
+ dataType: 'json',
+ });
+
+ ajaxCall.done(function(data) {
+ //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.
$.each(unique_addresses, function(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);
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};
//console.log(tmp_addr_total_balance_output);
result.push(tmp_addr_total_balance_output);
-
});
- },
- error: function(xhr, textStatus, error) {
+ //console.log(result)
+ resolve(result)
+ }).fail(function(xhr, textStatus, error) {
+ // handle request failures
console.log(xhr.statusText);
if ( xhr.readyState == 0 ) {
Iguana_ServiceUnavailable();
}
console.log(textStatus);
console.log(error);
- }
+ });
});
- //console.log(result);
NProgress.done();
- return result;
}
@@ -581,35 +606,34 @@ function EDEXMainAddr(coin) {
template: ''
});
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 ajax_data = {'userpass':tmpIguanaRPCAuth,"agent":"SuperNET","method":"activehandle"}
- //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('== Data OutPut ==');
- //console.log(AjaxOutputData[coin]);
- result.push(AjaxOutputData[coin]);
- },
- error: function(xhr, textStatus, error) {
+ var ajaxCall = $.ajax({
+ data: JSON.stringify(ajax_data),
+ url: 'http://127.0.0.1:7778',
+ type: 'POST',
+ dataType: 'json',
+ });
+
+ ajaxCall.done(function(data) {
+ tmp_coin_addr = data[coin]
+ //console.log(tmp_coin_addr)
+ resolve(tmp_coin_addr);
+ NProgress.done();
+ }).fail(function(xhr, textStatus, error) {
+ // handle request failures
console.log(xhr.statusText);
if ( xhr.readyState == 0 ) {
Iguana_ServiceUnavailable();
}
console.log(textStatus);
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) {
//console.log(AjaxOutputData['basilisk'][basilisk_index]);
+ EDEXMainAddr('KMD').then(function(result){
+ console.log(result)
+ });
tmp_coinaddr = EDEXMainAddr(AjaxOutputData['basilisk'][basilisk_index])
//console.log(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.configure({
template: ''
@@ -1159,61 +1186,139 @@ function EDEX_DEXgetinfoAll() {
NProgress.start();
var result = [];
- var get_dex_notarychains = EDEX_DEXnotarychains();
- console.log(get_dex_notarychains.length)
+ var tmpIguanaRPCAuth = 'tmpIgRPCUser@'+sessionStorage.getItem('IguanaRPCAuth');
+ 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 = '';
+function EDEX_DEXgetinfoAll() {
+ NProgress.done(true);
+ NProgress.configure({
+ template: ''
+ });
+ NProgress.start();
+ var result = [];
- $.each(get_dex_notarychains, function( coin_index, coin_value ) {
- console.log(coin_index + ': ' + coin_value);
- var tmpIguanaRPCAuth = 'tmpIgRPCUser@'+sessionStorage.getItem('IguanaRPCAuth');
- var ajax_data = {'userpass':tmpIguanaRPCAuth,"agent":"dex","method":"getinfo","symbol":coin_value}
- //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_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 tmpIguanaRPCAuth = 'tmpIgRPCUser@'+sessionStorage.getItem('IguanaRPCAuth');
+ var ajax_data = {'userpass':tmpIguanaRPCAuth,"agent":"dpow","method":"notarychains"}
+ var get_dex_notarychains = IguanaAJAX('http://127.0.0.1:7778',ajax_data).done(function(data) {
+ //console.log(get_dex_notarychains.responseText);
+ get_dex_notarychains = JSON.parse(get_dex_notarychains.responseText)
+ //console.log(get_dex_notarychains)
+
+ var refresh_percent = '';
+
+ $.each(get_dex_notarychains, function( coin_index, coin_value ) {
+ console.log(coin_index + ': ' + coin_value);
+ var tmpIguanaRPCAuth = 'tmpIgRPCUser@'+sessionStorage.getItem('IguanaRPCAuth');
+ var ajax_data = {'userpass':tmpIguanaRPCAuth,"agent":"dex","method":"getinfo","symbol":coin_value}
+ console.log(ajax_data);
+
+ if (coin_value !== 'MESH') {
+ 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)
+ console.log('== EDEX_DEXgetinfoAll Data OutPut ==');
+ console.log(getinfo_each_chain);
+
+ 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 (getinfo_each_chain == '' ) {
+ result.push([{"amount":0}]);
+ }
+ result.push(getinfo_each_chain);
+ if (getinfo_each_chain.error === 'less than required responses') {
+ toastr.info("Less than required responses for "+coin_value+".", "Basilisk Notification")
+ $('#basilisk-connections-refresh-status-output').text('Output: ' + getinfo_each_chain.error)
+ } else {
+ $('#basilisk-connections-refresh-status-output').text('Output: Connected')
+ }
+ 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);
NProgress.done();
return result[0];
@@ -1305,3 +1410,7 @@ function Shepherd_herd(coin) {
return result;
}
+
+
+
+
diff --git a/assets/scripts/login.js b/assets/scripts/login.js
index cfe145f..de54fe8 100644
--- a/assets/scripts/login.js
+++ b/assets/scripts/login.js
@@ -52,16 +52,6 @@ var Login = function() {
},
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 ajax_data = {'userpass':tmpIguanaRPCAuth,'handle': $('#wallet-handle').val(),'password': $('#password').val(),'timeout': '2592000',"agent":"bitcoinrpc","method":"walletpassphrase"}
$.ajax({
diff --git a/index.html b/index.html
index 75f7722..f0f85fb 100755
--- a/index.html
+++ b/index.html
@@ -830,11 +830,11 @@
Direction |
- Confirmations |
+ Confirmations |
Amount |
Time |
Dest. Address |
- Tx Detail |
+ Tx Detail |