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

chain: drop argument due to hardfork.

Browse Source
This commit is contained in:
Christopher Jeffrey 2016-10-21 19:42:31 -07:00
parent cb87c35caf
commit 89f175dd7a
No known key found for this signature in database
GPG Key ID: 8962AB9DE6666BBD
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/chain/chain.js
View File

@ -345,7 +345,7 @@ Chain.prototype.verify = co(function* verify(block, prev) {
100); 100);
} }
state = yield this.getDeployments(block, prev, ancestors); state = yield this.getDeployments(block, prev);
// Make sure the height contained in the coinbase is correct. // Make sure the height contained in the coinbase is correct.
if (state.hasBIP34()) { if (state.hasBIP34()) {
@ -433,12 +433,11 @@ Chain.prototype.verify = co(function* verify(block, prev) {
* Check all deployments on a chain, ranging from p2sh to segwit. * Check all deployments on a chain, ranging from p2sh to segwit.
* @param {Block} block * @param {Block} block
* @param {ChainEntry} prev * @param {ChainEntry} prev
* @param {ChainEntry[]} ancestors
* @returns {Promise} * @returns {Promise}
* [{@link VerifyError}, {@link DeploymentState}]. * [{@link VerifyError}, {@link DeploymentState}].
*/ */
Chain.prototype.getDeployments = co(function* getDeployments(block, prev, ancestors) { Chain.prototype.getDeployments = co(function* getDeployments(block, prev) {
var height = prev.height + 1; var height = prev.height + 1;
var state = new DeploymentState(); var state = new DeploymentState();
var active; var active;
@ -1965,14 +1964,11 @@ Chain.prototype.computeBlockVersion = co(function* computeBlockVersion(prev) {
Chain.prototype.getDeploymentState = co(function* getDeploymentState() { Chain.prototype.getDeploymentState = co(function* getDeploymentState() {
var prev = yield this.tip.getPrevious(); var prev = yield this.tip.getPrevious();
var ancestors;
if (!prev) if (!prev)
return this.state; return this.state;
ancestors = yield prev.getRetargetAncestors(); return yield this.getDeployments(this.tip, prev);
return yield this.getDeployments(this.tip, prev, ancestors);
}); });
/** /**