Added nSuperblockStartBlock, adjusted testnet/regtest params

This commit is contained in:
UdjinM6 2016-08-19 20:42:47 +03:00
parent 123aa04d5b
commit b6b6d6c4c5
2 changed files with 10 additions and 6 deletions

View File

@ -79,10 +79,11 @@ public:
consensus.nInstantSendKeepLock = 24; consensus.nInstantSendKeepLock = 24;
consensus.nInstantSendReprocessBlocks = 15; consensus.nInstantSendReprocessBlocks = 15;
consensus.nBudgetPaymentsStartBlock = 328008; // actual historical value consensus.nBudgetPaymentsStartBlock = 328008; // actual historical value
consensus.nSuperblockCycle = 576; // Superblocks can be issued daily
consensus.nBudgetPaymentsCycleBlocks = 16616; // ~(60*24*30)/2.6, actual number of blocks per month is 200700 / 12 = 16725 consensus.nBudgetPaymentsCycleBlocks = 16616; // ~(60*24*30)/2.6, actual number of blocks per month is 200700 / 12 = 16725
consensus.nBudgetPaymentsWindowBlocks = 100; consensus.nBudgetPaymentsWindowBlocks = 100;
consensus.nBudgetProposalEstablishingTime = 60*60*24; consensus.nBudgetProposalEstablishingTime = 60*60*24;
consensus.nSuperblockStartBlock = 543210; // TODO, the block at which 12.1 goes live.
consensus.nSuperblockCycle = 576; // Superblocks can be issued daily
consensus.nMasternodeMinimumConfirmations = 15; consensus.nMasternodeMinimumConfirmations = 15;
consensus.nMajorityEnforceBlockUpgrade = 750; consensus.nMajorityEnforceBlockUpgrade = 750;
consensus.nMajorityRejectBlockOutdated = 950; consensus.nMajorityRejectBlockOutdated = 950;
@ -196,11 +197,12 @@ public:
consensus.nMasternodePaymentsIncreasePeriod = 576; consensus.nMasternodePaymentsIncreasePeriod = 576;
consensus.nInstantSendKeepLock = 6; consensus.nInstantSendKeepLock = 6;
consensus.nInstantSendReprocessBlocks = 4; consensus.nInstantSendReprocessBlocks = 4;
consensus.nBudgetPaymentsStartBlock = 78476; consensus.nBudgetPaymentsStartBlock = 78476; // TODO
consensus.nSuperblockCycle = 576;
consensus.nBudgetPaymentsCycleBlocks = 50; consensus.nBudgetPaymentsCycleBlocks = 50;
consensus.nBudgetPaymentsWindowBlocks = 10; consensus.nBudgetPaymentsWindowBlocks = 10;
consensus.nBudgetProposalEstablishingTime = 60*20; consensus.nBudgetProposalEstablishingTime = 60*20;
consensus.nSuperblockStartBlock = 54321; // TODO, the block at which 12.1 goes live.
consensus.nSuperblockCycle = 24; // Superblocks can be issued hourly on testnet
consensus.nMasternodeMinimumConfirmations = 1; consensus.nMasternodeMinimumConfirmations = 1;
consensus.nMajorityEnforceBlockUpgrade = 51; consensus.nMajorityEnforceBlockUpgrade = 51;
consensus.nMajorityRejectBlockOutdated = 75; consensus.nMajorityRejectBlockOutdated = 75;
@ -298,9 +300,10 @@ public:
consensus.nInstantSendReprocessBlocks = 4; consensus.nInstantSendReprocessBlocks = 4;
consensus.nBudgetPaymentsStartBlock = 1000; consensus.nBudgetPaymentsStartBlock = 1000;
consensus.nBudgetPaymentsCycleBlocks = 50; consensus.nBudgetPaymentsCycleBlocks = 50;
consensus.nSuperblockCycle = 576; consensus.nBudgetPaymentsWindowBlocks = 10;
consensus.nBudgetPaymentsWindowBlocks = 100;
consensus.nBudgetProposalEstablishingTime = 60*20; consensus.nBudgetProposalEstablishingTime = 60*20;
consensus.nSuperblockStartBlock = 1500;
consensus.nSuperblockCycle = 10;
consensus.nMasternodeMinimumConfirmations = 1; consensus.nMasternodeMinimumConfirmations = 1;
consensus.nMajorityEnforceBlockUpgrade = 750; consensus.nMajorityEnforceBlockUpgrade = 750;
consensus.nMajorityRejectBlockOutdated = 950; consensus.nMajorityRejectBlockOutdated = 950;

View File

@ -44,9 +44,10 @@ struct Params {
int nInstantSendReprocessBlocks; int nInstantSendReprocessBlocks;
int nBudgetPaymentsStartBlock; int nBudgetPaymentsStartBlock;
int nBudgetPaymentsCycleBlocks; int nBudgetPaymentsCycleBlocks;
int nSuperblockCycle;
int nBudgetPaymentsWindowBlocks; int nBudgetPaymentsWindowBlocks;
int nBudgetProposalEstablishingTime; // in seconds int nBudgetProposalEstablishingTime; // in seconds
int nSuperblockStartBlock;
int nSuperblockCycle; // in blocks
int nMasternodeMinimumConfirmations; int nMasternodeMinimumConfirmations;
/** Used to check majorities for block version upgrade */ /** Used to check majorities for block version upgrade */
int nMajorityEnforceBlockUpgrade; int nMajorityEnforceBlockUpgrade;