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

peer: Add DisableRelayTx to config. #228

Merged
merged 6 commits into from
May 26, 2016

Conversation

davecgh
Copy link
Member

@davecgh davecgh commented May 26, 2016

Upstream commit 2a7f41c.

dajohi and others added 3 commits November 27, 2015 18:34
This is in preparation of moving mempool to its own subpackage.  No
functional change.
This creates a skeleton mining package that simply contains a few of the
definitions used by the mining and mempool code.

This is a step towards decoupling the mining code from the internals of
btcd and ultimately will house all of the code related to creating block
templates and CPU mining.

The main reason a skeleton package is being created before the full
blown package is ready is to avoid blocking mempool separation which
relies on these type definitions.
DisableRelayTx sets the DisableRelayTx value in the version
message which informs the remote peer on whether to send
inv messages for transactions.
@alexlyp
Copy link
Member

alexlyp commented May 26, 2016

tACK

Contains the following upstream commits:
- 83bcfea
- 2f6aeac
  - Cherry-picked because it fixes an issue originally introduced by the
    commit being merged

In addition to the normal required changes for syncing, the following
changes have been made in order to facilitate integration into Decred:

- Configure the NewestSha function to the new mempool config as a
  closure over the block manager state instead of using the database
  func directly
- Add a new NextStakeDifficulty callback to the new mempool config for
  obtaining the next stake difficulty from the block manager and
  configure it as a closure over the block manager state.
@jcvernaleo
Copy link
Member

OK once conflicts are dealt with (although I think the conflicts are really from the commits this shares with 227)

@davecgh davecgh force-pushed the merge_peer_disablerelaytx branch from c0edc3b to f0389a3 Compare May 26, 2016 21:55
@alexlyp alexlyp merged commit f0389a3 into decred:master May 26, 2016
@davecgh davecgh deleted the merge_peer_disablerelaytx branch May 26, 2016 23:10
@jcvernaleo jcvernaleo added this to the v0.1.5 milestone May 27, 2016
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.

4 participants