Merge pull request #67 from AXErunners/development

checkpoints

configure.ac

@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 1)
 define(_CLIENT_VERSION_MINOR, 1)
 define(_CLIENT_VERSION_REVISION, 0)
-define(_CLIENT_VERSION_BUILD, 0)
+define(_CLIENT_VERSION_BUILD, 1)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2018)
 AC_INIT([Axe Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/AXErunners/axe/issues],[axecore])

contrib/debian/examples/axe.conf

@@ -89,7 +89,7 @@
 #rpcallowip=2001:db8:85a3:0:0:8a2e:370:7334/96
 
 # Listen for RPC connections on this TCP port:
-#rpcport=98033
+#rpcport=9337
 
 # You can use Axe or axed to send commands to Axe/axed
 # running on another host using this option:

contrib/linearize/example-linearize.cfg

@@ -3,7 +3,7 @@
 rpcuser=someuser
 rpcpassword=somepassword
 host=127.0.0.1
-port=98033
+port=9337
 
 # bootstrap.dat hashlist settings (linearize-hashes)
 max_height=3130000

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'] = 98033
+		settings['port'] = 9337
 	if 'min_height' not in settings:
 		settings['min_height'] = 0
 	if 'max_height' not in settings:

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'] = 97031 if testnet else 98033
+        config['rpcport'] = 97031 if testnet else 9337
     connect = "http://%s:%s@127.0.0.1:%s"%(config['rpcuser'], config['rpcpassword'], config['rpcport'])
     try:
         result = ServiceProxy(connect)

doc/developer-notes.md

@@ -167,7 +167,7 @@ Threads
 
 - ThreadFlushWalletDB : Close the wallet.dat file if it hasn't been used in 500ms.
 
-- ThreadRPCServer : Remote procedure call handler, listens on port 98033 for connections and services them.
+- ThreadRPCServer : Remote procedure call handler, listens on port 9337 for connections and services them.
 
 - BitcoinMiner : Generates coins (if wallet is enabled).
 

src/chainparams.cpp

@@ -173,10 +173,14 @@ class CMainParams : public CChainParams {
 
         checkpointData = (CCheckpointData) {
             boost::assign::map_list_of
-            (  0, uint256S("0x00000c33631ca6f2f61368991ce2dc03306b5bb50bf7cede5cfbba6db38e52e6")),
-
-            1518140231, // * UNIX timestamp of last checkpoint block
-            0,    // * total number of transactions between genesis and last checkpoint
+            (     0, uint256S("0x00000c33631ca6f2f61368991ce2dc03306b5bb50bf7cede5cfbba6db38e52e6"))
+            (  1000, uint256S("0x000001c94f32e43dc459bc522e343b41f179b7b486e155e819c3f251ee4a6d8d"))
+            (  5000, uint256S("0x0000002e22464e17a0140f686bfdd7794ade570f71d884098302cba16b6059d5"))
+            ( 10000, uint256S("0x00000000009994b68f4fb71d5e3d21fa92b259c41c7734e1b10ab7d8fcabe78b"))
+            ( 12860, uint256S("0x000000000002aae6fac2e55b094bcba9ded463d14bd81fa76f29623fa35d2261")),
+
+            1519006914, // * UNIX timestamp of last checkpoint block
+            6274,    // * total number of transactions between genesis and last checkpoint
                         //   (the tx=... number in the SetBestChain debug.log lines)
             500        // * estimated number of transactions per day after checkpoint
         };
@@ -246,7 +250,7 @@ class CTestNetParams : public CChainParams {
         pchMessageStart[2] = 0xca;
         pchMessageStart[3] = 0xff;
         vAlertPubKey = ParseHex("0");
-        nDefaultPort = 9936;
+          nDefaultPort = 9936;
         nMaxTipAge = 0x7fffffff; // allow mining on top of old blocks for testnet
         nDelayGetHeadersTime = 24 * 60 * 60;
         nPruneAfterHeight = 1000;

src/chainparamsbase.cpp

@@ -32,7 +32,7 @@ class CBaseMainParams : public CBaseChainParams
 public:
     CBaseMainParams()
     {
-        nRPCPort = 98033;
+        nRPCPort = 9337;
     }
 };
 static CBaseMainParams mainParams;

src/clientversion.h

@@ -17,7 +17,7 @@
 #define CLIENT_VERSION_MAJOR 1
 #define CLIENT_VERSION_MINOR 1
 #define CLIENT_VERSION_REVISION 0
-#define CLIENT_VERSION_BUILD 0
+#define CLIENT_VERSION_BUILD 1
 
 //! Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE true

src/rpc/server.cpp

@@ -586,7 +586,7 @@ std::string HelpExampleCli(const std::string& methodname, const std::string& arg
 std::string HelpExampleRpc(const std::string& methodname, const std::string& args)
 {
     return "> curl --user myusername --data-binary '{\"jsonrpc\": \"1.0\", \"id\":\"curltest\", "
-        "\"method\": \"" + methodname + "\", \"params\": [" + args + "] }' -H 'content-type: text/plain;' http://127.0.0.1:98033/\n";
+        "\"method\": \"" + methodname + "\", \"params\": [" + args + "] }' -H 'content-type: text/plain;' http://127.0.0.1:9337/\n";
 }
 
 void RPCRegisterTimerInterface(RPCTimerInterface *iface)