From 2c742be0be14b0a307e69cc1362e6987ae40a050 Mon Sep 17 00:00:00 2001 From: Satinder Grewal Date: Thu, 2 Mar 2017 02:23:25 +1300 Subject: [PATCH 1/5] Receiving address part of EasyDEX Wallets updated to get data from cache file --- assets/scripts/dashboard.js | 147 +++++++++++++++++++++++++++-------- assets/scripts/iguana_api.js | 47 +++++++++++ index.html | 4 +- 3 files changed, 165 insertions(+), 33 deletions(-) diff --git a/assets/scripts/dashboard.js b/assets/scripts/dashboard.js index d88594e..cf5c18d 100644 --- a/assets/scripts/dashboard.js +++ b/assets/scripts/dashboard.js @@ -2367,44 +2367,129 @@ function EdexListAllAddr(coin) { }); NProgress.start(); - EDEXgetaddrbyaccount(coin).then(function(result) { - console.log(result); - var only_reciving_addr_data = []; - - $.each(result, function(index, value) { - if (value.interest == undefined || coin !== 'KMD') { - console.log('interest is undefined'); - tmp_interest = 'NA'; - } else { - tmp_interest = value.interest; - } - only_reciving_addr_data.push([ - value.label, - value.addr, - value.total, - tmp_interest - ]); - }); - console.log(only_reciving_addr_data); + active_edexcoinmodecode = sessionStorage.getItem('edexTmpMode'); + + if (active_edexcoinmodecode == 'Basilisk' && coin !== 'BTC' && coin !== 'SYS') { + EDEXgetaddrbyaccount(coin).then(function(result) { + console.log(result); + var only_reciving_addr_data = []; + + $.each(result, function(index, value) { + if (value.interest == undefined || coin !== 'KMD') { + console.log('interest is undefined'); + tmp_interest = 'NA'; + } else { + tmp_interest = value.interest; + } + only_reciving_addr_data.push([ + value.label, + value.addr, + value.total, + tmp_interest + ]); + }); + console.log(only_reciving_addr_data); + + var edexcoin_recieve_table = ''; + + edexcoin_recieve_table = $('#edexcoin-recieve-addr-tbl').DataTable({ + data: only_reciving_addr_data, + select: false, + retrieve: true + }); - var edexcoin_recieve_table = ''; + edexcoin_recieve_table.destroy(); - 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 + }); + + NProgress.done(); }); + } else if (active_edexcoinmodecode == 'Basilisk' ) { + EDEXgetaddrbyaccount_cache(coin).then(function(result){ + console.log(result); + var only_reciving_addr_data = []; + + $.each(result, function(index, value) { + if (value.interest == undefined || coin !== 'KMD') { + console.log('interest is undefined'); + tmp_interest = 'NA'; + } else { + tmp_interest = value.interest; + } + only_reciving_addr_data.push([ + value.label, + value.addr, + value.total, + tmp_interest + ]); + }); + console.log(only_reciving_addr_data); + + var edexcoin_recieve_table = ''; + + edexcoin_recieve_table = $('#edexcoin-recieve-addr-tbl').DataTable({ + data: only_reciving_addr_data, + select: false, + retrieve: true + }); - edexcoin_recieve_table.destroy(); + edexcoin_recieve_table.destroy(); - 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 + }); + + NProgress.done(); }); + } - NProgress.done(); - }); + if (active_edexcoinmodecode == 'Full') { + EDEXgetaddrbyaccount(coin).then(function(result) { + console.log(result); + var only_reciving_addr_data = []; + + $.each(result, function(index, value) { + if (value.interest == undefined || coin !== 'KMD') { + console.log('interest is undefined'); + tmp_interest = 'NA'; + } else { + tmp_interest = value.interest; + } + only_reciving_addr_data.push([ + value.label, + value.addr, + value.total, + tmp_interest + ]); + }); + console.log(only_reciving_addr_data); + + var edexcoin_recieve_table = ''; + + 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(); + }); + } + } diff --git a/assets/scripts/iguana_api.js b/assets/scripts/iguana_api.js index 8bf0bbf..fe05ce1 100644 --- a/assets/scripts/iguana_api.js +++ b/assets/scripts/iguana_api.js @@ -1311,6 +1311,53 @@ function EDEXgetinfo(coin) { }) } +function EDEXgetaddrbyaccount_cache(coin) { + return new Promise((resolve) => { + Shepherd_GetBasiliskCache().then(function(result){ + var _data = JSON.parse(result) + query = _data.result.basilisk + tmp_addr_label = '' + + ' public' + + ''; + 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) { + var pass_data = { + 'label': tmp_addr_label, + 'addr': coinaddr_value, + 'total': coinaddr_balances.balance.toFixed(8), + 'interest': coinaddr_balances.interest.toFixed(8) + }; + } + if (coinaddr_balances.interest == undefined) { + var pass_data = { + 'label': tmp_addr_label, + 'addr': coinaddr_value, + 'total': coinaddr_balances.balance.toFixed(8) + }; + } + + //console.log(pass_data) + resolve(pass_data) + }) + + })).then(result => { + //console.log(result) + resolve(result) + }) + + }) + }) +} + function EDEXgetaddrbyaccount(coin) { return new Promise((resolve) => { var tmpIguanaRPCAuth = 'tmpIgRPCUser@' + sessionStorage.getItem('IguanaRPCAuth'), diff --git a/index.html b/index.html index 5331d11..d4a6516 100755 --- a/index.html +++ b/index.html @@ -983,11 +983,11 @@
- +
From 3a4ed804acf830140a60a27101ca8dcc045e7c4b Mon Sep 17 00:00:00 2001 From: Satinder Grewal Date: Thu, 2 Mar 2017 03:26:01 +1300 Subject: [PATCH 2/5] basilisk send screen conditioned to show from select menu for all basilisk coins except BTC and SYS --- assets/scripts/dashboard.js | 45 ++++++++++++++++++++++--------------- index.html | 2 +- 2 files changed, 28 insertions(+), 19 deletions(-) diff --git a/assets/scripts/dashboard.js b/assets/scripts/dashboard.js index cf5c18d..e791a36 100644 --- a/assets/scripts/dashboard.js +++ b/assets/scripts/dashboard.js @@ -133,23 +133,32 @@ var Dashboard = function() { $('#edexcoin_recieve_section').hide(); $('#edexcoin_settings').hide(); - //Disabled dropdown list address in EasyDEX's main send option, as it's using sendtoaddress at the moment. - //This option can be enabled later for other section where user can select particular address to send funds from. - /*var edexcoin_addr_list_with_balance = EDEXlistunspent(active_edexcoin); - console.log(edexcoin_addr_list_with_balance); - var tmpoptions = ''; - tmpoptions += ''; - $.each(edexcoin_addr_list_with_balance, function(index) { - tmpoptions += ''; - $('#edexcoin_send_from').html(tmpoptions); - }); + var active_edexcoin = $('[data-edexcoin]').attr('data-edexcoin'); + var selected_coinmode = sessionStorage.getItem('edexTmpMode') + + // This send from part is only enabled now for Basilisk coins except BTC and SYS. + if (selected_coinmode == 'Basilisk' && active_edexcoin !== 'BTC' && active_edexcoin !== 'SYS' ) { + $('.edexcoin_send_from_for_basilisk').show() + EDEXgetaddrbyaccount_cache(active_edexcoin).then(function(result){ + //console.log(result) + edexcoin_addr_list_with_balance = result + console.log(edexcoin_addr_list_with_balance); + var tmpoptions = ''; + tmpoptions += ''; + $.each(edexcoin_addr_list_with_balance, function(index) { + tmpoptions += ''; + $('#edexcoin_send_from').html(tmpoptions); + }); + + $('.showedexcoinaddrs').selectpicker({ style: 'btn-info' }); + $('.showedexcoinaddrs').selectpicker('refresh'); + }) + } else { + $('.edexcoin_send_from_for_basilisk').hide() + } - $('.showedexcoinaddrs').selectpicker({ style: 'btn-info' }); - $('.showedexcoinaddrs').selectpicker('refresh');*/ //clearEdexSendFieldData(); $('.edexcoin-send-form')[0].reset(); - var active_edexcoin = $('[data-edexcoin]').attr('data-edexcoin'); - var selected_coinmode = sessionStorage.getItem('edexTmpMode') if ( selected_coinmode == 'Full' ) { EDEXgetinfo(active_edexcoin).then(function(result) { $('#edexcoin_fee').val(result.kbfee); @@ -2013,10 +2022,10 @@ function EdexGetTxList(coin) { var tmp_secondsToString = secondsToString(result_data[index].timestamp); if ( result_data[index].type == 'sent' ) { - tmp_category = ' OUT'; + tmp_category = ' OUT'; } if ( result_data[index].type == 'received' ) { - tmp_category = ' IN'; + tmp_category = ' IN'; } if ( result_data[index].type == 'generate' ) { tmp_category = ' Mined'; @@ -2105,10 +2114,10 @@ function EdexGetTxList_cache(coin) { var tmp_secondsToString = secondsToString(result_data[index].timestamp); if ( result_data[index].type == 'sent' ) { - tmp_category = ' OUT'; + tmp_category = ' OUT'; } if ( result_data[index].type == 'received' ) { - tmp_category = ' IN'; + tmp_category = ' IN'; } if ( result_data[index].type == 'generate' ) { tmp_category = ' Mined'; diff --git a/index.html b/index.html index d4a6516..0ec6b31 100755 --- a/index.html +++ b/index.html @@ -983,7 +983,7 @@
-
+ ' }); NProgress.start(); + + var active_edexcoin = $('[data-edexcoin]').attr('data-edexcoin'); + var selected_coinmode = sessionStorage.getItem('edexTmpMode') console.log('Sent control here after clicked in form...'); - EDEXMainAddr($('[data-edexcoin]').attr('data-edexcoin')).then(function(result) { - $('#mdl_confirm_currency_sendfrom_addr').text(result); - }); + + if (selected_coinmode == 'Basilisk' && active_edexcoin !== 'BTC' && active_edexcoin !== 'SYS' ) { + $('#mdl_confirm_currency_sendfrom_addr').text($('#edexcoin_send_from').val()); + } else { + EDEXMainAddr($('[data-edexcoin]').attr('data-edexcoin')).then(function(result) { + $('#mdl_confirm_currency_sendfrom_addr').text(result); + }); + } + $('#mdl_confirm_currency_sendto_addr').text($('#edexcoin_sendto').val()); $('#mdl_confirm_currency_send_amount').text($('#edexcoin_amount').val()); $('#mdl_confirm_currency_coinname').text($('[data-edexcoin]').attr('data-edexcoin')); @@ -280,9 +280,11 @@ var Dashboard = function() { console.log('==> Before confirming tx to send'); console.log($('[data-edexcoin]').attr('data-edexcoin')); console.log($('#edexcoin_sendto').val()); + console.log($('#mdl_confirm_currency_sendfrom_addr').text()); console.log($('#edexcoin_total_value').text()); var active_edexcoin = $('[data-edexcoin]').attr('data-edexcoin'), + tmp_send_from_addr = $('#edexcoin_send_from').val() tmp_send_to_addr = $('#edexcoin_sendto').val(), tmp_send_total_amount = $('#edexcoin_total_value').text(); $('#edexcoin-send-screen').hide(); @@ -299,9 +301,11 @@ var Dashboard = 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(), tmp_send_total_amount = $('#edexcoin_total_value').text(); console.log(active_edexcoin); + console.log(tmp_send_from_addr); console.log(tmp_send_to_addr); console.log(tmp_send_total_amount); diff --git a/assets/scripts/iguana_api.js b/assets/scripts/iguana_api.js index fe05ce1..bd76a84 100644 --- a/assets/scripts/iguana_api.js +++ b/assets/scripts/iguana_api.js @@ -1603,7 +1603,7 @@ function EDEXimportprivkey(params_data) { } function Iguana_SetRPCAuth() { - var tmpPass = '1234'; //md5(PassPhraseGenerator.generatePassPhrase(128)); + var tmpPass = md5(PassPhraseGenerator.generatePassPhrase(128)); sessionStorage.setItem('IguanaRPCAuth', tmpPass); } diff --git a/index.html b/index.html index 0ec6b31..9ce8d99 100755 --- a/index.html +++ b/index.html @@ -1004,7 +1004,7 @@ Total (amount - txfee): 0.000
- +
From 4d988cf288d320c4abc27bffcaacf540dedc0297 Mon Sep 17 00:00:00 2001 From: Satinder Grewal Date: Thu, 2 Mar 2017 05:51:20 +1300 Subject: [PATCH 4/5] fix for receiving addresses --- assets/scripts/dashboard.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/scripts/dashboard.js b/assets/scripts/dashboard.js index f15de48..6aa7b80 100644 --- a/assets/scripts/dashboard.js +++ b/assets/scripts/dashboard.js @@ -2383,7 +2383,7 @@ function EdexListAllAddr(coin) { active_edexcoinmodecode = sessionStorage.getItem('edexTmpMode'); if (active_edexcoinmodecode == 'Basilisk' && coin !== 'BTC' && coin !== 'SYS') { - EDEXgetaddrbyaccount(coin).then(function(result) { + EDEXgetaddrbyaccount_cache(coin).then(function(result) { console.log(result); var only_reciving_addr_data = []; @@ -2422,7 +2422,7 @@ function EdexListAllAddr(coin) { NProgress.done(); }); } else if (active_edexcoinmodecode == 'Basilisk' ) { - EDEXgetaddrbyaccount_cache(coin).then(function(result){ + EDEXgetaddrbyaccount(coin).then(function(result){ console.log(result); var only_reciving_addr_data = []; From 296082143f5a007824d08ed7d3667a1784e44208 Mon Sep 17 00:00:00 2001 From: Satinder Grewal Date: Thu, 2 Mar 2017 06:43:58 +1300 Subject: [PATCH 5/5] another fix for send form --- assets/scripts/dashboard.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/assets/scripts/dashboard.js b/assets/scripts/dashboard.js index 6aa7b80..c2518cd 100644 --- a/assets/scripts/dashboard.js +++ b/assets/scripts/dashboard.js @@ -158,6 +158,8 @@ var Dashboard = function() { }) } else { $('.edexcoin_send_from_for_basilisk').hide() + $('.edexcoin_send_coins_btn_step1').removeClass('disabled'); + $('.edexcoin_send_coins_btn_step1').removeAttr('disabled'); } //clearEdexSendFieldData();