Error when issuing work for miner

.gitignore

@@ -0,0 +1,12 @@
+*.pyc
+*.pyo
+*~
+
+data
+_trial_temp*
+Makefile.local
+.cache
+.pkg
+.coverage
+build
+web-static

README.md

@@ -1,113 +1,57 @@
 Requirements:
 -------------------------
 Generic:
-* 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
+* Dash >=0.11.2.17
+* Python >=2.7
+* Twisted >=13.0.0
+* Zope.interface >=3.8.0
 
-Windows:
-* Install Python 2.7: http://www.python.org/getit/
-* Install Twisted: http://twistedmatrix.com/trac/wiki/Downloads
-* Install Zope.Interface: http://pypi.python.org/pypi/zope.interface/3.8.0
-* Install python win32 api: http://sourceforge.net/projects/pywin32/files/pywin32/Build%20218/
-* Install python win32 api wmi wrapper: https://pypi.python.org/pypi/WMI/#downloads
-* Unzip the files into C:\Python27\Lib\site-packages
+Linux:
 
+    sudo apt-get install python-zope.interface python-twisted python-twisted-web python-dev
+    sudo apt-get install gcc g++
 
-Install module:
+Install Python modules:
 -------------------------
+dash_hash:
 
-* apt-get install libboost1.48-all-dev python-dev
-
-
-* git clone https://github.com/chaeplin/SUBSIDY_FUNC.git
-* git clone https://github.com/evan82/xcoin-hash.git
-
-* cd SUBSIDY_FUNC/darkcoin-subsidy-python
-* python setup.py install
-
-* cd xcoin-hash
-* python setup.py install
+    git clone https://github.com/vertoe/darkcoin_hash.git
+    cd darkcoin_hash
+    python setup.py install
 
+dash_subsidy:
 
+    git clone https://github.com/vertoe/darkcoin_subsidy.git
+    cd darkcoin_subsidy
+    python setup.py install
 
 Running P2Pool:
 -------------------------
-To use P2Pool, you must be running your own local bitcoind. For standard
+To use P2Pool, you must be running your own local dashd. For standard
 configurations, using P2Pool should be as simple as:
 
     python run_p2pool.py
 
-Then run your miner program, connecting to 127.0.0.1 on port 9332 with any
+Then run your miner program, connecting to 127.0.0.1 on port 7903 with any
 username and password.
 
 If you are behind a NAT, you should enable TCP port forwarding on your
-router. Forward port 9333 to the host running P2Pool.
+router. Forward port 8999 to the host running P2Pool.
 
 Run for additional options.
 
     python run_p2pool.py --help
 
-Donations towards further development:
--------------------------
-    1HNeqi3pJRNvXybNX4FKzZgYJsdTSqJTbk
-
 Official wiki :
 -------------------------
 https://en.bitcoin.it/wiki/P2Pool
 
 Alternate web front end :
 -------------------------
 * https://github.com/hardcpp/P2PoolExtendedFrontEnd
-
-Notes for Vertcoin:
-=========================
-Requirements:
--------------------------
-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 py_modules/vertcoin_scrypt
-    sudo python setup.py install
-
-Windows (mingw):
-* Install MinGW: http://www.mingw.org/wiki/Getting_Started
-* Install Python 2.7: http://www.python.org/getit/
-
-In bash type this:
-
-    cd py_modules\vertcoin_scrypt
-    C:\Python27\python.exe setup.py build --compile=mingw32 install
-
-Windows (microsoft visual c++)
-* Open visual studio console
-
-In bash type this:
-
-    SET VS90COMNTOOLS=%VS110COMNTOOLS%	           # For visual c++ 2012
-    SET VS90COMNTOOLS=%VS100COMNTOOLS%             # For visual c++ 2010
-    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 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
+* https://github.com/johndoe75/p2pool-node-status
+* https://github.com/justino/p2pool-ui-punchy
 
 Sponsors:
 -------------------------
@@ -116,4 +60,4 @@ 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
-
+* chaeplin, dstorm and mr.slaveg from the Dash Community

p2pool/bitcoin/data.py → p2pool/dash/data.py

@@ -108,6 +108,12 @@ def write(self, file, item):
     ('lock_time', pack.IntType(32)),
 ])
 
+vote_type = pack.ComposedType([
+    ('block_height', pack.IntType(64)),
+    ('pubkey', pack.VarStrType()),
+    ('votes', pack.IntType(32)),
+])
+
 merkle_link_type = pack.ComposedType([
     ('branch', pack.ListType(pack.IntType(256))),
     ('index', pack.IntType(32)),
@@ -131,6 +137,12 @@ def write(self, file, item):
 block_type = pack.ComposedType([
     ('header', block_header_type),
     ('txs', pack.ListType(tx_type)),
+    ('votes', pack.ListType(vote_type)),
+])
+
+block_type_old = pack.ComposedType([
+    ('header', block_header_type),
+    ('txs', pack.ListType(tx_type)),
 ])
 
 # merged mining
@@ -258,7 +270,7 @@ def pubkey_to_address(pubkey, net):
 
 def address_to_pubkey_hash(address, net):
     x = human_address_type.unpack(base58_decode(address))
-    if x['version'] != net.ADDRESS_VERSION:
+    if x['version'] != net.ADDRESS_VERSION and x['version'] != net.SCRIPT_ADDRESS_VERSION:
         raise ValueError('address not for this net!')
     return x['pubkey_hash']
 

p2pool/bitcoin/getwork.py → p2pool/dash/getwork.py

@@ -4,7 +4,7 @@
 
 from __future__ import division
 
-from . import data as bitcoin_data
+from . import data as dash_data
 from . import sha256
 from p2pool.util import pack
 
@@ -35,7 +35,7 @@ def getwork(self, **extra):
         if 'data' in extra or 'hash1' in extra or 'target' in extra or 'midstate' in extra:
             raise ValueError()
 
-        block_data = bitcoin_data.block_header_type.pack(dict(
+        block_data = dash_data.block_header_type.pack(dict(
             version=self.version,
             previous_block=self.previous_block,
             merkle_root=self.merkle_root,
@@ -75,4 +75,4 @@ def update(self, **kwargs):
         return self.__class__(**d)
 
 def decode_data(data):
-    return bitcoin_data.block_header_type.unpack(_swap4(data.decode('hex'))[:80])
+    return dash_data.block_header_type.unpack(_swap4(data.decode('hex'))[:80])