NIP-17 Typos and grammar improvements

Co-authored-by: dskvr <dskvr@users.noreply.github.com>

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>]`
+- 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 `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>]`
+    - 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)
 
 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.
 
@@ -89,7 +89,7 @@ Kinds specify how clients should interpret the meaning of each event and the oth
 
 This NIP defines one basic kind:
 
-- `0`: **user metadata**: the `content` is set to a stringified JSON object `{name: <username>, about: <string>, picture: <url, string>}` describing the user who created the event. [Extra metadata fields](24.md#kind-0) may be set. A relay may delete older events once it gets a new one for the same pubkey.
+- `0`: **user metadata**: the `content` is set to a stringified JSON object `{name: <nickname or full name>, about: <short bio>, picture: <url of the image>}` describing the user who created the event. [Extra metadata fields](24.md#kind-0) may be set. A relay may delete older events once it gets a new one for the same pubkey.
 
 And also a convention for kind ranges that allow for easier experimentation and flexibility of relay implementation:
 
@@ -168,9 +168,10 @@ 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`, and `error` for when none of that fits.
+- 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.

07.md

@@ -17,7 +17,6 @@ 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

10.md

@@ -10,25 +10,34 @@ 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` and `p` tags can be used to define note threads, replies and mentions. 
+`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.
 
 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"`, or `"mention"`.
+ * `<marker>` is optional and if present is one of `"reply"`, `"root"`.
  * `<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 `"mention"` denote a quoted or reposted event id.
+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. 
 
 A direct reply to the root of a thread should have a single marked "e" tag of type "root".
 

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>", "reply"] // if this is a reply
+    ["e", "<kind-14-id>", "<relay-url>"] // if this is a reply
     ["subject", "<conversation-title>"],
     // rest of tags...
   ],
@@ -31,13 +31,59 @@ 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.
 
-Tags that mention, quote and assemble threading structures MUST follow [NIP-10](10.md).
+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>"]
+```
 
 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 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 a clean message history.
 
 Clients SHOULD render messages of the same room in a continuous thread.
 
@@ -45,7 +91,7 @@ An optional `subject` tag defines the current name/topic of the conversation. An
 
 ## Encrypting
 
-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.
+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.
 
 ```jsonc
 {
@@ -127,7 +173,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
 

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.
+A comment is a threading note always scoped to a root event or an [`I`-tag](73.md).
 
 It uses `kind:1111` with plaintext `.content` (no HTML, Markdown, or other formatting).
 
@@ -198,4 +198,3 @@ A reply to a podcast comment:
   // other fields
 }
 ```
-

23.md

@@ -60,3 +60,7 @@ 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. 

25.md

@@ -25,26 +25,21 @@ consider it a "+".
 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.
+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 last `e` tag MUST be the `id` of the note that is being reacted to.
+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 `p` tag MUST be the `pubkey` of the event 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 `a` tag MUST contain the coordinates (`kind:pubkey:d-tag`) of the replaceable being reacted to.
+The reaction SHOULD include a `k` tag with the stringified kind number of the reacted event as its value.
 
-The reaction event MAY include a `k` tag with the stringified kind number of the reacted event as its value.
-
-Example code
+**Example code**
 
 ```swift
 func make_like_event(pubkey: String, privkey: String, liked: NostrEvent) -> NostrEvent {
-    var tags: [[String]] = liked.tags.filter {
-    	tag in tag.count >= 2 && (tag[0] == "e" || tag[0] == "p")
-    }
-    tags.append(["e", liked.id])
+    tags.append(["e", liked.id, liked.source_relays.first ?? ""])
     tags.append(["p", liked.pubkey])
-    tags.append(["k", liked.kind])
+    tags.append(["k", String(liked.kind)])
     let ev = NostrEvent(content: "+", pubkey: pubkey, kind: 7, tags: tags)
     ev.calculate_id()
     ev.sign(privkey: privkey)

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-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.
+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.
 
 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.
 

31.md

@@ -12,4 +12,4 @@ The intent is that social clients, used to display only `kind:1` notes, can stil
 
 These clients that only know `kind:1` are not expected to ask relays for events of different kinds, but users could still reference these weird events on their notes, and without proper context these could be nonsensical notes. Having the fallback text makes that situation much better -- even if only for making the user aware that they should try to view that custom event elsewhere.
 
-`kind:1`-centric clients can make interacting with these event kinds more functional by supporting [NIP-89](https://github.com/nostr-protocol/nips/blob/master/89.md).
+`kind:1`-centric clients can make interacting with these event kinds more functional by supporting [NIP-89](89.md).

34.md

@@ -22,9 +22,10 @@ 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>", ...]
+    ["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
   ]
 }
 ```

46.md

@@ -100,7 +100,6 @@ 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>`                                                          |

47.md

@@ -1,7 +1,7 @@
 NIP-47
 ======
 
-Nostr Wallet Connect
+Nostr Wallet Connect (NWC)
 --------------------
 
 `draft` `optional`
@@ -17,6 +17,9 @@ 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.  
@@ -45,7 +48,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 **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.
+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.
 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:
@@ -80,9 +83,9 @@ 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 **user**.
+The notification event SHOULD contain one `p` tag, the public key of the **client**.
 
-The content of notifications is encrypted with [NIP04](https://github.com/nostr-protocol/nips/blob/master/04.md), and is a JSON-RPCish object with a semi-fixed structure:
+The content of notifications is encrypted with [NIP04](04.md), and is a JSON-RPCish object with a semi-fixed structure:
 
 ```jsonc
 {
@@ -105,19 +108,27 @@ The content of notifications is encrypted with [NIP04](https://github.com/nostr-
 - `OTHER`: Other error.
 
 ## Nostr Wallet Connect URI
-**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 hex-encoded `pubkey` with the following query string parameters:
+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:
 
 - `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**.
+- `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**.
     - 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.
+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.
 
 ### Example connection string
 ```sh

51.md

@@ -24,6 +24,7 @@ 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)                                                                 |
@@ -50,7 +51,7 @@ Aside from their main identifier, the `"d"` tag, sets can optionally have a `"ti
 | Relay sets            | 30002 | user-defined relay groups the user can easily pick and choose from during various operations | `"relay"` (relay URLs)                                                              |
 | Bookmark sets         | 30003 | user-defined bookmarks categories , for when bookmarks must be in labeled separate groups    | `"e"` (kind:1 notes), `"a"` (kind:30023 articles), `"t"` (hashtags), `"r"` (URLs)   |
 | Curation sets         | 30004 | groups of articles picked by users as interesting and/or belonging to the same category      | `"a"` (kind:30023 articles), `"e"` (kind:1 notes)                                   |
-| Curation sets         | 30005 | groups of videos picked by users as interesting and/or belonging to the same category        | `"a"` (kind:34235 videos)                                                           |
+| Curation sets         | 30005 | groups of videos picked by users as interesting and/or belonging to the same category        | `"a"` (kind:21 videos)                                                              |
 | Kind mute sets        | 30007 | mute pubkeys by kinds<br>`"d"` tag MUST be the kind string                                   | `"p"` (pubkeys)                                                                     |
 | Interest sets         | 30015 | interest topics represented by a bunch of "hashtags"                                         | `"t"` (hashtags)                                                                    |
 | Emoji sets            | 30030 | categorized emoji groups                                                                     | `"emoji"` (see [NIP-30](30.md))                                                     |

53.md

@@ -35,7 +35,8 @@ 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", /*...*/]
+    ["relays", "wss://one.com", "wss://two.com", /*...*/],
+    ["pinned", "<event id of pinned live chat message>"],
   ],
   "content": "",
   // other fields...
@@ -62,7 +63,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 with a `root` marker. Other Kind-1 tags such as `reply` and `mention` can also be used.
+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. 
 
 ```jsonc
 {
@@ -75,6 +76,14 @@ 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).

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 and Content Resolvers to communicate between 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.
 
 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:
+Set the Signer package name after you receive the response from **get_public_key** method:
 
 ```kotlin
 intent.`package` = "com.example.signer"
@@ -114,7 +114,6 @@ 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(
@@ -130,7 +129,7 @@ launcher.launch(intent)
     context.startActivity(intent)
     ```
   - result:
-    - If the user approved intent it will return the **pubkey** in the result field
+    - If the user approved the intent it will return the **pubkey** in the result field and the signer packageName in the **package** field
 
       ```kotlin
       val pubkey = intent.data?.getStringExtra("result")
@@ -262,29 +261,6 @@ 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:
 
@@ -339,6 +315,8 @@ 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
@@ -364,6 +342,8 @@ 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")
@@ -390,6 +370,8 @@ 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)
@@ -414,6 +396,8 @@ 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)
@@ -438,6 +422,8 @@ 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)
@@ -462,36 +448,14 @@ 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:
 
@@ -510,6 +474,8 @@ 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)
@@ -518,6 +484,8 @@ 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.
@@ -572,13 +540,6 @@ 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:
 

56.md

@@ -22,7 +22,7 @@ are reporting.
 
 If reporting a note, an `e` tag MUST also be included referencing the note id.
 
-A `report type` string MUST be included as the 3rd entry to the `e` or `p` tag
+A `report type` string MUST be included as the 3rd entry to the `e`, `p` or `x` tag
 being reported, which consists of the following report types:
 
 - `nudity` - depictions of nudity, porn, etc.
@@ -33,7 +33,9 @@ being reported, which consists of the following report types:
 - `impersonation` - someone pretending to be someone else
 - `other` - for reports that don't fit in the above categories
 
-Some report tags only make sense for profile reports, such as `impersonation`
+Some report tags only make sense for profile reports, such as `impersonation`.
+
+- `x` tags SHOULD be info hash of a blob which is intended to be report. when the `x` tag is represented client MUST include an `e` tag which is the id of the event that contains the mentioned blob. also, additionally these events can contain a `server` tag to point to media servers which may contain the mentioned media.
 
 `l` and `L` tags MAY be also be used as defined in [NIP-32](32.md) to support
 further qualification and querying.
@@ -45,7 +47,7 @@ Example events
 {
   "kind": 1984,
   "tags": [
-    ["p", <pubkey>, "nudity"],
+    ["p", "<pubkey>", "nudity"],
     ["L", "social.nos.ontology"],
     ["l", "NS-nud", "social.nos.ontology"]
   ],
@@ -58,8 +60,8 @@ Example events
 {
   "kind": 1984,
   "tags": [
-    ["e", <eventId>, "illegal"],
-    ["p", <pubkey>]
+    ["e", "<eventId>", "illegal"],
+    ["p", "<pubkey>"]
   ],
   "content": "He's insulting the king!",
   // other fields...
@@ -70,13 +72,26 @@ Example events
 {
   "kind": 1984,
   "tags": [
-    ["p", <impersonator pubkey>, "impersonation"]
+    ["p", "<impersonator pubkey>", "impersonation"]
   ],
   "content": "Profile is impersonating nostr:<victim bech32 pubkey>",
   // other fields...
 }
 ```
 
+```jsonc
+{
+  "kind": 1984,
+  "tags": [
+    ["x", "<blob hash>", "malware"],
+    ["e", "<event id which contains the blob on x tag>", "malware"],
+    ["server", "https://you-may-find-the-blob-here.com/path-to-url.ext"]
+  ],
+  "content": "This file contains malware software in it.",
+  // other fields...
+}
+```
+
 Client behavior
 ---------------
 

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)` MUST match the description hash in the bolt11 invoice.
+- `SHA256(description)` SHOULD 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.

60.md

@@ -1,5 +1,9 @@
-# NIP-60
-## Cashu Wallet
+NIP-60
+======
+
+Cashu Wallets
+-------------
+
 `draft` `optional`
 
 This NIP defines the operations of a cashu-based wallet.
@@ -13,51 +17,31 @@ The purpose of this NIP is:
 This NIP doesn't deal with users' *receiving* money from someone else, it's just to keep state of the user's wallet.
 
 # High-level flow
-1. A user has a `kind:37375` event that represents a wallet.
+1. A user has a `kind:17375` event that represents a wallet.
 2. A user has `kind:7375` events that represent the unspent proofs of the wallet. -- The proofs are encrypted with the user's private key.
 3. A user has `kind:7376` events that represent the spending history of the wallet -- This history is for informational purposes only and is completely optional.
 
 ## Wallet Event
 ```jsonc
 {
-    "kind": 37375,
+    "kind": 17375,
     "content": nip44_encrypt([
-        [ "balance", "100", "sat" ],
-        [ "privkey", "hexkey" ] // explained in NIP-61
-    ]),
-    "tags": [
-        [ "d", "my-wallet" ],
+        [ "privkey", "hexkey" ],
         [ "mint", "https://mint1" ],
-        [ "mint", "https://mint2" ],
-        [ "mint", "https://mint3" ],
-        [ "name", "my shitposting wallet" ],
-        [ "unit", "sat" ],
-        [ "description", "a wallet for my day-to-day shitposting" ],
-        [ "relay", "wss://relay1" ],
-        [ "relay", "wss://relay2" ],
-    ]
+        [ "mint", "https://mint2" ]
+    ]),
+    "tags": []
 }
 ```
 
-The wallet event is a parameterized replaceable event `kind:37375`.
+The wallet event is an replaceable event `kind:17375`.
 
 Tags:
-* `d` - wallet ID.
 * `mint` - Mint(s) this wallet uses -- there MUST be one or more mint tags.
-* `relay` - Relays where the wallet and related events can be found. -- one ore more relays SHOULD be specified. If missing, clients should follow [[NIP-65]].
-* `unit` - Base unit of the wallet (e.g. "sat", "usd", etc).
-* `name` - Optional human-readable name for the wallet.
-* `description` - Optional human-readable description of the wallet.
-* `balance` - Optional best-effort balance of the wallet that can serve as a placeholder while an accurate balance is computed from fetching all unspent proofs.
-* `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 when receiving funds from others, described in NIP-61.
-
-Any tag, other than the `d` tag, can be [[NIP-44]] encrypted into the `.content` field.
-
-### Deleting a wallet event
-Due to addressable event being hard to delete, if a user wants to delete a wallet, they should empty the event and keep just the `d` identifier and add a `deleted` tag.
+* `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.
 
 ## Token Event
-Token events are used to record the unspent proofs that come from the mint.
+Token events are used to record unspent proofs.
 
 There can be multiple `kind:7375` events for the same mint, and multiple proofs inside each `kind:7375` event.
 
@@ -67,25 +51,29 @@ There can be multiple `kind:7375` events for the same mint, and multiple proofs
     "content": nip44_encrypt({
         "mint": "https://stablenut.umint.cash",
         "proofs": [
+            // one or more proofs in the default cashu format
             {
                 "id": "005c2502034d4f12",
                 "amount": 1,
                 "secret": "z+zyxAVLRqN9lEjxuNPSyRJzEstbl69Jc1vtimvtkPg=",
                 "C": "0241d98a8197ef238a192d47edf191a9de78b657308937b4f7dd0aa53beae72c46"
             }
-        ]
+        ],
+        // tokens that were destroyed in the creation of this token (helps on wallet state transitions)
+        "del": [ "token-event-id-1", "token-event-id-2" ]
     }),
-    "tags": [
-        [ "a", "37375:<pubkey>:my-wallet" ]
-    ]
+    "tags": []
 }
 ```
 
-`.content` is a [[NIP-44]] encrypted payload storing the mint and the unencoded proofs.
-* `a` an optional tag linking the token to a specific wallet.
+ * `.content` is a [NIP-44](44.md) encrypted payload:
+   * `mint`: The mint the proofs belong to.
+   * `proofs`: unecoded proofs
+   * `del`: token-ids that were destroyed by the creation of this token. This assists with state transitions.
 
-### Spending proofs
-When one or more proofs of a token are spent, the token event should be [[NIP-09]]-deleted and, if some proofs are unspent from the same token event, a new token event should be created rolling over the unspent proofs and adding any change outputs to the new token event.
+When one or more proofs of a token are spent, the token event should be [NIP-09](09.md)-deleted and, if some proofs are unspent from the same token event, a new token event should be created rolling over the unspent proofs and adding any change outputs to the new token event (the change output should include a `del` field).
+
+The `kind:5` _delete event_ created in the [NIP-09](09.md) process MUST have a tag `["k", "7375"]` to allow easy filtering by clients interested in state transitions.
 
 ## Spending History Event
 Clients SHOULD publish `kind:7376` events to create a transaction history when their balance changes.
@@ -95,41 +83,39 @@ Clients SHOULD publish `kind:7376` events to create a transaction history when t
     "kind": 7376,
     "content": nip44_encrypt([
         [ "direction", "in" ], // in = received, out = sent
-        [ "amount", "1", "sat" ],
-        [ "e", "<event-id-of-spent-token>", "<relay-hint>", "created" ],
+        [ "amount", "1" ],
+        [ "e", "<event-id-of-created-token>", "", "created" ]
     ]),
     "tags": [
-        [ "a", "37375:<pubkey>:my-wallet" ],
+        [ "e", "<event-id-of-created-token>", "", "redeemed" ]
     ]
 }
 ```
 
 * `direction` - The direction of the transaction; `in` for received funds, `out` for sent funds.
-* `a` - The wallet the transaction is related to.
 
 Clients MUST add `e` tags to create references of destroyed and created token events along with the marker of the meaning of the tag:
 * `created` - A new token event was created.
 * `destroyed` - A token event was destroyed.
-* `redeemed` - A [[NIP-61]] nutzap was redeemed.
+* `redeemed` - A [NIP-61](61.md) nutzap was redeemed.
 
-All tags can be [[NIP-44]] encrypted. Clients SHOULD leave `e` tags with a `redeemed` marker unencrypted.
+All tags can be [NIP-44](44.md) encrypted. Clients SHOULD leave `e` tags with a `redeemed` marker unencrypted.
 
-Multiple `e` tags can be added to a `kind:7376` event.
+Multiple `e` tags can be added, and should be encrypted, except for tags with the `redeemed` marker.
 
 # Flow
-A client that wants to check for user's wallets information starts by fetching `kind:10019` events from the user's relays, if no event is found, it should fall back to using the user's [[NIP-65]] relays.
+A client that wants to check for user's wallets information starts by fetching `kind:10019` events from the user's relays, if no event is found, it should fall back to using the user's [NIP-65](65.md) relays.
 
 ## Fetch wallet and token list
 From those relays, the client should fetch wallet and token events.
 
-`"kinds": [37375, 7375], "authors": ["<my-pubkey>"]`
+`"kinds": [17375, 7375], "authors": ["<my-pubkey>"]`
 
 ## Fetch proofs
-While the client is fetching (and perhaps validating) proofs it can use the optional `balance` tag of the wallet event to display a estimate of the balance of the wallet.
 
 ## Spending token
 If Alice spends 4 sats from this token event
-```jsonconc
+```jsonc
 {
     "kind": 7375,
     "id": "event-id-1",
@@ -142,15 +128,13 @@ If Alice spends 4 sats from this token event
             { "id": "4", "amount": 8 },
         ]
     }),
-    "tags": [
-        [ "a", "37375:<pubkey>:my-wallet" ]
-    ]
+    "tags": []
 }
 ```
 
 Her client:
 * MUST roll over the unspent proofs:
-```jsonconc
+```jsonc
 {
     "kind": 7375,
     "id": "event-id-2",
@@ -160,34 +144,32 @@ Her client:
             { "id": "1", "amount": 1 },
             { "id": "2", "amount": 2 },
             { "id": "4", "amount": 8 },
-        ]
+        ],
+        "del": [ "event-id-1" ]
     }),
-    "tags": [
-        [ "a", "37375:<pubkey>:my-wallet" ]
-    ]
+    "tags": []
 }
 ```
 * MUST delete event `event-id-1`
+* SHOULD add the `event-id-1` to the `del` array of deleted token-ids.
 * SHOULD create a `kind:7376` event to record the spend
-```jsonconc
+```jsonc
 {
     "kind": 7376,
     "content": nip44_encrypt([
         [ "direction", "out" ],
-        [ "amount", "4", "sats" ],
-        [ "e", "<event-id-1>", "<relay-hint>", "destroyed" ],
-        [ "e", "<event-id-2>", "<relay-hint>", "created" ],
+        [ "amount", "4" ],
+        [ "e", "<event-id-1>", "", "destroyed" ],
+        [ "e", "<event-id-2>", "", "created" ],
     ]),
-    "tags": [
-        [ "a", "37375:<pubkey>:my-wallet" ],
-    ]
+    "tags": []
 }
 ```
 
 ## Redeeming a quote (optional)
-When creating a quote at a mint, an event can be used to keep the state of the quote ID, which will be used to check when the quote has been paid. These events should be created with an expiration tag [[NIP-40]] matching the expiration of the bolt11 received from the mint; this signals to relays when they can safely discard these events.
+When creating a quote at a mint, an event can be used to keep the state of the quote ID, which will be used to check when the quote has been paid. These events should be created with an expiration tag [NIP-40](40.md) of 2 weeks (which is around the maximum amount of time a Lightning payment may be in-flight).
 
-Application developers are encouraged to use local state when possible and only publish this event when it makes sense in the context of their application.
+However, application developers SHOULD use local state when possible and only publish this event when it makes sense in the context of their application.
 
 ```jsonc
 {
@@ -195,8 +177,7 @@ Application developers are encouraged to use local state when possible and only
     "content": nip44_encrypt("quote-id"),
     "tags": [
         [ "expiration", "<expiration-timestamp>" ],
-        [ "mint", "<mint-url>" ],
-        [ "a", "37375:<pubkey>:my-wallet" ]
+        [ "mint", "<mint-url>" ]
     ]
 }
 ```

61.md

@@ -1,14 +1,19 @@
-# NIP-61:
-## Nut Zaps
+NIP-61
+======
 
-A Nut Zap is a P2PK cashu token where the payment itself is the receipt.
+Nutzaps
+-------
+
+`draft` `optional`
+
+A Nutzap is a P2PK Cashu token in which the payment itself is the receipt.
 
 # High-level flow
 Alice wants to nutzap 1 sat to Bob because of an event `event-id-1` she liked.
 
 ## Alice nutzaps Bob
 1. Alice fetches event `kind:10019` from Bob to see the mints Bob trusts.
-2. She mints a token at that mint (or swaps some tokens she already had in that mint) p2pk-locked to the pubkey Bob has listed in his `kind:10019`.
+2. She mints a token at that mint (or swaps some tokens she already had in that mint) P2PK-locked to the pubkey Bob has listed in his `kind:10019`.
 3. She publishes a `kind:9321` event to the relays Bob indicated with the proofs she minted.
 
 ## Bob receives the nutzap
@@ -29,65 +34,57 @@ Alice wants to nutzap 1 sat to Bob because of an event `event-id-1` she liked.
 }
 ```
 
-`kind:10019` is an event that is useful for others to know how to send money to the user.
-
-* `relay` - Relays where the user will be reading token events from. If a user wants to send money to the user, they should write to these relays.
-* `mint` - Mints the user is explicitly agreeing to use to receive funds on. Clients SHOULD not send money on mints not listed here or risk burning their money. Additional markers can be used to list the supported base units of the mint.
-* `pubkey` - Pubkey that SHOULD be used to P2PK-lock receiving nutzaps. If not present, clients SHOULD use the pubkey of the recipient. This is explained in Appendix 1.
+* `kind:10019` is an event that is useful for others to know how to send money to the user.
+* `relay`: relays where the user will be reading token events from. If a user wants to send money to the user, they should write to these relays.
+* `mint`: mints the user is explicitly agreeing to use to receive funds on. Clients SHOULD not send money on mints not listed here or risk burning their money. Additional markers can be used to list the supported base units of the mint.
+* `pubkey`: Public key that MUST be used to P2PK-lock receiving nutzaps -- implementations MUST NOT use the target user's main Nostr public key. This public key corresponds to the `privkey` field encrypted in a user's [nip-60](60.md) _wallet event_.
 
 ## Nutzap event
-Event `kind:9321` is a nutzap event published by the sender, p-tagging the recipient. The outputs are P2PK-locked to the pubkey the recipient indicated in their `kind:10019` event or to the recipient pubkey if the `kind:10019` event doesn't have a explicit pubkey.
+Event `kind:9321` is a nutzap event published by the sender, p-tagging the recipient. The outputs are P2PK-locked to the public key the recipient indicated in their `kind:10019` event.
 
-Clients MUST prefix the pubkey they p2pk-lock with `"02"` (for nostr<>cashu pubkey compatibility).
+Clients MUST prefix the public key they P2PK-lock with `"02"` (for nostr<>cashu compatibility).
 
 ```jsonc
 {
     kind: 9321,
     content: "Thanks for this great idea.",
-    pubkey: "sender-pubkey",
+    pubkey: "<sender-pubkey>",
     tags: [
-        [ "amount", "1" ],
-        [ "unit", "sat" ],
         [ "proof", "{\"amount\":1,\"C\":\"02277c66191736eb72fce9d975d08e3191f8f96afb73ab1eec37e4465683066d3f\",\"id\":\"000a93d6f8a1d2c4\",\"secret\":\"[\\\"P2PK\\\",{\\\"nonce\\\":\\\"b00bdd0467b0090a25bdf2d2f0d45ac4e355c482c1418350f273a04fedaaee83\\\",\\\"data\\\":\\\"02eaee8939e3565e48cc62967e2fde9d8e2a4b3ec0081f29eceff5c64ef10ac1ed\\\"}]\"}" ],
-        [ "u", "https://stablenut.umint.cash", ],
-        [ "e", "<zapped-event-id>", "<relay-hint>" ],
-        [ "p", "e9fbced3a42dcf551486650cc752ab354347dd413b307484e4fd1818ab53f991" ], // recipient of nut zap
+        [ "u", "https://stablenut.umint.cash" ],
+        [ "e", "<nutzapped-event-id>", "<relay-hint>" ],
+        [ "p", "e9fbced3a42dcf551486650cc752ab354347dd413b307484e4fd1818ab53f991" ], // recipient of nutzap
     ]
 }
 ```
 
 * `.content` is an optional comment for the nutzap
-* `amount` is a shorthand for the combined amount of all outputs. -- Clients SHOULD validate that the sum of the amounts in the outputs matches.
-* `unit` is the base unit of the amount.
-* `proof` is one ore more proofs p2pk-locked to the pubkey the recipient specified in their `kind:10019` event.
-* `u` is the mint the URL of the mint EXACTLY as specified by the recipient's `kind:10019`.
-* `e` zero or one event that is being nutzapped.
-* `p` exactly one pubkey, specifying the recipient of the nutzap.
-
-WIP: Clients SHOULD embed a DLEQ proof in the nutzap event to make it possible to verify nutzaps without talking to the mint.
+* `.tags`:
+  * `proof` is one or more proofs P2PK-locked to the public key the recipient specified in their `kind:10019` event and including a DLEQ proof.
+  * `u` is the mint the URL of the mint EXACTLY as specified by the recipient's `kind:10019`.
+  * `p` is the Nostr identity public key of nutzap recipient.
+  * `e` is the event that is being nutzapped, if any.
 
 # Sending a nutzap
 
 * The sender fetches the recipient's `kind:10019`.
 * The sender mints/swaps ecash on one of the recipient's listed mints.
-* The sender p2pk locks to the recipient's specified pubkey in their `kind:10019`
+* The sender P2PK-locks to the recipient's specified public key in their `kind:10019`
 
 # Receiving nutzaps
 
-Clients should REQ for nut zaps:
+Clients should REQ for nutzaps:
 * Filtering with `#u` for mints they expect to receive ecash from.
   * this is to prevent even interacting with mints the user hasn't explicitly signaled.
 * Filtering with `since` of the most recent `kind:7376` event the same user has created.
-  * this can be used as a marker of the nut zaps that have already been swaped by the user -- clients might choose to use other kinds of markers, including internal state -- this is just a guidance of one possible approach.
+  * this can be used as a marker of the nutzaps that have already been swaped by the user -- clients might choose to use other kinds of markers, including internal state -- this is just a guidance of one possible approach.
 
-Clients MIGHT choose to use some kind of filtering (e.g. WoT) to ignore spam.
+`{ "kinds": [9321], "#p": ["my-pubkey"], "#u": ["<mint-1>", "<mint-2>"], "since": <latest-created_at-of-kind-7376> }`.
 
-`{ "kinds": [9321], "#p": "my-pubkey", "#u": [ "<mint-1>", "<mint-2>"], "since": <latest-created_at-of-kind-7376> }`.
-
-Upon receiving a new nut zap, the client should swap the tokens into a wallet the user controls, either a [[NIP-60]] wallet, their own LN wallet or anything else.
+Upon receiving a new nutzap, the client should swap the tokens into a wallet the user controls, either a [NIP-60](60.md) wallet, their own LN wallet or anything else.
 
 ## Updating nutzap-redemption history
-When claiming a token the client SHOULD create a `kind:7376` event and `e` tag the original nut zap event. This is to record that this token has already been claimed (and shouldn't be attempted again) and as signaling to the recipient that the ecash has been redeemed.
+When claiming a token the client SHOULD create a `kind:7376` event and `e` tag the original nutzap event. This is to record that this token has already been claimed (and shouldn't be attempted again) and as signaling to the recipient that the ecash has been redeemed.
 
 Multiple `kind:9321` events can be tagged in the same `kind:7376` event.
 
@@ -96,37 +93,29 @@ Multiple `kind:9321` events can be tagged in the same `kind:7376` event.
     "kind": 7376,
     "content": nip44_encrypt([
         [ "direction", "in" ], // in = received, out = sent
-        [ "amount", "1", "sat" ],
-        [ "e", "<7375-event-id>", "relay-hint", "created" ] // new token event that was created
+        [ "amount", "1" ],
+        [ "e", "<7375-event-id>", "<relay-hint>", "created" ] // new token event that was created
     ]),
     "tags": [
-        [ "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)
+        [ "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)
     ]
 }
 ```
 
-Events that redeem a nutzap SHOULD be published to the sender's [[NIP-65]] relays.
+Events that redeem a nutzap SHOULD be published to the sender's [NIP-65](65.md) "read" relays.
 
 ## Verifying a Cashu Zap
-* Clients SHOULD check that the receiving user has issued a `kind:10019` tagging the mint where the cashu has been minted.
-* Clients SHOULD check that the token is locked to the pubkey the user has listed in their `kind:10019`.
+When listing or counting zaps received by any given event, observer clients SHOULD:
+
+* check that the receiving user has issued a `kind:10019` tagging the mint where the cashu has been minted.
+* check that the token is locked to the pubkey the user has listed in their `kind:10019`.
+* look at the `u` tag and check that the token is issued in one of the mints listed in the `kind:10019`.
+* locally verify the DLEQ proof of the tokens being sent.
+
+All these checks can be done offline (as long as the observer has the receiver mints' keyset and their `kind:10019` event), so the process should be reasonably fast.
 
 ## Final Considerations
-
-1. Clients SHOULD guide their users to use NUT-11 (P2PK) compatible-mints in their `kind:10019` event to avoid receiving nut zaps anyone can spend
-
+1. Clients SHOULD guide their users to use NUT-11 (P2PK) and NUT-12 (DLEQ proofs) compatible-mints in their `kind:10019` event to avoid receiving nutzaps anyone can spend.
 2. Clients SHOULD normalize and deduplicate mint URLs as described in NIP-65.
-
-3. A nut zap MUST be sent to a mint the recipient has listed in their `kind:10019` event or to the NIP-65 relays of the recipient, failure to do so may result in the recipient donating the tokens to the mint since the recipient might never see the event.
-
-## Appendix 1: Alternative P2PK pubkey
-Clients might not have access to the user's private key (i.e. NIP-07, NIP-46 signing) and, as such, the private key to sign cashu spends might not be available, which would make spending the P2PK incoming nutzaps impossible.
-
-For this scenarios clients can:
-
-* add a `pubkey` tag to the `kind:10019` (indicating which pubkey senders should P2PK to)
-* store the private key in the `kind:37375` event in the nip44-encrypted `content` field.
-
-This is to avoid depending on NIP-07/46 adaptations to sign cashu payloads.
+3. A nutzap event MUST include proofs in one of the mints the recipient has listed in their `kind:10019` and published to the NIP-65 relays of the recipient, failure to do so may result in the recipient donating the tokens to the mint since the recipient might never see the event.

62.md

@@ -0,0 +1,61 @@
+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. 

64.md

@@ -44,7 +44,7 @@ Clients SHOULD publish PGN notes in ["export format"][pgn_export_format] ("stric
 
 Clients SHOULD check whether the formatting is valid and all moves comply with chess rules.
 
-Clients MAY include additional tags (e.g. like [`"alt"`](https://github.com/nostr-protocol/nips/blob/master/31.md)) in order to represent the note to users of non-supporting clients.
+Clients MAY include additional tags (e.g. like [`"alt"`](31.md)) in order to represent the note to users of non-supporting clients.
 
 ## Relay Behavior
 

66.md

@@ -0,0 +1,250 @@
+# 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.

68.md

@@ -12,7 +12,7 @@ The idea is for this type of event to cater to Nostr clients resembling platform
 
 ## Picture Events
 
-Picture events contain a `title` tag and description in the `.content`. 
+Picture events contain a `title` tag and description in the `.content`.
 
 They may contain multiple images to be displayed as a single post.
 
@@ -81,7 +81,7 @@ They may contain multiple images to be displayed as a single post.
 
 The `imeta` tag `annotate-user` places a user link in the specific position in the image.
 
-Only the following media types are accepted: 
+Only the following media types are accepted:
 - `image/apng`: Animated Portable Network Graphics (APNG)
 - `image/avif`: AV1 Image File Format (AVIF)
 - `image/gif`: Graphics Interchange Format (GIF)
@@ -89,4 +89,4 @@ Only the following media types are accepted:
 - `image/png`: Portable Network Graphics (PNG)
 - `image/webp`: Web Picture format (WEBP)
 
-Picture events might be used with [NIP-71](71.md)'s kind `34236` to display short vertical videos in the same feed.
+Picture events might be used with [NIP-71](71.md)'s kind `22` to display short vertical videos in the same feed.

69.md

@@ -12,7 +12,7 @@ This NIP defines a simple standard for peer-to-peer order events, which enables
 
 ## The event
 
-Events are [addressable events](https://github.com/nostr-protocol/nips/blob/master/01.md#kinds) and use `38383` as event kind, a p2p event look like this:
+Events are [addressable events](01.md#kinds) and use `38383` as event kind, a p2p event look like this:
 
 ```json
 {
@@ -65,7 +65,7 @@ Events are [addressable events](https://github.com/nostr-protocol/nips/blob/mast
 - `name` [Name]: The name of the maker.
 - `g` [Geohash]: The geohash of the operation, it can be useful in a face to face trade.
 - `bond` [Bond]: The bond amount, the bond is a security deposit that both parties must pay.
-- `expiration` < Expiration\>: The expiration date of the order ([NIP-40](https://github.com/nostr-protocol/nips/blob/master/40.md)).
+- `expiration` < Expiration\>: The expiration date of the order ([NIP-40](40.md)).
 - `y` < Platform >: The platform that created the order.
 - `z` < Document >: `order`.
 

71.md

@@ -6,17 +6,19 @@ Video Events
 
 `draft` `optional`
 
-This specification defines video events representing a dedicated post of externally hosted content. These video events are _addressable_ and delete-requestable per [NIP-09](09.md).
+This specification defines _video_ events representing a dedicated post of externally hosted content.
 
-Unlike a `kind 1` event with a video attached, Video Events are meant to contain all additional metadata concerning the subject media and to be surfaced in video-specific clients rather than general micro-blogging clients. The thought is for events of this kind to be referenced in a Netflix, YouTube, or TikTok like nostr client where the video itself is at the center of the experience.
+Unlike a `kind:1` event with a video attached, video events are meant to contain all additional metadata concerning the subject media and to be surfaced in video-specific clients rather than general micro-blogging clients. The thought is for events of this kind to be referenced in a Netflix, YouTube, or TikTok like nostr client where the video itself is at the center of the experience.
 
 ## Video Events
 
-There are two types of video events represented by different kinds: horizontal and vertical video events. This is meant to allow clients to cater to each as the viewing experience for horizontal (landscape) videos is often different than that of vertical (portrait) videos (Stories, Reels, Shorts, etc).
+There are two types of video events represented by different kinds: _normal_ and _short_ video events. This is meant to allow clients to cater to each as the viewing experience for longer, mostly horizontal (landscape) videos is often different than that of short-form, mostly vertical (portrait), videos ("stories", "reels", "shorts" etc).
+
+Nothing except cavaliership and common sense prevents a _short_ video from being long, or a _normal_ video from being vertical, and that may or may not be justified, it's mostly a stylistic qualitative difference, not a question of actual raw size.
 
 #### Format
 
-The format uses an _addressable event_ kind `34235` for horizontal videos and `34236` for vertical videos.
+The format uses a _regular event_ kind `21` for _normal_ videos and `22` for _short_ videos.
 
 The `.content` of these events is a summary or description on the video content.
 
@@ -27,7 +29,7 @@ Each `imeta` tag can be used to specify a variant of the video by the `dim` & `m
 Example:
 ```json
 [
-  ["imeta", 
+  ["imeta",
     "dim 1920x1080",
     "url https://myvideo.com/1080/12345.mp4",
     "x 3093509d1e0bc604ff60cb9286f4cd7c781553bc8991937befaacfdc28ec5cdc",
@@ -38,7 +40,7 @@ Example:
     "fallback https://andanotherserver.com/1080/12345.mp4",
     "service nip96",
   ],
-  ["imeta", 
+  ["imeta",
     "dim 1280x720",
     "url https://myvideo.com/720/12345.mp4",
     "x e1d4f808dae475ed32fb23ce52ef8ac82e3cc760702fca10d62d382d2da3697d",
@@ -49,7 +51,7 @@ Example:
     "fallback https://andanotherserver.com/720/12345.mp4",
     "service nip96",
   ],
-  ["imeta", 
+  ["imeta",
     "dim 1280x720",
     "url https://myvideo.com/720/12345.m3u8",
     "x 704e720af2697f5d6a198ad377789d462054b6e8d790f8a3903afbc1e044014f",
@@ -86,17 +88,15 @@ Additionally `service nip96` may be included to allow clients to search the auth
   "id": <32-bytes lowercase hex-encoded SHA-256 of the the serialized event data>,
   "pubkey": <32-bytes lowercase hex-encoded public key of the event creator>,
   "created_at": <Unix timestamp in seconds>,
-  "kind": 34235 | 34236,
+  "kind": 21 | 22,
   "content": "<summary / description of video>",
   "tags": [
-    ["d", "<UUID>"],
-
     ["title", "<title of video>"],
     ["published_at", "<unix timestamp>"],
     ["alt", <description>],
 
-    // Video Data
-    ["imeta", 
+    // video Data
+    ["imeta",
       "dim 1920x1080",
       "url https://myvideo.com/1080/12345.mp4",
       "x 3093509d1e0bc604ff60cb9286f4cd7c781553bc8991937befaacfdc28ec5cdc",
@@ -113,17 +113,17 @@ Additionally `service nip96` may be included to allow clients to search the auth
     ["content-warning", "<reason>"],
     ["segment", <start>, <end>, "<title>", "<thumbnail URL>"],
 
-    // Participants
+    // participants
     ["p", "<32-bytes hex of a pubkey>", "<optional recommended relay URL>"],
     ["p", "<32-bytes hex of a pubkey>", "<optional recommended relay URL>"],
 
-    // Hashtags
+    // hashtags
     ["t", "<tag>"],
     ["t", "<tag>"],
 
-    // Reference links
+    // reference links
     ["r", "<url>"],
     ["r", "<url>"]
   ]
 }
-```
+```

73.md

@@ -9,26 +9,37 @@ 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>`" | "`<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" |
+| 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"                    |
 
 ---
 
 ## 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
@@ -56,5 +67,3 @@ 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]`
-
-

90.md

@@ -70,7 +70,7 @@ All tags are optional.
 
 ## Encrypted Params
 
-If the user wants to keep the input parameters a secret, they can encrypt the `i` and `param` tags with the service provider's 'p' tag and add it to the content field. Add a tag `encrypted` as tags. Encryption for private tags will use [NIP-04 - Encrypted Direct Message encryption](https://github.com/nostr-protocol/nips/blob/master/04.md), using the user's private and service provider's public key for the shared secret
+If the user wants to keep the input parameters a secret, they can encrypt the `i` and `param` tags with the service provider's 'p' tag and add it to the content field. Add a tag `encrypted` as tags. Encryption for private tags will use [NIP-04 - Encrypted Direct Message encryption](04.md), using the user's private and service provider's public key for the shared secret
 
 ```json
 [

92.md

@@ -6,10 +6,10 @@ Media Attachments
 
 Media attachments (images, videos, and other files) may be added to events by including a URL in the event content, along with a matching `imeta` tag.
 
-`imeta` ("inline metadata") tags add information about media URLs in the event's content. Each `imeta` tag SHOULD match a URL in the event content. Clients may replace imeta URLs with rich previews.
+`imeta` ("inline metadata") tags MAY add information about media URLs in the event's content. Each `imeta` tag SHOULD match a URL in the event content. Clients MAY replace imeta URLs with rich previews.
 
 The `imeta` tag is variadic, and each entry is a space-delimited key/value pair.
-Each `imeta` tag MUST have a `url`, and at least one other field. `imeta` may include
+Each `imeta` tag MUST have a `url`, and at least one other field. `imeta` MAY include
 any field specified by [NIP 94](./94.md). There SHOULD be only one `imeta` tag per URL.
 
 ## Example

BREAKING.md

@@ -5,6 +5,9 @@ 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) |
 | 2024-11-12  | [926a51e7](https://github.com/nostr-protocol/nips/commit/926a51e7) | [46](46.md) | NIP-05 login was removed |

README.md

@@ -77,8 +77,10 @@ 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)
@@ -119,14 +121,22 @@ 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)                            |
@@ -166,21 +176,23 @@ 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)                            |
+| `10002`       | Relay List Metadata             | [65](65.md), [51](51.md)               |
 | `10003`       | Bookmark list                   | [51](51.md)                            |
 | `10004`       | Communities list                | [51](51.md)                            |
 | `10005`       | Public chats list               | [51](51.md)                            |
 | `10006`       | Blocked relays list             | [51](51.md)                            |
 | `10007`       | Search relays list              | [51](51.md)                            |
 | `10009`       | User groups                     | [51](51.md), [29](29.md)               |
-| `10013`       | Draft relays                    | [37](37.md)                            |
+| `10013`       | Private event relay list        | [37](37.md)                            |
 | `10015`       | Interests list                  | [51](51.md)                            |
 | `10019`       | Nutzap Mint Recommendation      | [61](61.md)                            |
 | `10030`       | User emoji list                 | [51](51.md)                            |
 | `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]                 |
 | `22242`       | Client Authentication           | [42](42.md)                            |
 | `23194`       | Wallet Request                  | [47](47.md)                            |
@@ -205,10 +217,11 @@ 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`       | Modular Article Header          | [NKBIP-01]                             |
-| `30041`       | Modular Article Content         | [NKBIP-01]                             |
+| `30040`       | Curated Publication Index       | [NKBIP-01]                             |
+| `30041`       | Curated Publication 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)                            |
@@ -227,12 +240,9 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `31924`       | Calendar                        | [52](52.md)                            |
 | `31925`       | Calendar Event RSVP             | [52](52.md)                            |
 | `31989`       | Handler recommendation          | [89](89.md)                            |
-| `31990`       | Handler information             | [89](89.md)                            |
-| `32267`       | Software Application            |                                        |
-| `34235`       | Video Event                     | [71](71.md)                            |
-| `34236`       | Short-form Portrait Video Event | [71](71.md)                            |
+| `31990`       | Handler information             | [89](89.md)                            |                         |
+| `32267`       | Software Application            |                                        |                        |
 | `34550`       | Community Definition            | [72](72.md)                            |
-| `37375`       | Cashu Wallet Event              | [60](60.md)                            |
 | `38383`       | Peer-to-peer Order events       | [69](69.md)                            |
 | `39000-9`     | Group metadata events           | [29](29.md)                            |
 
@@ -242,8 +252,9 @@ 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
-[NKBIP-02]: https://wikistr.com/nkbip-02
+[NKBIP-01]: https://wikistr.com/nkbip-01*fd208ee8c8f283780a9552896e4823cc9dc6bfd442063889577106940fd927c1
+[NKBIP-02]: https://wikistr.com/nkbip-02*fd208ee8c8f283780a9552896e4823cc9dc6bfd442063889577106940fd927c1
+[NKBIP-03]: https://wikistr.com/nkbip-03*fd208ee8c8f283780a9552896e4823cc9dc6bfd442063889577106940fd927c1
 [blossom]: https://github.com/hzrd149/blossom
 [Tidal-nostr]: https://wikistr.com/tidal-nostr
 
@@ -298,7 +309,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`               | infohash                             | --                              | [35](35.md)                                        |
+| `x`               | hash                                 | --                              | [35](35.md), [56](56.md)                           |
 | `y`               | platform                             | --                              | [69](69.md)                                        |
 | `z`               | order number                         | --                              | [69](69.md)                                        |
 | `-`               | --                                   | --                              | [70](70.md)                                        |
@@ -373,4 +384,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>