Merge pull request #289 from thrasher-/master

Litecoin: Add testnet checkpoint and min chain work
This commit is contained in:
shaolinfry 2017-02-14 02:12:02 +00:00 committed by GitHub
commit 9070b0c4ce
8 changed files with 13 additions and 14 deletions

View File

@ -4,7 +4,7 @@ rpcuser=someuser
rpcpassword=somepassword rpcpassword=somepassword
host=127.0.0.1 host=127.0.0.1
port=9332 port=9332
#port=19334 #port=19332
# bootstrap.dat hashlist settings (linearize-hashes) # bootstrap.dat hashlist settings (linearize-hashes)
max_height=313000 max_height=313000

View File

@ -338,7 +338,7 @@ for selinuxvariant in %{selinux_variants}; do
done done
%{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 9332 %{_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 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}/semanage port -a -t bitcoin_port_t -p tcp 19335
%{_sbindir}/fixfiles -R bitcoin-server restore &> /dev/null || : %{_sbindir}/fixfiles -R bitcoin-server restore &> /dev/null || :
%{_sbindir}/restorecon -R %{_localstatedir}/lib/bitcoin || : %{_sbindir}/restorecon -R %{_localstatedir}/lib/bitcoin || :
@ -357,7 +357,7 @@ if [ $1 -eq 0 ]; then
if [ `%{_sbindir}/sestatus |grep -c "disabled"` -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 9332
%{_sbindir}/semanage port -d -p tcp 9333 %{_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 %{_sbindir}/semanage port -d -p tcp 19335
for selinuxvariant in %{selinux_variants}; do for selinuxvariant in %{selinux_variants}; do
%{_sbindir}/semodule -s ${selinuxvariant} -r bitcoin &> /dev/null || : %{_sbindir}/semodule -s ${selinuxvariant} -r bitcoin &> /dev/null || :

View File

@ -70,7 +70,7 @@ def connect_JSON(config):
testnet = config.get('testnet', '0') testnet = config.get('testnet', '0')
testnet = (int(testnet) > 0) # 0/1 in config file, convert to True/False testnet = (int(testnet) > 0) # 0/1 in config file, convert to True/False
if not 'rpcport' in config: 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']) connect = "http://%s:%s@127.0.0.1:%s"%(config['rpcuser'], config['rpcpassword'], config['rpcport'])
try: try:
result = ServiceProxy(connect) result = ServiceProxy(connect)

View File

@ -53,7 +53,7 @@ https://github.com/bitcoin/bips/blob/master/bip-0064.mediawiki
Example: 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", "chaintipHash" : "00000000fb01a7f3745a717f8caebee056c484e6e0bfe4a9591c235bb70506fb",
"chainHeight" : 325347, "chainHeight" : 325347,

View File

@ -48,8 +48,7 @@ Old and new addresses can be used interchangeably.
Reset Testnet Reset Testnet
------------- -------------
Testnet3 has been deprecated and replace with Testnet4. Testnet3 has been deprecated and replaced with Testnet4.
Credits Credits
======= =======

View File

@ -23,7 +23,7 @@ class RawTransactionsTest(BitcoinTestFramework):
self.nodes = start_nodes(self.num_nodes, self.options.tmpdir) self.nodes = start_nodes(self.num_nodes, self.options.tmpdir)
#connect to a local machine for debugging #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 = AuthServiceProxy(url)
#proxy.url = url # store URL on proxy for info #proxy.url = url # store URL on proxy for info
#self.nodes.append(proxy) #self.nodes.append(proxy)

View File

@ -202,7 +202,7 @@ public:
consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 1517356801; // January 31st, 2018 consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 1517356801; // January 31st, 2018
// The best chain should have at least this much work. // The best chain should have at least this much work.
consensus.nMinimumChainWork = uint256S("0x00"); consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000000000000000872d04d7");
pchMessageStart[0] = 0xfd; pchMessageStart[0] = 0xfd;
pchMessageStart[1] = 0xd2; pchMessageStart[1] = 0xd2;
@ -240,10 +240,10 @@ public:
checkpointData = (CCheckpointData) { checkpointData = (CCheckpointData) {
boost::assign::map_list_of boost::assign::map_list_of
( 0, uint256S("0x4966625a4b2851d9fdee139e56211a0d88575f59ed816ff5e6a63deb4e3e29a0")), ( 2056, uint256S("0x17748a31ba97afdc9a4f86837a39d287e3e7c7290a08a1d816c5969c78a83289")),
0, 1487036370,
0, 2057,
0 576
}; };
} }

View File

@ -45,7 +45,7 @@ class CBaseTestNetParams : public CBaseChainParams
public: public:
CBaseTestNetParams() CBaseTestNetParams()
{ {
nRPCPort = 19334; nRPCPort = 19332;
strDataDir = "testnet4"; strDataDir = "testnet4";
} }
}; };