diff --git a/contrib/linearize/example-linearize.cfg b/contrib/linearize/example-linearize.cfg index 7482675be..7379446a5 100644 --- a/contrib/linearize/example-linearize.cfg +++ b/contrib/linearize/example-linearize.cfg @@ -4,7 +4,7 @@ rpcuser=someuser rpcpassword=somepassword host=127.0.0.1 port=9332 -#port=19334 +#port=19332 # bootstrap.dat hashlist settings (linearize-hashes) max_height=313000 diff --git a/contrib/rpm/bitcoin.spec b/contrib/rpm/bitcoin.spec index 0b6d31a41..2c9d8e06c 100644 --- a/contrib/rpm/bitcoin.spec +++ b/contrib/rpm/bitcoin.spec @@ -338,7 +338,7 @@ for selinuxvariant in %{selinux_variants}; do done %{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 9332 %{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 9333 -%{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 19334 +%{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 19332 %{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 19335 %{_sbindir}/fixfiles -R bitcoin-server restore &> /dev/null || : %{_sbindir}/restorecon -R %{_localstatedir}/lib/bitcoin || : @@ -357,7 +357,7 @@ if [ $1 -eq 0 ]; then if [ `%{_sbindir}/sestatus |grep -c "disabled"` -eq 0 ]; then %{_sbindir}/semanage port -d -p tcp 9332 %{_sbindir}/semanage port -d -p tcp 9333 - %{_sbindir}/semanage port -d -p tcp 19334 + %{_sbindir}/semanage port -d -p tcp 19332 %{_sbindir}/semanage port -d -p tcp 19335 for selinuxvariant in %{selinux_variants}; do %{_sbindir}/semodule -s ${selinuxvariant} -r bitcoin &> /dev/null || : diff --git a/contrib/spendfrom/spendfrom.py b/contrib/spendfrom/spendfrom.py index 198ee7609..8c248a3f9 100755 --- a/contrib/spendfrom/spendfrom.py +++ b/contrib/spendfrom/spendfrom.py @@ -70,7 +70,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'] = 19334 if testnet else 9332 + config['rpcport'] = 19332 if testnet else 9332 connect = "http://%s:%s@127.0.0.1:%s"%(config['rpcuser'], config['rpcpassword'], config['rpcport']) try: result = ServiceProxy(connect) diff --git a/doc/REST-interface.md b/doc/REST-interface.md index 06caaa9fa..77ec04909 100644 --- a/doc/REST-interface.md +++ b/doc/REST-interface.md @@ -53,7 +53,7 @@ https://github.com/bitcoin/bips/blob/master/bip-0064.mediawiki Example: ``` -$ curl localhost:19334/rest/getutxos/checkmempool/b2cdfd7b89def827ff8af7cd9bff7627ff72e5e8b0f71210f92ea7a4000c5d75-0.json 2>/dev/null | json_pp +$ curl localhost:19332/rest/getutxos/checkmempool/b2cdfd7b89def827ff8af7cd9bff7627ff72e5e8b0f71210f92ea7a4000c5d75-0.json 2>/dev/null | json_pp { "chaintipHash" : "00000000fb01a7f3745a717f8caebee056c484e6e0bfe4a9591c235bb70506fb", "chainHeight" : 325347, diff --git a/doc/release-notes-litecoin.md b/doc/release-notes-litecoin.md index ed1ad3f3d..4e4ef2382 100644 --- a/doc/release-notes-litecoin.md +++ b/doc/release-notes-litecoin.md @@ -48,8 +48,7 @@ Old and new addresses can be used interchangeably. Reset Testnet ------------- -Testnet3 has been deprecated and replace with Testnet4. - +Testnet3 has been deprecated and replaced with Testnet4. Credits ======= diff --git a/qa/rpc-tests/rawtransactions.py b/qa/rpc-tests/rawtransactions.py index 694395c9d..afb96202b 100755 --- a/qa/rpc-tests/rawtransactions.py +++ b/qa/rpc-tests/rawtransactions.py @@ -23,7 +23,7 @@ class RawTransactionsTest(BitcoinTestFramework): self.nodes = start_nodes(self.num_nodes, self.options.tmpdir) #connect to a local machine for debugging - #url = "http://bitcoinrpc:DP6DvqZtqXarpeNWyN3LZTFchCCyCUuHwNF7E8pX99x1@%s:%d" % ('127.0.0.1', 19334) + #url = "http://bitcoinrpc:DP6DvqZtqXarpeNWyN3LZTFchCCyCUuHwNF7E8pX99x1@%s:%d" % ('127.0.0.1', 19332) #proxy = AuthServiceProxy(url) #proxy.url = url # store URL on proxy for info #self.nodes.append(proxy) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index d6e27fc54..d9f5a952b 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -202,7 +202,7 @@ public: consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 1517356801; // January 31st, 2018 // The best chain should have at least this much work. - consensus.nMinimumChainWork = uint256S("0x00"); + consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000000000000000872d04d7"); pchMessageStart[0] = 0xfd; pchMessageStart[1] = 0xd2; @@ -240,10 +240,10 @@ public: checkpointData = (CCheckpointData) { boost::assign::map_list_of - ( 0, uint256S("0x4966625a4b2851d9fdee139e56211a0d88575f59ed816ff5e6a63deb4e3e29a0")), - 0, - 0, - 0 + ( 2056, uint256S("0x17748a31ba97afdc9a4f86837a39d287e3e7c7290a08a1d816c5969c78a83289")), + 1487036370, + 2057, + 576 }; } diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp index 1cafb6b54..37db0e5f8 100644 --- a/src/chainparamsbase.cpp +++ b/src/chainparamsbase.cpp @@ -45,7 +45,7 @@ class CBaseTestNetParams : public CBaseChainParams public: CBaseTestNetParams() { - nRPCPort = 19334; + nRPCPort = 19332; strDataDir = "testnet4"; } };