1st commit.

umarucoin · Aug 26, 2017 · 806340d · 806340d
1 parent 4451e82
commit 806340d
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 20 deletions.
diff --git 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=9402
-#port=19402
+#port=19442
 
 # bootstrap.dat hashlist settings (linearize-hashes)
 max_height=313000

diff --git a/contrib/qos/README.md b/contrib/qos/README.md
@@ -1,5 +1,5 @@
 ### Qos ###
 
-This is a Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the UMRcoin network. It limits outbound TCP traffic with a source or destination port of 9401, but not if the destination IP is within a LAN (defined as 192.168.x.x).
+This is a Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the UMRcoin network. It limits outbound TCP traffic with a source or destination port of 9441, but not if the destination IP is within a LAN (defined as 192.168.x.x).
 
 This means one can have an always-on umrcoind instance running, and another local umrcoind/umrcoin-qt instance which connects to this node and receives blocks from it.
diff --git a/contrib/qos/tc.sh b/contrib/qos/tc.sh
@@ -36,10 +36,10 @@ tc filter add dev ${IF} parent 1: protocol ip prio 2 handle 2 fw classid 1:11
 #	ret=$?
 #done
 
-#limit outgoing traffic to and from port 9401. but not when dealing with a host on the local network
+#limit outgoing traffic to and from port 9441. but not when dealing with a host on the local network
 #	(defined by $LOCALNET)
 #	--set-mark marks packages matching these criteria with the number "2"
 #	these packages are filtered by the tc filter with "handle 2"
 #	this filter sends the packages into the 1:11 class, and this class is limited to ${LIMIT}
-iptables -t mangle -A OUTPUT -p tcp -m tcp --dport 9401 ! -d ${LOCALNET} -j MARK --set-mark 0x2
-iptables -t mangle -A OUTPUT -p tcp -m tcp --sport 9401 ! -d ${LOCALNET} -j MARK --set-mark 0x2
+iptables -t mangle -A OUTPUT -p tcp -m tcp --dport 9441 ! -d ${LOCALNET} -j MARK --set-mark 0x2
+iptables -t mangle -A OUTPUT -p tcp -m tcp --sport 9441 ! -d ${LOCALNET} -j MARK --set-mark 0x2
diff --git a/contrib/rpm/bitcoin.spec b/contrib/rpm/bitcoin.spec
@@ -335,8 +335,8 @@ for selinuxvariant in %{selinux_variants}; do
 	%{_sbindir}/semodule -s ${selinuxvariant} -i %{_datadir}/selinux/${selinuxvariant}/bitcoin.pp &> /dev/null || :
 done
 %{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 9402
-%{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 9401
-%{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 19402
+%{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 9441
+%{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 19442
 %{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 19403
 %{_sbindir}/fixfiles -R bitcoin-server restore &> /dev/null || :
 %{_sbindir}/restorecon -R %{_localstatedir}/lib/bitcoin || :
@@ -354,8 +354,8 @@ fi
 if [ $1 -eq 0 ]; then
 	if [ `%{_sbindir}/sestatus |grep -c "disabled"` -eq 0 ]; then
 	%{_sbindir}/semanage port -d -p tcp 9402
-	%{_sbindir}/semanage port -d -p tcp 9401
-	%{_sbindir}/semanage port -d -p tcp 19402
+	%{_sbindir}/semanage port -d -p tcp 9441
+	%{_sbindir}/semanage port -d -p tcp 19442
 	%{_sbindir}/semanage port -d -p tcp 19403
 	for selinuxvariant in %{selinux_variants}; do
 		%{_sbindir}/semodule -s ${selinuxvariant} -r bitcoin &> /dev/null || :

diff --git a/contrib/seeds/generate-seeds.py b/contrib/seeds/generate-seeds.py
@@ -127,7 +127,7 @@ def main():
     g.write(' * IPv4 as well as onion addresses are wrapped inside a IPv6 address accordingly.\n')
     g.write(' */\n')
     with open(os.path.join(indir,'nodes_main.txt'),'r') as f:
-        process_nodes(g, f, 'pnSeed6_main', 9401)
+        process_nodes(g, f, 'pnSeed6_main', 9441)
     g.write('\n')
     with open(os.path.join(indir,'nodes_test.txt'),'r') as f:
         process_nodes(g, f, 'pnSeed6_test', 19403)

diff --git 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'] = 19402 if testnet else 9402
+        config['rpcport'] = 19442 if testnet else 9402
     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
@@ -55,7 +55,7 @@ https://github.com/bitcoin/bips/blob/master/bip-0064.mediawiki
 
 Example:
 ```
-$ curl localhost:19402/rest/getutxos/checkmempool/b2cdfd7b89def827ff8af7cd9bff7627ff72e5e8b0f71210f92ea7a4000c5d75-0.json 2>/dev/null | json_pp
+$ curl localhost:19442/rest/getutxos/checkmempool/b2cdfd7b89def827ff8af7cd9bff7627ff72e5e8b0f71210f92ea7a4000c5d75-0.json 2>/dev/null | json_pp
 {
    "chaintipHash" : "00000000fb01a7f3745a717f8caebee056c484e6e0bfe4a9591c235bb70506fb",
    "chainHeight" : 325347,

diff --git a/doc/developer-notes.md b/doc/developer-notes.md
@@ -172,7 +172,7 @@ Threads
 
 - ThreadMapPort : Universal plug-and-play startup/shutdown
 
-- ThreadSocketHandler : Sends/Receives data from peers on port 9401.
+- ThreadSocketHandler : Sends/Receives data from peers on port 9441.
 
 - ThreadOpenAddedConnections : Opens network connections to added nodes.
 

diff --git a/doc/release-notes-monacoin.md b/doc/release-notes-monacoin.md
@@ -46,7 +46,7 @@ Reset Testnet
 -------------
 
 Testnet3 has been deprecated and replaced with Testnet4. The server port has been changed to 19403 however the RPC port remains
-the same (19402).
+the same (19442).
 
 Developers who require the new testnet blockchain paramaters can find them [here](https://github.com/umarucoin/umrcoin/blob/master-0.14/src/chainparams.cpp#L220).
 

diff --git a/doc/tor.md b/doc/tor.md
@@ -42,7 +42,7 @@ reachable from the Tor network. Add these lines to your /etc/tor/torrc (or equiv
 config file):
 
 	HiddenServiceDir /var/lib/tor/umrcoin-qtservice/
-	HiddenServicePort 9401 127.0.0.1:9401
+	HiddenServicePort 9441 127.0.0.1:9401
 	HiddenServicePort 19403 127.0.0.1:19403
 
 The directory can be different of course, but (both) port numbers should be equal to
@@ -81,7 +81,7 @@ as well, use `discover` instead:
 
 	./umrcoind ... -discover
 
-and open port 9401 on your firewall (or use -upnp).
+and open port 9441 on your firewall (or use -upnp).
 
 If you only want to use Tor to reach onion addresses, but not use it as a proxy
 for normal IPv4/IPv6 communication, use:

diff --git a/qa/rpc-tests/proxy_test.py b/qa/rpc-tests/proxy_test.py
@@ -127,7 +127,7 @@ def node_test(self, node, proxies, auth, test_onion=True):
             assert(isinstance(cmd, Socks5Command))
             assert_equal(cmd.atyp, AddressType.DOMAINNAME)
             assert_equal(cmd.addr, b"bitcoinostk4e4re.onion")
-            assert_equal(cmd.port, 9401)
+            assert_equal(cmd.port, 9441)
             if not auth:
                 assert_equal(cmd.username, None)
                 assert_equal(cmd.password, None)
@@ -139,7 +139,7 @@ def node_test(self, node, proxies, auth, test_onion=True):
         assert(isinstance(cmd, Socks5Command))
         assert_equal(cmd.atyp, AddressType.DOMAINNAME)
         assert_equal(cmd.addr, b"node.noumenon")
-        assert_equal(cmd.port, 9401)
+        assert_equal(cmd.port, 9441)
         if not auth:
             assert_equal(cmd.username, None)
             assert_equal(cmd.password, None)

diff --git a/qa/rpc-tests/rawtransactions.py b/qa/rpc-tests/rawtransactions.py
@@ -27,7 +27,7 @@ def setup_network(self, split=False):
         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', 19402)
+        #url = "http://bitcoinrpc:DP6DvqZtqXarpeNWyN3LZTFchCCyCUuHwNF7E8pX99x1@%s:%d" % ('127.0.0.1', 19442)
         #proxy = AuthServiceProxy(url)
         #proxy.url = url # store URL on proxy for info
         #self.nodes.append(proxy)

diff --git a/src/chainparamsseeds.h b/src/chainparamsseeds.h
@@ -19,7 +19,7 @@ static SeedSpec6 pnSeed6_main[] = {
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xE9,0x7A,0xA9}, 9441},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xDB,0x75,0xF8,0x37}, 9441},*/
 //    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xCA,0xB5,0x65,0xCD}, 9441}
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x85,0x82,0x42,0xa7}, 9444}
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x85,0x82,0x42,0xa7}, 9441}
 
 };