fix account indexes, add base path in settings
This commit is contained in:
parent
5abf35c68c
commit
791efca714
11 changed files with 162 additions and 74 deletions
46
src/js/services/derivationPathHelper.js
Normal file
46
src/js/services/derivationPathHelper.js
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
'use strict';
|
||||
|
||||
angular.module('copayApp.services').factory('derivationPathHelper', function(lodash) {
|
||||
var root = {};
|
||||
|
||||
root.default = "m/44'/0'/0'"
|
||||
root.parse = function(str) {
|
||||
var arr = str.split('/');
|
||||
|
||||
var ret = {};
|
||||
|
||||
if (arr[0] != 'm')
|
||||
return false;
|
||||
|
||||
switch (arr[1]) {
|
||||
case "44'":
|
||||
ret.derivationStrategy = 'BIP44';
|
||||
break;
|
||||
case "48'":
|
||||
ret.derivationStrategy = 'BIP48';
|
||||
break;
|
||||
default:
|
||||
return false;
|
||||
};
|
||||
|
||||
switch (arr[2]) {
|
||||
case "0'":
|
||||
ret.networkName = 'livenet';
|
||||
break;
|
||||
case "1'":
|
||||
ret.networkName = 'testnet';
|
||||
break;
|
||||
default:
|
||||
return false;
|
||||
};
|
||||
|
||||
var match = arr[3].match(/(\d+)'/);
|
||||
if (!match)
|
||||
return false;
|
||||
ret.account = + match[1]
|
||||
|
||||
return ret;
|
||||
};
|
||||
|
||||
return root;
|
||||
});
|
||||
|
|
@ -13,7 +13,7 @@ angular.module('copayApp.services')
|
|||
root._err = function(data) {
|
||||
var msg = 'Hardware Wallet Error: ' + (data.error || data.message || 'unknown');
|
||||
$log.warn(msg);
|
||||
return JSON.parse(JSON.stringify(msg));
|
||||
return msg;
|
||||
};
|
||||
|
||||
root.getAddressPath = function(isMultisig, account) {
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@ angular.module('copayApp.services')
|
|||
|
||||
|
||||
root.getInfoForNewWallet = function(isMultisig, account, callback) {
|
||||
account = account - 1;
|
||||
var opts = {};
|
||||
root.getEntropySource(isMultisig, account, function(err, data) {
|
||||
if (err) return callback(err);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue