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

check mnemonic strings match

Browse source
This commit is contained in:
Ivan Socolsky 2016-06-09 14:45:28 -03:00
commit fce9ef7f62
No known key found for this signature in database
GPG key ID: FAECE6A05FAA4F56
1 changed files with 22 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/js/controllers/backup.js
View file

@ -140,23 +140,31 @@ angular.module('copayApp.controllers').controller('backupController',
function confirm() { function confirm() {
self.backupError = false; self.backupError = false;
var walletClient = bwcService.getClient(); var customWordList = lodash.pluck(self.customWords, 'word');
var separator = self.useIdeograms ? '\u3000' : ' ';
var customSentence = lodash.pluck(self.customWords, 'word').join(separator);
var passphrase = $scope.passphrase || '';
try { if (!lodash.isEqual(self.mnemonicWords, customWordList)) {
walletClient.seedFromMnemonic(customSentence, { return backupError('Mnemonic string mismatch')
network: fc.credentials.network,
passphrase: passphrase,
account: fc.credentials.account
})
} catch (err) {
return backupError(err);
} }
if (walletClient.credentials.xPrivKey != self.xPrivKey) { if (self.mnemonicHasPassphrase) {
return backupError('Private key mismatch'); var walletClient = bwcService.getClient();
var separator = self.useIdeograms ? '\u3000' : ' ';
var customSentence = customWordList.join(separator);
var passphrase = $scope.passphrase || '';
try {
walletClient.seedFromMnemonic(customSentence, {
network: fc.credentials.network,
passphrase: passphrase,
account: fc.credentials.account
})
} catch (err) {
return backupError(err);
}
if (walletClient.credentials.xPrivKey != self.xPrivKey) {
return backupError('Private key mismatch');
}
} }
$rootScope.$emit('Local/BackupDone'); $rootScope.$emit('Local/BackupDone');