Loading...
';
+ actiavte_portfolio_coins_list_spinner += '';
+ actiavte_portfolio_coins_list_spinner += '';
+ actiavte_portfolio_coins_list_spinner += ' ';
+ actiavte_portfolio_coins_list_spinner += '
';
+ actiavte_portfolio_coins_list_spinner += ' ';
+ $('.porfolio_coins_list tbody').append(actiavte_portfolio_coins_list_spinner);
CheckPortfolioFn();
CheckPortfolio_Interval = setInterval(CheckPortfolioFn,60000);
});
@@ -1371,7 +1391,8 @@ function check_coin_inventory(coin) {
$('.RawJSONInventory-output').html(JSON.stringify(data, null, 2));
$('.dex_showinv_alice_tbl tbody').empty();
- var inv_alice_table_tr = '';
+ // Disabled since v0.6.8-beta
+ /*var inv_alice_table_tr = '';
inv_alice_table_tr += '';
inv_alice_table_tr += 'Index ';
inv_alice_table_tr += 'Coin ';
@@ -1398,7 +1419,7 @@ function check_coin_inventory(coin) {
inv_alice_table_tr += ' ';
$('.dex_showinv_alice_tbl tbody').append(inv_alice_table_tr);
- })
+ })*/
}
}).fail(function(jqXHR, textStatus, errorThrown) {
@@ -1408,12 +1429,12 @@ function check_coin_inventory(coin) {
}
-function check_coin_listunspent(coin_data) {
- console.log(coin_data);
+function check_coin_listunspent(coin_listunspent_data) {
+ console.log(coin_listunspent_data);
var userpass = sessionStorage.getItem('mm_userpass');
var mypubkey = sessionStorage.getItem('mm_mypubkey');
- var ajax_data = {"userpass":userpass,"method":"listunspent","coin":coin_data.coin,"address":coin_data.addr};
+ var ajax_data = {"userpass":userpass,"method":"listunspent","coin":coin_listunspent_data.coin,"address":coin_listunspent_data.addr};
var url = "http://127.0.0.1:7783";
$.ajax({
@@ -1422,32 +1443,39 @@ function check_coin_listunspent(coin_data) {
dataType: 'json',
type: 'POST',
url: url
- }).done(function(data) {
+ }).done(function(coin_listunspent_output_data) {
// If successful
- //console.log(data);
+ console.log(coin_listunspent_output_data);
$('.dex_showlist_unspents_tbl tbody').empty();
var show_list_unspents_tbl_tr = '';
show_list_unspents_tbl_tr += '';
show_list_unspents_tbl_tr += 'Index ';
- show_list_unspents_tbl_tr += 'Coin ';
- show_list_unspents_tbl_tr += 'Height ';
- show_list_unspents_tbl_tr += 'TX Position ';
- show_list_unspents_tbl_tr += 'Value ';
- show_list_unspents_tbl_tr += 'TX Hash ';
+ show_list_unspents_tbl_tr += 'Coin Info ';
+ show_list_unspents_tbl_tr += 'Value info ';
+ show_list_unspents_tbl_tr += 'Transaction Info ';
show_list_unspents_tbl_tr += ' ';
$('.dex_showlist_unspents_tbl tbody').append(show_list_unspents_tbl_tr);
- $.each(data, function(index, val) {
+ $.each(coin_listunspent_output_data, function(index, val) {
//console.log(index);
//console.log(val);
show_list_unspents_tbl_tr = '';
show_list_unspents_tbl_tr += '';
show_list_unspents_tbl_tr += '' + index + ' ';
- show_list_unspents_tbl_tr += '' + coin_data.coin + ' ';
- show_list_unspents_tbl_tr += '' + val.height + ' ';
- show_list_unspents_tbl_tr += '' + val.tx_pos + ' ';
- show_list_unspents_tbl_tr += '' + (parseFloat(val.value)/100000000).toFixed(8) + ' ' + coin_data.coin + ' ';
- show_list_unspents_tbl_tr += '' + val.tx_hash + ' ';
+ show_list_unspents_tbl_tr += `
+ Coin: `+ coin_listunspent_data.coin +`Account: `+ val.account +`Address: `+ val.address +` `;
+ show_list_unspents_tbl_tr += `
+ Amount: `+ (parseFloat(val.amount)/100000000).toFixed(8) + ' ' + coin_listunspent_data.coin +`Confirmations: `+ val.confirmations +`Interest: `+ val.interest +` `;
+ show_list_unspents_tbl_tr += `
+ scriptPubKey: `+ val.scriptPubKey +`TxID: `+ val.txid +` `;
show_list_unspents_tbl_tr += ' ';
$('.dex_showlist_unspents_tbl tbody').append(show_list_unspents_tbl_tr);
@@ -1657,17 +1685,65 @@ function clac_coin_inventory(data) {
}
-function make_inventory_withdraw(data) {
+function make_inventory_withdraw(mk_inv_data) {
//console.log(data);
- coin = data.coin;
+ coin = mk_inv_data.coin;
var userpass = sessionStorage.getItem('mm_userpass');
- var ajax_data = {"userpass":userpass,"method":"withdraw","coin": data.coin, "outputs": data.outputs};
+ var ajax_data = {"userpass":userpass,"method":"withdraw","coin": mk_inv_data.coin, "outputs": mk_inv_data.outputs};
var url = "http://127.0.0.1:7783";
console.log(ajax_data);
+ console.log(JSON.stringify(ajax_data));
- var a1 = $.ajax({
+
+ $.ajax({
+ data: JSON.stringify(ajax_data),
+ //dataType: 'json',
+ type: 'POST',
+ url: url
+ }).done(function(mk_inv_withdraw_data) {
+ console.log(mk_inv_withdraw_data);
+ var paprsed_mk_inv_withdraw_data = JSON.parse(mk_inv_withdraw_data);
+
+ if (paprsed_mk_inv_withdraw_data.complete == false) {
+ toastr.error('Uncessful Transaction. Please try again.','Tansaction info');
+ }
+ if (paprsed_mk_inv_withdraw_data.complete == true) {
+ var mk_inv_confirm_bootbox = bootbox.dialog({
+ backdrop: true,
+ onEscape: true,
+ message: `Sending a transaction to make small deposit change in your address for coin: ` + mk_inv_data.coin + `
+ Please confirm if you wish to proceed sending this transaction. Regular Transaction fee applies to make this deposit change.
Error making withdraw transaction:
` + mk_inv_sendrawtx_output_data + ` `);
+ }
+ }).fail(function(jqXHR, textStatus, errorThrown) {
+ // If fail
+ console.log(textStatus + ': ' + errorThrown);
});
}
@@ -1925,6 +2061,19 @@ function addcoins_dialog(){
console.log(addcoin_data);
enable_disable_coin(addcoin_data);
+ $('.porfolio_coins_list tbody').empty();
+ var actiavte_portfolio_coins_list_spinner = ''
+ actiavte_portfolio_coins_list_spinner += '';
+ actiavte_portfolio_coins_list_spinner += '';
+ actiavte_portfolio_coins_list_spinner += '';
+ actiavte_portfolio_coins_list_spinner += ' ';
+ actiavte_portfolio_coins_list_spinner += '
';
+ actiavte_portfolio_coins_list_spinner += ' ';
+ $('.porfolio_coins_list tbody').append(actiavte_portfolio_coins_list_spinner);
CheckPortfolioFn();
}
@@ -1999,22 +2148,26 @@ function CheckPortfolioFn(sig) {
}
-function PortfolioTblDataFn(data) {
- //console.log(data);
+function PortfolioTblDataFn(portfolio_tbl_data) {
+ console.log(portfolio_tbl_data.portfolio.length);
+ if (portfolio_tbl_data.portfolio &&
+ portfolio_tbl_data.portfolio.length) {
+ $('#portfolio-coins-spinner').hide();
+ }
- $('.portfolio_kmd_equiv').html(data.kmd_equiv);
- $('.portfolio_buycoin').html(data.buycoin);
- $('.portfolio_buyforce').html(data.buyforce);
- $('.portfolio_sellcoin').html(data.sellcoin);
- $('.portfolio_sellforce').html(data.sellforce);
- $('.portfolio_base').html(data.base);
- $('.portfolio_rel').html(data.rel);
- $('.portfolio_relvolume').html(data.relvolume);
+ $('.portfolio_kmd_equiv').html(portfolio_tbl_data.kmd_equiv);
+ $('.portfolio_buycoin').html(portfolio_tbl_data.buycoin);
+ $('.portfolio_buyforce').html(portfolio_tbl_data.buyforce);
+ $('.portfolio_sellcoin').html(portfolio_tbl_data.sellcoin);
+ $('.portfolio_sellforce').html(portfolio_tbl_data.sellforce);
+ $('.portfolio_base').html(portfolio_tbl_data.base);
+ $('.portfolio_rel').html(portfolio_tbl_data.rel);
+ $('.portfolio_relvolume').html(portfolio_tbl_data.relvolume);
$('.dex_portfolio_coins_tbl tbody').empty();
$('.porfolio_coins_list tbody').empty();
- $.each(data.portfolio, function(index, val) {
+ $.each(portfolio_tbl_data.portfolio, function(index, val) {
//console.log(index);
console.log(val);
@@ -2137,6 +2290,19 @@ function PortfolioChartUpdate(chart_data) {
$('.btn-refreshportfolio').click(function() {
console.log('clicked refresh button at dex portfolio charts');
+ $('.porfolio_coins_list tbody').empty();
+ var actiavte_portfolio_coins_list_spinner = ''
+ actiavte_portfolio_coins_list_spinner += '';
+ actiavte_portfolio_coins_list_spinner += '';
+ actiavte_portfolio_coins_list_spinner += '';
+ actiavte_portfolio_coins_list_spinner += ' ';
+ actiavte_portfolio_coins_list_spinner += '
';
+ actiavte_portfolio_coins_list_spinner += ' ';
+ $('.porfolio_coins_list tbody').append(actiavte_portfolio_coins_list_spinner);
CheckPortfolioFn();
});
@@ -2636,7 +2802,7 @@ function manual_buy_sell(mt_data) {
toastr.error('No withdraw info found. Please try again with lower buy amount.', 'Bot Info');
}*/
}
- if (data.error == 'cant find alice utxo that is big enough') {
+ if (data.error == 'cant find utxo that is close enough in size') {
toastr.error(data.error, 'Trade Info');
}
if (data.error == 'cant find ordermatch utxo, need to change relvolume to be closer to available') {
@@ -3751,16 +3917,23 @@ function bot_sendrawtx(bot_data) {
//dataType: 'json',
type: 'POST',
url: url
- }).done(function(data) {
+ }).done(function(bot_output_data) {
// If successful
- console.log(data);
- console.log(JSON.stringify(data));
+ console.log(bot_output_data);
+ var parsed_bot_output_data = '';
+ try {
+ parsed_bot_output_data = JSON.parse(bot_output_data);
+ console.log(parsed_bot_output_data);
- if (!data.error === false) {
- toastr.error(data.error.message, 'Transaction Info');
- } else if (data.result == 'success') {
- toastr.info('Low no. of UTXOsError making withdraw transaction:
` + data + ` `);
+ ` + bot_output_data + ` `);
}
}).fail(function(jqXHR, textStatus, errorThrown) {
// If fail
@@ -4402,6 +4577,12 @@ function check_swap_status_details(swap_data) {
bob_explorer = 'https://www.kmd.host/tx/'
} else if(data.bob == 'BTC') {
bob_explorer = 'https://www.blocktrail.com/BTC/tx/'
+ } else if(data.bob == 'ZEC') {
+ bob_explorer = 'https://zchain.online/tx/'
+ } else if(data.bob == 'LTC') {
+ bob_explorer = 'https://bchain.info/LTC/tx/'
+ } else if(data.bob = 'HUSH') {
+ bob_explorer = 'https://explorer.myhush.org/tx/'
}
var alice_explorer = '';
@@ -4411,6 +4592,12 @@ function check_swap_status_details(swap_data) {
alice_explorer = 'https://www.kmd.host/tx/'
} else if(data.alice == 'BTC') {
alice_explorer = 'https://www.blocktrail.com/BTC/tx/'
+ } else if(data.alice == 'ZEC') {
+ alice_explorer = 'https://zchain.online/tx/'
+ } else if(data.alice == 'LTC') {
+ alice_explorer = 'https://bchain.info/LTC/tx/'
+ } else if(data.alice = 'HUSH') {
+ alice_explorer = 'https://explorer.myhush.org/tx/'
}
var time = new Date( data.expiration *1000);
@@ -4594,6 +4781,12 @@ function check_swap_status_details(swap_data) {
bob_explorer = 'https://www.kmd.host/tx/'
} else if(data.bob == 'BTC') {
bob_explorer = 'https://www.blocktrail.com/BTC/tx/'
+ } else if(data.bob == 'ZEC') {
+ bob_explorer = 'https://zchain.online/tx/'
+ } else if(data.bob == 'LTC') {
+ bob_explorer = 'https://bchain.info/LTC/tx/'
+ } else if(data.bob = 'HUSH') {
+ bob_explorer = 'https://explorer.myhush.org/tx/'
}
var alice_explorer = '';
@@ -4603,6 +4796,12 @@ function check_swap_status_details(swap_data) {
alice_explorer = 'https://www.kmd.host/tx/'
} else if(data.alice == 'BTC') {
alice_explorer = 'https://www.blocktrail.com/BTC/tx/'
+ } else if(data.alice == 'ZEC') {
+ alice_explorer = 'https://zchain.online/tx/'
+ } else if(data.alice == 'LTC') {
+ alice_explorer = 'https://bchain.info/LTC/tx/'
+ } else if(data.alice = 'HUSH') {
+ alice_explorer = 'https://explorer.myhush.org/tx/'
}
$('.tbl_alicepayment').html(`` + dataforblinker.alicepayment + ` `);
diff --git a/main.js b/main.js
index c8b7849..aa9d9d4 100755
--- a/main.js
+++ b/main.js
@@ -20,7 +20,7 @@ const killmm = require('./ipc/killmm');
const appBasicInfo = {
name: 'BarterDEX-Simple',
- version: '0.6.7-beta'
+ version: '0.6.8-beta'
};
app.setName(appBasicInfo.name);
diff --git a/package.json b/package.json
index 65e1e13..4697c18 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "BarterDEX-Simple",
- "version": "0.6.7-beta",
+ "version": "0.6.8-beta",
"description": "A simple BarterDEX Implimentation with powertools for Traders",
"main": "main.js",
"scripts": {
-