BTCPrivate
/
BarterDEX
mirror of https://github.com/BTCPrivate/BarterDEX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

passphrase API implimented

This commit is contained in:
satindergrewal 2017-12-06 02:20:56 +13:00
parent cea0e54bb7
commit 0d20e611d4
4 changed files with 237 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/bin/osx/marketmaker
View File

Binary file not shown.

2
gui/index.html
View File

@ -68,7 +68,7 @@
<body class="mCustomScrollbar" data-mcs-theme="minimal-dark"> <body class="mCustomScrollbar" data-mcs-theme="minimal-dark">
<!-- LOGIN BODY --> <!-- LOGIN BODY -->
<div class="loginbody"> <div class="loginbody" style="display: none;">
<div class="container"> <div class="container">
<form class="form-signin"> <form class="form-signin">
<h3 class="form-signin-heading" style="text-align: center;">Welcome to BarterDEX</h3> <h3 class="form-signin-heading" style="text-align: center;">Welcome to BarterDEX</h3>

194
gui/js/ipc-actions.js
View File

@ -1,4 +1,24 @@
var CheckMM_Interval = null; var CheckMM_Interval = null;
var CheckDefaultLogin_Interval = null;
$(document).ready(function() {
var mypubkey = sessionStorage.getItem('mm_mypubkey');
if (mypubkey !== '739860d6114f01f8bae9e1132945c4d4523a423d97c3573b84d4caf9cb8f0c78') {
var loginstate = sessionStorage.getItem('mm_loginstate');
if (loginstate == null || loginstate == 'default') {
var shepherdresult = ShepherdIPC({"command":"login","passphrase":"default"});
$('.mainbody').hide();
$('.loginbody').hide();
CheckMM_Interval = setInterval(CheckMMStatus,1000);
$('.loadingbody').fadeIn();
}
} else {
$('.mainbody').hide();
$('.loginbody').fadeIn();
$('.loadingbody').fadeOut();
}
});
// In renderer process (web page). // In renderer process (web page).
const {ipcRenderer} = require('electron') const {ipcRenderer} = require('electron')
@ -73,10 +93,12 @@ $('.dextradeshistory-btn').click(function(e) {
$('.dexlogout-btn').click(function(e) { $('.dexlogout-btn').click(function(e) {
e.preventDefault(); e.preventDefault();
var shepherdresult = ShepherdIPC({"command":"logout"}); //var shepherdresult = ShepherdIPC({"command":"logout"});
$('.mainbody').fadeOut(); $('.mainbody').fadeOut();
$('.loginbody').fadeIn(); $('.loginbody').fadeIn();
LoginWithPassphrase('default','logout');
CheckPortfolioFn(false); CheckPortfolioFn(false);
CheckOrderBookFn(false); CheckOrderBookFn(false);
check_swap_status(false); check_swap_status(false);
@ -86,7 +108,7 @@ $('.dexlogout-btn').click(function(e) {
bot_screen_sellcoin_balance(false); bot_screen_sellcoin_balance(false);
check_coin_balance(false); check_coin_balance(false);
sessionStorage.clear(); //sessionStorage.clear();
}); });
$('.dexdebug-btn').click(function(e) { $('.dexdebug-btn').click(function(e) {
@ -212,11 +234,12 @@ $('.login-genpass-btn').click(function(e){
$('.login-btn').click(function(e) { $('.login-btn').click(function(e) {
e.preventDefault(); e.preventDefault();
var passphrase = $('.loginPassphrase').val(); var passphrase = $('.loginPassphrase').val();
var shepherdresult = ShepherdIPC({"command":"login","passphrase":passphrase}); LoginWithPassphrase(passphrase,'login');
//var shepherdresult = ShepherdIPC({"command":"login","passphrase":passphrase});
$('.loginPassphrase').val(''); $('.loginPassphrase').val('');
$('.mainbody').hide(); $('.mainbody').hide();
$('.loginbody').hide(); $('.loginbody').hide();
CheckMM_Interval = setInterval(CheckMMStatus,1000); //CheckMM_Interval = setInterval(CheckMMStatus,1000);
$('.loadingbody').fadeIn(); $('.loadingbody').fadeIn();
var dexmode = $('.login_mode_options').selectpicker('val'); var dexmode = $('.login_mode_options').selectpicker('val');
@ -407,63 +430,136 @@ CheckMMStatus = function(sig) {
} }
var mmstatus = ShepherdIPC({"command":"mmstatus"}); var mmstatus = ShepherdIPC({"command":"mmstatus"});
if (mmstatus !== 'closed') { if (mmstatus !== 'closed') {
console.log(mmstatus);
clearInterval(CheckMM_Interval);
CheckDefaultLogin_Interval = setInterval(CheckDefaultLogin,1000);
} else {
$('.mainbody').hide();
$('.loginbody').hide();
$('.loadingbody').fadeIn();
}
/*if (mmstatus !== 'closed') {
var userpass = sessionStorage.getItem('mm_userpass');
var mypubkey = sessionStorage.getItem('mm_mypubkey');
console.log('mypubkey: '+mypubkey);
console.log('userpass: '+userpass);
if (mypubkey == '739860d6114f01f8bae9e1132945c4d4523a423d97c3573b84d4caf9cb8f0c78') {
$('.mainbody').hide();
$('.loadingbody').fadeOut();
$('.loginbody').fadeIn();
clearInterval(CheckPortfolio_Interval);
} else {
$('.mainbody').fadeIn(); $('.mainbody').fadeIn();
$('.loginbody').fadeOut(); $('.loginbody').fadeOut();
$('.loadingbody').hide(); $('.loadingbody').hide();
var refresh_data = {"coin":" ", "status": "enable"}; console.log(mypubkey);
//enable_disable_coin(refresh_data);
//get_myprices(); }
//CheckOrderbook_Interval = setInterval(CheckOrderBookFn,3000);
//check_coin_balance_Interval = setInterval(check_coin_balance,3000);
CheckPortfolio_Interval = setInterval(CheckPortfolioFn,60000); CheckPortfolio_Interval = setInterval(CheckPortfolioFn,60000);
CheckPortfolioFn(); CheckPortfolioFn();
//---- dICO App Settings START ----//
//CheckPortfolio_Interval = setInterval(CheckPortfolioFn,60000);
/*selected_coin = {}
selected_coin.coin = _coin;
selected_coin.coin_name = return_coin_name(_coin);
console.log(selected_coin);
sessionStorage.setItem('mm_selectedcoin', JSON.stringify(selected_coin));
$('.screen-portfolio').hide();
$('.screen-coindashboard').hide()
$('.screen-exchange').show();
$('.coin_ticker').html(_coin);
$.each($('.coinexchange[data-coin]'), function(index, value) {
$('.coinexchange[data-coin]').data('coin', _coin);
});
check_coin_balance(false);
CheckOrderBookFn();
CheckOrderbook_Interval = setInterval(CheckOrderBookFn,30000);
check_swap_status_Interval = setInterval(check_swap_status,20000);
check_swap_status();
check_bot_list_Interval = setInterval(check_bot_list, 30000);
check_bot_list();
check_my_prices_Interval = setInterval(check_my_prices, 30000);
check_my_prices();
bot_screen_coin_balance_Interval = setInterval(bot_screen_coin_balance, 30000);
bot_screen_coin_balance();
bot_screen_sellcoin_balance_Interval = setInterval(bot_screen_sellcoin_balance, 30000);
bot_screen_sellcoin_balance();
$('#trading_mode_options_trademanual').trigger('click');
$('#trading_mode_options_tradebot').removeAttr("checked");
$('#trading_mode_options_trademanual').attr('checked','checked');*/
//---- dICO App Settings END ----//
clearInterval(CheckMM_Interval); clearInterval(CheckMM_Interval);
} else { } else {
$('.mainbody').fadeOut(); $('.mainbody').hide();
$('.loginbody').fadeOut(); $('.loginbody').hide();
$('.loadingbody').fadeIn(); $('.loadingbody').fadeIn();
}*/
} }
CheckDefaultLogin = function(sig) {
if (sig == false) {
clearInterval(CheckDefaultLogin_Interval);
} else {
console.log("Checking if it's default login");
} }
var userpass = '1d8b27b21efabcd96571cd56f91a40fb9aa4cc623d273c63bf9223dc6f8cd81f';
var ajax_data = {"userpass":userpass,"method":"portfolio"};
console.log(ajax_data)
var url = "http://127.0.0.1:7783";
$.ajax({
async: true,
data: JSON.stringify(ajax_data),
dataType: 'json',
type: 'POST',
url: url
}).done(function(data) {
// If successful
console.log(data);
if (!data.userpass === false) {
console.log('first marketmaker api call execution after marketmaker started.')
sessionStorage.setItem('mm_usercoins', JSON.stringify(data.coins));
sessionStorage.setItem('mm_userpass', data.userpass);
sessionStorage.setItem('mm_mypubkey', data.mypubkey);
sessionStorage.setItem('mm_loginstate', 'default');
if (data.mypubkey == '739860d6114f01f8bae9e1132945c4d4523a423d97c3573b84d4caf9cb8f0c78') {
$('.mainbody').hide();
$('.loadingbody').fadeOut();
$('.loginbody').fadeIn();
clearInterval(CheckDefaultLogin_Interval);
}
//return
}
}).fail(function(jqXHR, textStatus, errorThrown) {
// If fail
console.log(textStatus + ': ' + errorThrown);
});
}
LoginWithPassphrase = function(login_passphrase,action_mode) {
console.log('Login using passphrase from Login form input');
var userpass = '1d8b27b21efabcd96571cd56f91a40fb9aa4cc623d273c63bf9223dc6f8cd81f';
var ajax_data = {"userpass":userpass,"method":"passphrase","passphrase":login_passphrase,"gui":"simplegui"};
console.log(ajax_data)
var url = "http://127.0.0.1:7783";
$.ajax({
async: true,
data: JSON.stringify(ajax_data),
dataType: 'json',
type: 'POST',
url: url
}).done(function(data) {
// If successful
console.log(data);
sessionStorage.setItem('mm_usercoins', JSON.stringify(data.coins));
sessionStorage.setItem('mm_userpass', data.userpass);
sessionStorage.setItem('mm_mypubkey', data.mypubkey);
if (action_mode == 'login') {
sessionStorage.setItem('mm_loginstate', 'loggedin');
$('.mainbody').fadeIn();
$('.loginbody').fadeOut();
$('.loadingbody').hide();
CheckPortfolio_Interval = setInterval(CheckPortfolioFn,60000);
CheckPortfolioFn();
}
if (action_mode == 'logout') {
sessionStorage.setItem('mm_loginstate', 'loggedout');
$('.mainbody').fadeOut();
$('.loginbody').fadeIn();
$('.loadingbody').hide();
}
}).fail(function(jqXHR, textStatus, errorThrown) {
// If fail
console.log(textStatus + ': ' + errorThrown);
});
}
function BarterDEXSettingsFn() { function BarterDEXSettingsFn() {
var barterDEX_settings = ShepherdIPC({"command":"read_settings"}); var barterDEX_settings = ShepherdIPC({"command":"read_settings"});

9
gui/js/simpledexactions.js
View File

@ -13,6 +13,10 @@ var shell = require('electron').shell;
$(document).ready(function() { $(document).ready(function() {
var mmstatus = ShepherdIPC({"command":"mmstatus"}); var mmstatus = ShepherdIPC({"command":"mmstatus"});
if (mmstatus !== 'closed') { if (mmstatus !== 'closed') {
var mypubkey = sessionStorage.getItem('mm_mypubkey');
if (mypubkey !== '739860d6114f01f8bae9e1132945c4d4523a423d97c3573b84d4caf9cb8f0c78') {
var loginstate = sessionStorage.getItem('mm_loginstate');
if (loginstate == null || loginstate == 'default') {
$('.mainbody').show(); $('.mainbody').show();
$('.loginbody').hide(); $('.loginbody').hide();
CheckPortfolio_Interval = setInterval(CheckPortfolioFn,60000); CheckPortfolio_Interval = setInterval(CheckPortfolioFn,60000);
@ -95,10 +99,13 @@ $(document).ready(function() {
BarterDEXSettingsFn(); BarterDEXSettingsFn();
}
} else {
}
} else { } else {
$('.mainbody').hide(); $('.mainbody').hide();
$('.loginbody').show(); //$('.loginbody').show();
} }
//$('.set_goal_label_portfolio').html($('.sell_coin_p').selectpicker('val')); //$('.set_goal_label_portfolio').html($('.sell_coin_p').selectpicker('val'));
}); });