Browse Source

spv wrong wif format login/export error

pkg_automation_electrum
pbca26 7 years ago
parent
commit
dc15cd70d1
  1. 19
      routes/shepherd/electrum/auth.js
  2. 16
      routes/shepherd/electrum/keys.js

19
routes/shepherd/electrum/auth.js

@ -3,6 +3,8 @@ const bitcoinZcash = require('bitcoinjs-lib-zcash');
module.exports = (shepherd) => {
shepherd.post('/electrum/login', (req, res, next) => {
let _wifError = false;
for (let key in shepherd.electrumServers) {
const _abbr = shepherd.electrumServers[key].abbr;
const _seed = req.body.seed;
@ -15,11 +17,16 @@ module.exports = (shepherd) => {
} catch (e) {}
if (isWif) {
let key = shepherd.isZcash(_abbr.toLowerCase()) ? bitcoinZcash.ECPair.fromWIF(_seed, shepherd.getNetworkData(_abbr.toLowerCase()), true) : shepherd.bitcoinJS.ECPair.fromWIF(_seed, shepherd.getNetworkData(_abbr.toLowerCase()), true);
keys = {
priv: key.toWIF(),
pub: key.getAddress(),
};
try {
let key = shepherd.isZcash(_abbr.toLowerCase()) ? bitcoinZcash.ECPair.fromWIF(_seed, shepherd.getNetworkData(_abbr.toLowerCase()), true) : shepherd.bitcoinJS.ECPair.fromWIF(_seed, shepherd.getNetworkData(_abbr.toLowerCase()), true);
keys = {
priv: key.toWIF(),
pub: key.getAddress(),
};
} catch (e) {
_wifError = true;
break;
}
} else {
keys = shepherd.seedToWif(_seed, shepherd.findNetworkObj(_abbr), req.body.iguana);
}
@ -35,7 +42,7 @@ module.exports = (shepherd) => {
// shepherd.log(JSON.stringify(shepherd.electrumKeys, null, '\t'), true);
const successObj = {
msg: 'success',
msg: _wifError ? 'error' : 'success',
result: 'true',
};

16
routes/shepherd/electrum/keys.js

@ -73,6 +73,7 @@ module.exports = (shepherd) => {
let _totalKeys = 0;
let _electrumKeys = {};
let _seed = req.body.seed;
let _wifError = false;
for (let key in shepherd.electrumServers) {
const _abbr = shepherd.electrumServers[key].abbr;
@ -86,9 +87,14 @@ module.exports = (shepherd) => {
} catch (e) {}
if (isWif) {
let key = shepherd.isZcash(_abbr.toLowerCase()) ? bitcoinZcash.ECPair.fromWIF(_seed, shepherd.getNetworkData(_abbr.toLowerCase()), true) : shepherd.bitcoinJS.ECPair.fromWIF(_seed, shepherd.getNetworkData(_abbr.toLowerCase()), true);
priv = key.toWIF();
pub = key.getAddress();
try {
let key = shepherd.isZcash(_abbr.toLowerCase()) ? bitcoinZcash.ECPair.fromWIF(_seed, shepherd.getNetworkData(_abbr.toLowerCase()), true) : shepherd.bitcoinJS.ECPair.fromWIF(_seed, shepherd.getNetworkData(_abbr.toLowerCase()), true);
priv = key.toWIF();
pub = key.getAddress();
} catch (e) {
_wifError = true;
break;
}
} else {
let _keys = shepherd.seedToWif(_seed, shepherd.findNetworkObj(_abbr), req.body.iguana);
priv = _keys.priv;
@ -115,8 +121,8 @@ module.exports = (shepherd) => {
}
const successObj = {
msg: 'success',
result: _matchingKeyPairs === _totalKeys ? _electrumKeys : false,
msg: _wifError ? 'error' : 'success',
result: _wifError ? false : (_matchingKeyPairs === _totalKeys ? _electrumKeys : false),
};
res.end(JSON.stringify(successObj));

Loading…
Cancel
Save