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

latest linux mm, BLK and BTG added, confpath bug fix

This commit is contained in:
satindergrewal 2017-12-16 17:06:38 +13:00
parent f29f071b1e
commit 1cd6ed20c5
5 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/bin/linux64/marketmaker
View File

Binary file not shown.

2
assets/coins.json
View File

File diff suppressed because one or more lines are too long

8
gui/js/coin_names.js
View File

@ -19,6 +19,14 @@ function return_coin_details(coin) {
coin_details.name = 'Bitcoin Cash';
coin_details.explorer = 'https://blockchair.com/bitcoin-cash/transaction/';
break;
case 'BLK':
coin_details.name = 'BlackCoin';
coin_details.explorer = 'https://chainz.cryptoid.info/blk//tx.dws?';
break;
case 'BTG':
coin_details.name = 'Bitcoin Gold';
coin_details.explorer = 'https://btgexp.com/tx/';
break;
case 'MNZ':
coin_details.name = 'Monaize';
coin_details.explorer = 'https://www.mnzexplorer.com/tx/';

1
gui/js/coin_select_options.js
View File

@ -16,6 +16,7 @@ coin_select_options = `<optgroup label="Crytpo Coins">
<option data-content="<img src='img/cryptologo/btx.png' width='30px'/> Bitcore (BTX)" data-tokens="Bitcore BTX">BTX</option>
<option data-content="<img src='img/cryptologo/btcz.png' width='30px'/> BitcoinZ (BTCZ)" data-tokens="BitcoinZ BTCZ">BTCZ</option>
<option data-content="<img src='img/cryptologo/bsd.png' width='30px'/> BitSend (BSD)" data-tokens="BitSend BSD">BSD</option>
<option data-content="<img src='img/cryptologo/btg.png' width='30px'/> Bitcoin Gold (BTG)" data-tokens="Bitcoin Gold BTG">BTG</option>
<option data-content="<img src='img/cryptologo/blk.png' width='30px'/> BlackCoin (BLK)" data-tokens="BlackCoin BLK">BLK</option>
<option data-content="<img src='img/cryptologo/block.png' width='30px'/> Blocknet (BLOCK)" data-tokens="Blocknet BLOCK">BLK</option>

37
ipc/shepherd-ipc.js
View File

@ -223,14 +223,16 @@ StartMarketMaker = function(data) {
fs.pathExists(_coinsListFile, (err, exists) => {
if (exists === true) {
console.log('file exist');
data.coinslist = fs.readJsonSync(_coinsListFile, { throws: false });
var coinslist_filedata = fs.readJsonSync(_coinsListFile, { throws: false });
data.coinslist = ProcessCoinsList(coinslist_filedata);
ExecMarketMaker(data);
} else if (exists === false) {
console.log('file doesn\'t exist');
fs.copy(defaultCoinsListFile, _coinsListFile)
.then(() => {
console.log('file copied!')
data.coinslist = fs.readJsonSync(_coinsListFile, { throws: false });
var coinslist_filedata = fs.readJsonSync(_coinsListFile, { throws: false });
data.coinslist = ProcessCoinsList(coinslist_filedata);
ExecMarketMaker(data);
})
.catch(err => {
@ -293,7 +295,7 @@ ExecMarketMaker = function(data) {
BarterDEXBin = '"'+BarterDEXBin+'"';
params.userhome = process.env.APPDATA;
if (!!params.coins) { // if not undefined and true
delete params.coins; // for Windows we should use coins.json file, and don't pass coins in command line
delete params.coins; // for Windows we should use coins.json file, and don't pass coins in command line
}
//console.log('[Decker] BarterDEXBin = '+BarterDEXBin+', BarterDEXDir = '+BarterDEXDir);
params = JSON.stringify(_customParam);
@ -424,3 +426,32 @@ UpdateBarterDEXSettings = function(settings_data) {
console.error(err);
})
}
function ProcessCoinsList(coins) {
if (os.platform() === 'darwin') {
fixPath();
coins = JSON.stringify(coins);
coins = coins.replace(/USERHOME/g, `${process.env.HOME}/Library/Application Support`);
coins = coins.replace(/\/\./g, '/');
coins = JSON.parse(coins);
return coins;
}
if (os.platform() === 'linux') {
coins = JSON.stringify(coins);
coins = coins.replace(/USERHOME/g, `${process.env.HOME}`);
coins = JSON.parse(coins);
return coins;
}
if (os.platform() === 'win32') {
coins = JSON.stringify(coins);
coins = coins.replace(/USERHOME/g, `${process.env.APPDATA}`);
coins = coins.replace(/\/\./g, '/');
coins = path.normalize(coins);
coins = JSON.parse(coins);
return coins;
}
}