RanchiMall/flocore-node
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix to locator

Browse Source
This commit is contained in:
eordano 2015-04-07 16:18:08 -03:00
parent acfbef8a33
commit 1d7ff62a9e
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/blockchain.js
View File

@ -5,12 +5,16 @@ var $ = bitcore.util.preconditions;
var _ = bitcore.deps._; var _ = bitcore.deps._;
function BlockChain() { function BlockChain() {
this.tip = null; this.tip = '0000000000000000000000000000000000000000000000000000000000000000';
this.work = { this.work = {
'0000000000000000000000000000000000000000000000000000000000000000': 0 '0000000000000000000000000000000000000000000000000000000000000000': 0
}; };
this.height = {}; this.height = {
this.hashByHeight = {}; '0000000000000000000000000000000000000000000000000000000000000000': -1
};
this.hashByHeight = {
'-1': '0000000000000000000000000000000000000000000000000000000000000000'
};
this.next = {}; this.next = {};
this.prev = {}; this.prev = {};
} }
@ -44,7 +48,7 @@ BlockChain.prototype.proposeNewBlock = function(block) {
$.checkArgument(block instanceof bitcore.Block, 'Argument is not a Block instance'); $.checkArgument(block instanceof bitcore.Block, 'Argument is not a Block instance');
var prevHash = bitcore.util.buffer.reverse(block.header.prevHash).toString('hex'); var prevHash = bitcore.util.buffer.reverse(block.header.prevHash).toString('hex');
if (!this.work[prevHash]) { if (_.isUndefined(this.work[prevHash])) {
throw new Error('No previous data to estimate work'); throw new Error('No previous data to estimate work');
} }
this.addData(block); this.addData(block);
@ -118,7 +122,9 @@ BlockChain.prototype.getBlockLocator = function() {
var currentHeight = this.height[this.tip]; var currentHeight = this.height[this.tip];
var exponentialBackOff = 1; var exponentialBackOff = 1;
for (var i = 0; i < 10; i++) { for (var i = 0; i < 10; i++) {
result.push(this.hashByHeight[currentHeight--]); if (currentHeight >= 0) {
result.push(this.hashByHeight[currentHeight--]);
}
} }
while (currentHeight > 0) { while (currentHeight > 0) {
result.push(this.hashByHeight[currentHeight]); result.push(this.hashByHeight[currentHeight]);

5
lib/networkmonitor.js
View File

@ -65,8 +65,9 @@ NetworkMonitor.prototype.setupPeer = function(peer) {
}; };
NetworkMonitor.prototype.requestBlocks = function(start) { NetworkMonitor.prototype.requestBlocks = function(start) {
$.checkArgument(_.isString(start), 'start must be a block hash string'); $.checkArgument(_.isArray(start) ||
this.peer.sendMessage(messages.GetBlocks([start])); _.isString(start), 'start must be a block hash string or array');
this.peer.sendMessage(messages.GetBlocks(_.isArray(start) ? start : [start]));
}; };
NetworkMonitor.prototype.start = function() { NetworkMonitor.prototype.start = function() {

11
lib/node.js
View File

@ -48,12 +48,12 @@ var BitcoreNode = function(bus, networkMonitor, blockService, transactionService
} }
var blockchainChanges = self.blockchain.proposeNewBlock(block); var blockchainChanges = self.blockchain.proposeNewBlock(block);
Promise.series(blockchainChanges.unconfirmed.map(function(hash) { Promise.each(blockchainChanges.unconfirmed, function(hash) {
return self.blockService.unconfirm(self.blockCache[hash]); return self.blockService.unconfirm(self.blockCache[hash]);
})) })
.then(Promise.series(blockchainChanges.confirmed.map(function(hash) { .then(Promise.each(blockchainChanges.confirmed, function(hash) {
return self.blockService.confirm(self.blockCache[hash]); return self.blockService.confirm(self.blockCache[hash]);
}))) }))
.then(function() { .then(function() {
self.networkMonitor.requestBlocks(self.blockchain.getBlockLocator()); self.networkMonitor.requestBlocks(self.blockchain.getBlockLocator());
}); });
@ -105,10 +105,11 @@ BitcoreNode.create = function(opts) {
BitcoreNode.prototype.start = function() { BitcoreNode.prototype.start = function() {
var self = this; var self = this;
var genesis = bitcore.Block.fromBuffer(genesisBlocks[bitcore.Networks.defaultNetwork.name]);
this.blockService.getBlockchain().then(function(blockchain) { this.blockService.getBlockchain().then(function(blockchain) {
if (!blockchain) { if (!blockchain) {
self.blockchain = new BlockChain(); self.blockchain = new BlockChain();
self.blockchain.setTip(genesis); self.blockchain.proposeNewBlock(genesis);
} }
self.sync(); self.sync();
self.networkMonitor.start(); self.networkMonitor.start();