RanchiMall/fcoin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chain: minor segnet3 fix.

Browse Source
This commit is contained in:
Christopher Jeffrey 2016-07-26 12:05:18 -07:00
parent c0ac60e291
commit bccbef0aaa
No known key found for this signature in database
GPG Key ID: 8962AB9DE6666BBD
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/bcoin/chain.js
View File

@ -640,7 +640,7 @@ Chain.prototype.getDeployments = function getDeployments(block, prev, ancestors,
// Only allow version 5 blocks (bip141 - segnet3) // Only allow version 5 blocks (bip141 - segnet3)
// once the majority of blocks are using it. // once the majority of blocks are using it.
if (this.network.oldWitness) { if (this.options.witness && this.network.oldWitness) {
if (block.version < 5 && prev.isOutdated(5, ancestors)) if (block.version < 5 && prev.isOutdated(5, ancestors))
return callback(new VerifyError(block, 'obsolete', 'bad-version', 0)); return callback(new VerifyError(block, 'obsolete', 'bad-version', 0));
} }

2
lib/bcoin/peer.js
View File

@ -356,7 +356,7 @@ Peer.prototype._onAck = function _onAck(err) {
// Let them know we support segwit (old // Let them know we support segwit (old
// segwit3 nodes require this instead // segwit3 nodes require this instead
// of service bits). // of service bits).
if (this.network.oldWitness) { if (this.pool.options.witness && this.network.oldWitness) {
if (this.version.version >= 70012) if (this.version.version >= 70012)
this.write(this.framer.haveWitness()); this.write(this.framer.haveWitness());
} }