Merge branch 'master' of github.com:jedmccaleb/NewCoin

This commit is contained in:
Arthur Britto
2012-06-20 16:40:16 -07:00
5 changed files with 17 additions and 8 deletions

View File

@@ -140,8 +140,10 @@
[debug_logfile]
debug.log
[validation_seed]
shh1D4oj5czH3PUEjYES8c7Bay3tE
[unl_default]
validators.txt
[ips]
23.21.167.100 51235
23.23.201.55 51235
107.21.116.214 51235

View File

@@ -9,9 +9,9 @@
# All other lines should be hankos or domain names.
#
# [validators]:
# List of nodes to accept as validators speficied by public key or domain.
# List of nodes to accept as validators specified by public key or domain.
#
# For domains, newcoind will probe for https web servers at the specied
# For domains, newcoind will probe for https web servers at the specified
# domain in the following order: newcoin.DOMAIN, www.DOMAIN, DOMAIN
#
# Examples: redstem.com
@@ -23,3 +23,4 @@
n9LQC4xFSWXNv1SU1sKtjrW6TZpBZSwp1nRWej8saGs155x42YFZ first
n9LFzWuhKNvXStHAuemfRKFVECLApowncMAM5chSCL9R5ECHGN4V second
n9KXAZxiHkWuVGxDEE8boW7WmcycpZNmWei4vxVaywLZ391Nbuqx third
n94365hzFKikgCULeJwczs3kwzpir3KVHkfhUWGT4MjmbEbC5xBy

View File

@@ -145,3 +145,8 @@ shh1D4oj5czH3PUEjYES8c7Bay3tE
[unl_default]
validators.txt
[ips]
23.21.167.100 51235
23.23.201.55 51235
107.21.116.214 51235

View File

@@ -683,7 +683,7 @@ void Peer::recvPropose(newcoin::TMProposeSet& packet)
memcpy(currentTxHash.begin(), packet.currenttxhash().data(), 32);
if(theApp->getOPs().recvPropose(proposeSeq, currentTxHash, packet.nodepubkey(), packet.signature()))
{ // FIXME: Not all nodes will want proposals
{ // FIXME: Not all nodes will want proposals
PackedMessage::pointer message = boost::make_shared<PackedMessage>(packet, newcoin::mtPROPOSE_LEDGER);
theApp->getConnectionPool().relayMessage(this, message);
}

View File

@@ -9,9 +9,9 @@
# All other lines should be hankos or domain names.
#
# [validators]:
# List of nodes to accept as validators speficied by public key or domain.
# List of nodes to accept as validators specified by public key or domain.
#
# For domains, newcoind will probe for https web servers at the specied
# For domains, newcoind will probe for https web servers at the specified
# domain in the following order: newcoin.DOMAIN, www.DOMAIN, DOMAIN
#
# Examples: redstem.com
@@ -23,3 +23,4 @@
n9LQC4xFSWXNv1SU1sKtjrW6TZpBZSwp1nRWej8saGs155x42YFZ first
n9LFzWuhKNvXStHAuemfRKFVECLApowncMAM5chSCL9R5ECHGN4V second
n9KXAZxiHkWuVGxDEE8boW7WmcycpZNmWei4vxVaywLZ391Nbuqx third
n94365hzFKikgCULeJwczs3kwzpir3KVHkfhUWGT4MjmbEbC5xBy