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

Merge pull request #3171 from matiu/bug/fix-ja-mnemonics 

add normalization of seeds, better JA support
This commit is contained in:
Gustavo Maximiliano Cortez 2015-09-16 09:44:32 -03:00
parent cd449e6384 de77a1f0a1
commit 6b3063793d
8 changed files with 45 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
public/views/backup.html
View File

@ -54,7 +54,7 @@
<div ng-show="wordsC.mnemonicWords">
<div class="row">
<div class="m10t oh" ng-init="show=false">
<div class="m10t columns" ng-init="show=false">
<a class="button outline light-gray expand tiny" ng-click="show=!show">
<i class="fi-widget m3r"></i>
<span translate ng-hide="show" ng-click="wordsC.done()">Show Wallet Seed</span>
@ -66,40 +66,39 @@
</div>
<div class="row" ng-show="show">
<div class="small-centered text-gray large-centered medium-centered large-8 medium-8 small-10 columns size-14" style="padding:0" translate>
Your wallet seed:
<div class="row m10t m10b" ng-show="show">
<div class="small-centered text-gray columns size-14 text-center" translate>
Your Wallet Seed
</div>
</div>
<div class="row enable_text_select" ng-show="show">
<div class="small-centered p10t p10b large-centered medium-centered large-8 medium-8 small-10 columns enable_text_select" style="border:1px solid gray; background:#eee;
">
<span ng-repeat="word in wordsC.mnemonicWords">
{{word}}
</span>
<div class="row" ng-show="show">
<div class="columns">
<div class="p10 enable_text_select" style="background:#eee">
<span ng-repeat="word in wordsC.mnemonicWords"><span style="white-space:nowrap">{{word}}</span><span ng-show="index.defaultLanguageIsoCode == 'ja'">&#x3000;</span> </span>
</div>
</div>
</div>
<div class="box-notification large-centered medium-centered small-centered large-8 medium-8 small-10 columns m10t" ng-show="wordsC.mnemonicHasPassphrase">
<span class="text-warning size-14">
<div class="row m10t m20b" ng-show="show">
<div class="columns" ng-show="wordsC.mnemonicHasPassphrase">
<span class="size-12">
<i class="fi-alert"></i>
<span translate>
WARNING: This seed was created with a passphrase. To recover this wallet both the mnemonic and passphrase are needed.
</span>
</span>
</div>
</div>
<div class="m10 text-center columns">
<div class="m10 size-14 text-gray">
<div class="row" ng-show="show">
<div class="m10t text-center columns">
<div class="size-12 text-gray">
<span translate>
Once you have copy your wallet seed, it is recommended to delete it from this device.
</span>
</div>
<button class="button outline round dark-gray tiny" ng-click="wordsC.delete()">
<button class="button outline m10t round dark-gray tiny" ng-click="wordsC.delete()">
<i class="fi-trash"></i>
<span translate>
DELETE WORDS
@ -110,11 +109,13 @@
<!-- hide this in multisig just to show less text -->
<div class="row m20t" ng-show="index.n==1">
<div class="columns size-14 text-gray">
<span translate>You can safely install your wallet on another device and use it from multiple devices at the same time.</span>
<a href="#" ng-click="$root.openExternalLink('https://github.com/bitpay/copay/blob/master/README.md#copay-backups-and-recovery')" translate>
Learn more about Copay backups
</a>
<div class="columns size-12 text-gray">
<div class="p10t" style="border-top:1px solid #ccc">
<span translate>You can safely install your wallet on another device and use it from multiple devices at the same time.</span>
<a href="#" ng-click="$root.openExternalLink('https://github.com/bitpay/copay/blob/master/README.md#copay-backups-and-recovery')" translate>
Learn more about Copay backups
</a>
</div>
</div>
</div>

4
public/views/modals/paypro.html
View File

@ -34,9 +34,9 @@
<li class="line-b p10 oh">
<span class="text-gray" translate>Certified by</span>:
<span class="right">
<span ng-show="paypro.verified"><i class="fi-lock color-greeni"></i>
<span ng-show="paypro.verified && paypro.chainVerified"><i class="fi-lock color-greeni"></i>
{{paypro.verifyData.caName || paypro.verifyData}}</span>
<span ng-show="!paypro.verified"><i class="fi-unlock color-yellowi"></i> <span translate>Untrusted</span></span>
<span ng-show="!paypro.verified || !paypro.chainVerified"><i class="fi-unlock color-yellowi"></i> <span translate>Unknown Root or Selfsigned Certificate</span></span>
</span>
</li>
<li class="line-b p10 oh" ng-if="paypro.memo">

6
public/views/preferences.html
View File

@ -55,12 +55,6 @@
<span translate>Backup</span>
</li>
<h4 class="title m0">&nbsp;</h4>
<li class="line-b p20" ng-click="$root.go('export')" ng-hide="preferences.externalIndex >= 0">
<i class="icon-arrow-right3 size-24 right text-gray"></i>
<span translate>Export</span>
</li>
<li class="line-b p20" ng-click="$root.go('preferencesAdvanced')">
<i class="icon-arrow-right3 size-24 right text-gray"></i>
<span translate>Advanced</span>

4
public/views/walletHome.html
View File

@ -335,8 +335,8 @@
<div class="input block">
<input class="p45li" type="text" id="domain" name="domain" ng-model="home._paypro.domain" ng-disabled="1">
<i ng-show="home._paypro.verified" class="fi-lock color-greeni"></i>
<i ng-show="!home._paypro.verified" class="fi-unlock color-yellowi"></i>
<i ng-show="home._paypro.verified && home._paypro.chainVerified" class="fi-lock color-greeni"></i>
<i ng-show="!home._paypro.verified || !home._paypro.chainVerified" class="fi-unlock color-yellowi"></i>
</div>
</div>
</div>

1
src/css/main.css
View File

@ -374,6 +374,7 @@ ul.manage li {
.m15 {margin: 15px;}
.m15h {margin: 0 15px;}
.p10t {padding-top: 10px;}
.p10h {padding-right: 10px; padding-left: 10px;}
.p0r {padding-right: 0;}
.p70r {padding-right: 70px;}
.p70l {padding-left: 70px;}

2
src/js/controllers/backup.js
View File

@ -27,7 +27,7 @@ angular.module('copayApp.controllers').controller('wordsController',
var words = fc.getMnemonic();
if (words)
this.mnemonicWords = words.split(' ');
this.mnemonicWords = words.split(/[\u3000\s]+/);
this.mnemonicHasPassphrase = fc.mnemonicHasPassphrase();
});

11
src/js/controllers/import.js
View File

@ -159,18 +159,13 @@ angular.module('copayApp.controllers').controller('importController',
if (!words) {
this.error = gettext('Please enter the seed words');
} else if (words.indexOf(' ') == -1 && words.indexOf('prv') == 1 && words.length > 108) {
} else if (words.indexOf('xprv') == 0 || words.indexOf('tprv') == 0) {
return _importExtendedPrivateKey(words)
} else {
var wordList = words.split(/ /).filter(function(v) {
return v.length > 0;
});
var wordList = words.split(/[\u3000\s]+/);
// m/ allows to enter a custom derivation
if ((wordList.length % 3) != 0 && wordList[0].indexOf('m/') != 0)
if ((wordList.length % 3) != 0)
this.error = gettext('Wrong number of seed words:') + wordList.length;
else
words = wordList.join(' ');
}
if (this.error) {

39
src/js/services/profileService.js
View File

@ -170,15 +170,9 @@ angular.module('copayApp.services')
var walletClient = bwcService.getClient();
var network = opts.networkName || 'livenet';
if (opts.mnemonic && opts.mnemonic.indexOf('m/') == 0) {
var xPrivKey = root._preDerivation(opts.mnemonic, network);
if (!xPrivKey)
return bwsError.cb('Bad derivation', gettext('Could not import'), cb);
opts.mnemonic = null;
opts.extendedPrivateKey = xPrivKey;
}
if (opts.mnemonic) {
try {
opts.mnemonic = root._normalizeMnemonic(opts.mnemonic);
walletClient.seedFromMnemonic(opts.mnemonic, opts.passphrase, network);
} catch (ex) {
$log.info(ex);
@ -327,10 +321,11 @@ angular.module('copayApp.services')
var walletId = walletClient.credentials.walletId;
// check if exist
if (lodash.find(root.profile.credentials, {
var w = lodash.find(root.profile.credentials, {
'walletId': walletId
})) {
return cb(gettext('Wallet already exists'));
});
if (w) {
return cb(gettext('Wallet already in Copay' + ": ") + w.walletName );
}
root.profile.credentials.push(JSON.parse(walletClient.export()));
@ -371,31 +366,19 @@ angular.module('copayApp.services')
};
root._preDerivation = function(words, network) {
var wordList = words.split(/ /).filter(function(v) {
return v.length > 0;
});
var path = wordList.shift();
var walletClient = bwcService.getClient();
$log.info('preDerivation:', path);
walletClient.seedFromMnemonic(wordList.join(' '), null, network);
var k = new bitcore.HDPrivateKey(walletClient.credentials.xPrivKey);
var k2 = k.derive(path);
return k2.toString();
root._normalizeMnemonic = function(words) {
var isJA = words.indexOf('\u3000') > -1;
var wordList = words.split(/[\u3000\s]+/);
return wordList.join(isJA ? '\u3000' : ' ');
};
root.importMnemonic = function(words, opts, cb) {
var walletClient = bwcService.getClient();
if (words.indexOf('m/') == 0) {
var xPrivKey = root._preDerivation(words, opts.networkName);
if (!xPrivKey)
return bwsError.cb('Bad derivation', gettext('Could not import'), cb);
return root.importExtendedPrivateKey(xPrivKey, cb);
}
$log.debug('Importing Wallet Mnemonic');
words = root._normalizeMnemonic(words);
walletClient.importFromMnemonic(words, {
network: opts.networkName,
passphrase: opts.passphrase,