Add tests and documentation for blocksonly #15990

maflcko · 2019-05-09T14:35:27Z

This is de-facto no longer hidden

This helps to distinguish it from CNode::fRelayTxes and avoid bugs like 425278d

doc/reduce-traffic.md

promag

utACK fae9f79.

test/functional/p2p_blocksonly.py

DrahtBot · 2019-05-09T17:53:49Z

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

Reviewers, this pull request conflicts with the following ones:

#15984 (net: Remove -whitelistrelay by MarcoFalke)
#15759 ([p2p] Add 2 outbound blocks-only connections by sdaftuar)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

gmaxwell · 2019-05-10T03:41:12Z

Great work!

jonatack

ACK fac2396. Nice tests and docs. TIL blocksonly is no longer hidden.

Before:

$ bitcoind -help-debug | grep -A3 -- -blocksonly
  -blocksonly
       Whether to operate in a blocks only mode (default: 0)

$ bitcoind -help | grep -A3 -- -blocksonly

After:

$ bitcoind -help-debug | grep -A3 -- -blocksonly
  -blocksonly
       Whether to reject transactions from network peers. Transactions from the
       wallet or RPC are not affected. (default: 0)

$ bitcoind -help | grep -A3 -- -blocksonly
  -blocksonly
       Whether to reject transactions from network peers. Transactions from the
       wallet or RPC are not affected. (default: 0)

doc/reduce-traffic.md

test/functional/p2p_blocksonly.py

src/init.cpp

maflcko · 2019-05-13T13:23:52Z

Replied to or addressed @jonatack s nits. Only doc-changes in the last force push

maflcko · 2019-05-13T13:24:23Z

Also addressed @promag s feedback

jamesob · 2019-05-13T13:26:27Z

Concept ACK - will review today.

jamesob · 2019-05-13T13:27:06Z

doc/reduce-traffic.md

@@ -35,3 +35,14 @@ blocks and transactions to fewer nodes.
 Reducing the maximum connected nodes to a minimum could be desirable if traffic
 limits are tiny. Keep in mind that bitcoin's trustless model works best if you are
 connected to a handful of nodes.
+
+## 4. Turn off transaction relay (`-blocksonly`)


<3 great doc.

jamesob · 2019-05-13T13:37:49Z

test/functional/p2p_blocksonly.py

+        assert_equal(self.nodes[0].getnetworkinfo()['localrelay'], False)
+        with self.nodes[0].assert_debug_log(['transaction sent in violation of protocol peer=0']):
+            self.nodes[0].p2p.send_message(msg_tx(FromHex(CTransaction(), sigtx)))
+            self.nodes[0].p2p.sync_with_ping()


Maybe I'm just being thick here, but shouldn't we assert that the mininode hasn't received a message containing the new tx from self.nodes[0] after this sync_with_ping()?

You mean spinning up a second mininode to check that that one didn't receive it?

I think adding a getmempoolinfo()['size']==0 should do the same?

Yep, the latter sounds good.

jnewbery

utACK fa9c829. One suggested change to the docs.

doc/reduce-traffic.md

jamesob · 2019-05-13T14:58:00Z

utACK fa8ced3

Only changes since 979519e are adding a mempool assertion and a period to the docs. Nice PR!

laanwj · 2019-05-16T17:05:18Z

utACK fa8ced3, thanks for adding documentation!

fa8ced3 doc: Mention blocksonly in reduce-traffic.md, unhide option (MarcoFalke) fa320de test: Add test for p2p_blocksonly (MarcoFalke) fa3872e test: Format predicate source as multiline on error (MarcoFalke) fa1dce7 net: Rename ::fRelayTxes to ::g_relay_txes (MarcoFalke) Pull request description: This is de-facto no longer hidden ACKs for commit fa8ced: jamesob: utACK fa8ced3 Tree-SHA512: 474fbdee6cbd035ed9068a066b6056c1f909ec7520be0417820fcd1672ab3069b53f55c5147968978d9258fd3a3933fe1a9ef8e4f6e14fb6ebbd79701a0a1245

This helps to distinguish it from CNode::fRelayTxes and avoid bugs like 425278d Github-Pull: bitcoin#15990 Rebased-From: fa1dce7

Github-Pull: bitcoin#15990 Rebased-From: fa3872e

Github-Pull: bitcoin#15990 Rebased-From: fa320de

Github-Pull: bitcoin#15990 Rebased-From: fa8ced3

fa8ced3 doc: Mention blocksonly in reduce-traffic.md, unhide option (MarcoFalke) fa320de test: Add test for p2p_blocksonly (MarcoFalke) fa3872e test: Format predicate source as multiline on error (MarcoFalke) fa1dce7 net: Rename ::fRelayTxes to ::g_relay_txes (MarcoFalke) Pull request description: This is de-facto no longer hidden ACKs for commit fa8ced: jamesob: utACK bitcoin@fa8ced3 Tree-SHA512: 474fbdee6cbd035ed9068a066b6056c1f909ec7520be0417820fcd1672ab3069b53f55c5147968978d9258fd3a3933fe1a9ef8e4f6e14fb6ebbd79701a0a1245

This helps to distinguish it from CNode::fRelayTxes and avoid bugs like 425278d Github-Pull: bitcoin#15990 Rebased-From: fa1dce7

Github-Pull: bitcoin#15990 Rebased-From: fa3872e

Github-Pull: bitcoin#15990 Rebased-From: fa320de

Github-Pull: bitcoin#15990 Rebased-From: fa8ced3

This helps to distinguish it from CNode::fRelayTxes and avoid bugs like 425278d Github-Pull: bitcoin#15990 Rebased-From: fa1dce7

Github-Pull: bitcoin#15990 Rebased-From: fa3872e

Github-Pull: bitcoin#15990 Rebased-From: fa320de

Github-Pull: bitcoin#15990 Rebased-From: fa8ced3

Summary: * net: Rename ::fRelayTxes to ::g_relay_txes This helps to distinguish it from CNode::fRelayTxes and avoid bugs like 425278d * test: Format predicate source as multiline on error * test: Add test for p2p_blocksonly * doc: Mention blocksonly in reduce-traffic.md, unhide option This is a backport of Core [[bitcoin/bitcoin#15990 | PR15990]] Test Plan: ninja all check-all Reviewers: #bitcoin_abc, majcosta Reviewed By: #bitcoin_abc, majcosta Differential Revision: https://reviews.bitcoinabc.org/D6424

Add -blocksonly option Cherry-picked from the following upstream PRs: - bitcoin/bitcoin#6993 - bitcoin/bitcoin#7046 - bitcoin/bitcoin#6780 - The third commit (we backported the rest in #2390). - bitcoin/bitcoin#7126 - bitcoin/bitcoin#7439 - bitcoin/bitcoin#15990 - Only the `-blocksonly` documentation changes. - bitcoin/bitcoin#16555 - bitcoin/bitcoin#18391 - Only the `-blocksonly` documentation changes. Part of #2074.

fa8ced3 doc: Mention blocksonly in reduce-traffic.md, unhide option (MarcoFalke) fa320de test: Add test for p2p_blocksonly (MarcoFalke) fa3872e test: Format predicate source as multiline on error (MarcoFalke) fa1dce7 net: Rename ::fRelayTxes to ::g_relay_txes (MarcoFalke) Pull request description: This is de-facto no longer hidden ACKs for commit fa8ced: jamesob: utACK bitcoin@fa8ced3 Tree-SHA512: 474fbdee6cbd035ed9068a066b6056c1f909ec7520be0417820fcd1672ab3069b53f55c5147968978d9258fd3a3933fe1a9ef8e4f6e14fb6ebbd79701a0a1245

net: Rename ::fRelayTxes to ::g_relay_txes

fa1dce7

This helps to distinguish it from CNode::fRelayTxes and avoid bugs like 425278d

maflcko added this to the 0.18.1 milestone May 9, 2019

maflcko force-pushed the 1905-docTestBlocksOnly branch from fae64e6 to fae9f79 Compare May 9, 2019 14:40

DrahtBot added Docs P2P RPC/REST/ZMQ Tests labels May 9, 2019

promag reviewed May 9, 2019

View reviewed changes

doc/reduce-traffic.md Outdated Show resolved Hide resolved

promag reviewed May 9, 2019

View reviewed changes

test/functional/p2p_blocksonly.py Outdated Show resolved Hide resolved

test: Format predicate source as multiline on error

fa3872e

maflcko force-pushed the 1905-docTestBlocksOnly branch from fae9f79 to fac2396 Compare May 10, 2019 11:30

jonatack reviewed May 13, 2019

View reviewed changes

doc/reduce-traffic.md Outdated Show resolved Hide resolved

test/functional/p2p_blocksonly.py Show resolved Hide resolved

jonatack reviewed May 13, 2019

View reviewed changes

src/init.cpp Show resolved Hide resolved

maflcko force-pushed the 1905-docTestBlocksOnly branch from fac2396 to fa9c829 Compare May 13, 2019 13:21

jamesob reviewed May 13, 2019

View reviewed changes

jnewbery reviewed May 13, 2019

View reviewed changes

doc/reduce-traffic.md Outdated Show resolved Hide resolved

maflcko force-pushed the 1905-docTestBlocksOnly branch from fa9c829 to 979519e Compare May 13, 2019 14:41

MarcoFalke added 2 commits May 13, 2019 10:44

test: Add test for p2p_blocksonly

fa320de

doc: Mention blocksonly in reduce-traffic.md, unhide option

fa8ced3

maflcko force-pushed the 1905-docTestBlocksOnly branch from 979519e to fa8ced3 Compare May 13, 2019 14:45

laanwj merged commit fa8ced3 into bitcoin:master May 16, 2019

maflcko deleted the 1905-docTestBlocksOnly branch May 16, 2019 17:14

maflcko pushed a commit to maflcko/bitcoin-core that referenced this pull request May 16, 2019

net: Rename ::fRelayTxes to ::g_relay_txes

9c1a607

This helps to distinguish it from CNode::fRelayTxes and avoid bugs like 425278d Github-Pull: bitcoin#15990 Rebased-From: fa1dce7

maflcko pushed a commit to maflcko/bitcoin-core that referenced this pull request May 16, 2019

test: Format predicate source as multiline on error

8f215c7

Github-Pull: bitcoin#15990 Rebased-From: fa3872e

maflcko pushed a commit to maflcko/bitcoin-core that referenced this pull request May 16, 2019

test: Add test for p2p_blocksonly

3460555

Github-Pull: bitcoin#15990 Rebased-From: fa320de

maflcko pushed a commit to maflcko/bitcoin-core that referenced this pull request May 16, 2019

doc: Mention blocksonly in reduce-traffic.md, unhide option

890a92e

Github-Pull: bitcoin#15990 Rebased-From: fa8ced3

jnewbery mentioned this pull request Jun 9, 2019

Setting -blocksonly sets -maxmempool to zero. #9569

Closed

laanwj added Needs backport and removed Needs backport labels Jul 18, 2019

laanwj removed this from the 0.18.1 milestone Jul 18, 2019

HashUnlimited pushed a commit to HashUnlimited/chaincoin that referenced this pull request Aug 23, 2019

net: Rename ::fRelayTxes to ::g_relay_txes

43efe36

This helps to distinguish it from CNode::fRelayTxes and avoid bugs like 425278d Github-Pull: bitcoin#15990 Rebased-From: fa1dce7

HashUnlimited pushed a commit to HashUnlimited/chaincoin that referenced this pull request Aug 23, 2019

test: Format predicate source as multiline on error

f8d7b0e

Github-Pull: bitcoin#15990 Rebased-From: fa3872e

HashUnlimited pushed a commit to HashUnlimited/chaincoin that referenced this pull request Aug 23, 2019

test: Add test for p2p_blocksonly

4757de6

Github-Pull: bitcoin#15990 Rebased-From: fa320de

HashUnlimited pushed a commit to HashUnlimited/chaincoin that referenced this pull request Aug 23, 2019

doc: Mention blocksonly in reduce-traffic.md, unhide option

268ab37

Github-Pull: bitcoin#15990 Rebased-From: fa8ced3

Bushstar pushed a commit to Bushstar/omnicore that referenced this pull request Aug 24, 2019

net: Rename ::fRelayTxes to ::g_relay_txes

9d62706

This helps to distinguish it from CNode::fRelayTxes and avoid bugs like 425278d Github-Pull: bitcoin#15990 Rebased-From: fa1dce7

Bushstar pushed a commit to Bushstar/omnicore that referenced this pull request Aug 24, 2019

test: Format predicate source as multiline on error

78d7825

Github-Pull: bitcoin#15990 Rebased-From: fa3872e

Bushstar pushed a commit to Bushstar/omnicore that referenced this pull request Aug 24, 2019

test: Add test for p2p_blocksonly

51fef28

Github-Pull: bitcoin#15990 Rebased-From: fa320de

Bushstar pushed a commit to Bushstar/omnicore that referenced this pull request Aug 24, 2019

doc: Mention blocksonly in reduce-traffic.md, unhide option

ec4269a

Github-Pull: bitcoin#15990 Rebased-From: fa8ced3

str4d mentioned this pull request Feb 19, 2021

Add -blocksonly option zcash/zcash#4996

Merged

bitcoin locked as resolved and limited conversation to collaborators Aug 16, 2022

Add tests and documentation for blocksonly #15990

Add tests and documentation for blocksonly #15990

Uh oh!

Conversation

maflcko commented May 9, 2019

Uh oh!

Uh oh!

promag left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

DrahtBot commented May 9, 2019

Conflicts

Uh oh!

gmaxwell commented May 10, 2019

Uh oh!

jonatack left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

maflcko commented May 13, 2019

Uh oh!

maflcko commented May 13, 2019

Uh oh!

jamesob commented May 13, 2019

Uh oh!

jamesob May 13, 2019

Choose a reason for hiding this comment

Uh oh!

jamesob May 13, 2019

Choose a reason for hiding this comment

Uh oh!

maflcko May 13, 2019

Choose a reason for hiding this comment

Uh oh!

jamesob May 13, 2019

Choose a reason for hiding this comment

Uh oh!

jnewbery left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jamesob commented May 13, 2019

Uh oh!

laanwj commented May 16, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

laanwj commented May 16, 2019 •

edited

Loading