Upgrade to Python3

.gitignore

@@ -1,14 +1,19 @@
 *.pyc
 *.pyo
 *~
+.*.swp
+*.so
 
 /data/
-/litecoin_scrypt/build/
 /_trial_temp*
 Makefile.local
 .cache/
 .pkglist
 .pyenv/
 .coverage
 build/
-ltc_scrypt.so
+MANIFEST
+VERSION
+dist/
+tags
+*.egg-info

MANIFEST.in

@@ -0,0 +1,4 @@
+include README.md
+include VERSION
+include p2pool/pow/*
+include web-static/*

README.md

@@ -21,44 +21,24 @@ Copy and paste the following commands into a bash shell in order to install p2po
 >sudo apt-get install pypy pypy-dev pypy-setuptools gcc build-essential git
 
 
->wget https://bootstrap.pypa.io/ez_setup.py -O - | sudo pypy
->sudo rm setuptools-*.zip
-
-
->wget https://pypi.python.org/packages/source/z/zope.interface/zope.interface-4.1.3.tar.gz#md5=9ae3d24c0c7415deb249dd1a132f0f79
-tar zxf zope.interface-4.1.3.tar.gz
-
->cd zope.interface-4.1.3/
-
->sudo pypy setup.py install
-
->cd ..
-
->sudo rm -r zope.interface-4.1.3*
-
-
->wget https://pypi.python.org/packages/source/T/Twisted/Twisted-15.4.0.tar.bz2
-
->tar jxf Twisted-15.4.0.tar.bz2
-
->cd Twisted-15.4.0
-
->sudo pypy setup.py install
-
->cd ..
-
->sudo rm -r Twisted-15.4.0*
-
-
 >git clone https://github.com/jtoomim/p2pool.git
 
 >cd p2pool
 
 >git checkout 1mb_segwit
 
 
+Download dependencies, build required modules and install P2Pool. You can
+install it system wide, in your home directory or in a virtualenv.
+
+>(python3|pypy3|/path/to/virtualenv/bin/python3|pypy3) setup.py install [--user]
+
+
 You'll also need to install and run your bitcoind or altcoind of choice, and edit ~/.bitcoin/bitcoin.conf (or the corresponding file for litecoin or whatever other coin you intend to mine) with your bitcoind's RPC username and password. Launch your bitcoind or altcoind, and after it has finished downloading blocks and syncing, go to your p2pool directory and run
 
+> run_p2pool.py
+
+or
 
 >pypy run_p2pool.py
 
@@ -100,10 +80,19 @@ P2pool communicates with miners via the stratum protocol. For BTC, configure you
 >Password: x
 
 
-For Litecoin, replace 9332 with 9327. For Bitcoin Cash, use 9348. For Dash, use 7903.
+For Litecoin, replace 9332 with 9327. For Bitcoin Cash, use 9348.
 
 
-The mining address must be a regular P2PKH address. Segwit, multisig, and bech32 addresses are not supported. That means an address starting with a 1 for Bitcoin or Bitcoin Cash or an L for Litecoin. If you use an address that p2pool cannot understand, then p2pool will mine to that node's default address instead.
+Mining to Legacy (P2PKH), SegWit/MultiSig (P2SH) and Bech32 addresses are supported for the following coins with the specified address prefixes:
+
+|Coin		|P2PKH	|P2SH	|Bech32				|
+|---------------|-------|-------|-------------------------------|
+|Bitcoin	|`1...`	|`3...`	|`bc1...`			|
+|Bitcoin Cash*	|`1...`	| (test)|`bitcoincash:q...` or `q...`	|
+|Litecoin	|`L...`	|`M...`	|`ltc1...`			|
+* Bitcoin Cash uses cashaddr instead of Bech32
+
+**Only Legacy addresses (P2PKH) are supported for coins not mentioned above. If you use an address that p2pool cannot understand, then p2pool will mine to that node's default address instead.**
 
 
 If you wish to modify the mining difficulty, you may add something like "address+4096" after your mining address to set the pseudoshare difficulty to 4096, or "address/65536" to set the actual share difficulty to 65536 or the p2pool minimum share difficulty, whichever is higher. Pseudoshares only affect hashrate statistics, whereas actual shares affect revenue variance and efficiency.
@@ -113,3 +102,16 @@ If you wish to modify the mining difficulty, you may add something like "address
 
 
 If your node is behind a firewall or behind NAT (i.e. on a private IP address), you may want to forward ports to your p2pool server. P2pool uses two ports: one for p2p communication with the p2pool network, and another for both the web UI and for stratum communication with workers. For Bitcoin, those ports are 9333 (p2p) and 9332 (stratum/web). For Litecoin, they are 9326 (p2p) and 9327 (stratum/web). For Bitcoin Cash, they are 9349 (p2p) and 9348 (stratum/web).
+
+**Credits**
+
+Original P2Pool written by:
+* Forrest Voight <[email protected]>
+
+Contributions by:
+* Jonathan Toomim <[email protected]>
+* Robert LeBlanc <[email protected]>
+
+Maintained by:
+* Jonathan Toomim <[email protected]>
+* Robert LeBlanc <[email protected]>