Browse Source

spv < v0.23 seed compatibility argv

v0.25
pbca26 7 years ago
parent
commit
130fd5a948
  1. 4
      main.js
  2. 4
      routes/shepherd/electrum/keys.js

4
main.js

@ -478,7 +478,7 @@ function createWindow(status) {
let _appClosingInterval; let _appClosingInterval;
shepherd.killRogueProcess('marketmaker'); // shepherd.killRogueProcess('marketmaker');
if (!Object.keys(shepherd.coindInstanceRegistry).length || if (!Object.keys(shepherd.coindInstanceRegistry).length ||
!appConfig.stopNativeDaemonsOnQuit) { !appConfig.stopNativeDaemonsOnQuit) {
closeApp(); closeApp();
@ -514,7 +514,7 @@ app.on('window-all-closed', function() {
// Calling event.preventDefault() will prevent the default behaviour, which is terminating the application. // Calling event.preventDefault() will prevent the default behaviour, which is terminating the application.
app.on('before-quit', function(event) { app.on('before-quit', function(event) {
shepherd.log('before-quit'); shepherd.log('before-quit');
shepherd.killRogueProcess('marketmaker'); // shepherd.killRogueProcess('marketmaker');
/*if (!forceQuitApp && /*if (!forceQuitApp &&
mainWindow === null && mainWindow === null &&

4
routes/shepherd/electrum/keys.js

@ -1,10 +1,10 @@
const sha256 = require('js-sha256'); const sha256 = require('js-sha256');
module.exports = (shepherd) => { module.exports = (shepherd) => {
shepherd.seedToWif = (seed, network, iguana, old) => { shepherd.seedToWif = (seed, network, iguana) => {
let bytes; let bytes;
if (old) { if (process.argv.indexOf('spvold=true') > -1) {
bytes = shepherd.sha256(seed, { asBytes: true }); bytes = shepherd.sha256(seed, { asBytes: true });
} else { } else {
const hash = sha256.create().update(seed); const hash = sha256.create().update(seed);

Loading…
Cancel
Save