diff --git a/lib/bcoin/chain.js b/lib/bcoin/chain.js index 7bb562b0..fc812373 100644 --- a/lib/bcoin/chain.js +++ b/lib/bcoin/chain.js @@ -2154,8 +2154,8 @@ Chain.prototype.isActive = function isActive(prev, id, callback) { Chain.prototype.getState = function getState(prev, id, callback) { var self = this; - var period = this.network.minerConfirmationWindow; - var threshold = this.network.ruleChangeActivationThreshold; + var period = this.network.minerWindow; + var threshold = this.network.activationThreshold; var deployment = this.network.deployments[id]; var timeStart, timeTimeout, compute, height; diff --git a/lib/bcoin/network.js b/lib/bcoin/network.js index a8f32877..0364abe1 100644 --- a/lib/bcoin/network.js +++ b/lib/bcoin/network.js @@ -43,8 +43,8 @@ function Network(options) { this.block = options.block; this.witness = options.witness; this.segwitHeight = options.segwitHeight; - this.ruleChangeActivationThreshold = options.ruleChangeActivationThreshold; - this.minerConfirmationWindow = options.minerConfirmationWindow; + this.activationThreshold = options.activationThreshold; + this.minerWindow = options.minerWindow; this.deployments = options.deployments; this.prefixes = options.prefixes; this.address = options.address; diff --git a/lib/bcoin/protocol/network.js b/lib/bcoin/protocol/network.js index e1cfdf0e..ef3060d7 100644 --- a/lib/bcoin/protocol/network.js +++ b/lib/bcoin/protocol/network.js @@ -308,7 +308,7 @@ main.segwitHeight = 2000000000; * @default */ -main.ruleChangeActivationThreshold = 1916; // 95% of 2016 +main.activationThreshold = 1916; // 95% of 2016 /** * Confirmation window for versionbits. @@ -316,7 +316,7 @@ main.ruleChangeActivationThreshold = 1916; // 95% of 2016 * @default */ -main.minerConfirmationWindow = 2016; // nPowTargetTimespan / nPowTargetSpacing +main.minerWindow = 2016; // nPowTargetTimespan / nPowTargetSpacing /** * Deployments for versionbits. @@ -561,9 +561,9 @@ testnet.witness = false; testnet.segwitHeight = 2000000000; -testnet.ruleChangeActivationThreshold = 1512; // 75% for testchains +testnet.activationThreshold = 1512; // 75% for testchains -testnet.minerConfirmationWindow = 2016; // nPowTargetTimespan / nPowTargetSpacing +testnet.minerWindow = 2016; // nPowTargetTimespan / nPowTargetSpacing testnet.deployments = { testdummy: { @@ -708,9 +708,9 @@ regtest.witness = false; regtest.segwitHeight = -1; -regtest.ruleChangeActivationThreshold = 108; // 75% for testchains +regtest.activationThreshold = 108; // 75% for testchains -regtest.minerConfirmationWindow = 144; // Faster than normal for regtest (144 instead of 2016) +regtest.minerWindow = 144; // Faster than normal for regtest (144 instead of 2016) regtest.deployments = { testdummy: { @@ -855,9 +855,9 @@ segnet3.witness = true; segnet3.segwitHeight = 0; -segnet3.ruleChangeActivationThreshold = 108; +segnet3.activationThreshold = 108; -segnet3.minerConfirmationWindow = 144; +segnet3.minerWindow = 144; segnet3.deployments = {}; @@ -985,9 +985,9 @@ segnet4.witness = true; segnet4.segwitHeight = -1; -segnet4.ruleChangeActivationThreshold = 108; +segnet4.activationThreshold = 108; -segnet4.minerConfirmationWindow = 144; +segnet4.minerWindow = 144; segnet4.deployments = { testdummy: {