Browse Source

enable voting ui, assets vote2018, ninja

v0.25
pbca26 7 years ago
parent
commit
8781345ab4
  1. 8
      main.js
  2. 12
      routes/electrumjs/electrumServers.js
  3. 3
      routes/ports.js
  4. 6
      routes/shepherd/electrum/network.js
  5. 6
      version
  6. 2
      version_build

8
main.js

@ -280,19 +280,21 @@ function createWindow(status, hideLoadingWindow) {
mainWindow.startKMDNative = shepherd.startKMDNative; mainWindow.startKMDNative = shepherd.startKMDNative;
mainWindow.addressVersionCheck = shepherd.addressVersionCheck; mainWindow.addressVersionCheck = shepherd.addressVersionCheck;
mainWindow.getCoinByPub = shepherd.getCoinByPub; mainWindow.getCoinByPub = shepherd.getCoinByPub;
mainWindow.resetSettings = function() { shepherd.saveLocalAppConf(__defaultAppSettings) }; mainWindow.resetSettings = () => { shepherd.saveLocalAppConf(__defaultAppSettings) };
mainWindow.createSeed = { mainWindow.createSeed = {
triggered: false, triggered: false,
firstLoginPH: null, firstLoginPH: null,
secondaryLoginPH: null, secondaryLoginPH: null,
}; };
for (let i = 0; i < process.argv.length; i++) { mainWindow.nnVoteChain = 'VOTE2018';
/*for (let i = 0; i < process.argv.length; i++) {
if (process.argv[i].indexOf('nvote') > -1) { if (process.argv[i].indexOf('nvote') > -1) {
console.log(`notary node elections chain ${process.argv[i].replace('nvote=', '')}`); console.log(`notary node elections chain ${process.argv[i].replace('nvote=', '')}`);
mainWindow.nnVoteChain = process.argv[i].replace('nvote=', ''); mainWindow.nnVoteChain = process.argv[i].replace('nvote=', '');
} }
} }*/
} else { } else {
mainWindow = new BrowserWindow({ mainWindow = new BrowserWindow({
width: 500, width: 500,

12
routes/electrumjs/electrumServers.js

@ -180,17 +180,25 @@ let electrumServers = {
'electrum2.cipig.net:10024' 'electrum2.cipig.net:10024'
], ],
}, },
vote: { // !estimatefee vote2018: { // !estimatefee
address: 'electrum1.cipig.net', address: 'electrum1.cipig.net',
port: 10021, port: 10021,
proto: 'tcp', proto: 'tcp',
txfee: 10000, txfee: 10000,
abbr: 'VOTE', abbr: 'VOTE2018',
serverList: [ serverList: [
'electrum1.cipig.net:10021', 'electrum1.cipig.net:10021',
'electrum2.cipig.net:10021' 'electrum2.cipig.net:10021'
], ],
}, },
ninja: { // !estimatefee
address: 'electrum.fund.ninja',
port: 50001,
proto: 'tcp',
txfee: 10000,
abbr: 'NINJA',
serverList: 'none',
},
jumblr: { // !estimatefee jumblr: { // !estimatefee
address: 'electrum1.cipig.net', address: 'electrum1.cipig.net',
port: 10004, port: 10004,

3
routes/ports.js

@ -26,7 +26,8 @@ const assetChainPorts = {
'MESH': '9455', 'MESH': '9455',
'AXO': '12927', 'AXO': '12927',
'ETOMIC': '10271', 'ETOMIC': '10271',
'VOTE': '8012', 'VOTE2018': '15488',
'NINJA': '8427',
'BTCH': '8800', 'BTCH': '8800',
}; };

6
routes/shepherd/electrum/network.js

@ -65,7 +65,8 @@ module.exports = (shepherd) => {
coin === 'KMD' || coin === 'KMD' ||
coin === 'BEER' || coin === 'BEER' ||
coin === 'PIZZA' || coin === 'PIZZA' ||
coin === 'VOTE' || coin === 'VOTE2018' ||
coin === 'NINJA' ||
coin === 'KOMODO' || coin === 'KOMODO' ||
coinUC === 'SUPERNET' || coinUC === 'SUPERNET' ||
coinUC === 'REVS' || coinUC === 'REVS' ||
@ -90,7 +91,8 @@ module.exports = (shepherd) => {
coinUC === 'BTCH' || coinUC === 'BTCH' ||
coinUC === 'BEER' || coinUC === 'BEER' ||
coinUC === 'PIZZA' || coinUC === 'PIZZA' ||
coinUC === 'VOTE' || coinUC === 'VOTE2018' ||
coinUC === 'NINJA' ||
coinUC === 'KMD' || coinUC === 'KMD' ||
coinUC === 'KOMODO') { coinUC === 'KOMODO') {
return shepherd.electrumJSNetworks.komodo; return shepherd.electrumJSNetworks.komodo;

6
version

@ -1,3 +1,3 @@
version=0.2.0.29c version=0.2.0.30a
type=c-beta type=a-beta
minversion=0.2.0.29 minversion=0.2.0.30

2
version_build

@ -1 +1 @@
0.2.0.29c-beta 0.2.0.30a-beta
Loading…
Cancel
Save