process block working!
This commit is contained in:
parent
9bbfff071e
commit
2cff530072
|
@ -182,9 +182,7 @@ BlockchainMonitor.prototype._handleTxOuts = function(data) {
|
||||||
};
|
};
|
||||||
|
|
||||||
BlockchainMonitor.prototype._processBlock = function(network, hash, cb) {
|
BlockchainMonitor.prototype._processBlock = function(network, hash, cb) {
|
||||||
|
|
||||||
var self = this;
|
var self = this;
|
||||||
console.log('[blockchainmonitor.js.184:network:]', network); //TODO
|
|
||||||
|
|
||||||
//1. check block is not reorg
|
//1. check block is not reorg
|
||||||
//2. doProcessBlock
|
//2. doProcessBlock
|
||||||
|
@ -192,7 +190,6 @@ BlockchainMonitor.prototype._processBlock = function(network, hash, cb) {
|
||||||
if (err) return cb(err);
|
if (err) return cb(err);
|
||||||
|
|
||||||
log.debug('Processing block ' + network + ' ' + hash);
|
log.debug('Processing block ' + network + ' ' + hash);
|
||||||
console.log('[blockchainmonitor.js.195:data:]',data); //TODO
|
|
||||||
var block = new Bitcore.Block(new Buffer(data.rawblock, 'hex'));
|
var block = new Bitcore.Block(new Buffer(data.rawblock, 'hex'));
|
||||||
var txs = block.toObject().transactions;
|
var txs = block.toObject().transactions;
|
||||||
|
|
||||||
|
|
|
@ -859,6 +859,8 @@ Storage.prototype._dump = function(cb, fn) {
|
||||||
};
|
};
|
||||||
|
|
||||||
Storage.prototype.updateLastUsedOn = function(address, cb) {
|
Storage.prototype.updateLastUsedOn = function(address, cb) {
|
||||||
|
|
||||||
|
// Do not use `upsert` here.
|
||||||
this.db.collection(collections.ADDRESSES).update({
|
this.db.collection(collections.ADDRESSES).update({
|
||||||
address: address,
|
address: address,
|
||||||
}, {
|
}, {
|
||||||
|
|
|
@ -138,22 +138,27 @@ describe('Blockchain monitor', function() {
|
||||||
var incoming = {
|
var incoming = {
|
||||||
hash: '123',
|
hash: '123',
|
||||||
};
|
};
|
||||||
var address;
|
|
||||||
server.createAddress({}, function(err, a) {
|
|
||||||
should.not.exist(err);
|
|
||||||
address = a.address;
|
|
||||||
|
|
||||||
// TODO add address to block data
|
|
||||||
|
|
||||||
blockchainExplorer.getBlock = sinon.stub().yields(null, {
|
blockchainExplorer.getBlock = sinon.stub().yields(null, {
|
||||||
rawblock: TestData.block
|
rawblock: TestData.block.rawblock
|
||||||
});
|
});
|
||||||
|
|
||||||
socket.handlers['block'](incoming);
|
var fakeAddresses= TestData.block.addresses.splice(0, 3);
|
||||||
|
|
||||||
|
server.getWallet({}, function(err, wallet) {
|
||||||
|
should.not.exist(err);
|
||||||
|
helpers.insertFakeAddresses(server, wallet, fakeAddresses, function(err) {
|
||||||
|
should.not.exist(err);
|
||||||
|
|
||||||
|
socket.handlers['block'](incoming);
|
||||||
setTimeout(function() {
|
setTimeout(function() {
|
||||||
|
storage.fetchRecentAddresses(wallet.id, (Date.now() / 1000) - 100, function(err, addr) {
|
||||||
|
_.pluck(addr,'address').should.be.deep.equal(fakeAddresses);
|
||||||
done();
|
done();
|
||||||
|
});
|
||||||
}, 50);
|
}, 50);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -418,6 +418,20 @@ helpers.createAddresses = function(server, wallet, main, change, cb) {
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
helpers.insertFakeAddresses = function(server, wallet, addresses, cb) {
|
||||||
|
async.each(addresses, function(addr, i_cb) {
|
||||||
|
var addressObj = Model.Address.create({
|
||||||
|
walletId: wallet.id,
|
||||||
|
address: addr,
|
||||||
|
});
|
||||||
|
server.storage.storeAddressAndWallet(wallet, addressObj, function(err) {
|
||||||
|
return i_cb(err);
|
||||||
|
});
|
||||||
|
}, cb);
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
helpers.createAndPublishTx = function(server, txOpts, signingKey, cb) {
|
helpers.createAndPublishTx = function(server, txOpts, signingKey, cb) {
|
||||||
server.createTx(txOpts, function(err, txp) {
|
server.createTx(txOpts, function(err, txp) {
|
||||||
should.not.exist(err);
|
should.not.exist(err);
|
||||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue