Miscellaneous Fixes: 15, 21, 22, 23 (ensdomains#46)

Author: adraffy

ensips/15.md

@@ -8,7 +8,7 @@ ensip:
 ignoredRules: ["heading:description-of-", "heading:derivation", "heading:appendix:-reference-specifications", "heading:appendix:-additional-resources", "heading:appendix:-validation-tests", "heading:annex:-beautification"]
 ---
 
-# ENSIP-15: ENS Name Normalization Standard
+# ENSIP-15: Name Normalization
 
 ## Abstract
 

ensips/21.md

@@ -1,5 +1,5 @@
 ---
-description: Batch Gateway Protocol
+description: Batch Gateway Offchain Lookup Protocol.
 contributors:
     - raffy.eth
     - nick.eth

ensips/22.md

@@ -7,7 +7,7 @@ ensip:
   status: draft
 ---
 
-# ENSIP-X: ENS Contract Features
+# ENSIP-22: Contract Features
 
 ## Abstract
 
@@ -32,7 +32,7 @@ Any resolver that supports features must adhere to the following criteria:
 
 Therefore, when resolution calldata is not a `multicall`, the resolver may be invoked directly without [batch gateway](./21) infrastructure.
 
-### <a name="eth.ens.resolver.extended.multicall">eth.ens.resolver.extended.multicall &mdash; `0x96b62db8`</a>
+### eth.ens.resolver.extended.multicall &mdash; `0x96b62db8`
 
 If a resolver is an [`IExtendedResolver`](./10) and supports this feature, `resolve(name, data)` must handle `multicall(bytes[])` as expected.
 

ensips/23.md

@@ -1,5 +1,5 @@
 ---
-description: An universal entrypoint for resolving ENS names.
+description: Universal entrypoint for resolving ENS names.
 contributors:
   - taytems.eth
   - raffy.eth
@@ -8,17 +8,17 @@ ensip:
   status: draft
 ---
 
-# ENSIP-X: Universal Resolver
+# ENSIP-23: Universal Resolver
 
 ## Abstract
 
-This ENSIP standardizes [IUniversalResolver](#specification) (UR), an universal entrypoint for resolving ENS names.  UR incorporates onchain algorithms for [ENSIP-10](./10#pseudocode), [ENSIP-19](./19#algorithm), [ENSIP-21](./21), and [ENSIP-22](./22) to reduce ENS integration complexities.
+This ENSIP standardizes [IUniversalResolver](#specification) (UR), an universal entrypoint for resolving ENS names.  UR incorporates onchain algorithms for [ENSIP-1: ENS](./1), [ENSIP-10: Wildcard Resolution](./10), [ENSIP-19: Multichain Primary Names](./19), [ENSIP-21: Batch Gateway](./21), and [ENSIP-22: Contract Features](./22) to reduce integration complexities.
 
 ## Motivation
 
 The process of resolving ENS names requires multiple onchain calls and in-depth knowledge of the [latest standards](/).
 
-Resolution has become more complex over time, especially with the introduction of [wildcard resolution](./10) and [multichain primary names](./19).  ENSv2 will also introduce a new registry design and many other improvements.
+Resolution has become more complex over time, especially with the introduction of wildcard resolution and multichain primary names.  [ENSv2](https://ens.domains/ensv2) will also introduce a new registry design and many other improvements.
 
 Maintaining these changes across multiple client frameworks demands significant development effort.  The growth and evolution of the ENS protocol should not be constrained by the pace of client deployments or hindered by outdated libraries.
 
@@ -104,11 +104,11 @@ interface IUniversalResolver {
 
 ### findResolver
 
-This function performs onchain [ENSIP-1 § Registry](./#registry-specification) traversal of a DNS-encoded `name`.  It returns the first non-null `resolver` address, the namehash of `name` as `node`, and the `resolverOffset` into `name` that corresponds to the resolver.  If no resolver is found, `resolver` is null.
+This function performs onchain [registry traversal](./#registry-specification) of a DNS-encoded `name`.  It returns the first non-null `resolver` address, the namehash of `name` as `node`, and the `resolverOffset` into `name` that corresponds to the resolver.  If no resolver is found, `resolver` is null.
 
 `findResolver()` does not perform any validity checks on the resolver and simply returns the value in the registry.  The resolver may not be a contract or a resolver.
 
-#### <a name="resolve-example">Pseudocode Example</a>
+#### Pseudocode Example
 
 ```js
 name = dnsEncode("sub.nick.eth") = "\x03sub\x04nick\x03eth\x00"
@@ -126,18 +126,18 @@ findResolver(name)
 
 ### resolve
 
-This function performs ENS forward resolution using the `resolver` found by [`findResolver()`](#findresolver).  It provides a standard interface for interacting [ENSIP-1](./1) and [ENSIP-10](./10) resolvers for onchain and offchain resolution.  Provided a DNS-encoded `name` and ABI-encoded `data`, it returns the ABI-encoded resolver `result` and the valid `resolver` address.
+This function performs forward resolution using the `resolver` found by [`findResolver()`](#findresolver).  It provides a standard interface for interacting [ENSIP-1](./1) and [ENSIP-10](./10) resolvers for onchain and offchain resolution.  Provided a DNS-encoded `name` and ABI-encoded `data`, it returns the ABI-encoded resolver `result` and the valid `resolver` address.
 
-UR automatically handles wrapping calldata and unwrapping responses when interacting with an [`IExtendedResolver`](./10#pseudocode) and safely interacts with contracts deployed before [EIP-140](https://eips.ethereum.org/EIPS/eip-140).
+UR automatically handles wrapping calldata and unwrapping responses when interacting with an [`IExtendedResolver`](./10#pseudocode) and safely interacts with contracts deployed before [EIP-140: REVERT Instruction](https://eips.ethereum.org/EIPS/eip-140).
 
-##### <a name="resolve-resolution-errors">Resolution Errors</a>
+##### Resolution Errors
 
 * If no resolver was found, reverts `ResolverNotFound`.
 * If the resolver was not a contract, reverts `ResolverNotContract`.
 * If [EIP-3668](https://eips.ethereum.org/EIPS/eip-3668) (CCIP-Read) was required and it was not handled by the client, reverts `OffchainLookup`.
 * If CCIP-Read was handled but the `OffchainLookup` failed, reverts `HTTPError`.
 
-##### <a name="resolve-resolver-errors">Resolver Errors</a>
+##### Resolver Errors
 
 * If the called function was not implemented, reverts `UnsupportedResolverProfile`.
 * If the called function reverted, reverts `ResolverError`.
@@ -146,7 +146,7 @@ UR automatically handles wrapping calldata and unwrapping responses when interac
 
 Traditionally, resolvers have been written to answer direct profile requests, eg. `addr()` returns one address.  To perform multiple requests, the caller must perform multiple independent requests (in sequence, parallel, or via batched RPC) or utilize an [external multicall contract](https://www.multicall3.com/) which does not support CCIP-Read.
 
-UR supports multicall with CCIP-Read and [`eth.ens.resolver.extended.multicall`](./22) feature.  To perform multiple calls:
+UR supports multicall with CCIP-Read and [`eth.ens.resolver.extended.multicall`](./22#ethensresolverextendedmulticall--0x96b62db8) feature.  To perform multiple calls:
 ```solidity
 bytes[] memory calls = new bytes[](3);
 calls[0] = abi.encodeCall(IAddrResolver.addr, (node));
@@ -177,7 +177,7 @@ const data = encodeFunctionData({ functionName: "multicall", args: [calls] });
 const [result, resolver] = await UR.read.resolve(name, data);
 const results = decodeFunctionResult({ functionName: "multicall", data: result });
 ```
-The same [resolution errors](#resolve-resolution-errors) apply but [resolver errors](#resolve-resolver-errors) are handled differently.  The call **always succeeds** and decodes into an array of results.  The number of calls is always equal to the number of results.  If `results[i]` is not multiple of 32 bytes, it is an ABI-encoded error for the corresponding `calls[i]`.
+The same [resolution errors](#resolution-errors) apply but [resolver errors](#resolver-errors) are handled differently.  The call **always succeeds** and decodes into an array of results.  The number of calls is always equal to the number of results.  If `results[i]` is not multiple of 32 bytes, it is an ABI-encoded error for the corresponding `calls[i]`.
 
 ```solidity
 address ethAddress = abi.decode(results[0], (address));
@@ -192,18 +192,18 @@ const error = decodeErrorResult({ data: result[2] }); // { errorName: "Unsupport
 
 ### reverse
 
-This function performs ENS primary name resolution according to [ENSIP-19](./19).  Provided a [byte-encoded](./9) `lookupAddress` and desired `coinType`, it returns the verified primary `name` and the addresses of forward `resolver` and `reverseResolver`.  UR supports CCIP-Read during the forward and reverse phases.
+This function performs multichain primary name resolution according to [ENSIP-19](./19).  Provided a [byte-encoded](./9) `lookupAddress` and desired `coinType`, it returns the verified primary `name` and the addresses of forward `resolver` and `reverseResolver`.  UR supports CCIP-Read during the forward and reverse phases.
 
 If the primary `name` is [unnormalized](./15), eg. `normalize("Nick.eth") != "nick.eth"`, then `name` and `resolver` are invalid.
 
-* If [reverse resolution](./19#reverse-resolution) of the reverse name was not successful, reverts a [`resolve()` error](resolve-resolution-errors).
+* If [reverse resolution](./19#reverse-resolution) of the reverse name was not successful, reverts a [`resolve()` error](#resolution-errors).
 * If the resolved primary name was null, returns `("", address(0), <reverseResolver>)`.
-* If [forward resolution](./19#forward-resolution) of the primary name was not successful, also reverts a [`resolve()` error](resolve-resolution-errors).
+* If [forward resolution](./19#forward-resolution) of the primary name was not successful, also reverts a [`resolve()` error](#resolution-errors).
 * If the resolved address of `coinType` doesn't equal the `lookupAddress`, reverts `ReverseAddressMismatch`.
 
 `reverse()` is effectively (2) sequential `resolve()` calls.
 
-#### <a name="reverse-example">Pseudocode Example</a>
+#### Pseudocode Example
 
 ```js
 // valid primary name: vitalik.eth on mainnet
@@ -231,9 +231,9 @@ It is a **complete replacement** for existing ENS resolution procedures.  Client
 
 ## Security Considerations
 
-UR uses a batch gateway to perform CCIP-Read requests.  If the client does not support [ENSIP-21](./21), a trustless external batch gateway service is used which adds latency and leaks information.
+UR uses a batch gateway to perform CCIP-Read requests.  If the client does not support ENSIP-21, a trustless external batch gateway service is used which adds latency and leaks information.
 
-UR is deployed as an immutable contract and as an ENS DAO-managed upgradeable proxy.  The main purpose of the proxy is to facilitate a seamless transition to [ENS v2](https://ens.domains/ensv2) and track the latest standards.  Client frameworks should default to the proxy so their libraries are future-proof, with the option to specify an alternative implementation.
+UR is deployed as an immutable contract and as an ENS DAO-managed upgradeable proxy.  The main purpose of the proxy is to facilitate a seamless transition to ENSv2 and track the latest standards.  Client frameworks should default to the proxy so their libraries are future-proof, with the option to specify an alternative implementation.
 
 ## Copyright