diff --git a/zip-0155.html b/zip-0155.html index 94bcc09f..72b7a998 100644 --- a/zip-0155.html +++ b/zip-0155.html @@ -18,7 +18,7 @@ License: BSD-2-Clause Discussions-To: <https://github.com/zcash/zips/issues/542> Pull-Request: <https://github.com/zcash/zips/pull/543>

Terminology

-

The key words "MUST", "MUST NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED" and "MAY" in this document are to be interpreted as described in RFC 2119. 1

+

The key words "MUST", "MUST NOT", "SHOULD", "SHOULD NOT", and "MAY" in this document are to be interpreted as described in RFC 2119. 1

The term "network upgrade" in this document is to be interpreted as described in ZIP 200. 4

The terms "Testnet" and "Mainnet" are to be interpreted as described in section 3.11 of the Zcash Protocol Specification 2.

"P2P network" means the Zcash peer-to-peer network.

@@ -128,7 +128,7 @@ Pull-Request: <https://githu

Network ID 0x03 is intentionally not assigned. In BIP 155 3 it was assigned to Tor v2 onion addresses, but those addresses are no longer supported by the latest Tor client code, and MUST NOT be used once this ZIP is deployed.

-

Clients SHOULD gossip addresses from all known networks even if they are currently not connected to some of them. That could help multi-homed nodes and make it more difficult for an observer to tell which networks a node is connected to.

+

Clients SHOULD gossip valid, potentially routable addresses from all known networks, even if they are currently not connected to some of them. That could help multi-homed nodes and make it more difficult for an observer to tell which networks a node is connected to.

Clients MUST NOT gossip addresses from unknown networks, because they have no means to validate those addresses and so can be tricked to gossip invalid addresses.

Clients MUST reject messages that contain addresses that have a different length than specified in this table for a specific network ID, as these are meaningless.

Network address encodings

diff --git a/zip-0155.rst b/zip-0155.rst index 532ca924..71c8a8c3 100644 --- a/zip-0155.rst +++ b/zip-0155.rst @@ -16,8 +16,8 @@ Terminology =========== -The key words "MUST", "MUST NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED" and "MAY" -in this document are to be interpreted as described in RFC 2119. [#RFC2119]_ +The key words "MUST", "MUST NOT", "SHOULD", "SHOULD NOT", and "MAY" in this +document are to be interpreted as described in RFC 2119. [#RFC2119]_ The term "network upgrade" in this document is to be interpreted as described in ZIP 200. [#zip-0200]_ @@ -111,9 +111,10 @@ Network ID ``0x03`` is intentionally not assigned. In BIP 155 [#bip-0155]_ it wa assigned to Tor v2 onion addresses, but those addresses are no longer supported by the latest Tor client code, and MUST NOT be used once this ZIP is deployed. -Clients SHOULD gossip addresses from all known networks even if they are currently -not connected to some of them. That could help multi-homed nodes and make it more -difficult for an observer to tell which networks a node is connected to. +Clients SHOULD gossip valid, potentially routable addresses from all known +networks, even if they are currently not connected to some of them. That could +help multi-homed nodes and make it more difficult for an observer to tell which +networks a node is connected to. Clients MUST NOT gossip addresses from unknown networks, because they have no means to validate those addresses and so can be tricked to gossip invalid addresses.