diff --git a/assets/scripts/atomicexplorer.js b/assets/scripts/atomicexplorer.js index 88fa970..431fbb4 100644 --- a/assets/scripts/atomicexplorer.js +++ b/assets/scripts/atomicexplorer.js @@ -333,32 +333,6 @@ var AtomicExplorer = function() { NProgress.done(); } }); - - /*$.ajax({ - type: 'GET', - url: 'http://127.0.0.1:' + config.iguanaPort + '/api/bitcoinrpc/walletlock', - dataType: 'text', - success: function(data, textStatus, jqXHR) { - var LogoutOutput = JSON.parse(data); - sessionStorage.clear(); - console.log('== Logout Data OutPut =='); - console.log(LogoutOutput); - - - }, - error: function(xhr, textStatus, error) { - console.log('failure'); - console.log(xhr.statusText); - if ( xhr.readyState == 0 ) { - Iguana_ServiceUnavailable(); - } - console.log(textStatus); - console.log(error); - //swal("Oops...", "Something went wrong!", "error"); - toastr.warning("Opps... Something went wrong!", "Account Notification") - - } - });*/ }); }; diff --git a/assets/scripts/coinwallets.js b/assets/scripts/coinwallets.js index 68a14c5..c5dd874 100644 --- a/assets/scripts/coinwallets.js +++ b/assets/scripts/coinwallets.js @@ -33,7 +33,6 @@ function getCurrency() { function sendCurrency(val) { console.log(val); $('#mdl_currency_balance').text($('span[data-currency="' + val.currency + '"][id="currency-balance"]').text()); - //console.log($('span[data-currency="' + val.currency + '"][id="currency-balance"]').text()); $('#mdl_currency_sendto').attr('placeholder', _lang[defaultLang].INDEX.ENTER + ' ' + val.currency + ' ' + _lang[defaultLang].INDEX.ADDR_SM); $( '#mdl_currency_amount_label,' + @@ -115,8 +114,6 @@ $('#mdl_currency_amount').keyup(function() { getCurrency(); var total_of_currency_fiat = total_of_currency_fee * currency_fiat_value; - //console.log($('#mdl_currency_amount').val()); - //console.log(total_of_currency_fiat); $('#mdl_currency_total_value').text(total_of_currency_fee.toFixed(8)); $('#mdl_currency_total_fiat_value').text(fiat_symbol + total_of_currency_fiat.toFixed(2)); diff --git a/assets/scripts/dashboard.js b/assets/scripts/dashboard.js index fbf5605..4fa0a88 100644 --- a/assets/scripts/dashboard.js +++ b/assets/scripts/dashboard.js @@ -49,7 +49,7 @@ var Dashboard = function() { if ( sessionStorage.getItem('edexTmpMode') === 'Full') { sessionStorage.setItem('edexTmpRefresh', 'start'); } - if ( /*sessionStorage.getItem('edexTmpMode') === 'Basilisk' ||*/ sessionStorage.getItem('edexTmpMode') === 'Native' ) { + if ( sessionStorage.getItem('edexTmpMode') === 'Native' ) { sessionStorage.setItem('edexTmpRefresh', 'stop'); } $( @@ -69,7 +69,6 @@ var Dashboard = function() { if ( selected_coinmode == 'Basilisk' ) { getDEXGetBalance_cache(active_edexcoin) .then(function(result) { - //console.log(result) if ( result.interest !== undefined && active_edexcoin == 'KMD') { $( '#edexcoin_getbalance_interest,' + @@ -110,9 +109,7 @@ var Dashboard = function() { } else { EDEXlistunspent(active_edexcoin) .then(function(result) { - //console.log(result) if (result[0] != undefined) { - //console.log(result[0]) if ( result[0].interest !== undefined ) { $( '#edexcoin_getbalance_interest,' + @@ -204,7 +201,6 @@ var Dashboard = function() { EDEXgetaddrbyaccount_cache(active_edexcoin) .then(function(result){ var tmpoptions = ''; - //console.log(result); edexcoin_addr_list_with_balance = result; console.log(edexcoin_addr_list_with_balance); tmpoptions += ''; @@ -228,7 +224,6 @@ var Dashboard = function() { .removeAttr('disabled'); } - //clearEdexSendFieldData(); $('.edexcoin-send-form')[0].reset(); if ( selected_coinmode == 'Full' ) { EDEXgetinfo(active_edexcoin) @@ -240,7 +235,6 @@ var Dashboard = function() { $('.showedexcoinaddrs').on('change', function() { var selected = $(this).find('option:selected').val(); - //console.log(selected) }); $('#edexcoin_send_from').change(function() { @@ -295,7 +289,6 @@ var Dashboard = function() { total_minus_currency_fee = sum_val1 - sum_val2, mdl_send_btn = $('#edexcoin_send_coins_btn'); - //console.log($('#edexcoin_amount').val()); $('#edexcoin_total_value').text(total_minus_currency_fee.toFixed(8)); }); @@ -396,8 +389,6 @@ var Dashboard = function() { }); $('#edexcoin_send_coins_btn').click(function() { - //$('#edexcoin_send_coins_btn').prop('disabled', true); - console.log('==> After confirming tx to send') var active_edexcoin = $('[data-edexcoin]').attr('data-edexcoin'), tmp_send_from_addr = $('#edexcoin_send_from').val(), tmp_send_to_addr = $('#edexcoin_sendto').val(), @@ -405,6 +396,7 @@ var Dashboard = function() { tmp_send_fee = $('#edexcoin_fee').val(), tmp_sendflag = $('#edexcoin_send_sig').is(':checked'); + console.log('==> After confirming tx to send') console.log(active_edexcoin); console.log(tmp_send_from_addr); console.log(tmp_send_to_addr); @@ -1067,8 +1059,7 @@ var Dashboard = function() { // TODO: refactor if ( active_edexcoinmodecode == 'Basilisk' || active_edexcoinmodecode == 'Native' ) { - //console.log(active_edexcoinmodecode) - //console.log('No need to show Progress bar for Native or Basilisk mode.') + } else { ShowCoinProgressBar(active_edexcoin); } @@ -1080,13 +1071,11 @@ var Dashboard = function() { var active_edexcoin = $('[data-edexcoin]').attr('data-edexcoin'), active_edexcoinmodecode = sessionStorage.getItem('edexTmpMode'); if ( sessionStorage.getItem('IguanaActiveAccount') === null ) { - //clearInterval(CheckIfIguanaRunning); - //console.log('=> No wallet logged in, or Dashboard not ative. No need to Run History.'); + } else { Iguana_activehandle() .then(function(result){ - //console.log(result) - //console.log("Iguana is running"); + }); } }, 1000); @@ -1096,8 +1085,7 @@ var Dashboard = function() { active_edexcoinmodecode = sessionStorage.getItem('edexTmpMode'); // TODO: refactor if ( sessionStorage.getItem('IguanaActiveAccount') === null ) { - //clearInterval(FetchBasiliskData); - //console.log('=> No wallet logged in, or Dashboard not ative. No need to Run History.'); + } else { if ( active_edexcoinmodecode == 'Basilisk') { var call_data = { @@ -1105,7 +1093,6 @@ var Dashboard = function() { 'coin': active_edexcoin, 'calls': 'listtransactions:getbalance' }; - //console.log(call_data) if ( sessionStorage.getItem('edexTmpRefresh') === null || sessionStorage.getItem('edexTmpRefresh') === 'start') { Shepherd_FetchBasiliskData(call_data) .then(function(result) { @@ -1172,23 +1159,7 @@ var Dashboard = function() { handleEdexWalletInfo(); handleBasiliskWalletActions(); handleWalletToAtomicExplorer(); - //TotalFiatValue(); } - - /*setInterval(function() { - handleWalletWidgets(); - console.log('wallet widget refereshed (every 15 seconds)'); - }, 15000);*/ - - /*RunTotalFiatValue = setInterval(function() { - if ( sessionStorage.getItem('IguanaActiveAccount') === null ) { - //console.log('=> No wallet logged in. No need to get Rates.'); - //StopTotalFiatValue(); - } else { - //TotalFiatValue(); - //console.log('Get Rates (every 60 seconds)'); - } - }, 60000);*/ }, handleWalletWidgets: handleWalletWidgets }; @@ -1211,9 +1182,4 @@ function resizeDashboardWindow() { function getActiveEdexcoin() { var active_edexcoin = $('[data-edexcoin]').attr('data-edexcoin'); return active_edexcoin; -} - -/*function hideExtCoinsinEdexDashboard(coin) { - var tmp_getinfo = EDEXgetinfo(coin); - console.log(tmp_getinfo); -}*/ \ No newline at end of file +} \ No newline at end of file diff --git a/assets/scripts/dashboard/DashboardBasilisk.js b/assets/scripts/dashboard/DashboardBasilisk.js index 52ced69..e6e0c3b 100644 --- a/assets/scripts/dashboard/DashboardBasilisk.js +++ b/assets/scripts/dashboard/DashboardBasilisk.js @@ -17,7 +17,6 @@ function ShowBasiliskFetchDataProgress(coin) { listunspent_status = NOT_FOUND, refresh_status = NOT_FOUND, res_data; - //console.log(query) res_data = { 'addresses': false, @@ -28,56 +27,39 @@ function ShowBasiliskFetchDataProgress(coin) { } if (!query) { - //console.log('data not found.') res_data.coin = false; - //console.log(res_data) } else if (!query[coin]) { - //console.log(coin + ' not found.') coin_exists = false; res_data.coin = coin_exists; - //console.log(res_data) } else if (!('addresses' in query[coin])) { - //console.log(coin + ' addresses not found.') addresses_exists = false; res_data.coin = coin_exists; - //console.log(res_data) } else { Promise.all(query[coin].addresses.map((coinaddr_value,coinaddr_index) => { return new Promise((resolve, reject) => { - //console.log(coinaddr_index) - //console.log(coinaddr_value) var data = query[coin][coinaddr_value].getbalance; - //console.log(data) if (!('getbalance' in query[coin][coinaddr_value])) { - //console.log(coin + '>>>' + coinaddr_value + ' => getbalance not found.') getbalance_exists = false; } else { - //console.log(query[coin][coinaddr_value].getbalance.status) getbalance_status = query[coin][coinaddr_value].getbalance.status; } if (!('listtransactions' in query[coin][coinaddr_value])) { - //console.log(coin + '>>>' + coinaddr_value + ' => listtransactions not found.') listtransactions_exists = false; } else { - //console.log(query[coin][coinaddr_value].listtransactions.status) listtransactions_status = query[coin][coinaddr_value].listtransactions.status; } if (!('listunspent' in query[coin][coinaddr_value])) { - //console.log(coin + '>>>' + coinaddr_value + ' => listunspent not found.') listunspent_exists = false; } else { - //console.log(query[coin][coinaddr_value].listunspent.status) listunspent_status = query[coin][coinaddr_value].listunspent.status; } if (!('refresh' in query[coin][coinaddr_value])) { - //console.log(coin + '>>>' + coinaddr_value + ' => refresh not found.') refresh_exists = false; } else { - //console.log(query[coin][coinaddr_value].refresh.status) refresh_status = query[coin][coinaddr_value].refresh.status; } @@ -98,15 +80,9 @@ function ShowBasiliskFetchDataProgress(coin) { }); })) .then(result => { - //console.log(result); - //var res_data.coin = coin_exists; - //var res_data.addresses = addresses_exists; var BasiliskFetchData = ''; $.each(result, function(result_index, result_val) { - //console.log(result_index); - //console.log(result_val); - var tmp_listunspent_lable_color = '', tmp_listtransactions_lable_color = '', tmp_getbalance_lable_color = '', @@ -180,7 +156,6 @@ function ShowBasiliskFetchDataProgress(coin) { break; case NOT_FOUND: tmp_refresh_lable_color = 'danger'; - //$('#edexcoin_dashboard_basilisk_refresh_status').show(); break; } @@ -201,13 +176,6 @@ function ShowBasiliskFetchDataProgress(coin) { '' + ''; $('.tbl_edexcoin_dashboard_basilisk_refresh_status tbody').html(BasiliskFetchData); - //console.log(result_val.refresh_status) - - /*if (result[result.length-1] == result_val && result_val.listtransactions_status !== 'done' && result_val.getbalance_status !== 'done' && result_val.refresh_status !== 'done' ) { - $('#edexcoin_dashboard_basilisk_refresh_status').show() - } else { - $('#edexcoin_dashboard_basilisk_refresh_status').hide() - }*/ }); }); } @@ -260,10 +228,8 @@ function SwitchBasicliskFull(switch_data) { toastr.success(switch_data.currency + ' ' + _lang[defaultLang].TOASTR.SWITCHED_TO + ' ' + mode_value + ' ' + _lang[defaultLang].TOASTR.MODE, _lang[defaultLang].TOASTR.COIN_NOTIFICATION); } else if (SwitchCoinDataOutput.result === 'coin already there') { console.log('coin already there'); - //toastr.info("Looks like" + switch_data.currency + "already running.", "Coin Notification"); } else if (SwitchCoinDataOutput.result === null) { console.log('coin already there'); - //toastr.info("Looks like" + switch_data.currency + "already running.", "Coin Notification"); } }, error: function(xhr, textStatus, error) { diff --git a/assets/scripts/dashboard/DashboardCoinFiat.js b/assets/scripts/dashboard/DashboardCoinFiat.js index ec86539..8208959 100644 --- a/assets/scripts/dashboard/DashboardCoinFiat.js +++ b/assets/scripts/dashboard/DashboardCoinFiat.js @@ -149,7 +149,7 @@ function ShowCoinProgressBar(coin) { // TODO: refactor if (typeof CoinInfoData.bundles == 'undefined') { - //console.log(coin+' is undefined'); + } else { if ( parseInt(CoinInfoData.RTheight) != 0 ) { var coin_blocks = parseInt(CoinInfoData.blocks), diff --git a/assets/scripts/dashboard/DashboardDEX.js b/assets/scripts/dashboard/DashboardDEX.js index 8275aca..bd8282d 100644 --- a/assets/scripts/dashboard/DashboardDEX.js +++ b/assets/scripts/dashboard/DashboardDEX.js @@ -88,16 +88,12 @@ function getDEXGetBalance_cache(coin) { return new Promise((resolve) => { Shepherd_CheckBasiliskCacheData(coin) .then(function(result) { - //console.log(result); - //console.log(result.coin); - if (result.coin == false || result.addresses == false) { var call_data = { 'allcoins': false, 'coin': coin, 'calls': 'listtransactions:getbalance:refresh' }; - //console.log(call_data) Shepherd_FetchBasiliskData(call_data) .then(function(result) { console.log(result); @@ -108,7 +104,6 @@ function getDEXGetBalance_cache(coin) { 'coin': coin, 'calls': 'getbalance:listtransactions' }; - //console.log(call_data); Shepherd_FetchBasiliskData(call_data).then(function(result) { console.log(result); }); diff --git a/assets/scripts/dashboard/DashboardEDEX.js b/assets/scripts/dashboard/DashboardEDEX.js index e4eb43a..d5cc48d 100644 --- a/assets/scripts/dashboard/DashboardEDEX.js +++ b/assets/scripts/dashboard/DashboardEDEX.js @@ -374,213 +374,8 @@ function EdexGetTxList_cache(coin) { }); } -/*function EdexGetTxList(coin) { - 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'); - - var ajax_call_1 = $.ajax({ - data: JSON.stringify(ajax_data_1), - url: 'http://127.0.0.1:' + config.iguanaPort, - 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' ) { - if ( coin == 'BTC' - || coin == 'BTCD' - || coin == 'LTC' - || coin == 'DOGE' - || coin == 'DGB' - || coin == 'SYS' - || coin == 'MZC' - || coin == 'UNO' - || coin == 'ZET' - || coin == 'BTM' - || coin == 'CARB' - || coin == 'ANC' - || coin == 'FRK') { - 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,"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, []]} - } - console.log(ajax_data_2) - return $.ajax({ - data: JSON.stringify(ajax_data_2), - url: 'http://127.0.0.1:' + config.iguanaPort, - 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); - - if ( active_edexcoinmodecode == 'Full' - || ( active_edexcoinmodecode == 'Basilisk' && coin == 'BTC') - || ( active_edexcoinmodecode == 'Basilisk' && coin == 'BTCD' ) - || ( active_edexcoinmodecode == 'Basilisk' && coin == 'LTC' ) - || ( active_edexcoinmodecode == 'Basilisk' && coin == 'DOGE' ) - || ( active_edexcoinmodecode == 'Basilisk' && coin == 'DGB' ) - || ( active_edexcoinmodecode == 'Basilisk' && coin == 'SYS' ) - || ( active_edexcoinmodecode == 'Basilisk' && coin == 'MZC' ) - || ( active_edexcoinmodecode == 'Basilisk' && coin == 'UNO' ) - || ( active_edexcoinmodecode == 'Basilisk' && coin == 'ZET' ) - || ( active_edexcoinmodecode == 'Basilisk' && coin == 'BTM' ) - || ( active_edexcoinmodecode == 'Basilisk' && coin == 'CARB' ) - || ( active_edexcoinmodecode == 'Basilisk' && coin == 'ANC' ) - || ( active_edexcoinmodecode == 'Basilisk' && coin == 'FRK' ) ) { - 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!' - } - - //tmp_secondsToString = ' Unknown' - //if(("blocktime" in data[index])) { - //console.log('blocktime FOUND'); - //var tmp_secondsToString = secondsToString(data[index].blocktime) - //} - - 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); - } - - if ( active_edexcoinmodecode == 'Basilisk' - && coin !== 'BTC' - && coin !== 'BTCD' - && coin !== 'LTC' - && coin !== 'DOGE' - && coin !== 'DGB' - && coin !== 'SYS' - && coin !== 'MZC' - && coin !== 'UNO' - && coin !== 'ZET' - && coin !== 'BTM' - && coin !== 'CARB' - && coin !== 'ANC' - && coin !== 'FRK' ) { - var tmp_category = ''; - var tmp_amount = data[index].amount; - if(!("amount" in data[index])) { - tmp_amount = 'Unknown' - } - var tmp_addr = null - if(!("paid" in data[index])) { - tmp_addr = ' Z Address not listed by wallet!' - } - if(("paid" in data[index])) { - var first_addr = Object.keys(data[index].paid['vouts'][0]); - var tmp_addr = first_addr[0]; - //console.log(data[index].paid['vouts'][0]) - - } - - //tmp_secondsToString = ' Unknown' - //if(("blocktime" in data[index])) { - //console.log('blocktime FOUND'); - //var tmp_secondsToString = secondsToString(data[index].blocktime) - //} - - var tmp_secondsToString = secondsToString(data[index].timestamp) - - if (isNaN(tmp_secondsToString)) { - //tmp_secondsToString = 'Unknown'; - } - - console.log(data[index].type) - if ( data[index].type == 'sent' ) { - tmp_category = ' OUT'; - } - if ( data[index].type == 'received' ) { - tmp_category = ' IN'; - } - if ( data[index].type == 'generate' ) { - tmp_category = ' Mined'; - }if ( data[index].type == 'immature' ) { - tmp_category = ' Immature'; - } - if ( data[index].type == 'unknown' ) { - tmp_category = ' Unknown'; - } - - - if(!("confirmations" in data[index])) { - tmp_confirms = ' Unknown'; - } - if(("confirmations" in data[index])) { - tmp_confirms = data[index].confirmations - } - - //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,tmp_confirms,tmp_amount,tmp_secondsToString,tmp_addr,''] - //console.log(tmplisttransactions); - result.push(tmplisttransactions); - } - - }); - //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); - }); - }); -}*/ function clearEdexSendFieldData() { - //$('.showedexcoinaddrs').selectpicker('refresh'); - //$('#edexcoin_sendto').val(''); - //$('#edexcoin_total_value').text(''); - //$('#edexcoin_amount').val(''); } function EdexListAllAddr(coin) { @@ -806,10 +601,6 @@ function edexCoinBtnAction() { alertify.success(_lang[defaultLang].DASHBOARD.ADDR_COPIED + '.'); }); - //var clipboard = new Clipboard('.clipboard-edexaddr'); - //clipboard.destroy(); - - //var clipboard = null; if (clipboard && clipboard != null ) { clipboard.destroy(); } diff --git a/assets/scripts/iguana_api.js b/assets/scripts/iguana_api.js index 327f1b6..ee974b7 100644 --- a/assets/scripts/iguana_api.js +++ b/assets/scripts/iguana_api.js @@ -40,31 +40,6 @@ function Iguana_dumpwallet() { return tmp; }(); - - //console.log(return_result); - - //comment - /*var ajax_data = {"agent":"bitcoinrpc","method":"dumpwallet","filename": ""}; - 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('== Data OutPut =='); - console.log(AjaxOutputData); - //return AjaxOutputData; - }, - error: function(xhr, textStatus, error) { - console.log(xhr.statusText); - console.log(textStatus); - console.log(error); - } - }); - //console.log(datareturn) - //return datareturn;*/ } function Iguana_ServiceUnavailable() { @@ -153,7 +128,7 @@ function Iguana_CheckActiveCoins() { AjaxOutputData = JSON.parse(AjaxOutputData.responseText); $.each(AjaxOutputData, function( index, value ) { if ( index === 'tag' ) { - //console.log('it is tag'); + } else { if (AjaxOutputData[index].length !== 0 ) { result.push({ 'active': AjaxOutputData[index].length }); diff --git a/assets/scripts/iguana_api/IguanaAddcoin.js b/assets/scripts/iguana_api/IguanaAddcoin.js index 083e76f..8ea3bf3 100644 --- a/assets/scripts/iguana_api/IguanaAddcoin.js +++ b/assets/scripts/iguana_api/IguanaAddcoin.js @@ -211,10 +211,6 @@ function Iguana_addcoin(addcoin_data) { } startcoin(); - /*setconfig() - .then(function(result) { - return startcoin(); - });*/ var tmpinternval = 6000, AddCoinData = {"coin":"ZEC","conf":"zcash.conf","path":confpath[0].path,"unitval":"20","zcash":1,"RELAY":-1,"VALIDATE":0,"prefetchlag":-1,"poll":10,"active":1,"agent":"iguana","method":"addcoin","startpend":8,"endpend":8,"services":129,"maxpeers":32,"newcoin":"ZEC","name":"Zcash","hasheaders":0,"useaddmultisig":0,"netmagic":"24e92764","p2p":8233,"rpc":8232,"pubval":184,"p2shval":189,"wifval":128,"txfee_satoshis":"10000","isPoS":0,"minoutput":10000,"minconfirms":2,"genesishash":"00040fe8ec8471911baa1db1266ea15dd06b4a8a5c453883c000b031973dce08","protover":170002,"genesisblock":"040000000000000000000000000000000000000000000000000000000000000000000000db4d7a85b768123f1dff1d4c4cece70083b2d27e117b4ac2e31d087988a5eac4000000000000000000000000000000000000000000000000000000000000000090041358ffff071f5712000000000000000000000000000000000000000000000000000000000000fd4005000a889f00854b8665cd555f4656f68179d31ccadc1b1f7fb0952726313b16941da348284d67add4686121d4e3d930160c1348d8191c25f12b267a6a9c131b5031cbf8af1f79c9d513076a216ec87ed045fa966e01214ed83ca02dc1797270a454720d3206ac7d931a0a680c5c5e099057592570ca9bdf6058343958b31901fce1a15a4f38fd347750912e14004c73dfe588b903b6c03166582eeaf30529b14072a7b3079e3a684601b9b3024054201f7440b0ee9eb1a7120ff43f713735494aa27b1f8bab60d7f398bca14f6abb2adbf29b04099121438a7974b078a11635b594e9170f1086140b4173822dd697894483e1c6b4e8b8dcd5cb12ca4903bc61e108871d4d915a9093c18ac9b02b6716ce1013ca2c1174e319c1a570215bc9ab5f7564765f7be20524dc3fdf8aa356fd94d445e05ab165ad8bb4a0db096c097618c81098f91443c719416d39837af6de85015dca0de89462b1d8386758b2cf8a99e00953b308032ae44c35e05eb71842922eb69797f68813b59caf266cb6c213569ae3280505421a7e3a0a37fdf8e2ea354fc5422816655394a9454bac542a9298f176e211020d63dee6852c40de02267e2fc9d5e1ff2ad9309506f02a1a71a0501b16d0d36f70cdfd8de78116c0c506ee0b8ddfdeb561acadf31746b5a9dd32c21930884397fb1682164cb565cc14e089d66635a32618f7eb05fe05082b8a3fae620571660a6b89886eac53dec109d7cbb6930ca698a168f301a950be152da1be2b9e07516995e20baceebecb5579d7cdbc16d09f3a50cb3c7dffe33f26686d4ff3f8946ee6475e98cf7b3cf9062b6966e838f865ff3de5fb064a37a21da7bb8dfd2501a29e184f207caaba364f36f2329a77515dcb710e29ffbf73e2bbd773fab1f9a6b005567affff605c132e4e4dd69f36bd201005458cfbd2c658701eb2a700251cefd886b1e674ae816d3f719bac64be649c172ba27a4fd55947d95d53ba4cbc73de97b8af5ed4840b659370c556e7376457f51e5ebb66018849923db82c1c9a819f173cccdb8f3324b239609a300018d0fb094adf5bd7cbb3834c69e6d0b3798065c525b20f040e965e1a161af78ff7561cd874f5f1b75aa0bc77f720589e1b810f831eac5073e6dd46d00a2793f70f7427f0f798f2f53a67e615e65d356e66fe40609a958a05edb4c175bcc383ea0530e67ddbe479a898943c6e3074c6fcc252d6014de3a3d292b03f0d88d312fe221be7be7e3c59d07fa0f2f4029e364f1f355c5d01fa53770d0cd76d82bf7e60f6903bc1beb772e6fde4a70be51d9c7e03c8d6d8dfb361a234ba47c470fe630820bbd920715621b9fbedb49fcee165ead0875e6c2b1af16f50b5d6140cc981122fcbcf7c5a4e3772b3661b628e08380abc545957e59f634705b1bbde2f0b4e055a5ec5676d859be77e20962b645e051a880fddb0180b4555789e1f9344a436a84dc5579e2553f1e5fb0a599c137be36cabbed0319831fea3fddf94ddc7971e4bcf02cdc93294a9aab3e3b13e3b058235b4f4ec06ba4ceaa49d675b4ba80716f3bc6976b1fbf9c8bf1f3e3a4dc1cd83ef9cf816667fb94f1e923ff63fef072e6a19321e4812f96cb0ffa864da50ad74deb76917a336f31dce03ed5f0303aad5e6a83634f9fcc371096f8288b8f02ddded5ff1bb9d49331e4a84dbe1543164438fde9ad71dab024779dcdde0b6602b5ae0a6265c14b94edd83b37403f4b78fcd2ed555b596402c28ee81d87a909c4e8722b30c71ecdd861b05f61f8b1231795c76adba2fdefa451b283a5d527955b9f3de1b9828e7b2e74123dd47062ddcc09b05e7fa13cb2212a6fdbc65d7e852cec463ec6fd929f5b8483cf3052113b13dac91b69f49d1b7d1aec01c4a68e41ce157","debug":0} @@ -1052,12 +1048,6 @@ function Iguana_addcoin(addcoin_data) { Shepherd_FetchBasiliskData().then(function(result) { console.log(result); }); - //EDEXMainAddr(addcoin_data.coin).then(function(result){ - //console.log(result) - //Iguana_DEXImportAddr(addcoin_data.coin,result); - //}) - //Iguana_DEXImportAllWalletAddr(addcoin_data.coin) - //$(document).ready(function() { window.location.reload(); }); } else { Iguana_CheckActiveCoins().then(function(result) { if (result.length !== 0 ) { diff --git a/assets/scripts/iguana_api/IguanaDEX.js b/assets/scripts/iguana_api/IguanaDEX.js index cf55cb0..d676975 100644 --- a/assets/scripts/iguana_api/IguanaDEX.js +++ b/assets/scripts/iguana_api/IguanaDEX.js @@ -392,8 +392,7 @@ function Iguana_DEXsendrawtx(data) { $.ajax({ data: JSON.stringify(ajax_data), url: 'http://127.0.0.1:' + config.iguanaPort, - type: 'POST', - //dataType: 'json' + type: 'POST' }) .then(result => { console.log(result); diff --git a/assets/scripts/iguana_api/IguanaEDEX.js b/assets/scripts/iguana_api/IguanaEDEX.js index 62e9f7a..8d5fd66 100644 --- a/assets/scripts/iguana_api/IguanaEDEX.js +++ b/assets/scripts/iguana_api/IguanaEDEX.js @@ -58,7 +58,6 @@ function EDEXlistunspent(coin, addr) { $.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; tmpcalcinterest = tmpcalcinterest + data[index].interest; interest_enable = true; @@ -84,20 +83,6 @@ function EDEXlistunspent(coin, addr) { }; } - /*var tmpcalcnum = 0; - $.each(unique_addr_tmp_array, function(index, value) { - //console.log(value.amount); - if ( value.interest !== undefined ) { - tmpcalcnum = tmpcalcnum + value.amount + value.interest; - } - if ( value.interest === undefined ) { - tmpcalcnum = tmpcalcnum + value.amount; - } - }); - //console.log(tmpcalcnum); - 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); }); @@ -214,7 +199,7 @@ function EDEXSendutxoRawTx(data) { 'utxos': utxos_set }; - console.log(send_data) + console.log(send_data); Iguana_utxorawtx(send_data).then(function(result) { var edexcoin_sendto_result_tbl = ''; @@ -283,35 +268,25 @@ function EDEXSendutxoRawTx(data) { var process_refresh_utxos = function(gettxdata) { return new Promise(function(resolve, reject) { - console.log(gettxdata) - console.log(utxos_set) + console.log(gettxdata); + console.log(utxos_set); EDEX_GetTxIDList(gettxdata).then(function(get_txid_list) { - console.log(get_txid_list) + console.log(get_txid_list); resolve(get_txid_list); }); - /*EDEX_ProcessRefreshData(gettxdata,utxos_set).then(function(new_utxos_set) { - console.log(new_utxos_set); - resolve(new_utxos_set); - });*/ }); } var get_data_cache_contents = function(get_txid_list) { return new Promise(function(resolve, reject) { console.log(get_txid_list); - console.log(send_data) - console.log(send_data.sendfrom) + console.log(send_data); + console.log(send_data.sendfrom); + Shepherd_GroomData_Get().then(function(result) { console.log(result); - /*console.log(result.basilisk.KMD[send_data.sendfrom].refresh); - delete result.basilisk.KMD[send_data.sendfrom].refresh.data; - console.log(result.basilisk.KMD[send_data.sendfrom].refresh); - result.basilisk.KMD[send_data.sendfrom].refresh.data = new_utxos_set; - console.log(result.basilisk.KMD[send_data.sendfrom].refresh); - var save_this_data = result;*/ var save_this_data = EDEX_RemoveTXID(result, get_txid_list); console.log(save_this_data); - //resolve(result); resolve(save_this_data); }); }); @@ -390,8 +365,6 @@ function EDEXSendutxoRawTx(data) { var active_edexcoin = $('[data-edexcoin]').attr('data-edexcoin'); console.log(send_data); - - //toastr.success('Signed Transaction Generated.', 'Wallet Notification'); edexcoin_sendto_result_tbl += '' + '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..787f155 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'); @@ -249,7 +243,6 @@ function KMD_ProgressBar() { $('#extcoin-progressbars .progress-bar').css({ 'width': '100%' }); } 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) + '%'); diff --git a/assets/scripts/login.js b/assets/scripts/login.js index d8dee86..8f4292e 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') { @@ -858,10 +776,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 fef516f..58fa0b0 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(); @@ -592,7 +585,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(''); } @@ -600,7 +592,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 c00fed5..082251d 100755 --- a/index.html +++ b/index.html @@ -28,7 +28,6 @@ - @@ -68,7 +67,8 @@