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

rename some versionbits stuff.

Browse Source
This commit is contained in:
Christopher Jeffrey 2016-06-29 04:53:15 -07:00
parent 74e67c8a65
commit 5c5ff9e265
No known key found for this signature in database
GPG Key ID: 8962AB9DE6666BBD
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/bcoin/chain.js
View File

@ -2154,8 +2154,8 @@ Chain.prototype.isActive = function isActive(prev, id, callback) {
Chain.prototype.getState = function getState(prev, id, callback) { Chain.prototype.getState = function getState(prev, id, callback) {
var self = this; var self = this;
var period = this.network.minerConfirmationWindow; var period = this.network.minerWindow;
var threshold = this.network.ruleChangeActivationThreshold; var threshold = this.network.activationThreshold;
var deployment = this.network.deployments[id]; var deployment = this.network.deployments[id];
var timeStart, timeTimeout, compute, height; var timeStart, timeTimeout, compute, height;

4
lib/bcoin/network.js
View File

@ -43,8 +43,8 @@ function Network(options) {
this.block = options.block; this.block = options.block;
this.witness = options.witness; this.witness = options.witness;
this.segwitHeight = options.segwitHeight; this.segwitHeight = options.segwitHeight;
this.ruleChangeActivationThreshold = options.ruleChangeActivationThreshold; this.activationThreshold = options.activationThreshold;
this.minerConfirmationWindow = options.minerConfirmationWindow; this.minerWindow = options.minerWindow;
this.deployments = options.deployments; this.deployments = options.deployments;
this.prefixes = options.prefixes; this.prefixes = options.prefixes;
this.address = options.address; this.address = options.address;

20
lib/bcoin/protocol/network.js
View File

@ -308,7 +308,7 @@ main.segwitHeight = 2000000000;
* @default * @default
*/ */
main.ruleChangeActivationThreshold = 1916; // 95% of 2016 main.activationThreshold = 1916; // 95% of 2016
/** /**
* Confirmation window for versionbits. * Confirmation window for versionbits.
@ -316,7 +316,7 @@ main.ruleChangeActivationThreshold = 1916; // 95% of 2016
* @default * @default
*/ */
main.minerConfirmationWindow = 2016; // nPowTargetTimespan / nPowTargetSpacing main.minerWindow = 2016; // nPowTargetTimespan / nPowTargetSpacing
/** /**
* Deployments for versionbits. * Deployments for versionbits.
@ -561,9 +561,9 @@ testnet.witness = false;
testnet.segwitHeight = 2000000000; 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 = { testnet.deployments = {
testdummy: { testdummy: {
@ -708,9 +708,9 @@ regtest.witness = false;
regtest.segwitHeight = -1; 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 = { regtest.deployments = {
testdummy: { testdummy: {
@ -855,9 +855,9 @@ segnet3.witness = true;
segnet3.segwitHeight = 0; segnet3.segwitHeight = 0;
segnet3.ruleChangeActivationThreshold = 108; segnet3.activationThreshold = 108;
segnet3.minerConfirmationWindow = 144; segnet3.minerWindow = 144;
segnet3.deployments = {}; segnet3.deployments = {};
@ -985,9 +985,9 @@ segnet4.witness = true;
segnet4.segwitHeight = -1; segnet4.segwitHeight = -1;
segnet4.ruleChangeActivationThreshold = 108; segnet4.activationThreshold = 108;
segnet4.minerConfirmationWindow = 144; segnet4.minerWindow = 144;
segnet4.deployments = { segnet4.deployments = {
testdummy: { testdummy: {