diff options
| author | fanquake <fanquake@gmail.com> | 2020-08-18 11:49:55 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2020-08-18 12:15:48 +0800 |
| commit | f2d1b9881f68e8196e5842ea92ad80a8b0f2e6ed (patch) | |
| tree | 4634f7e26721de10c1657aaf681679d6e52812d1 /src/protocol.h | |
| parent | 53dac67a97e2084eb2369457d0fec1d3accc3bad (diff) | |
| parent | 4792cad88c5c3c93e639a051df779230ee817396 (diff) | |
| download | bitcoin-f2d1b9881f68e8196e5842ea92ad80a8b0f2e6ed.tar.xz | |
Merge #19721: p2p: comment out unused MSG_FILTERED_WITNESS_BLOCK
4792cad88c5c3c93e639a051df779230ee817396 doc: comment out and add annotation to unused MSG_FILTERED_WITNESS_BLOCK (Adam Jonas)
Pull request description:
Commenting out and adding a note to unused `MSG_FILTERED_WITNESS_BLOCK` [defined in BIP144](https://github.com/bitcoin/bips/blob/master/bip-0144.mediawiki#relay).
There was an attempt to make use of this in https://github.com/bitcoin/bitcoin/pull/10350, but it was closed due to lack of support. (h/t sdaftuar for pointing to the PR and jnewbery for the idea)
ACKs for top commit:
jnewbery:
Obvious ACK 4792cad88c5c3c93e639a051df779230ee817396
theStack:
ACK https://github.com/bitcoin/bitcoin/pull/19721/commits/4792cad88c5c3c93e639a051df779230ee817396 📜
MarcoFalke:
cr ACK 4792cad88c5c3c93e639a051df779230ee817396 good to keep it around in a comment to avoid accidental future re-assignment
practicalswift:
ACK 4792cad88c5c3c93e639a051df779230ee817396
Tree-SHA512: 22327ddded643ae50fdb529e4529a9b464f74e90620d0d2079a11070eaa8afe8363f6e14cca52f3bec2c9f87ee13e318edc6c5193761c94b8ae77be353a8da1f
Diffstat (limited to 'src/protocol.h')
| -rw-r--r-- | src/protocol.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/protocol.h b/src/protocol.h index 9565f5ff96..2e6c767cdd 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -398,7 +398,9 @@ enum GetDataMsg : uint32_t { MSG_CMPCT_BLOCK = 4, //!< Defined in BIP152 MSG_WITNESS_BLOCK = MSG_BLOCK | MSG_WITNESS_FLAG, //!< Defined in BIP144 MSG_WITNESS_TX = MSG_TX | MSG_WITNESS_FLAG, //!< Defined in BIP144 - MSG_FILTERED_WITNESS_BLOCK = MSG_FILTERED_BLOCK | MSG_WITNESS_FLAG, + // MSG_FILTERED_WITNESS_BLOCK is defined in BIP144 as reserved for future + // use and remains unused. + // MSG_FILTERED_WITNESS_BLOCK = MSG_FILTERED_BLOCK | MSG_WITNESS_FLAG, }; /** inv message data */ |