Skip to content

Commit

Permalink
Changes for genesis block and mainnet test run
Browse files Browse the repository at this point in the history
  • Loading branch information
tohsnoom committed Oct 3, 2018
1 parent 89b963c commit 1ca148e
Show file tree
Hide file tree
Showing 46 changed files with 165 additions and 119 deletions.
Binary file added background.tiff
Binary file not shown.
Binary file added background.tiff.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added background.tiff@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions contrib/bitrpc/bitrpc.py
Expand Up @@ -11,9 +11,9 @@


if rpcpass == "":
access = ServiceProxy("http://127.0.0.1:19684")
access = ServiceProxy("http://127.0.0.1:19688")
else:
access = ServiceProxy("http://"+rpcuser+":"+rpcpass+"@127.0.0.1:19684")
access = ServiceProxy("http://"+rpcuser+":"+rpcpass+"@127.0.0.1:19688")
cmd = sys.argv[1].lower()

if cmd == "backupwallet":
Expand Down
6 changes: 3 additions & 3 deletions contrib/debian/examples/monetaryunit.conf
Expand Up @@ -38,11 +38,11 @@

# Use as many addnode= settings as you like to connect to specific peers
#addnode=69.164.218.197
#addnode=10.0.0.2:19683
#addnode=10.0.0.2:19687

# Alternatively use as many connect= settings as you like to connect ONLY to specific peers
#connect=69.164.218.197
#connect=10.0.0.1:19683
#connect=10.0.0.1:19687

# Listening mode, enabled by default except when 'connect' is being used
#listen=1
Expand Down Expand Up @@ -79,7 +79,7 @@
#rpcallowip=2001:db8:85a3:0:0:8a2e:370:7334/96

# Listen for RPC connections on this TCP port:
#rpcport=19684
#rpcport=19688

# You can use MonetaryUnit or monetaryunitd to send commands to MonetaryUnit/monetaryunitd
# running on another host using this option:
Expand Down
4 changes: 2 additions & 2 deletions contrib/debian/manpages/monetaryunit-qt.1
Expand Up @@ -41,7 +41,7 @@ Use proxy to reach tor hidden services (default: same as \fB\-proxy\fR)
Allow DNS lookups for \fB\-addnode\fR, \fB\-seednode\fR and \fB\-connect\fR
.TP
\fB\-port=\fR<port>
Listen for connections on <port> (default: 19683 or testnet: 19685)
Listen for connections on <port> (default: 19687 or testnet: 19685)
.TP
\fB\-maxconnections=\fR<n>
Maintain at most <n> connections to peers (default: 125)
Expand Down Expand Up @@ -122,7 +122,7 @@ Username for JSON\-RPC connections
Password for JSON\-RPC connections
.TP
\fB\-rpcport=\fR<port>
Listen for JSON\-RPC connections on <port> (default: 19684 or testnet: 19686)
Listen for JSON\-RPC connections on <port> (default: 19688 or testnet: 19686)
.TP
\fB\-rpcallowip=\fR<ip>
Allow JSON\-RPC connections from specified IP address
Expand Down
6 changes: 3 additions & 3 deletions contrib/debian/manpages/monetaryunit.conf.5
Expand Up @@ -18,10 +18,10 @@ Enable or disable run on the test network instead of the real *monetaryunit* net
\fBproxy=\fR\fI'127.0.0.1:9050'\fR
Connect via a socks4 proxy.
.TP
\fBaddnode=\fR\fI'10.0.0.2:19683'\fR
\fBaddnode=\fR\fI'10.0.0.2:19687'\fR
Use as many *addnode=* settings as you like to connect to specific peers.
.TP
\fBconnect=\fR\fI'10.0.0.1:19683'\fR
\fBconnect=\fR\fI'10.0.0.1:19687'\fR
Use as many *connect=* settings as you like to connect ONLY to specific peers.
.TP
\fRmaxconnections=\fR\fI'value'\fR
Expand All @@ -40,7 +40,7 @@ You must set *rpcpassword* to secure the JSON-RPC api.
\fBrpcallowip=\fR\fI'192.168.1.*'\fR
By default, only RPC connections from localhost are allowed. Specify as many *rpcallowip=* settings as you like to allow connections from other hosts (and you may use * as a wildcard character).
.TP
\fBrpcport=\fR\fI'19684'\fR
\fBrpcport=\fR\fI'19688'\fR
Listen for RPC connections on this TCP port.
.TP
\fBrpcconnect=\fR\fI'127.0.0.1'\fR
Expand Down
1 change: 1 addition & 0 deletions contrib/ledgertxfr/balances.json

Large diffs are not rendered by default.

Binary file added contrib/ledgertxfr/balances.json.gz
Binary file not shown.
1 change: 1 addition & 0 deletions contrib/ledgertxfr/balances_main.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions contrib/ledgertxfr/balances_test.json
@@ -0,0 +1 @@
[{"address": "y1WbajfHb9oSntK7m1zfbA8SktM6AhRBmi", "balance": 56679820331603}, {"address": "xwkgZohhqnG9mnwHtvTGWjJXfYE4hASnwo", "balance": 310000000}, {"address": "yK9GaxT3JHwniSoZCfJrLDYgG9io49qbm2", "balance": 2500000}, {"address": "xwEvhW412ohbf6TWFEB8poVmhKy8GjnaF3", "balance": 320100000}, {"address": "y84jE1N1qzFpoag8b3m1p2akoyTWQBWHSt", "balance": 385000000}, {"address": "y7F98n6HAHETZUwQtNVrfy76vu4hY2mduU", "balance": 242500000}, {"address": "yE7xh5ECmY2diqJV8mfYieELS3vrgHQYzg", "balance": 327000000}, {"address": "yBmp3hJWVJd2LePeAMyrzZKrsRMJQA1iZa", "balance": 12500000}, {"address": "y41Vwexk3TpXd7su3EkKWGr4QbT6CdvkpM", "balance": 330100000}, {"address": "y8aWDSjhrXRqG8UKFVbPBJJxSVnRdEAeCf", "balance": 273000000}, {"address": "y7DcH1DAzqAtBBn1n9E7FE4Dnb5jU9A2ie", "balance": 2500000}, {"address": "yC9D8hQg6AHvQjXdoWMxuSHgYe5ygt2uzg", "balance": 3602823390}]
40 changes: 40 additions & 0 deletions contrib/ledgertxfr/txfr.py
@@ -0,0 +1,40 @@

from bitcoinrpc.authproxy import AuthServiceProxy, JSONRPCException
from itertools import islice
import time
import json

# Breaks up dictionary into chunks
def chunks(data, SIZE=1000):
it = iter(data)
for i in range(0, len(data), SIZE):
yield {k:data[k] for k in islice(it, SIZE)}

# Number of addresses per transaction in sendmany
batch_size = 5

balances = json.load(open("balances.json","r"))

# Make dictionary of addresses and decimal balances
disbursals = {}
total_amount = 0
for entry in balances:
# Convert from satoshis to decimal value
disbursals[entry['address']] = entry['balance'] / 100000000
total_amount += entry['balance'] / 100000000

print("Total amount to send: " + str(total_amount))
exit()

# replace rpcuser and rpcpassword values for your local node to match helium.conf
rpc_connection = AuthServiceProxy("http://%s:%s@%s:%s" % ('user', 'password', '127.0.0.1', '19688'))
print(rpc_connection.getbalance())

# Chunking was not necessary since there were less than 800 transactions,
# but would be for very large disbursals that may exceed maximum transaction size.
# Premine funds were sent in advance manually to an address with Premine as the label.
# If this had not been done, the default account of "" would have worked.
for chunk in chunks(disbursals, batch_size):
print(chunk)
sendcoins = rpc_connection.sendmany("", chunk)
time.sleep(10)
2 changes: 1 addition & 1 deletion contrib/linearize/example-linearize.cfg
Expand Up @@ -3,7 +3,7 @@
rpcuser=someuser
rpcpassword=somepassword
host=127.0.0.1
port=19683
port=19687

# bootstrap.dat hashlist settings (linearize-hashes)
max_height=313000
Expand Down
2 changes: 1 addition & 1 deletion contrib/linearize/linearize-hashes.py
Expand Up @@ -96,7 +96,7 @@ def get_block_hashes(settings, max_blocks_per_call=10000):
if 'host' not in settings:
settings['host'] = '127.0.0.1'
if 'port' not in settings:
settings['port'] = 19684
settings['port'] = 19688
if 'min_height' not in settings:
settings['min_height'] = 0
if 'max_height' not in settings:
Expand Down
2 changes: 1 addition & 1 deletion contrib/qos/README.md
@@ -1,5 +1,5 @@
### Qos ###

This is a Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the Bitcoin network. It limits outbound TCP traffic with a source or destination port of 19683, but not if the destination IP is within a LAN (defined as 192.168.x.x).
This is a Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the Bitcoin network. It limits outbound TCP traffic with a source or destination port of 19687, but not if the destination IP is within a LAN (defined as 192.168.x.x).

This means one can have an always-on monetaryunitd instance running, and another local monetaryunitd/monetaryunit-qt instance which connects to this node and receives blocks from it.
6 changes: 3 additions & 3 deletions contrib/qos/tc.sh
Expand Up @@ -32,10 +32,10 @@ tc filter add dev ${IF} parent 1: protocol ip prio 2 handle 2 fw classid 1:11
# ret=$?
#done

#limit outgoing traffic to and from port 19683. but not when dealing with a host on the local network
#limit outgoing traffic to and from port 19687. but not when dealing with a host on the local network
# (defined by $LOCALNET)
# --set-mark marks packages matching these criteria with the number "2"
# these packages are filtered by the tc filter with "handle 2"
# this filter sends the packages into the 1:11 class, and this class is limited to ${LIMIT}
iptables -t mangle -A OUTPUT -p tcp -m tcp --dport 19683 ! -d ${LOCALNET} -j MARK --set-mark 0x2
iptables -t mangle -A OUTPUT -p tcp -m tcp --sport 19683 ! -d ${LOCALNET} -j MARK --set-mark 0x2
iptables -t mangle -A OUTPUT -p tcp -m tcp --dport 19687 ! -d ${LOCALNET} -j MARK --set-mark 0x2
iptables -t mangle -A OUTPUT -p tcp -m tcp --sport 19687 ! -d ${LOCALNET} -j MARK --set-mark 0x2
2 changes: 1 addition & 1 deletion contrib/seeds/generate-seeds.py
Expand Up @@ -127,7 +127,7 @@ def main():
g.write(' * IPv4 as well as onion addresses are wrapped inside a IPv6 address accordingly.\n')
g.write(' */\n')
with open(os.path.join(indir,'nodes_main.txt'),'r') as f:
process_nodes(g, f, 'pnSeed6_main', 19683)
process_nodes(g, f, 'pnSeed6_main', 19687)
g.write('\n')
with open(os.path.join(indir,'nodes_test.txt'),'r') as f:
process_nodes(g, f, 'pnSeed6_test', 19685)
Expand Down
4 changes: 2 additions & 2 deletions contrib/seeds/nodes_main.txt
@@ -1,2 +1,2 @@
192.99.217.102:19683
164.132.151.109:19683
192.99.217.102:19687
164.132.151.109:19687
2 changes: 1 addition & 1 deletion contrib/spendfrom/spendfrom.py
Expand Up @@ -67,7 +67,7 @@ def connect_JSON(config):
testnet = config.get('testnet', '0')
testnet = (int(testnet) > 0) # 0/1 in config file, convert to True/False
if not 'rpcport' in config:
config['rpcport'] = 19686 if testnet else 19684
config['rpcport'] = 19686 if testnet else 19688
connect = "http://%s:%s@127.0.0.1:%s"%(config['rpcuser'], config['rpcpassword'], config['rpcport'])
try:
result = ServiceProxy(connect)
Expand Down
2 changes: 1 addition & 1 deletion doc/Doxyfile
Expand Up @@ -38,7 +38,7 @@ PROJECT_NAME = "MonetaryUnit Core"
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = 1.3.3
PROJECT_NUMBER = 1.4.2

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
4 changes: 2 additions & 2 deletions doc/guide-startmany.md
Expand Up @@ -108,8 +108,8 @@ alias ipaddress:port masternode_private_key collateral_output collateral_output_
Example:

```
mn01 127.0.0.1:19683 93HaYBVUCYjEMeeH1Y4sBGLALQZE1Yc1K64xiqgX37tGBDQL8Xg 2bcd3c84c84f87eaa86e4e56834c92927a07f9e18718810b92e0d0324456a67c 0
mn02 127.0.0.2:19683 93WaAb3htPJEV8E9aQcN23Jt97bPex7YvWfgMDTUdWJvzmrMqey aa9f1034d973377a5e733272c3d0eced1de22555ad45d6b24abadff8087948d4 0 7gnwGHt17heGpG9Crfeh4KGpYNFugPhJdh:25
mn01 127.0.0.1:19687 93HaYBVUCYjEMeeH1Y4sBGLALQZE1Yc1K64xiqgX37tGBDQL8Xg 2bcd3c84c84f87eaa86e4e56834c92927a07f9e18718810b92e0d0324456a67c 0
mn02 127.0.0.2:19687 93WaAb3htPJEV8E9aQcN23Jt97bPex7YvWfgMDTUdWJvzmrMqey aa9f1034d973377a5e733272c3d0eced1de22555ad45d6b24abadff8087948d4 0 7gnwGHt17heGpG9Crfeh4KGpYNFugPhJdh:25
```

## What about the monetaryunit.conf file?
Expand Down
6 changes: 3 additions & 3 deletions doc/masternode_conf.md
Expand Up @@ -10,9 +10,9 @@ The new masternode.conf format consists of a space seperated text file. Each lin

Example:
```
mn1 127.0.0.2:19683 93HaYBVUCYjEMeeH1Y4sBGLALQZE1Yc1K64xiqgX37tGBDQL8Xg 2bcd3c84c84f87eaa86e4e56834c92927a07f9e18718810b92e0d0324456a67c 0
mn2 127.0.0.3:19683 93WaAb3htPJEV8E9aQcN23Jt97bPex7YvWfgMDTUdWJvzmrMqey aa9f1034d973377a5e733272c3d0eced1de22555ad45d6b24abadff8087948d4 0 7gnwGHt17heGpG9Crfeh4KGpYNFugPhJdh:33
mn3 127.0.0.4:19683 92Da1aYg6sbenP6uwskJgEY2XWB5LwJ7bXRqc3UPeShtHWJDjDv db478e78e3aefaa8c12d12ddd0aeace48c3b451a8b41c570d0ee375e2a02dfd9 1 7gnwGHt17heGpG9Crfeh4KGpYNFugPhJdh
mn1 127.0.0.2:19687 93HaYBVUCYjEMeeH1Y4sBGLALQZE1Yc1K64xiqgX37tGBDQL8Xg 2bcd3c84c84f87eaa86e4e56834c92927a07f9e18718810b92e0d0324456a67c 0
mn2 127.0.0.3:19687 93WaAb3htPJEV8E9aQcN23Jt97bPex7YvWfgMDTUdWJvzmrMqey aa9f1034d973377a5e733272c3d0eced1de22555ad45d6b24abadff8087948d4 0 7gnwGHt17heGpG9Crfeh4KGpYNFugPhJdh:33
mn3 127.0.0.4:19687 92Da1aYg6sbenP6uwskJgEY2XWB5LwJ7bXRqc3UPeShtHWJDjDv db478e78e3aefaa8c12d12ddd0aeace48c3b451a8b41c570d0ee375e2a02dfd9 1 7gnwGHt17heGpG9Crfeh4KGpYNFugPhJdh
```

In the example above:
Expand Down
6 changes: 3 additions & 3 deletions doc/tor.md
Expand Up @@ -59,7 +59,7 @@ SOCKSPolicy accept 127.0.0.1/8
Log notice file /var/log/tor/notices.log
ControlPort 9051
HiddenServiceDir /var/lib/tor/dnet/
HiddenServicePort 989 127.0.0.1:19683
HiddenServicePort 989 127.0.0.1:19687
HiddenServiceStatistics 0
ORPort 9001
LongLivedPorts 989
Expand All @@ -69,7 +69,7 @@ NumEntryGuards 8
```

The directory can be different of course, but (both) port numbers should be equal to
your monetaryunitd's P2P listen port (19683 by default).
your monetaryunitd's P2P listen port (19687 by default).
```
-externalip=X You can tell monetaryunit about its publicly reachable address using
this option, and this can be a .onion address. Given the above
Expand Down Expand Up @@ -102,7 +102,7 @@ specify:
./monetaryunitd ... -discover
```

and open port 19683 on your firewall (or use -upnp).
and open port 19687 on your firewall (or use -upnp).

If you only want to use Tor to reach onion addresses, but not use it as a proxy
for normal IPv4/IPv6 communication, use:
Expand Down
47 changes: 24 additions & 23 deletions src/chainparams.cpp
Expand Up @@ -55,29 +55,29 @@ static void convertSeed6(std::vector<CAddress>& vSeedsOut, const SeedSpec6* data
// + Contains no strange transactions
static Checkpoints::MapCheckpoints mapCheckpoints =
boost::assign::map_list_of
( 0, uint256("0xedee755717c4de66ce52056e36ae0f6e9f0269667fd8a06e3c5367588cbfadbd"));
( 0, uint256("0x1f5a41cef13983949b22d9dbeda4bb932709786633ef4acf7a9eda5437e51a46"));

static const Checkpoints::CCheckpointData data = {
&mapCheckpoints,
1532555998, // * UNIX timestamp of last checkpoint block
943282, // * total number of transactions between genesis and last checkpoint
1536266133, // * UNIX timestamp of last checkpoint block
0, // * total number of transactions between genesis and last checkpoint
// (the tx=... number in the SetBestChain debug.log lines)
1500 // * estimated number of transactions per day after checkpoint
2200 // * estimated number of transactions per day after checkpoint
};

static Checkpoints::MapCheckpoints mapCheckpointsTestnet =
boost::assign::map_list_of(0, uint256("0x6bb5bda42ae892d9d73efdb5ee95ac997e1d6621857d3ba1de5200fc99a2fa61"));
boost::assign::map_list_of(0, uint256("0x1785d5da14778e4381c123748b01b5715f4faa4bdad72b5380d3e3ba04ff1c08"));
static const Checkpoints::CCheckpointData dataTestnet = {
&mapCheckpointsTestnet,
1504595227,
1505224800,
0,
250};

static Checkpoints::MapCheckpoints mapCheckpointsRegtest =
boost::assign::map_list_of(0, uint256("0x6bb5bda42ae892d9d73efdb5ee95ac997e1d6621857d3ba1de5200fc99a2fa61"));
boost::assign::map_list_of(0, uint256("0x1998a6003c5d9d9acd43e0c6c4d919e1e3dbd537efbd8d1c124db69e40bc0b30"));
static const Checkpoints::CCheckpointData dataRegtest = {
&mapCheckpointsRegtest,
1504595227,
1505224800,
0,
100};

Expand All @@ -99,7 +99,7 @@ class CMainParams : public CChainParams
pchMessageStart[2] = 0xfd;
pchMessageStart[3] = 0xea;
vAlertPubKey = ParseHex("04659d53bd8f7ad9d34a17281febedac754e5a6eb136142d3a9c6c0ea21b6ed7498ceb3d872eed00ae755f7aeadaeb1d9ab5e1a8f1e7efcd0ddcb39d4623c12790");
nDefaultPort = 19683;
nDefaultPort = 19687;
bnProofOfWorkLimit = ~uint256(0) >> 1;
nMaxReorganizationDepth = 100;
nEnforceBlockUpgradeMajority = 750;
Expand All @@ -113,7 +113,8 @@ class CMainParams : public CChainParams
nMaxMoneyOut = 4000000000 * COIN;

/** Height or Time Based Activations **/
nLastPOWBlock = 400;
// TODO Moonshot: Change last POW block back to 400 for real mainnet launch
nLastPOWBlock = 900;
nModifierUpdateBlock = 1;

/**
Expand All @@ -126,7 +127,7 @@ class CMainParams : public CChainParams
* CTxOut(nValue=50.00000000, scriptPubKey=0xA9037BAC7050C479B121CF)
* vMerkleTree: e0028e
*/
const char* pszTimestamp = "Bitcoin Block #540242: 0x000000000000000000265e9ecd8728c5f24eea700831ca4d74b2c8ea64af0aee";
const char* pszTimestamp = "Bitcoin Block #544171: 0x0000000000000000002044427f9186e47dbe5c5157d175d81c5ab0416227dc6f";
CMutableTransaction txNew;
txNew.vin.resize(1);
txNew.vout.resize(1);
Expand All @@ -138,7 +139,7 @@ class CMainParams : public CChainParams
genesis.nVersion = 1;
genesis.nTime = 1536266133;
genesis.nBits = 0x207fffff;;
genesis.nNonce = 4;
genesis.nNonce = 5;

hashGenesisBlock = genesis.GetHash();
if (regenerate) {
Expand Down Expand Up @@ -166,10 +167,10 @@ class CMainParams : public CChainParams
LogPrintf(" time: %u\n", genesis.nTime);
LogPrintf(" hash: 0x%s\n", genesis.GetHash().ToString().c_str());
LogPrintf(" merklehash: 0x%s\n", genesis.hashMerkleRoot.ToString().c_str());
assert(hashGenesisBlock == uint256("0x388bb718bed848a70552d8a041682100a86253f555ccbd97b95c4af833902ba1"));
assert(genesis.hashMerkleRoot == uint256("0x4f74c21a149b2ba9771046edb4c441aa6140c579916191ece307697f90ebd071"));
assert(hashGenesisBlock == uint256("0x1f5a41cef13983949b22d9dbeda4bb932709786633ef4acf7a9eda5437e51a46"));
assert(genesis.hashMerkleRoot == uint256("0x8774d5554422df62b26e0477edba63ec6568acf2d5bfa7d34c883e2f9b700614"));
}
// Mainnet --- nonce: 4 time: 1536266133 hash: 0x388bb718bed848a70552d8a041682100a86253f555ccbd97b95c4af833902ba1 merklehash: 0x4f74c21a149b2ba9771046edb4c441aa6140c579916191ece307697f90ebd071
// Mainnet --- nonce: 5 time: 1536266133 hash: 0x1f5a41cef13983949b22d9dbeda4bb932709786633ef4acf7a9eda5437e51a46 merklehash: 0x8774d5554422df62b26e0477edba63ec6568acf2d5bfa7d34c883e2f9b700614

vSeeds.push_back(CDNSSeedData("dns1", "dns1.monetaryunit.org"));
vSeeds.push_back(CDNSSeedData("dns2", "dns2.monetaryunit.org"));
Expand Down Expand Up @@ -240,7 +241,7 @@ class CTestNetParams : public CMainParams

//! Modify the testnet genesis block so the timestamp is valid for a later start.
genesis.nTime = 1505224800;
genesis.nNonce = 0;
genesis.nNonce = 1;

hashGenesisBlock = genesis.GetHash();
if (regenerate) {
Expand Down Expand Up @@ -269,10 +270,10 @@ class CTestNetParams : public CMainParams
LogPrintf(" time: %u\n", genesis.nTime);
LogPrintf(" hash: 0x%s\n", genesis.GetHash().ToString().c_str());
LogPrintf(" merklehash: 0x%s\n", genesis.hashMerkleRoot.ToString().c_str());
assert(hashGenesisBlock == uint256("0x593d24a90efc74135f4a2162c71b975dcdb1f0696b2689f4436449aa34749255"));
assert(genesis.hashMerkleRoot == uint256("0x4f74c21a149b2ba9771046edb4c441aa6140c579916191ece307697f90ebd071"));
assert(hashGenesisBlock == uint256("0x1785d5da14778e4381c123748b01b5715f4faa4bdad72b5380d3e3ba04ff1c08"));
assert(genesis.hashMerkleRoot == uint256("0x8774d5554422df62b26e0477edba63ec6568acf2d5bfa7d34c883e2f9b700614"));
}
// Testnet --- nonce: 0 time: 1505224800 hash: 0x593d24a90efc74135f4a2162c71b975dcdb1f0696b2689f4436449aa34749255 merklehash: 0x4f74c21a149b2ba9771046edb4c441aa6140c579916191ece307697f90ebd071
// Testnet --- nonce: 1 time: 1505224800 hash: 0x1785d5da14778e4381c123748b01b5715f4faa4bdad72b5380d3e3ba04ff1c08 merklehash: 0x8774d5554422df62b26e0477edba63ec6568acf2d5bfa7d34c883e2f9b700614

vFixedSeeds.clear();
vSeeds.clear();
Expand Down Expand Up @@ -339,7 +340,7 @@ class CRegTestParams : public CTestNetParams
bnProofOfWorkLimit = ~uint256(0) >> 1;
genesis.nTime = 1505224800;
genesis.nBits = 0x207fffff;
genesis.nNonce = 12345;
genesis.nNonce = 12346;
nMaturity = 0;
nLastPOWBlock = 999999999; // PoS complicates Regtest because of timing issues
nDefaultPort = 19685;
Expand Down Expand Up @@ -370,10 +371,10 @@ class CRegTestParams : public CTestNetParams
LogPrintf(" time: %u\n", genesis.nTime);
LogPrintf(" hash: 0x%s\n", genesis.GetHash().ToString().c_str());
LogPrintf(" merklehash: 0x%s\n", genesis.hashMerkleRoot.ToString().c_str());
assert(hashGenesisBlock == uint256("0x19c95320506c1a25db643682cb74088713c18449a218c1680c026382b0e99cab"));
assert(genesis.hashMerkleRoot == uint256("0x4f74c21a149b2ba9771046edb4c441aa6140c579916191ece307697f90ebd071"));
assert(hashGenesisBlock == uint256("0x1998a6003c5d9d9acd43e0c6c4d919e1e3dbd537efbd8d1c124db69e40bc0b30"));
assert(genesis.hashMerkleRoot == uint256("0x8774d5554422df62b26e0477edba63ec6568acf2d5bfa7d34c883e2f9b700614"));
}
// Regtestnet --- nonce: 12345 time: 1505224800 hash: 0x19c95320506c1a25db643682cb74088713c18449a218c1680c026382b0e99cab merklehash: 0x4f74c21a149b2ba9771046edb4c441aa6140c579916191ece307697f90ebd071
// Regtestnet --- nonce: 12346 time: 1505224800 hash: 0x1998a6003c5d9d9acd43e0c6c4d919e1e3dbd537efbd8d1c124db69e40bc0b30 merklehash: 0x8774d5554422df62b26e0477edba63ec6568acf2d5bfa7d34c883e2f9b700614

if (regenerate)
exit(0);
Expand Down
2 changes: 1 addition & 1 deletion src/chainparamsbase.cpp
Expand Up @@ -22,7 +22,7 @@ class CBaseMainParams : public CBaseChainParams
CBaseMainParams()
{
networkID = CBaseChainParams::MAIN;
nRPCPort = 19684;
nRPCPort = 19688;
}
};
static CBaseMainParams mainParams;
Expand Down

0 comments on commit 1ca148e

Please sign in to comment.