From 586d79133e44855a60edfdbda422bd62d8fb7952 Mon Sep 17 00:00:00 2001 From: -k Date: Sun, 18 Feb 2018 20:47:49 -0500 Subject: [PATCH 1/5] checkpoints --- src/chainparams.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index efcbf5989..4449c24ce 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -173,7 +173,10 @@ class CMainParams : public CChainParams { checkpointData = (CCheckpointData) { boost::assign::map_list_of - ( 0, uint256S("0x00000c33631ca6f2f61368991ce2dc03306b5bb50bf7cede5cfbba6db38e52e6")), + ( 0, uint256S("0x00000c33631ca6f2f61368991ce2dc03306b5bb50bf7cede5cfbba6db38e52e6")), + ( 1000, uint256S("0x000001c94f32e43dc459bc522e343b41f179b7b486e155e819c3f251ee4a6d8d")), + ( 5000, uint256S("0x0000002e22464e17a0140f686bfdd7794ade570f71d884098302cba16b6059d5")), + ( 10000, uint256S("0x00000000009994b68f4fb71d5e3d21fa92b259c41c7734e1b10ab7d8fcabe78b")), 1518140231, // * UNIX timestamp of last checkpoint block 0, // * total number of transactions between genesis and last checkpoint @@ -246,7 +249,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; From 4dde1f6cee206c6d0bedad5010fe63c0324a3ef1 Mon Sep 17 00:00:00 2001 From: -k Date: Sun, 18 Feb 2018 20:51:19 -0500 Subject: [PATCH 2/5] port change --- contrib/debian/examples/axe.conf | 2 +- contrib/linearize/example-linearize.cfg | 2 +- contrib/linearize/linearize-hashes.py | 2 +- contrib/spendfrom/spendfrom.py | 2 +- doc/developer-notes.md | 2 +- src/chainparamsbase.cpp | 2 +- src/rpc/server.cpp | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/contrib/debian/examples/axe.conf b/contrib/debian/examples/axe.conf index 1463ac7a7..a1067c3cb 100644 --- a/contrib/debian/examples/axe.conf +++ b/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: diff --git a/contrib/linearize/example-linearize.cfg b/contrib/linearize/example-linearize.cfg index ac813796c..1933bf841 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=98033 +port=9337 # bootstrap.dat hashlist settings (linearize-hashes) max_height=3130000 diff --git a/contrib/linearize/linearize-hashes.py b/contrib/linearize/linearize-hashes.py index 1ab7bb22f..0ef7eb2f7 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'] = 98033 + settings['port'] = 9337 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 8b17db2e7..8aa602541 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'] = 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) diff --git a/doc/developer-notes.md b/doc/developer-notes.md index b552f46a0..88d39cb1b 100644 --- a/doc/developer-notes.md +++ b/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). diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp index 03b10b25d..02c4836da 100644 --- a/src/chainparamsbase.cpp +++ b/src/chainparamsbase.cpp @@ -32,7 +32,7 @@ class CBaseMainParams : public CBaseChainParams public: CBaseMainParams() { - nRPCPort = 98033; + nRPCPort = 9337; } }; static CBaseMainParams mainParams; diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp index 03baeedd4..9f235e388 100644 --- a/src/rpc/server.cpp +++ b/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) From 18a166c57d9ced037418c72d28e7e609603c5ca3 Mon Sep 17 00:00:00 2001 From: -k Date: Sun, 18 Feb 2018 20:52:03 -0500 Subject: [PATCH 3/5] version update --- configure.ac | 2 +- src/clientversion.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index cdfb22f52..9806cd1ed 100644 --- a/configure.ac +++ b/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]) diff --git a/src/clientversion.h b/src/clientversion.h index 0a4c4c500..6d1d38728 100644 --- a/src/clientversion.h +++ b/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 From 84ad09945d742c4c90ee46cf64f500d8c586fc81 Mon Sep 17 00:00:00 2001 From: -k Date: Sun, 18 Feb 2018 21:26:30 -0500 Subject: [PATCH 4/5] checkpoint --- src/chainparams.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 4449c24ce..25302fd7f 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -177,9 +177,10 @@ class CMainParams : public CChainParams { ( 1000, uint256S("0x000001c94f32e43dc459bc522e343b41f179b7b486e155e819c3f251ee4a6d8d")), ( 5000, uint256S("0x0000002e22464e17a0140f686bfdd7794ade570f71d884098302cba16b6059d5")), ( 10000, uint256S("0x00000000009994b68f4fb71d5e3d21fa92b259c41c7734e1b10ab7d8fcabe78b")), + ( 12860, uint256S("0x000000000002aae6fac2e55b094bcba9ded463d14bd81fa76f29623fa35d2261")), - 1518140231, // * UNIX timestamp of last checkpoint block - 0, // * total number of transactions between genesis and last checkpoint + 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 }; From 54e3d5679da661bcecf267e9267df59b6e31e2d0 Mon Sep 17 00:00:00 2001 From: -k Date: Sun, 18 Feb 2018 21:37:45 -0500 Subject: [PATCH 5/5] fix init --- src/chainparams.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 25302fd7f..984f86313 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -173,10 +173,10 @@ class CMainParams : public CChainParams { checkpointData = (CCheckpointData) { boost::assign::map_list_of - ( 0, uint256S("0x00000c33631ca6f2f61368991ce2dc03306b5bb50bf7cede5cfbba6db38e52e6")), - ( 1000, uint256S("0x000001c94f32e43dc459bc522e343b41f179b7b486e155e819c3f251ee4a6d8d")), - ( 5000, uint256S("0x0000002e22464e17a0140f686bfdd7794ade570f71d884098302cba16b6059d5")), - ( 10000, uint256S("0x00000000009994b68f4fb71d5e3d21fa92b259c41c7734e1b10ab7d8fcabe78b")), + ( 0, uint256S("0x00000c33631ca6f2f61368991ce2dc03306b5bb50bf7cede5cfbba6db38e52e6")) + ( 1000, uint256S("0x000001c94f32e43dc459bc522e343b41f179b7b486e155e819c3f251ee4a6d8d")) + ( 5000, uint256S("0x0000002e22464e17a0140f686bfdd7794ade570f71d884098302cba16b6059d5")) + ( 10000, uint256S("0x00000000009994b68f4fb71d5e3d21fa92b259c41c7734e1b10ab7d8fcabe78b")) ( 12860, uint256S("0x000000000002aae6fac2e55b094bcba9ded463d14bd81fa76f29623fa35d2261")), 1519006914, // * UNIX timestamp of last checkpoint block