Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update p2pool-dash for working with DashCore v0.12.1.x #24

Merged
merged 53 commits into from
Feb 7, 2017

Conversation

thelazier
Copy link
Contributor

Please let me know if we need to add anything.
Possibly version bump to compatible with DashCore release.

thelazier and others added 30 commits February 3, 2016 22:52
- Try use getblocktemplate first
- Fix case no transaction.
- Fix case no votes found from getblocktemplate (Removed by dashpay/dash@e2aaf09 )
Added missing label to current_payouts table
…rt_networks

If you're having trouble merging this commit, first merge this commit's parent, and then
start merging this commit and do this to apply what this commit does to your networks:

    git reset HEAD . # reset index to your copy
    git checkout HEAD . # reset tree to your copy
    rm -fr p2pool/networks p2pool/dash/networks # remove added files
    dev/convert_networks # convert networks to new format (what this commit does)
    git commit # finish the merge
Conflicts:
	p2pool/main.py
	p2pool/web.py
Conflicts:
	p2pool/p2p.py
thelazier and others added 10 commits October 7, 2016 15:19
* Update setup.py
* Create appveyor.yml
…to add or remove

transactions to known_txs_var and trigger callbacks (for caching) on just
the changes, instead of triggering a callback on the before and after
state. This should improve performance dramatically with large mempools
when receiving or removing transactions.

Conflicts:
	p2pool/node.py
	p2pool/p2p.py
@thelazier
Copy link
Contributor Author

BTW, p2pool-dash seed nodes possibly need to update, suggestions are welcome.

* Check Version to 120100
* Update bootstrap addr for mainnet
*
Copy link
Contributor

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Few minior changes needed, see comments.
And btw, was this tested? Is there any live p2pool node either on mainnet or testnet running this?

@@ -14,12 +14,12 @@ def check(dashd, net):
print >>sys.stderr, " Check failed! Make sure that you're connected to the right dashd with --dashd-rpc-port!"
raise deferral.RetrySilentlyException()
if not net.VERSION_CHECK((yield dashd.rpc_getinfo())['version']):
print >>sys.stderr, ' dash version too old! Upgrade to 0.11.2.17 or newer!'
print >>sys.stderr, ' dash version too old! Upgrade to 0.12.0.58 or newer!'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

0.12.1.0

@@ -19,7 +19,7 @@ def __init__(self, net):

def connectionMade(self):
self.send_version(
version=70077,
version=70204,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

70206

@thelazier
Copy link
Contributor Author

Tested on testnet , I'm running a mainnet node (p2pool.dash.siampm.com), we still need to get in touch with other pools to update seed nodes.

Copy link
Contributor

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

@UdjinM6
Copy link
Contributor

UdjinM6 commented Feb 7, 2017

Another user confirmed successful node start with this code https://www.dash.org/forum/threads/p2pool-repository-and-python-modules-may-2016.8795/#post-113168

Probably ok to merge. @schinzelh ?

@UdjinM6 UdjinM6 merged commit e8d4618 into dashpay:master Feb 7, 2017
@UdjinM6
Copy link
Contributor

UdjinM6 commented Feb 7, 2017

@thelazier thelazier deleted the v0.12.1.x branch February 8, 2017 04:06
@thelazier thelazier restored the v0.12.1.x branch February 8, 2017 04:07
@thelazier thelazier deleted the v0.12.1.x branch February 8, 2017 04:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants