' +
'| result | ' +
'' +
@@ -614,16 +587,13 @@ function EDEXgettransaction(coin,txid) {
'txid': txid
};
- //console.log(ajax_data)
$.ajax({
type: 'POST',
data: JSON.stringify(ajax_data),
url: 'http://127.0.0.1:' + config.iguanaPort
})
.then(function(data) {
- //console.log(data);
res_data = JSON.parse(data);
- //console.log(res_data);
resolve(res_data);
})
.fail(function(xhr, textStatus, error) {
@@ -634,18 +604,6 @@ function EDEXgettransaction(coin,txid) {
console.log(textStatus);
console.log(error);
});
-
- /*var AjaxOutputData = IguanaAJAX('http://127.0.0.1:' + config.iguanaPort, ajax_data).done(function(data) {
- AjaxOutputData = JSON.parse(AjaxOutputData.responseText)
- resolve(AjaxOutputData);
- }).fail(function(xhr, textStatus, error) {
- // handle request failures
- console.log(xhr.statusText);
- if ( xhr.readyState == 0 ) {
- }
- console.log(textStatus);
- console.log(error);
- });*/
});
}
@@ -660,12 +618,8 @@ function EDEXgetaddrbyaccount_cache(coin) {
'',
active_edexcoinmodecode = sessionStorage.getItem('edexTmpMode');
- //console.log(query[coin].addresses)
-
Promise.all(query[coin].addresses.map((coinaddr_value, coinaddr_index) => {
return new Promise((resolve, reject) => {
- //console.log(coinaddr_index);
- //console.log(coinaddr_value);
coinaddr_balances = query[coin][coinaddr_value].getbalance.data;
if (coinaddr_balances.interest !== undefined) {
@@ -684,12 +638,10 @@ function EDEXgetaddrbyaccount_cache(coin) {
};
}
- //console.log(pass_data);
resolve(pass_data);
});
}))
.then(result => {
- //console.log(result);
resolve(result);
});
});
@@ -948,19 +900,10 @@ function EDEXimportprivkey(params_data) {
}
function EDEX_ProcessRefreshData(gettxdata, refreshdata){
- //console.log(gettxdata);
- //console.log(refreshdata);
-
return new Promise((resolve, reject) => {
Promise.all(gettxdata.vin.map((vin_value, vin_index) => {
- //console.log(vin_index);
- //console.log(vin_value);
-
return new Promise((resolve, reject) => {
Promise.all(refreshdata.map((refresh_value, refresh_index) => {
- //console.log(refresh_index);
- //console.log(refresh_value);
-
if (refreshdata[refresh_index] !== undefined && refresh_value.txid == vin_value.txid) {
delete refreshdata[refresh_index];
refreshdata = refreshdata;
@@ -972,14 +915,12 @@ function EDEX_ProcessRefreshData(gettxdata, refreshdata){
.then(result=> {
var res_data = result[result.length - 1],
refresh_final = [];
- //console.log(res_data);
$.each(res_data,function(index) {
if(res_data[index] !== undefined) {
refresh_final.push(res_data[index]);
}
});
- //console.log(refresh_final)
resolve(refresh_final);
});
});
@@ -989,11 +930,8 @@ function EDEX_GetTxIDList(gettxdata) {
return new Promise((resolve, reject) => {
get_txid_list = [];
$.each(gettxdata.vin, function(vin_index, vin_value) {
- //console.log(vin_index)
- //console.log(vin_value)
get_txid_list.push(vin_value.txid);
- })
- //console.log(get_txid_list)
+ });
resolve(get_txid_list);
});
}
@@ -1025,5 +963,6 @@ function EDEX_RemoveTXID(_obj, txidArray) {
} else {
console.log('basilisk node is missing');
}
+
return _obj;
}
\ No newline at end of file
diff --git a/assets/scripts/iguana_api/IguanaHandle.js b/assets/scripts/iguana_api/IguanaHandle.js
index c4f458c..4593634 100644
--- a/assets/scripts/iguana_api/IguanaHandle.js
+++ b/assets/scripts/iguana_api/IguanaHandle.js
@@ -40,25 +40,24 @@ function Iguana_activehandle(callback) {
'method': 'activehandle'
};
- $.ajax({
- data: JSON.stringify(ajax_data),
- url: 'http://127.0.0.1:' + config.iguanaPort,
- type: 'POST',
- dataType: 'json'
- })
- .then(result => {
- //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);
- });
+ $.ajax({
+ data: JSON.stringify(ajax_data),
+ url: 'http://127.0.0.1:' + config.iguanaPort,
+ type: 'POST',
+ dataType: 'json'
+ })
+ .then(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);
+ });
});
}
diff --git a/assets/scripts/iguana_api/IguanaShepherd.js b/assets/scripts/iguana_api/IguanaShepherd.js
index 3823ec8..f144ab0 100644
--- a/assets/scripts/iguana_api/IguanaShepherd.js
+++ b/assets/scripts/iguana_api/IguanaShepherd.js
@@ -15,11 +15,6 @@ function Shepherd_getConf(coin) {
result.push({ 'path': AjaxOutputData.result });
},
error: function(xhr, textStatus, error) {
- //console.log(xhr.statusText);
- //if ( xhr.readyState == 0 ) {
- //}
- //console.log(textStatus);
- //console.log(error);
}
});
@@ -43,11 +38,6 @@ function Shepherd_setConf(coin) {
result.push({ 'result': AjaxOutputData.msg });
},
error: function(xhr, textStatus, error) {
- //console.log(xhr.statusText);
- //if ( xhr.readyState == 0 ) {
- //}
- //console.log(textStatus);
- //console.log(error);
}
});
@@ -74,11 +64,6 @@ function Shepherd_herd(coin,herd_data) {
result.push({ 'result': AjaxOutputData.msg });
},
error: function(xhr, textStatus, error) {
- //console.log(xhr.statusText);
- //if ( xhr.readyState == 0 ) {
- //}
- //console.log(textStatus);
- //console.log(error);
}
});
@@ -295,22 +280,18 @@ function Shepherd_CheckBasiliskCacheData(coin) {
var data = query[coin][coinaddr_value].getbalance;
if (!('getbalance' in query[coin][coinaddr_value])) {
- //console.log(coin + '>>>' + coinaddr_value + ' => getbalance not found.')
getbalance_exists = false;
}
if (!('listtransactions' in query[coin][coinaddr_value])) {
- //console.log(coin + '>>>' + coinaddr_value + ' => listtransactions not found.')
listtransactions_exists = false;
}
if (!('listunspent' in query[coin][coinaddr_value])) {
- //console.log(coin + '>>>' + coinaddr_value + ' => listunspent not found.')
listunspent_exists = false;
}
if (!('refresh' in query[coin][coinaddr_value])) {
- //console.log(coin + '>>>' + coinaddr_value + ' => refresh not found.')
refresh_exists = false;
}
@@ -334,7 +315,6 @@ function Shepherd_CheckBasiliskCacheData(coin) {
});
}
-
function Shepherd_SysInfo() {
return new Promise((resolve) => {
$.ajax({
@@ -349,9 +329,10 @@ function Shepherd_SysInfo() {
}
function Shepherd_SendPendValue() {
- Shepherd_SysInfo().then(function(result){
- var ram_data = formatBytes(result.totalmem_bytes)
- var pend_val = null;
+ Shepherd_SysInfo().then(function(result) {
+ var ram_data = formatBytes(result.totalmem_bytes),
+ pend_val = null;
+
if (ram_data.size === 'GB') {
if (ram_data.ramsize >= '63' ) { pend_val = 16; }
if (ram_data.ramsize >= '31' ) { pend_val = 8; }
@@ -359,7 +340,7 @@ function Shepherd_SendPendValue() {
if (ram_data.ramsize <= '15' ) { pend_val = 1; }
} else { pend_val = 1; }
sessionStorage.setItem('IguanaPendValue', pend_val);
- })
+ });
}
diff --git a/assets/scripts/iguana_api/IguanaUnused.js b/assets/scripts/iguana_api/IguanaUnused.js
deleted file mode 100644
index 3bbe640..0000000
--- a/assets/scripts/iguana_api/IguanaUnused.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/*var Iguana_activehandle_output = ''; //Storing activehandle output this variable. accessible globally.
-function Iguana_activehandle() {
-
- //comment
- var tmpIguanaRPCAuth = 'tmpIgRPCUser@'+sessionStorage.getItem('IguanaRPCAuth');
- var ajax_data = {'userpass':tmpIguanaRPCAuth,"agent":"SuperNET","method":"activehandle"};
- //console.log(ajax_data);
- $.ajax({
- type: 'POST',
- data: JSON.stringify(ajax_data),
- url: 'http://127.0.0.1:' + config.iguanaPort,
- //dataType: 'text',
- success: function(data, textStatus, jqXHR) {
- var AjaxOutputData = JSON.parse(data);
- //console.log('== ActiveHandle Data OutPut ==');
- //console.log(AjaxOutputData);
- Iguana_activehandle_output = AjaxOutputData;
- return true;
- },
- error: function(xhr, textStatus, error) {
- console.log(xhr.statusText);
- if ( xhr.readyState == 0 ) {
- Iguana_ServiceUnavailable();
- }
- console.log(textStatus);
- console.log(error);
- return false;
- }
- });
- return 'Executed Iguana_activehandle. Check Iguana_activehandle_output var value.';
-}*/
\ No newline at end of file
diff --git a/assets/scripts/jumblr.js b/assets/scripts/jumblr.js
index 36149fd..61547fd 100644
--- a/assets/scripts/jumblr.js
+++ b/assets/scripts/jumblr.js
@@ -11,8 +11,7 @@ var Jumblr = function() {
});
if ( sessionStorage.getItem('IguanaActiveAccount') === null ) {
- // clearInterval(CheckIfIguanaRunning);
- // console.log('=> No wallet logged in, or Dashboard not ative. No need to Run History.');
+
} else {
Jumblr_CheckIfConnected()
.then(function(result) {
@@ -49,7 +48,6 @@ var Jumblr = function() {
function Jumblr_ShowHideAlert() {
Jumblr_LookforNativeKomodo()
.then(function(result) {
- // console.log(result)
if (result === 'isnative') {
$('#jumblr_no_native_kmd_alert').hide();
} else {
@@ -60,7 +58,6 @@ function Jumblr_ShowHideAlert() {
function Jumblr_DisplayAddresses() {
var jumblr_session_data = JSON.parse(JSON.parse(sessionStorage.getItem('IguanaActiveAccount')));
- // console.log(jumblr_session_data);
$('#jumblr_BTCdeposit').text(jumblr_session_data.BTCdeposit);
$('#jumblr_BTCjumblr').text(jumblr_session_data.BTCjumblr);
$('#jumblr_KMDdeposit').text(jumblr_session_data.KMDdeposit);
@@ -70,11 +67,6 @@ function Jumblr_DisplayAddresses() {
function Jumblr_DisplayStatus() {
Iguana_Jumblr_Status()
.then(function(result) {
- //console.log(result)
- /*$('#jumblr_status_BTCdeposit').text(result.BTCdeposit)
- $('#jumblr_status_BTCjumblr').text(result.BTCjumblr)
- $('#jumblr_status_KMDdeposit').text(result.KMDdeposit)
- $('#jumblr_status_KMDjumblr').text(result.KMDjumblr)*/
if (result.result == 'success') {
$('#jumblr_status_result')
.addClass('label-success')
@@ -106,8 +98,6 @@ function Jumblr_LookforNativeKomodo() {
AjaxOutputData = JSON.parse(AjaxOutputData.responseText);
if (AjaxOutputData['native'].length !== 0 ) {
$.each(AjaxOutputData.native, function( index, value ) {
- //console.log(index)
- //console.log(value)
if (value !== 'KMD') {
console.log('Native KMD not found')
resolve('notfound');
@@ -144,7 +134,6 @@ function Jumblr_CheckIfConnected() {
'hex': ''
};
- // console.log(ajax_data);
$.ajax({
type: 'POST',
data: JSON.stringify(ajax_data),
diff --git a/assets/scripts/kmd_wallet/KMDAddress.js b/assets/scripts/kmd_wallet/KMDAddress.js
index 49935df..9b8f331 100644
--- a/assets/scripts/kmd_wallet/KMDAddress.js
+++ b/assets/scripts/kmd_wallet/KMDAddress.js
@@ -251,7 +251,6 @@ function KMDListAllAddr() {
' ' + _lang[defaultLang].KMD_NATIVE.PRIVATE +
'';
}
- //var tmp_addr_action_button = '';
only_reciving_addr_data.push([
tmp_addr_label,
listAlladdr[index]
diff --git a/assets/scripts/kmd_wallet/KMDBalance.js b/assets/scripts/kmd_wallet/KMDBalance.js
index e4af2c6..5932bdc 100644
--- a/assets/scripts/kmd_wallet/KMDBalance.js
+++ b/assets/scripts/kmd_wallet/KMDBalance.js
@@ -28,12 +28,10 @@ function getTotalKMDBalance() {
};
}
- //console.log(ajax_data);
$.ajax({
type: 'POST',
data: JSON.stringify(ajax_data),
url: 'http://127.0.0.1:' + config.iguanaPort,
- //dataType: 'text',
success: function(data, textStatus, jqXHR) {
var AjaxOutputData = JSON.parse(data);
diff --git a/assets/scripts/kmd_wallet/KMDInit.js b/assets/scripts/kmd_wallet/KMDInit.js
index 7ef25d6..890d484 100644
--- a/assets/scripts/kmd_wallet/KMDInit.js
+++ b/assets/scripts/kmd_wallet/KMDInit.js
@@ -115,7 +115,6 @@ function RunKMDInitFunctions() {
$('#activating-komodod-progress').html(': ' + Math.floor(currentBestChain * 100 / totalBlocksInExplorer) + '% (blocks ' + currentBestChain + ' / ' + totalBlocksInExplorer + ')');
chainActivationLastUpdate = Date.now();
if (currentBestChain === totalBlocksInExplorer) {
- //clearInterval(totalBlocksInExplorerInterval);
clearInterval(currentBestBlockInterval);
}
}
@@ -165,7 +164,6 @@ function RunKMDInitFunctions() {
$('#kmd_wallet_settings').hide();
}
- // KMDWalletDashboard.init()
$('#kmd_wallet_recieve_section').hide();
NProgress.done();
}
\ No newline at end of file
diff --git a/assets/scripts/kmd_wallet/KMDTransaction.js b/assets/scripts/kmd_wallet/KMDTransaction.js
index 7e813cb..db68632 100644
--- a/assets/scripts/kmd_wallet/KMDTransaction.js
+++ b/assets/scripts/kmd_wallet/KMDTransaction.js
@@ -35,7 +35,6 @@ function KMDGetPublicTransactions() {
url: 'http://127.0.0.1:' + config.iguanaPort,
success: function(data, textStatus, jqXHR) {
var AjaxOutputData = JSON.parse(data); // Ajax output gets the whole list of unspent coin with addresses
- //console.log(AjaxOutputData);
$.each(AjaxOutputData, function(index, value) {
var tmp_category = '',
@@ -183,10 +182,8 @@ function KMDfillTxHistoryT() {
});
NProgress.start();
- var txhistorydataT = KMDGetPublicTransactions();
- //var txhistorydataZ = KMDGetProtectedTransactions();
- //var txhistorydata = $.merge( txhistorydataT, txhistorydataZ );
- var txhistorydata = txhistorydataT,
+ var txhistorydataT = KMDGetPublicTransactions(),
+ txhistorydata = txhistorydataT,
kmd_txhistory_table = '';
kmd_txhistory_table = $('#kmd-tx-history-tbl').DataTable({
diff --git a/assets/scripts/kmd_wallet/KMDWalletDashboard.js b/assets/scripts/kmd_wallet/KMDWalletDashboard.js
index 1e96fac..0e594c9 100644
--- a/assets/scripts/kmd_wallet/KMDWalletDashboard.js
+++ b/assets/scripts/kmd_wallet/KMDWalletDashboard.js
@@ -2,8 +2,6 @@ var KMDWalletDashboard = function() {
var handle_KMD_Dashboard = function() {
var action_btn_code = getHeaderActionMenuButtonCoinCode();
$('#btn_' + action_btn_code + '_wallet_dashboard').click(function() {
- //console.log('kmd wallet dashbaord button clicked...');
- //console.log($(this).data());
if ( sessionStorage.getItem('edexTmpMode') === 'Native') {
sessionStorage.setItem('edexTmpRefresh', 'start');
}
@@ -105,8 +103,6 @@ var KMDWalletDashboard = function() {
$('#kmd_wallet_sendto') != '' &&
$('#kmd_wallet_fee') != '' ) {
mdl_send_btn.removeClass('disabled');
- //mdl_send_btn.attr('data-dismiss','modal');
- //mdl_send_btn.attr('data-target','#SendCoinModelStep2');
} else {
mdl_send_btn.addClass('disabled');
mdl_send_btn.removeAttr('data-dismiss');
@@ -127,8 +123,6 @@ var KMDWalletDashboard = function() {
$('#kmd_wallet_sendto') != '' &&
$('#kmd_wallet_fee') != '' ) {
mdl_send_btn.removeClass('disabled');
- //mdl_send_btn.attr('data-dismiss','modal');
- //mdl_send_btn.attr('data-target','#SendCoinModelStep2');
} else {
mdl_send_btn.addClass('disabled');
mdl_send_btn.removeAttr('data-dismiss');
@@ -136,10 +130,6 @@ var KMDWalletDashboard = function() {
}
});
- /*$('#kmd_wallet_send_coins_btn').click(function() {
- console.log('send button clicked in form...')
- });*/
-
$('.extcoin-send-form').validate({
// errorElement: 'span', //default input error message container
// errorClass: 'help-block', // default input error message class
@@ -264,11 +254,9 @@ var KMDWalletDashboard = function() {
// main function to initiate the module
init: function() {
handle_KMD_Dashboard();
- //KMDfillTxHistoryT();
handle_KMD_Send();
KMDWalletRecieve();
KMDWalletSettings();
- //RunKMDInitFunctions();
handleWalletDashboardAlet();
}
};
diff --git a/assets/scripts/kmd_wallet_dashboard.js b/assets/scripts/kmd_wallet_dashboard.js
index a4915e9..9056ec2 100644
--- a/assets/scripts/kmd_wallet_dashboard.js
+++ b/assets/scripts/kmd_wallet_dashboard.js
@@ -5,8 +5,7 @@ jQuery(document).ready(function() {
if ( sessionStorage.getItem('IguanaActiveAccount') === null ||
sessionStorage.getItem('NativeWalletActions') === null ||
sessionStorage.getItem('NativeWalletActions') === 'stop' ) {
- //clearInterval(RunNativeProgressBar);
- //console.log('=> No wallet logged in, or Native Wallet not ative. No need to Run Progress Bar code.');
+
} else if ( sessionStorage.getItem('NativeWalletActions') !== null || sessionStorage.getItem('NativeWalletActions') === 'start') {
KMD_ProgressBar();
}
@@ -17,12 +16,10 @@ jQuery(document).ready(function() {
sessionStorage.getItem('NativeWalletActions') === null ||
sessionStorage.getItem('NativeWalletActions') === 'stop' ) {
clearInterval(RefreshEdexWalletDashboard);
- //console.log('=> No wallet logged in, or Dashboard not ative. No need to Run History.');
} else if ( sessionStorage.getItem('NativeWalletActions') === null || sessionStorage.getItem('NativeWalletActions') === 'start') {
if ( $('[data-data-extcoin]').attr('data-data-extcoin') !== 'COIN' ) {
if ( sessionStorage.getItem('edexTmpMode') !== null || sessionStorage.getItem('edexTmpMode') === 'Native') {
if ( sessionStorage.getItem('edexTmpRefresh') === null || sessionStorage.getItem('edexTmpRefresh') === 'start') {
- //console.log('it is not COIN. '+'It is: ' + $('[data-data-extcoin]').attr("data-data-extcoin"));
var action_btn_code = getHeaderActionMenuButtonCoinCode();
$( '#btn_' + action_btn_code + '_wallet_dashboard' ).trigger( 'click' );
}
@@ -91,9 +88,6 @@ function CheckIfConnected() {
url: 'http://127.0.0.1:' + config.iguanaPort,
success: function(data, textStatus, jqXHR) {
var AjaxOutputData = JSON.parse(data);
- //console.log('== Data OutPut ==');
- //console.log(AjaxOutputData);
- //console.log(AjaxOutputData.error);
if ( AjaxOutputData.errors != undefined ) {
result.push('connected');
@@ -174,7 +168,7 @@ function CheckIfWalletEncrypted() {
return result;
}
-function KMD_getInfo_rtrn() {
+function KMD_getInfo_rtrn(cb) {
var result = [],
extcoin = $('[data-extcoin]').attr('data-extcoin'),
passthru_agent = getPassthruAgent(),
@@ -201,7 +195,7 @@ function KMD_getInfo_rtrn() {
}
$.ajax({
- async: false,
+ //async: true,
type: 'POST',
data: JSON.stringify(ajax_data),
url: 'http://127.0.0.1:' + config.iguanaPort,
@@ -217,6 +211,8 @@ function KMD_getInfo_rtrn() {
} else {
result.push(AjaxOutputData.errors);
}
+
+ cb.call(this, result[0]);
},
error: function(xhr, textStatus, error) {
console.log('failed getting Coin History.');
@@ -234,30 +230,32 @@ function KMD_getInfo_rtrn() {
function KMD_ProgressBar() {
var result = [],
- extcoin = $('[data-extcoin]').attr('data-extcoin'),
- getinfotmp = KMD_getInfo_rtrn();
+ extcoin = $('[data-extcoin]').attr('data-extcoin');
+
+ KMD_getInfo_rtrn(_KMD_ProgressBar);
- if (extcoin !== 'ZEC') {
- if ( getinfotmp == 'activating') {
- $('span[data-extcoin="' + extcoin + '"][id="extcoin-sync-percent"]').text(_lang[defaultLang].INDEX.ACTIVATING + '...');
- } else {
- if (getinfotmp.blocks === 0) {
- $('span[data-extcoin="' + extcoin + '"][id="extcoin-sync-percent"]').text('No blocks');
- $('#extcoin-progressbars .progress-bar').css({ 'width': '100%' });
- } else if (getinfotmp.blocks > 0 && getinfotmp.longestchain === 0) {
- $('span[data-extcoin="' + extcoin + '"][id="extcoin-sync-percent"]').text('No longestchain');
- $('#extcoin-progressbars .progress-bar').css({ 'width': '100%' });
+ function _KMD_ProgressBar(getinfotmp) {
+ if (extcoin !== 'ZEC') {
+ if ( getinfotmp == 'activating') {
+ $('span[data-extcoin="' + extcoin + '"][id="extcoin-sync-percent"]').text(_lang[defaultLang].INDEX.ACTIVATING + '...');
} else {
- var sync_percent = parseFloat(parseInt(getinfotmp.blocks, 10) * 100) / parseInt(getinfotmp.longestchain, 10);
- //console.log(sync_percent);
- console.log('getinfotmp', getinfotmp);
- $('div[data-extcoin="' + extcoin + '"][id="extcoin-sync"]').width(parseFloat(sync_percent).toFixed(2) + '%');
- $('span[data-extcoin="' + extcoin + '"][id="extcoin-sync-percent"]').text(parseFloat(sync_percent).toFixed(2) + '%');
- $('span[data-extcoin="' + extcoin + '"][id="extcoin-synced-blocks"]').text(getinfotmp.blocks);
- $('span[data-extcoin="' + extcoin + '"][id="extcoin-longestchain"]').text(getinfotmp.longestchain);
- $('span[data-extcoin="' + extcoin + '"][id="extcoin-connections"]').text(getinfotmp.connections);
+ if (getinfotmp.blocks === 0) {
+ $('span[data-extcoin="' + extcoin + '"][id="extcoin-sync-percent"]').text('No blocks');
+ $('#extcoin-progressbars .progress-bar').css({ 'width': '100%' });
+ } else if (getinfotmp.blocks > 0 && getinfotmp.longestchain === 0) {
+ $('span[data-extcoin="' + extcoin + '"][id="extcoin-sync-percent"]').text('No longestchain');
+ $('#extcoin-progressbars .progress-bar').css({ 'width': '100%' });
+ } else {
+ var sync_percent = parseFloat(parseInt(getinfotmp.blocks, 10) * 100) / parseInt(getinfotmp.longestchain, 10);
+ console.log('getinfotmp', getinfotmp);
+ $('div[data-extcoin="' + extcoin + '"][id="extcoin-sync"]').width(parseFloat(sync_percent).toFixed(2) + '%');
+ $('span[data-extcoin="' + extcoin + '"][id="extcoin-sync-percent"]').text(parseFloat(sync_percent).toFixed(2) + '%');
+ $('span[data-extcoin="' + extcoin + '"][id="extcoin-synced-blocks"]').text(getinfotmp.blocks);
+ $('span[data-extcoin="' + extcoin + '"][id="extcoin-longestchain"]').text(getinfotmp.longestchain);
+ $('span[data-extcoin="' + extcoin + '"][id="extcoin-connections"]').text(getinfotmp.connections);
+ }
+ $('#extcoin-wallet-activating-alert').hide();
}
- $('#extcoin-wallet-activating-alert').hide();
}
}
}
\ No newline at end of file
diff --git a/assets/scripts/login.js b/assets/scripts/login.js
index 53e4016..1bc66dd 100644
--- a/assets/scripts/login.js
+++ b/assets/scripts/login.js
@@ -55,10 +55,9 @@ var Login = function() {
submitHandler: function(form) {
var jumblr_setpassphrase_val = 'jumblr ' + $('#password').val();
- //console.log(jumblr_setpassphrase_val);
Iguana_Jumblr_SetPassphrase({ 'passphrase': jumblr_setpassphrase_val })
.then(function(result) {
- //console.log(result);
+
})
.then(function() {
var tmpIguanaRPCAuth = 'tmpIgRPCUser@' + sessionStorage.getItem('IguanaRPCAuth'),
@@ -77,8 +76,8 @@ var Login = function() {
data: JSON.stringify(ajax_data),
url: 'http://127.0.0.1:' + config.iguanaPort,
success: function(data, textStatus, jqXHR) {
- var LoginOutput = JSON.parse(data);
- LoginDataToStore = JSON.stringify(data),
+ var LoginOutput = JSON.parse(data),
+ LoginDataToStore = JSON.stringify(data);
sessionStorage.setItem('IguanaActiveAccount', LoginDataToStore);
if (LoginOutput.result === 'success') {
console.log('Success');
@@ -272,7 +271,6 @@ var Login = function() {
if (CreateWalletOutput.result === 'success') {
console.log('Success');
toastr.success(_lang[defaultLang].TOASTR.WALLET_CREATED_SUCCESFULLY, _lang[defaultLang].TOASTR.ACCOUNT_NOTIFICATION);
- // Iguana_DEXImportAll();
$('#wallet-handle').val('');
$('#password').val('');
@@ -399,7 +397,6 @@ var Login = function() {
url: 'http://127.0.0.1:' + config.iguanaPort,
success: function(data, textStatus, jqXHR) {
var LogoutOutput = JSON.parse(data);
- // sessionStorage.clear();
sessionStorage.removeItem('IguanaActiveAccount');
console.log('== Logout Data OutPut ==');
console.log(LogoutOutput);
@@ -612,84 +609,6 @@ var Login = function() {
$('#section-login').show();
}
});
-
- /*$.each([ 'basilisk', 'full', 'virtual' ], function( index, value ) {
- var allcoinsvalues = {"agent":"InstantDEX","method":"allcoins"};
- $.ajax({
- type: 'POST',
- data: JSON.stringify(allcoinsvalues),
- url: 'http://127.0.0.1:' + config.iguanaPort,
- //dataType: 'text',
- success: function(data, textStatus, jqXHR) {
- var allcoinsData = JSON.parse(data);
- console.log('== Data OutPut ==');
- console.log(allcoinsData);
- $.each(allcoinsData[value], function(index) {
- if ( allcoinsData[value][index] == 'BTC' ) { console.log('Index: '+ index + ' and Value: BTC'); }
- if ( allcoinsData[value][index] == 'BTCD' ) { console.log('Index: '+ index + ' and Value: BTCD'); }
- var coinvals = {"coin":"BTCD","portp2p":14631,"mode":0}
- Iguana_addcoin(coinvals);
- });
-
- },
- error: function(xhr, textStatus, error) {
- console.log('failed getting Coin History.');
- console.log(xhr.statusText);
- console.log(textStatus);
- console.log(error);
- toastr.error("Unable to complete transaction", "Transaction Notification")
- }
- });
- });
- if ( sessionStorage.getItem('IguanaActiveAccount') === null ) {
- $.each([ 'BTC', 'BTCD' ], function( index, value ) {
- var AddCoinBasiliskData = {
- "poll": 100,
- "active": 1,
- "newcoin": value,
- "startpend": 1,
- "endpend": 1,
- "services": 128,
- "maxpeers": 16,
- "RELAY": 0,
- "VALIDATE": 0,
- "portp2p": 14631
- }
- //Start BitcoinDark in Basilisk mode
- $.ajax({
- type: 'GET',
- data: AddCoinBasiliskData,
- url: 'http://127.0.0.1:' + config.iguanaPort + '/api/iguana/addcoin',
- dataType: 'text',
- success: function(data, textStatus, jqXHR) {
- var CoinBasiliskDataOutput = JSON.parse(data);
- //console.log('== Data OutPut ==');
- //console.log(CoinBasiliskDataOutput);
-
- if (CoinBasiliskDataOutput.result === 'coin added') {
- console.log('coin added');
- toastr.success(value + " started in Basilisk Mode", "Coin Notification");
- } else if (CoinBasiliskDataOutput.result === 'coin already there') {
- console.log('coin already there');
- //toastr.info("Looks like" + value + "already running.", "Coin Notification");
- } else if (CoinBasiliskDataOutput.result === null) {
- console.log('coin already there');
- //toastr.info("Looks like" + value + "already running.", "Coin Notification");
- }
- },
- error: function(xhr, textStatus, error) {
- console.log('failed starting BitcoinDark.');
- console.log(xhr.statusText);
- console.log(textStatus);
- console.log(error);
- //swal("Oops...", "Something went wrong!", "error");
- if (xhr.readyState == '0' ) {
- toastr.error("Unable to connect to Iguana", "Account Notification")
- }
- }
- });
- });
- }*/
}
var handleLoginAnotherWallet = function() {
@@ -708,7 +627,6 @@ var Login = function() {
url: 'http://127.0.0.1:' + config.iguanaPort,
success: function(data, textStatus, jqXHR) {
var LogoutOutput = JSON.parse(data);
- //sessionStorage.clear();
sessionStorage.removeItem('IguanaActiveAccount');
if (LogoutOutput.result === 'success') {
@@ -857,10 +775,7 @@ var Login = function() {
}
var handleAddCoinOSOptions = function() {
- if ( navigator.platform == 'Win32-'
- // || navigator.platform == 'MacIntel'
- // || navigator.platform == 'Linux x86_64' || navigator.platform == 'Linux' || navigator.platform == 'Linux i686'
- ) {
+ if ( navigator.platform == 'Win32-') {
// Conditions for Login Add Coin Dialog
$.each($('.style-addcoin-lbl-mdl-login'), function(index, value) {
if ( index == 0 || index == 1 ) {
diff --git a/assets/scripts/sidebar.js b/assets/scripts/sidebar.js
index 75b3db2..cb612b7 100644
--- a/assets/scripts/sidebar.js
+++ b/assets/scripts/sidebar.js
@@ -144,7 +144,6 @@ $('#nav-jumblr').on('click', function() {
.removeClass( '' )
.addClass( 'active open' );
$('.page-header-bordered h1').text('Jumblr')
- //$(".header-easydex-section").text('Secure, Native and Decentralised Coin Shuffling');
$.each($('.nav-top-menu'), function(index, value) { $(value).removeClass('active'); });
$(this.parentElement).addClass('active');
@@ -200,7 +199,6 @@ $('#nav-komodo-wallet').on('click', function() {
RunKMDInitFunctions();
removeJumblrStyle();
removeACPAXWalletStyle();
- // removeZECWalletStyle();
applyKMDWalletStyle();
CommonSidebarActionsSet02();
removeDashboardStyle();
@@ -223,7 +221,6 @@ $('#nav-zcash-wallet').on('click', function() {
'#section-iguana-wallet-settings'
)
.hide();
- // $('#section-zcash').show();
$('#section-extcoin').show();
$(
'#nav-dashboard,' +
@@ -256,7 +253,6 @@ $('#nav-zcash-wallet').on('click', function() {
KMDWalletDashboard.init(); // Initiate Komodo Dashbaord sript
RunKMDInitFunctions();
- //removeKMDWalletStyle();
applyZECWalletStyle();
CommonSidebarActionsSet02();
removeDashboardStyle();
@@ -329,7 +325,6 @@ $('#nav-iguana-wallet-settings').on('click', function() {
$('#nav-iguana-wallet-settings')
.removeClass( '' )
.addClass( 'active open' );
- // $(".header-easydex-section").text("Wallet Settings");
removeKMDWalletStyle();
removeZECWalletStyle();
removeJumblrStyle();
@@ -424,8 +419,6 @@ function assetchain_pax_menu_actions(coin) {
RunKMDInitFunctions();
removeJumblrStyle();
removeACPAXWalletStyle();
- //removeZECWalletStyle();
- //applyKMDWalletStyle();
applyACPAXWalletStyle()
CommonSidebarActionsSet02();
removeDashboardStyle();
@@ -595,7 +588,6 @@ function assetchain_pax_menu_actions(coin) {
function CommonSidebarActionsSet01() {
sessionStorage.setItem('DashboardActions', 'start');
sessionStorage.setItem('NativeWalletActions', 'stop');
- // $(document).ready(function() { Dashboard.init(); });
$('#wifkeys_passphrase').val('');
$('#wif-priv-keys').html('');
}
@@ -603,7 +595,6 @@ function CommonSidebarActionsSet01() {
function CommonSidebarActionsSet011() {
sessionStorage.setItem('DashboardActions', 'start');
sessionStorage.setItem('NativeWalletActions', 'stop');
- // location.reload();
$('#wifkeys_passphrase').val('');
$('#wif-priv-keys').html('');
}
diff --git a/assets/scripts/templates/bottomIncludes.js b/assets/scripts/templates/bottomIncludes.js
index de3a730..9a81a9f 100644
--- a/assets/scripts/templates/bottomIncludes.js
+++ b/assets/scripts/templates/bottomIncludes.js
@@ -72,7 +72,6 @@ templates.bottomIncludes =
-
diff --git a/assets/scripts/walletsettings.js b/assets/scripts/walletsettings.js
index b9219a8..d84d104 100644
--- a/assets/scripts/walletsettings.js
+++ b/assets/scripts/walletsettings.js
@@ -166,7 +166,6 @@ var WalletSettings = function() {
},
submitHandler: function(form) {
var Getimport_wifkey = $('#import_wifkey').val();
- // console.log(Getimport_wifkey);
EDEXimportprivkey(Getimport_wifkey)
.then(function(result) {
console.log(result);
diff --git a/index.html b/index.html
index 82abd4f..b959c07 100755
--- a/index.html
+++ b/index.html
@@ -28,7 +28,6 @@
-
@@ -68,7 +67,8 @@
|