worker diff

change port

Author: chaeplin

LICENSE

@@ -45,11 +45,11 @@ dist:
 
 # ===--------------------------------------------------------------------===
 
-${CACHE_ROOT}/virtualenv/virtualenv-1.8.2.tar.gz:
+${CACHE_ROOT}/virtualenv/virtualenv-1.10.1.tar.gz:
 	mkdir -p ${CACHE_ROOT}/virtualenv
-	sh -c "cd ${CACHE_ROOT}/virtualenv && curl -O http://pypi.python.org/packages/source/v/virtualenv/virtualenv-1.8.2.tar.gz"
+	sh -c "cd ${CACHE_ROOT}/virtualenv && curl -O https://pypi.python.org/packages/source/v/virtualenv/virtualenv-1.10.1.tar.gz"
 
-${PKG_ROOT}/.stamp-h: conf/requirements*.pip ${CACHE_ROOT}/virtualenv/virtualenv-1.8.2.tar.gz
+${PKG_ROOT}/.stamp-h: conf/requirements*.pip ${CACHE_ROOT}/virtualenv/virtualenv-1.10.1.tar.gz
 	# Because build and run-time dependencies are not thoroughly tracked,
 	# it is entirely possible that rebuilding the development environment
 	# on top of an existing one could result in a broken build. For the
@@ -71,14 +71,14 @@ ${PKG_ROOT}/.stamp-h: conf/requirements*.pip ${CACHE_ROOT}/virtualenv/virtualenv
 	# this project in ``${PKG_ROOT}``.
 	tar \
 	  -C "${CACHE_ROOT}"/virtualenv --gzip \
-	  -xf "${CACHE_ROOT}"/virtualenv/virtualenv-1.8.2.tar.gz
-	python "${CACHE_ROOT}"/virtualenv/virtualenv-1.8.2/virtualenv.py \
+	  -xf "${CACHE_ROOT}"/virtualenv/virtualenv-1.10.1.tar.gz
+	python "${CACHE_ROOT}"/virtualenv/virtualenv-1.10.1/virtualenv.py \
 	  --clear \
 	  --distribute \
 	  --never-download \
 	  --prompt="(p2pool) " \
 	  "${PKG_ROOT}"
-	-rm -rf "${CACHE_ROOT}"/virtualenv/virtualenv-1.8.2
+	-rm -rf "${CACHE_ROOT}"/virtualenv/virtualenv-1.10.1
 
 	# readline is installed here to get around a bug on Mac OS X which is
 	# causing readline to not build properly if installed from pip.

Makefile

@@ -1,14 +1,14 @@
 Requirements:
 -------------------------
 Generic:
-* Bitcoin >=0.6.4
-* Python
-* Twisted
-* python-argparse (for Python <=2.6)
+* Vertcoin >=0.8.5
+* Python >=2.6
+* Twisted >=10.0.0
+* python-argparse (for Python =2.6)
 
 Linux:
 * sudo apt-get install python-zope.interface python-twisted python-twisted-web
-* sudo apt-get install python-argparse # if on Python 2.6 or older
+* sudo apt-get install python-argparse # if on Python 2.6
 
 Windows:
 * Install Python 2.7: http://www.python.org/getit/
@@ -47,16 +47,16 @@ Alternate web front end :
 -------------------------
 * https://github.com/hardcpp/P2PoolExtendedFrontEnd
 
-Notes for Litecoin:
+Notes for Vertcoin:
 =========================
 Requirements:
 -------------------------
-In order to run P2Pool with the Litecoin network, you would need to build and install the
-ltc_scrypt module that includes the scrypt proof of work code that Litecoin uses for hashes.
+In order to run P2Pool with the Vertcoin network, you would need to build and install the
+vtc_scrypt module that includes the scrypt proof of work code that Vertcoin uses for hashes.
 
 Linux:
 
-    cd litecoin_scrypt
+    cd py_modules/vertcoin_scrypt
     sudo python setup.py install
 
 Windows (mingw):
@@ -65,7 +65,7 @@ Windows (mingw):
 
 In bash type this:
 
-    cd litecoin_scrypt
+    cd py_modules\vertcoin_scrypt
     C:\Python27\python.exe setup.py build --compile=mingw32 install
 
 Windows (microsoft visual c++)
@@ -75,21 +75,32 @@ In bash type this:
 
     SET VS90COMNTOOLS=%VS110COMNTOOLS%	           # For visual c++ 2012
     SET VS90COMNTOOLS=%VS100COMNTOOLS%             # For visual c++ 2010
-    cd litecoin_scrypt
+    cd py_modules\vertcoin_scrypt
     C:\Python27\python.exe setup.py build --compile=mingw32 install
-	
+
 If you run into an error with unrecognized command line option '-mno-cygwin', see this:
 http://stackoverflow.com/questions/6034390/compiling-with-cython-and-mingw-produces-gcc-error-unrecognized-command-line-o
 
 Running P2Pool:
 -------------------------
-Run P2Pool with the "--net litecoin" option.
-Run your miner program, connecting to 127.0.0.1 on port 9327.
-Forward port 9338 to the host running P2Pool.
+Run P2Pool with the "--net vertcoin" option.
+Run your miner program, connecting to 127.0.0.1 on port 9171.
+
+Notes for Cachecoin:
+=========================
+This is currently under heavy development and still experimental. For the
+current latest stable implementation, please use https://github.com/Sykh/p2pool-cache
+
+Sponsors:
+-------------------------
+
+Thanks to:
+* The Bitcoin Foundation for its generous support of P2Pool
+* The Litecoin Project for its generous donations to P2Pool
+* The Vertcoin Community for its great contribution to P2Pool
+
 
-Litecoin's use of ports 9332 and 9332 conflicts with P2Pool running on
-the Bitcoin network. To avoid problems, add these lines to litecoin.conf
-and restart litecoind:
 
-    rpcport=10332
-    port=10333
+##### PORT CHANGE
+# nat
+# -A PREROUTING -i eth0 -p tcp --dport 6903 -j REDIRECT --to-port 7903

Makefile.local

@@ -1050,6 +1050,8 @@ def _parseSOAP(xml_str, rules = None):
     # turn on namespace mangeling
     parser.setFeature(xml.sax.handler.feature_namespaces,1)
 
+    parser.setFeature(xml.sax.handler.feature_external_ges, 0)
+
     try:
         parser.parse(inpsrc)
     except xml.sax.SAXParseException, e:

README.md

@@ -1,2 +1,3 @@
 Twisted>=12.2.0
 argparse>=1.2.1
+pyOpenSSL>=0.13

SOAPpy/Parser.py

@@ -226,26 +226,11 @@ def average_attempts_to_target(average_attempts):
 def target_to_difficulty(target):
     assert 0 <= target and isinstance(target, (int, long)), target
     if target >= 2**256: warnings.warn('target >= 2**256!')
-    ###Neisklar: Quarkcoins diff is 1 Byte off (256 times off), who the heck had that idea...
-    #return (0xffff0000 * 2**(256-56) + 1)/(target + 1)
-
-    ### Neisklar: this was a very bad idea, we need to keep the standard diff calculations for all the other
-	###           stuff out there. If we would change this, then we would NEED to change the miner, and since the miner is
-	###           already out there in the wild, this won't work.
-	###           The actual problem is stratum: stratum sends NOT the target, it sends the diff and then the client creates from that diff
-	###           locally the target, which means the client must know about that 1 Byte shift, which it doesn't.
-	###           So we stick to the bitcoin definition of a diff 1 target.
-	###           We just need to change the display in the p2pools log and statspage, to handle that offset.
-	###
-	###           And the diff display in the Quarkcoin wallet should be adjusted.
     return (0xffff0000 * 2**(256-64) + 1)/(target + 1)
 
 def difficulty_to_target(difficulty):
     assert difficulty >= 0
     if difficulty == 0: return 2**256-1
-    #return min(int((0xffff0000 * 2**(256-56) + 1)/difficulty - 1 + 0.5), 2**256-1)
-	
-    ### Neisklar: see above
     return min(int((0xffff0000 * 2**(256-64) + 1)/difficulty - 1 + 0.5), 2**256-1)
 
 # human addresses
@@ -276,11 +261,6 @@ def address_to_pubkey_hash(address, net):
     if x['version'] != net.ADDRESS_VERSION:
         raise ValueError('address not for this net!')
     return x['pubkey_hash']
-def address_to_pubkey_hash_version(address, version):
-    x = human_address_type.unpack(base58_decode(address))
-    if x['version'] != version:
-        raise ValueError('address not for this net!')
-    return x['pubkey_hash']
 
 # transactions
 

conf/requirements.production.pip

@@ -11,10 +11,10 @@
 @defer.inlineCallbacks
 def check(bitcoind, net):
     if not (yield net.PARENT.RPC_CHECK(bitcoind)):
-        print >>sys.stderr, "    Check failed! Make sure that you're connected to the right Client with --bitcoind-rpc-port!"
+        print >>sys.stderr, "    Check failed! Make sure that you're connected to the right bitcoind with --bitcoind-rpc-port!"
         raise deferral.RetrySilentlyException()
     if not net.VERSION_CHECK((yield bitcoind.rpc_getinfo())['version']):
-        print >>sys.stderr, '    Client version too old! Upgrade to newer!'
+        print >>sys.stderr, '    Bitcoin version too old! Upgrade to 0.6.4 or newer!'
         raise deferral.RetrySilentlyException()
 
 @deferral.retry('Error getting work from bitcoind:', 3)
@@ -36,7 +36,7 @@ def go():
             work = yield go()
             end = time.time()
         except jsonrpc.Error_for_code(-32601): # Method not found
-            print >>sys.stderr, 'Error: Client version too old! Upgrade to v0.5 or newer!'
+            print >>sys.stderr, 'Error: Bitcoin version too old! Upgrade to v0.5 or newer!'
             raise deferral.RetrySilentlyException()
     packed_transactions = [(x['data'] if isinstance(x, dict) else x).decode('hex') for x in work['transactions']]
     if 'height' not in work:

nattraverso/__init__.pyc

@@ -4,7 +4,18 @@
 from twisted.internet import defer
 
 from . import data
-from p2pool.util import math, pack
+from p2pool.util import math, pack, jsonrpc
+from operator import *
+
+
+@defer.inlineCallbacks
+def check_genesis_block(bitcoind, genesis_block_hash):
+    try:
+        yield bitcoind.rpc_getblock(genesis_block_hash)
+    except jsonrpc.Error_for_code(-5):
+        defer.returnValue(False)
+    else:
+        defer.returnValue(True)
 
 nets = dict(
 
@@ -30,6 +41,7 @@
         DUMB_SCRYPT_DIFF=1,
         DUST_THRESHOLD=0.001e8,
     ),
+
 )
 for net_name, net in nets.iteritems():
     net.NAME = net_name

nattraverso/ipdiscover.pyc

@@ -16,7 +16,7 @@ class Protocol(p2protocol.Protocol):
     def __init__(self, net):
         p2protocol.Protocol.__init__(self, net.P2P_PREFIX, 1000000, ignore_trailing_payload=True)
         self.net = net
-    
+
     def connectionMade(self):
         self.send_version(
             version=70002,
@@ -36,7 +36,7 @@ def connectionMade(self):
             sub_version_num='/P2Pool:%s/' % (p2pool.__version__,),
             start_height=0,
         )
-    
+
     message_version = pack.ComposedType([
         ('version', pack.IntType(32)),
         ('services', pack.IntType(64)),
@@ -49,21 +49,20 @@ def connectionMade(self):
     ])
     def handle_version(self, version, services, time, addr_to, addr_from, nonce, sub_version_num, start_height):
         self.send_verack()
-    
+
     message_verack = pack.ComposedType([])
     def handle_verack(self):
         self.get_block = deferral.ReplyMatcher(lambda hash: self.send_getdata(requests=[dict(type='block', hash=hash)]))
         self.get_block_header = deferral.ReplyMatcher(lambda hash: self.send_getheaders(version=1, have=[], last=hash))
-        
+
         if hasattr(self.factory, 'resetDelay'):
             self.factory.resetDelay()
         if hasattr(self.factory, 'gotConnection'):
             self.factory.gotConnection(self)
-        
-        #self.pinger = deferral.RobustLoopingCall(self.send_ping)
+
         self.pinger = deferral.RobustLoopingCall(self.send_ping, nonce=1234)
         self.pinger.start(30)
-    
+
     message_inv = pack.ComposedType([
         ('invs', pack.ListType(pack.ComposedType([
             ('type', pack.EnumType(pack.IntType(32), {1: 'tx', 2: 'block'})),
@@ -78,7 +77,7 @@ def handle_inv(self, invs):
                 self.factory.new_block.happened(inv['hash'])
             else:
                 print 'Unknown inv type', inv
-    
+
     message_getdata = pack.ComposedType([
         ('requests', pack.ListType(pack.ComposedType([
             ('type', pack.EnumType(pack.IntType(32), {1: 'tx', 2: 'block'})),
@@ -96,7 +95,7 @@ def handle_inv(self, invs):
         ('last', pack.PossiblyNoneType(0, pack.IntType(256))),
     ])
     message_getaddr = pack.ComposedType([])
-    
+
     message_addr = pack.ComposedType([
         ('addrs', pack.ListType(pack.ComposedType([
             ('timestamp', pack.IntType(32)),
@@ -106,32 +105,34 @@ def handle_inv(self, invs):
     def handle_addr(self, addrs):
         for addr in addrs:
             pass
-    
+
     message_tx = pack.ComposedType([
         ('tx', bitcoin_data.tx_type),
     ])
     def handle_tx(self, tx):
         self.factory.new_tx.happened(tx)
-    
+
     message_block = pack.ComposedType([
         ('block', bitcoin_data.block_type),
     ])
     def handle_block(self, block):
+        #block_hash = bitcoin_data.hash256(bitcoin_data.block_header_type.pack(block['header']))
         block_hash = self.net.BLOCKHASH_FUNC(bitcoin_data.block_header_type.pack(block['header']))
         self.get_block.got_response(block_hash, block)
         self.get_block_header.got_response(block_hash, block['header'])
-    
+
     message_headers = pack.ComposedType([
         ('headers', pack.ListType(bitcoin_data.block_type)),
     ])
     def handle_headers(self, headers):
         for header in headers:
             header = header['header']
-
             header_hash = self.net.BLOCKHASH_FUNC(bitcoin_data.block_header_type.pack(header))
             self.get_block_header.got_response(header_hash, header)
+
+            #self.get_block_header.got_response(bitcoin_data.hash256(bitcoin_data.block_header_type.pack(header)), header)
         self.factory.new_headers.happened([header['header'] for header in headers])
-   
+
     message_ping = pack.ComposedType([
         ('nonce', pack.IntType(64)),
     ])
@@ -143,14 +144,14 @@ def handle_ping(self, nonce):
     ])
     def handle_pong(self, nonce):
         pass
-    
+
     message_alert = pack.ComposedType([
         ('message', pack.VarStrType()),
         ('signature', pack.VarStrType()),
     ])
     def handle_alert(self, message, signature):
         pass # print 'ALERT:', (message, signature)
-    
+
     def connectionLost(self, reason):
         if hasattr(self.factory, 'gotConnection'):
             self.factory.gotConnection(None)
@@ -161,24 +162,24 @@ def connectionLost(self, reason):
 
 class ClientFactory(protocol.ReconnectingClientFactory):
     protocol = Protocol
-    
+
     maxDelay = 1
-    
+
     def __init__(self, net):
         self.net = net
         self.conn = variable.Variable(None)
-        
+
         self.new_block = variable.Event()
         self.new_tx = variable.Event()
         self.new_headers = variable.Event()
-    
+
     def buildProtocol(self, addr):
         p = self.protocol(self.net)
         p.factory = self
         return p
-    
+
     def gotConnection(self, conn):
         self.conn.set(conn)
-    
+
     def getProtocol(self):
         return self.conn.get_not_none()