anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Change Seed to Recovery Phrase, and more. (#4201)

Browse source 
* Seed -> Recovery Phrase ; Passphrase -> Password ; Password -> Spending Password

* More Spending Password
This commit is contained in:
Kirvx 2016-05-09 20:23:20 +02:00 • committed by Gustavo Maximiliano Cortez
commit aee30ec151
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
16 changed files with 68 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

26
public/views/backup.html
View file

@ -32,15 +32,15 @@
<div ng-show="wordsC.step == 1">
<div ng-show="wordsC.mnemonicWords || (wordsC.credentialsEncrypted && !wordsC.deleted)" class="row">
<h5 class="text-center" translate>Write your wallet seed</h5>
<h5 class="text-center" translate>Write your wallet recovery phrase</h5>
<div class="size-14 text-gray columns" ng-show="(index.n>1 && index.m != index.n )">
<span translate>
To restore this {{index.m}}-{{index.n}} <b>shared</b> wallet you will need
</span>:
<ol class="m10t columns size-14 text-gray">
<li translate>Your wallet seed and access to the server that coordinated the initial wallet creation. You still need {{index.m}} keys to spend.</li>
<li translate><b>OR</b> the wallet seed of <b>all</b> copayers in the wallet</li>
<li translate><b>OR</b> 1 wallet export file and the remaining quorum of wallet seeds (e.g. in a 3-5 wallet: 1 wallet export file + 2 wallet seeds of any of the other copayers).</li>
<li translate>Your wallet recovery phrase and access to the server that coordinated the initial wallet creation. You still need {{index.m}} keys to spend.</li>
<li translate><b>OR</b> the wallet recovery phrase of <b>all</b> copayers in the wallet</li>
<li translate><b>OR</b> 1 wallet export file and the remaining quorum of wallet recovery phrases (e.g. in a 3-5 wallet: 1 wallet export file + 2 wallet recovery phrases of any of the other copayers).</li>
</ol>
</span>
</div>
@ -49,8 +49,8 @@
To restore this {{index.m}}-{{index.n}} <b>shared</b> wallet you will need
</span>:
<ol class="m10t columns size-14 text-gray">
<li translate>Your wallet seed and access to the server that coordinated the initial wallet creation. You still need {{index.m}} keys to spend.</li>
<li translate><b>OR</b> the wallet seeds of <b>all</b> copayers in the wallet</li>
<li translate>Your wallet recovery phrase and access to the server that coordinated the initial wallet creation. You still need {{index.m}} keys to spend.</li>
<li translate><b>OR</b> the wallet recovery phrases of <b>all</b> copayers in the wallet</li>
</ol>
</span>
</div>
@ -58,21 +58,21 @@
<div class="row m20t" ng-show="wordsC.deleted">
<div class="columns size-14 text-gray text-center" translate>
Wallet seed not available. You can still export it from Advanced &gt; Export.
Wallet recovery phrase not available. You can still export it from Advanced &gt; Export.
</div>
</div>
<div ng-show="wordsC.mnemonicWords || (wordsC.credentialsEncrypted && !wordsC.deleted)">
<p class="text-center columns text-gray" ng-show="index.n==1 && wordsC.step == 1">
<span translate>
You need the wallet seed to restore this personal wallet. Write it down and keep them somewhere safe.
You need the wallet recovery phrase to restore this personal wallet. Write it down and keep them somewhere safe.
</span>
</p>
<div class="row" ng-show="wordsC.credentialsEncrypted">
<div class="m10t columns">
<a class="button outline light-gray expand tiny" ng-click="wordsC.toggle()">
<i class="fi-widget m3r"></i>
<span translate ng-hide="wordsC.show">Show Wallet Seed</span>
<span translate ng-hide="wordsC.show">Show Wallet Recovery Phrase</span>
</a>
</div>
</div>
@ -89,7 +89,7 @@
<div class="line-t p10 size-10 text-gray text-center" ng-show="wordsC.mnemonicHasPassphrase">
<i class="fi-alert"></i>
<span translate>
This seed was created with a passphrase. To recover this wallet both the mnemonic and passphrase are needed.
This recovery phrase was created with a password. To recover this wallet both the recovery phrase and password are needed.
</span>
</div>
</div>
@ -112,7 +112,7 @@
<div ng-show="wordsC.step == 2">
<div class="columns text-center extra-padding-bottom">
<h5 translate>Confirm your wallet seed</h5>
<h5 translate>Confirm your wallet recovery phrase</h5>
<p class="text-gray m0" translate>
Please tap the words in order to confirm your backup phrase is correctly written.
</p>
@ -144,9 +144,9 @@
<div ng-show="wordsC.step == 3">
<div class="columns text-center">
<h5 translate>Enter your passphrase</h5>
<h5 translate>Enter your password</h5>
<p class="text-gray m0" translate>
In order to verify your wallet backup, please type your passphrase:
In order to verify your wallet backup, please type your password:
</p>
<div class="m20v">
<input type="text" id="passphrase" ng-model="passphrase" autocapitalize="off" spellcheck="false" autofocus/>

12
public/views/create.html
View file

@ -108,7 +108,7 @@
</div>
<div>
<label><span translate>Wallet Seed</span>
<label><span translate>Wallet Recovery Phrase</span>
<select class="m10t" ng-model="seedSource"
ng-options="seed as seed.label for seed in create.seedOptions"
ng-change="create.setSeedSource()">
@ -126,13 +126,13 @@
<span class="text-warning size-14">
<i class="fi-alert"></i>
<span translate>
WARNING: Passphrase cannot be recovered. <b>Be sure to write it down</b>. The wallet can not be restored without the passphrase.
WARNING: The password cannot be recovered. <b>Be sure to write it down</b>. The wallet can not be restored without the password.
</span>
</span>
</div>
<div ng-show="create.seedSourceId=='new' ">
<label for="createPassphrase" ><span translate>Add a Seed Passphrase</span> <small translate>Add an optional passphrase to secure the seed</small>
<label for="createPassphrase" ><span translate>Add a Password</span> <small translate>Add an optional password to secure the recovery phrase</small>
<div class="input">
<input type="text" class="form-control" autocapitalize="off"
name="createPassphrase" ng-model="createPassphrase">
@ -142,8 +142,8 @@
<div ng-show="create.seedSourceId=='set'">
<label for="ext-master">
<span translate>Wallet Seed</span>
<small translate>Enter the seed words (BIP39)</small>
<span translate>Wallet Recovery Phrase</span>
<small translate>Enter the recovery phrase (BIP39)</small>
<input id="ext-master"
autocapitalize="off"
type="text"
@ -152,7 +152,7 @@
</div>
<div ng-show="create.seedSourceId=='set'">
<label for="passphrase"> <span translate>Seed Passphrase</span> <small translate>The seed could require a passphrase to be imported</small>
<label for="passphrase"> <span translate>Password</span> <small translate>The recovery phrase could require a password to be imported</small>
<div class="input">
<input type="text" autocapitalize="off" class="form-control" name="passphrase" ng-model="passphrase">
</div>

6
public/views/export.html
View file

@ -27,14 +27,14 @@
<form>
<div class="row">
<div class="columns">
<label for="password" translate>Set up an Export Password </label>
<label for="password" translate>Set up a Spending Password </label>
<div class="input">
<input type="password" class="form-control"
placeholder="{{'Your export password'|translate}}"
placeholder="{{'Your spending password'|translate}}"
name="password" ng-model="exportC.password">
</div>
<label for="password" translate>Repeat password</label>
<label for="password" translate>Repeat the spending password</label>
<div class="input">
<input type="password" class="form-control"
placeholder="{{'Repeat password'|translate}}"

14
public/views/import.html
View file

@ -33,7 +33,7 @@
<div class="create-tab pr small-only-text-center" ng-hide="create.hideTabs">
<div class="row">
<div class="tab-container small-4 medium-4 large-4" ng-class="{'selected': type =='12'}">
<a href ng-click="import.setType('12')" translate>Wallet Seed</a>
<a href ng-click="import.setType('12')" translate>Wallet Recovery Phrase</a>
</div>
<div class="tab-container small-4 medium-4 large-4" ng-class="{'selected': type=='file'}">
<a href ng-click="import.setType('file')" translate>File/Text Backup</a>
@ -55,7 +55,7 @@
<div >
<label for="words">
<span translate>Type the Seed Phrase (usually 12 words)</span>:
<span translate>Type the Recovery Phrase (usually 12 words)</span>:
</label>
<textarea class="form-control" name="words" ng-model="import.words" rows="2" autocapitalize="off" spellcheck="false"></textarea>
</div>
@ -72,9 +72,9 @@
<div ng-hide="hideAdv" class="row">
<div class="large-12 columns">
<label for="passphrase" class="oh"><span translate>Passphrase</span> <small translate>Wallet Seed could require a passphrase to be imported</small>
<label for="passphrase" class="oh"><span translate>Password</span> <small translate>The Wallet Recovery Phrase could require a password to be imported</small>
<div class="input">
<input type="password" class="form-control" placeholder="{{'Seed passphrase'|translate}}"
<input type="password" class="form-control" placeholder="{{'Password'|translate}}"
name="passphrase" ng-model="import.passphrase">
</div>
</label>
@ -124,10 +124,10 @@
<textarea class="form-control" name="backupText" ng-model="import.backupText" rows="5"></textarea>
</div>
<label for="password"><span translate>Password</span>
<label for="password"><span translate>Spending Password</span>
</label>
<div class="input">
<input type="password" class="form-control" placeholder="{{'Your backup password'|translate}}"
<input type="password" class="form-control" placeholder="{{'Your spending password'|translate}}"
name="password" ng-model="import.password">
</div>
@ -181,7 +181,7 @@
</div>
<div ng-show="import.seedOptions[0]">
<div>
<label><span translate>Wallet Seed</span>
<label><span translate>Wallet Recovery Phrase</span>
<select class="m10t" ng-model="seedSource"
ng-options="seed as seed.label for seed in import.seedOptions"
ng-change="import.setSeedSource()">

4
public/views/importLegacy.html
View file

@ -38,8 +38,8 @@
</label>
<label for="password">
<span translate>Password</span>
<input type="password" class="form-control" placeholder="{{'Your profile password'|translate}}"
<span translate>Spending Password</span>
<input type="password" class="form-control" placeholder="{{'Your profile spending password'|translate}}"
name="password" ng-model="importLegacy.password" required>
</label>

10
public/views/includes/password.html
View file

@ -7,15 +7,15 @@
>
<div class="columns m20t">
<label class="size-14 text-center" for="password" ng-if="index.askPassword.isSetup">
<span ng-show="!pass.isVerification" translate>Set up a password</span>
<span ng-show="pass.isVerification" translate>Repeat password</span>
<span ng-show="!pass.isVerification" translate>Set up a spending password</span>
<span ng-show="pass.isVerification" translate>Repeat the spending password</span>
</label>
<label class="size-14 text-center" for="password" ng-if="!index.askPassword.isSetup">
<span translate>Enter your password</span>
<span translate>Enter your spending password</span>
</label>
<div class="input m20t">
<input type="password" placeholder="{{'Your password'|translate}}"
<input type="password" placeholder="{{'Your spending password'|translate}}"
id="passwordInput" name="password" ng-model="password">
</div>
</div>
@ -42,7 +42,7 @@
<p class="text-warning size-12 columns m20t text-center" ng-show="index.askPassword.isSetup">
<i class="fi-alert"></i>
<span translate ng-show="!pass.error"> Your wallet key will be encrypted. Password cannot be recovered. Be sure to write it down</span>
<span translate ng-show="!pass.error"> Your wallet key will be encrypted. The Spending Password cannot be recovered. Be sure to write it down</span>
<span ng-show="pass.error">{{pass.error|translate}}</span>
</p>

12
public/views/join.html
View file

@ -90,7 +90,7 @@
</div>
<div>
<label><span translate>Wallet Seed</span>
<label><span translate>Wallet Recovery Phrase</span>
<select class="m10t" ng-model="seedSource"
ng-options="seed as seed.label for seed in join.seedOptions"
ng-change="join.setSeedSource()">
@ -108,13 +108,13 @@
<span class="text-warning size-14">
<i class="fi-alert"></i>
<span translate>
WARNING: Passphrase cannot be recovered. <b>Be sure to write it down</b>. The wallet can not be restored without the passphrase.
WARNING: The password cannot be recovered. <b>Be sure to write it down</b>. The wallet can not be restored without the password.
</span>
</span>
</div>
<div ng-show="join.seedSourceId=='new' ">
<label for="createPassphrase" ><span translate>Add a Seed Passphrase</span> <small translate>Add an optional passphrase to secure the seed</small>
<label for="createPassphrase" ><span translate>Add a Password</span> <small translate>Add an optional password to secure the recovery phrase</small>
<div class="input">
<input type="text" class="form-control" autocapitalize="off"
name="createPassphrase" ng-model="createPassphrase">
@ -124,8 +124,8 @@
<div ng-show="join.seedSourceId=='set'">
<label for="ext-master">
<span translate>Wallet Seed</span>
<small translate>Enter the seed words (BIP39)</small>
<span translate>Wallet Recovery Phrase</span>
<small translate>Enter the recovery phrase (BIP39)</small>
<input id="ext-master"
autocapitalize="off"
type="text"
@ -134,7 +134,7 @@
</div>
<div ng-show="join.seedSourceId=='set'">
<label for="passphrase"> <span translate>Seed Passphrase</span> <small translate>The seed could require a passphrase to be imported</small>
<label for="passphrase"> <span translate>Password</span> <small translate>The recovery phrase could require a password to be imported</small>
<div class="input">
<input type="text" autocapitalize="off" class="form-control" name="passphrase" ng-model="passphrase">
</div>

2
public/views/paperWallet.html
View file

@ -33,7 +33,7 @@
</div>
<div ng-show="paperWallet.isPkEncrypted">
<label for="passphrase">
<span translate>Passphrase</span>
<span translate>Password</span>
</label>
<input id="passphrase" type="password" name="passphrase" placeholder="{{'Passphrase'|translate}}" ng-model="passphrase">
<p ng-show="index.isCordova" translate class="size-12 text-gray">

4
public/views/preferences.html
View file

@ -72,7 +72,7 @@
<li>
<switch id="network-name" name="encrypt" ng-model="encrypt" class="green right"></switch>
<div translate>Request Password</div>
<div translate>Request Spending Password</div>
</li>
<li ng-show="preferences.touchidAvailable">
@ -87,7 +87,7 @@
<ul class="no-bullet m0">
<li ng-click="$root.go('deleteWords')">
<i class="icon-arrow-right3 size-24 right text-gray"></i>
<div translate>Delete seed words</div>
<div translate>Delete recovery phrase</div>
</li>
</ul>

8
public/views/preferencesDeleteWords.html
View file

@ -1,7 +1,7 @@
<div
class="topbar-container"
ng-include="'views/includes/topbar.html'"
ng-init="titleSection='Delete Seed Words'; goBackToState = 'preferences'">
ng-init="titleSection='Delete Recovery Phrase'; goBackToState = 'preferences'">
</div>
@ -13,7 +13,7 @@
{{preferences.error|translate}}
</div>
<div class="text-warning size-18 m10b" translate>Warning!</div>
<div class="m20b" ng-show="!index.needsBackup" translate>Once you have copied your wallet seed down, it is recommended to delete it from this device.</div>
<div class="m20b" ng-show="!index.needsBackup" translate>Once you have copied your wallet recovery phrase down, it is recommended to delete it from this device.</div>
<div class="m20b" ng-show="index.needsBackup" translate>Need to do backup</div>
</div>
<ul class="no-bullet m0" ng-show="!index.needsBackup">
@ -21,14 +21,14 @@
<div class="right" ng-style="{'color':index.backgroundColor}">
{{index.walletName}} <span ng-show="index.alias">({{index.alias}})</span>
</div>
<div translate>Delete words</div>
<div translate>Delete Recovery Phrase</div>
</li>
</ul>
</div>
<div class="row m20t" ng-show="preferences.deleted">
<div class="columns size-14 text-gray text-center" translate>
Wallet seed not available. You can still export it from Advanced &gt; Export.
Wallet recovery phrase not available. You can still export it from Advanced &gt; Export.
</div>
</div>

6
src/js/controllers/create.js
View file

@ -44,10 +44,10 @@ angular.module('copayApp.controllers').controller('createController',
self.seedOptions = [{
id: 'new',
label: gettext('New Random Seed'),
label: gettext('New Random Recovery Phrase'),
}, {
id: 'set',
label: gettext('Specify Seed...'),
label: gettext('Specify Recovery Phrase...'),
}];
$scope.seedSource = self.seedOptions[0];
@ -123,7 +123,7 @@ angular.module('copayApp.controllers').controller('createController',
}
if (setSeed && !opts.mnemonic && !opts.extendedPrivateKey) {
this.error = gettext('Please enter the wallet seed');
this.error = gettext('Please enter the wallet recovery phrase');
return;
}

6
src/js/controllers/import.js
View file

@ -51,7 +51,7 @@ angular.module('copayApp.controllers').controller('importController',
try {
str2 = sjcl.decrypt(self.password, str);
} catch (e) {
err = gettext('Could not decrypt file, check your password');
err = gettext('Could not decrypt file, check your spending password');
$log.warn(e);
};
@ -190,14 +190,14 @@ angular.module('copayApp.controllers').controller('importController',
this.error = null;
if (!words) {
this.error = gettext('Please enter the seed words');
this.error = gettext('Please enter the recovery phrase');
} else if (words.indexOf('xprv') == 0 || words.indexOf('tprv') == 0) {
return _importExtendedPrivateKey(words, opts);
} else {
var wordList = words.split(/[\u3000\s]+/);
if ((wordList.length % 3) != 0)
this.error = gettext('Wrong number of seed words:') + wordList.length;
this.error = gettext('Wrong number of recovery words:') + wordList.length;
}
if (this.error) {

6
src/js/controllers/join.js
View file

@ -19,10 +19,10 @@ angular.module('copayApp.controllers').controller('joinController',
var updateSeedSourceSelect = function() {
self.seedOptions = [{
id: 'new',
label: gettext('New Random Seed'),
label: gettext('New Random Recovery Phrase'),
}, {
id: 'set',
label: gettext('Specify Seed...'),
label: gettext('Specify Recovery Phrase...'),
}];
$scope.seedSource = self.seedOptions[0];
@ -85,7 +85,7 @@ angular.module('copayApp.controllers').controller('joinController',
}
if (setSeed && !opts.mnemonic && !opts.extendedPrivateKey) {
this.error = gettext('Please enter the wallet seed');
this.error = gettext('Please enter the wallet recovery phrase');
return;
}

4
src/js/controllers/password.js
View file

@ -10,7 +10,7 @@ angular.module('copayApp.controllers').controller('passwordController',
document.getElementById("passwordInput").focus();
this.close = function(cb) {
return cb('No password given');
return cb('No spending password given');
};
this.set = function(isSetup, cb) {
@ -30,7 +30,7 @@ angular.module('copayApp.controllers').controller('passwordController',
}
if (isSetup && pass1 != $scope.password) {
self.loading = false;
self.error = gettext('Passwords do not match');
self.error = gettext('Spending Passwords do not match');
self.isVerification = false;
$scope.password = null;
pass1 = null;

4
src/js/services/bwsError.js
View file

@ -23,10 +23,10 @@ angular.module('copayApp.services')
if (name) {
switch (name) {
case 'INVALID_BACKUP':
body = gettextCatalog.getString('Wallet seed is invalid');
body = gettextCatalog.getString('Wallet Recovery Phrase is invalid');
break;
case 'WALLET_DOES_NOT_EXIST':
body = gettextCatalog.getString('Wallet not registered at the wallet service. Recreate it from "Create Wallet" using "Advanced Options" to set your seed');
body = gettextCatalog.getString('Wallet not registered at the wallet service. Recreate it from "Create Wallet" using "Advanced Options" to set your recovery phrase');
break;
case 'MISSING_PRIVATE_KEY':
body = gettextCatalog.getString('Missing private keys to sign');

12
src/js/services/profileService.js
View file

@ -227,7 +227,7 @@ angular.module('copayApp.services')
} catch (ex) {
$log.info(ex);
return cb(gettext('Could not create: Invalid wallet seed'));
return cb(gettext('Could not create: Invalid wallet recovery phrase'));
}
} else if (opts.extendedPrivateKey) {
try {
@ -256,9 +256,9 @@ angular.module('copayApp.services')
account: 0,
});
} catch (e) {
$log.info('Error creating seed: ' + e.message);
$log.info('Error creating recovery phrase: ' + e.message);
if (e.message.indexOf('language') > 0) {
$log.info('Using default language for mnemonic');
$log.info('Using default language for recovery phrase');
walletClient.seedFromRandomWithMnemonic({
network: network,
passphrase: opts.passphrase,
@ -471,7 +471,7 @@ angular.module('copayApp.services')
password: opts.password
});
} catch (err) {
return cb(gettext('Could not import. Check input file and password'));
return cb(gettext('Could not import. Check input file and spending password'));
}
str = JSON.parse(str);
@ -682,13 +682,13 @@ angular.module('copayApp.services')
return cb(err2);
if (!password)
return cb(gettext('Password needed'));
return cb(gettext('Spending Password needed'));
try {
fc.unlock(password);
} catch (e) {
$log.warn('Error decrypting wallet:', e);
return cb(gettext('Wrong password'));
return cb(gettext('Wrong spending password'));
}
return cb();
});