diff --git a/assets/scripts/dashboard.js b/assets/scripts/dashboard.js
index 0525006..7097f66 100644
--- a/assets/scripts/dashboard.js
+++ b/assets/scripts/dashboard.js
@@ -109,9 +109,10 @@ var Dashboard = function() {
var active_edexcoin = $('[data-edexcoin]').attr("data-edexcoin");
var selected_coinmode = sessionStorage.getItem('edexTmpMode')
if ( selected_coinmode == 'Full' ) {
- tmp_coinkbfee = EDEXgetinfo(active_edexcoin);
- console.log(tmp_coinkbfee);
- $('#edexcoin_fee').val(tmp_coinkbfee[0].kbfee)
+ EDEXgetinfo(active_edexcoin).then(function(result){
+ //console.log(result)
+ $('#edexcoin_fee').val(result.kbfee)
+ })
}
});
@@ -337,7 +338,9 @@ var Dashboard = function() {
$('#edexcoin_get_new_addr').click(function() {
var active_edexcoin = $('[data-edexcoin]').attr("data-edexcoin");
console.log('get new T address button clicked...');
- EDEXgetnewaddress(active_edexcoin);
+ EDEXgetnewaddress(active_edexcoin).then(function(result){
+ //console.log(result)
+ })
EdexListAllAddr(active_edexcoin);
toastr.info("Receiving Address list updated", "Wallet Notification");
});
@@ -768,8 +771,8 @@ function getActiveEdexcoin() {
}
function hideExtCoinsinEdexDashboard(coin) {
- var tmp_getinfo = EDEXgetinfo(coin)
- console.log(tmp_getinfo);
+ //var tmp_getinfo = EDEXgetinfo(coin)
+ //console.log(tmp_getinfo);
}
function EdexfillTxHistory(coin) {
@@ -1037,11 +1040,13 @@ function getCoinBalance(coin) {
}
function getBasiliskCoinBalance(coin) {
- var coinmainaddr = EDEXMainAddr(coin);
- var coinwalletbalance = EDEX_DEXlistunspent(coin, coinmainaddr);
- console.log(coinwalletbalance[0].amount)
- coinwalletbalance = coinwalletbalance[0].amount
- $('span[data-edexcoincode="' + coin + '"][id="edexcoin-balance"]').text(coinwalletbalance);
+ EDEXMainAddr(coin).then(function(result){
+ console.log(result)
+ EDEX_DEXlistunspent(coin, result).then(function(result_listunspent){
+ console.log(result_listunspent[0].amount);
+ $('span[data-edexcoincode="' + coin + '"][id="edexcoin-balance"]').text(result_listunspent[0].amount);
+ });
+ })
}
function StopShowCoinHistory() {
@@ -1474,32 +1479,32 @@ function EdexListAllAddr(coin) {
template: '
'
});
NProgress.start();
- var only_reciving_addr_data = [];
- var listAlladdr = EDEXgetaddrbyaccount(coin);
- listAlladdr = listAlladdr[0];
- console.log(listAlladdr);
-
- $.each(listAlladdr, function(index, value) {
- tmp_addr_label = ' public';
- //var tmp_addr_action_button = '';
- only_reciving_addr_data.push([tmp_addr_label, listAlladdr[index]]);
- });
- //console.log(only_reciving_addr_data);
- var edexcoin_recieve_table = '';
+ EDEXgetaddrbyaccount(coin).then(function(result){
+ //console.log(result)
+ var only_reciving_addr_data = [];
- edexcoin_recieve_table = $('#edexcoin-recieve-addr-tbl').DataTable( { data: only_reciving_addr_data,
- select: false,
- retrieve: true
- });
+ $.each(result, function(index, value) {
+ tmp_addr_label = ' public';
+ //var tmp_addr_action_button = '';
+ only_reciving_addr_data.push([tmp_addr_label, result[index]]);
+ });
+ //console.log(only_reciving_addr_data);
- edexcoin_recieve_table.destroy();
+ var edexcoin_recieve_table = '';
- edexcoin_recieve_table = $('#edexcoin-recieve-addr-tbl').DataTable( { data: only_reciving_addr_data,
- select: false,
- retrieve: true
- });
+ edexcoin_recieve_table = $('#edexcoin-recieve-addr-tbl').DataTable( { data: only_reciving_addr_data,
+ select: false,
+ retrieve: true
+ });
+
+ edexcoin_recieve_table.destroy();
+
+ edexcoin_recieve_table = $('#edexcoin-recieve-addr-tbl').DataTable( { data: only_reciving_addr_data,
+ select: false,
+ retrieve: true
+ });
+ })
NProgress.done();
- return only_reciving_addr_data;
}
diff --git a/assets/scripts/iguana_api.js b/assets/scripts/iguana_api.js
index f662a7b..c9f8bce 100644
--- a/assets/scripts/iguana_api.js
+++ b/assets/scripts/iguana_api.js
@@ -517,7 +517,7 @@ function Iguana_HashHex(data) {
var tmpIguanaRPCAuth = 'tmpIgRPCUser@'+sessionStorage.getItem('IguanaRPCAuth');
var ajax_data = {'userpass':tmpIguanaRPCAuth,"agent":"hash","method":"hex","message":data}
$.ajax({
- async: false,
+ //async: false,
type: 'POST',
data: JSON.stringify(ajax_data),
url: 'http://127.0.0.1:7778',
@@ -658,7 +658,7 @@ function EDEXgetBalance(coin) {
var ajax_data = {'userpass':tmpIguanaRPCAuth,"agent":"bitcoinrpc","method":"getbalance","coin": coin};
//console.log(ajax_data);
$.ajax({
- async: false,
+ //async: false,
type: 'POST',
data: JSON.stringify(ajax_data),
url: 'http://127.0.0.1:7778',
@@ -762,96 +762,66 @@ function EDEXSendToAddr(data) {
function EDEXgetinfo(coin) {
- var result = [];
-
- //Get parameters values from confirm dialog and send currency
- var tmpIguanaRPCAuth = 'tmpIgRPCUser@'+sessionStorage.getItem('IguanaRPCAuth');
- var ajax_data = {'userpass':tmpIguanaRPCAuth,"coin":coin,"agent":"bitcoinrpc","method":"getinfo","immediate":100,"timeout":4000};
- //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 ==');
+ return new Promise((resolve) =>{
+
+ var tmpIguanaRPCAuth = 'tmpIgRPCUser@'+sessionStorage.getItem('IguanaRPCAuth');
+ var ajax_data = {'userpass':tmpIguanaRPCAuth,"coin":coin,"agent":"bitcoinrpc","method":"getinfo","immediate":100,"timeout":4000};
+ var AjaxOutputData = IguanaAJAX('http://127.0.0.1:7778',ajax_data).done(function(data) {
+ //console.log(AjaxOutputData.responseText);
+ AjaxOutputData = JSON.parse(AjaxOutputData.responseText)
//console.log(AjaxOutputData);
- result.push(AjaxOutputData);
- },
- error: function(xhr, textStatus, error) {
+ resolve(AjaxOutputData);
+ }).fail(function(xhr, textStatus, error) {
+ // handle request failures
console.log(xhr.statusText);
if ( xhr.readyState == 0 ) {
- Iguana_ServiceUnavailable();
}
console.log(textStatus);
console.log(error);
- }
- });
- return result;
+ })
+ })
}
function EDEXgetaddrbyaccount(coin) {
- var result = [];
-
- //Get parameters values from confirm dialog and send currency
- var tmpIguanaRPCAuth = 'tmpIgRPCUser@'+sessionStorage.getItem('IguanaRPCAuth');
- var ajax_data = {'userpass':tmpIguanaRPCAuth,"coin":coin,"agent":"bitcoinrpc","method":"getaddressesbyaccount","account":"*"}
- //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 ==');
+ return new Promise((resolve) =>{
+
+ var tmpIguanaRPCAuth = 'tmpIgRPCUser@'+sessionStorage.getItem('IguanaRPCAuth');
+ var ajax_data = {'userpass':tmpIguanaRPCAuth,"coin":coin,"agent":"bitcoinrpc","method":"getaddressesbyaccount","account":"*"}
+ var AjaxOutputData = IguanaAJAX('http://127.0.0.1:7778',ajax_data).done(function(data) {
+ //console.log(AjaxOutputData.responseText);
+ AjaxOutputData = JSON.parse(AjaxOutputData.responseText)
//console.log(AjaxOutputData);
- result.push(AjaxOutputData.result);
- },
- error: function(xhr, textStatus, error) {
+ resolve(AjaxOutputData.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);
- }
- });
- return result;
+ })
+ })
}
function EDEXgetnewaddress(coin) {
- var result = [];
-
- //Get parameters values from confirm dialog and send currency
- var tmpIguanaRPCAuth = 'tmpIgRPCUser@'+sessionStorage.getItem('IguanaRPCAuth');
- var ajax_data = {'userpass':tmpIguanaRPCAuth,"coin":coin,"agent":"bitcoinrpc","method":"getnewaddress","account":""}
- 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 ==');
+ return new Promise((resolve) =>{
+
+ var tmpIguanaRPCAuth = 'tmpIgRPCUser@'+sessionStorage.getItem('IguanaRPCAuth');
+ var ajax_data = {'userpass':tmpIguanaRPCAuth,"coin":coin,"agent":"bitcoinrpc","method":"getnewaddress","account":""}
+ var AjaxOutputData = IguanaAJAX('http://127.0.0.1:7778',ajax_data).done(function(data) {
+ //console.log(AjaxOutputData.responseText);
+ AjaxOutputData = JSON.parse(AjaxOutputData.responseText)
//console.log(AjaxOutputData);
- result.push(AjaxOutputData.result);
- },
- error: function(xhr, textStatus, error) {
+ resolve(AjaxOutputData.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);
- }
- });
- return result;
+ })
+ })
}
function Iguana_SetRPCAuth() {
@@ -895,48 +865,6 @@ function Iguana_CheckActiveCoins() {
console.log(error);
})
})
-
-
-/*
- //Get parameters values from confirm dialog and send currency
- var tmpIguanaRPCAuth = 'tmpIgRPCUser@'+sessionStorage.getItem('IguanaRPCAuth');
- var ajax_data = {'userpass':tmpIguanaRPCAuth,"agent":"InstantDEX","method":"allcoins"};
- //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 ==');
- //console.log(AjaxOutputData);
- $.each(AjaxOutputData, function( index, value ) {
- //console.log(index)
- //console.log(value)
- if (index === 'tag' ) {
- //console.log('it is tag');
- } else {
- if (AjaxOutputData[index].length !== 0 ) {
- result.push({"active": AjaxOutputData[index].length});
- }
- //console.log(AjaxOutputData[index]);
- //console.log(AjaxOutputData[index].length);
- }
- });
-
- },
- error: function(xhr, textStatus, error) {
- console.log(xhr.statusText);
- if ( xhr.readyState == 0 ) {
- Iguana_ServiceUnavailable();
- }
- console.log(textStatus);
- console.log(error);
- }
- });
- return result;*/
}
@@ -948,7 +876,6 @@ function Iguana_DEXgetNotaries(coin) {
var ajax_data = {'userpass':tmpIguanaRPCAuth,"agent":"dex","method":"getnotaries","symbol":coin};
console.log(ajax_data);
$.ajax({
- async: false,
type: 'POST',
data: JSON.stringify(ajax_data),
url: 'http://127.0.0.1:7778',
@@ -1111,7 +1038,7 @@ function Iguana_DEXCheckAddr(coin,addr) {
var ajax_data = {'userpass':tmpIguanaRPCAuth,"agent":"dex","method":"checkaddress","address":addr,"symbol":coin};
console.log(ajax_data);
$.ajax({
- async: false,
+ //async: false,
type: 'POST',
data: JSON.stringify(ajax_data),
url: 'http://127.0.0.1:7778',
@@ -1190,41 +1117,32 @@ function EDEX_DEXlistunspent(coin,addr) {
template: ''
});
NProgress.start();
- var result = [];
- var tmpIguanaRPCAuth = 'tmpIgRPCUser@'+sessionStorage.getItem('IguanaRPCAuth');
- var ajax_data = {'userpass':tmpIguanaRPCAuth,"agent":"dex","method":"listunspent","address":addr,"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('== EDEX_DEXlistunspent Data OutPut ==');
+ return new Promise((resolve) =>{
+
+ var tmpIguanaRPCAuth = 'tmpIgRPCUser@'+sessionStorage.getItem('IguanaRPCAuth');
+ var ajax_data = {'userpass':tmpIguanaRPCAuth,"agent":"dex","method":"listunspent","address":addr,"symbol":coin}
+ var AjaxOutputData = IguanaAJAX('http://127.0.0.1:7778',ajax_data).done(function(data) {
+ //console.log(AjaxOutputData.responseText);
+ AjaxOutputData = JSON.parse(AjaxOutputData.responseText)
//console.log(AjaxOutputData);
if (AjaxOutputData == '' ) {
result.push([{"amount":0}]);
}
- result.push(AjaxOutputData);
if (AjaxOutputData.error === 'less than required responses') {
toastr.error("Less than required responses. Please try again.", "Basilisk Notification")
}
- },
- error: function(xhr, textStatus, error) {
+ resolve(AjaxOutputData);
+ }).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];
+ })
+ NProgress.done();
+ })
}
@@ -1240,7 +1158,6 @@ function EDEX_DEXnotarychains() {
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',