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

wallet listing working

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-09-03 01:25:08 -03:00
commit 6efa4f86de
14 changed files with 538 additions and 240 deletions
Download patch file Download diff file Expand all files Collapse all files

11
js/models/core/PluginManager.js
View file

@ -3,8 +3,9 @@ var preconditions = require('preconditions').singleton();
function PluginManager(config) {
this.registered = {};
this.scripts = [];
for(var ii in config.plugins){
for (var ii in config.plugins) {
var pluginName = ii;
if (!config.plugins[pluginName])
@ -12,7 +13,7 @@ function PluginManager(config) {
console.log('Loading plugin: ' + pluginName);
var pluginClass = require('../plugins/' + pluginName);
var pluginObj = new pluginClass();
var pluginObj = new pluginClass(config[pluginName]);
pluginObj.init();
this._register(pluginObj, pluginName);
}
@ -25,9 +26,10 @@ PluginManager.TYPE = {};
PluginManager.TYPE['STORAGE'] = KIND_UNIQUE;
PluginManager.prototype._register = function(obj, name) {
preconditions.checkArgument(obj.type,'Plugin has not type:' + name);
preconditions.checkArgument(obj.type, 'Plugin has not type:' + name);
var type = obj.type;
var kind = PluginManager.TYPE[type];
preconditions.checkArgument(kind, 'Plugin has unkown type' + name);
preconditions.checkState(kind !== PluginManager.KIND_UNIQUE || !this.registered[type], 'Plugin kind already registered: ' + name);
@ -37,8 +39,11 @@ PluginManager.prototype._register = function(obj, name) {
this.registered[type] = this.registered[type] || [];
this.registered[type].push(obj);
}
this.scripts = this.scripts.concat(obj.scripts || []);
};
PluginManager.prototype.get = function(type) {
return this.registered[type];
};

36
js/models/core/Wallet.js
View file

@ -821,21 +821,28 @@ Wallet.prototype.getRegisteredPeerIds = function() {
* @emits locked - in case the wallet is opened in another instance
*/
Wallet.prototype.keepAlive = function() {
try {
this.lock.keepAlive();
} catch (e) {
log.debug(e);
this.emit('locked', null, 'Wallet appears to be openned on other browser instance. Closing this one.');
}
var self = this;
this.lock.keepAlive(function(err) {
if (err) {
log.debug(err);
self.emit('locked', null, 'Wallet appears to be openned on other browser instance. Closing this one.');
}
});
};
/**
* @desc Store the wallet's state
* @param {function} callback (err)
*/
Wallet.prototype.store = function() {
Wallet.prototype.store = function(cb) {
var self = this;
this.keepAlive();
this.storage.setFromObj(this.id, this.toObj());
log.debug('Wallet stored');
this.storage.setFromObj(this.id, this.toObj(), function(err) {
log.debug('Wallet stored');
if (cb)
cb(err);
});
};
/**
@ -2339,11 +2346,14 @@ Wallet.prototype.indexDiscovery = function(start, change, copayerIndex, gap, cb)
/**
* @desc Closes the wallet and disconnects all services
*/
Wallet.prototype.close = function() {
Wallet.prototype.close = function(cb) {
var self =this;
log.debug('## CLOSING');
this.lock.release();
this.network.cleanUp();
this.blockchain.destroy();
this.lock.release(function() {
self.network.cleanUp();
self.blockchain.destroy();
if (cb) return cb();
});
};
/**

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

@ -1,4 +1,5 @@
'use strict';
var preconditions = require('preconditions').singleton();
var TxProposals = require('./TxProposals');
var PublicKeyRing = require('./PublicKeyRing');
@ -6,7 +7,7 @@ var PrivateKey = require('./PrivateKey');
var Wallet = require('./Wallet');
var _ = require('underscore');
var log = require('../../log');
var PluginManager = require('./PluginManager');
var PluginManager = require('./PluginManager');
var Async = module.exports.Async = require('../network/Async');
var Insight = module.exports.Insight = require('../blockchain/Insight');
var preconditions = require('preconditions').singleton();
@ -33,16 +34,24 @@ var Storage = module.exports.Storage = require('../Storage');
* @param {string} version - the version of copay for which this wallet was generated (for example, 0.4.7)
* @constructor
*/
function WalletFactory(config, version) {
function WalletFactory(config, version, pluginManager) {
var self = this;
config = config || {};
this.pluginManager = new PluginManager(config);
this.Storage = config.Storage || Storage;
this.Storage = config.Storage || Storage;
this.Network = config.Network || Async;
this.Blockchain = config.Blockchain || Insight;
this.storage = new this.Storage({storage: this.pluginManager.get('STORAGE')});
var storageOpts = {};
if (pluginManager) {
storageOpts = {
storage: pluginManager.get('STORAGE')
};
}
this.storage = new this.Storage(storageOpts);
this.networks = {
'livenet': new this.Network(config.network.livenet),
@ -57,27 +66,6 @@ function WalletFactory(config, version) {
this.version = version;
};
/**
* @desc
* Returns true if the storage instance can retrieve the following keys using a given walletId
* <ul>
* <li><tt>publicKeyRing</tt></li>
* <li><tt>txProposals</tt></li>
* <li><tt>opts</tt></li>
* <li><tt>privateKey</tt></li>
* </ul>
* @param {string} walletId
* @return {boolean} true if all the keys are present in the storage instance
*/
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');
return !!ret;
};
/**
* @desc obtain network name from serialized wallet
@ -100,9 +88,14 @@ WalletFactory.prototype.obtainNetworkName = function(obj) {
WalletFactory.prototype.fromObj = function(obj, skipFields) {
var networkName = this.obtainNetworkName(obj);
preconditions.checkState(networkName);
preconditions.checkArgument(obj);
obj.opts.reconnectDelay = this.walletDefaults.reconnectDelay;
// this is only used if private key or public key ring is skipped
obj.opts.networkName = this.networkName;
skipFields = skipFields || [];
skipFields.forEach(function(k) {
if (obj[k]) {
@ -155,20 +148,17 @@ WalletFactory.prototype.import = function(base64, password, skipFields) {
* @param {string[]} skipFields - parameters to ignore when importing
* @return {Wallet}
*/
WalletFactory.prototype.read = function(walletId, skipFields) {
if (!this._checkRead(walletId))
return false;
WalletFactory.prototype.read = function(walletId, skipFields, cb) {
var self = this;
var obj = {};
var s = this.storage;
obj.id = walletId;
_.each(Wallet.PERSISTED_PROPERTIES, function(value) {
obj[value] = s.get(walletId, value);
});
var w = this.fromObj(obj, skipFields);
return w;
this.storage.getMany(walletId, Wallet.PERSISTED_PROPERTIES, function(ret) {
for (var ii in ret) {
obj[ii] = ret[ii];
}
return cb(self.fromObj(obj, skipFields));
});
};
/**
@ -269,29 +259,29 @@ WalletFactory.prototype._checkVersion = function(inVersion) {
* @desc Retrieve a wallet from the storage
* @param {string} walletId - the id of the wallet
* @param {string} passphrase - the passphrase to decode it
* @return {Wallet}
* @param {function} callback (err, {Wallet})
* @return
*/
WalletFactory.prototype.open = function(walletId, passphrase) {
this.storage._setPassphrase(passphrase);
var w = this.read(walletId);
if (w) {
w.store();
}
this.storage.setLastOpened(walletId);
return w;
WalletFactory.prototype.open = function(walletId, passphrase, cb) {
var self = this,
err;
self.storage._setPassphrase(passphrase);
self.read(walletId, null, function(w) {
w.store(function() {
self.storage.setLastOpened(walletId, function() {
return cb(err, w);
});
});
});
};
/**
* @desc Retrieve all wallets stored without encription in the storage instance
* @returns {Wallet[]}
*/
WalletFactory.prototype.getWallets = function() {
var ret = this.storage.getWallets();
ret.forEach(function(i) {
i.show = i.name ? ((i.name + ' <' + i.id + '>')) : i.id;
WalletFactory.prototype.getWallets = function(cb) {
var ret = this.storage.getWallets(function(ret) {
ret.forEach(function(i) {
i.show = i.name ? ((i.name + ' <' + i.id + '>')) : i.id;
});
return cb(ret);
});
return ret;
};
/**
@ -374,30 +364,32 @@ WalletFactory.prototype.joinCreateSession = function(secret, nickname, passphras
connectedOnce = true;
});
joinNetwork.on('serverError', function() {
return cb('joinError');
});
<< << << < HEAD
joinNetwork.on('serverError', function() { === === =
self.network.on('serverError', function() { >>> >>> > wallet listing working
return cb('joinError');
});
joinNetwork.start(opts, function() {
joinNetwork.greet(decodedSecret.pubKey, opts.secretNumber);
joinNetwork.on('data', function(sender, data) {
if (data.type === 'walletId') {
if (data.networkName !== decodedSecret.networkName) {
return cb('badNetwork');
}
joinNetwork.start(opts, function() {
joinNetwork.greet(decodedSecret.pubKey, opts.secretNumber);
joinNetwork.on('data', function(sender, data) {
if (data.type === 'walletId') {
if (data.networkName !== decodedSecret.networkName) {
return cb('badNetwork');
}
data.opts.privateKey = privateKey;
data.opts.nickname = nickname;
data.opts.passphrase = passphrase;
data.opts.id = data.walletId;
var w = self.create(data.opts);
w.sendWalletReady(decodedSecret.pubKey);
return cb(null, w);
} else {
return cb('walletFull', w);
}
});
});
};
data.opts.privateKey = privateKey;
data.opts.nickname = nickname;
data.opts.passphrase = passphrase;
data.opts.id = data.walletId;
var w = self.create(data.opts);
w.sendWalletReady(decodedSecret.pubKey);
return cb(null, w);
} else {
return cb('walletFull', w);
}
});
});
};
module.exports = WalletFactory;
module.exports = WalletFactory;

57
js/models/core/WalletLock.js
View file

@ -10,46 +10,51 @@ function WalletLock(storage, walletId, timeoutMin) {
this.storage = storage;
this.timeoutMin = timeoutMin || 5;
this.key = WalletLock._keyFor(walletId);
this._setLock();
this._setLock(function() {});
}
WalletLock._keyFor = function(walletId) {
return 'lock' + '::' + walletId;
};
WalletLock.prototype._isLockedByOther = function() {
var json = this.storage.getGlobal(this.key);
var wl = json ? JSON.parse(json) : null;
var t = wl ? (Date.now() - wl.expireTs) : false;
// is not locked?
if (!wl || t > 0 || wl.sessionId === this.sessionId)
return false;
WalletLock.prototype._isLockedByOther = function(cb) {
var self=this;
this.storage.getGlobal(this.key, function(json) {
var wl = json ? JSON.parse(json) : null;
var t = wl ? (Date.now() - wl.expireTs) : false;
// is not locked?
if (!wl || t > 0 || wl.sessionId === self.sessionId)
return cb(false);
// Seconds remainding
return parseInt(-t/1000.);
};
WalletLock.prototype._setLock = function() {
this.storage.setGlobal(this.key, {
sessionId: this.sessionId,
expireTs: Date.now() + this.timeoutMin * 60 * 1000,
// Seconds remainding
return cb(parseInt(-t / 1000.));
});
};
WalletLock.prototype.keepAlive = function() {
preconditions.checkState(this.sessionId);
var t = this._isLockedByOther();
if (t)
throw new Error('Wallet is already open. Close it to proceed or wait '+ t + ' seconds if you close it already' );
this._setLock();
WalletLock.prototype._setLock = function(cb) {
this.storage.setGlobal(this.key, {
sessionId: this.sessionId,
expireTs: Date.now() + this.timeoutMin * 60 * 1000,
}, cb);
};
WalletLock.prototype.release = function() {
this.storage.removeGlobal(this.key);
WalletLock.prototype.keepAlive = function(cb) {
preconditions.checkState(this.sessionId);
var self = this;
this._isLockedByOther(function(t) {
if (t)
return cb(new Error('Wallet is already open. Close it to proceed or wait ' + t + ' seconds if you close it already'));
self._setLock(cb);
});
};
WalletLock.prototype.release = function(cb) {
this.storage.removeGlobal(this.key, cb);
};