Skip to content

Commit

Permalink
Port changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Cyprella committed Feb 21, 2018
1 parent 8cdfe55 commit 1dd1ed5
Show file tree
Hide file tree
Showing 9 changed files with 28 additions and 156 deletions.
124 changes: 0 additions & 124 deletions contrib/debian/examples/nyx.conf

This file was deleted.

6 changes: 3 additions & 3 deletions contrib/debian/examples/suc.conf
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@

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

# 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:4330
#connect=10.0.0.1:2330

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

# Listen for RPC connections on this TCP port:
#rpcport=9998
#rpcport=9999

# You can use Suc or sucd to send commands to Suc/sucd
# running on another host using this option:
Expand Down
2 changes: 1 addition & 1 deletion contrib/linearize/example-linearize-testnet.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
rpcuser=someuser
rpcpassword=somepassword
host=127.0.0.1
port=4333
port=2333

# bootstrap.dat hashlist settings (linearize-hashes)
max_height=3130000
Expand Down
2 changes: 1 addition & 1 deletion contrib/linearize/example-linearize.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
rpcuser=someuser
rpcpassword=somepassword
host=127.0.0.1
port=9998
port=9999

# bootstrap.dat hashlist settings (linearize-hashes)
max_height=3130000
Expand Down
2 changes: 1 addition & 1 deletion contrib/linearize/linearize-hashes.py
Original file line number Diff line number Diff line change
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'] = 4331
settings['port'] = 2331
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/spendfrom/spendfrom.py
Original file line number Diff line number Diff line change
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'] = 4333 if testnet else 4331
config['rpcport'] = 2333 if testnet else 2331
connect = "http://%s:%[email protected]:%s"%(config['rpcuser'], config['rpcpassword'], config['rpcport'])
try:
result = ServiceProxy(connect)
Expand Down
34 changes: 15 additions & 19 deletions src/chainparams.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@ class CMainParams : public CChainParams {
*/
pchMessageStart[0] = 0xaf;
pchMessageStart[1] = 0x3c;
pchMessageStart[2] = 0x7b;
pchMessageStart[2] = 0x7c;
pchMessageStart[3] = 0xcc;
vAlertPubKey = ParseHex("041d33468b8753a0df3b8ddbd0b64edf0e7e2bbc4996ff7d7ceb32283496d72b40421eff54bf4a223f0af838253114ed27f1661a35086870e7693b52ff040ac641");
nDefaultPort = 4330;
nDefaultPort = 2330;
nMaxTipAge = 6 * 60 * 60; // ~144 blocks behind -> 2 x fork detection time, was 24 * 60 * 60 in bitcoin
nPruneAfterHeight = 100000;

Expand All @@ -105,11 +105,11 @@ class CMainParams : public CChainParams {
assert(genesis.hashMerkleRoot == uint256S("0xbb3755d2f47f9f30081b068778b2c607fa86359d74056801f7d40c2f1f697375"));


vSeeds.push_back(CDNSSeedData("node_nl", "node1.succoin.org"));
vSeeds.push_back(CDNSSeedData("node_ny", "node2.succoin.org"));
vSeeds.push_back(CDNSSeedData("node_tx", "node3.succoin.org"));
vSeeds.push_back(CDNSSeedData("node_ca", "node4.succoin.org"));
vSeeds.push_back(CDNSSeedData("node_as", "node5.succoin.org"));
//vSeeds.push_back(CDNSSeedData("node_nl", "node1.succoin.org"));
//vSeeds.push_back(CDNSSeedData("node_ny", "node2.succoin.org"));
//vSeeds.push_back(CDNSSeedData("node_tx", "node3.succoin.org"));
//vSeeds.push_back(CDNSSeedData("node_ca", "node4.succoin.org"));
//vSeeds.push_back(CDNSSeedData("node_as", "node5.succoin.org"));

// Suc addresses start with 'N'
base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,53);
Expand All @@ -126,7 +126,7 @@ class CMainParams : public CChainParams {

vFixedSeeds = std::vector<SeedSpec6>(pnSeed6_main, pnSeed6_main + ARRAYLEN(pnSeed6_main));

fMiningRequiresPeers = true;
fMiningRequiresPeers = false
fDefaultConsistencyChecks = false;
fRequireStandard = true;
fMineBlocksOnDemand = false;
Expand All @@ -137,19 +137,15 @@ class CMainParams : public CChainParams {
strSporkPubKey = "04f44658e6f5fbfe63e1db3914aafb5116eb1bec6435493bae2b6afe329eadcd9598f0bdc4de24d20ea125d23d2a1eb509f63a8eda6e1d3f625af2501801ae27fa";
strMasternodePaymentsPubKey = "04f44658e6f5fbfe63e1db3914aafb5116eb1bec6435493bae2b6afe329eadcd9598f0bdc4de24d20ea125d23d2a1eb509f63a8eda6e1d3f625af2501801ae27fa";

checkpointData = (CCheckpointData){
checkpointData = (CCheckpointData) {
boost::assign::map_list_of
( 175, uint256S("0x0000008324b22109a4cd33aa15181a81e13b0ed6b4724fd4b0b9355637a65058"))
( 5175, uint256S("0x000000000002b5b8886acc2c0613f871e1eff192c68bde64fded61a337652065"))
( 7175, uint256S("0x000000000414eefe72278ca920180ab474a40142e8670f637051ce9161639458"))
( 10060, uint256S("0x00000000062fb058cf59407a9f5b367112d443e2ad7335fd5744efcd9dfdbd93"))
( 10306, uint256S("0x00000000005f0cf9410b0c5700ecc41589d9ef8f771352d4465008ae185e62bb"))
( 10600, uint256S("0x000000000143db6fd3c07ff85bfd59515ac1493ff4abacaaedffbcb121bd3635")),
1518942216, // * UNIX timestamp of last checkpoint block
12481, // * total number of transactions between genesis and last checkpoint
( 0, uint256S("0x000005c7d93c5345fc71f55851feef6691bab133d74533e8219681a135d3bb04")),
1483076495, // * 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)
1000 // * estimated number of transactions per day after checkpoint
500 // * estimated number of transactions per day after checkpoint
};

}
};
static CMainParams mainParams;
Expand Down Expand Up @@ -201,7 +197,7 @@ class CTestNetParams : public CChainParams {
pchMessageStart[2] = 0xbd;
pchMessageStart[3] = 0x2c;
vAlertPubKey = ParseHex("0451c826df9385f36dfd8e23bde24b9fab40aac24521dc1358abd8af6582202fd2faf1b42607f4157039f5e9cd4998e8b74e15819dc601c2c5d748f93683baa4ea");
nDefaultPort = 4332;
nDefaultPort = 2332;
nMaxTipAge = 0x7fffffff; // allow mining on top of old blocks for testnet
nPruneAfterHeight = 1000;

Expand Down
6 changes: 3 additions & 3 deletions src/chainparamsbase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class CBaseMainParams : public CBaseChainParams
public:
CBaseMainParams()
{
nRPCPort = 4331;
nRPCPort = 2331;
}
};
static CBaseMainParams mainParams;
Expand All @@ -45,7 +45,7 @@ class CBaseTestNetParams : public CBaseChainParams
public:
CBaseTestNetParams()
{
nRPCPort = 4333;
nRPCPort = 2333;
strDataDir = "testnet3";
}
};
Expand All @@ -59,7 +59,7 @@ class CBaseRegTestParams : public CBaseChainParams
public:
CBaseRegTestParams()
{
nRPCPort = 4335;
nRPCPort = 2335;
strDataDir = "regtest";
}
};
Expand Down
6 changes: 3 additions & 3 deletions src/clientversion.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@

//! These need to be macros, as clientversion.cpp's and suc*-res.rc's voodoo requires it
#define CLIENT_VERSION_MAJOR 0
#define CLIENT_VERSION_MINOR 12
#define CLIENT_VERSION_REVISION 1
#define CLIENT_VERSION_BUILD 6
#define CLIENT_VERSION_MINOR 1
#define CLIENT_VERSION_REVISION 0
#define CLIENT_VERSION_BUILD 0

//! Set to true for release, false for prerelease or test build
#define CLIENT_VERSION_IS_RELEASE true
Expand Down

0 comments on commit 1dd1ed5

Please sign in to comment.