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

Expose information on whether transaction relay is enabled in `getnetwork` #8049

Merged
merged 2 commits into from May 26, 2016

Conversation

Projects
None yet
6 participants
@laanwj
Member

laanwj commented May 12, 2016

Re-work of #7841 by @dragongem45.
Closes #7771.

laanwj added some commits May 12, 2016

net: Add fRelayTxes flag
Add a fRelayTxes to keep track of the relay transaction flag
we send to other peers.
rpc: Add `relaytxes` flag to `getnetworkinfo`
Re-work of PR #7841 by dragongem45.
Closes #7771.

@laanwj laanwj changed the title from Expose information on whether transaction relayed is enabled in `getnetwork` to Expose information on whether transaction relay is enabled in `getnetwork` May 12, 2016

@@ -460,6 +460,7 @@ UniValue getnetworkinfo(const UniValue& params, bool fHelp)
" \"subversion\": \"/Satoshi:x.x.x/\", (string) the server subversion string\n"
" \"protocolversion\": xxxxx, (numeric) the protocol version\n"
" \"localservices\": \"xxxxxxxxxxxxxxxx\", (string) the services we offer to the network\n"
" \"localrelay\": true|false, (bool) true if transaction relay is requested from peers\n"

This comment has been minimized.

@MarcoFalke

MarcoFalke May 12, 2016

Member

What does "transaction relay is requested from peers" mean? Shouldn't this say "true if transaction relay is enabled locally"?

@MarcoFalke

MarcoFalke May 12, 2016

Member

What does "transaction relay is requested from peers" mean? Shouldn't this say "true if transaction relay is enabled locally"?

This comment has been minimized.

@laanwj

laanwj May 12, 2016

Member

Possibly - What the flag is used for is to specify in the version message whether we want to receive transactions (so whether transactions should be relayed to us), as well as in the network code whether we accept transactions. That we don't relay transactions is also true, but follows from that.
Maybe the naming is confusing, but I don't know a better one either.

@laanwj

laanwj May 12, 2016

Member

Possibly - What the flag is used for is to specify in the version message whether we want to receive transactions (so whether transactions should be relayed to us), as well as in the network code whether we accept transactions. That we don't relay transactions is also true, but follows from that.
Maybe the naming is confusing, but I don't know a better one either.

This comment has been minimized.

@MarcoFalke

MarcoFalke May 12, 2016

Member

Maybe "true if we do not want to send or receive transactions"? But consider it a nit, I am not a native speaker ;)

@MarcoFalke

MarcoFalke May 12, 2016

Member

Maybe "true if we do not want to send or receive transactions"? But consider it a nit, I am not a native speaker ;)

@MarcoFalke

This comment has been minimized.

Show comment
Hide comment
@MarcoFalke
Member

MarcoFalke commented May 12, 2016

utACK 1ab1dc3

@dcousens

This comment has been minimized.

Show comment
Hide comment
@dcousens

dcousens May 12, 2016

Contributor

utACK 1ab1dc3

Contributor

dcousens commented May 12, 2016

utACK 1ab1dc3

@gmaxwell

This comment has been minimized.

Show comment
Hide comment
@gmaxwell

gmaxwell May 16, 2016

Member

utACK

Member

gmaxwell commented May 16, 2016

utACK

@sipa

This comment has been minimized.

Show comment
Hide comment
@sipa

sipa May 26, 2016

Member

utACK 1ab1dc3

Member

sipa commented May 26, 2016

utACK 1ab1dc3

@sipa sipa merged commit 1ab1dc3 into bitcoin:master May 26, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

sipa added a commit that referenced this pull request May 26, 2016

Merge #8049: Expose information on whether transaction relay is enabl…
…ed in `getnetwork`

1ab1dc3 rpc: Add `relaytxes` flag to `getnetworkinfo` (Wladimir J. van der Laan)
581ddff net: Add fRelayTxes flag (Wladimir J. van der Laan)
@@ -1102,6 +1102,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
fListen = GetBoolArg("-listen", DEFAULT_LISTEN);
fDiscover = GetBoolArg("-discover", true);
fNameLookup = GetBoolArg("-dns", DEFAULT_NAME_LOOKUP);
fRelayTxes = !GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY);

This comment has been minimized.

@rebroad

rebroad Sep 23, 2016

Contributor

nit: why the "e" between the "x" and "s"?

@rebroad

rebroad Sep 23, 2016

Contributor

nit: why the "e" between the "x" and "s"?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment