Skip to content

Commit

Permalink
basic changes
Browse files Browse the repository at this point in the history
  • Loading branch information
flyinghuman committed Aug 13, 2018
1 parent ccfaa12 commit 96b5fd2
Show file tree
Hide file tree
Showing 31 changed files with 100 additions and 100 deletions.
4 changes: 2 additions & 2 deletions contrib/debian/examples/ucc.conf
Expand Up @@ -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:1945
#addnode=10.0.0.2:41112

# 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:1945
#connect=10.0.0.1:41112

# Listening mode, enabled by default except when 'connect' is being used
#listen=1
Expand Down
2 changes: 1 addition & 1 deletion 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 1945, 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 41112, but not if the destination IP is within a LAN (defined as 192.168.x.x).

This means one can have an always-on uccd instance running, and another local uccd/ucc-qt instance which connects to this node and receives blocks from it.
6 changes: 3 additions & 3 deletions contrib/qos/tc.sh
Expand Up @@ -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 1945. but not when dealing with a host on the local network
#limit outgoing traffic to and from port 41112. 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 1945 ! -d ${LOCALNET} -j MARK --set-mark 0x2
iptables -t mangle -A OUTPUT -p tcp -m tcp --sport 1945 ! -d ${LOCALNET} -j MARK --set-mark 0x2
iptables -t mangle -A OUTPUT -p tcp -m tcp --dport 41112 ! -d ${LOCALNET} -j MARK --set-mark 0x2
iptables -t mangle -A OUTPUT -p tcp -m tcp --sport 41112 ! -d ${LOCALNET} -j MARK --set-mark 0x2
4 changes: 2 additions & 2 deletions contrib/seeds/generate-seeds.py
Expand Up @@ -127,10 +127,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', 1945)
process_nodes(g, f, 'pnSeed6_main', 41112)
g.write('\n')
with open(os.path.join(indir,'nodes_test.txt'),'r') as f:
process_nodes(g, f, 'pnSeed6_test', 11945)
process_nodes(g, f, 'pnSeed6_test', 51112)
g.write('#endif // BITCOIN_CHAINPARAMSSEEDS_H\n')

if __name__ == '__main__':
Expand Down
6 changes: 3 additions & 3 deletions doc/masternode_conf.md
Expand Up @@ -10,9 +10,9 @@ The new masternode.conf format consists of a space seperated text file. Each lin

Example:
```
mn1 127.0.0.2:1945 93HaYBVUCYjEMeeH1Y4sBGLALQZE1Yc1K64xiqgX37tGBDQL8Xg 2bcd3c84c84f87eaa86e4e56834c92927a07f9e18718810b92e0d0324456a67c 0
mn2 127.0.0.3:1945 93WaAb3htPJEV8E9aQcN23Jt97bPex7YvWfgMDTUdWJvzmrMqey aa9f1034d973377a5e733272c3d0eced1de22555ad45d6b24abadff8087948d4 0 7gnwGHt17heGpG9Crfeh4KGpYNFugPhJdh:33
mn3 127.0.0.4:1945 92Da1aYg6sbenP6uwskJgEY2XWB5LwJ7bXRqc3UPeShtHWJDjDv db478e78e3aefaa8c12d12ddd0aeace48c3b451a8b41c570d0ee375e2a02dfd9 1 7gnwGHt17heGpG9Crfeh4KGpYNFugPhJdh
mn1 127.0.0.2:41112 93HaYBVUCYjEMeeH1Y4sBGLALQZE1Yc1K64xiqgX37tGBDQL8Xg 2bcd3c84c84f87eaa86e4e56834c92927a07f9e18718810b92e0d0324456a67c 0
mn2 127.0.0.3:41112 93WaAb3htPJEV8E9aQcN23Jt97bPex7YvWfgMDTUdWJvzmrMqey aa9f1034d973377a5e733272c3d0eced1de22555ad45d6b24abadff8087948d4 0 7gnwGHt17heGpG9Crfeh4KGpYNFugPhJdh:33
mn3 127.0.0.4:41112 92Da1aYg6sbenP6uwskJgEY2XWB5LwJ7bXRqc3UPeShtHWJDjDv db478e78e3aefaa8c12d12ddd0aeace48c3b451a8b41c570d0ee375e2a02dfd9 1 7gnwGHt17heGpG9Crfeh4KGpYNFugPhJdh
```

In the example above:
Expand Down
6 changes: 3 additions & 3 deletions doc/tor.md
Expand Up @@ -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:1945
HiddenServicePort 989 127.0.0.1:41112
HiddenServiceStatistics 0
ORPort 9001
LongLivedPorts 989
Expand All @@ -69,7 +69,7 @@ NumEntryGuards 8
```

The directory can be different of course, but (both) port numbers should be equal to
your uccd's P2P listen port (1945 by default).
your uccd's P2P listen port (41112 by default).
```
-externalip=X You can tell ucc about its publicly reachable address using
this option, and this can be a .onion address. Given the above
Expand Down Expand Up @@ -102,7 +102,7 @@ specify:
./uccd ... -discover
```

and open port 1945 on your firewall (or use -upnp).
and open port 41112 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:
Expand Down
4 changes: 2 additions & 2 deletions qa/rpc-tests/proxy_test.py
Expand Up @@ -100,12 +100,12 @@ def node_test(self, node, proxies, auth):
rv.append(cmd)

# Test: outgoing onion connection through node
node.addnode("dnavj7kcklujarx.onion:1945", "onetry")
node.addnode("dnavj7kcklujarx.onion:41112", "onetry")
cmd = proxies[2].queue.get()
assert(isinstance(cmd, Socks5Command))
assert_equal(cmd.atyp, AddressType.DOMAINNAME)
assert_equal(cmd.addr, "dnavj7kcklujarx.onion")
assert_equal(cmd.port, 1945)
assert_equal(cmd.port, 41112)
if not auth:
assert_equal(cmd.username, None)
assert_equal(cmd.password, None)
Expand Down
4 changes: 2 additions & 2 deletions src/chainparams.cpp
Expand Up @@ -114,7 +114,7 @@ class CMainParams : public CChainParams
vUCCFundKey = ParseHex("03b7a94485bb264d12fbffdddff462060e51a27e55f256b62648c25c1fb8bb565c"); // FundPubKey for fees
nDevFee = 1; // DevFee %
nFundFee = 2; //FundFee %
nDefaultPort = 1945;
nDefaultPort = 41112;
bnProofOfWorkLimit = ~uint256(0) >> 20;
bnStartWork = ~uint256(0) >> 24;

Expand Down Expand Up @@ -277,7 +277,7 @@ class CTestNetParams : public CMainParams
assert(subsidySwitchPoints.size());

vAlertPubKey = ParseHex("04459DC949A9E2C2E1FA87ED9EE93F8D26CD52F95853EE24BCD4B07D4B7D79458E81F0425D81E52B797ED304A836667A1D2D422CD10F485B06CCBE906E1081FBAC");
nDefaultPort = 11945;
nDefaultPort = 51112;
nEnforceBlockUpgradeMajority = 51;
nRejectBlockOutdatedMajority = 75;
nToCheckBlockUpgradeMajority = 100;
Expand Down
74 changes: 37 additions & 37 deletions src/chainparamsseeds.h
Expand Up @@ -8,50 +8,50 @@
* IPv4 as well as onion addresses are wrapped inside a IPv6 address accordingly.
*/
static SeedSpec6 pnSeed6_main[] = {
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xd3,0x9e,0xc5}, 1945},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0xed,0x22,0x16}, 1945},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xd3,0x2a,0x2a}, 1945},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xd3,0x2a,0x7e}, 1945},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xd3,0x28,0x0e}, 1945},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xd3,0xb4,0x20}, 1945},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0xd5,0xa1,0x29}, 1945},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0x2e,0x46,0x2f}, 1945},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0xed,0x19,0xee}, 1945},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xb1,0xd8,0x57}, 1945},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8c,0x52,0x0d,0x75}, 1945},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8c,0x52,0x38,0x95}, 1945},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xcf,0x94,0x53,0x70}, 1945},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x45,0x04,0x57}, 1945},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x4c,0xda,0x47}, 1945},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x95,0x1c,0x64,0x7c}, 1945},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x4c,0xbe,0x23}, 1945},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xca,0xb6,0x71,0x0c}, 1945}
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xd3,0x9e,0xc5}, 41112},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0xed,0x22,0x16}, 41112},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xd3,0x2a,0x2a}, 41112},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xd3,0x2a,0x7e}, 41112},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xd3,0x28,0x0e}, 41112},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xd3,0xb4,0x20}, 41112},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0xd5,0xa1,0x29}, 41112},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0x2e,0x46,0x2f}, 41112},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0xed,0x19,0xee}, 41112},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xb1,0xd8,0x57}, 41112},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8c,0x52,0x0d,0x75}, 41112},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8c,0x52,0x38,0x95}, 41112},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xcf,0x94,0x53,0x70}, 41112},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x45,0x04,0x57}, 41112},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x4c,0xda,0x47}, 41112},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x95,0x1c,0x64,0x7c}, 41112},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x4c,0xbe,0x23}, 41112},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xca,0xb6,0x71,0x0c}, 41112}


};



static SeedSpec6 pnSeed6_test[] = {
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x0c,0x5f,0xb7}, 11945},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xd3,0x9e,0xc5}, 11945},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0xed,0x22,0x16}, 11945},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xd3,0x2a,0x2a}, 11945},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xd3,0x2a,0x7e}, 11945},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xd3,0x28,0x0e}, 11945},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xd3,0xb4,0x20}, 11945},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0xd5,0xa1,0x29}, 11945},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0x2e,0x46,0x2f}, 11945},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0xed,0x19,0xee}, 11945},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xb1,0xd8,0x57}, 11945},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8c,0x52,0x0d,0x75}, 11945},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8c,0x52,0x38,0x95}, 11945},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xcf,0x94,0x53,0x70}, 11945},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x45,0x04,0x57}, 11945},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x4c,0xda,0x47}, 11945},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x95,0x1c,0x64,0x7c}, 11945},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x4c,0xbe,0x23}, 11945},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xca,0xb6,0x71,0x0c}, 11945}
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x0c,0x5f,0xb7}, 51112},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xd3,0x9e,0xc5}, 51112},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0xed,0x22,0x16}, 51112},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xd3,0x2a,0x2a}, 51112},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xd3,0x2a,0x7e}, 51112},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xd3,0x28,0x0e}, 51112},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xd3,0xb4,0x20}, 51112},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0xd5,0xa1,0x29}, 51112},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0x2e,0x46,0x2f}, 51112},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0xed,0x19,0xee}, 51112},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xb1,0xd8,0x57}, 51112},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8c,0x52,0x0d,0x75}, 51112},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8c,0x52,0x38,0x95}, 51112},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xcf,0x94,0x53,0x70}, 51112},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x45,0x04,0x57}, 51112},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x4c,0xda,0x47}, 51112},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x95,0x1c,0x64,0x7c}, 51112},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x4c,0xbe,0x23}, 51112},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xca,0xb6,0x71,0x0c}, 51112}
};

#endif // BITCOIN_CHAINPARAMSSEEDS_H
4 changes: 2 additions & 2 deletions src/init.cpp
Expand Up @@ -344,7 +344,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)"), 1945, 11945));
strUsage += HelpMessageOpt("-port=<port>", strprintf(_("Listen for connections on <port> (default: %u or testnet: %u)"), 41112, 51112));
strUsage += HelpMessageOpt("-proxy=<ip:port>", _("Connect through SOCKS5 proxy"));
strUsage += HelpMessageOpt("-seednode=<ip>", _("Connect to a node to retrieve peer addresses, and disconnect"));
strUsage += HelpMessageOpt("-timeout=<n>", strprintf(_("Specify connection timeout in milliseconds (minimum: 1, default: %d)"), DEFAULT_CONNECT_TIMEOUT));
Expand Down Expand Up @@ -456,7 +456,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:1945"));
strUsage += HelpMessageOpt("-masternodeaddr=<n>", strprintf(_("Set external address:port to get to this masternode (example: %s)"), "128.127.106.235:41112"));

strUsage += HelpMessageGroup(_("Obfuscation options:"));
strUsage += HelpMessageOpt("-enableobfuscation=<n>", strprintf(_("Enable use of automated obfuscation for funds stored in this wallet (0-1, default: %u)"), 0));
Expand Down
10 changes: 5 additions & 5 deletions src/masternodeconfig.cpp
Expand Up @@ -30,7 +30,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:1945 93HaYBVUCYjEMeeH1Y4sBGLALQZE1Yc1K64xiqgX37tGBDQL8Xg 2bcd3c84c84f87eaa86e4e56834c92927a07f9e18718810b92e0d0324456a67c 0\n";
"# Example: mn1 127.0.0.2:41112 93HaYBVUCYjEMeeH1Y4sBGLALQZE1Yc1K64xiqgX37tGBDQL8Xg 2bcd3c84c84f87eaa86e4e56834c92927a07f9e18718810b92e0d0324456a67c 0\n";
fwrite(strHeader.c_str(), std::strlen(strHeader.c_str()), 1, configFile);
fclose(configFile);
}
Expand Down Expand Up @@ -61,17 +61,17 @@ bool CMasternodeConfig::read(std::string& strErr)
}

if (Params().NetworkID() == CBaseChainParams::MAIN) {
if (CService(ip).GetPort() != 1945) {
if (CService(ip).GetPort() != 41112) {
strErr = _("Invalid port detected in masternode.conf") + "\n" +
strprintf(_("Line: %d"), linenumber) + "\n\"" + line + "\"" + "\n" +
_("(must be 1945 for mainnet)");
_("(must be 41112 for mainnet)");
streamConfig.close();
return false;
}
} else if (CService(ip).GetPort() == 1945) {
} else if (CService(ip).GetPort() == 41112) {
strErr = _("Invalid port detected in masternode.conf") + "\n" +
strprintf(_("Line: %d"), linenumber) + "\n\"" + line + "\"" + "\n" +
_("(1945 could be used only on mainnet)");
_("(41112 could be used only on mainnet)");
streamConfig.close();
return false;
}
Expand Down
8 changes: 4 additions & 4 deletions src/qt/locale/ucc_da.ts
Expand Up @@ -4118,8 +4118,8 @@ For eksempel: alertnotify=Echo %% | mail - s "UCC ALARM!" e-mail@administrator.d
<translation>Der skal angives en masternodeprivkey i konfigurationen. For mere information, se i dokumentationen.</translation>
</message>
<message>
<source>(1945 could be used only on mainnet)</source>
<translation>(1945 kunne kun bruges på hovednettet)</translation>
<source>(41112 could be used only on mainnet)</source>
<translation>(41112 kunne kun bruges på hovednettet)</translation>
</message>
<message>
<source>(default: %s)</source>
Expand All @@ -4130,8 +4130,8 @@ For eksempel: alertnotify=Echo %% | mail - s "UCC ALARM!" e-mail@administrator.d
<translation>(default: 1)</translation>
</message>
<message>
<source>(must be 1945 for mainnet)</source>
<translation>(skal være 1945 for hovednettet)</translation>
<source>(must be 41112 for mainnet)</source>
<translation>(skal være 41112 for hovednettet)</translation>
</message>
<message>
<source>Accept command line and JSON-RPC commands</source>
Expand Down
6 changes: 3 additions & 3 deletions src/qt/locale/ucc_en.ts
Expand Up @@ -5331,8 +5331,8 @@ for example: alertnotify=echo %%s | mail -s &quot;UCC Alert&quot; admin@foo.com
</message>
<message>
<location line="+3"/>
<source>(1945 could be used only on mainnet)</source>
<translation type="unfinished">(1945 could be used only on mainnet)</translation>
<source>(41112 could be used only on mainnet)</source>
<translation type="unfinished">(41112 could be used only on mainnet)</translation>
</message>
<message>
<location line="+1"/>
Expand All @@ -5346,7 +5346,7 @@ for example: alertnotify=echo %%s | mail -s &quot;UCC Alert&quot; admin@foo.com
</message>
<message>
<location line="+1"/>
<source>(must be 1945 for mainnet)</source>
<source>(must be 41112 for mainnet)</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand Down

0 comments on commit 96b5fd2

Please sign in to comment.