diff --git a/contrib/debian/examples/nyx.conf b/contrib/debian/examples/nyx.conf deleted file mode 100644 index 95cae94..0000000 --- a/contrib/debian/examples/nyx.conf +++ /dev/null @@ -1,124 +0,0 @@ -## -## nyx.conf configuration file. Lines beginning with # are comments. -## - -# Network-related settings: - -# Run on the test network instead of the real nyx network. -#testnet=0 - -# Run a regression test network -#regtest=0 - -# Connect via a SOCKS5 proxy -#proxy=127.0.0.1:9050 - -# Bind to given address and always listen on it. Use [host]:port notation for IPv6 -#bind= - -# Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6 -#whitebind= - -############################################################## -## Quick Primer on addnode vs connect ## -## Let's say for instance you use addnode=4.2.2.4 ## -## addnode will connect you to and tell you about the ## -## nodes connected to 4.2.2.4. In addition it will tell ## -## the other nodes connected to it that you exist so ## -## they can connect to you. ## -## connect will not do the above when you 'connect' to it. ## -## It will *only* connect you to 4.2.2.4 and no one else.## -## ## -## So if you're behind a firewall, or have other problems ## -## finding nodes, add some using 'addnode'. ## -## ## -## If you want to stay private, use 'connect' to only ## -## connect to "trusted" nodes. ## -## ## -## If you run multiple nodes on a LAN, there's no need for ## -## all of them to open lots of connections. Instead ## -## 'connect' them all to one node that is port forwarded ## -## and has lots of connections. ## -## Thanks goes to [Noodle] on Freenode. ## -############################################################## - -# Use as many addnode= settings as you like to connect to specific peers -#addnode=69.164.218.197 -#addnode=10.0.0.2:4330 - -# 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 - -# Listening mode, enabled by default except when 'connect' is being used -#listen=1 - -# Maximum number of inbound+outbound connections. -#maxconnections= - -# -# JSON-RPC options (for controlling a running Nyx/nyxd process) -# - -# server=1 tells Nyx-Qt and nyxd to accept JSON-RPC commands -#server=0 - -# Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. -# This option can be specified multiple times (default: bind to all interfaces) -#rpcbind= - -# You must set rpcuser and rpcpassword to secure the JSON-RPC api -#rpcuser=Ulysseys -#rpcpassword=YourSuperGreatPasswordNumber_DO_NOT_USE_THIS_OR_YOU_WILL_GET_ROBBED_385593 - -# How many seconds Nyx Core will wait for a complete RPC HTTP request. -# after the HTTP connection is established. -#rpcclienttimeout=30 - -# By default, only RPC connections from localhost are allowed. -# Specify as many rpcallowip= settings as you like to allow connections from other hosts, -# either as a single IPv4/IPv6 or with a subnet specification. - -# NOTE: opening up the RPC port to hosts outside your local trusted network is NOT RECOMMENDED, -# because the rpcpassword is transmitted over the network unencrypted. - -# server=1 tells Nyx-Qt to accept JSON-RPC commands. -# it is also read by nyxd to determine if RPC should be enabled -#rpcallowip=10.1.1.34/255.255.255.0 -#rpcallowip=1.2.3.4/24 -#rpcallowip=2001:db8:85a3:0:0:8a2e:370:7334/96 - -# Listen for RPC connections on this TCP port: -#rpcport=9998 - -# You can use Nyx or nyxd to send commands to Nyx/nyxd -# running on another host using this option: -#rpcconnect=127.0.0.1 - -# Transaction Fee Changes in 0.12.0 - -# Send transactions as zero-fee transactions if possible (default: 0) -#sendfreetransactions=0 - -# Create transactions that have enough fees (or priority) so they are likely to begin confirmation within n blocks (default: 1). -# This setting is over-ridden by the -paytxfee option. -#txconfirmtarget=n - -# Miscellaneous options - -# Pre-generate this many public/private key pairs, so wallet backups will be valid for -# both prior transactions and several dozen future transactions. -#keypool=100 - -# Pay an optional transaction fee every time you send nyxs. Transactions with fees -# are more likely than free transactions to be included in generated blocks, so may -# be validated sooner. -#paytxfee=0.00 - -# User interface options - -# Start Nyx minimized -#min=1 - -# Minimize to the system tray -#minimizetotray=1 diff --git a/contrib/debian/examples/suc.conf b/contrib/debian/examples/suc.conf index db7f537..6988996 100644 --- a/contrib/debian/examples/suc.conf +++ b/contrib/debian/examples/suc.conf @@ -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 @@ -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: diff --git a/contrib/linearize/example-linearize-testnet.cfg b/contrib/linearize/example-linearize-testnet.cfg index 140863f..324d24e 100644 --- a/contrib/linearize/example-linearize-testnet.cfg +++ b/contrib/linearize/example-linearize-testnet.cfg @@ -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 diff --git a/contrib/linearize/example-linearize.cfg b/contrib/linearize/example-linearize.cfg index 87ef76c..6bb347c 100644 --- a/contrib/linearize/example-linearize.cfg +++ b/contrib/linearize/example-linearize.cfg @@ -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 diff --git a/contrib/linearize/linearize-hashes.py b/contrib/linearize/linearize-hashes.py index f4d7a52..dbac412 100755 --- a/contrib/linearize/linearize-hashes.py +++ b/contrib/linearize/linearize-hashes.py @@ -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: diff --git a/contrib/spendfrom/spendfrom.py b/contrib/spendfrom/spendfrom.py index a610d64..faf838c 100755 --- a/contrib/spendfrom/spendfrom.py +++ b/contrib/spendfrom/spendfrom.py @@ -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:%s@127.0.0.1:%s"%(config['rpcuser'], config['rpcpassword'], config['rpcport']) try: result = ServiceProxy(connect) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index f6066bd..8b78fda 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -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; @@ -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(1,53); @@ -126,7 +126,7 @@ class CMainParams : public CChainParams { vFixedSeeds = std::vector(pnSeed6_main, pnSeed6_main + ARRAYLEN(pnSeed6_main)); - fMiningRequiresPeers = true; + fMiningRequiresPeers = false fDefaultConsistencyChecks = false; fRequireStandard = true; fMineBlocksOnDemand = false; @@ -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; @@ -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; diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp index a5a6377..31a13fc 100644 --- a/src/chainparamsbase.cpp +++ b/src/chainparamsbase.cpp @@ -32,7 +32,7 @@ class CBaseMainParams : public CBaseChainParams public: CBaseMainParams() { - nRPCPort = 4331; + nRPCPort = 2331; } }; static CBaseMainParams mainParams; @@ -45,7 +45,7 @@ class CBaseTestNetParams : public CBaseChainParams public: CBaseTestNetParams() { - nRPCPort = 4333; + nRPCPort = 2333; strDataDir = "testnet3"; } }; @@ -59,7 +59,7 @@ class CBaseRegTestParams : public CBaseChainParams public: CBaseRegTestParams() { - nRPCPort = 4335; + nRPCPort = 2335; strDataDir = "regtest"; } }; diff --git a/src/clientversion.h b/src/clientversion.h index 1323362..8c2ebda 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -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