diff --git a/_autocrossref.yaml b/_autocrossref.yaml index e4c5b75afa..c94200ca1f 100644 --- a/_autocrossref.yaml +++ b/_autocrossref.yaml @@ -145,6 +145,7 @@ message headers: message header message payload: '`merchant_data`': pp merchant data merkle block: +merkle blocks: merkle block '`merkleblock` message': merkleblock message '`merkleblock` messages': merkleblock message merkle root: diff --git a/_includes/ref_p2p_networking.md b/_includes/ref_p2p_networking.md index f54516e64c..9dfa4724df 100644 --- a/_includes/ref_p2p_networking.md +++ b/_includes/ref_p2p_networking.md @@ -809,7 +809,7 @@ section][message header] for an example of a message without a payload. *Added in protocol version 70001 as described by BIP37.* The `filterload` message tells the receiving peer to filter all relayed -transactions and requested merkleblocks through the provided filter. +transactions and requested merkle blocks through the provided filter. This allows clients to receive transactions relevant to their wallet plus a configurable rate of false positive transactions which can provide plausible-deniability privacy. @@ -819,8 +819,8 @@ provide plausible-deniability privacy. | *Varies* | nFilterBytes | uint8_t[] | Number of bytes in the following filter bit field. | *Varies* | filter | uint8_t[] | A bit field of arbitrary byte-aligned size. The maximum size is 36,000 bytes. | 4 | nHashFuncs | uint32_t | The number of hash functions to use in this filter. The maximum value allowed in this field is 50. -| 4 | nTweak | uint32_t | A arbitrary value to add to the seed value in the hash function used by the bloom filter. -| 1 | nFlags | uint8_t | A set of flags that control how outpoints corresponding to a matched pubkey script are are added to the filter. See the table in the Updating A Bloom Filter subsection below. +| 4 | nTweak | uint32_t | An arbitrary value to add to the seed value in the hash function used by the bloom filter. +| 1 | nFlags | uint8_t | A set of flags that control how outpoints corresponding to a matched pubkey script are added to the filter. See the table in the Updating A Bloom Filter subsection below. The annotated hexdump below shows a `filterload` message. (The message header has been omitted.) For an example of how this payload was diff --git a/_includes/references.md b/_includes/references.md index 7159b4ccde..6c4117ad4a 100644 --- a/_includes/references.md +++ b/_includes/references.md @@ -49,7 +49,7 @@ [fiat]: /en/developer-guide#term-fiat "National currencies such as the dollar or euro" [filteradd message]: /en/developer-reference#filteradd "A P2P protocol message used to add a data element to an existing bloom filter." [filterclear message]: /en/developer-reference#filterclear "A P2P protocol message used to remove an existing bloom filter." -[filterload message]: /en/developer-reference#filterclear "A P2P protocol message used send a filter to a remote peer, requesting that they only send transactions which match the filter." +[filterload message]: /en/developer-reference#filterclear "A P2P protocol message used to send a filter to a remote peer, requesting that they only send transactions which match the filter." [fork]: /en/developer-guide#term-fork "When two or more blocks have the same block height, forking the block chain." [genesis block]: /en/developer-guide#term-genesis-block "The first block created; also called block 0" [getaddr message]: /en/developer-reference#getaddr "A P2P protool message used to request an addr message containing connection information for other nodes" @@ -107,7 +107,7 @@ [op_hash160]: /en/developer-reference#term-op-hash160 "Operation which converts the entry below it on the stack into a RIPEMD(SHA256()) hashed version of itself" [op_return]: /en/developer-reference#term-op-return "Operation which terminates the script in failure" [op_verify]: /en/developer-reference#term-op-verify "Operation which terminates the script if the entry below it on the stack is non-true (zero)" -[outpoint]: /en/developer-reference#term-outpoint "The structure used to refer to a particular transaction output, considing of a 32-byte TXID and a 4-byte output index number (vout)." +[outpoint]: /en/developer-reference#term-outpoint "The structure used to refer to a particular transaction output, consisting of a 32-byte TXID and a 4-byte output index number (vout)." [output]: /en/developer-guide#term-output "The output of a transaction which transfers value to a pubkey script" [output index]: /en/developer-guide#term-output-index "The sequentially-numbered index of outputs in a single transaction starting from 0" [P2PKH]: /en/developer-guide#term-p2pkh "A pubkey script which Pays To PubKey Hashes (P2PKH), allowing spending of satoshis to anyone with a Bitcoin address"