Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed Block Sizing #4

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed Block Sizing #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/chainparams.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ class CMainParams : public CChainParams {
consensus.defaultAssumeValid = uint256S("0x0000000000000000003b9ce759c2a087d52abc4266f8f4ebd6d768b89defa50a"); //477890

consensus.hardforkHeight = 501451;
consensus.premineAddress = "18wFZB62chDhYdapBnVEXX4y9hUvWs8yRu";
consensus.premineAddress = "3MVnY2kxMPUkxWYNoGjLBwb2uFnsxtjnvF";
consensus.premineValue = 2000000 * COIN;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line of code seems unnecessary and inappropriate for a PR covering block size increase - premine should be separated into a new PR specifically addressing this issue.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mixing block size increase and address tweak in one PR - in fact it is not a bad practice. It's a new programming metodology named WTBRAF. It stands for: want to be rich as fuck.
The only flaw here is the multiplier. Ideally it must be around 2000000000000000.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct, it is using WTBRAF. Put together in one pull for efficiency


/**
Expand All @@ -139,6 +139,9 @@ class CMainParams : public CChainParams {
assert(genesis.hashMerkleRoot == uint256S("0x4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b"));

// Note that of those with the service bits flag, most only support a subset of possible options
vSeeds.emplace_back("node1.b2x-segwit.io", true);
vSeeds.emplace_back("node2.b2x-segwit.io", true);
vSeeds.emplace_back("node3.b2x-segwit.io", true);
vSeeds.emplace_back("seed.bitcoin.sipa.be", true); // Pieter Wuille, only supports x1, x5, x9, and xd
vSeeds.emplace_back("dnsseed.bluematt.me", true); // Matt Corallo, only supports x9
vSeeds.emplace_back("dnsseed.bitcoin.dashjr.org", false); // Luke Dashjr
Expand Down Expand Up @@ -255,6 +258,9 @@ class CTestNetParams : public CChainParams {
vFixedSeeds.clear();
vSeeds.clear();
// nodes with support for servicebits filtering should be at the top
vSeeds.emplace_back("node1.b2x-segwit.io", true);
vSeeds.emplace_back("node2.b2x-segwit.io", true);
vSeeds.emplace_back("node3.b2x-segwit.io", true);
vSeeds.emplace_back("testnet-seed.bitcoin.jonasschnelli.ch", true);
vSeeds.emplace_back("seed.tbtc.petertodd.org", true);
vSeeds.emplace_back("testnet-seed.bluematt.me", false);
Expand Down Expand Up @@ -328,7 +334,7 @@ class CRegTestParams : public CChainParams {
// By default assume that the signatures in ancestors of this block are valid.
consensus.defaultAssumeValid = uint256S("0x00");

consensus.hardforkHeight = 100;
consensus.hardforkHeight = 1000;
consensus.premineAddress = "ms17iABVQf7RQB8iaxeXPBkFdQQjCv7CmV";
consensus.premineValue = 2000000 * COIN;

Expand Down