make relays for nip-60 wallets explicit

2025-12-08 16:18:50 +00:00 · 2025-03-12 16:36:14 +00:00
22 changed files with 133 additions and 497 deletions
--- a/01.md
+++ b/01.md
@@ -75,11 +75,11 @@ The first element of the tag array is referred to as the tag _name_ or _key_ and

 This NIP defines 3 standard tags that can be used across all event kinds with the same meaning. They are as follows:

- The `e` tag, used to refer to an event: `["e", <32-bytes lowercase hex of the id of another event>, <recommended relay URL, optional>, <32-bytes lowercase hex of the author's pubkey, optional>]`
+- The `e` tag, used to refer to an event: `["e", <32-bytes lowercase hex of the id of another event>, <recommended relay URL, optional>]`
 - The `p` tag, used to refer to another user: `["p", <32-bytes lowercase hex of a pubkey>, <recommended relay URL, optional>]`
 - The `a` tag, used to refer to an addressable or replaceable event
-    - for an addressable event: `["a", "<kind integer>:<32-bytes lowercase hex of a pubkey>:<d tag value>", <recommended relay URL, optional>]`
-    - for a normal replaceable event: `["a", "<kind integer>:<32-bytes lowercase hex of a pubkey>:", <recommended relay URL, optional>]` (note: include the trailing colon)
+    - for an addressable event: `["a", <kind integer>:<32-bytes lowercase hex of a pubkey>:<d tag value>, <recommended relay URL, optional>]`
+    - for a normal replaceable event: `["a", <kind integer>:<32-bytes lowercase hex of a pubkey>:, <recommended relay URL, optional>]`

 As a convention, all single-letter (only english alphabet letters: a-z, A-Z) key tags are expected to be indexed by relays, such that it is possible, for example, to query or subscribe to events that reference the event `"5c83da77af1dec6d7289834998ad7aafbd9e2191396d75ec3cc27f5a77226f36"` by using the `{"#e": ["5c83da77af1dec6d7289834998ad7aafbd9e2191396d75ec3cc27f5a77226f36"]}` filter. Only the first value in any given tag is indexed.

@@ -168,10 +168,9 @@ This NIP defines no rules for how `NOTICE` messages should be sent or treated.
  * `["OK", "b1a649ebe8...", false, "rate-limited: slow down there chief"]`
  * `["OK", "b1a649ebe8...", false, "invalid: event creation date is too far off from the current time"]`
  * `["OK", "b1a649ebe8...", false, "pow: difficulty 26 is less than 30"]`
-  * `["OK", "b1a649ebe8...", false, "restricted: not allowed to write."]`
  * `["OK", "b1a649ebe8...", false, "error: could not connect to the database"]`
 - `CLOSED` messages MUST be sent in response to a `REQ` when the relay refuses to fulfill it. It can also be sent when a relay decides to kill a subscription on its side before a client has disconnected or sent a `CLOSE`. This message uses the same pattern of `OK` messages with the machine-readable prefix and human-readable message. Some examples:
  * `["CLOSED", "sub1", "unsupported: filter contains unknown elements"]`
  * `["CLOSED", "sub1", "error: could not connect to the database"]`
  * `["CLOSED", "sub1", "error: shutting down idle subscription"]`
- The standardized machine-readable prefixes for `OK` and `CLOSED` are: `duplicate`, `pow`, `blocked`, `rate-limited`, `invalid`, `restricted`, and `error` for when none of that fits.
+- The standardized machine-readable prefixes for `OK` and `CLOSED` are: `duplicate`, `pow`, `blocked`, `rate-limited`, `invalid`, and `error` for when none of that fits.
--- a/07.md
+++ b/07.md
@@ -17,6 +17,7 @@ async window.nostr.signEvent(event: { created_at: number, kind: number, tags: st

 Aside from these two basic above, the following functions can also be implemented optionally:
 ```
+async window.nostr.getRelays(): { [url: string]: {read: boolean, write: boolean} } // returns a basic map of relay urls to relay policies
 async window.nostr.nip04.encrypt(pubkey, plaintext): string // returns ciphertext and iv as specified in nip-04 (deprecated)
 async window.nostr.nip04.decrypt(pubkey, ciphertext): string // takes ciphertext and iv as specified in nip-04 (deprecated)
 async window.nostr.nip44.encrypt(pubkey, plaintext): string // returns ciphertext as specified in nip-44
--- a/10.md
+++ b/10.md
@@ -10,34 +10,25 @@ This NIP defines `kind:1` as a simple plaintext note.

 ## Abstract

+This NIP describes how to use "e" and "p" tags in text events, especially those that are replies to other text events. It helps clients thread the replies into a tree rooted at the original event.
+
 The `.content` property contains some human-readable text. 

-`e` tags can be used to define note thread roots and replies. They SHOULD be sorted by the reply stack from root to the direct parent.
-
-`q` tags MAY be used when citing events in the `.content` with [NIP-21](21.md).
-
-```json
-["q", "<event-id> or <event-address>", "<relay-url>", "<pubkey-if-a-regular-event>"]
-```
-
-Authors of the `e` and `q` tags SHOULD be added as `p` tags to notify of a new reply or quote.
+`e` and `p` tags can be used to define note threads, replies and mentions. 

 Markup languages such as markdown and HTML SHOULD NOT be used. 

 ## Marked "e" tags (PREFERRED)
-
-Kind 1 events with `e` tags are replies to other kind 1 events. Kind 1 replies MUST NOT be used to reply to other kinds, use [NIP-22](22.md) instead. 
-
 `["e", <event-id>, <relay-url>, <marker>, <pubkey>]`

 Where:

 * `<event-id>` is the id of the event being referenced.
 * `<relay-url>` is the URL of a recommended relay associated with the reference. Clients SHOULD add a valid `<relay-url>` field, but may instead leave it as `""`.
- * `<marker>` is optional and if present is one of `"reply"`, `"root"`.
+ * `<marker>` is optional and if present is one of `"reply"`, `"root"`, or `"mention"`.
 * `<pubkey>` is optional, SHOULD be the pubkey of the author of the referenced event

-Those marked with `"reply"` denote the id of the reply event being responded to.  Those marked with `"root"` denote the root id of the reply thread being responded to. For top level replies (those replying directly to the root event), only the `"root"` marker should be used. 
+Those marked with `"reply"` denote the id of the reply event being responded to.  Those marked with `"root"` denote the root id of the reply thread being responded to. For top level replies (those replying directly to the root event), only the `"root"` marker should be used. Those marked with `"mention"` denote a quoted or reposted event id.

 A direct reply to the root of a thread should have a single marked "e" tag of type "root".

--- a/17.md
+++ b/17.md
@@ -21,7 +21,7 @@ Kind `14` is a chat message. `p` tags identify one or more receivers of the mess
   "tags": [
     ["p", "<receiver-1-pubkey>", "<relay-url>"],
     ["p", "<receiver-2-pubkey>", "<relay-url>"],
-    ["e", "<kind-14-id>", "<relay-url>"] // if this is a reply
+    ["e", "<kind-14-id>", "<relay-url>", "reply"] // if this is a reply
    ["subject", "<conversation-title>"],
     // rest of tags...
   ],
@@ -31,59 +31,13 @@ Kind `14` is a chat message. `p` tags identify one or more receivers of the mess

 `.content` MUST be plain text. Fields `id` and `created_at` are required.

-An `e` tag denotes the direct parent message this post is replying to. 
-
-`q` tags MAY be used when citing events in the `.content` with [NIP-21](21.md).
-
-```json
-["q", "<event-id> or <event-address>", "<relay-url>", "<pubkey-if-a-regular-event>"]
-```
+Tags that mention, quote and assemble threading structures MUST follow [NIP-10](10.md).

 Kind `14`s MUST never be signed. If it is signed, the message might leak to relays and become **fully public**.

-## File Message Kind
-
-```jsonc
-{
-  "id": "<usual hash>",
-  "pubkey": "<sender-pubkey>",
-  "created_at": "<current-time>",
-  "kind": 15,
-  "tags": [
-    ["p", "<receiver-1-pubkey>", "<relay-url>"],
-    ["p", "<receiver-2-pubkey>", "<relay-url>"],
-    ["e", "<kind-14-id>", "<relay-url>", "reply"], // if this is a reply
-    ["subject", "<conversation-title>"],
-    ["file-type", "<file-mime-type>"],
-    ["encryption-algorithm", "<encryption-algorithm>"],
-    ["decryption-key", "<decryption-key>"],
-    ["decryption-nonce", "<decryption-nonce>"],
-    ["x", "<the SHA-256 hexencoded string of the file>"],
-    // rest of tags...
-  ],
-  "content": "<file-url>"
-}
-```
-
-Kind 15 is used for sending encrypted file event messages:
-
- `file-type`: Specifies the MIME type of the attached file (e.g., `image/jpeg`, `audio/mpeg`, etc.).
- `encryption-algorithm`: Indicates the encryption algorithm used for encrypting the file. Supported algorithms may include `aes-gcm`, `chacha20-poly1305`,`aes-cbc` etc.
- `decryption-key`: The decryption key that will be used by the recipient to decrypt the file.
- `decryption-nonce`: The decryption nonce that will be used by the recipient to decrypt the file.
- `content`: The URL of the file (`<file-url>`).
- `x` containing the SHA-256 hexencoded string of the file.
- `size` (optional) size of file in bytes
- `dim` (optional) size of the file in pixels in the form `<width>x<height>`
- `blurhash`(optional) the [blurhash](https://github.com/woltapp/blurhash) to show while the client is loading the file
- `thumb` (optional) URL of thumbnail with same aspect ratio (encrypted with the same key, nonce)
- `fallback` (optional) zero or more fallback file sources in case `url` fails
-
-Just like kind 14, kind `15`s MUST never be signed.
-
 ## Chat Rooms

-The set of `pubkey` + `p` tags defines a chat room. If a new `p` tag is added or a current one is removed, a new room is created with a clean message history.
+The set of `pubkey` + `p` tags defines a chat room. If a new `p` tag is added or a current one is removed, a new room is created with clean message history.

 Clients SHOULD render messages of the same room in a continuous thread.

@@ -91,7 +45,7 @@ An optional `subject` tag defines the current name/topic of the conversation. An

 ## Encrypting

-Following [NIP-59](59.md), the **unsigned** `kind:14` & `kind:15` chat messages must be sealed (`kind:13`) and then gift-wrapped (`kind:1059`) to each receiver and the sender individually.
+Following [NIP-59](59.md), the **unsigned** `kind:14` chat message must be sealed (`kind:13`) and then gift-wrapped (`kind:1059`) to each receiver and the sender individually.

 ```jsonc
 {
@@ -173,7 +127,7 @@ The main limitation of this approach is having to send a separate encrypted even

 Clients implementing this NIP should by default only connect to the set of relays found in their `kind:10050` list. From that they should be able to load all messages both sent and received as well as get new live updates, making it for a very simple and lightweight implementation that should be fast.

-When sending a message to anyone, clients must then connect to the relays in the receiver's `kind:10050` and send the events there but can disconnect right after unless more messages are expected to be sent (e.g. the chat tab is still selected). Clients should also send a copy of their outgoing messages to their own `kind:10050` relay set.
+When sending a message to anyone, clients must then connect to the relays in the receiver's `kind:10050` and send the events there, but can disconnect right after unless more messages are expected to be sent (e.g. the chat tab is still selected). Clients should also send a copy of their outgoing messages to their own `kind:10050` relay set.

 ## Examples

--- a/22.md
+++ b/22.md
@@ -6,7 +6,7 @@ Comment

 `draft` `optional`

-A comment is a threading note always scoped to a root event or an [`I`-tag](73.md).
+A comment is a threading note always scoped to a root event or an `I`-tag.

 It uses `kind:1111` with plaintext `.content` (no HTML, Markdown, or other formatting).

@@ -198,3 +198,4 @@ A reply to a podcast comment:
  // other fields
 }
 ```
+
--- a/23.md
+++ b/23.md
@@ -60,7 +60,3 @@ References to other Nostr notes, articles or profiles must be made according to
  "id": "..."
 }
 ```
-
-### Replies & Comments
-
-Replies to `kind 30023` MUST use [NIP-22](./22.md) `kind 1111` comments. 
--- a/25.md
+++ b/25.md
@@ -25,21 +25,26 @@ consider it a "+".
 Tags
 ----

-There MUST be always an `e` tag set to the `id` of the event that is being reacted to. The `e` tag SHOULD include a relay hint pointing to a relay where the event being reacted to can be found. If a client decides to include other `e`, which not recommended, the target event `id` should be last of the `e` tags.
+The reaction event SHOULD include `e` and `p` tags from the note the user is reacting to (and optionally `a` tags if the target is a replaceable event). This allows users to be notified of reactions to posts they were mentioned in. Including the `e` tags enables clients to pull all the reactions associated with individual posts or all the posts in a thread. `a` tags enables clients to seek reactions for all versions of a replaceable event.

-The SHOULD be a `p` tag set to the `pubkey` of the event being reacted to. If a client decides to include other `p` tags, which not recommended, the target event `pubkey` should be last the `p` tags.
+The last `e` tag MUST be the `id` of the note that is being reacted to.

-If the event being reacted to is an addressable event, an `a` SHOULD be included together with the `e` tag, it must be set to the coordinates (`kind:pubkey:d-tag`) of the event being reacted to.
+The last `p` tag MUST be the `pubkey` of the event being reacted to.

-The reaction SHOULD include a `k` tag with the stringified kind number of the reacted event as its value.
+The `a` tag MUST contain the coordinates (`kind:pubkey:d-tag`) of the replaceable being reacted to.

-**Example code**
+The reaction event MAY include a `k` tag with the stringified kind number of the reacted event as its value.
+
+Example code

 ```swift
 func make_like_event(pubkey: String, privkey: String, liked: NostrEvent) -> NostrEvent {
-    tags.append(["e", liked.id, liked.source_relays.first ?? ""])
+    var tags: [[String]] = liked.tags.filter {
+    	tag in tag.count >= 2 && (tag[0] == "e" || tag[0] == "p")
+    }
+    tags.append(["e", liked.id])
    tags.append(["p", liked.pubkey])
-    tags.append(["k", String(liked.kind)])
+    tags.append(["k", liked.kind])
    let ev = NostrEvent(content: "+", pubkey: pubkey, kind: 7, tags: tags)
    ev.calculate_id()
    ev.sign(privkey: privkey)
--- a/27.md
+++ b/27.md
@@ -10,7 +10,7 @@ This document standardizes the treatment given by clients of inline references o

 When creating an event, clients should include mentions to other profiles and to other events in the middle of the `.content` using [NIP-21](21.md) codes, such as `nostr:nprofile1qqsw3dy8cpu...6x2argwghx6egsqstvg`.

-Including [NIP-18](18.md)'s quote tags (`["q", "<event-id> or <event-address>", "<relay-url>", "<pubkey-if-a-regular-event>"]`) for each reference is optional, clients should do it whenever they want the profile being mentioned to be notified of the mention, or when they want the referenced event to recognize their mention as a reply.
+Including [NIP-10](10.md)-style tags (`["e", <hex-id>, <relay-url>, <marker>]`) for each reference is optional, clients should do it whenever they want the profile being mentioned to be notified of the mention, or when they want the referenced event to recognize their mention as a reply.

 A reader client that receives an event with such `nostr:...` mentions in its `.content` can do any desired context augmentation (for example, linking to the profile or showing a preview of the mentioned event contents) it wants in the process. If turning such mentions into links, they could become internal links, [NIP-21](21.md) links or direct links to web clients that will handle these references.

--- a/34.md
+++ b/34.md
@@ -22,10 +22,9 @@ Git repositories are hosted in Git-enabled servers, but their existence can be a
    ["description", "brief human-readable project description>"],
    ["web", "<url for browsing>", ...], // a webpage url, if the git server being used provides such a thing
    ["clone", "<url for git-cloning>", ...], // a url to be given to `git clone` so anyone can clone it
-    ["relays", "<relay-url>", ...], // relays that this repository will monitor for patches and issues
-    ["r", "<earliest-unique-commit-id>", "euc"],
-    ["maintainers", "<other-recognized-maintainer>", ...],
-    ["t", "<arbitrary string>"], // hashtags labelling the repository
+    ["relays", "<relay-url>", ...] // relays that this repository will monitor for patches and issues
+    ["r", "<earliest-unique-commit-id>", "euc"]
+    ["maintainers", "<other-recognized-maintainer>", ...]
  ]
 }
 ```
--- a/46.md
+++ b/46.md
@@ -100,6 +100,7 @@ Each of the following are methods that the _client_ sends to the _remote-signer_
 | `connect`                | `[<remote-signer-pubkey>, <optional_secret>, <optional_requested_permissions>]`        | "ack" OR `<required-secret-value>`                                                                  |
 | `sign_event`             | `[<{kind, content, tags, created_at}>]`                                       | `json_stringified(<signed_event>)`                                     |
 | `ping`                   | `[]`                                                                          | "pong"                                                                 |
+| `get_relays`             | `[]`                                                                          | `json_stringified({<relay_url>: {read: <boolean>, write: <boolean>}})` |
 | `get_public_key`         | `[]`                                                                          | `<user-pubkey>`                                                         |
 | `nip04_encrypt`          | `[<third_party_pubkey>, <plaintext_to_encrypt>]`                              | `<nip04_ciphertext>`                                                   |
 | `nip04_decrypt`          | `[<third_party_pubkey>, <nip04_ciphertext_to_decrypt>]`                       | `<plaintext>`                                                          |
--- a/47.md
+++ b/47.md
@@ -1,7 +1,7 @@
 NIP-47
 ======

-Nostr Wallet Connect (NWC)
+Nostr Wallet Connect
 --------------------

 `draft` `optional`
@@ -17,9 +17,6 @@ This NIP describes a way for clients to access a remote lightning wallet through
 * **wallet service**: Nostr app that typically runs on an always-on computer (eg. in the cloud or on a Raspberry Pi).  This app has access to the APIs of the wallets it serves.

 ## Theory of Operation
-
-Fundamentally NWC is communication between a **client** and **wallet service** by the means of E2E-encrypted direct messages over a nostr relay. The relay knows the kinds and tags of notes, but not the content of the encrypted payloads. The **user**'s identity key is not used to avoid linking payment activity to the user. Ideally unique keys are used for each individual connection.
-
 1. **Users** who wish to use this NIP to allow **client(s)** to interact with their wallet must first acquire a special "connection" URI from their NIP-47 compliant wallet application.  The wallet application may provide this URI using a QR screen, or a pasteable string, or some other means. 
 
 2. The **user** should then copy this URI into their **client(s)** by pasting, or scanning the QR, etc.  The **client(s)** should save this URI and use it later whenever the **user** (or the **client** on the user's behalf) wants to interact with the wallet.  The **client** should then request an `info` (13194) event from the relay(s) specified in the URI.  The **wallet service** will have sent that event to those relays earlier, and the relays will hold it as a replaceable event.  
@@ -48,7 +45,7 @@ If the **wallet service** supports notifications, the info event SHOULD contain

 ### Request and Response Events

-Both the request and response events SHOULD contain one `p` tag, containing the public key of the **wallet service** if this is a request, and the public key of the **client** if this is a response. The response event SHOULD contain an `e` tag with the id of the request event it is responding to.
+Both the request and response events SHOULD contain one `p` tag, containing the public key of the **wallet service** if this is a request, and the public key of the **user** if this is a response. The response event SHOULD contain an `e` tag with the id of the request event it is responding to.
 Optionally, a request can have an `expiration` tag that has a unix timestamp in seconds. If the request is received after this timestamp, it should be ignored.

 The content of requests and responses is encrypted with [NIP04](04.md), and is a JSON-RPCish object with a semi-fixed structure:
@@ -83,7 +80,7 @@ If the command was successful, the `error` field must be null.

 ### Notification Events

-The notification event SHOULD contain one `p` tag, the public key of the **client**.
+The notification event SHOULD contain one `p` tag, the public key of the **user**.

 The content of notifications is encrypted with [NIP04](04.md), and is a JSON-RPCish object with a semi-fixed structure:

@@ -108,27 +105,19 @@ The content of notifications is encrypted with [NIP04](04.md), and is a JSON-RPC
 - `OTHER`: Other error.

 ## Nostr Wallet Connect URI
+**client** discovers **wallet service** by scanning a QR code, handling a deeplink or pasting in a URI.

-Communication between the **client** and **wallet service** requires two keys in order to encrypt and decrypt messages. The connection URI includes the secret key of the **client** and only the public key of the **wallet service**.
-
-The **client** discovers **wallet service** by scanning a QR code, handling a deeplink or pasting in a URI.
-
-The **wallet service** generates this connection URI with protocol `nostr+walletconnect://` and base path its 32-byte hex-encoded `pubkey`, which SHOULD be unique per client connection.
-
-The connection URI contains the following query string parameters:
+The **wallet service** generates this connection URI with protocol `nostr+walletconnect://` and base path its hex-encoded `pubkey` with the following query string parameters:

 - `relay` Required. URL of the relay where the **wallet service** is connected and will be listening for events. May be more than one.
- `secret` Required. 32-byte randomly generated hex encoded string. The **client** MUST use this to sign events and encrypt payloads when communicating with the **wallet service**. The **wallet service** MUST use the corresponding public key of this secret to communicate with the **client**.
+- `secret` Required. 32-byte randomly generated hex encoded string. The **client** MUST use this to sign events and encrypt payloads when communicating with the **wallet service**.
    - Authorization does not require passing keys back and forth.
    - The user can have different keys for different applications. Keys can be revoked and created at will and have arbitrary constraints (eg. budgets).
    - The key is harder to leak since it is not shown to the user and backed up.
    - It improves privacy because the user's main key would not be linked to their payments.
 - `lud16` Recommended. A lightning address that clients can use to automatically setup the `lud16` field on the user's profile if they have none configured.

-The **client** should then store this connection and use it when the user wants to perform actions like paying an invoice. Due to this NIP using ephemeral events, it is recommended to pick relays that do not close connections on inactivity to not drop events, and ideally retain the events until they are either consumed or become stale.
-
- When the **client** sends or receives a message it will use the `secret` from the connection URI and **wallet service**'s `pubkey` to encrypt or decrypt.
- When the **wallet service** sends or receives a message it will use its own secret and the corresponding pubkey of the **client's** `secret` to encrypt or decrypt. The **wallet service** SHOULD NOT store the secret it generates for the client and MUST NOT rely on the knowing the **client** secret for general operation.
+The **client** should then store this connection and use it when the user wants to perform actions like paying an invoice. Due to this NIP using ephemeral events, it is recommended to pick relays that do not close connections on inactivity to not drop events.

 ### Example connection string
 ```sh
--- a/51.md
+++ b/51.md
@@ -24,7 +24,6 @@ For example, _mute list_ can contain the public keys of spammers and bad actors
 | ---               | ---   | ---                                                         | ---                                                                                                 |
 | Mute list         | 10000 | things the user doesn't want to see in their feeds          | `"p"` (pubkeys), `"t"` (hashtags), `"word"` (lowercase string), `"e"` (threads)                     |
 | Pinned notes      | 10001 | events the user intends to showcase in their profile page   | `"e"` (kind:1 notes)                                                                                |
-| Read/write relays | 10002 | where a user publishes to and where they expect mentions    | see [NIP-65](65.md)                                                                                 |
 | Bookmarks         | 10003 | uncategorized, "global" list of things a user wants to save | `"e"` (kind:1 notes), `"a"` (kind:30023 articles), `"t"` (hashtags), `"r"` (URLs)                   |
 | Communities       | 10004 | [NIP-72](72.md) communities the user belongs to             | `"a"` (kind:34550 community definitions)                                                            |
 | Public chats      | 10005 | [NIP-28](28.md) chat channels the user is in                | `"e"` (kind:40 channel definitions)                                                                 |
--- a/53.md
+++ b/53.md
@@ -35,8 +35,7 @@ For example:
    ["p", "91cf9..4e5ca", "wss://provider1.com/", "Host", "<proof>"],
    ["p", "14aeb..8dad4", "wss://provider2.com/nostr", "Speaker"],
    ["p", "612ae..e610f", "ws://provider3.com/ws", "Participant"],
-    ["relays", "wss://one.com", "wss://two.com", /*...*/],
-    ["pinned", "<event id of pinned live chat message>"],
+    ["relays", "wss://one.com", "wss://two.com", /*...*/]
  ],
  "content": "",
  // other fields...
@@ -63,7 +62,7 @@ This feature is important to avoid malicious event owners adding large account h

 ### Live Chat Message

-Event `kind:1311` is live chat's channel message. Clients MUST include the `a` tag of the activity. An `e` tag denotes the direct parent message this post is replying to. 
+Event `kind:1311` is live chat's channel message. Clients MUST include the `a` tag of the activity with a `root` marker. Other Kind-1 tags such as `reply` and `mention` can also be used.

 ```jsonc
 {
@@ -76,14 +75,6 @@ Event `kind:1311` is live chat's channel message. Clients MUST include the `a` t
 }
 ```

-`q` tags MAY be used when citing events in the `.content` with [NIP-21](21.md).
-
-```json
-["q", "<event-id> or <event-address>", "<relay-url>", "<pubkey-if-a-regular-event>"]
-```
-
-Hosts may choose to pin one or more live chat messages by updating the `pinned` tags in the live event kind `30311`.
-
 ## Use Cases

 Common use cases include meeting rooms/workshops, watch-together activities, or event spaces, such as [zap.stream](https://zap.stream).
--- a/55.md
+++ b/55.md
@@ -10,7 +10,7 @@ This NIP describes a method for 2-way communication between an Android signer an

 # Usage for Android applications

-The Android signer uses Intents (to accept/reject permissions manually) and Content Resolvers (to accept/reject permissions automatically in background if the user allowed it) to communicate between applications.
+The Android signer uses Intents and Content Resolvers to communicate between applications.

 To be able to use the Android signer in your application you should add this to your AndroidManifest.xml:

@@ -66,7 +66,7 @@ Create the Intent using the **nostrsigner** scheme:
 val intent = Intent(Intent.ACTION_VIEW, Uri.parse("nostrsigner:$content"))
 ```

-Set the Signer package name after you receive the response from **get_public_key** method:
+Set the Signer package name:

 ```kotlin
 intent.`package` = "com.example.signer"
@@ -114,6 +114,7 @@ launcher.launch(intent)

    ```kotlin
    val intent = Intent(Intent.ACTION_VIEW, Uri.parse("nostrsigner:"))
+    intent.`package` = "com.example.signer"
    intent.putExtra("type", "get_public_key")
    // You can send some default permissions for the user to authorize for ever
    val permissions = listOf(
@@ -129,7 +130,7 @@ launcher.launch(intent)
    context.startActivity(intent)
    ```
  - result:
-    - If the user approved the intent it will return the **pubkey** in the result field and the signer packageName in the **package** field
+    - If the user approved intent it will return the **pubkey** in the result field

      ```kotlin
      val pubkey = intent.data?.getStringExtra("result")
@@ -261,6 +262,29 @@ launcher.launch(intent)
      val id = intent.data?.getStringExtra("id")
      ```

+- **get_relays**
+  - params:
+
+    ```kotlin
+    val intent = Intent(Intent.ACTION_VIEW, Uri.parse("nostrsigner:"))
+    intent.`package` = "com.example.signer"
+    intent.putExtra("type", "get_relays")
+    // to control the result in your application in case you are not waiting the result before sending another intent
+    intent.putExtra("id", "some_id")
+    // Send the current logged in user pubkey
+    intent.putExtra("current_user", account.keyPair.pubkey)
+
+    context.startActivity(intent)
+    ```
+  - result:
+    - If the user approved intent it will return the **result** and **id** fields
+
+      ```kotlin
+      val relayJsonText = intent.data?.getStringExtra("result")
+      // the id you sent
+      val id = intent.data?.getStringExtra("id")
+      ```
+
 - **decrypt_zap_event**
  - params:

@@ -315,8 +339,6 @@ If the user chose to always reject the event, signer application will return the
      ```kotlin
        if (result == null) return

-        if (it.getColumnIndex("rejected") > -1) return
-
        if (result.moveToFirst()) {
            val index = it.getColumnIndex("result")
            if (index < 0) return
@@ -342,8 +364,6 @@ If the user chose to always reject the event, signer application will return the
      ```kotlin
        if (result == null) return

-        if (it.getColumnIndex("rejected") > -1) return
-
        if (result.moveToFirst()) {
            val index = it.getColumnIndex("result")
            val indexJson = it.getColumnIndex("event")
@@ -370,8 +390,6 @@ If the user chose to always reject the event, signer application will return the
      ```kotlin
        if (result == null) return

-        if (it.getColumnIndex("rejected") > -1) return
-
        if (result.moveToFirst()) {
            val index = it.getColumnIndex("result")
            val encryptedText = it.getString(index)
@@ -396,8 +414,6 @@ If the user chose to always reject the event, signer application will return the
      ```kotlin
        if (result == null) return

-        if (it.getColumnIndex("rejected") > -1) return
-
        if (result.moveToFirst()) {
            val index = it.getColumnIndex("result")
            val encryptedText = it.getString(index)
@@ -422,8 +438,6 @@ If the user chose to always reject the event, signer application will return the
      ```kotlin
        if (result == null) return

-        if (it.getColumnIndex("rejected") > -1) return
-
        if (result.moveToFirst()) {
            val index = it.getColumnIndex("result")
            val encryptedText = it.getString(index)
@@ -448,14 +462,36 @@ If the user chose to always reject the event, signer application will return the
      ```kotlin
        if (result == null) return

-        if (it.getColumnIndex("rejected") > -1) return
-
        if (result.moveToFirst()) {
            val index = it.getColumnIndex("result")
            val encryptedText = it.getString(index)
        }
      ```

+- **get_relays**
+  - params:
+
+    ```kotlin
+    val result = context.contentResolver.query(
+        Uri.parse("content://com.example.signer.GET_RELAYS"),
+        listOf("${logged_in_user_pubkey}"),
+        null,
+        null,
+        null
+    )
+    ```
+  - result:
+    - Will return the **result** column
+
+      ```kotlin
+        if (result == null) return
+
+        if (result.moveToFirst()) {
+            val index = it.getColumnIndex("result")
+            val relayJsonText = it.getString(index)
+        }
+      ```
+
 - **decrypt_zap_event**
  - params:

@@ -474,8 +510,6 @@ If the user chose to always reject the event, signer application will return the
      ```kotlin
        if (result == null) return

-        if (it.getColumnIndex("rejected") > -1) return
-
        if (result.moveToFirst()) {
            val index = it.getColumnIndex("result")
            val eventJson = it.getString(index)
@@ -484,8 +518,6 @@ If the user chose to always reject the event, signer application will return the

 # Usage for Web Applications

-You should consider using [NIP-46: Nostr Connect](46.md) for a better experience for web applications. When using this approach, the web app can't call the signer in the background, so the user will see a popup for every event you try to sign.
-
 Since web applications can't receive a result from the intent, you should add a modal to paste the signature or the event json or create a callback url.

 If you send the callback url parameter, Signer Application will send the result to the url.
@@ -540,6 +572,13 @@ Android intents and browser urls have limitations, so if you are using the `retu
    window.href = `nostrsigner:${encryptedText}?pubkey=${hex_pub_key}&compressionType=none&returnType=signature&type=nip44_decrypt&callbackUrl=https://example.com/?event=`;
    ```

+- **get_relays**
+  - params:
+
+    ```js
+    window.href = `nostrsigner:?compressionType=none&returnType=signature&type=get_relays&callbackUrl=https://example.com/?event=`;
+    ```
+
 - **decrypt_zap_event**
  - params:

--- a/57.md
+++ b/57.md
@@ -132,7 +132,7 @@ The following should be true of the `zap receipt` event:
 - `tags` MUST include the `p` tag (zap recipient) AND optional `e` tag from the `zap request` AND optional `a` tag from the `zap request` AND optional `P` tag from the pubkey of the zap request (zap sender).
 - The `zap receipt` MUST have a `bolt11` tag containing the description hash bolt11 invoice.
 - The `zap receipt` MUST contain a `description` tag which is the JSON-encoded zap request.
- `SHA256(description)` SHOULD match the description hash in the bolt11 invoice.
+- `SHA256(description)` MUST match the description hash in the bolt11 invoice.
 - The `zap receipt` MAY contain a `preimage` tag to match against the payment hash of the bolt11 invoice. This isn't really a payment proof, there is no real way to prove that the invoice is real or has been paid. You are trusting the author of the `zap receipt` for the legitimacy of the payment.

 The `zap receipt` is not a proof of payment, all it proves is that some nostr user fetched an invoice. The existence of the `zap receipt` implies the invoice as paid, but it could be a lie given a rogue implementation.
--- a/60.md
+++ b/60.md
@@ -28,7 +28,9 @@ This NIP doesn't deal with users' *receiving* money from someone else, it's just
    "content": nip44_encrypt([
        [ "privkey", "hexkey" ],
        [ "mint", "https://mint1" ],
-        [ "mint", "https://mint2" ]
+        [ "mint", "https://mint2" ],
+        [ "relay", "wss://relay1" ],
+        [ "relay", "wss://relay2" ]
    ]),
    "tags": []
 }
@@ -39,6 +41,7 @@ The wallet event is an replaceable event `kind:17375`.
 Tags:
 * `mint` - Mint(s) this wallet uses -- there MUST be one or more mint tags.
 * `privkey` - Private key used to unlock P2PK ecash. MUST be stored encrypted in the `.content` field. **This is a different private key exclusively used for the wallet, not associated in any way to the user's Nostr private key** -- This is only used for receiving [NIP-61](61.md) nutzaps.
+* `relay` - Relay(s) where wallet events should be published. If present, clients SHOULD publish all wallet-related events (`kind:7375`, `kind:7376`, etc.) to these relays. There MAY be multiple `relay` entries. If no `relay` entries are present, clients SHOULD fall back to using the user's [NIP-65](65.md) relays.

 ## Token Event
 Token events are used to record unspent proofs.
--- a/61.md
+++ b/61.md
@@ -48,11 +48,11 @@ Clients MUST prefix the public key they P2PK-lock with `"02"` (for nostr<>cashu
 {
    kind: 9321,
    content: "Thanks for this great idea.",
-    pubkey: "<sender-pubkey>",
+    pubkey: "sender-pubkey",
    tags: [
        [ "proof", "{\"amount\":1,\"C\":\"02277c66191736eb72fce9d975d08e3191f8f96afb73ab1eec37e4465683066d3f\",\"id\":\"000a93d6f8a1d2c4\",\"secret\":\"[\\\"P2PK\\\",{\\\"nonce\\\":\\\"b00bdd0467b0090a25bdf2d2f0d45ac4e355c482c1418350f273a04fedaaee83\\\",\\\"data\\\":\\\"02eaee8939e3565e48cc62967e2fde9d8e2a4b3ec0081f29eceff5c64ef10ac1ed\\\"}]\"}" ],
        [ "u", "https://stablenut.umint.cash" ],
-        [ "e", "<nutzapped-event-id>", "<relay-hint>" ],
+        [ "e", "<zapped-event-id>", "<relay-hint>" ],
        [ "p", "e9fbced3a42dcf551486650cc752ab354347dd413b307484e4fd1818ab53f991" ], // recipient of nutzap
    ]
 }
@@ -94,11 +94,12 @@ Multiple `kind:9321` events can be tagged in the same `kind:7376` event.
    "content": nip44_encrypt([
        [ "direction", "in" ], // in = received, out = sent
        [ "amount", "1" ],
-        [ "e", "<7375-event-id>", "<relay-hint>", "created" ] // new token event that was created
+        [ "e", "<7375-event-id>", "relay-hint", "created" ] // new token event that was created
    ]),
    "tags": [
-        [ "e", "<9321-event-id>", "<relay-hint>", "redeemed" ], // nutzap event that has been redeemed
-        [ "p", "<sender-pubkey>" ] // pubkey of the author of the 9321 event (nutzap sender)
+        [ "a", "37375:<pubkey>:my-wallet" ], // an optional wallet tag
+        [ "e", "<9321-event-id>", "relay-hint", "redeemed" ], // nutzap event that has been redeemed
+        [ "p", "sender-pubkey" ] // pubkey of the author of the 9321 event (nutzap sender)
    ]
 }
 ```
--- a/62.md
+++ b/62.md
@@ -1,61 +0,0 @@
-NIP-62
-======
-
-Request to Vanish
-----------------
-
-`draft` `optional`
-
-This NIP offers a Nostr-native way to request a complete reset of a key's fingerprint on the web. This procedure is legally binding in some jurisdictions, and thus, supporters of this NIP should truly delete events from their database. 
-
-## Request to Vanish from Relay
-
-Kind `62` requests a specific relay to delete everything, including [NIP-09](09.md) Deletion Events, from the `.pubkey` until its `.created_at`. 
-
-```jsonc
-{
-  "kind": 62,
-  "pubkey": <32-byte hex-encoded public key of the event creator>,
-  "tags": [
-    ["relay", "<relay url>"]
-  ],
-  "content": "<reason or note>",
-  //...other fields
-}
-```
-
-The tag list MUST include at least one `relay` value. 
-
-Content MAY include a reason or a legal notice to the relay operator. 
-
-Relays MUST fully delete any events from the `.pubkey` if their service URL is tagged in the event. 
-
-Relays SHOULD delete all [NIP-59](59.md) Gift Wraps that p-tagged the `.pubkey` if their service URL is tagged in the event, deleting all DMs to the pubkey.
-
-Relays MUST ensure the deleted events cannot be re-broadcasted into the relay. 
-
-Relays MAY store the signed request to vanish for bookkeeping.
-
-Paid relays or relays that restrict who can post MUST also follow the request to vanish regardless of the user's status. 
-
-Publishing a deletion request event (Kind `5`) against a request to vanish has no effect. Clients and relays are not obliged to support "unrequest vanish" functionality.
-
-Clients SHOULD send this event to the target relays only. 
-
-## Global Request to Vanish
-
-To request ALL relays to delete everything, the event MUST include a `relay` tag with the value `ALL_RELAYS` in uppercase. 
-
-```jsonc
-{
-  "kind": 62,
-  "pubkey": <32-byte hex-encoded public key of the event creator>,
-  "tags": [
-    ["relay", "ALL_RELAYS"]
-  ],
-  "content": "<reason>",
-  //...other fields
-}
-```
-
-Clients SHOULD broadcast this event to as many relays as possible. 
--- a/66.md
+++ b/66.md
@@ -1,250 +0,0 @@
-# NIP-66: Relay Discovery and Liveness Monitoring
-
-`draft` `optional`
-
-You want to find relays. You may want to discover relays based on criteria that's up to date. You may even want to ensure that you have a complete dataset. You probably want to filter relays based on their reported liveness.
-
-In its purest form:
-
-```json
-{
-  "kind": 30166,
-  "created_at": 1722173222,  
-  "content": "{}",
-  "tags": [
-    [ "d", "wss://somerelay.abc/" ]
-  ],
-  "pubkey": "<pubkey>", 
-  "sig": "<signature>",
-  "id": "<eventid>"
-}
-```
-
-This event signals that the relay at `wss://somerelay.abc/` was reported "online" by `<pubkey>` at timestamp `1722173222`. This event **MAY** be extended upon to include more information.
-
-## Kinds
-`NIP-66` defines two (2) event kinds, `30166` and `10166`
-
-| kind  | name                       | description                                                                             |
-|-------|----------------------------|-----------------------------------------------------------------------------------------|
-| [30166](#k30166) | Relay Discovery      | An addressable event that is published by a monitor when a relay is online |
-| [10166](#k10166) | Relay Monitor Announcement | An RE that stores data that signals the intent of a pubkey to monitor relays and publish `30166` events at a regular _frequency_ |
-
-## Ontology
- `Relay Operator`: someone who operates a relay 
- `Monitor`: A pubkey that monitors relays and publishes `30166` events at the frequency specified in their `10166` event.
- `Ad-hoc Monitor`: A pubkey that monitors relays and publishes `30166` events at an irregular frequency.
- `Monitor Service`: A group or individual that monitors relays using one or more `Monitors`.
- `Check`: a specific data point that is tested or aggregated by a monitor.
-
-## `30166`: "Relay Discovery" <a id="k30166"></a>
-
-### Summary
-`30166` is a `NIP-33` addressable event, referred to as a "Relay Discovery" event. These events are optimized with a small footprint for protocol-level relay Discovery.
-
-### Purpose 
-Discovery of relays over nostr. 
-
-### Schema 
-
-#### Content 
-`30166` content fields **SHOULD** include the stringified JSON of the relay's NIP-11 informational document. This data **MAY** be provided for informational purposes only. 
-
-#### `created_at`
-The `created_at` field in a NIP-66 event should reflect the time when the relay liveness (and potentially other data points) was checked.
-
-#### `tags`
-
-##### Meta Tags (unindexed)
- `rtt-open` The relay's open **round-trip time** in milliseconds.
- `rtt-read` The relay's read **round-trip time** in milliseconds.
- `rtt-write` The relay's write **round-trip time** in milliseconds.
-
-_Other `rtt` values **MAY** be present. This NIP should be updated if there is value found in more `rtt` values._
-
-##### Single Letter Tags (indexed)
- `d` The relay URL/URI. The `#d` tag **must** be included in the `event.tags[]` array. Index position `1` **must** be the relay websocket URL/URI. If a URL it **SHOULD** be [normalized](https://datatracker.ietf.org/doc/html/rfc3986#section-6). For relays not accessible via conventional means but rather by an npub/pubkey, an npub/pubkey **MAY** be used in place of a URL.
-  ```json
-  [ "d", "wss://somerelay.abc/"]
-  ```
-
- `n`: Network
-  ```json
-  [ "n", "clearnet" ]
-  ```
-
- `T`: Relay Type. Enumerated [relay type](https://github.com/nostr-protocol/nips/issues/1282) formatted as `PascalCase`
-  ```json
-  ["T", "PrivateInbox" ]
-  ```
-
- `N`: Supported Nips _From NIP-11 "Informational Document" `nip11.supported_nips[]`_
-  ```json
-  [ "N", "42" ]
-  ```
-
- `R`: Requirements _NIP-11 "Informational Document" `nip11.limitations.payment_required`, `nip11.limitations.auth_required` and/or any other boolean value within `nip11.limitations[]` that is added in the future_
-  ```json
-  [ "R", "payment" ],
-  [ "R", "auth" ],
-  ```
-  Since the nostr protocol does not currently support filtering on whether an indexed tag **is** or **is not** set, to make "public" and "no auth" relays discoverable requires a `!` flag
-
-  ```json
-  [ "R", "!payment" ], //no payment required, is public
-  [ "R", "!auth" ], //no authentication required
-  ```
-
- `t`: "Topics" _From NIP-11 "Informational Document" `nip11.tags[]`_
-  ```json
-  [ "t", "nsfw" ]
-  ```
-
- `k`: Accepted/Blocked Kinds [`NIP-22`]
-  ```json
-  [ "k", "0" ],
-  [ "k", "3" ],
-  [ "k", "10002" ]
-  ```
-
-  or for blocked kinds
-
-  ```json
-  [ "k", "!0" ]
-  [ "k", "!3" ],
-  [ "k", "!10002" ]
-  ```
-
- `g`: `NIP-52` `g` tags (geohash)
-  ```json
-  [ "g", "9r1652whz" ]
-  ```
-
- `30166` **MAY** be extended with global tags defined by other NIPs that do no collide with locally defined indices, including but not limited to: `p`, `t`, `e`, `a`, `i` and `l/L`. 
-
-#### Robust Example of a `30166` Event
-_Relay was online, and you can filter on a number of different tags_
-```json
-{
-  "id": "<eventid>",
-  "pubkey": "<monitor's pubkey>",
-  "created_at": "<created_at  [some recent date ...]>",
-  "signature": "<signature>",
-  "content": "{}",
-  "kind": 30166,
-  "tags": [  
-    ["d","wss://some.relay/"],
-    ["n", "clearnet"],
-    ["N", "40"],
-    ["N", "33"],
-    ["R", "!payment"],
-    ["R", "auth"],
-    ["g", "ww8p1r4t8"],
-    ["p", "somehexkey..."],
-    ["l", "en", "ISO-639-1"],
-    ["t", "nsfw" ],
-    ["rtt-open", 234 ]
-  ]
-} 
-```
-
-## `10166`: "Relay Monitor Announcement" Events <a id="k10166"></a>
-
-### Summary 
-`10166` is a replacable event herein referred to as "Relay Monitor Announcement" events. These events contain information about a publisher's intent to monitor and publish data as `30166` events. This event is optional and is intended for monitors who intend to provide monitoring services at a regular and predictable frequency.
-
-### Purpose 
-To provide a directory of monitors, their intent to publish, their criteria and parameters of monitoring activities. Absence of this event implies the monitor is ad-hoc and does not publish events at a predictable frequency, and relies on mechanisms to infer data integrity, such as web-of-trust.
-
-### Schema
-
-#### Standard Tags
-
- `frequency` The frequency **in seconds** at which the monitor publishes events. A string-integer at index `1` represents the expected frequency the monitor will publish `30166` events. There should only be `1` frequency per monitor. 
-
-  ```json
-  [ "frequency", "3600" ]
-  ```
-
- `timeout` (optional) The timeout values for various checks conducted by a monitor. Index `1` is the monitor's timeout in milliseconds. Index `2` describes what test the timeout is used for. If no index `2` is provided, it is inferred that the timeout provided applies to all tests. These values can assist relay operators in understanding data signaled by the monitor in _Relay Discovery Events_. 
-  ```json
-  [ "timeout", "2000", "open" ],
-  [ "timeout", "2000", "read" ],
-  [ "timeout", "3000", "write" ],
-  [ "timeout", "2000", "nip11" ],
-  [ "timeout", "4000", "ssl" ]
-  ```
-
-#### Indexed Tags
- `c`  "Checks" **SHOULD** be a lowercase string describing the check(s) conducted by a monitor. Due to the rapidly evolving nature of relays, enumeration is organic and not strictly defined. But examples of some checks could be websocket `open/read/write/auth`, `nip11` checks, `dns` and `geo` checks, and and any other checks the monitor may deem useful.. Other checks **MAY** be included. New types of checks **SHOULD** be added to this NIP as they are needed.
-  ```json
-  [ "c", "ws" ],
-  [ "c", "nip11" ],
-  [ "c", "dns" ],
-  [ "c", "geo" ],
-  [ "c", "ssl" ],
-  ```
-
- `g`: `NIP-52` `g` tags (geohash)
-  ```json
-  [ "g", "9r1652whz" ]
-  ```
-
- Any other globally defined indexable tags **MAY** be included as found necessary.
-
-### Other Requirements
-Monitors **SHOULD** have the following 
- A published `0` (NIP-1) event
- A published `10002` (NIP-65) event that defines the relays the monitor publishes to.
-
-### Robust Example of a `10166` Event
-```json
-{
-  "id": "<eventid>",
-  "pubkey": "<monitor's pubkey>",
-  "created_at": "<created_at  [some recent date ...]>",
-  "signature": "<signature>",
-  "content": "",
-  "tags": [  
-
-    [ "timeout", "open", "5000"  ],
-    [ "timeout", "read", "3000"  ],
-    [ "timeout", "write", "3000" ],
-    [ "timeout", "nip11", "3000" ],
-
-    [ "frequency", "3600" ],
-
-    [ "c", "ws" ],
-    [ "c", "nip11" ],
-    [ "c", "ssl" ],
-    [ "c", "dns" ],
-    [ "c", "geo" ]
-
-    [ "g", "ww8p1r4t8" ]
-  ]
-} 
-```
-
-## Methodology 
-
-### Monitors
-1. A _Relay Monitor_ checks the liveness and potentially other attributes of a relay. 
-
-2. _Relay Monitor_ publishes a kind `30166` note when a relay it is monitoring is online. If the monitor has a `10166` event, events should be published at the frequency defined in their `10166` note. 
-
-_Any pubkey that publishes `30166` events **SHOULD** at a minimum be checking that the relay is available by websocket and behaves like a relay_
-
-### Clients
-1. In most cases, a client **SHOULD** filter on `30166` events using either a statically or dynamically defined monitor's `pubkey` and a `created_at` value respective of the monitor's published `frequency`. If the monitor has no stated frequency, other mechanisms should be employed to determine data integrity.
-
-2. _Relay Liveness_ is subjectively determined by the client, starting with the `frequency` value of a monitor. 
-
-3. The liveness of a _Relay Monitor_ can be subjectively determined by detecting whether the _Relay Monitor_ has published events with respect to `frequency` value of any particular monitor.
-
-4. The reliability and trustworthiness of a _Relay Monitor_ could be established via web-of-trust, reviews or similar mechanisms. 
-
-## Risk Mitigation
-
- When a client implements `NIP-66` events, the client should have a fallback if `NIP-66` events cannot be located.
-
- A `Monitor` or `Ad-hoc Monitor` may publish erroneous `30166` events, intentionally or otherwise. Therefor, it's important to program defensively to limit the impact of such events. This can be achieved with web-of-trust, reviews, fallbacks and/or data-aggregation for example.
--- a/73.md
+++ b/73.md
@@ -9,37 +9,26 @@ External Content IDs
 There are certain established global content identifiers such as [Book ISBNs](https://en.wikipedia.org/wiki/ISBN), [Podcast GUIDs](https://podcastnamespace.org/tag/guid), and [Movie ISANs](https://en.wikipedia.org/wiki/International_Standard_Audiovisual_Number) that are useful to reference in nostr events so that clients can query all the events assosiated with these ids.


-`i` tags are used for referencing these external content ids, with `k` tags representing the external content id kind so that clients can query all the events for a specific kind.
+`i` tags are used for referencing these external content ids, with `k` tags representing the external content id kind so that clients can query all the events for a specific kind. 

 ## Supported IDs

-| Type               | `i` tag                             | `k` tag                  |
-| ---                | ---                                 | ---                      |
-| URLs               | "`<URL, normalized, no fragment>`"  | "web"                    |
-| Hashtags           | "#`<topic, lowercase>`"             | "#"                      |
-| Geohashes          | "geo:`<geohash, lowercase>`"        | "geo"                    |
-| Books              | "isbn:`<id, without hyphens>`"      | "isbn"                   |
-| Podcast Feeds      | "podcast:guid:`<guid>`"             | "podcast:guid"           |
-| Podcast Episodes   | "podcast:item:guid:`<guid>`"        | "podcast:item:guid"      |
-| Podcast Publishers | "podcast:publisher:guid:`<guid>`"   | "podcast:publisher:guid" |
-| Movies             | "isan:`<id, without version part>`" | "isan"                   |
-| Papers             | "doi:`<id, lowercase>`"             | "doi"                    |
+| Type | `i` tag | `k` tag |
+|- | - | - |
+| URLs | "`<URL, normalized, no fragment>`" | "`<scheme-host, normalized>`" |
+| Hashtags | "#`<topic, lowercase>`" | "#" |
+| Geohashes| "geo:`<geohash, lowercase>`" | "geo" |
+| Books | "isbn:`<id, without hyphens>`" | "isbn" |
+| Podcast Feeds | "podcast:guid:`<guid>`" | "podcast:guid" |
+| Podcast Episodes | "podcast:item:guid:`<guid>`" | "podcast:item:guid" |
+| Podcast Publishers | "podcast:publisher:guid:`<guid>`" | "podcast:publisher:guid" |
+| Movies | "isan:`<id, without version part>`" | "isan" |
+| Papers | "doi:`<id, lowercase>`" | "doi" |

 ---

 ## Examples

-### Webpages
-
-For the webpage "https://myblog.example.com/post/2012-03-27/hello-world" the "i" and "k" tags are:
-
-```jsonc
-[
-  ["i","https://myblog.example.com/post/2012-03-27/hello-world"],
-  ["k", "web"]
-]
-```
-
 ### Books:

 - Book ISBN: `["i", "isbn:9780765382030"]` - https://isbnsearch.org/isbn/9780765382030
@@ -67,3 +56,5 @@ Each `i` tag MAY have a url hint as the second argument to redirect people to a
 `["i", "podcast:item:guid:d98d189b-dc7b-45b1-8720-d4b98690f31f", https://fountain.fm/episode/z1y9TMQRuqXl2awyrQxg]`

 `["i", "isan:0000-0000-401A-0000-7", https://www.imdb.com/title/tt0120737]`
+
+
--- a/BREAKING.md
+++ b/BREAKING.md
@@ -5,8 +5,6 @@ reverse chronological order.

 | Date        | Commit    | NIP      | Change |
 | ----------- | --------- | -------- | ------ |
-| 2025-02-14  | [81908b6e](https://github.com/nostr-protocol/nips/commit/81908b6e) | [07](07.md), [46](46.md), [55](55.md) | `getRelays` and `get_relays` were removed |
-| 2025-02-07  | [0023ca81](https://github.com/nostr-protocol/nips/commit/0023ca81) | [10](10.md) | `"mention"` marker was removed |
 | 2025-01-31  | [6a4b125a](https://github.com/nostr-protocol/nips/commit/6a4b125a) | [71](71.md) | video events were changed to regular |
 | 2024-12-05  | [6d16019e](https://github.com/nostr-protocol/nips/commit/6d16019e) | [46](46.md) | message encryption was changed to NIP-44 |
 | 2024-11-12  | [2838e3bd](https://github.com/nostr-protocol/nips/commit/2838e3bd) | [29](29.md) | `kind: 12` and `kind: 10` were removed (use `kind: 1111` instead) |
--- a/README.md
+++ b/README.md
@@ -77,10 +77,8 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 - [NIP-59: Gift Wrap](59.md)
 - [NIP-60: Cashu Wallet](60.md)
 - [NIP-61: Nutzaps](61.md)
- [NIP-62: Request to Vanish](62.md)
 - [NIP-64: Chess (PGN)](64.md)
 - [NIP-65: Relay List Metadata](65.md)
- [NIP-66: Relay Discovery and Liveness Monitoring](66.md)
 - [NIP-68: Picture-first feeds](68.md)
 - [NIP-69: Peer-to-peer Order events](69.md)
 - [NIP-70: Protected Events](70.md)
@@ -121,22 +119,16 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `12`          | Group Thread Reply              | 29 (deprecated)                        |
 | `13`          | Seal                            | [59](59.md)                            |
 | `14`          | Direct Message                  | [17](17.md)                            |
-| `15`          | File Message                    | [17](17.md)                            |
 | `16`          | Generic Repost                  | [18](18.md)                            |
 | `17`          | Reaction to a website           | [25](25.md)                            |
 | `20`          | Picture                         | [68](68.md)                            |
 | `21`          | Video Event                     | [71](71.md)                            |
 | `22`          | Short-form Portrait Video Event | [71](71.md)                            |
-| `30`          | internal reference              | [NKBIP-03]                             |
-| `31`          | external web reference          | [NKBIP-03]                            |
-| `32`          | hardcopy reference              | [NKBIP-03]                            |
-| `33`          | prompt reference                | [NKBIP-03]                            |
 | `40`          | Channel Creation                | [28](28.md)                            |
 | `41`          | Channel Metadata                | [28](28.md)                            |
 | `42`          | Channel Message                 | [28](28.md)                            |
 | `43`          | Channel Hide Message            | [28](28.md)                            |
 | `44`          | Channel Mute User               | [28](28.md)                            |
-| `62`          | Request to Vanish               | [62](62.md)                            |
 | `64`          | Chess (PGN)                     | [64](64.md)                            |
 | `818`         | Merge Requests                  | [54](54.md)                            |
 | `1018`        | Poll Response                   | [88](88.md)                            |
@@ -176,7 +168,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `9802`        | Highlights                      | [84](84.md)                            |
 | `10000`       | Mute list                       | [51](51.md)                            |
 | `10001`       | Pin list                        | [51](51.md)                            |
-| `10002`       | Relay List Metadata             | [65](65.md), [51](51.md)               |
+| `10002`       | Relay List Metadata             | [65](65.md)                            |
 | `10003`       | Bookmark list                   | [51](51.md)                            |
 | `10004`       | Communities list                | [51](51.md)                            |
 | `10005`       | Public chats list               | [51](51.md)                            |
@@ -190,7 +182,6 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `10050`       | Relay list to receive DMs       | [51](51.md), [17](17.md)               |
 | `10063`       | User server list                | [Blossom][blossom]                     |
 | `10096`       | File storage server list        | [96](96.md)                            |
-| `10166`       | Relay Monitor Announcement      | [66](66.md)                            |
 | `13194`       | Wallet Info                     | [47](47.md)                            |
 | `17375`       | Cashu Wallet Event              | [60](60.md)                            |
 | `21000`       | Lightning Pub RPC               | [Lightning.Pub][lnpub]                 |
@@ -217,11 +208,10 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `30023`       | Long-form Content               | [23](23.md)                            |
 | `30024`       | Draft Long-form Content         | [23](23.md)                            |
 | `30030`       | Emoji sets                      | [51](51.md)                            |
-| `30040`       | Curated Publication Index       | [NKBIP-01]                             |
-| `30041`       | Curated Publication Content     | [NKBIP-01]                             |
+| `30040`       | Modular Article Header          | [NKBIP-01]                             |
+| `30041`       | Modular Article Content         | [NKBIP-01]                             |
 | `30063`       | Release artifact sets           | [51](51.md)                            |
 | `30078`       | Application-specific Data       | [78](78.md)                            |
-| `30166`       | Relay Discovery                 | [66](66.md)                            |
 | `30267`       | App curation sets               | [51](51.md)                            |
 | `30311`       | Live Event                      | [53](53.md)                            |
 | `30315`       | User Statuses                   | [38](38.md)                            |
@@ -252,9 +242,8 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 [cornychat-slideset]: https://cornychat.com/datatypes#kind30388slideset
 [cornychat-linkset]: https://cornychat.com/datatypes#kind31388linkset
 [joinstr]: https://gitlab.com/1440000bytes/joinstr/-/blob/main/NIP.md
-[NKBIP-01]: https://wikistr.com/nkbip-01*fd208ee8c8f283780a9552896e4823cc9dc6bfd442063889577106940fd927c1
-[NKBIP-02]: https://wikistr.com/nkbip-02*fd208ee8c8f283780a9552896e4823cc9dc6bfd442063889577106940fd927c1
-[NKBIP-03]: https://wikistr.com/nkbip-03*fd208ee8c8f283780a9552896e4823cc9dc6bfd442063889577106940fd927c1
+[NKBIP-01]: https://wikistr.com/nkbip-01
+[NKBIP-02]: https://wikistr.com/nkbip-02
 [blossom]: https://github.com/hzrd149/blossom
 [Tidal-nostr]: https://wikistr.com/tidal-nostr

@@ -309,7 +298,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `s`               | status                               | --                              | [69](69.md)                                        |
 | `t`               | hashtag                              | --                              | [24](24.md), [34](34.md), [35](35.md)              |
 | `u`               | url                                  | --                              | [61](61.md), [98](98.md)                           |
-| `x`               | hash                                 | --                              | [35](35.md), [56](56.md)                           |
+| `x`               | infohash                             | --                              | [35](35.md)                                        |
 | `y`               | platform                             | --                              | [69](69.md)                                        |
 | `z`               | order number                         | --                              | [69](69.md)                                        |
 | `-`               | --                                   | --                              | [70](70.md)                                        |
@@ -384,4 +373,4 @@ All NIPs are public domain.

 <a align="center" href="https://github.com/nostr-protocol/nips/graphs/contributors">
  <img src="https://contrib.rocks/image?repo=nostr-protocol/nips" />
-</a>
+</a>