Update protocol and main port

zSAM-Project · Aug 21, 2018 · e18ce2d · e18ce2d
1 parent e4d273c
commit e18ce2d
Show file tree

Hide file tree

Showing 32 changed files with 93 additions and 93 deletions.
diff --git a/configure.ac b/configure.ac
@@ -1,8 +1,8 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 2)
-define(_CLIENT_VERSION_MINOR, 2)
-define(_CLIENT_VERSION_REVISION, 2)
+define(_CLIENT_VERSION_MINOR, 3)
+define(_CLIENT_VERSION_REVISION, 0)
 define(_CLIENT_VERSION_BUILD, 1)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2018)

diff --git a/contrib/debian/examples/stamp.conf b/contrib/debian/examples/stamp.conf
@@ -38,11 +38,11 @@
 
 # Use as many addnode= settings as you like to connect to specific peers
 #addnode=69.164.218.197
-#addnode=10.0.0.2:43452
+#addnode=10.0.0.2:43451
 
 # Alternatively use as many connect= settings as you like to connect ONLY to specific peers
 #connect=69.164.218.197
-#connect=10.0.0.1:43452
+#connect=10.0.0.1:43451
 
 # Listening mode, enabled by default except when 'connect' is being used
 #listen=1

diff --git a/contrib/debian/manpages/stamp-qt.1 b/contrib/debian/manpages/stamp-qt.1
@@ -41,7 +41,7 @@ Use proxy to reach tor hidden services (default: same as \fB\-proxy\fR)
 Allow DNS lookups for \fB\-addnode\fR, \fB\-seednode\fR and \fB\-connect\fR
 .TP
 \fB\-port=\fR<port>
-Listen for connections on <port> (default: 43452 or testnet: 43454)
+Listen for connections on <port> (default: 43451 or testnet: 43454)
 .TP
 \fB\-maxconnections=\fR<n>
 Maintain at most <n> connections to peers (default: 125)

diff --git a/contrib/debian/manpages/stamp.conf.5 b/contrib/debian/manpages/stamp.conf.5
@@ -18,10 +18,10 @@ Enable or disable run on the test network instead of the real *stamp* network.
 \fBproxy=\fR\fI'127.0.0.1:9050'\fR
 Connect via a socks4 proxy.
 .TP
-\fBaddnode=\fR\fI'10.0.0.2:43452'\fR
+\fBaddnode=\fR\fI'10.0.0.2:43451'\fR
 Use as many *addnode=* settings as you like to connect to specific peers.
 .TP
-\fBconnect=\fR\fI'10.0.0.1:43452'\fR
+\fBconnect=\fR\fI'10.0.0.1:43451'\fR
 Use as many *connect=* settings as you like to connect ONLY to specific peers.
 .TP
 \fRmaxconnections=\fR\fI'value'\fR

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 Bitcoin network. It limits outbound TCP traffic with a source or destination port of 43452, 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 Bitcoin network. It limits outbound TCP traffic with a source or destination port of 43451, but not if the destination IP is within a LAN (defined as 192.168.x.x).
 
 This means one can have an always-on stampd instance running, and another local stampd/stamp-qt instance which connects to this node and receives blocks from it.
diff --git a/contrib/qos/tc.sh b/contrib/qos/tc.sh
@@ -32,10 +32,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 43452. but not when dealing with a host on the local network
+#limit outgoing traffic to and from port 43451. 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 43452 ! -d ${LOCALNET} -j MARK --set-mark 0x2
-iptables -t mangle -A OUTPUT -p tcp -m tcp --sport 43452 ! -d ${LOCALNET} -j MARK --set-mark 0x2
+iptables -t mangle -A OUTPUT -p tcp -m tcp --dport 43451 ! -d ${LOCALNET} -j MARK --set-mark 0x2
+iptables -t mangle -A OUTPUT -p tcp -m tcp --sport 43451 ! -d ${LOCALNET} -j MARK --set-mark 0x2
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', 43452)
+        process_nodes(g, f, 'pnSeed6_main', 43451)
     g.write('\n')
     with open(os.path.join(indir,'nodes_test.txt'),'r') as f:
         process_nodes(g, f, 'pnSeed6_test', 43454)

diff --git a/doc/guide-startmany.md b/doc/guide-startmany.md
@@ -108,8 +108,8 @@ alias ipaddress:port masternode_private_key collateral_output collateral_output_
 Example:
 
 ```
-mn01 127.0.0.1:43452 93HaYBVUCYjEMeeH1Y4sBGLALQZE1Yc1K64xiqgX37tGBDQL8Xg 2bcd3c84c84f87eaa86e4e56834c92927a07f9e18718810b92e0d0324456a67c 0
-mn02 127.0.0.2:43452 93WaAb3htPJEV8E9aQcN23Jt97bPex7YvWfgMDTUdWJvzmrMqey aa9f1034d973377a5e733272c3d0eced1de22555ad45d6b24abadff8087948d4 0 7gnwGHt17heGpG9Crfeh4KGpYNFugPhJdh:25
+mn01 127.0.0.1:43451 93HaYBVUCYjEMeeH1Y4sBGLALQZE1Yc1K64xiqgX37tGBDQL8Xg 2bcd3c84c84f87eaa86e4e56834c92927a07f9e18718810b92e0d0324456a67c 0
+mn02 127.0.0.2:43451 93WaAb3htPJEV8E9aQcN23Jt97bPex7YvWfgMDTUdWJvzmrMqey aa9f1034d973377a5e733272c3d0eced1de22555ad45d6b24abadff8087948d4 0 7gnwGHt17heGpG9Crfeh4KGpYNFugPhJdh:25
 ```
 
 ## What about the stamp.conf file?

diff --git a/doc/tor.md b/doc/tor.md
@@ -59,7 +59,7 @@ SOCKSPolicy accept 127.0.0.1/8
 Log notice file /var/log/tor/notices.log
 ControlPort 9051
 HiddenServiceDir /var/lib/tor/dnet/
-HiddenServicePort 989 127.0.0.1:43452
+HiddenServicePort 989 127.0.0.1:43451
 HiddenServiceStatistics 0
 ORPort 9001
 LongLivedPorts 989
@@ -69,7 +69,7 @@ NumEntryGuards 8
 ```
 
 The directory can be different of course, but (both) port numbers should be equal to
-your stampd's P2P listen port (43452 by default).
+your stampd's P2P listen port (43451 by default).
 ```
 -externalip=X   You can tell stamp about its publicly reachable address using
                 this option, and this can be a .onion address. Given the above
@@ -102,7 +102,7 @@ specify:
 ./stampd ... -discover
 ```
 
-and open port 43452 on your firewall (or use -upnp).
+and open port 43451 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
@@ -100,12 +100,12 @@ def node_test(self, node, proxies, auth):
         rv.append(cmd)
 
         # Test: outgoing onion connection through node
-        node.addnode("stampvj7kcklujarx.onion:43452", "onetry")
+        node.addnode("stampvj7kcklujarx.onion:43451", "onetry")
         cmd = proxies[2].queue.get()
         assert(isinstance(cmd, Socks5Command))
         assert_equal(cmd.atyp, AddressType.DOMAINNAME)
         assert_equal(cmd.addr, "stampvj7kcklujarx.onion")
-        assert_equal(cmd.port, 43452)
+        assert_equal(cmd.port, 43451)
         if not auth:
             assert_equal(cmd.username, None)
             assert_equal(cmd.password, None)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -129,7 +129,7 @@ class CMainParams : public CChainParams
         pchMessageStart[2] = 0x4c;
         pchMessageStart[3] = 0x38;
         vAlertPubKey = ParseHex("048c9563a2fd465f506948b2fb56f7c62b3d0ae8f8f70cd3679cff0a6b86b1b9832dac56959c1f61204cac89bc09716560a4a62a5707ae3e003348220db8ca77c4");
-        nDefaultPort = 43452;
+        nDefaultPort = 43451;
         bnProofOfWorkLimit = ~uint256(0) >> 20; // STAMP starting difficulty is 1 / 2^12
         nSubsidyHalvingInterval = 210000;
         nMaxReorganizationDepth = 100;

diff --git a/src/init.cpp b/src/init.cpp
@@ -407,7 +407,7 @@ std::string HelpMessage(HelpMessageMode mode)
     strUsage += HelpMessageOpt("-onlynet=<net>", _("Only connect to nodes in network <net> (ipv4, ipv6 or onion)"));
     strUsage += HelpMessageOpt("-permitbaremultisig", strprintf(_("Relay non-P2SH multisig (default: %u)"), 1));
     strUsage += HelpMessageOpt("-peerbloomfilters", strprintf(_("Support filtering of blocks and transaction with bloom filters (default: %u)"), DEFAULT_PEERBLOOMFILTERS));
-    strUsage += HelpMessageOpt("-port=<port>", strprintf(_("Listen for connections on <port> (default: %u or testnet: %u)"), 43452, 43454));
+    strUsage += HelpMessageOpt("-port=<port>", strprintf(_("Listen for connections on <port> (default: %u or testnet: %u)"), 43451, 43454));
     strUsage += HelpMessageOpt("-proxy=<ip:port>", _("Connect through SOCKS5 proxy"));
     strUsage += HelpMessageOpt("-proxyrandomize", strprintf(_("Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)"), 1));
     strUsage += HelpMessageOpt("-seednode=<ip>", _("Connect to a node to retrieve peer addresses, and disconnect"));
@@ -528,7 +528,7 @@ std::string HelpMessage(HelpMessageMode mode)
     strUsage += HelpMessageOpt("-mnconf=<file>", strprintf(_("Specify masternode configuration file (default: %s)"), "masternode.conf"));
     strUsage += HelpMessageOpt("-mnconflock=<n>", strprintf(_("Lock masternodes from masternode configuration file (default: %u)"), 1));
     strUsage += HelpMessageOpt("-masternodeprivkey=<n>", _("Set the masternode private key"));
-    strUsage += HelpMessageOpt("-masternodeaddr=<n>", strprintf(_("Set external address:port to get to this masternode (example: %s)"), "128.127.106.235:43452"));
+    strUsage += HelpMessageOpt("-masternodeaddr=<n>", strprintf(_("Set external address:port to get to this masternode (example: %s)"), "128.127.106.235:43451"));
     strUsage += HelpMessageOpt("-budgetvotemode=<mode>", _("Change automatic finalized budget voting behavior. mode=auto: Vote for only exact finalized budget match to my generated budget. (string, default: auto)"));
 
     strUsage += HelpMessageGroup(_("Zerocoin options:"));

diff --git a/src/masternode.cpp b/src/masternode.cpp
@@ -528,8 +528,8 @@ bool CMasternodeBroadcast::CheckAndUpdate(int& nDos)
     }
 
     if (Params().NetworkID() == CBaseChainParams::MAIN) {
-        if (addr.GetPort() != 43452) return false;
-    } else if (addr.GetPort() == 43452)
+        if (addr.GetPort() != 43451) return false;
+    } else if (addr.GetPort() == 43451)
         return false;
 
     //search existing Masternode list, this is where we update existing Masternodes with new mnb broadcasts

diff --git a/src/masternodeconfig.cpp b/src/masternodeconfig.cpp
@@ -29,7 +29,7 @@ bool CMasternodeConfig::read(std::string& strErr)
         if (configFile != NULL) {
             std::string strHeader = "# Masternode config file\n"
                                     "# Format: alias IP:port masternodeprivkey collateral_output_txid collateral_output_index\n"
-                                    "# Example: mn1 127.0.0.2:43452 93HaYBVUCYjEMeeH1Y4sBGLALQZE1Yc1K64xiqgX37tGBDQL8Xg 2bcd3c84c84f87eaa86e4e56834c92927a07f9e18718810b92e0d0324456a67c 0\n";
+                                    "# Example: mn1 127.0.0.2:43451 93HaYBVUCYjEMeeH1Y4sBGLALQZE1Yc1K64xiqgX37tGBDQL8Xg 2bcd3c84c84f87eaa86e4e56834c92927a07f9e18718810b92e0d0324456a67c 0\n";
             fwrite(strHeader.c_str(), std::strlen(strHeader.c_str()), 1, configFile);
             fclose(configFile);
         }
@@ -70,17 +70,17 @@ bool CMasternodeConfig::read(std::string& strErr)
         }
 
         if (Params().NetworkID() == CBaseChainParams::MAIN) {
-            if (port != 43452) {
+            if (port != 43451) {
                 strErr = _("Invalid port detected in masternode.conf") + "\n" +
                          strprintf(_("Line: %d"), linenumber) + "\n\"" + line + "\"" + "\n" +
-                         _("(must be 43452 for mainnet)");
+                         _("(must be 43451 for mainnet)");
                 streamConfig.close();
                 return false;
             }
-        } else if (port == 43452) {
+        } else if (port == 43451) {
             strErr = _("Invalid port detected in masternode.conf") + "\n" +
                      strprintf(_("Line: %d"), linenumber) + "\n\"" + line + "\"" + "\n" +
-                     _("(43452 could be used only on mainnet)");
+                     _("(43451 could be used only on mainnet)");
             streamConfig.close();
             return false;
         }

diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp
@@ -926,8 +926,8 @@ void CMasternodeMan::ProcessMessage(CNode* pfrom, std::string& strCommand, CData
         }
 
         if (Params().NetworkID() == CBaseChainParams::MAIN) {
-            if (addr.GetPort() != 43452) return;
-        } else if (addr.GetPort() == 43452)
+            if (addr.GetPort() != 43451) return;
+        } else if (addr.GetPort() == 43451)
             return;
 
         //search existing Masternode list, this is where we update existing Masternodes with new dsee broadcasts

diff --git a/src/qt/locale/stamp_bg.ts b/src/qt/locale/stamp_bg.ts
@@ -5003,8 +5003,8 @@ Either mint higher denominations (so fewer inputs are needed) or reduce the amou
         <translation>Трябва да зададете masternodeprivkey в конфигурационния файл. Консултирайте се с документацията за повече помощ.</translation>
     </message>
     <message>
-        <source>(43452 could be used only on mainnet)</source>
-        <translation>(43452 може да се ползва само в mainnet)</translation>
+        <source>(43451 could be used only on mainnet)</source>
+        <translation>(43451 може да се ползва само в mainnet)</translation>
     </message>
     <message>
         <source>(default: %s)</source>
@@ -5015,8 +5015,8 @@ Either mint higher denominations (so fewer inputs are needed) or reduce the amou
         <translation>(по подразбиране: 1)</translation>
     </message>
     <message>
-        <source>(must be 43452 for mainnet)</source>
-        <translation>(трябва да е 43452 за mainnet)</translation>
+        <source>(must be 43451 for mainnet)</source>
+        <translation>(трябва да е 43451 за mainnet)</translation>
     </message>
     <message>
         <source>Accept command line and JSON-RPC commands</source>

diff --git a/src/qt/locale/stamp_da.ts b/src/qt/locale/stamp_da.ts
@@ -5015,8 +5015,8 @@ Enten mint højere nomineringer (så færre input er nødvendige) eller reducere
         <translation>Der skal angives en masternodeprivkey i konfigurationen. For mere information, se i dokumentationen.</translation>
     </message>
     <message>
-        <source>(43452 could be used only on mainnet)</source>
-        <translation>(43452 kunne kun bruges på hovednettet)</translation>
+        <source>(43451 could be used only on mainnet)</source>
+        <translation>(43451 kunne kun bruges på hovednettet)</translation>
     </message>
     <message>
         <source>(default: %s)</source>
@@ -5027,8 +5027,8 @@ Enten mint højere nomineringer (så færre input er nødvendige) eller reducere
         <translation>(default: 1)</translation>
     </message>
     <message>
-        <source>(must be 43452 for mainnet)</source>
-        <translation>(skal være 43452 for hovednettet)</translation>
+        <source>(must be 43451 for mainnet)</source>
+        <translation>(skal være 43451 for hovednettet)</translation>
     </message>
     <message>
         <source>Accept command line and JSON-RPC commands</source>

diff --git a/src/qt/locale/stamp_de.ts b/src/qt/locale/stamp_de.ts
@@ -5137,8 +5137,8 @@ Präge entweder höhere Stückelungen (damit weniger Eingaben benötigt werdenn)
         <translation>Sie müssen einen privaten Masternode-Schlüssel in der Konfiguration festlegen. Bitte nutzen Sie die Dokumentation zwecks Hilfe.</translation>
     </message>
     <message>
-        <source>(43452 could be used only on mainnet)</source>
-        <translation>(43452 kann nur im Mainnet verwendet werden)</translation>
+        <source>(43451 could be used only on mainnet)</source>
+        <translation>(43451 kann nur im Mainnet verwendet werden)</translation>
     </message>
     <message>
         <source>(default: %s)</source>
@@ -5149,8 +5149,8 @@ Präge entweder höhere Stückelungen (damit weniger Eingaben benötigt werdenn)
         <translation>(default: 1)</translation>
     </message>
     <message>
-        <source>(must be 43452 for mainnet)</source>
-        <translation>(muss im Mainnet 43452 sein)</translation>
+        <source>(must be 43451 for mainnet)</source>
+        <translation>(muss im Mainnet 43451 sein)</translation>
     </message>
     <message>
         <source>Accept command line and JSON-RPC commands</source>

diff --git a/src/qt/locale/stamp_en.ts b/src/qt/locale/stamp_en.ts
@@ -6581,8 +6581,8 @@ Either mint higher denominations (so fewer inputs are needed) or reduce the amou
     </message>
     <message>
         <location line="+3"/>
-        <source>(43452 could be used only on mainnet)</source>
-        <translation type="unfinished">(43452 could be used only on mainnet)</translation>
+        <source>(43451 could be used only on mainnet)</source>
+        <translation type="unfinished">(43451 could be used only on mainnet)</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -6596,7 +6596,7 @@ Either mint higher denominations (so fewer inputs are needed) or reduce the amou
     </message>
     <message>
         <location line="+1"/>
-        <source>(must be 43452 for mainnet)</source>
+        <source>(must be 43451 for mainnet)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

diff --git a/src/qt/locale/stamp_en_US.ts b/src/qt/locale/stamp_en_US.ts
@@ -4166,8 +4166,8 @@ for example: alertnotify=echo %%s | mail -s "STAMP Alert" admin@foo.com
         <translation>You must specify a masternodeprivkey in the configuration. Please see documentation for help.</translation>
     </message>
     <message>
-        <source>(43452 could be used only on mainnet)</source>
-        <translation>(43452 could be used only on mainnet)</translation>
+        <source>(43451 could be used only on mainnet)</source>
+        <translation>(43451 could be used only on mainnet)</translation>
     </message>
     <message>
         <source>(default: %s)</source>
@@ -4178,8 +4178,8 @@ for example: alertnotify=echo %%s | mail -s "STAMP Alert" admin@foo.com
         <translation>(default: 1)</translation>
     </message>
     <message>
-        <source>(must be 43452 for mainnet)</source>
-        <translation>(must be 43452 for mainnet)</translation>
+        <source>(must be 43451 for mainnet)</source>
+        <translation>(must be 43451 for mainnet)</translation>
     </message>
     <message>
         <source>Accept command line and JSON-RPC commands</source>

diff --git a/src/qt/locale/stamp_es.ts b/src/qt/locale/stamp_es.ts
@@ -5015,8 +5015,8 @@ También mint las denominaciones más altas (por lo tanto, se necesitan menos da
         <translation>Debes especificar un masternodeprivkey en la configuración. Por favor mira la documentación por ayuda.</translation>
     </message>
     <message>
-        <source>(43452 could be used only on mainnet)</source>
-        <translation>(43452 puede ser utilizado solo en mainnet)</translation>
+        <source>(43451 could be used only on mainnet)</source>
+        <translation>(43451 puede ser utilizado solo en mainnet)</translation>
     </message>
     <message>
         <source>(default: %s)</source>
@@ -5027,8 +5027,8 @@ También mint las denominaciones más altas (por lo tanto, se necesitan menos da
         <translation>(predeterminado: 1)</translation>
     </message>
     <message>
-        <source>(must be 43452 for mainnet)</source>
-        <translation>(debe ser 43452 para un mainnet)</translation>
+        <source>(must be 43451 for mainnet)</source>
+        <translation>(debe ser 43451 para un mainnet)</translation>
     </message>
     <message>
         <source>Accept command line and JSON-RPC commands</source>

diff --git a/src/qt/locale/stamp_hr_HR.ts b/src/qt/locale/stamp_hr_HR.ts
@@ -5147,8 +5147,8 @@ Either mint higher denominations (so fewer inputs are needed) or reduce the amou
         <translation>Morate odrediti masternodeprivkey u konfiguraciji. Za pomoć pogledajte dokumentaciju.</translation>
     </message>
     <message>
-        <source>(43452 could be used only on mainnet)</source>
-        <translation>(43452 se može koristiti samo na mainnetu)</translation>
+        <source>(43451 could be used only on mainnet)</source>
+        <translation>(43451 se može koristiti samo na mainnetu)</translation>
     </message>
     <message>
         <source>(default: %s)</source>
@@ -5159,8 +5159,8 @@ Either mint higher denominations (so fewer inputs are needed) or reduce the amou
         <translation>(default: 1)</translation>
     </message>
     <message>
-        <source>(must be 43452 for mainnet)</source>
-        <translation>(mora biti 43452 za glavnu mrežu)</translation>
+        <source>(must be 43451 for mainnet)</source>
+        <translation>(mora biti 43451 za glavnu mrežu)</translation>
     </message>
     <message>
         <source>Accept command line and JSON-RPC commands</source>