From 324e44a006ace5cc4d41a78d99bbe4bb8a4f443a Mon Sep 17 00:00:00 2001 From: Lovok Date: Fri, 4 Apr 2014 15:01:52 +0200 Subject: [PATCH 01/11] 2nd Vertcoin network bootstrapping update Add more nodes and cleanup for already updated nodes --- p2pool/networks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/p2pool/networks.py b/p2pool/networks.py index 2bcf0d14..a50df82c 100644 --- a/p2pool/networks.py +++ b/p2pool/networks.py @@ -100,7 +100,7 @@ MAX_TARGET=2**256//2**20 - 1, PERSIST=False, WORKER_PORT=9172, - BOOTSTRAP_ADDRS='lovok.no-ip.com:9346 lovok.no-ip.com:9347 us-east.p2pools.net:9346 us-east.p2pools.net:9347 vert.marcsi.ch:9346 vert.marcsi.ch:9347'.split(' '), + BOOTSTRAP_ADDRS='lovok.no-ip.com:9346 lovok.no-ip.com us-east.p2pools.net us-central.p2pools.net us-west.p2pools.net vert.marcsi.ch'.split(' '), ANNOUNCE_CHANNEL='#p2pool-vtc', VERSION_CHECK=lambda v: True, ), From 1f74275103acb4dd0f5b2e3a26231fd36dc76084 Mon Sep 17 00:00:00 2001 From: Lovok Date: Fri, 4 Apr 2014 15:06:32 +0200 Subject: [PATCH 02/11] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 60969868..6d461ab2 100644 --- a/README.md +++ b/README.md @@ -96,7 +96,7 @@ http://stackoverflow.com/q/6034390/1260906 Running P2Pool: ------------------------- Vertcoin: -* Run P2Pool with the "--net vertcoin" or "--net vertcoin2" (if you want to connect to 2nd network; use --worker-port 9171 if you want default port for 2nd network workers) option. +* Run P2Pool with the "--net vertcoin" or "--net vertcoin2" (if you want to connect to 2nd network) option. * Run your miner program, connecting to 127.0.0.1 on port 9171 or 9172 (for 2nd network). GPUCcoin: From 9174209d5d834314d09980fc34c5802b7b2a0199 Mon Sep 17 00:00:00 2001 From: Lovok Date: Fri, 4 Apr 2014 15:12:15 +0200 Subject: [PATCH 03/11] Add option for 3rd VTC network For future use ... --- p2pool/networks.py | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/p2pool/networks.py b/p2pool/networks.py index a50df82c..445fbad7 100644 --- a/p2pool/networks.py +++ b/p2pool/networks.py @@ -86,7 +86,7 @@ VERSION_CHECK=lambda v: True, ), - vertcoin2=math.Object( # --> low hashrate net + vertcoin2=math.Object( # --> middle hashrate net PARENT=networks.nets['vertcoin'], SHARE_PERIOD=15, # seconds CHAIN_LENGTH=24*60*60//10, # shares @@ -104,6 +104,25 @@ ANNOUNCE_CHANNEL='#p2pool-vtc', VERSION_CHECK=lambda v: True, ), + + vertcoin3=math.Object( # --> low hashrate net + PARENT=networks.nets['vertcoin'], + SHARE_PERIOD=15, # seconds + CHAIN_LENGTH=24*60*60//10, # shares + REAL_CHAIN_LENGTH=24*60*60//10, # shares + TARGET_LOOKBEHIND=200, # shares + SPREAD=12, # blocks + IDENTIFIER='a06a81c827cab975'.decode('hex'), + PREFIX='7c3614a6bcdcf796'.decode('hex'), + P2P_PORT=9348, + MIN_TARGET=4, + MAX_TARGET=2**256//2**20 - 1, + PERSIST=False, + WORKER_PORT=9173, + BOOTSTRAP_ADDRS='lovok.no-ip.com'.split(' '), + ANNOUNCE_CHANNEL='#p2pool-vtc', + VERSION_CHECK=lambda v: True, + ), gpucoin=math.Object( PARENT=networks.nets['gpucoin'], From 9b107e7229c0e7439f7ad5ba55aeed8de4ff448f Mon Sep 17 00:00:00 2001 From: Lovok Date: Sat, 5 Apr 2014 00:08:47 +0200 Subject: [PATCH 04/11] Donation info on modern dashboard Re/enable danation info on modern dashboard --- web-static.modern/index.html | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/web-static.modern/index.html b/web-static.modern/index.html index f784bb0a..8c766668 100644 --- a/web-static.modern/index.html +++ b/web-static.modern/index.html @@ -128,8 +128,8 @@

Status

- Node fee: - + Node fee / donation: + / Node uptime: @@ -139,10 +139,6 @@

Status

Protocol version: -

Active miners on this node

@@ -343,8 +339,8 @@

Recent blocks

.text(parseFloat(local_stats.block_value).toFixed(8)) .append(' ').append(currency.clone()); - //$('#node_donation') - // .text(local_stats.donation_proportion + '%'); + $('#node_donation') + .text((local_stats.donation_proportion * 100) + '%'); $('#node_fee') .text(local_stats.fee + '%'); From a76402c2593172cc725e63e3ad32c5b46b546dcd Mon Sep 17 00:00:00 2001 From: Lovok Date: Tue, 8 Apr 2014 12:01:19 +0200 Subject: [PATCH 05/11] Change worker port for 3rd VTC network to avoid Execoin p2pool port collision --- p2pool/networks.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/p2pool/networks.py b/p2pool/networks.py index 445fbad7..414b0b43 100644 --- a/p2pool/networks.py +++ b/p2pool/networks.py @@ -81,7 +81,7 @@ MAX_TARGET=2**256//2**20 - 1, PERSIST=False, WORKER_PORT=9171, - BOOTSTRAP_ADDRS='q30.qhor.net seed.p2pool.etyd.org vtc.royalminingco.com p2pool.letsmine.it'.split(' '), + BOOTSTRAP_ADDRS='q30.qhor.net seed.p2pool.etyd.org vtc.royalminingco.com p2pool.letsmine.it lovok.no-ip.com'.split(' '), ANNOUNCE_CHANNEL='#p2pool-vtc', VERSION_CHECK=lambda v: True, ), @@ -100,7 +100,7 @@ MAX_TARGET=2**256//2**20 - 1, PERSIST=False, WORKER_PORT=9172, - BOOTSTRAP_ADDRS='lovok.no-ip.com:9346 lovok.no-ip.com us-east.p2pools.net us-central.p2pools.net us-west.p2pools.net vert.marcsi.ch'.split(' '), + BOOTSTRAP_ADDRS='lovok.no-ip.com us-east.p2pools.net us-central.p2pools.net us-west.p2pools.net vert.marcsi.ch'.split(' '), ANNOUNCE_CHANNEL='#p2pool-vtc', VERSION_CHECK=lambda v: True, ), @@ -118,7 +118,7 @@ MIN_TARGET=4, MAX_TARGET=2**256//2**20 - 1, PERSIST=False, - WORKER_PORT=9173, + WORKER_PORT=9174, BOOTSTRAP_ADDRS='lovok.no-ip.com'.split(' '), ANNOUNCE_CHANNEL='#p2pool-vtc', VERSION_CHECK=lambda v: True, From 63ad454e65f95c438ac8bd8724d953461ed65e86 Mon Sep 17 00:00:00 2001 From: Lovok Date: Tue, 8 Apr 2014 21:56:06 +0200 Subject: [PATCH 06/11] Add second bootstrap node for 3rd VTC network --- p2pool/networks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/p2pool/networks.py b/p2pool/networks.py index 414b0b43..f38359bd 100644 --- a/p2pool/networks.py +++ b/p2pool/networks.py @@ -119,7 +119,7 @@ MAX_TARGET=2**256//2**20 - 1, PERSIST=False, WORKER_PORT=9174, - BOOTSTRAP_ADDRS='lovok.no-ip.com'.split(' '), + BOOTSTRAP_ADDRS='lovok.no-ip.com vtc.cubeconnex.com'.split(' '), ANNOUNCE_CHANNEL='#p2pool-vtc', VERSION_CHECK=lambda v: True, ), From f531d078bbc606223c2c24bd73232edacea1ea66 Mon Sep 17 00:00:00 2001 From: Lovok Date: Wed, 9 Apr 2014 10:58:04 +0200 Subject: [PATCH 07/11] Update README.md Add 3rd VTC network information --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6d461ab2..bfabe9c8 100644 --- a/README.md +++ b/README.md @@ -96,8 +96,8 @@ http://stackoverflow.com/q/6034390/1260906 Running P2Pool: ------------------------- Vertcoin: -* Run P2Pool with the "--net vertcoin" or "--net vertcoin2" (if you want to connect to 2nd network) option. -* Run your miner program, connecting to 127.0.0.1 on port 9171 or 9172 (for 2nd network). +* Run P2Pool with the "--net vertcoin", "--net vertcoin2" (if you want to connect to 2nd network) or "--net vertcoin3" (for 3rd network) option. +* Run your miner program, connecting to 127.0.0.1 on port 9171, 9172 (for 2nd network) or 9174 (for 3rd network). GPUCcoin: * Run P2Pool with the "--net gpucoin" option. From 009e21a8c42356de0caac0ad7c99fbb57930c48f Mon Sep 17 00:00:00 2001 From: Lovok Date: Thu, 24 Apr 2014 13:12:06 +0200 Subject: [PATCH 08/11] Add Caishen support Based on information from here: https://bitcointa.lk/threads/ann-p2pool-cai-first-caishen-p2pool.291148/#post-6031449 As no full source was released, rest of values are default, guessed or based on Caishen source. Until confirmed by thepool.pw it's not sure if it's 100% compatible but seems to work for now. --- p2pool/networks.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/p2pool/networks.py b/p2pool/networks.py index f38359bd..cf6d2001 100644 --- a/p2pool/networks.py +++ b/p2pool/networks.py @@ -201,6 +201,25 @@ VERSION_WARNING=lambda v: 'Upgrade Spaincoin to >=0.8.8.0!' if v < 80800 else None, ), + caishen=math.Object( + PARENT=networks.nets['caishen'], + SHARE_PERIOD=15, # seconds + CHAIN_LENGTH=24*60*60//10, # shares + REAL_CHAIN_LENGTH=24*60*60//10, # shares + TARGET_LOOKBEHIND=200, # shares + SPREAD=12, # blocks + IDENTIFIER='a06a81c827cab9e3'.decode('hex'), + PREFIX='7c3614a6bcdcf7e4'.decode('hex'), + P2P_PORT=2828, + MIN_TARGET=4, + MAX_TARGET=2**256//2**20 - 1, + PERSIST=False, + WORKER_PORT=2888, + BOOTSTRAP_ADDRS='thepool.pw lovok.no-ip.com'.split(' '), + ANNOUNCE_CHANNEL='#p2pool-cai', + VERSION_CHECK=lambda v: True, + ), + ) for net_name, net in nets.iteritems(): net.NAME = net_name From 6a0686e58fdab81bd3de27b5435136dad55167b8 Mon Sep 17 00:00:00 2001 From: Lovok Date: Thu, 24 Apr 2014 13:17:01 +0200 Subject: [PATCH 09/11] Add Caishen support --- p2pool/bitcoin/networks.py | 40 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/p2pool/bitcoin/networks.py b/p2pool/bitcoin/networks.py index 55476170..81041977 100644 --- a/p2pool/bitcoin/networks.py +++ b/p2pool/bitcoin/networks.py @@ -38,6 +38,24 @@ def spa_sub(n): return 101-i +def get_caishensubsidy(bnHeight): + nSubsidy = 28 + + if bnHeight == 0: + nSubsidy = 1 + elif bnHeight < 2: + nSubsidy = 560000 + elif bnHeight > 3583630: + nSubsidy = 1 + elif bnHeight > 2150178: + nSubsidy = 3 + elif bnHeight > 1075089: + nSubsidy = 5 + elif bnHeight > 358363: + nSubsidy = 10 + + return int(nSubsidy * 1000000) + def get_subsidy(nCap, nMaxSubsidy, bnTarget): bnLowerBound = 0.01 bnUpperBound = bnSubsidyLimit = nMaxSubsidy @@ -246,6 +264,28 @@ def check_genesis_block(bitcoind, genesis_block_hash): DUST_THRESHOLD=0.03e8, ), + caishen=math.Object( + P2P_PREFIX='fabfb5da'.decode('hex'), + P2P_PORT=14260, + ADDRESS_VERSION=28, + RPC_PORT=14261, + RPC_CHECK=defer.inlineCallbacks(lambda bitcoind: defer.returnValue( + 'caishenaddress' in (yield bitcoind.rpc_help()) and + not (yield bitcoind.rpc_getinfo())['testnet'] + )), + SUBSIDY_FUNC=lambda height: get_caishensubsidy(height), + POW_FUNC=lambda data: pack.IntType(256).unpack(__import__('vtc_scrypt').getPoWHash(data)), + BLOCK_PERIOD=88, # s + SYMBOL='CAI', + CONF_FILE_FUNC=lambda: os.path.join(os.path.join(os.environ['APPDATA'], 'Caishen') if platform.system() == 'Windows' else os.path.expanduser('~/Library/Application Support/Caishen/') if platform.system() == 'Darwin' else os.path.expanduser('~/.caishen'), 'caishen.conf'), + BLOCK_EXPLORER_URL_PREFIX='http://greekpool.eu:29000/block/', + ADDRESS_EXPLORER_URL_PREFIX='http://greekpool.eu:29000/address/', + TX_EXPLORER_URL_PREFIX='http://greekpool.eu:29000/tx/', + SANE_TARGET_RANGE=(2**256//1000000000 - 1, 2**256//1000 - 1), + DUMB_SCRYPT_DIFF=2**16, + DUST_THRESHOLD=0.03e8, + ), + ) for net_name, net in nets.iteritems(): net.NAME = net_name From f07db3c583bddb3734640367e4aa15705fbfc357 Mon Sep 17 00:00:00 2001 From: Lovok Date: Sun, 27 Apr 2014 00:31:33 +0200 Subject: [PATCH 10/11] Fix CAI subsidy --- p2pool/bitcoin/networks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/p2pool/bitcoin/networks.py b/p2pool/bitcoin/networks.py index 81041977..877ab09d 100644 --- a/p2pool/bitcoin/networks.py +++ b/p2pool/bitcoin/networks.py @@ -54,7 +54,7 @@ def get_caishensubsidy(bnHeight): elif bnHeight > 358363: nSubsidy = 10 - return int(nSubsidy * 1000000) + return int(nSubsidy * 100000000) def get_subsidy(nCap, nMaxSubsidy, bnTarget): bnLowerBound = 0.01 From 9e92ef49ebefb91df46464290662471bfd29ebf7 Mon Sep 17 00:00:00 2001 From: Lovok Date: Mon, 28 Apr 2014 12:27:32 +0200 Subject: [PATCH 11/11] Merge --- p2pool/bitcoin/networks.py | 44 ++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/p2pool/bitcoin/networks.py b/p2pool/bitcoin/networks.py index a618a9ef..eaf20c1c 100644 --- a/p2pool/bitcoin/networks.py +++ b/p2pool/bitcoin/networks.py @@ -263,26 +263,7 @@ def check_genesis_block(bitcoind, genesis_block_hash): DUMB_SCRYPT_DIFF=2**16, DUST_THRESHOLD=0.03e8, ), - -<<<<<<< HEAD - caishen=math.Object( - P2P_PREFIX='fabfb5da'.decode('hex'), - P2P_PORT=14260, - ADDRESS_VERSION=28, - RPC_PORT=14261, - RPC_CHECK=defer.inlineCallbacks(lambda bitcoind: defer.returnValue( - 'caishenaddress' in (yield bitcoind.rpc_help()) and - not (yield bitcoind.rpc_getinfo())['testnet'] - )), - SUBSIDY_FUNC=lambda height: get_caishensubsidy(height), - POW_FUNC=lambda data: pack.IntType(256).unpack(__import__('vtc_scrypt').getPoWHash(data)), - BLOCK_PERIOD=88, # s - SYMBOL='CAI', - CONF_FILE_FUNC=lambda: os.path.join(os.path.join(os.environ['APPDATA'], 'Caishen') if platform.system() == 'Windows' else os.path.expanduser('~/Library/Application Support/Caishen/') if platform.system() == 'Darwin' else os.path.expanduser('~/.caishen'), 'caishen.conf'), - BLOCK_EXPLORER_URL_PREFIX='http://greekpool.eu:29000/block/', - ADDRESS_EXPLORER_URL_PREFIX='http://greekpool.eu:29000/address/', - TX_EXPLORER_URL_PREFIX='http://greekpool.eu:29000/tx/', -======= + kimocoin=math.Object( P2P_PREFIX='6b696d6f'.decode('hex'), P2P_PORT=1889, @@ -300,7 +281,28 @@ def check_genesis_block(bitcoind, genesis_block_hash): BLOCK_EXPLORER_URL_PREFIX='http://explorer.kimocoin.com/block/', ADDRESS_EXPLORER_URL_PREFIX='http://explorer.kimocoin.com/address/', TX_EXPLORER_URL_PREFIX='http://explorer.kimocoin.com/tx/', ->>>>>>> e57e3b4e2b56d308241f488ec1afb8d3345998c3 + SANE_TARGET_RANGE=(2**256//1000000000 - 1, 2**256//1000 - 1), + DUMB_SCRYPT_DIFF=2**16, + DUST_THRESHOLD=0.03e8, + ), + + caishen=math.Object( + P2P_PREFIX='fabfb5da'.decode('hex'), + P2P_PORT=14260, + ADDRESS_VERSION=28, + RPC_PORT=14261, + RPC_CHECK=defer.inlineCallbacks(lambda bitcoind: defer.returnValue( + 'caishenaddress' in (yield bitcoind.rpc_help()) and + not (yield bitcoind.rpc_getinfo())['testnet'] + )), + SUBSIDY_FUNC=lambda height: get_caishensubsidy(height), + POW_FUNC=lambda data: pack.IntType(256).unpack(__import__('vtc_scrypt').getPoWHash(data)), + BLOCK_PERIOD=88, # s + SYMBOL='CAI', + CONF_FILE_FUNC=lambda: os.path.join(os.path.join(os.environ['APPDATA'], 'Caishen') if platform.system() == 'Windows' else os.path.expanduser('~/Library/Application Support/Caishen/') if platform.system() == 'Darwin' else os.path.expanduser('~/.caishen'), 'caishen.conf'), + BLOCK_EXPLORER_URL_PREFIX='http://greekpool.eu:29000/block/', + ADDRESS_EXPLORER_URL_PREFIX='http://greekpool.eu:29000/address/', + TX_EXPLORER_URL_PREFIX='http://greekpool.eu:29000/tx/', SANE_TARGET_RANGE=(2**256//1000000000 - 1, 2**256//1000 - 1), DUMB_SCRYPT_DIFF=2**16, DUST_THRESHOLD=0.03e8,