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

create/join using mnemonic working

Browse source
This commit is contained in:
Matias Alejo Garcia 2015-09-02 15:56:00 -03:00
commit 452d9e1bda
9 changed files with 187 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -18,6 +18,7 @@ angular.module('copayApp.controllers').controller('importController',
this.setType = function(type) {
$scope.type = type;
this.error = null;
$timeout(function() {
$rootScope.$apply();
});
@ -63,11 +64,8 @@ angular.module('copayApp.controllers').controller('importController',
var _importMnemonic = function(words, passphrase, opts) {
self.loading = true;
console.log('[import.js.64:opts:]', opts); //TODO
$timeout(function() {
profileService.importWalletMnemonic(words, {
passphrase: passphrase,
}, function(err, ret) {
profileService.importWalletMnemonic(words, opts, function(err, ret) {
self.loading = false;
if (err) {
self.error = err;
@ -83,13 +81,13 @@ angular.module('copayApp.controllers').controller('importController',
}, 100);
};
// {
// network: opts.network,
// m: opts.m,
// n: opts.n,
// publicKeyRing: opts.publicKeyRing,
// },
//
// {
// network: opts.network,
// m: opts.m,
// n: opts.n,
// publicKeyRing: opts.publicKeyRing,
// },
//
$scope.getFile = function() {
// If we use onloadend, we need to check the readyState.
reader.onloadend = function(evt) {
@ -144,18 +142,28 @@ angular.module('copayApp.controllers').controller('importController',
var passphrase = form.passphrase.$modelValue;
var words = form.words.$modelValue;
this.error = null;
if (!words || words.split(' ').map(function(v) {
return lodash.trim(v);
}).length != 12) {
this.error = gettext('Please input 12 backup words');
if (!words) {
this.error = gettext('Please enter the backup words');
} else {
var wordList = words.split(/ /).filter(function(v){ return v.length>0; });
if (wordList.length != 12)
this.error = gettext('Please enter 12 backup words');
else
words = wordList.join(' ');
}
if (this.error) {
$timeout(function() {
$scope.$apply();
});
return;
}
opts.passphrase = form.passphrase.$modelValue || null;
opts.networkName = form.isTestnet.$modelValue ? 'testnet' : 'livenet';
_importMnemonic(words, passphrase, opts);
};

8
src/js/controllers/splash.js
View file

@ -29,12 +29,4 @@ angular.module('copayApp.controllers').controller('splashController',
});
}, 100);
};
console.log('[splash.js.32]'); //TODO
var a = bwcService.getClient();
console.log('[splash.js.34]'); //TODO
a.seedFromMnemonic('glare benefit approve speak post afford spot cancel argue cushion unaware kitchen');
console.log("LISTO", a.credentials);
});

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

@ -84,6 +84,21 @@ angular.module('copayApp.services')
case 'WALLET_NOT_FOUND':
body = gettextCatalog.getString('Wallet not found');
break;
case 'SERVER_COMPROMISED':
body = gettextCatalog.getString('Server response could not be verified');
break;
case 'WALLET_DOES_NOT_EXIST':
body = gettextCatalog.getString('This wallet is not registed at the wallet service. Please create it from "Create Wallet" using adding for backup words');
break;
case 'INVALID_BACKUP':
body = gettextCatalog.getString('Backup words are invalid');
break;
default:
$log.warn('Unknown error type:', err.code);
body = err.code + ':' + err.message;
break;
}
}

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

@ -146,7 +146,7 @@ angular.module('copayApp.services')
return cb(err);
}
if (!profile) {
// Migration??
// Migration??
storageService.tryToMigrate(function(err, migratedProfile) {
if (err) return cb(err);
if (!migratedProfile)
@ -165,52 +165,14 @@ angular.module('copayApp.services')
});
};
root._seedWallet = function(walletClient, network) {
var lang = uxLanguage.getCurrentLanguage();
console.log('[profileService.js.170]'); //TODO
try {
walletClient.seedFromRandomWithMnemonic(network, null, lang);
console.log('[profileService.js.174]'); //TODO
} catch (e) {
$log.info('Error creating seed: ' + e.message);
if (e.message.indexOf('language') > 0) {
$log.info('Using default language for mnemonic');
walletClient.seedFromRandomWithMnemonic(network);
} else {
throw (e);
}
}
};
root._createNewProfile = function(opts, cb) {
if (opts.noWallet) {
return cb(null, Profile.create());
}
root._seedWallet = function(opts, cb) {
opts = opts || {};
var walletClient = bwcService.getClient();
root._seedWallet(walletClient, 'livenet');
walletClient.createWallet('Personal Wallet', 'me', 1, 1, {
network: 'livenet'
}, function(err) {
if (err) return bwsError.cb(err, gettext('Error creating wallet'), cb);
var p = Profile.create({
credentials: [JSON.parse(walletClient.export())],
});
return cb(null, p);
})
};
root.createWallet = function(opts, cb) {
var walletClient = bwcService.getClient();
$log.debug('Creating Wallet:', opts);
var network = opts.networkName || 'livenet';
if (opts.mnemonic) {
try {
walletClient.seedFromMnemonic(opts.mnemonic);
walletClient.seedFromMnemonic(opts.mnemonic, opts.passphrase, network);
} catch (ex) {
$log.info(ex);
return cb(gettext('Could not create: Invalid Backup Words'));
@ -221,41 +183,69 @@ console.log('[profileService.js.174]'); //TODO
} catch (ex) {
return cb(gettext('Could not create using the specified extended public key'));
}
} else {
var lang = uxLanguage.getCurrentLanguage();
try {
walletClient.seedFromRandomWithMnemonic(network, opts.passphrase, lang);
} catch (e) {
$log.info('Error creating seed: ' + e.message);
if (e.message.indexOf('language') > 0) {
$log.info('Using default language for mnemonic');
walletClient.seedFromRandomWithMnemonic(network, opts.passphrase);
} else {
return cb(e);
}
}
}
root._seedWallet(walletClient, opts.networkName);
return cb(null, walletClient);
};
walletClient.createWallet(opts.name, opts.myName || 'me', opts.m, opts.n, {
network: opts.networkName
}, function(err, secret) {
if (err) return bwsError.cb(err, gettext('Error creating wallet'), cb);
root._createNewProfile = function(opts, cb) {
root.profile.credentials.push(JSON.parse(walletClient.export()));
root.setWalletClients();
if (opts.noWallet) {
return cb(null, Profile.create());
}
root.setAndStoreFocus(walletClient.credentials.walletId, function() {
storageService.storeProfile(root.profile, function(err) {
return cb(null, secret);
root._seedWallet({}, function(err, walletClient) {
if (err) return cb(err);
walletClient.createWallet('Personal Wallet', 'me', 1, 1, {
network: 'livenet'
}, function(err) {
if (err) return bwsError.cb(err, gettext('Error creating wallet'), cb);
var p = Profile.create({
credentials: [JSON.parse(walletClient.export())],
});
return cb(null, p);
});
})
};
root.createWallet = function(opts, cb) {
$log.debug('Creating Wallet:', opts);
root._seedWallet(opts, function(err, walletClient) {
if (err) return cb(err);
walletClient.createWallet(opts.name, opts.myName || 'me', opts.m, opts.n, {
network: opts.networkName
}, function(err, secret) {
if (err) return bwsError.cb(err, gettext('Error creating wallet'), cb);
root.profile.credentials.push(JSON.parse(walletClient.export()));
root.setWalletClients();
root.setAndStoreFocus(walletClient.credentials.walletId, function() {
storageService.storeProfile(root.profile, function(err) {
return cb(null, secret);
});
});
})
});
};
root.joinWallet = function(opts, cb) {
var walletClient = bwcService.getClient();
$log.debug('Joining Wallet:', opts);
if (opts.extendedPrivateKey) {
try {
walletClient.seedFromExtendedPrivateKey(opts.extendedPrivateKey);
} catch (ex) {
return cb(gettext('Could not join using the specified extended private key'));
}
} else if (opts.extendedPublicKey) {
try {
walletClient.seedFromExternalWalletPublicKey(opts.extendedPublicKey, opts.externalSource, opts.externalIndex);
} catch (ex) {
return cb(gettext('Could not create using the specified extended public key'));
}
}
try {
var walletData = this.getUtils().fromSecret(opts.secret);
@ -269,18 +259,24 @@ console.log('[profileService.js.174]'); //TODO
} catch (ex) {
return cb(gettext('Bad wallet invitation'));
}
opts.networkName = walletData.network;
$log.debug('Joining Wallet:', opts);
walletClient.joinWallet(opts.secret, opts.myName || 'me', function(err) {
if (err) return bwsError.cb(err, gettext('Could not join wallet'), cb);
root._seedWallet(opts, function(err, walletClient) {
if (err) return cb(err);
root.profile.credentials.push(JSON.parse(walletClient.export()));
root.setWalletClients();
walletClient.joinWallet(opts.secret, opts.myName || 'me', function(err) {
if (err) return bwsError.cb(err, gettext('Could not join wallet'), cb);
root.setAndStoreFocus(walletClient.credentials.walletId, function() {
storageService.storeProfile(root.profile, function(err) {
return cb(null, opts.secret);
root.profile.credentials.push(JSON.parse(walletClient.export()));
root.setWalletClients();
root.setAndStoreFocus(walletClient.credentials.walletId, function() {
storageService.storeProfile(root.profile, function(err) {
return cb();
});
});
});
})
})
};
@ -351,9 +347,13 @@ console.log('[profileService.js.174]'); //TODO
var walletClient = bwcService.getClient();
$log.debug('Importing Wallet Mnemonic');
console.log('[profileService.js.340]', words, opts); //TODO
walletClient.importFromMnemonic(words, {
network: opts.networkName,
passphrase: opts.passphrase,
}, function(err) {
console.log('[profileService.js.342:err:]',err); //TODO
console.log('[profileService.js.341:walletClient:]',walletClient.credentials.credentials); //TODO
if (err)
return bwsError.cb(err, gettext('Could not import'), cb);
@ -361,21 +361,6 @@ console.log('[profileService.js.174]'); //TODO
});
};
root.importWalletMnemonicEx = function(words, opts, cb) {
var walletClient = bwcService.getClient();
$log.debug('Importing Wallet Mnemonic EX', opts);
walletClient.importFromMnemonic(words, opts,
function(err) {
if (err)
return bwsError.cb(err, gettext('Could not import'), cb);
root._addWalletClient(walletClient, cb);
});
};
root.create = function(opts, cb) {
$log.info('Creating profile');
configService.get(function(err) {