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

pull laanwj wants to merge 2 commits into bitcoin:master from laanwj:2016_05_rpc_relaytxes changing 5 files +8 −3

laanwj commented at 12:27 PM on May 12, 2016: member

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

net: Add fRelayTxes flag

Add a fRelayTxes to keep track of the relay transaction flag
we send to other peers.

581ddff05c

rpc: Add `relaytxes` flag to `getnetworkinfo`
Re-work of PR #7841 by dragongem45. Closes #7771.
1ab1dc3140
laanwj added the label RPC/REST/ZMQ on May 12, 2016
laanwj added the label P2P on May 12, 2016
laanwj renamed this:
~~Expose information on whether transaction relayed is enabled in `getnetwork`~~
Expose information on whether transaction relay is enabled in `getnetwork`
on May 12, 2016
in src/rpc/net.cpp:None in 1ab1dc3140
```
 459 | @@ -460,6 +460,7 @@ UniValue getnetworkinfo(const UniValue& params, bool fHelp)
 460 |              "  \"subversion\": \"/Satoshi:x.x.x/\",     (string) the server subversion string\n"
 461 |              "  \"protocolversion\": xxxxx,              (numeric) the protocol version\n"
 462 |              "  \"localservices\": \"xxxxxxxxxxxxxxxx\", (string) the services we offer to the network\n"
 463 | +            "  \"localrelay\": true|false,              (bool) true if transaction relay is requested from peers\n"
```
MarcoFalke commented at 12:56 PM on May 12, 2016:

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

laanwj commented at 1:17 PM on May 12, 2016:

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.

MarcoFalke commented at 1:33 PM on May 12, 2016:

Maybe "true if we do not want to send or receive transactions"? But consider it a nit, I am not a native speaker ;)
MarcoFalke commented at 12:56 PM on May 12, 2016: member

utACK 1ab1dc3
dcousens commented at 1:57 PM on May 12, 2016: contributor

utACK 1ab1dc3
gmaxwell commented at 8:43 PM on May 16, 2016: contributor

utACK
sipa commented at 12:51 PM on May 26, 2016: member

utACK 1ab1dc3140ff521df42f1f396a49a50e91bf2740
sipa merged this on May 26, 2016
sipa closed this on May 26, 2016
sipa referenced this in commit c028c7b755 on May 26, 2016

in src/init.cpp:None in 1ab1dc3140

1101 | @@ -1102,6 +1102,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
1102 |      fListen = GetBoolArg("-listen", DEFAULT_LISTEN);
1103 |      fDiscover = GetBoolArg("-discover", true);
1104 |      fNameLookup = GetBoolArg("-dns", DEFAULT_NAME_LOOKUP);
1105 | +    fRelayTxes = !GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY);

rebroad commented at 11:03 AM on September 23, 2016:

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

MarkLTZ referenced this in commit 13cd4b32df on Apr 27, 2019
MarkLTZ referenced this in commit 137ee6db0d on Apr 27, 2019
DrahtBot locked this on Sep 8, 2021

Contributors

Labels

Linked (view graph)

#7771 Expose information on whether transaction relayed is enabled in getnetworkinfo #7841 Expose information on whether transaction relayed is enabled in getnetwork #8102 Bugfix: use global ::fRelayTxes instead of CNode in version send #8103 Travis shutdown didn't result in failed job