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

Fix Conflicts:

Browse source 
js/models/core/WalletFactory.js
This commit is contained in:
Gustavo Cortez 2014-06-18 10:03:22 -03:00
commit 21baa103bd
13 changed files with 346 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

10
js/controllers/backup.js
View file

@ -1,7 +1,7 @@
'use strict';
angular.module('copayApp.controllers').controller('BackupController',
function($scope, $rootScope, $location, $window, $timeout, $modal, backupService) {
function($scope, $rootScope, $location, $window, $timeout, $modal, backupService, walletFactory, controllerUtils) {
$scope.title = 'Backup';
$scope.download = function() {
@ -19,6 +19,14 @@ angular.module('copayApp.controllers').controller('BackupController',
});
};
$scope.deleteWallet = function() {
var w = $rootScope.wallet;
w.disconnect();
walletFactory.delete(w.id, function() {
controllerUtils.logout();
});
};
});
var ModalInstanceCtrl = function($scope, $modalInstance) {

2
js/controllers/header.js
View file

@ -1,7 +1,7 @@
'use strict';
angular.module('copayApp.controllers').controller('HeaderController',
function($scope, $rootScope, $location, $notification, $http, walletFactory, controllerUtils) {
function($scope, $rootScope, $location, $notification, $http, controllerUtils) {
$scope.menu = [
{
'title': 'Addresses',

21
js/directives.js
View file

@ -202,4 +202,23 @@ angular.module('copayApp.directives')
});
}
};
});
})
// From https://gist.github.com/asafge/7430497
.directive('ngReallyClick', [
function() {
return {
restrict: 'A',
link: function(scope, element, attrs) {
element.bind('click', function() {
var message = attrs.ngReallyMessage;
if (message && confirm(message)) {
scope.$apply(attrs.ngReallyClick);
}
});
}
}
}
])
;

101
js/models/core/WalletFactory.js
View file

@ -1,6 +1,6 @@
'use strict';
var imports = require('soop').imports();
var imports = require('soop').imports();
var TxProposals = require('./TxProposals');
var PublicKeyRing = require('./PublicKeyRing');
@ -29,13 +29,13 @@ function WalletFactory(config, version) {
this.network = new this.Network(config.network);
this.blockchain = new this.Blockchain(config.blockchain);
this.networkName = config.networkName;
this.verbose = config.verbose;
this.networkName = config.networkName;
this.verbose = config.verbose;
this.walletDefaults = config.wallet;
this.version = version;
this.version = version;
}
WalletFactory.prototype.log = function(){
WalletFactory.prototype.log = function() {
if (!this.verbose) return;
if (console) {
console.log.apply(console, arguments);
@ -45,18 +45,18 @@ WalletFactory.prototype.log = function(){
WalletFactory.prototype._checkRead = function(walletId) {
var s = this.storage;
var ret =
s.get(walletId, 'publicKeyRing') &&
s.get(walletId, 'txProposals') &&
s.get(walletId, 'opts') &&
s.get(walletId, 'privateKey');
var ret =
s.get(walletId, 'publicKeyRing') &&
s.get(walletId, 'txProposals') &&
s.get(walletId, 'opts') &&
s.get(walletId, 'privateKey');
return !!ret;
};
WalletFactory.prototype.fromObj = function(obj) {
// not stored options
obj.opts.reconnectDelay = this.walletDefaults.reconnectDelay;
obj.opts.reconnectDelay = this.walletDefaults.reconnectDelay;
var w = Wallet.fromObj(obj, this.storage, this.network, this.blockchain);
if (!w) return false;
@ -75,34 +75,36 @@ WalletFactory.prototype.fromEncryptedObj = function(base64, password) {
};
WalletFactory.prototype.read = function(walletId) {
if (! this._checkRead(walletId))
if (!this._checkRead(walletId))
return false;
var obj = {};
var s = this.storage;
obj.id = walletId;
obj.opts = s.get(walletId, 'opts');
obj.publicKeyRing = s.get(walletId, 'publicKeyRing');
obj.txProposals = s.get(walletId, 'txProposals');
obj.privateKey = s.get(walletId, 'privateKey');
obj.addressBook = s.get(walletId, 'addressBook');
obj.opts = s.get(walletId, 'opts');
obj.publicKeyRing = s.get(walletId, 'publicKeyRing');
obj.txProposals = s.get(walletId, 'txProposals');
obj.privateKey = s.get(walletId, 'privateKey');
obj.addressBook = s.get(walletId, 'addressBook');
var w = this.fromObj(obj);
return w;
};
WalletFactory.prototype.create = function(opts) {
opts = opts || {};
this.log('### CREATING NEW WALLET.' +
(opts.id ? ' USING ID: ' + opts.id : ' NEW ID') +
(opts.privateKey ? ' USING PrivateKey: ' + opts.privateKey.getId() : ' NEW PrivateKey')
);
opts = opts || {};
this.log('### CREATING NEW WALLET.' +
(opts.id ? ' USING ID: ' + opts.id : ' NEW ID') +
(opts.privateKey ? ' USING PrivateKey: ' + opts.privateKey.getId() : ' NEW PrivateKey')
);
opts.privateKey = opts.privateKey || new PrivateKey({ networkName: this.networkName });
opts.privateKey = opts.privateKey || new PrivateKey({
networkName: this.networkName
});
var requiredCopayers = opts.requiredCopayers || this.walletDefaults.requiredCopayers;
var totalCopayers = opts.totalCopayers || this.walletDefaults.totalCopayers;
var totalCopayers = opts.totalCopayers || this.walletDefaults.totalCopayers;
opts.publicKeyRing = opts.publicKeyRing || new PublicKeyRing({
networkName: this.networkName,
@ -127,10 +129,10 @@ WalletFactory.prototype.create = function(opts) {
opts.verbose = this.verbose;
opts.spendUnconfirmed = opts.spendUnconfirmed || this.walletDefaults.spendUnconfirmed;
opts.reconnectDelay = opts.reconnectDelay || this.walletDefaults.reconnectDelay;
opts.reconnectDelay = opts.reconnectDelay || this.walletDefaults.reconnectDelay;
opts.requiredCopayers = requiredCopayers;
opts.totalCopayers = totalCopayers;
opts.version = opts.version || this.version;
opts.totalCopayers = totalCopayers;
opts.version = opts.version || this.version;
var w = new Wallet(opts);
w.store();
return w;
@ -140,32 +142,25 @@ WalletFactory.prototype.create = function(opts) {
WalletFactory.prototype._checkVersion = function(inVersion) {
var thisV = this.version.split('.');
var thisV0 = parseInt(thisV[0]);
var inV = inVersion.split('.');
var inV0 = parseInt(inV[0]);
var inV = inVersion.split('.');
var inV0 = parseInt(inV[0]);
//We only check for major version differences
if( thisV0 < inV0 ) {
if (thisV0 < inV0) {
throw new Error('Major difference in software versions' +
'. Received:' + inVersion +
'. Current version:' + this.version +
'. Aborting.');
'. Received:' + inVersion +
'. Current version:' + this.version +
'. Aborting.');
}
};
WalletFactory.prototype._checkNetwork = function(inNetworkName) {
if( this.networkName !== inNetworkName ) {
throw new Error('This Wallet is configured for '
+ inNetworkName
+ ' while currently Copay is configured for: '
+ this.networkName
+ '. Check your settings.'
);
if (this.networkName !== inNetworkName) {
throw new Error('This Wallet is configured for ' + inNetworkName + ' while currently Copay is configured for: ' + this.networkName + '. Check your settings.');
}
};
WalletFactory.prototype.open = function(walletId, opts) {
opts = opts || {};
opts.id = walletId;
@ -182,14 +177,16 @@ WalletFactory.prototype.open = function(walletId, opts) {
WalletFactory.prototype.getWallets = function() {
var ret = this.storage.getWallets();
ret.forEach(function(i) {
i.show = i.name ? ( (i.name + ' <'+i.id+'>') ) : i.id;
i.show = i.name ? ((i.name + ' <' + i.id + '>')) : i.id;
});
return ret;
};
WalletFactory.prototype.remove = function(walletId) {
// TODO remove wallet contents
this.log('TODO: remove wallet contents');
WalletFactory.prototype.delete = function(walletId, cb) {
var s = this.storage;
this.log('## DELETING WALLET ID:' + walletId); //TODO
s.deleteWallet(walletId);
return cb();
};
WalletFactory.prototype.decodeSecret = function(secret) {
@ -205,9 +202,11 @@ WalletFactory.prototype.joinCreateSession = function(secret, nickname, passphras
var s = self.decodeSecret(secret);
if (!s) return cb('badSecret');
//Create our PrivateK
var privateKey = new PrivateKey({ networkName: this.networkName });
var privateKey = new PrivateKey({
networkName: this.networkName
});
this.log('\t### PrivateKey Initialized');
var opts = {
copayerId: privateKey.getId(),
@ -226,13 +225,13 @@ WalletFactory.prototype.joinCreateSession = function(secret, nickname, passphras
return cb(connectedOnce ? 'walletFull' : 'joinError');
});
self.network.on('data', function(sender, data) {
if (data.type ==='walletId') {
if (data.networkName !== self.networkName ){
if (data.type === 'walletId') {
if (data.networkName !== self.networkName) {
return cb('badNetwork');
}
data.opts.privateKey = privateKey;
data.opts.nickname = nickname;
data.opts.nickname = nickname;
data.opts.passphrase = passphrase;
data.opts.id = data.walletId;
var w = self.create(data.opts);

18
js/models/storage/LocalEncrypted.js
View file

@ -135,7 +135,6 @@ Storage.prototype.getWalletIds = function() {
Storage.prototype.getWallets = function() {
var wallets = [];
var uniq = {};
var ids = this.getWalletIds();
for (var i in ids) {
@ -147,6 +146,23 @@ Storage.prototype.getWallets = function() {
return wallets;
};
Storage.prototype.deleteWallet = function(walletId) {
var toDelete = {};
toDelete['nameFor::' + walletId] = 1;
for (var i = 0; i < localStorage.length; i++) {
var key = localStorage.key(i);
var split = key.split('::');
if (split.length == 2 && split[0] === walletId) {
toDelete[key] = 1;
}
}
for (var i in toDelete) {
this.removeGlobal(i);
}
};
//obj contains keys to be set
Storage.prototype.setFromObj = function(walletId, obj) {
for (var k in obj) {

7
js/services/backupService.js
View file

@ -1,6 +1,8 @@
'use strict';
var BackupService = function() {};
var BackupService = function($notification) {
this.notifications = $notification;
};
BackupService.prototype.getName = function(wallet) {
return (wallet.name ? (wallet.name+'-') : '') + wallet.id;
@ -11,6 +13,7 @@ BackupService.prototype.download = function(wallet) {
var timestamp = +(new Date());
var walletName = this.getName(wallet);
var filename = walletName + '-' + timestamp + '-keybackup.json.aes';
this.notifications.success('Backup created', 'Encrypted backup file saved.');
var blob = new Blob([ew], {
type: 'text/plain;charset=utf-8'
});
@ -44,4 +47,4 @@ BackupService.prototype.sendEmail = function(email, wallet) {
}
};
angular.module('copayApp.services').value('backupService', new BackupService());
angular.module('copayApp.services').service('backupService', BackupService);