Commit e0a9517f authored by Infernoman's avatar Infernoman
Browse files

9999 -> 9340

Former-commit-id: 9158d212fc1b27f395912a189010341df2d65ffe
parent 714c97b9
Showing with 56 additions and 56 deletions
+56 -56
......@@ -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:9999
#addnode=10.0.0.2:9340
# 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:9999
#connect=10.0.0.1:9340
# Listening mode, enabled by default except when 'connect' is being used
#listen=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: 9999 or testnet: 19999)
Listen for connections on <port> (default: 9340 or testnet: 19340)
.TP
\fB\-maxconnections=\fR<n>
Maintain at most <n> connections to peers (default: 125)
......
......@@ -18,10 +18,10 @@ Enable or disable run on the test network instead of the real *dash* network.
\fBproxy=\fR\fI'127.0.0.1:9050'\fR
Connect via a socks4 proxy.
.TP
\fBaddnode=\fR\fI'10.0.0.2:9999'\fR
\fBaddnode=\fR\fI'10.0.0.2:9340'\fR
Use as many *addnode=* settings as you like to connect to specific peers.
.TP
\fBconnect=\fR\fI'10.0.0.1:9999'\fR
\fBconnect=\fR\fI'10.0.0.1:9340'\fR
Use as many *connect=* settings as you like to connect ONLY to specific peers.
.TP
\fRmaxconnections=\fR\fI'value'\fR
......
### 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 9999, 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 9340, but not if the destination IP is within a LAN (defined as 192.168.x.x).
This means one can have an always-on bitcoind instance running, and another local bitcoind/bitcoin-qt instance which connects to this node and receives blocks from it.
......@@ -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 9999. but not when dealing with a host on the local network
#limit outgoing traffic to and from port 9340. 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 9999 ! -d ${LOCALNET} -j MARK --set-mark 0x2
iptables -t mangle -A OUTPUT -p tcp -m tcp --sport 9999 ! -d ${LOCALNET} -j MARK --set-mark 0x2
iptables -t mangle -A OUTPUT -p tcp -m tcp --dport 9340 ! -d ${LOCALNET} -j MARK --set-mark 0x2
iptables -t mangle -A OUTPUT -p tcp -m tcp --sport 9340 ! -d ${LOCALNET} -j MARK --set-mark 0x2
......@@ -23,7 +23,7 @@ import re
import sys
import dns.resolver
PATTERN_IPV4 = re.compile(r"^((\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})):9999$")
PATTERN_IPV4 = re.compile(r"^((\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})):9340$")
PATTERN_AGENT = re.compile(r"^(\/Satoshi:0.8.6\/|\/Satoshi:0.9.(2|3)\/|\/Core:0.1(0|1|2).\d{1,2}.\d{1,2}\/)$")
def parseline(line):
......
......@@ -119,7 +119,7 @@ Threads
- ThreadMapPort : Universal plug-and-play startup/shutdown
- ThreadSocketHandler : Sends/Receives data from peers on port 9999.
- ThreadSocketHandler : Sends/Receives data from peers on port 9340.
- ThreadOpenAddedConnections : Opens network connections to added nodes.
......
......@@ -108,8 +108,8 @@ alias ipaddress:port masternode_private_key collateral_output collateral_output_
Example:
```
mn01 127.0.0.1:9999 93HaYBVUCYjEMeeH1Y4sBGLALQZE1Yc1K64xiqgX37tGBDQL8Xg 2bcd3c84c84f87eaa86e4e56834c92927a07f9e18718810b92e0d0324456a67c 0
mn02 127.0.0.2:9999 93WaAb3htPJEV8E9aQcN23Jt97bPex7YvWfgMDTUdWJvzmrMqey aa9f1034d973377a5e733272c3d0eced1de22555ad45d6b24abadff8087948d4 0 7gnwGHt17heGpG9Crfeh4KGpYNFugPhJdh:25
mn01 127.0.0.1:9340 93HaYBVUCYjEMeeH1Y4sBGLALQZE1Yc1K64xiqgX37tGBDQL8Xg 2bcd3c84c84f87eaa86e4e56834c92927a07f9e18718810b92e0d0324456a67c 0
mn02 127.0.0.2:9340 93WaAb3htPJEV8E9aQcN23Jt97bPex7YvWfgMDTUdWJvzmrMqey aa9f1034d973377a5e733272c3d0eced1de22555ad45d6b24abadff8087948d4 0 7gnwGHt17heGpG9Crfeh4KGpYNFugPhJdh:25
```
## What about the dash.conf file?
......
......@@ -10,9 +10,9 @@ The new masternode.conf format consists of a space seperated text file. Each lin
Example:
```
mn1 127.0.0.2:19999 93HaYBVUCYjEMeeH1Y4sBGLALQZE1Yc1K64xiqgX37tGBDQL8Xg 2bcd3c84c84f87eaa86e4e56834c92927a07f9e18718810b92e0d0324456a67c 0
mn2 127.0.0.3:19999 93WaAb3htPJEV8E9aQcN23Jt97bPex7YvWfgMDTUdWJvzmrMqey aa9f1034d973377a5e733272c3d0eced1de22555ad45d6b24abadff8087948d4 0 7gnwGHt17heGpG9Crfeh4KGpYNFugPhJdh:33
mn3 127.0.0.4:19999 92Da1aYg6sbenP6uwskJgEY2XWB5LwJ7bXRqc3UPeShtHWJDjDv db478e78e3aefaa8c12d12ddd0aeace48c3b451a8b41c570d0ee375e2a02dfd9 1 7gnwGHt17heGpG9Crfeh4KGpYNFugPhJdh
mn1 127.0.0.2:19340 93HaYBVUCYjEMeeH1Y4sBGLALQZE1Yc1K64xiqgX37tGBDQL8Xg 2bcd3c84c84f87eaa86e4e56834c92927a07f9e18718810b92e0d0324456a67c 0
mn2 127.0.0.3:19340 93WaAb3htPJEV8E9aQcN23Jt97bPex7YvWfgMDTUdWJvzmrMqey aa9f1034d973377a5e733272c3d0eced1de22555ad45d6b24abadff8087948d4 0 7gnwGHt17heGpG9Crfeh4KGpYNFugPhJdh:33
mn3 127.0.0.4:19340 92Da1aYg6sbenP6uwskJgEY2XWB5LwJ7bXRqc3UPeShtHWJDjDv db478e78e3aefaa8c12d12ddd0aeace48c3b451a8b41c570d0ee375e2a02dfd9 1 7gnwGHt17heGpG9Crfeh4KGpYNFugPhJdh
```
In the example above:
......
......@@ -629,11 +629,11 @@ However, there are some known issues:
Testing commands, you can start multiple wallets up and all denominate
on the same masternode for testing purposes:
/darkcoin-qt -datadir=/home/user/.darkcoin -listen=0 -darksendrounds=8 -usemasternode="192.168.56.102:19999"
/darkcoin-qt -datadir=/home/user/.darkcoin2 -listen=0 -darksendrounds=8 -usemasternode="192.168.56.102:19999"
/darkcoin-qt -datadir=/home/user/.darkcoin -listen=0 -darksendrounds=8 -usemasternode="192.168.56.102:19340"
/darkcoin-qt -datadir=/home/user/.darkcoin2 -listen=0 -darksendrounds=8 -usemasternode="192.168.56.102:19340"
and even disable darksend auto-denom if wanted:
/darkcoin-qt -datadir=/home/user/.darkcoin -listen=0 -darksendrounds=8 -usemasternode="192.168.56.102:19999" -disabledarksend=1
/darkcoin-qt -datadir=/home/user/.darkcoin -listen=0 -darksendrounds=8 -usemasternode="192.168.56.102:19340" -disabledarksend=1
0.10.12.7 Release notes
......
......@@ -448,11 +448,11 @@ However, there are some known issues:
Testing commands, you can start multiple wallets up and all denominate
on the same masternode for testing purposes:
/darkcoin-qt -datadir=/home/user/.darkcoin -listen=0 -darksendrounds=8 -usemasternode="192.168.56.102:19999"
/darkcoin-qt -datadir=/home/user/.darkcoin2 -listen=0 -darksendrounds=8 -usemasternode="192.168.56.102:19999"
/darkcoin-qt -datadir=/home/user/.darkcoin -listen=0 -darksendrounds=8 -usemasternode="192.168.56.102:19340"
/darkcoin-qt -datadir=/home/user/.darkcoin2 -listen=0 -darksendrounds=8 -usemasternode="192.168.56.102:19340"
and even disable darksend auto-denom if wanted:
/darkcoin-qt -datadir=/home/user/.darkcoin -listen=0 -darksendrounds=8 -usemasternode="192.168.56.102:19999" -disabledarksend=1
/darkcoin-qt -datadir=/home/user/.darkcoin -listen=0 -darksendrounds=8 -usemasternode="192.168.56.102:19340" -disabledarksend=1
0.9.12.7 Release notes
......
......@@ -52,11 +52,11 @@ reachable from the Tor network. Add these lines to your /etc/tor/torrc (or equiv
config file):
HiddenServiceDir /var/lib/tor/dash-service/
HiddenServicePort 9999 127.0.0.1:9999
HiddenServicePort 19999 127.0.0.1:19999
HiddenServicePort 9340 127.0.0.1:9340
HiddenServicePort 19340 127.0.0.1:19340
The directory can be different of course, but (both) port numbers should be equal to
your dashd's P2P listen port (9999 by default).
your dashd's P2P listen port (9340 by default).
-externalip=X You can tell dash about its publicly reachable address using
this option, and this can be a .onion address. Given the above
......@@ -86,7 +86,7 @@ specify:
./dashd ... -discover
and open port 9999 on your firewall (or use -upnp).
and open port 9340 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:
......
......@@ -124,10 +124,10 @@ 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', 9999)
process_nodes(g, f, 'pnSeed6_main', 9340)
g.write('\n')
with open(os.path.join(indir,'nodes_test.txt'),'r') as f:
process_nodes(g, f, 'pnSeed6_test', 19999)
process_nodes(g, f, 'pnSeed6_test', 19340)
g.write('#endif // BITCOIN_CHAINPARAMSSEEDS_H\n')
if __name__ == '__main__':
......
......@@ -65,13 +65,13 @@ void CActiveMasternode::ManageStatus()
}
if(Params().NetworkID() == CBaseChainParams::MAIN) {
if(service.GetPort() != 9999) {
notCapableReason = strprintf("Invalid port: %u - only 9999 is supported on mainnet.", service.GetPort());
if(service.GetPort() != 9340) {
notCapableReason = strprintf("Invalid port: %u - only 9340 is supported on mainnet.", service.GetPort());
LogPrintf("CActiveMasternode::ManageStatus() - not capable: %s\n", notCapableReason);
return;
}
} else if(service.GetPort() == 9999) {
notCapableReason = strprintf("Invalid port: %u - 9999 is only supported on mainnet.", service.GetPort());
} else if(service.GetPort() == 9340) {
notCapableReason = strprintf("Invalid port: %u - 9340 is only supported on mainnet.", service.GetPort());
LogPrintf("CActiveMasternode::ManageStatus() - not capable: %s\n", notCapableReason);
return;
}
......@@ -237,13 +237,13 @@ bool CActiveMasternode::CreateBroadcast(std::string strService, std::string strK
CService service = CService(strService);
if(Params().NetworkID() == CBaseChainParams::MAIN) {
if(service.GetPort() != 9999) {
errorMessage = strprintf("Invalid port %u for masternode %s - only 9999 is supported on mainnet.", service.GetPort(), strService);
if(service.GetPort() != 9340) {
errorMessage = strprintf("Invalid port %u for masternode %s - only 9340 is supported on mainnet.", service.GetPort(), strService);
LogPrintf("CActiveMasternode::CreateBroadcast() - %s\n", errorMessage);
return false;
}
} else if(service.GetPort() == 9999) {
errorMessage = strprintf("Invalid port %u for masternode %s - 9999 is only supported on mainnet.", service.GetPort(), strService);
} else if(service.GetPort() == 9340) {
errorMessage = strprintf("Invalid port %u for masternode %s - 9340 is only supported on mainnet.", service.GetPort(), strService);
LogPrintf("CActiveMasternode::CreateBroadcast() - %s\n", errorMessage);
return false;
}
......
......@@ -9,7 +9,7 @@
*/
// ***TODO*** fix generate-seeds.py and REGENERATE
static SeedSpec6 pnSeed6_main[] = {
//{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb3,0x2b,0x80,0xef}, 9999},
//{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb3,0x2b,0x80,0xef}, 9340},
};
......
......@@ -321,7 +321,7 @@ std::string HelpMessage(HelpMessageMode mode)
strUsage += " -onion=<ip:port> " + strprintf(_("Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)"), "-proxy") + "\n";
strUsage += " -onlynet=<net> " + _("Only connect to nodes in network <net> (ipv4, ipv6 or onion)") + "\n";
strUsage += " -permitbaremultisig " + strprintf(_("Relay non-P2SH multisig (default: %u)"), 1) + "\n";
strUsage += " -port=<port> " + strprintf(_("Listen for connections on <port> (default: %u or testnet: %u)"), 9999, 19999) + "\n";
strUsage += " -port=<port> " + strprintf(_("Listen for connections on <port> (default: %u or testnet: %u)"), 9340, 19340) + "\n";
strUsage += " -proxy=<ip:port> " + _("Connect through SOCKS5 proxy") + "\n";
strUsage += " -seednode=<ip> " + _("Connect to a node to retrieve peer addresses, and disconnect") + "\n";
strUsage += " -timeout=<n> " + strprintf(_("Specify connection timeout in milliseconds (minimum: 1, default: %d)"), DEFAULT_CONNECT_TIMEOUT) + "\n";
......@@ -416,7 +416,7 @@ std::string HelpMessage(HelpMessageMode mode)
strUsage += " -mnconf=<file> " + strprintf(_("Specify masternode configuration file (default: %s)"), "masternode.conf") + "\n";
strUsage += " -mnconflock=<n> " + strprintf(_("Lock masternodes from masternode configuration file (default: %u)"), 1) + "\n";
strUsage += " -masternodeprivkey=<n> " + _("Set the masternode private key") + "\n";
strUsage += " -masternodeaddr=<n> " + strprintf(_("Set external address:port to get to this masternode (example: %s)"), "128.127.106.235:9999") + "\n";
strUsage += " -masternodeaddr=<n> " + strprintf(_("Set external address:port to get to this masternode (example: %s)"), "128.127.106.235:9340") + "\n";
strUsage += " -budgetvotemode=<mode> " + _("Change automatic finalized budget voting behavior. mode=auto: Vote for only exact finalized budget match to my generated budget. (string, default: auto)") + "\n";
strUsage += "\n" + _("Darksend options:") + "\n";
......@@ -427,7 +427,7 @@ std::string HelpMessage(HelpMessageMode mode)
strUsage += "\n" + _("InstantX options:") + "\n";
strUsage += " -enableinstantx=<n> " + strprintf(_("Enable instantx, show confirmations for locked transactions (bool, default: %s)"), "true") + "\n";
strUsage += " -instantxdepth=<n> " + strprintf(_("Show N confirmations for a successfully locked transaction (0-9999, default: %u)"), nInstantXDepth) + "\n";
strUsage += " -instantxdepth=<n> " + strprintf(_("Show N confirmations for a successfully locked transaction (0-9340, default: %u)"), nInstantXDepth) + "\n";
strUsage += "\n" + _("Node relay options:") + "\n";
strUsage += " -datacarrier " + strprintf(_("Relay and mine data carrier transactions (default: %u)"), 1) + "\n";
......@@ -1534,11 +1534,11 @@ bool AppInit2(boost::thread_group& threadGroup)
if(nLiquidityProvider != 0) {
darkSendPool.SetMinBlockSpacing(std::min(nLiquidityProvider,100)*15);
fEnableDarksend = true;
nDarksendRounds = 99999;
nDarksendRounds = 93409;
}
nAnonymizeDarkcoinAmount = GetArg("-anonymizedashamount", 0);
if(nAnonymizeDarkcoinAmount > 999999) nAnonymizeDarkcoinAmount = 999999;
if(nAnonymizeDarkcoinAmount > 934099) nAnonymizeDarkcoinAmount = 934099;
if(nAnonymizeDarkcoinAmount < 2) nAnonymizeDarkcoinAmount = 2;
fEnableInstantX = GetBoolArg("-enableinstantx", fEnableInstantX);
......
......@@ -433,8 +433,8 @@ bool CMasternodeBroadcast::CheckAndUpdate(int& nDos)
}
if(Params().NetworkID() == CBaseChainParams::MAIN) {
if(addr.GetPort() != 9999) return false;
} else if(addr.GetPort() == 9999) return false;
if(addr.GetPort() != 9340) return false;
} else if(addr.GetPort() == 9340) return false;
//search existing Masternode list, this is where we update existing Masternodes with new mnb broadcasts
CMasternode* pmn = mnodeman.Find(vin);
......
......@@ -22,7 +22,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:19999 93HaYBVUCYjEMeeH1Y4sBGLALQZE1Yc1K64xiqgX37tGBDQL8Xg 2bcd3c84c84f87eaa86e4e56834c92927a07f9e18718810b92e0d0324456a67c 0\n";
"# Example: mn1 127.0.0.2:19340 93HaYBVUCYjEMeeH1Y4sBGLALQZE1Yc1K64xiqgX37tGBDQL8Xg 2bcd3c84c84f87eaa86e4e56834c92927a07f9e18718810b92e0d0324456a67c 0\n";
fwrite(strHeader.c_str(), std::strlen(strHeader.c_str()), 1, configFile);
fclose(configFile);
}
......@@ -54,17 +54,17 @@ bool CMasternodeConfig::read(std::string& strErr) {
}
if(Params().NetworkID() == CBaseChainParams::MAIN) {
if(CService(ip).GetPort() != 9999) {
if(CService(ip).GetPort() != 9340) {
strErr = _("Invalid port detected in masternode.conf") + "\n" +
strprintf(_("Line: %d"), linenumber) + "\n\"" + line + "\"" + "\n" +
_("(must be 9999 for mainnet)");
_("(must be 9340 for mainnet)");
streamConfig.close();
return false;
}
} else if(CService(ip).GetPort() == 9999) {
} else if(CService(ip).GetPort() == 9340) {
strErr = _("Invalid port detected in masternode.conf") + "\n" +
strprintf(_("Line: %d"), linenumber) + "\n\"" + line + "\"" + "\n" +
_("(9999 could be used only on mainnet)");
_("(9340 could be used only on mainnet)");
streamConfig.close();
return false;
}
......
......@@ -139,7 +139,7 @@ QT_TRANSLATE_NOOP("dash-core", ""
"Set the number of threads for coin generation if enabled (-1 = all cores, "
"default: %d)"),
QT_TRANSLATE_NOOP("dash-core", ""
"Show N confirmations for a successfully locked transaction (0-9999, default: "
"Show N confirmations for a successfully locked transaction (0-9340, default: "
"%u)"),
QT_TRANSLATE_NOOP("dash-core", ""
"This is a pre-release test build - use at your own risk - do not use for "
......@@ -205,10 +205,10 @@ QT_TRANSLATE_NOOP("dash-core", ""
QT_TRANSLATE_NOOP("dash-core", ""
"You must specify a masternodeprivkey in the configuration. Please see "
"documentation for help."),
QT_TRANSLATE_NOOP("dash-core", "(9999 could be used only on mainnet)"),
QT_TRANSLATE_NOOP("dash-core", "(9340 could be used only on mainnet)"),
QT_TRANSLATE_NOOP("dash-core", "(default: %s)"),
QT_TRANSLATE_NOOP("dash-core", "(default: 1)"),
QT_TRANSLATE_NOOP("dash-core", "(must be 9999 for mainnet)"),
QT_TRANSLATE_NOOP("dash-core", "(must be 9340 for mainnet)"),
QT_TRANSLATE_NOOP("dash-core", "<category> can be:\n"),
QT_TRANSLATE_NOOP("dash-core", "Accept command line and JSON-RPC commands"),
QT_TRANSLATE_NOOP("dash-core", "Accept connections from outside (default: 1 if no -proxy or -connect)"),
......
......@@ -3749,8 +3749,8 @@ for example: alertnotify=echo %%s | mail -s "Crown Alert" admin@foo.com
<translation>Whitelisted не могат да бъдат DoS забранени и техните транзакции ще бъдат винаги предадени, дори ако вече са в mempool, полезно напр. за gateway</translation>
</message>
<message>
<source>(9999 could be used only on mainnet)</source>
<translation>(9999 може да бъде използван в основната мрежа)</translation>
<source>(9340 could be used only on mainnet)</source>
<translation>(9340 може да бъде използван в основната мрежа)</translation>
</message>
<message>
<source>(default: %s)</source>
......@@ -4167,8 +4167,8 @@ for example: alertnotify=echo %%s | mail -s "Crown Alert" admin@foo.com
<translation>Невалиден частен ключ на Masternode. Моля вижте документацията.</translation>
</message>
<message>
<source>(must be 9999 for mainnet)</source>
<translation>(трябва да е 9999 за основната мрежа)</translation>
<source>(must be 9340 for mainnet)</source>
<translation>(трябва да е 9340 за основната мрежа)</translation>
</message>
<message>
<source>Can't find random Masternode.</source>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment