aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFerdinando M. Ametrano <fametrano@users.noreply.github.com>2017-07-14 16:47:10 +0200
committerFerdinando M. Ametrano <ferdinando@ametrano.net>2017-08-04 10:27:41 +0200
commitce3baa193f32078d850945f8c6d5ecb3796adb3b (patch)
tree7e5e660c41a5626e55e099f45bae2637e1b2b499
parente222618a32a16cf0efae392e6349c10c38e57db6 (diff)
downloadbitcoin-ce3baa193f32078d850945f8c6d5ecb3796adb3b.tar.xz
changed regtest RPCport to 18443 to avoid conflict with testnet 18332
-rw-r--r--contrib/linearize/example-linearize.cfg7
-rw-r--r--contrib/rpm/bitcoin.spec4
-rw-r--r--doc/REST-interface.md3
-rw-r--r--src/chainparamsbase.cpp2
4 files changed, 14 insertions, 2 deletions
diff --git a/contrib/linearize/example-linearize.cfg b/contrib/linearize/example-linearize.cfg
index d019b06b6c..2315898bf1 100644
--- a/contrib/linearize/example-linearize.cfg
+++ b/contrib/linearize/example-linearize.cfg
@@ -3,9 +3,16 @@ rpcuser=someuser
rpcpassword=somepassword
#datadir=~/.bitcoin
host=127.0.0.1
+
+#mainnet default
port=8332
+
+#testnet default
#port=18332
+#regtest default
+#port=18443
+
# bootstrap.dat hashlist settings (linearize-hashes)
max_height=313000
diff --git a/contrib/rpm/bitcoin.spec b/contrib/rpm/bitcoin.spec
index cc54fcaf3d..7c4d933ee0 100644
--- a/contrib/rpm/bitcoin.spec
+++ b/contrib/rpm/bitcoin.spec
@@ -336,6 +336,8 @@ done
%{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 8333
%{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 18332
%{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 18333
+%{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 18443
+%{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 18444
%{_sbindir}/fixfiles -R bitcoin-server restore &> /dev/null || :
%{_sbindir}/restorecon -R %{_localstatedir}/lib/bitcoin || :
fi
@@ -355,6 +357,8 @@ if [ $1 -eq 0 ]; then
%{_sbindir}/semanage port -d -p tcp 8333
%{_sbindir}/semanage port -d -p tcp 18332
%{_sbindir}/semanage port -d -p tcp 18333
+ %{_sbindir}/semanage port -d -p tcp 18443
+ %{_sbindir}/semanage port -d -p tcp 18444
for selinuxvariant in %{selinux_variants}; do
%{_sbindir}/semodule -s ${selinuxvariant} -r bitcoin &> /dev/null || :
done
diff --git a/doc/REST-interface.md b/doc/REST-interface.md
index caf6782886..882df0f94d 100644
--- a/doc/REST-interface.md
+++ b/doc/REST-interface.md
@@ -3,7 +3,8 @@ Unauthenticated REST Interface
The REST API can be enabled with the `-rest` option.
-The interface runs on the same port as the JSON-RPC interface, by default port 8332 for mainnet and port 18332 for testnet.
+The interface runs on the same port as the JSON-RPC interface, by default port 8332 for mainnet, port 18332 for testnet,
+and port 18443 for regtest.
Supported API
-------------
diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp
index 43c9a13c54..469f618f7c 100644
--- a/src/chainparamsbase.cpp
+++ b/src/chainparamsbase.cpp
@@ -57,7 +57,7 @@ class CBaseRegTestParams : public CBaseChainParams
public:
CBaseRegTestParams()
{
- nRPCPort = 18332;
+ nRPCPort = 18443;
strDataDir = "regtest";
}
};