txp indexes at storage
This commit is contained in:
parent
0ee2abf841
commit
196610f2eb
|
@ -146,6 +146,10 @@ TxProposal.prototype.reject = function(copayerId) {
|
||||||
this.addAction(copayerId, 'reject');
|
this.addAction(copayerId, 'reject');
|
||||||
};
|
};
|
||||||
|
|
||||||
|
TxProposal.prototype.isPending = function() {
|
||||||
|
return this.status === 'pending';
|
||||||
|
};
|
||||||
|
|
||||||
TxProposal.prototype.isAccepted = function() {
|
TxProposal.prototype.isAccepted = function() {
|
||||||
var votes = _.countBy(_.values(this.actions), 'type');
|
var votes = _.countBy(_.values(this.actions), 'type');
|
||||||
return votes['accept'] >= this.requiredSignatures;
|
return votes['accept'] >= this.requiredSignatures;
|
||||||
|
|
|
@ -569,8 +569,8 @@ CopayServer.prototype.getPendingTxs = function(opts, cb) {
|
||||||
self.storage.fetchTxs(self.walletId, function(err, txps) {
|
self.storage.fetchTxs(self.walletId, function(err, txps) {
|
||||||
if (err) return cb(err);
|
if (err) return cb(err);
|
||||||
|
|
||||||
var pending = _.filter(txps, {
|
var pending = _.filter(txps, function(txp) {
|
||||||
status: 'pending'
|
return txp.isPending();
|
||||||
});
|
});
|
||||||
return cb(null, pending);
|
return cb(null, pending);
|
||||||
});
|
});
|
||||||
|
|
|
@ -12,14 +12,16 @@ var Copayer = require('./model/copayer');
|
||||||
var Address = require('./model/address');
|
var Address = require('./model/address');
|
||||||
var TxProposal = require('./model/txproposal');
|
var TxProposal = require('./model/txproposal');
|
||||||
|
|
||||||
var Storage = function (opts) {
|
var Storage = function(opts) {
|
||||||
opts = opts || {};
|
opts = opts || {};
|
||||||
this.db = opts.db || levelup(opts.dbPath || './db/copay.db', { valueEncoding: 'json' });
|
this.db = opts.db || levelup(opts.dbPath || './db/copay.db', {
|
||||||
|
valueEncoding: 'json'
|
||||||
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
Storage.prototype.fetchWallet = function (id, cb) {
|
Storage.prototype.fetchWallet = function(id, cb) {
|
||||||
this.db.get('wallet-' + id, function (err, data) {
|
this.db.get('wallet-' + id, function(err, data) {
|
||||||
if (err) {
|
if (err) {
|
||||||
if (err.notFound) return cb();
|
if (err.notFound) return cb();
|
||||||
return cb(err);
|
return cb(err);
|
||||||
|
@ -28,25 +30,34 @@ Storage.prototype.fetchWallet = function (id, cb) {
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
Storage.prototype.storeWallet = function (wallet, cb) {
|
Storage.prototype.storeWallet = function(wallet, cb) {
|
||||||
this.db.put('wallet-' + wallet.id, wallet, cb);
|
this.db.put('wallet-' + wallet.id, wallet, cb);
|
||||||
};
|
};
|
||||||
|
|
||||||
Storage.prototype.storeWalletAndUpdateCopayersLookup = function (wallet, cb) {
|
<< << << < HEAD
|
||||||
|
Storage.prototype.storeWalletAndUpdateCopayersLookup = function(wallet, cb) {
|
||||||
var ops = [];
|
var ops = [];
|
||||||
ops.push({ type: 'put', key: 'wallet-' + wallet.id, value: wallet });
|
ops.push({
|
||||||
_.each(wallet.copayers, function (copayer) {
|
type: 'put',
|
||||||
|
key: 'wallet-' + wallet.id,
|
||||||
|
value: wallet
|
||||||
|
});
|
||||||
|
_.each(wallet.copayers, function(copayer) {
|
||||||
var value = {
|
var value = {
|
||||||
walletId: wallet.id,
|
walletId: wallet.id,
|
||||||
signingPubKey: copayer.signingPubKey,
|
signingPubKey: copayer.signingPubKey,
|
||||||
};
|
};
|
||||||
ops.push({ type: 'put', key: 'copayer-' + copayer.id, value: value });
|
ops.push({
|
||||||
|
type: 'put',
|
||||||
|
key: 'copayer-' + copayer.id,
|
||||||
|
value: value
|
||||||
|
});
|
||||||
});
|
});
|
||||||
this.db.batch(ops, cb);
|
this.db.batch(ops, cb);
|
||||||
};
|
};
|
||||||
|
|
||||||
Storage.prototype.fetchCopayerLookup = function (copayerId, cb) {
|
Storage.prototype.fetchCopayerLookup = function(copayerId, cb) {
|
||||||
this.db.get('copayer-' + copayerId, function (err, data) {
|
this.db.get('copayer-' + copayerId, function(err, data) {
|
||||||
if (err) {
|
if (err) {
|
||||||
if (err.notFound) return cb();
|
if (err.notFound) return cb();
|
||||||
return cb(err);
|
return cb(err);
|
||||||
|
@ -55,8 +66,8 @@ Storage.prototype.fetchCopayerLookup = function (copayerId, cb) {
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
Storage.prototype.fetchTx = function (walletId, txProposalId, cb) {
|
Storage.prototype.fetchTx = function(walletId, txProposalId, cb) {
|
||||||
this.db.get('wallet-' + walletId + '-txp-' + txProposalId, function (err, data) {
|
this.db.get('wallet-' + walletId + '-txp-' + txProposalId, function(err, data) {
|
||||||
if (err) {
|
if (err) {
|
||||||
if (err.notFound) return cb();
|
if (err.notFound) return cb();
|
||||||
return cb(err);
|
return cb(err);
|
||||||
|
@ -65,55 +76,79 @@ Storage.prototype.fetchTx = function (walletId, txProposalId, cb) {
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
Storage.prototype.fetchTxs = function (walletId, cb) {
|
Storage.prototype.fetchTxs = function(walletId, cb) {
|
||||||
var txs = [];
|
var txs = [];
|
||||||
var key = 'wallet-' + walletId + '-txp-';
|
var key = 'wallet-' + walletId + '-txp-';
|
||||||
this.db.createReadStream({ gte: key, lt: key + '~' })
|
this.db.createReadStream({
|
||||||
.on('data', function (data) {
|
gte: key,
|
||||||
|
lt: key + '~'
|
||||||
|
})
|
||||||
|
.on('data', function(data) {
|
||||||
txs.push(TxProposal.fromObj(data.value));
|
txs.push(TxProposal.fromObj(data.value));
|
||||||
})
|
})
|
||||||
.on('error', function (err) {
|
.on('error', function(err) {
|
||||||
if (err.notFound) return cb();
|
if (err.notFound) return cb();
|
||||||
return cb(err);
|
return cb(err);
|
||||||
})
|
})
|
||||||
.on('end', function () {
|
.on('end', function() {
|
||||||
return cb(null, txs);
|
return cb(null, txs);
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
Storage.prototype.storeTx = function (walletId, txp, cb) {
|
Storage.prototype.storeTx = function(walletId, txp, cb) {
|
||||||
this.db.put('wallet-' + walletId + '-txp-' + txp.id, txp, cb);
|
var self = this;
|
||||||
|
|
||||||
|
async.series([
|
||||||
|
|
||||||
|
function(next) {
|
||||||
|
self.db.put('wallet-' + walletId + '-txp-' + txp.id, txp, next);
|
||||||
|
},
|
||||||
|
function(next) {
|
||||||
|
self.db.put('wallet-' + walletId + '-txp-ts-' + txp.createdOn, txp.id, next);
|
||||||
|
},
|
||||||
|
function(next) {
|
||||||
|
if (txp.isPending())
|
||||||
|
self.db.put('wallet-' + walletId + '-txp-p-' + txp.createdOn, txp.id, next);
|
||||||
|
else
|
||||||
|
self.db.del('wallet-' + walletId + '-txp-p-' + txp.createdOn, next);
|
||||||
|
}
|
||||||
|
], cb);
|
||||||
};
|
};
|
||||||
|
|
||||||
Storage.prototype.fetchAddresses = function (walletId, cb) {
|
Storage.prototype.fetchAddresses = function(walletId, cb) {
|
||||||
var addresses = [];
|
var addresses = [];
|
||||||
var key = 'wallet-' + walletId + '-address-';
|
var key = 'wallet-' + walletId + '-address-';
|
||||||
this.db.createReadStream({ gte: key, lt: key + '~' })
|
this.db.createReadStream({
|
||||||
.on('data', function (data) {
|
gte: key,
|
||||||
|
lt: key + '~'
|
||||||
|
})
|
||||||
|
.on('data', function(data) {
|
||||||
addresses.push(Address.fromObj(data.value));
|
addresses.push(Address.fromObj(data.value));
|
||||||
})
|
})
|
||||||
.on('error', function (err) {
|
.on('error', function(err) {
|
||||||
if (err.notFound) return cb();
|
if (err.notFound) return cb();
|
||||||
return cb(err);
|
return cb(err);
|
||||||
})
|
})
|
||||||
.on('end', function () {
|
.on('end', function() {
|
||||||
return cb(null, addresses);
|
return cb(null, addresses);
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
Storage.prototype.storeAddress = function (walletId, address, cb) {
|
Storage.prototype.storeAddress = function(walletId, address, cb) {
|
||||||
this.db.put('wallet-' + walletId + '-address-' + address.address, address, cb);
|
this.db.put('wallet-' + walletId + '-address-' + address.address, address, cb);
|
||||||
};
|
};
|
||||||
|
|
||||||
Storage.prototype.removeAddress = function (walletId, address, cb) {
|
Storage.prototype.removeAddress = function(walletId, address, cb) {
|
||||||
this.db.del('wallet-' + walletId + '-address-' + address.address, cb);
|
this.db.del('wallet-' + walletId + '-address-' + address.address, cb);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
Storage.prototype._dump = function (cb) {
|
Storage.prototype._dump = function(cb) {
|
||||||
this.db.readStream()
|
this.db.readStream()
|
||||||
.on('data', console.log)
|
.on('data', console.log)
|
||||||
.on('end', function () { if (cb) return cb(); });
|
.on('end', function() {
|
||||||
|
if (cb) return cb();
|
||||||
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
module.exports = Storage;
|
module.exports = Storage;
|
||||||
|
|
Loading…
Reference in New Issue