diff --git a/configure.ac b/configure.ac index 57f210e..2d24864 100644 --- 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 index 742acbc..85f4267 100644 --- 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 index 90fedeb..f4166a1 100644 --- 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 -Listen for connections on (default: 43452 or testnet: 43454) +Listen for connections on (default: 43451 or testnet: 43454) .TP \fB\-maxconnections=\fR Maintain at most connections to peers (default: 125) diff --git a/contrib/debian/manpages/stamp.conf.5 b/contrib/debian/manpages/stamp.conf.5 index 59ae036..4e146c3 100644 --- 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 index 0bd91bb..6548723 100644 --- 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 index 466014a..7a636ad 100644 --- 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 index 1816f2b..2322bb5 100644 --- 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 index e180181..e41fcfa 100644 --- 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 index 00f6d4e..5ada04c 100644 --- 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 index 269638b..604f3aa 100755 --- 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 index 16b94b7..5ce41e2 100644 --- 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 index c807f87..4910964 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -407,7 +407,7 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += HelpMessageOpt("-onlynet=", _("Only connect to nodes in network (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=", strprintf(_("Listen for connections on (default: %u or testnet: %u)"), 43452, 43454)); + strUsage += HelpMessageOpt("-port=", strprintf(_("Listen for connections on (default: %u or testnet: %u)"), 43451, 43454)); strUsage += HelpMessageOpt("-proxy=", _("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=", _("Connect to a node to retrieve peer addresses, and disconnect")); @@ -528,7 +528,7 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += HelpMessageOpt("-mnconf=", strprintf(_("Specify masternode configuration file (default: %s)"), "masternode.conf")); strUsage += HelpMessageOpt("-mnconflock=", strprintf(_("Lock masternodes from masternode configuration file (default: %u)"), 1)); strUsage += HelpMessageOpt("-masternodeprivkey=", _("Set the masternode private key")); - strUsage += HelpMessageOpt("-masternodeaddr=", strprintf(_("Set external address:port to get to this masternode (example: %s)"), "128.127.106.235:43452")); + strUsage += HelpMessageOpt("-masternodeaddr=", strprintf(_("Set external address:port to get to this masternode (example: %s)"), "128.127.106.235:43451")); strUsage += HelpMessageOpt("-budgetvotemode=", _("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 index 0eccd07..9af3f84 100644 --- 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 index 4d81b2a..d17f021 100644 --- 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 index 96bd753..7c229e8 100644 --- 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 index c0ab484..f739596 100644 --- 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 Трябва да зададете masternodeprivkey в конфигурационния файл. Консултирайте се с документацията за повече помощ. - (43452 could be used only on mainnet) - (43452 може да се ползва само в mainnet) + (43451 could be used only on mainnet) + (43451 може да се ползва само в mainnet) (default: %s) @@ -5015,8 +5015,8 @@ Either mint higher denominations (so fewer inputs are needed) or reduce the amou (по подразбиране: 1) - (must be 43452 for mainnet) - (трябва да е 43452 за mainnet) + (must be 43451 for mainnet) + (трябва да е 43451 за mainnet) Accept command line and JSON-RPC commands diff --git a/src/qt/locale/stamp_da.ts b/src/qt/locale/stamp_da.ts index 8142404..53ba8d0 100644 --- 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 Der skal angives en masternodeprivkey i konfigurationen. For mere information, se i dokumentationen. - (43452 could be used only on mainnet) - (43452 kunne kun bruges på hovednettet) + (43451 could be used only on mainnet) + (43451 kunne kun bruges på hovednettet) (default: %s) @@ -5027,8 +5027,8 @@ Enten mint højere nomineringer (så færre input er nødvendige) eller reducere (default: 1) - (must be 43452 for mainnet) - (skal være 43452 for hovednettet) + (must be 43451 for mainnet) + (skal være 43451 for hovednettet) Accept command line and JSON-RPC commands diff --git a/src/qt/locale/stamp_de.ts b/src/qt/locale/stamp_de.ts index 754de4c..c849cf3 100644 --- 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) Sie müssen einen privaten Masternode-Schlüssel in der Konfiguration festlegen. Bitte nutzen Sie die Dokumentation zwecks Hilfe. - (43452 could be used only on mainnet) - (43452 kann nur im Mainnet verwendet werden) + (43451 could be used only on mainnet) + (43451 kann nur im Mainnet verwendet werden) (default: %s) @@ -5149,8 +5149,8 @@ Präge entweder höhere Stückelungen (damit weniger Eingaben benötigt werdenn) (default: 1) - (must be 43452 for mainnet) - (muss im Mainnet 43452 sein) + (must be 43451 for mainnet) + (muss im Mainnet 43451 sein) Accept command line and JSON-RPC commands diff --git a/src/qt/locale/stamp_en.ts b/src/qt/locale/stamp_en.ts index d8ac37a..c712a3d 100644 --- 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 - (43452 could be used only on mainnet) - (43452 could be used only on mainnet) + (43451 could be used only on mainnet) + (43451 could be used only on mainnet) @@ -6596,7 +6596,7 @@ Either mint higher denominations (so fewer inputs are needed) or reduce the amou - (must be 43452 for mainnet) + (must be 43451 for mainnet) diff --git a/src/qt/locale/stamp_en_US.ts b/src/qt/locale/stamp_en_US.ts index 61d069b..d058857 100644 --- 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 You must specify a masternodeprivkey in the configuration. Please see documentation for help. - (43452 could be used only on mainnet) - (43452 could be used only on mainnet) + (43451 could be used only on mainnet) + (43451 could be used only on mainnet) (default: %s) @@ -4178,8 +4178,8 @@ for example: alertnotify=echo %%s | mail -s "STAMP Alert" admin@foo.com (default: 1) - (must be 43452 for mainnet) - (must be 43452 for mainnet) + (must be 43451 for mainnet) + (must be 43451 for mainnet) Accept command line and JSON-RPC commands diff --git a/src/qt/locale/stamp_es.ts b/src/qt/locale/stamp_es.ts index 85e50d8..273ffc3 100644 --- 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 Debes especificar un masternodeprivkey en la configuración. Por favor mira la documentación por ayuda. - (43452 could be used only on mainnet) - (43452 puede ser utilizado solo en mainnet) + (43451 could be used only on mainnet) + (43451 puede ser utilizado solo en mainnet) (default: %s) @@ -5027,8 +5027,8 @@ También mint las denominaciones más altas (por lo tanto, se necesitan menos da (predeterminado: 1) - (must be 43452 for mainnet) - (debe ser 43452 para un mainnet) + (must be 43451 for mainnet) + (debe ser 43451 para un mainnet) Accept command line and JSON-RPC commands diff --git a/src/qt/locale/stamp_hr_HR.ts b/src/qt/locale/stamp_hr_HR.ts index 8dc8dc3..b3c4556 100644 --- 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 Morate odrediti masternodeprivkey u konfiguraciji. Za pomoć pogledajte dokumentaciju. - (43452 could be used only on mainnet) - (43452 se može koristiti samo na mainnetu) + (43451 could be used only on mainnet) + (43451 se može koristiti samo na mainnetu) (default: %s) @@ -5159,8 +5159,8 @@ Either mint higher denominations (so fewer inputs are needed) or reduce the amou (default: 1) - (must be 43452 for mainnet) - (mora biti 43452 za glavnu mrežu) + (must be 43451 for mainnet) + (mora biti 43451 za glavnu mrežu) Accept command line and JSON-RPC commands diff --git a/src/qt/locale/stamp_ko_KR.ts b/src/qt/locale/stamp_ko_KR.ts index c2bf867..bf1b1eb 100644 --- a/src/qt/locale/stamp_ko_KR.ts +++ b/src/qt/locale/stamp_ko_KR.ts @@ -5043,8 +5043,8 @@ Either mint higher denominations (so fewer inputs are needed) or reduce the amou 환경설정에서 masternodeprivkey를 지정해야 합니다. 도움말을 참조하십시오. - (43452 could be used only on mainnet) - (43452 은 메인넷에서만 사용될 수 있습니다) + (43451 could be used only on mainnet) + (43451 은 메인넷에서만 사용될 수 있습니다) (default: %s) @@ -5055,8 +5055,8 @@ Either mint higher denominations (so fewer inputs are needed) or reduce the amou (기본값: 1) - (must be 43452 for mainnet) - (메인넷 일경우 43452) + (must be 43451 for mainnet) + (메인넷 일경우 43451) Accept command line and JSON-RPC commands diff --git a/src/qt/locale/stamp_nl.ts b/src/qt/locale/stamp_nl.ts index a5c24c9..7f656ed 100644 --- a/src/qt/locale/stamp_nl.ts +++ b/src/qt/locale/stamp_nl.ts @@ -5147,8 +5147,8 @@ Ofwel het munten van hogere denominaties (dus minder invoer nodig) of het te bes Je moet een masternodeprivkey opgeven in de configuratie. Raadpleeg de documentatie voor hulp. - (43452 could be used only on mainnet) - (43452 kan alleen op mainnet worden gebruikt) + (43451 could be used only on mainnet) + (43451 kan alleen op mainnet worden gebruikt) (default: %s) @@ -5159,8 +5159,8 @@ Ofwel het munten van hogere denominaties (dus minder invoer nodig) of het te bes (standaard: 1) - (must be 43452 for mainnet) - (moet 43452 voor mainnet zijn) + (must be 43451 for mainnet) + (moet 43451 voor mainnet zijn) Accept command line and JSON-RPC commands diff --git a/src/qt/locale/stamp_pt_BR.ts b/src/qt/locale/stamp_pt_BR.ts index dba3288..ee9b307 100644 --- a/src/qt/locale/stamp_pt_BR.ts +++ b/src/qt/locale/stamp_pt_BR.ts @@ -3728,8 +3728,8 @@ https://www.transifex.com/zSAM-Project/zSAM-Project-translations Você deve especificar uma masternodeprivkey na configuração. Favor verificar o manual para obter ajuda. - (43452 could be used only on mainnet) - (43452 could be used only on mainnet) + (43451 could be used only on mainnet) + (43451 could be used only on mainnet) (default: %s) @@ -3740,8 +3740,8 @@ https://www.transifex.com/zSAM-Project/zSAM-Project-translations (padrão: 1) - (must be 43452 for mainnet) - (deve ser 43452 para mainnet) + (must be 43451 for mainnet) + (deve ser 43451 para mainnet) Accept connections from outside (default: 1 if no -proxy or -connect) diff --git a/src/qt/locale/stamp_ru.ts b/src/qt/locale/stamp_ru.ts index 5943c04..354491b 100644 --- a/src/qt/locale/stamp_ru.ts +++ b/src/qt/locale/stamp_ru.ts @@ -5011,8 +5011,8 @@ Either mint higher denominations (so fewer inputs are needed) or reduce the amou Вы должны указать в строке приложенный ключ. Пожалуйста, обратитесь к документации для получения справки - (43452 could be used only on mainnet) - (43452 можно использовать только в сети) + (43451 could be used only on mainnet) + (43451 можно использовать только в сети) (default: %s) @@ -5023,8 +5023,8 @@ Either mint higher denominations (so fewer inputs are needed) or reduce the amou (неуплата: 1) - (must be 43452 for mainnet) - (должен быть 43452 для mainet) + (must be 43451 for mainnet) + (должен быть 43451 для mainet) Accept command line and JSON-RPC commands diff --git a/src/qt/locale/stamp_sv.ts b/src/qt/locale/stamp_sv.ts index 16ecca6..bb979a5 100644 --- a/src/qt/locale/stamp_sv.ts +++ b/src/qt/locale/stamp_sv.ts @@ -4902,8 +4902,8 @@ Minta antingen högre valörer (så att färre inputs behövs) eller spendera mi Du måste specifiera en masternodeprivkey i konfigurationen. Var vänlig se dokumentation för hjälp. - (43452 could be used only on mainnet) - (43452 kunde endast användas på mainnet) + (43451 could be used only on mainnet) + (43451 kunde endast användas på mainnet) (default: %s) @@ -4914,8 +4914,8 @@ Minta antingen högre valörer (så att färre inputs behövs) eller spendera mi (standard: 1) - (must be 43452 for mainnet) - (måste vara 43452 för mainnet) + (must be 43451 for mainnet) + (måste vara 43451 för mainnet) Accept command line and JSON-RPC commands diff --git a/src/qt/stampstrings.cpp b/src/qt/stampstrings.cpp index a6e7f30..4f2f315 100644 --- a/src/qt/stampstrings.cpp +++ b/src/qt/stampstrings.cpp @@ -235,10 +235,10 @@ QT_TRANSLATE_NOOP("stamp-core", "" QT_TRANSLATE_NOOP("stamp-core", "" "You must specify a masternodeprivkey in the configuration. Please see " "documentation for help."), -QT_TRANSLATE_NOOP("stamp-core", "(43452 could be used only on mainnet)"), +QT_TRANSLATE_NOOP("stamp-core", "(43451 could be used only on mainnet)"), QT_TRANSLATE_NOOP("stamp-core", "(default: %s)"), QT_TRANSLATE_NOOP("stamp-core", "(default: 1)"), -QT_TRANSLATE_NOOP("stamp-core", "(must be 43452 for mainnet)"), +QT_TRANSLATE_NOOP("stamp-core", "(must be 43451 for mainnet)"), QT_TRANSLATE_NOOP("stamp-core", " can be:"), QT_TRANSLATE_NOOP("stamp-core", "Accept command line and JSON-RPC commands"), QT_TRANSLATE_NOOP("stamp-core", "Accept connections from outside (default: 1 if no -proxy or -connect)"), diff --git a/src/rpcmasternode.cpp b/src/rpcmasternode.cpp index 30fc645..2bb708d 100644 --- a/src/rpcmasternode.cpp +++ b/src/rpcmasternode.cpp @@ -278,7 +278,7 @@ UniValue masternodeconnect(const UniValue& params, bool fHelp) "1. \"address\" (string, required) IP or net address to connect to\n" "\nExamples:\n" + - HelpExampleCli("masternodeconnect", "\"192.168.0.6:43452\"") + HelpExampleRpc("masternodeconnect", "\"192.168.0.6:43452\"")); + HelpExampleCli("masternodeconnect", "\"192.168.0.6:43451\"") + HelpExampleRpc("masternodeconnect", "\"192.168.0.6:43451\"")); std::string strAddress = params[0].get_str(); diff --git a/src/rpcnet.cpp b/src/rpcnet.cpp index 64957d3..a8fa8ea 100644 --- a/src/rpcnet.cpp +++ b/src/rpcnet.cpp @@ -184,7 +184,7 @@ UniValue addnode(const UniValue& params, bool fHelp) "2. \"command\" (string, required) 'add' to add a node to the list, 'remove' to remove a node from the list, 'onetry' to try a connection to the node once\n" "\nExamples:\n" + - HelpExampleCli("addnode", "\"192.168.0.6:43452\" \"onetry\"") + HelpExampleRpc("addnode", "\"192.168.0.6:43452\", \"onetry\"")); + HelpExampleCli("addnode", "\"192.168.0.6:43451\" \"onetry\"") + HelpExampleRpc("addnode", "\"192.168.0.6:43451\", \"onetry\"")); string strNode = params[0].get_str(); @@ -258,7 +258,7 @@ UniValue getaddednodeinfo(const UniValue& params, bool fHelp) " \"connected\" : true|false, (boolean) If connected\n" " \"addresses\" : [\n" " {\n" - " \"address\" : \"192.168.0.201:43452\", (string) The stamp server host and port\n" + " \"address\" : \"192.168.0.201:43451\", (string) The stamp server host and port\n" " \"connected\" : \"outbound\" (string) connection, inbound or outbound\n" " }\n" " ,...\n" diff --git a/src/test/netbase_tests.cpp b/src/test/netbase_tests.cpp index 66b4f27..a9be2df 100644 --- a/src/test/netbase_tests.cpp +++ b/src/test/netbase_tests.cpp @@ -63,15 +63,15 @@ BOOST_AUTO_TEST_CASE(netbase_splithost) BOOST_CHECK(TestSplitHost("www.bitcoin.org:80", "www.bitcoin.org", 80)); BOOST_CHECK(TestSplitHost("[www.bitcoin.org]:80", "www.bitcoin.org", 80)); BOOST_CHECK(TestSplitHost("127.0.0.1", "127.0.0.1", -1)); - BOOST_CHECK(TestSplitHost("127.0.0.1:43452", "127.0.0.1", 43452)); + BOOST_CHECK(TestSplitHost("127.0.0.1:43451", "127.0.0.1", 43451)); BOOST_CHECK(TestSplitHost("[127.0.0.1]", "127.0.0.1", -1)); - BOOST_CHECK(TestSplitHost("[127.0.0.1]:43452", "127.0.0.1", 43452)); + BOOST_CHECK(TestSplitHost("[127.0.0.1]:43451", "127.0.0.1", 43451)); BOOST_CHECK(TestSplitHost("::ffff:127.0.0.1", "::ffff:127.0.0.1", -1)); - BOOST_CHECK(TestSplitHost("[::ffff:127.0.0.1]:43452", "::ffff:127.0.0.1", 43452)); - BOOST_CHECK(TestSplitHost("[::]:43452", "::", 43452)); - BOOST_CHECK(TestSplitHost("::43452", "::43452", -1)); - BOOST_CHECK(TestSplitHost(":43452", "", 43452)); - BOOST_CHECK(TestSplitHost("[]:43452", "", 43452)); + BOOST_CHECK(TestSplitHost("[::ffff:127.0.0.1]:43451", "::ffff:127.0.0.1", 43451)); + BOOST_CHECK(TestSplitHost("[::]:43451", "::", 43451)); + BOOST_CHECK(TestSplitHost("::43451", "::43451", -1)); + BOOST_CHECK(TestSplitHost(":43451", "", 43451)); + BOOST_CHECK(TestSplitHost("[]:43451", "", 43451)); BOOST_CHECK(TestSplitHost("", "", -1)); } @@ -86,10 +86,10 @@ bool static TestParse(string src, string canon) BOOST_AUTO_TEST_CASE(netbase_lookupnumeric) { BOOST_CHECK(TestParse("127.0.0.1", "127.0.0.1:65535")); - BOOST_CHECK(TestParse("127.0.0.1:43452", "127.0.0.1:43452")); + BOOST_CHECK(TestParse("127.0.0.1:43451", "127.0.0.1:43451")); BOOST_CHECK(TestParse("::ffff:127.0.0.1", "127.0.0.1:65535")); BOOST_CHECK(TestParse("::", "[::]:65535")); - BOOST_CHECK(TestParse("[::]:43452", "[::]:43452")); + BOOST_CHECK(TestParse("[::]:43451", "[::]:43451")); BOOST_CHECK(TestParse("[127.0.0.1]", "127.0.0.1:65535")); BOOST_CHECK(TestParse(":::", "")); } diff --git a/src/version.h b/src/version.h index 61a671f..d0ba579 100644 --- a/src/version.h +++ b/src/version.h @@ -21,7 +21,7 @@ static const int INIT_PROTO_VERSION = 209; static const int GETHEADERS_VERSION = 70077; //! disconnect from peers older than this proto version -static const int MIN_PEER_PROTO_VERSION_BEFORE_ENFORCEMENT = 70917; +static const int MIN_PEER_PROTO_VERSION_BEFORE_ENFORCEMENT = 70918; static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT = PROTOCOL_VERSION; //! masternodes older than this proto version use old strMessage format for mnannounce