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

bitcoind: added zmq precondition

Browse Source 
Adds a state check that transaction and block events are over the same host
and port. This is to make sure that block events can be subscribed to and
that the tip of the chain stays up to date for correct confirmation counts.
This commit is contained in:
Braydon Fuller 2016-06-01 19:43:00 -04:00
parent c897f62d02
commit cf16a23408
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/services/bitcoind.js
View File

@ -390,6 +390,11 @@ Bitcoin.prototype._checkConfigIndexes = function(spawnConfig, node) {
'Please add "zmqpubhashblock=tcp://127.0.0.1:<port>" to your configuration and restart'
);
$.checkState(
(spawnConfig.zmqpubhashblock === spawnConfig.zmqpubrawtx),
'"zmqpubrawtx" and "zmqpubhashblock" are expected to the same host and port in bitcoin.conf'
);
if (spawnConfig.reindex && spawnConfig.reindex === 1) {
log.warn('Reindex option is currently enabled. This means that bitcoind is undergoing a reindex. ' +
'The reindex flag will start the index from beginning every time the node is started, so it ' +

18
test/services/bitcoind.unit.js
View File

@ -429,7 +429,7 @@ describe('Bitcoin Service', function() {
beforeEach(function() {
sandbox.stub(log, 'warn');
});
after(function() {
afterEach(function() {
sandbox.restore();
});
it('should warn the user if reindex is set to 1 in the bitcoin.conf file', function() {
@ -448,6 +448,22 @@ describe('Bitcoin Service', function() {
log.warn.callCount.should.equal(1);
node._reindex.should.equal(true);
});
it('should warn if zmq port and hosts do not match', function() {
var bitcoind = new BitcoinService(baseConfig);
var config = {
txindex: 1,
addressindex: 1,
spentindex: 1,
server: 1,
zmqpubrawtx: 'tcp://127.0.0.1:28332',
zmqpubhashblock: 'tcp://127.0.0.1:28331',
reindex: 1
};
var node = {};
(function() {
bitcoind._checkConfigIndexes(config, node);
}).should.throw('"zmqpubrawtx" and "zmqpubhashblock"');
});
});
describe('#_resetCaches', function() {