Merge pull request #3 from GenYuanLian/third-party

Third party

Author: nigefanshu

.idea/workspace.xml

@@ -7,22 +7,25 @@
 from p2pool.util import pack
 
 
-P2P_PREFIX = '0b110907'.decode('hex')
+# P2P_PREFIX = '0b110907'.decode('hex')
+P2P_PREFIX = '0b110902'.decode('hex')
 P2P_PORT = 18333
 ADDRESS_VERSION = 111
 RPC_PORT = 18332
 RPC_CHECK = defer.inlineCallbacks(lambda bitcoind: defer.returnValue(
-            'bitcoinaddress' in (yield bitcoind.rpc_help()) and
+            # 'bitcoinaddress' in (yield bitcoind.rpc_help()) and
             (yield bitcoind.rpc_getblockchaininfo())['chain'] == 'test'
         ))
 SUBSIDY_FUNC = lambda height: 50*100000000 >> (height + 1)//210000
-POW_FUNC = data.hash256
+# POW_FUNC = data.hash256
+POW_FUNC = lambda data: pack.IntType(256).unpack(__import__('Lyra2Z_scrypt').getPoWHash(data))
 BLOCK_PERIOD = 600 # s
-SYMBOL = 'tBTC'
+SYMBOL = 'BSTK'
 CONF_FILE_FUNC = lambda: os.path.join(os.path.join(os.environ['APPDATA'], 'Bitcoin') if platform.system() == 'Windows' else os.path.expanduser('~/Library/Application Support/Bitcoin/') if platform.system() == 'Darwin' else os.path.expanduser('~/.bitcoin'), 'bitcoin.conf')
 BLOCK_EXPLORER_URL_PREFIX = 'http://blockexplorer.com/testnet/block/'
 ADDRESS_EXPLORER_URL_PREFIX = 'http://blockexplorer.com/testnet/address/'
 TX_EXPLORER_URL_PREFIX = 'http://blockexplorer.com/testnet/tx/'
-SANE_TARGET_RANGE = (2**256//2**32//1000 - 1, 2**256//2**32 - 1)
+# SANE_TARGET_RANGE = (2**256//2**32//1000 - 1, 2**256//2**32 - 1)
+SANE_TARGET_RANGE = (2**256//2**32//1000000 - 1, 2**256//2**28 - 1)   #scchain args
 DUMB_SCRYPT_DIFF = 1
-DUST_THRESHOLD = 1e8
+DUST_THRESHOLD = 0.001e8

p2pool/bitcoin/networks/bitcoin_testnet.py

@@ -12,6 +12,7 @@
 from p2pool.bitcoin import data as bitcoin_data, script, sha256
 from p2pool.util import math, forest, pack
 from p2pool.bitcoin.data import pubkey_hash_to_script2
+from p2pool import global_var
 
 def parse_bip0034(coinbase):
     _, opdata = script.parse(coinbase).next()
@@ -65,7 +66,8 @@ def is_segwit_activated(version, net):
     return version >= segwit_activation_version and segwit_activation_version > 0
 
 # DONATION_SCRIPT = '4104ffd03de44a6e11b9917f3a29f9443283d9871c9d743ef30d5eddcd37094b64d1b3d8090496b53256786bf5c82932ec23c3b74d9f05a6f95a8b5529352656664bac'.decode('hex')
-DONATION_SCRIPT=pubkey_hash_to_script2(974143861276139069219601755531477429285430505615)
+DONATION_SCRIPT=pubkey_hash_to_script2(974143861276139069219601755531477429285430505615)   #srcchain main
+# DONATION_SCRIPT=pubkey_hash_to_script2(519791236046945930428491375523868623218951526243) #srcchain testnet
 
 
 class BaseShare(object):
@@ -195,10 +197,11 @@ def generate_transaction(cls, tracker, share_data, block_target, desired_timesta
         )
         assert total_weight == sum(weights.itervalues()) + donation_weight, (total_weight, sum(weights.itervalues()) + donation_weight)
 
-        amounts = dict((script, share_data['subsidy']*(179*weight)//(200*total_weight)) for script, weight in weights.iteritems()) # 99.5% goes according to weights prior to this share
+        amounts = dict((script, share_data['subsidy']*((197-global_var.get_value('reserve_percentage'))*weight)//(200*total_weight)) for script, weight in weights.iteritems()) # 99.5% goes according to weights prior to this share
         this_script = bitcoin_data.pubkey_hash_to_script2(share_data['pubkey_hash'])
         amounts[this_script] = amounts.get(this_script, 0) + share_data['subsidy']//200 # 0.5% goes to block finder
-        amounts[DONATION_SCRIPT] = amounts.get(DONATION_SCRIPT, 0) + share_data['subsidy'] - sum(amounts.itervalues()) # all that's left over is the donation weight and some extra satoshis due to rounding
+        amounts[DONATION_SCRIPT]=amounts.get(DONATION_SCRIPT,0)+share_data['subsidy']//100
+        amounts[global_var.get_value('script')] = amounts.get(global_var.get_value('script'), 0) + share_data['subsidy'] - sum(amounts.itervalues()) # all that's left over is the donation weight and some extra satoshis due to rounding
 
         if sum(amounts.itervalues()) != share_data['subsidy'] or any(x < 0 for x in amounts.itervalues()):
             raise ValueError()

p2pool/data.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+
+def _init():  # 初始化
+    global _global_dict
+    _global_dict = {}
+
+
+def set_value(key, value):
+    _global_dict[key] = value
+
+
+def get_value(key, defValue=None):
+    try:
+        return _global_dict[key]
+    except KeyError:
+        return defValue

p2pool/global_var.py

@@ -24,6 +24,8 @@
 from util import fixargparse, jsonrpc, variable, deferral, math, logging, switchprotocol
 from . import networks, web, work
 import p2pool, p2pool.data as p2pool_data, p2pool.node as p2pool_node
+import global_var
+from p2pool.bitcoin.data import pubkey_hash_to_script2,address_to_pubkey_hash
 
 class keypool():
     keys = []
@@ -99,6 +101,7 @@ def long():
         url = '%s://%s:%i/' % ('https' if args.bitcoind_rpc_ssl else 'http', args.bitcoind_address, args.bitcoind_rpc_port)
         print '''Testing bitcoind RPC connection to '%s' with username '%s'...''' % (url, args.bitcoind_rpc_username)
         bitcoind = jsonrpc.HTTPProxy(url, dict(Authorization='Basic ' + base64.b64encode(args.bitcoind_rpc_username + ':' + args.bitcoind_rpc_password)), timeout=30)
+        print base64.b64encode(args.bitcoind_rpc_username + ':' + args.bitcoind_rpc_password)
         yield helper.check(bitcoind, net)
         temp_work = yield helper.getwork(bitcoind)
 
@@ -114,7 +117,7 @@ def poll_warnings():
         print '    Current block height: %i' % (temp_work['height'] - 1,)
         print '    Current block bits  : %s' % (temp_work['bits'],)
         print
-        
+
         if not args.testnet:
             factory = yield connect_p2p()
 
@@ -300,7 +303,10 @@ def upnp_thread():
 
         print '    ...success!'
         print
-        
+
+        print args.reserve_address
+        print args.reserve_percentage
+        global_var.set_value('script',pubkey_hash_to_script2(address_to_pubkey_hash(global_var.get_value('reserve_address'),wb.net)))
 
         # done!
         print 'Started successfully!'
@@ -511,30 +517,38 @@ def run():
     parser.add_argument('--disable-advertise',
         help='''don't advertise local IP address as being available for incoming connections. useful for running a dark node, along with multiple -n ADDR's and --outgoing-conns 0''',
         action='store_false', default=True, dest='advertise_ip')
+
+    parser.add_argument('--reserve-percentage', metavar='RESERVE_PERCENTAGE',
+        help='the reserve percentage of coinbase for the pool owner',
+        type=float, action='store', default=0, dest='reserve_percentage')
+    parser.add_argument('--reserve-address', metavar='RESERVE_ADDRESS',
+        help='the reserve address of coinbase for the pool owner',
+        type=str, action='store', default='1R2Y45QymfK3Bg4shM26kuQKWYjQ4iQA8', dest='reserve_address')
+
 
     worker_group = parser.add_argument_group('worker interface')
     worker_group.add_argument('-w', '--worker-port', metavar='PORT or ADDR:PORT',
         help='listen on PORT on interface with ADDR for RPC connections from miners (default: all interfaces, %s)' % ', '.join('%s:%i' % (name, net.WORKER_PORT) for name, net in sorted(realnets.items())),
         type=str, action='store', default=None, dest='worker_endpoint')
     worker_group.add_argument('-f', '--fee', metavar='FEE_PERCENTAGE',
-        help='''charge workers mining to their own bitcoin address (by setting their miner's username to a bitcoin address) this percentage fee to mine on your p2pool instance. Amount displayed at http://127.0.0.1:WORKER_PORT/fee (default: 0)''',
+        help='''charge workers mining to their own bitcoin address (by setting their miner's username to a srcchain address) this percentage fee to mine on your p2pool instance. Amount displayed at http://127.0.0.1:WORKER_PORT/fee (default: 0)''',
         type=float, action='store', default=0, dest='worker_fee')
 
     bitcoind_group = parser.add_argument_group('bitcoind interface')
-    bitcoind_group.add_argument('--bitcoind-config-path', metavar='BITCOIND_CONFIG_PATH',
+    bitcoind_group.add_argument('--srcchaind-config-path', metavar='BITCOIND_CONFIG_PATH',
         help='custom configuration file path (when bitcoind -conf option used)',
         type=str, action='store', default=None, dest='bitcoind_config_path')
-    bitcoind_group.add_argument('--bitcoind-address', metavar='BITCOIND_ADDRESS',
+    bitcoind_group.add_argument('--srcchaind-address', metavar='BITCOIND_ADDRESS',
         help='connect to this address (default: 127.0.0.1)',
         type=str, action='store', default='127.0.0.1', dest='bitcoind_address')
-    bitcoind_group.add_argument('--bitcoind-rpc-port', metavar='BITCOIND_RPC_PORT',
-        help='''connect to JSON-RPC interface at this port (default: %s <read from bitcoin.conf if password not provided>)''' % ', '.join('%s:%i' % (name, net.PARENT.RPC_PORT) for name, net in sorted(realnets.items())),
+    bitcoind_group.add_argument('--srcchaind-rpc-port', metavar='BITCOIND_RPC_PORT',
+        help='''connect to JSON-RPC interface at this port (default: %s <read from srcchain.conf if password not provided>)''' % ', '.join('%s:%i' % (name, net.PARENT.RPC_PORT) for name, net in sorted(realnets.items())),
         type=int, action='store', default=None, dest='bitcoind_rpc_port')
-    bitcoind_group.add_argument('--bitcoind-rpc-ssl',
+    bitcoind_group.add_argument('--srcchaind-rpc-ssl',
         help='connect to JSON-RPC interface using SSL',
         action='store_true', default=False, dest='bitcoind_rpc_ssl')
-    bitcoind_group.add_argument('--bitcoind-p2p-port', metavar='BITCOIND_P2P_PORT',
-        help='''connect to P2P interface at this port (default: %s <read from bitcoin.conf if password not provided>)''' % ', '.join('%s:%i' % (name, net.PARENT.P2P_PORT) for name, net in sorted(realnets.items())),
+    bitcoind_group.add_argument('--srcchaind-p2p-port', metavar='BITCOIND_P2P_PORT',
+        help='''connect to P2P interface at this port (default: %s <read from srcchain.conf if password not provided>)''' % ', '.join('%s:%i' % (name, net.PARENT.P2P_PORT) for name, net in sorted(realnets.items())),
         type=int, action='store', default=None, dest='bitcoind_p2p_port')
     bitcoind_group.add_argument(metavar='BITCOIND_RPCUSERPASS',
         help='bitcoind RPC interface username, then password, space-separated (only one being provided will cause the username to default to being empty, and none will cause P2Pool to read them from bitcoin.conf)',
@@ -621,7 +635,17 @@ def run():
             parser.error('error parsing address: ' + repr(e))
     else:
         args.pubkey_hash = None
-    
+
+    global_var._init()
+    if args.reserve_address is not None:
+        global_var.set_value('reserve_address',args.reserve_address)
+    else:
+        global_var.set_value('reserve_address','1R2Y45QymfK3Bg4shM26kuQKWYjQ4iQA8')
+    if args.reserve_percentage is not None and 1<=args.reserve_percentage<=90:
+        global_var.set_value('reserve_percentage',args.reserve_percentage*2)
+    else:
+        global_var.set_value('reserve_percentage',0)
+
     def separate_url(url):
         s = urlparse.urlsplit(url)
         if '@' not in s.netloc:

p2pool/main.py

@@ -13,7 +13,7 @@
 MAX_TARGET = 2**256//2**32 - 1
 PERSIST = False
 WORKER_PORT = 19332
-BOOTSTRAP_ADDRS = 'forre.st vps.forre.st liteco.in 78.158.149.247'.split(' ')
+BOOTSTRAP_ADDRS = ''
 ANNOUNCE_CHANNEL = '#p2pool-alt'
 VERSION_CHECK = lambda v: None if 100000 <= v else 'Bitcoin version too old. Upgrade to 0.11.2 or newer!' # not a bug. BIP65 support is ensured by SOFTFORKS_REQUIRED
 VERSION_WARNING = lambda v: None

p2pool/networks/bitcoin_testnet.py

@@ -226,8 +226,8 @@ def decent_height():
     web_root.putChild('payout_addr', WebInterface(lambda: bitcoin_data.pubkey_hash_to_address(wb.my_pubkey_hash, node.net.PARENT)))
     web_root.putChild('payout_addrs', WebInterface(lambda: list(('%s' % bitcoin_data.pubkey_hash_to_address(add, node.net.PARENT)) for add in wb.pubkeys.keys)))
     web_root.putChild('recent_blocks', WebInterface(lambda: [dict(
-        # ts=s.timestamp,
-        ts=s.min_header.timestamp,
+        ts=s.timestamp,
+        # ts=s.min_header.timestamp,
         hash='%064x' % s.header_hash,
         number=p2pool_data.parse_bip0034(s.share_data['coinbase'])[0],
         share='%064x' % s.hash,