change number

reformat
add note about timing analysis
2025-12-09 08:38:50 +00:00 · 2024-10-21 12:27:00 +01:00 · 2024-10-20 01:05:23 +01:00 · 2024-10-20 01:04:11 +01:00 · 2024-10-20 00:57:11 +01:00 · 2024-10-18 14:20:59 -07:00
55 changed files with 1007 additions and 463 deletions
--- a/01.md
+++ b/01.md
@@ -77,11 +77,11 @@ This NIP defines 3 standard tags that can be used across all event kinds with th

 - The `e` tag, used to refer to an event: `["e", <32-bytes lowercase hex of the id of another event>, <recommended relay URL, optional>]`
 - The `p` tag, used to refer to another user: `["p", <32-bytes lowercase hex of a pubkey>, <recommended relay URL, optional>]`
- The `a` tag, used to refer to a (maybe parameterized) replaceable event
-    - for a parameterized replaceable event: `["a", <kind integer>:<32-bytes lowercase hex of a pubkey>:<d tag value>, <recommended relay URL, optional>]`
-    - for a non-parameterized replaceable event: `["a", <kind integer>:<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>]`

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

 ### Kinds

@@ -95,7 +95,7 @@ And also a convention for kind ranges that allow for easier experimentation and
 - for kind `n` such that `1000 <= n < 10000 || 4 <= n < 45 || n == 1 || n == 2`, events are **regular**, which means they're all expected to be stored by relays.
 - for kind `n` such that `10000 <= n < 20000 || n == 0 || n == 3`, events are **replaceable**, which means that, for each combination of `pubkey` and `kind`, only the latest event MUST be stored by relays, older versions MAY be discarded.
 - for kind `n` such that `20000 <= n < 30000`, events are **ephemeral**, which means they are not expected to be stored by relays.
- for kind `n` such that `30000 <= n < 40000`, events are **parameterized replaceable**, which means that, for each combination of `pubkey`, `kind` and the `d` tag's first value, only the latest event MUST be stored by relays, older versions MAY be discarded.
+- for kind `n` such that `30000 <= n < 40000`, events are **addressable** by their `kind`, `pubkey` and `d` tag value -- which means that, for each combination of `kind`, `pubkey` and the `d` tag value, only the latest event MUST be stored by relays, older versions MAY be discarded.

 In case of replaceable events with the same timestamp, the event with the lowest id (first in lexical order) should be retained, and the other discarded.

@@ -131,7 +131,7 @@ Clients can send 3 types of messages, which must be JSON arrays, according to th
 }
 ```

-Upon receiving a `REQ` message, the relay SHOULD query its internal database and return events that match the filter, then store that filter and send again all future events it receives to that same websocket until the websocket is closed. The `CLOSE` event is received with the same `<subscription_id>` or a new `REQ` is sent using the same `<subscription_id>`, in which case relay MUST overwrite the previous subscription.
+Upon receiving a `REQ` message, the relay SHOULD return events that match the filter. Any new events it receives SHOULD be sent to that same websocket until the connection is closed, a `CLOSE` event is received with the same `<subscription_id>`, or a new `REQ` is sent using the same `<subscription_id>` (in which case a new subscription is created, replacing the old one).

 Filter attributes containing lists (`ids`, `authors`, `kinds` and tag filters like `#e`) are JSON arrays with one or more values. At least one of the arrays' values must match the relevant field in an event for the condition to be considered a match. For scalar event attributes such as `authors` and `kind`, the attribute from the event must be contained in the filter list. In the case of tag attributes such as `#e`, for which an event may have multiple values, the event and filter condition values must have at least one item in common.

@@ -169,7 +169,6 @@ This NIP defines no rules for how `NOTICE` messages should be sent or treated.
  * `["OK", "b1a649ebe8...", false, "pow: difficulty 26 is less than 30"]`
  * `["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", "duplicate: sub1 already opened"]`
  * `["CLOSED", "sub1", "unsupported: filter contains unknown elements"]`
  * `["CLOSED", "sub1", "error: could not connect to the database"]`
  * `["CLOSED", "sub1", "error: shutting down idle subscription"]`
--- a/02.md
+++ b/02.md
@@ -14,7 +14,7 @@ The `.content` is not used.

 For example:

-```json
+```jsonc
 {
  "kind": 3,
  "tags": [
@@ -23,7 +23,7 @@ For example:
    ["p", "612ae..e610f", "ws://carolrelay.com/ws", "carol"]
  ],
  "content": "",
-  ...other fields
+  // other fields...
 }
 ```

--- a/05.md
+++ b/05.md
@@ -16,12 +16,12 @@ The result should be a JSON document object with a key `"names"` that should the

 If a client sees an event like this:

-```json
+```jsonc
 {
  "pubkey": "b0635d6a9851d3aed0cd6c495b282167acf761729078d975fc341b22650b07b9",
  "kind": 0,
  "content": "{\"name\": \"bob\", \"nip05\": \"bob@example.com\"}"
-  ...
+  // other fields...
 }
 ```

@@ -58,6 +58,15 @@ A client may implement support for finding users' public keys from _internet ide

 ## Notes

+### Identification, not verification
+
+The NIP-05 is not intended to _verify_ a user, but only to _identify_ them, for the purpose of facilitating the exchange of a contact or their search.  
+Exceptions are people who own (e.g., a company) or are connected (e.g., a project) to a well-known domain, who can exploit NIP-05 as an attestation of their relationship with it, and thus to the organization behind it, thereby gaining an element of trust.
+
+### User discovery implementation suggestion
+
+A client can use this to allow users to search other profiles. If a client has a search box or something like that, a user may be able to type "bob@example.com" there and the client would recognize that and do the proper queries to obtain a pubkey and suggest that to the user.
+
 ### Clients must always follow public keys, not NIP-05 addresses

 For example, if after finding that `bob@bob.com` has the public key `abc...def`, the user clicks a button to follow that profile, the client must keep a primary reference to `abc...def`, not `bob@bob.com`. If, for any reason, the address `https://bob.com/.well-known/nostr.json?name=bob` starts returning the public key `1d2...e3f` at any time in the future, the client must not replace `abc...def` in his list of followed profiles for the user (but it should stop displaying "bob@bob.com" for that user, as that will have become an invalid `"nip05"` property).
@@ -66,10 +75,6 @@ For example, if after finding that `bob@bob.com` has the public key `abc...def`,

 Keys must be returned in hex format. Keys in NIP-19 `npub` format are only meant to be used for display in client UIs, not in this NIP.

-### User Discovery implementation suggestion
-
-A client can also use this to allow users to search other profiles. If a client has a search box or something like that, a user may be able to type "bob@example.com" there and the client would recognize that and do the proper queries to obtain a pubkey and suggest that to the user.
-
 ### Showing just the domain as an identifier

 Clients may treat the identifier `_@domain` as the "root" identifier, and choose to display it as just the `<domain>`. For example, if Bob owns `bob.com`, he may not want an identifier like `bob@bob.com` as that is redundant. Instead, Bob can use the identifier `_@bob.com` and expect Nostr clients to show and treat that as just `bob.com` for all purposes.
--- a/09.md
+++ b/09.md
@@ -1,18 +1,18 @@
 NIP-09
 ======

-Event Deletion
--------------
+Event Deletion Request
+----------------------

 `draft` `optional`

-A special event with kind `5`, meaning "deletion" is defined as having a list of one or more `e` or `a` tags, each referencing an event the author is requesting to be deleted. Deletion requests SHOULD include a `k` tag for the kind of each event being deleted.
+A special event with kind `5`, meaning "deletion request" is defined as having a list of one or more `e` or `a` tags, each referencing an event the author is requesting to be deleted. Deletion requests SHOULD include a `k` tag for the kind of each event being requested for deletion.

-The event's `content` field MAY contain a text note describing the reason for the deletion.
+The event's `content` field MAY contain a text note describing the reason for the deletion request.

 For example:

-```
+```jsonc
 {
  "kind": 5,
  "pubkey": <32-bytes hex-encoded public key of the event creator>,
@@ -24,28 +24,30 @@ For example:
    ["k", "30023"]
  ],
  "content": "these posts were published by accident",
-  ...other fields
+  // other fields...
 }
 ```

-Relays SHOULD delete or stop publishing any referenced events that have an identical `pubkey` as the deletion request.  Clients SHOULD hide or otherwise indicate a deletion status for referenced events.
+Relays SHOULD delete or stop publishing any referenced events that have an identical `pubkey` as the deletion request.  Clients SHOULD hide or otherwise indicate a deletion request status for referenced events.

-Relays SHOULD continue to publish/share the deletion events indefinitely, as clients may already have the event that's intended to be deleted. Additionally, clients SHOULD broadcast deletion events to other relays which don't have it.
+Relays SHOULD continue to publish/share the deletion request events indefinitely, as clients may already have the event that's intended to be deleted. Additionally, clients SHOULD broadcast deletion request events to other relays which don't have it.

-When an `a` tag is used, relays SHOULD delete all versions of the replaceable event up to the `created_at` timestamp of the deletion event.
+When an `a` tag is used, relays SHOULD delete all versions of the replaceable event up to the `created_at` timestamp of the deletion request event.

 ## Client Usage

-Clients MAY choose to fully hide any events that are referenced by valid deletion events.  This includes text notes, direct messages, or other yet-to-be defined event kinds.  Alternatively, they MAY show the event along with an icon or other indication that the author has "disowned" the event.  The `content` field MAY also be used to replace the deleted events' own content, although a user interface should clearly indicate that this is a deletion reason, not the original content.
+Clients MAY choose to fully hide any events that are referenced by valid deletion request events.  This includes text notes, direct messages, or other yet-to-be defined event kinds.  Alternatively, they MAY show the event along with an icon or other indication that the author has "disowned" the event.  The `content` field MAY also be used to replace the deleted events' own content, although a user interface should clearly indicate that this is a deletion request reason, not the original content.

 A client MUST validate that each event `pubkey` referenced in the `e` tag of the deletion request is identical to the deletion request `pubkey`, before hiding or deleting any event.  Relays can not, in general, perform this validation and should not be treated as authoritative.

-Clients display the deletion event itself in any way they choose, e.g., not at all, or with a prominent notice.
+Clients display the deletion request event itself in any way they choose, e.g., not at all, or with a prominent notice.
+
+Clients MAY choose to inform the user that their request for deletion does not guarantee deletion because it is impossible to delete events from all relays and clients.

 ## Relay Usage

-Relays MAY validate that a deletion event only references events that have the same `pubkey` as the deletion itself, however this is not required since relays may not have knowledge of all referenced events.
+Relays MAY validate that a deletion request event only references events that have the same `pubkey` as the deletion request itself, however this is not required since relays may not have knowledge of all referenced events.

-## Deleting a Deletion
+## Deletion Request of a Deletion Request

-Publishing a deletion event against a deletion has no effect.  Clients and relays are not obliged to support "undelete" functionality.
+Publishing a deletion request event against a deletion request has no effect.  Clients and relays are not obliged to support "unrequest deletion" functionality.
--- a/10.md
+++ b/10.md
@@ -2,8 +2,8 @@ NIP-10
 ======


-On "e" and "p" tags in Text Events (kind 1).
--------------------------------------------
+On "e" and "p" tags in Text Events (kind 1)
+-------------------------------------------

 `draft` `optional`

@@ -43,7 +43,7 @@ They are citing from this event.  `root-id` and `reply-id` are as above.
 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 `""`.
+ * `<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"`.
 * `<pubkey>` is optional, SHOULD be the pubkey of the author of the referenced event

--- a/11.md
+++ b/11.md
@@ -2,7 +2,7 @@ NIP-11
 ======

 Relay Information Document
---------------------------
+--------------------------

 `draft` `optional`

@@ -66,7 +66,7 @@ These are limitations imposed by the relay on clients. Your client
 should expect that requests which exceed these *practical* limitations
 are rejected or fail immediately.

-```json
+```jsonc
 {
  "limitation": {
    "max_message_length": 16384,
@@ -83,7 +83,7 @@ are rejected or fail immediately.
    "created_at_lower_limit": 31536000,
    "created_at_upper_limit": 3
  },
-  ...
+  // other fields...
 }
 ```

@@ -146,14 +146,15 @@ Retention times are given in seconds, with `null` indicating infinity.
 If zero is provided, this means the event will not be stored at
 all, and preferably an error will be provided when those are received.

-```json
+```jsonc
 {
  "retention": [
    {"kinds": [0, 1, [5, 7], [40, 49]], "time": 3600},
    {"kinds": [[40000, 49999]], "time": 100},
    {"kinds": [[30000, 39999]], "count": 1000},
    {"time": 3600, "count": 10000}
-  ]
+  ],
+  // other fields...
 }
 ```

@@ -172,7 +173,7 @@ There is no need to specify retention times for _ephemeral events_ since they ar
 ### Content Limitations

 Some relays may be governed by the arbitrary laws of a nation state. This
-may limit what content can be stored in cleartext on those relays. All
+may limit what content can be stored in clear-text on those relays. All
 clients are encouraged to use encryption to work around this limitation.

 It is not possible to describe the limitations of each country's laws
@@ -183,13 +184,13 @@ countries' laws might end up being enforced on them, and then
 indirectly on their users' content.

 Users should be able to avoid relays in countries they don't like,
-and/or select relays in more favourable zones. Exposing this
+and/or select relays in more favorable zones. Exposing this
 flexibility is up to the client software.

-```json
+```jsonc
 {
  "relay_countries": [ "CA", "US" ],
-  ...
+  // other fields...
 }
 ```

@@ -208,12 +209,12 @@ local community. This would encourage users to follow the global
 feed on that relay, in addition to their usual individual follows.
 To support this goal, relays MAY specify some of the following values.

-```json
+```jsonc
 {
  "language_tags": ["en", "en-419"],
  "tags": ["sfw-only", "bitcoin-only", "anime"],
  "posting_policy": "https://example.com/posting-policy.html",
-  ...
+  // other fields...
 }
 ```

@@ -260,10 +261,10 @@ Relays that require payments may want to expose their fee schedules.

 A URL pointing to an image to be used as an icon for the relay. Recommended to be squared in shape.

-```json
+```jsonc
 {
  "icon": "https://nostr.build/i/53866b44135a27d624e99c6165cabd76ac8f72797209700acb189fce75021f47.jpg",
-  ...
+  // other fields...
 }
 ```

@@ -271,9 +272,11 @@ A URL pointing to an image to be used as an icon for the relay. Recommended to b

 As of 2 May 2023 the following command provided these results:

+```bash
+$ curl -H "Accept: application/nostr+json" https://eden.nostr.land | jq
 ```
-~> curl -H "Accept: application/nostr+json" https://eden.nostr.land | jq

+```json
 {
  "description": "nostr.land family of relays (us-or-01)",
  "name": "nostr.land",
@@ -312,3 +315,4 @@ As of 2 May 2023 the following command provided these results:
    ]
  },
 }
+```
--- a/13.md
+++ b/13.md
@@ -48,37 +48,30 @@ Validating
 Here is some reference C code for calculating the difficulty (aka number of leading zero bits) in a nostr event id:

 ```c
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+int zero_bits(unsigned char b)
+{
+        int n = 0;

-int countLeadingZeroes(const char *hex) {
-    int count = 0;
+        if (b == 0)
+                return 8;

-    for (int i = 0; i < strlen(hex); i++) {
-        int nibble = (int)strtol((char[]){hex[i], '\0'}, NULL, 16);
-        if (nibble == 0) {
-            count += 4;
-        } else {
-            count += __builtin_clz(nibble) - 28;
-            break;
-        }
-    }
+        while (b >>= 1)
+                n++;

-    return count;
+        return 7-n;
 }

-int main(int argc, char *argv[]) {
-    if (argc != 2) {
-        fprintf(stderr, "Usage: %s <hex_string>\n", argv[0]);
-        return 1;
-    }
-
-    const char *hex_string = argv[1];
-    int result = countLeadingZeroes(hex_string);
-    printf("Leading zeroes in hex string %s: %d\n", hex_string, result);
-
-    return 0;
+/* find the number of leading zero bits in a hash */
+int count_leading_zero_bits(unsigned char *hash)
+{
+        int bits, total, i;
+        for (i = 0, total = 0; i < 32; i++) {
+                bits = zero_bits(hash[i]);
+                total += bits;
+                if (bits != 8)
+                        break;
+        }
+        return total;
 }
 ```

@@ -103,16 +96,6 @@ function countLeadingZeroes(hex) {
 }
 ```

-Querying relays for PoW notes
-----------------------------
-
-If relays allow searching on prefixes, you can use this as a way to filter notes of a certain difficulty:
-
-```
-$ echo '["REQ", "subid", {"ids": ["000000000"]}]'  | websocat wss://some-relay.com | jq -c '.[2]'
-{"id":"000000000121637feeb68a06c8fa7abd25774bdedfa9b6ef648386fb3b70c387", ...}
-```
-
 Delegated Proof of Work
 -----------------------

--- a/15.md
+++ b/15.md
@@ -73,10 +73,10 @@ Fields that are not self-explanatory:

 **Event Tags**

-```json
+```jsonc
 {
  "tags": [["d", <string, id of stall]],
-  ...
+  // other fields...
 }
 ```
 - the `d` tag is required, its value MUST be the same as the stall `id`.
@@ -124,12 +124,12 @@ Fields that are not self-explanatory:

 **Event Tags**

-```json
+```jsonc
  "tags": [
    ["d", <string, id of product],
    ["t", <string (optional), product category],
    ["t", <string (optional), product category],
-    ...
+    // other fields...
  ],
  ...
 ```
@@ -158,7 +158,7 @@ The below JSON goes in content of [NIP-04](04.md).
  "type": 0,
  "name": <string (optional), ???>,
  "address": <string (optional), for physical goods an address should be provided>,
-  "message": "<string (optional), message for merchant>,
+  "message": <string (optional), message for merchant>,
  "contact": {
    "nostr": <32-bytes hex of a pubkey>,
    "phone": <string (optional), if the customer wants to be contacted by phone>,
@@ -237,7 +237,7 @@ Create a customized user experience using the `naddr` from [NIP-19](19.md#sharea

 **Event Content**

-```json
+```jsonc
 {
  "name": <string (optional), market name>,
  "about": <string (optional), market description>,
@@ -248,7 +248,7 @@ Create a customized user experience using the `naddr` from [NIP-19](19.md#sharea
    "darkMode": <bool, true/false>
  },
  "merchants": [array of pubkeys (optional)],
-  ...
+  // other fields...
 }
 ```

@@ -290,17 +290,18 @@ This event leverages naddr to enable comprehensive customization and sharing of

 ### Event `1021`: Bid

-```json
+```jsonc
 {
    "content": <int, amount of sats>,
    "tags": [["e", <event ID of the auction to bid on>]],
+    // other fields...
 }
 ```

 Bids are simply events of kind `1021` with a `content` field specifying the amount, in the currency of the auction. Bids must reference an auction.

 > [!NOTE]
-> Auctions can be edited as many times as desired (they are "parameterized replaceable events") by the author - even after the start_date, but they cannot be edited after they have received the first bid! This is enforced by the fact that bids reference the event ID of the auction (rather than the product UUID), which changes with every new version of the auctioned product. So a bid is always attached to one "version". Editing the auction after a bid would result in the new product losing the bid!
+> Auctions can be edited as many times as desired (they are "addressable events") by the author - even after the start_date, but they cannot be edited after they have received the first bid! This is enforced by the fact that bids reference the event ID of the auction (rather than the product UUID), which changes with every new version of the auctioned product. So a bid is always attached to one "version". Editing the auction after a bid would result in the new product losing the bid!

 ### Event `1022`: Bid confirmation

@@ -335,4 +336,4 @@ Customer support is handled over whatever communication method was specified. If

 ## Additional

-Standard data models can be found <a href="https://raw.githubusercontent.com/lnbits/nostrmarket/main/models.py">here</a>
+Standard data models can be found [here](https://raw.githubusercontent.com/lnbits/nostrmarket/main/models.py)
--- a/17.md
+++ b/17.md
@@ -12,18 +12,18 @@ This NIP defines an encrypted direct messaging scheme using [NIP-44](44.md) encr

 Kind `14` is a chat message. `p` tags identify one or more receivers of the message.

-```js
+```jsonc
 {
  "id": "<usual hash>",
   "pubkey": "<sender-pubkey>",
-  "created_at": now(),
+  "created_at": "<current-time>",
   "kind": 14,
   "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>"],
-    ...
+    // rest of tags...
   ],
   "content": "<message-in-plain-text>",
 }
@@ -86,7 +86,7 @@ Clients CAN offer disappearing messages by setting an `expiration` tag in the gi

 Kind `10050` indicates the user's preferred relays to receive DMs. The event MUST include a list of `relay` tags with relay URIs.

-```js
+```jsonc
 {
  "kind": 10050,
  "tags": [
@@ -94,7 +94,7 @@ Kind `10050` indicates the user's preferred relays to receive DMs. The event MUS
    ["relay", "wss://myrelay.nostr1.com"],
  ],
  "content": "",
-  //...other fields
+  // other fields...
 }
 ```

@@ -102,7 +102,7 @@ Clients SHOULD publish kind `14` events to the `10050`-listed relays. If that is

 ## Relays

-It's advisable that relays do not serve `kind:14` to clients other than the ones tagged in them.
+It's advisable that relays do not serve `kind:1059` to clients other than the ones tagged in them.

 It's advisable that users choose relays that conform to these practices.

--- a/18.md
+++ b/18.md
@@ -25,6 +25,14 @@ quote reposted. The `q` tag ensures quote reposts are not pulled and included
 as replies in threads. It also allows you to easily pull and count all of the
 quotes for a post.

+`q` tags should follow the same conventions as NIP 10 `e` tags, with the exception
+of the `mark` argument.
+
+`["q", <event-id>, <relay-url>, <pubkey>]`
+
+Quote reposts MUST include the [NIP-21](21.md) `nevent`, `note`, or `naddr` of the
+event in the content.
+
 ## Generic Reposts

 Since `kind 6` reposts are reserved for `kind 1` contents, we use `kind 16`
--- a/19.md
+++ b/19.md
@@ -43,7 +43,7 @@ These possible standardized `TLV` types are indicated here:
  - depends on the bech32 prefix:
    - for `nprofile` it will be the 32 bytes of the profile public key
    - for `nevent` it will be the 32 bytes of the event id
-    - for `naddr`, it is the identifier (the `"d"` tag) of the event being referenced. For non-parameterized replaceable events, use an empty string.
+    - for `naddr`, it is the identifier (the `"d"` tag) of the event being referenced. For normal replaceable events use an empty string.
 - `1`: `relay`
  - for `nprofile`, `nevent` and `naddr`, _optionally_, a relay in which the entity (profile or event) is more likely to be found, encoded as ascii
  - this may be included multiple times
--- a/23.md
+++ b/23.md
@@ -6,7 +6,7 @@ Long-form Content

 `draft` `optional`

-This NIP defines `kind:30023` (a _parameterized replaceable event_) for long-form text content, generally referred to as "articles" or "blog posts". `kind:30024` has the same structure as `kind:30023` and is used to save long form drafts.
+This NIP defines `kind:30023` (an _addressable event_) for long-form text content, generally referred to as "articles" or "blog posts". `kind:30024` has the same structure as `kind:30023` and is used to save long form drafts.

 "Social" clients that deal primarily with `kind:1` notes should not be expected to implement this NIP.

@@ -20,7 +20,7 @@ The `.content` of these events should be a string text in Markdown syntax. To ma

 ### Metadata

-For the date of the last update the `.created_at` field should be used, for "tags"/"hashtags" (i.e. topics about which the event might be of relevance) the `t` tag should be used, as per NIP-12.
+For the date of the last update the `.created_at` field should be used, for "tags"/"hashtags" (i.e. topics about which the event might be of relevance) the `t` tag should be used.

 Other metadata fields can be added as tags to the event as necessary. Here we standardize 4 that may be useful, although they remain strictly optional:

@@ -31,7 +31,7 @@ Other metadata fields can be added as tags to the event as necessary. Here we st

 ### Editability

-These articles are meant to be editable, so they should make use of the parameterized replaceability feature and include a `d` tag with an identifier for the article. Clients should take care to only publish and read these events from relays that implement that. If they don't do that they should also take care to hide old versions of the same article they may receive.
+These articles are meant to be editable, so they should include a `d` tag with an identifier for the article. Clients should take care to only publish and read these events from relays that implement that. If they don't do that they should also take care to hide old versions of the same article they may receive.

 ### Linking

--- a/24.md
+++ b/24.md
@@ -39,5 +39,7 @@ tags

 These tags may be present in multiple event kinds. Whenever a different meaning is not specified by some more specific NIP, they have the following meanings:

-  - `r`: a web URL the event is referring to in some way
-  - `title`: name of [NIP-51](51.md) sets, [NIP-52](52.md) calendar event, [NIP-53](53.md) live event or [NIP-99](99.md) listing
+  - `r`: a web URL the event is referring to in some way.
+  - `i`: an external id the event is referring to in some way - see [NIP-73](73.md).
+  - `title`: name of [NIP-51](51.md) sets, [NIP-52](52.md) calendar event, [NIP-53](53.md) live event or [NIP-99](99.md) listing.
+  - `t`: a hashtag. The value MUST be a lowercase string.
--- a/25.md
+++ b/25.md
@@ -52,6 +52,26 @@ func make_like_event(pubkey: String, privkey: String, liked: NostrEvent) -> Nost
 }
 ```

+Reactions to a website
+---------------------
+
+If the target of the reaction is a website, the reaction MUST be a `kind 17` event and MUST include an `r` tag with the website's URL.
+
+```jsonc
+{
+  "kind": 17,
+  "content": "⭐",
+  "tags": [
+    ["r", "https://example.com/"]
+  ],
+  // other fields...
+}
+```
+
+URLs SHOULD be [normalized](https://datatracker.ietf.org/doc/html/rfc3986#section-6), so that reactions to the same website are not omitted from queries.
+A fragment MAY be attached to the URL, to react to a section of the page.
+It should be noted that a URL with a fragment is not considered to be the same URL as the original.
+
 Custom Emoji Reaction
 ---------------------

@@ -59,14 +79,14 @@ The client may specify a custom emoji ([NIP-30](30.md)) `:shortcode:` in the
 reaction content. The client should refer to the emoji tag and render the
 content as an emoji if shortcode is specified.

-```json
+```jsonc
 {
  "kind": 7,
  "content": ":soapbox:",
  "tags": [
    ["emoji", "soapbox", "https://gleasonator.com/emoji/Gleasonator/soapbox.png"]
  ],
-  ...other fields
+  // other fields...
 }
 ```

--- a/26.md
+++ b/26.md
@@ -2,7 +2,7 @@ NIP-26
 =======

 Delegated Event Signing
-----
+-----------------------

 `draft` `optional`

--- a/28.md
+++ b/28.md
@@ -25,10 +25,10 @@ Create a public chat channel.

 In the channel creation `content` field, Client SHOULD include basic channel metadata (`name`, `about`, `picture` and `relays` as specified in kind 41).

-```json
+```jsonc
 {
  "content": "{\"name\": \"Demo Channel\", \"about\": \"A test channel.\", \"picture\": \"https://placekitten.com/200/200\", \"relays\": [\"wss://nos.lol\", \"wss://nostr.mom\"]}",
-  ...
+ // other fields...
 }
 ```

@@ -52,11 +52,11 @@ Clients MAY add additional metadata fields.

 Clients SHOULD use [NIP-10](10.md) marked "e" tags to recommend a relay.

-```json
+```jsonc
 {
  "content": "{\"name\": \"Updated Demo Channel\", \"about\": \"Updating a test channel.\", \"picture\": \"https://placekitten.com/201/201\", \"relays\": [\"wss://nos.lol\", \"wss://nostr.mom\"]}",
  "tags": [["e", <channel_create_event_id>, <relay-url>]],
-  ...
+  // other fields...
 }
 ```

@@ -71,26 +71,26 @@ Clients SHOULD append [NIP-10](10.md) "p" tags to replies.

 Root message:

-```json
+```jsonc
 {
  "content": <string>,
  "tags": [["e", <kind_40_event_id>, <relay-url>, "root"]],
-  ...
+  // other fields...
 }
 ```

 Reply to another message:

-```json
+```jsonc
 {
  "content": <string>,
  "tags": [
      ["e", <kind_40_event_id>, <relay-url>, "root"],
      ["e", <kind_42_event_id>, <relay-url>, "reply"],
      ["p", <pubkey>, <relay-url>],
-      ...
+      // rest of tags...
  ],
-  ...
+  // other fields...
 }
 ```

@@ -107,11 +107,11 @@ Clients MAY hide event 42s for other users other than the user who sent the even

 (For example, if three users 'hide' an event giving a reason that includes the word 'pornography', a Nostr client that is an iOS app may choose to hide that message for all iOS clients.)

-```json
+```jsonc
 {
  "content": "{\"reason\": \"Dick pic\"}",
  "tags": [["e", <kind_42_event_id>]],
-  ...
+  // other fields...
 }
 ```

@@ -125,11 +125,11 @@ Clients SHOULD hide event 42s shown to a given user, if there is an event 44 fro

 Clients MAY hide event 42s for users other than the user who sent the event 44.

-```json
+```jsonc
 {
  "content": "{\"reason\": \"Posting dick pics\"}",
  "tags": [["p", <pubkey>]],
-  ...
+  // other fields...
 }
 ```

--- a/29.md
+++ b/29.md
@@ -16,7 +16,7 @@ Normally a group will originally belong to one specific relay, but the community

 ## Relay-generated events

-Relays are supposed to generate the events that describe group metadata and group admins. These are parameterized replaceable events signed by the relay keypair directly, with the group _id_ as the `d` tag.
+Relays are supposed to generate the events that describe group metadata and group admins. These are _addressable_ events signed by the relay keypair directly, with the group _id_ as the `d` tag.

 ## Group identifier

@@ -42,14 +42,14 @@ Relays should prevent late publication (messages published now with a timestamp

 This is the basic unit of a "microblog" root text note sent to a group.

-```js
+```jsonc
  "kind": 11,
  "content": "hello my friends lovers of pizza",
  "tags": [
    ["h", "<group-id>"],
-    ["previous", "<event-id-first-chars>", "<event-id-first-chars>", ...]
+    ["previous", "<event-id-first-chars>", "<event-id-first-chars>", /*...*/]
  ]
-  ...
+  // other fields...
 ```

 - *threaded text reply* (`kind:12`)
@@ -63,14 +63,14 @@ This is the basic unit of a "microblog" reply note sent to a group. It's the sam

 This is the basic unit of a _chat message_ sent to a group.

-```js
+```jsonc
  "kind": 9,
  "content": "hello my friends lovers of pizza",
  "tags": [
    ["h", "<group-id>"],
-    ["previous", "<event-id-first-chars>", "<event-id-first-chars>", ...]
+    ["previous", "<event-id-first-chars>", "<event-id-first-chars>", /*...*/]
  ]
-  ...
+  // other fields...
 ```

 - *chat message threaded reply* (`kind:10`)
@@ -83,7 +83,7 @@ Similar to `kind:12`, this is the basic unit of a chat message sent to a group.

 Any user can send one of these events to the relay in order to be automatically or manually added to the group. If the group is `open` the relay will automatically issue a `kind:9000` in response adding this user. Otherwise group admins may choose to query for these requests and act upon them.

-```js
+```json
 {
  "kind": 9021,
  "content": "optional reason",
@@ -93,17 +93,31 @@ Any user can send one of these events to the relay in order to be automatically
 }
 ```

+- *leave request* (`kind:9022`)
+
+Any user can send one of these events to the relay in order to be automatically removed from the group. The relay will automatically issue a `kind:9001` in response removing this user.
+
+```json
+{
+  "kind": 9022,
+  "content": "optional reason",
+  "tags": [
+    ["h", "<group-id>"]
+  ]
+}
+```
+
 - *moderation events* (`kinds:9000-9020`) (optional)

 Clients can send these events to a relay in order to accomplish a moderation action. Relays must check if the pubkey sending the event is capable of performing the given action. The relay may discard the event after taking action or keep it as a moderation log.

-```js
+```json
 {
  "kind": 90xx,
  "content": "optional reason",
  "tags": [
    ["h", "<group-id>"],
-    ["previous", ...]
+    ["previous", /*...*/]
  ]
 }
 ```
@@ -120,6 +134,7 @@ Each moderation action uses a different kind and requires different arguments, w
 | 9005 | `delete-event`      | `e` (id hex)                              |
 | 9006 | `edit-group-status` | `public` or `private`, `open` or `closed` |
 | 9007 | `create-group`      |                                           |
+| 9008 | `delete-group`      |                                           |

 - *group metadata* (`kind:39000`) (optional)

@@ -127,7 +142,7 @@ This event defines the metadata for the group -- basically how clients should di

 If the group is forked and hosted in multiple relays, there will be multiple versions of this event in each different relay and so on.

-```js
+```jsonc
 {
  "kind": 39000,
  "content": "",
@@ -139,7 +154,7 @@ If the group is forked and hosted in multiple relays, there will be multiple ver
    ["public"], // or ["private"]
    ["open"] // or ["closed"]
  ]
-  ...
+  // other fields...
 }
 ```

@@ -160,8 +175,9 @@ The list of capabilities, as defined by this NIP, for now, is the following:
 - `add-permission`
 - `remove-permission`
 - `edit-group-status`
+- `delete-group`

-```js
+```json
 {
  "kind": 39001,
  "content": "list of admins for the pizza lovers group",
@@ -170,7 +186,7 @@ The list of capabilities, as defined by this NIP, for now, is the following:
    ["p", "<pubkey1-as-hex>", "ceo", "add-user", "edit-metadata", "delete-event", "remove-user"],
    ["p", "<pubkey2-as-hex>", "secretary", "add-user", "delete-event"]
  ]
-  ...
+  // other fields...
 }
 ```

--- a/30.md
+++ b/30.md
@@ -54,3 +54,19 @@ In kind 1 events, the `content` should be emojified.
  "created_at": 1682630000
 }
 ```
+
+### Kind 7 events
+
+In kind 7 events, the `content` should be emojified.
+
+```json
+{
+  "kind": 7,
+  "content": ":dezh:",
+  "tags": [
+    ["emoji", "dezh", "https://raw.githubusercontent.com/dezh-tech/brand-assets/main/dezh/logo/black-normal.svg"]
+  ],
+  "pubkey": "79c2cae114ea28a981e7559b4fe7854a473521a8d22a66bbab9fa248eb820ff6",
+  "created_at": 1682630000
+}
+```
--- a/32.md
+++ b/32.md
@@ -2,13 +2,13 @@ NIP-32
 ======

 Labeling
---------
+--------

 `draft` `optional`

 This NIP defines two new indexable tags to label events and a new event kind (`kind:1985`) to attach those labels to existing events. This supports several use cases, including distributed moderation, collection management, license assignment, and content classification.

-New Tags: 
+New Tags:

 - `L` denotes a label namespace
 - `l` denotes a label
@@ -57,7 +57,7 @@ Example events

 A suggestion that multiple pubkeys be associated with the `permies` topic.

-```json
+```jsonc
 {
  "kind": 1985,
  "tags": [
@@ -66,13 +66,13 @@ A suggestion that multiple pubkeys be associated with the `permies` topic.
    ["p", <pubkey1>, <relay_url>],
    ["p", <pubkey2>, <relay_url>]
  ],
-  ...
+  // other fields...
 }
 ```

 A report flagging violence toward a human being as defined by ontology.example.com.

-```json
+```jsonc
 {
  "kind": 1985,
  "tags": [
@@ -81,13 +81,13 @@ A report flagging violence toward a human being as defined by ontology.example.c
    ["p", <pubkey1>, <relay_url>],
    ["p", <pubkey2>, <relay_url>]
  ],
-  ...
+  // other fields...
 }
 ```

 A moderation suggestion for a chat event.

-```json
+```jsonc
 {
  "kind": 1985,
  "tags": [
@@ -95,13 +95,13 @@ A moderation suggestion for a chat event.
    ["l", "approve", "nip28.moderation"],
    ["e", <kind40_event_id>, <relay_url>]
  ],
-  ...
+  // other fields...
 }
 ```

 Assignment of a license to an event.

-```json
+```jsonc
 {
  "kind": 1985,
  "tags": [
@@ -109,14 +109,14 @@ Assignment of a license to an event.
    ["l", "MIT", "license"],
    ["e", <event_id>, <relay_url>]
  ],
-  ...
+  // other fields...
 }
 ```

 Publishers can self-label by adding `l` tags to their own non-1985 events. In this case, the kind 1 event's author
 is labeling their note as being related to Milan, Italy using ISO 3166-2.

-```json
+```jsonc
 {
  "kind": 1,
  "tags": [
@@ -124,13 +124,13 @@ is labeling their note as being related to Milan, Italy using ISO 3166-2.
    ["l", "IT-MI", "ISO-3166-2"]
  ],
  "content": "It's beautiful here in Milan!",
-  ...
+  // other fields...
 }
 ```

 Author is labeling their note language as English using ISO-639-1.

-```json
+```jsonc
 {
  "kind": 1,
  "tags": [
@@ -138,15 +138,15 @@ Author is labeling their note language as English using ISO-639-1.
    ["l", "en", "ISO-639-1"]
  ],
  "content": "English text",
-  ...
+  // other fields...
 }
 ```

 Other Notes
 -----------

-When using this NIP to bulk-label many targets at once, events may be deleted and a replacement
-may be published. We have opted not to use parameterizable/replaceable events for this due to the
+When using this NIP to bulk-label many targets at once, events may be requested for deletion using [NIP-09](09.md) and a replacement
+may be published. We have opted not to use addressable/replaceable events for this due to the
 complexity in coming up with a standard `d` tag. In order to avoid ambiguity when querying,
 publishers SHOULD limit labeling events to a single namespace.

@@ -169,7 +169,7 @@ be handled in some other way.


 Appendix: Known Ontologies
-------------------------
+--------------------------

 Below is a non-exhaustive list of ontologies currently in widespread use.

--- a/33.md
+++ b/33.md
@@ -6,4 +6,4 @@ Parameterized Replaceable Events

 `final` `mandatory`

-Moved to [NIP-01](01.md).
+Renamed to "Addressable events" and moved to [NIP-01](01.md).
--- a/34.md
+++ b/34.md
@@ -53,7 +53,7 @@ An optional source of truth for the state of branches and tags in a repository.

 The `refs` tag may appear multiple times, or none.

-If no `refs` tags are present, the author is no longer tracking repository state using this event. This approach enables the author to restart tracking state at a later time unlike [NIP-09](09.md) deletion.
+If no `refs` tags are present, the author is no longer tracking repository state using this event. This approach enables the author to restart tracking state at a later time unlike [NIP-09](09.md) deletion requests.

 The `refs` tag can be optionally extended to enable clients to identify how many commits ahead a ref is:

@@ -104,15 +104,20 @@ The first patch in a series MAY be a cover letter in the format produced by `git

 ## Issues

-Issues are Markdown text that is just human-readable conversational threads related to the repository: bug reports, feature requests, questions or comments of any kind. Like patches, these SHOULD be sent to the relays specified in that repository's announcement event's `"relays"` tag.
+Issues are Markdown text that is just human-readable conversational threads related to the repository: bug reports, feature requests, questions or comments of any kind. Like patches, these SHOULD be sent to the relays specified in that repository's announcement event's `"relays"` tag. 

-```jsonc
+Issues may have a `subject` tag, which clients can utilize to display a header. Additionally, one or more `t` tags may be included to provide labels for the issue.
+
+```json
 {
  "kind": 1621,
  "content": "<markdown text>",
  "tags": [
    ["a", "30617:<base-repo-owner-pubkey>:<base-repo-id>"],
    ["p", "<repository-owner>"]
+    ["subject", "<issue-subject>"]
+    ["t", "<issue-label>"]
+    ["t", "<another-issue-label>"]
  ]
 }
 ```
@@ -132,8 +137,9 @@ Replies are also Markdown text. The difference is that they MUST be issued as re
    // other "e" and "p" tags should be applied here when necessary, following the threading rules of NIP-10
    ["p", "<patch-author-pubkey-hex>", "", "mention"],
    ["e", "<previous-reply-id-hex>", "", "reply"],
-    // ...
-  ]
+    // rest of tags...
+  ],
+  // other fields...
 }
 ```

--- a/35.md
+++ b/35.md
@@ -2,7 +2,7 @@ NIP-35
 ======

 Torrents
-----------
+--------

 `draft` `optional`

@@ -37,7 +37,7 @@ A second level prefix should be included where the database supports multiple me

 In some cases the url mapping isnt direct, mapping the url in general is out of scope for this NIP, the section above is only a guide so that implementers have enough information to succsesfully map the url if they wish.

-```jsonc
+```json
 {
  "kind": 2003,
  "content": "<long-description-pre-formatted>",
--- a/37.md
+++ b/37.md
@@ -0,0 +1,146 @@
+NIP-37
+======
+
+Event Publication Onion-routing
+-----------------
+
+`draft` `optional`
+
+This NIP defines a way to do onion-based routing for event publishing, optionally compensated with cashu where pubkeys (not necessarily relays) provide routing services.
+
+## Announcement
+A pubkey announces itself as willing to route by publishing an ephemeral event `kind:20690` in their outbox relays. Announcers should republish a new ephemeral event every few minutes to indicate they are still willing to route and online. The refresh rate depends on the relays where they are publishing (usually ~5 minutes).
+
+```jsonc
+{
+    "kind": 20690,
+    "tags": [
+        [ "relay", "wss://example1.com" ],
+        [ "relay", "wss://example2.com" ],
+        [ "fee", "1", "sat" ]
+    ],
+    "content": "",
+    "pubkey": <pubkey-of-router>
+}
+```
+
+Tags:
+`relay` -- relay(s) where the pubkey will be listening for requests.
+`fee` -- an optional fee indicating how much money the pubkey demands to be paid.
+
+## Routing request
+A sender publishes a series of `kind:2444` or `kind:20444` where the `payload` is the event that should be published by the pubkey of the current hop in the relays specified by the envelope. An optional proof can be included, this cashu proof is for the hop processing this route.
+
+```jsonc
+{
+    "kind": 20444,
+    "content": nip44_encrypt("{
+        'relays': [ 'wss://example1.com' ],
+        'event': { 'id': ...., sig: ...,  }, // event the current routing pubkey should publish
+        'proof': <optional-unencoded-cashu-proof>,
+        'mint': 'https://mint.com',
+        'unit': 'sat'
+    }")
+    "tags": [
+        [ "p", "pubkey-of-next-hop" ]
+    ]
+}
+```
+
+Event `kind:2444` has the exact same format as the `kind:20444`, the only difference being that it's not ephemeral, so it can be used to route events that are expected to take longer to route. `kind:2444` events SHOULD include an [[NIP-40]] `expiration` tag.
+
+Routing pubkeys MUST look at the `created_at` of the event they need to publish and wait until at least that time before publishing. Using future `created_at`s allows the sender to increase their privacy by preventing timing analysis by mixing different time delays at each hop.
+
+When a routing pubkey receives a routing request event it should decrypt the content, redeem the cashu and publish the event in the `event` field. If the cashu cannot be redeemed the routing pubkey MUST NOT publish the event. This is useful as a way to **cancel** a routing event where the sender uses a future `created_at` timestamps and chooses to cancel the publication.
+
+## Constructing a route
+The sender:
+
+1. looks for `kind:20400` announcements and assembles a path
+2. creates the event they want to publish and sign it with their normal pubkey
+
+3. walks the path backwards (finish -> start), putting the event signed in the previous step in the `event` field of the `content` and the other fileds of the envelope
+4. encrypts to the current hop and signs -- both operations with a new disposable key and `p`-tags the current hop.
+3. repeat step #3 and #4 for the rest of the route until the first hop
+4. sender publishes the resulting event to one of the relays the first hop indicated it's active on
+
+## Pseudocode implementation
+```ts
+// event to be published
+event = { "kind": 1, content: "This is an onion-routed event" }
+sign_event(event, my_private_key)
+outer_layer = assemble_onion_route(event, [ "pubkey-A", "pubkey-B", "pubkey-C" ])
+publish_event(outer_layer)
+
+function assemble_onion_route(final_event, path) {
+    current_event = final_event  // Start with the event to be published by the final hop
+
+    // Walk the path backwards from "C" to "A"
+    for hop_pubkey in reverse(path):  // path = ["A", "B", "C"], reversed to ["C", "B", "A"]
+        // Generate a new disposable key for this hop
+        disposable_key = generate_disposable_key()
+
+        // Create the payload for this hop
+        payload = {
+            "event": current_event  // The event for the hop to publish
+            // ...
+        }
+        
+        // Encrypt the payload for the current hop
+        encrypted_payload = nip44_encrypt(payload, hop_pubkey)  // Encrypt with the hop's pubkey
+        
+        // Create the routing event for this hop
+        routing_event = {
+            "kind": 20444,  // Ephemeral routing request
+            "content": encrypted_payload,  // The encrypted payload for this hop
+            "tags": [["p", hop_pubkey]]  // Tag indicating the pubkey of the next hop
+        }
+        
+        // Sign the event with the disposable key for this hop
+        sign_event(routing_event, disposable_key)
+        
+        // Prepare for the next hop (wrap another layer)
+        current_event = routing_event
+    }
+
+    return current_event  // Return the fully wrapped outermost event ready to be published
+}
+
+```
+
+## Example anatomy of a sequence of routing events
+
+```jsonc
+{
+    kind: 20444,
+    content: nip44_encrypt({
+        relays: [...],
+        event: {
+            "id": ...,
+            "kind": 20444,
+            "pubkey": "ephemeral-key-1",
+            "sig": ...,
+            content: nip44_encrypt({
+                relays: [....],
+                event: {
+                    "id": ....,
+                    "kind": 20444,
+                    "pubkey": "ephemeral-key-2",
+                    "sig": ...,
+                    "content": nip44_encrypt({
+                        relays: [ "wss://target-relay.com" ],
+                        event: {
+                            id: ...,
+                            "kind": 1,
+                            content: "This is an onion-routed event",
+                            "pubkey": "real-pubkey",
+                            "sig": ...,
+                        }
+                    })
+                }
+            })
+        }
+    }
+}
+```
+
--- a/38.md
+++ b/38.md
@@ -3,7 +3,7 @@ NIP-38
 ======

 User Statuses
--------------
+-------------

 `draft` `optional`

@@ -13,11 +13,11 @@ This NIP enables a way for users to share live statuses such as what music they

 ## Live Statuses

-A special event with `kind:30315` "User Status" is defined as an *optionally expiring* _parameterized replaceable event_, where the `d` tag represents the status type:
+A special event with `kind:30315` "User Status" is defined as an *optionally expiring* _addressable event_, where the `d` tag represents the status type:

 For example:

-```js
+```json
 {
  "kind": 30315,
  "content": "Sign up for nostrasia!",
@@ -26,7 +26,9 @@ For example:
    ["r", "https://nostr.world"]
  ],
 }
+```

+```json
 {
  "kind": 30315,
  "content": "Intergalatic - Beastie Boys",
@@ -44,7 +46,7 @@ Two common status types are defined: `general` and `music`. `general` represent

 Any other status types can be used but they are not defined by this NIP.

-The status MAY include an `r`, `p`, `e` or `a` tag linking to a URL, profile, note, or parameterized replaceable event.
+The status MAY include an `r`, `p`, `e` or `a` tag linking to a URL, profile, note, or addressable event.

 The `content` MAY include emoji(s), or [NIP-30](30.md) custom emoji(s). If the `content` is an empty string then the client should clear the status.

--- a/39.md
+++ b/39.md
@@ -13,7 +13,8 @@ Nostr protocol users may have other online identities such as usernames, profile
 ## `i` tag on a metadata event

 A new optional `i` tag is introduced for `kind 0` metadata event defined in [NIP-01](01.md):
-```json
+
+```jsonc
 {
  "id": <id>,
  "pubkey": <pubkey>,
@@ -23,7 +24,7 @@ A new optional `i` tag is introduced for `kind 0` metadata event defined in [NIP
    ["i", "mastodon:bitcoinhackers.org/@semisol", "109775066355589974"]
    ["i", "telegram:1087295469", "nostrdirectory/770"]
  ],
-  ...
+  // other fields...
 }
 ```

--- a/42.md
+++ b/42.md
@@ -22,13 +22,13 @@ A relay may want to require clients to authenticate to access restricted resourc

 This NIP defines a new message, `AUTH`, which relays CAN send when they support authentication and clients can send to relays when they want to authenticate. When sent by relays the message has the following form:

-```json
+```
 ["AUTH", <challenge-string>]
 ```

 And, when sent by clients, the following form:

-```json
+```
 ["AUTH", <signed-event-json>]
 ```

@@ -38,14 +38,14 @@ And, when sent by clients, the following form:

 The signed event is an ephemeral event not meant to be published or queried, it must be of `kind: 22242` and it should have at least two tags, one for the relay URL and one for the challenge string as received from the relay. Relays MUST exclude `kind: 22242` events from being broadcasted to any client. `created_at` should be the current time. Example:

-```json
+```jsonc
 {
  "kind": 22242,
  "tags": [
    ["relay", "wss://relay.example.com/"],
    ["challenge", "challengestringhere"]
  ],
-  ...
+  // other fields...
 }
 ```

--- a/44.md
+++ b/44.md
@@ -1,5 +1,5 @@
 NIP-44
-=====
+======

 Encrypted Payloads (Versioned)
 ------------------------------
@@ -142,6 +142,8 @@ validation rules, refer to BIP-340.
    The operation produces a shared point, and we encode the shared point's 32-byte x coordinate, using method
    `bytes(P)` from BIP340. Private and public keys must be validated as per BIP340: pubkey must be a valid,
    on-curve point, and private key must be a scalar in range `[1, secp256k1_order - 1]`.
+    NIP44 doesn't do hashing of the output: keep this in mind, because some libraries hash it using sha256.
+    As an example, in libsecp256k1, unhashed version is available in `secp256k1_ec_pubkey_tweak_mul`
 - Operators
  - `x[i:j]`, where `x` is a byte array and `i, j <= 0` returns a `(j - i)`-byte array with a copy of the
    `i`-th byte (inclusive) to the `j`-th byte (exclusive) of `x`.
--- a/45.md
+++ b/45.md
@@ -2,7 +2,7 @@ NIP-45
 ======

 Event Counts
--------------
+------------

 `draft` `optional`

@@ -16,14 +16,14 @@ Some queries a client may want to execute against connected relays are prohibiti

 This NIP defines the verb `COUNT`, which accepts a subscription id and filters as specified in [NIP 01](01.md) for the verb `REQ`. Multiple filters are OR'd together and aggregated into a single count result.

-```json
+```
 ["COUNT", <subscription_id>, <filters JSON>...]
 ```

 Counts are returned using a `COUNT` response in the form `{"count": <integer>}`. Relays may use probabilistic counts to reduce compute requirements.
 In case a relay uses probabilistic counts, it MAY indicate it in the response with `approximate` key i.e. `{"count": <integer>, "approximate": <true|false>}`.

-```json
+```
 ["COUNT", <subscription_id>, {"count": <integer>}]
 ```

@@ -33,14 +33,14 @@ Whenever the relay decides to refuse to fulfill the `COUNT` request, it MUST ret

 ### Followers count

-```json
+```
 ["COUNT", <subscription_id>, {"kinds": [3], "#p": [<pubkey>]}]
 ["COUNT", <subscription_id>, {"count": 238}]
 ```

 ### Count posts and reactions

-```json
+```
 ["COUNT", <subscription_id>, {"kinds": [1, 7], "authors": [<pubkey>]}]
 ["COUNT", <subscription_id>, {"count": 5}]
 ```
--- a/46.md
+++ b/46.md
@@ -1,4 +1,8 @@
-# NIP-46 - Nostr Remote Signing
+NIP-46
+======
+
+Nostr Remote Signing
+--------------------

 ## Rationale

@@ -90,7 +94,7 @@ nostrconnect://<local-keypair-pubkey>?relay=<wss://relay-to-connect-on>&metadata

 ## Request Events `kind: 24133`

-```json
+```jsonc
 {
    "id": <id>,
    "kind": 24133,
--- a/47.md
+++ b/47.md
@@ -173,7 +173,7 @@ Request:
        "amount": 123, // invoice amount in msats, required
        "pubkey": "03...", // payee pubkey, required
        "preimage": "0123456789abcdef...", // preimage of the payment, optional
-        "tlv_records: [ // tlv records, optional
+        "tlv_records": [ // tlv records, optional
            {
                "type": 5482373484, // tlv type
                "value": "0123456789abcdef" // hex encoded tlv value
@@ -208,7 +208,7 @@ Request:
    "method": "multi_pay_keysend",
    "params": {
        "keysends": [
-          {"id": "4c5b24a351", pubkey": "03...", "amount": 123},
+          {"id": "4c5b24a351", "pubkey": "03...", "amount": 123},
          {"id": "3da52c32a1", "pubkey": "02...", "amount": 567, "preimage": "abc123..", "tlv_records": [{"type": 696969, "value": "77616c5f6872444873305242454d353736"}]},
        ],
    }
@@ -358,8 +358,7 @@ Request:
 ```jsonc
 {
    "method": "get_balance",
-    "params": {
-    }
+    "params": {}
 }
 ```

@@ -379,8 +378,7 @@ Request:
 ```jsonc
 {
    "method": "get_info",
-    "params": {
-    }
+    "params": {}
 }
 ```

--- a/50.md
+++ b/50.md
@@ -15,9 +15,9 @@ extensible framework for performing such queries.
 ## `search` filter field 

 A new `search` field is introduced for `REQ` messages from clients:
-```json
+```jsonc
 {
-  ...
+  // other fields on filter object...
  "search": <string>
 }
 ```
--- a/51.md
+++ b/51.md
@@ -16,7 +16,7 @@ When new items are added to an existing list, clients SHOULD append them to the

 ## Standard lists

-Standard lists use non-parameterized replaceable events, meaning users may only have a single list of each kind. They have special meaning and clients may rely on them to augment a user's profile or browsing experience.
+Standard lists use normal replaceable events, meaning users may only have a single list of each kind. They have special meaning and clients may rely on them to augment a user's profile or browsing experience.

 For example, _mute list_ can contain the public keys of spammers and bad actors users don't want to see in their feeds or receive annoying notifications from.

@@ -51,6 +51,7 @@ Aside from their main identifier, the `"d"` tag, sets can optionally have a `"ti
 | 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)                                                         |
+| 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))                                                   |
 | Release artifact sets | 30063 | groups of files of a software release  | `"e"` (kind:1063 [file metadata](94.md) events), `"i"` (application identifier, typically reverse domain notation), `"version"`  |
@@ -110,7 +111,7 @@ Some clients have used these lists in the past, but they should work on transiti

 ### A _release artifact set_ of an Example App

-```json
+```jsonc
 {
  "id": "567b41fc9060c758c4216fe5f8d3df7c57daad7ae757fa4606f0c39d4dd220ef",
  "pubkey": "d6dc95542e18b8b7aec2f14610f55c335abebec76f3db9e58c254661d0593a0c",
--- a/52.md
+++ b/52.md
@@ -6,7 +6,7 @@ Calendar Events

 `draft` `optional`

-This specification defines calendar events representing an occurrence at a specific moment or between moments. These calendar events are _parameterized replaceable_ and deletable per [NIP-09](09.md).
+This specification defines calendar events representing an occurrence at a specific moment or between moments. These calendar events are _addressable_ and deletable per [NIP-09](09.md).

 Unlike the term `calendar event` specific to this NIP, the term `event` is used broadly in all the NIPs to describe any Nostr event. The distinction is being made here to discern between the two terms.

@@ -20,7 +20,7 @@ This kind of calendar event starts on a date and ends before a different date in

 #### Format

-The format uses a parameterized replaceable event kind `31922`.
+The format uses an _addressable event_ of `kind:31922`.

 The `.content` of these events should be a detailed description of the calendar event. It is required but can be an empty string.

@@ -79,7 +79,7 @@ This kind of calendar event spans between a start time and end time.

 #### Format

-The format uses a parameterized replaceable event kind `31923`.
+The format uses an _addressable event_ kind `31923`.

 The `.content` of these events should be a detailed description of the calendar event. It is required but can be an empty string.

@@ -90,9 +90,12 @@ The list of tags are as follows:
 * `end` (optional) exclusive end Unix timestamp in seconds. If omitted, the calendar event ends instantaneously.
 * `start_tzid` (optional) time zone of the start timestamp, as defined by the IANA Time Zone Database. e.g., `America/Costa_Rica`
 * `end_tzid` (optional) time zone of the end timestamp, as defined by the IANA Time Zone Database. e.g., `America/Costa_Rica`. If omitted and `start_tzid` is provided, the time zone of the end timestamp is the same as the start timestamp.
+* `summary` (optional) brief description of the calendar event
+* `image` (optional) url of an image to use for the event
 * `location` (optional, repeated) location of the calendar event. e.g. address, GPS coordinates, meeting room name, link to video call
 * `g` (optional) [geohash](https://en.wikipedia.org/wiki/Geohash) to associate calendar event with a searchable physical location
 * `p` (optional, repeated) 32-bytes hex pubkey of a participant, optional recommended relay URL, and participant's role in the meeting
+* `l` (optional, repeated) label to categorize calendar event. e.g. `audiospace` to denote a scheduled event from a live audio space implementation such as cornychat.com
 * `t` (optional, repeated) hashtag to categorize calendar event
 * `r` (optional, repeated) references / links to web pages, documents, video calls, recorded videos, etc.

@@ -110,6 +113,8 @@ The following tags are deprecated:
    ["d", "<UUID>"],

    ["title", "<title of calendar event>"],
+    ["summary", "<brief description of the calendar event>"],
+    ["image", "<string with image URI>"],

    // Timestamps
    ["start", "<Unix timestamp in seconds>"],
@@ -126,6 +131,10 @@ The following tags are deprecated:
    ["p", "<32-bytes hex of a pubkey>", "<optional recommended relay URL>", "<role>"],
    ["p", "<32-bytes hex of a pubkey>", "<optional recommended relay URL>", "<role>"],

+    // Labels (example using com.cornychat namespace denoting the event as an audiospace)
+    ["L", "com.cornychat"],
+    ["l", "audiospace", "com.cornychat"],
+
    // Hashtags
    ["t", "<tag>"],
    ["t", "<tag>"],
@@ -178,17 +187,23 @@ This NIP is intentionally not defining who is authorized to attend a calendar ev

 This NIP is also intentionally not defining what happens if a calendar event changes after an RSVP is submitted.

+The RSVP MUST have an `a` tag of the event coordinates to the calendar event, and optionally an `e` tag of the id of the specific calendar event revision. If an `e` tag is present, clients SHOULD interpret it as an indication that the RSVP is a response to that revision of the calendar event, and MAY interpret it to not necessarily apply to other revisions of the calendar event.
+
+The RSVP MAY tag the author of the calendar event it is in response to using a `p` tag so that clients can easily query all RSVPs that pertain to the author.
+
 ### Format

-The format uses a parameterized replaceable event kind `31925`.
+The format uses an _addressable event_ kind `31925`.

 The `.content` of these events is optional and should be a free-form note that adds more context to this calendar event response.

 The list of tags are as follows:
-* `a` (required) reference tag to kind `31922` or `31923` calendar event being responded to.
+* `a` (required) coordinates to a kind `31922` or `31923` calendar event being responded to.
+* `e` (optional) event id of a kind `31922` or `31923` calendar event being responded to.
 * `d` (required) universally unique identifier. Generated by the client creating the calendar event RSVP.
 * `status` (required) `accepted`, `declined`, or `tentative`. Determines attendance status to the referenced calendar event.
 * `fb` (optional) `free` or `busy`. Determines if the user would be free or busy for the duration of the calendar event. This tag must be omitted or ignored if the `status` label is set to `declined`.
+* `p` (optional) pubkey of the author of the calendar event being responded to.

 ```json
 {
@@ -198,10 +213,12 @@ The list of tags are as follows:
  "kind": 31925,
  "content": "<note>",
  "tags": [
-    ["a", "<31922 or 31923>:<calendar event author pubkey>:<d-identifier of calendar event>", "<optional relay url>"],
+    ["e", "<kind 31922 or 31923 event id", "<optional recommended relay URL>"]
+    ["a", "<31922 or 31923>:<calendar event author pubkey>:<d-identifier of calendar event>", "<optional recommended relay URL>"],
    ["d", "<UUID>"],
    ["status", "<accepted/declined/tentative>"],
    ["fb", "<free/busy>"],
+    ["p", "<hex pubkey of kind 31922 or 31923 event>", "<optional recommended relay URL>"]
  ]
 }
 ```
--- a/53.md
+++ b/53.md
@@ -12,11 +12,11 @@ Service providers want to offer live activities to the Nostr network in such a w

 ### Live Event

-A special event with `kind:30311` "Live Event" is defined as a _parameterized replaceable event_ of public `p` tags. Each `p` tag SHOULD have a **displayable** marker name for the current role (e.g. `Host`, `Speaker`, `Participant`) of the user in the event and the relay information MAY be empty. This event will be constantly updated as participants join and leave the activity.
+A special event with `kind:30311` "Live Event" is defined as an _addressable event_ of public `p` tags. Each `p` tag SHOULD have a **displayable** marker name for the current role (e.g. `Host`, `Speaker`, `Participant`) of the user in the event and the relay information MAY be empty. This event will be constantly updated as participants join and leave the activity.

 For example:

-```json
+```jsonc
 {
  "kind": 30311,
  "tags": [
@@ -35,10 +35,10 @@ 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", /*...*/]
  ],
  "content": "",
-  ...
+  // other fields...
 }
 ```

@@ -64,14 +64,14 @@ This feature is important to avoid malicious event owners adding large account h

 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.

-```json
+```jsonc
 {
  "kind": 1311,
  "tags": [
    ["a", "30311:<Community event author pubkey>:<d-identifier of the community>", "<Optional relay url>", "root"],
  ],
  "content": "Zaps to live streams is beautiful.",
-  ...
+  // other fields...
 }
 ```

--- a/54.md
+++ b/54.md
@@ -6,12 +6,12 @@ Wiki

 `draft` `optional`

-This NIP defines `kind:30818` (a _parameterized replaceable event_) for long-form text content similar to [NIP-23](23.md), but with one important difference: articles are meant to be descriptions, or encyclopedia entries, of particular subjects, and it's expected that multiple people will write articles about the exact same subjects, with either small variations or completely independent content.
+This NIP defines `kind:30818` (an _addressable event_) for descriptions (or encyclopedia entries) of particular subjects, and it's expected that multiple people will write articles about the exact same subjects, with either small variations or completely independent content.

 Articles are identified by lowercase, normalized ascii `d` tags.

 ### Articles
-```jsonc
+```json
 {
  "content": "A wiki is a hypertext publication collaboratively edited and managed by its own audience.",
  "tags": [
@@ -26,21 +26,25 @@ Articles are identified by lowercase, normalized ascii `d` tags.
 - Any non-letter character MUST be converted to a `-`.
 - All letters MUST be converted to lowercase.

-### Content rules
+### Content

-The content should be Markdown, following the same rules as of [NIP-23](23.md), although it takes some extra (optional) metadata tags:
+The `content` should be Asciidoc with two extra functionalities: **wikilinks** and **nostr:...** links.

-  - `title`: for when the display title should be different from the `d` tag.
-  - `summary`: for display in lists.
-  - `a` and `e`: for referencing the original event a wiki article was forked from.
-
-One extra functionality is added: **wikilinks**. Unlike normal Markdown links `[]()` that link to webpages, wikilinks `[[]]` link to other articles in the wiki. In this case, the wiki is the entirety of Nostr. Clicking on a wikilink should cause the client to ask relays for events with `d` tags equal to the target of that wikilink.
+Unlike normal Asciidoc links `http://example.com[]` that link to external webpages, wikilinks `[[]]` link to other articles in the wiki. In this case, the wiki is the entirety of Nostr. Clicking on a wikilink should cause the client to ask relays for events with `d` tags equal to the target of that wikilink.

 Wikilinks can take these two forms:

  1. `[[Target Page]]` -- in this case it will link to the page `target-page` (according to `d` tag normalization rules above) and be displayed as `Target Page`;
  2. `[[target page|see this]]` -- in this case it will link to the page `target-page`, but will be displayed as `see this`.

+`nostr:...` links, as per [NIP-21](21.md), should link to profiles or arbitrary Nostr events. Although it is not recommended to link to specific versions of articles -- instead the _wikilink_ syntax should be preferred, since it should be left to the reader and their client to decide what version of any given article they want to read.
+
+### Optional extra tags
+
+  - `title`: for when the display title should be different from the `d` tag.
+  - `summary`: for display in lists.
+  - `a` and `e`: for referencing the original event a wiki article was forked from.
+
 ### Merge Requests

 Event `kind:818` represents a request to merge from a forked article into the source. It is directed to a pubkey and references the original article and the modified event.
@@ -86,23 +90,23 @@ This is a stronger signal of trust than a `+` reaction.

 This marker is useful when a user edits someone else's entry; if the original author includes the editor's changes and the editor doesn't want to keep/maintain an independent version, the `link` tag could effectively be a considered a "deletion" of the editor's version and putting that pubkey's WoT weight behind the original author's version.

-Why Markdown?
+Why Asciidoc?
 -------------

-If the idea is to make a wiki then the most obvious text format to use is probably the mediawiki/wikitext format used by Wikipedia since it's widely deployed in all mediawiki installations and used for decades with great success. However, it turns out that format is very bloated and convoluted, has way too many features and probably because of that it doesn't have many alternative implementations out there, and the ones that exist are not complete and don't look very trustworthy. Also it is very much a centralized format that can probably be changed at the whims of the Wikipedia owners.
+Wikitext is [garbage](nostr:nevent1qqsqt0gcggry60n72uglhuhypdlmr2dm6swjj69jex5v530gcpazlzsprpmhxue69uhhyetvv9ujumn0wdmksetjv5hxxmmdqy28wumn8ghj7un9d3shjtnyv9kh2uewd9hsygpm7rrrljungc6q0tuh5hj7ue863q73qlheu4vywtzwhx42a7j9n5ueneex) and Markdown is not powerful enough (besides being too freeform and unspecified and prone to generate incompatibilities in the future).

-On the other hand, Markdown has proven to work well for small scale wikis and one of the biggest wikis in the planet (which is not very often thought of as a wiki), [StackOverflow](https://stackoverflow.com) and its child sites, and also one of the biggest "personal wiki" software, [Obsidian](https://obsidian.md/). Markdown can probably deliver 95% of the functionality of wikitext. When augmented with tables, diagram generators and MathJax (which are common extensions that exist in the wild and can be included in this NIP) that rate probably goes to 99%, and its simplicity is a huge benefit that can't be overlooked. Wikitext format can also be transpíled into Markdown using Pandoc. Given all that, I think it's a reasonable suspicion that mediawiki is not inherently better than Markdown, the success of Wikipedia probably cannot be predicated on the syntax language choice.
+Asciidoc has a strict spec, multiple implementations in many languages, and support for features that are very much necessary in a wiki article, like _sidebars_, _tables_ (with rich markup inside cells), many levels of _headings_, _footnotes_, _superscript_ and _subscript_ markup and _description lists_. It is also arguably easier to read in its plaintext format than Markdown (and certainly much better than Wikitext).

 # Appendix 1: Merge requests
 Users can request other users to get their entries merged into someone else's entry by creating a `kind:818` event.

-```jsonc
+```json
 {
  "content": "I added information about how to make hot ice-creams",
  "kind": 818,
  "tags": [
    [ "a", "30818:<destination-pubkey>:hot-ice-creams", "<relay-url>" ],
-    [ "e", "<version-against-which-the-modification-was-made>", "<relay-url>' ],
+    [ "e", "<version-against-which-the-modification-was-made>", "<relay-url>" ],
    [ "p", "<destination-pubkey>" ],
    [ "e", "<version-to-be-merged>", "<relay-url>", "source" ]
  ]
@@ -114,4 +118,4 @@ Users can request other users to get their entries merged into someone else's en
 `e` tag: optional version of the article in which this modifications is based
 `e` tag with `source` marker: the ID of the event that should be merged. This event id MUST be of a `kind:30818` as defined in this NIP.

-The destination-pubkey (the pubkey being requested to merge something into their article can create [[NIP-25]] reactions that tag the `kind:818` event with `+` or `-`
+The destination-pubkey is the pubkey being requested to merge something into their article can create [[NIP-25]] reactions that tag the `kind:818` event with `+` or `-`
--- a/55.md
+++ b/55.md
@@ -1,6 +1,8 @@
-# NIP-55
+NIP-55
+======

-## Android Signer Application
+Android Signer Application
+--------------------------

 `draft` `optional`

@@ -99,10 +101,10 @@ launcher.launch(intent)
    context.startActivity(intent)
    ```
  - result:
-    - If the user approved intent it will return the **npub** in the signature field
+    - If the user approved intent it will return the **pubkey** in the signature field

      ```kotlin
-      val npub = intent.data?.getStringExtra("signature")
+      val pubkey = intent.data?.getStringExtra("signature")
      // The package name of the signer application
      val packageName = intent.data?.getStringExtra("package")
      ```
@@ -116,8 +118,8 @@ launcher.launch(intent)
    intent.putExtra("type", "sign_event")
    // To handle results when not waiting between intents
    intent.putExtra("id", event.id)
-    // Send the current logged in user npub
-    intent.putExtra("current_user", npub)
+    // Send the current logged in user pubkey
+    intent.putExtra("current_user", pubkey)

    context.startActivity(intent)
    ```
@@ -140,10 +142,10 @@ launcher.launch(intent)
    intent.putExtra("type", "nip04_encrypt")
    // 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 npub
-    intent.putExtra("current_user", account.keyPair.pubKey.toNpub())
-    // Send the hex pubKey that will be used for encrypting the data
-    intent.putExtra("pubKey", pubKey)
+    // Send the current logged in user pubkey
+    intent.putExtra("current_user", account.keyPair.pubkey)
+    // Send the hex pubkey that will be used for encrypting the data
+    intent.putExtra("pubkey", pubkey)

    context.startActivity(intent)
    ```
@@ -165,10 +167,10 @@ launcher.launch(intent)
    intent.putExtra("type", "nip44_encrypt")
    // 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 npub
-    intent.putExtra("current_user", account.keyPair.pubKey.toNpub())
-    // Send the hex pubKey that will be used for encrypting the data
-    intent.putExtra("pubKey", pubKey)
+    // Send the current logged in user pubkey
+    intent.putExtra("current_user", account.keyPair.pubkey)
+    // Send the hex pubkey that will be used for encrypting the data
+    intent.putExtra("pubkey", pubkey)

    context.startActivity(intent)
    ```
@@ -190,10 +192,10 @@ launcher.launch(intent)
    intent.putExtra("type", "nip04_decrypt")
    // 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 npub
-    intent.putExtra("current_user", account.keyPair.pubKey.toNpub())
-    // Send the hex pubKey that will be used for decrypting the data
-    intent.putExtra("pubKey", pubKey)
+    // Send the current logged in user pubkey
+    intent.putExtra("current_user", account.keyPair.pubkey)
+    // Send the hex pubkey that will be used for decrypting the data
+    intent.putExtra("pubkey", pubkey)

    context.startActivity(intent)
    ```
@@ -215,10 +217,10 @@ launcher.launch(intent)
    intent.putExtra("type", "nip04_decrypt")
    // 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 npub
-    intent.putExtra("current_user", account.keyPair.pubKey.toNpub())
-    // Send the hex pubKey that will be used for decrypting the data
-    intent.putExtra("pubKey", pubKey)
+    // Send the current logged in user pubkey
+    intent.putExtra("current_user", account.keyPair.pubkey)
+    // Send the hex pubkey that will be used for decrypting the data
+    intent.putExtra("pubkey", pubkey)

    context.startActivity(intent)
    ```
@@ -231,6 +233,29 @@ launcher.launch(intent)
      val id = intent.data?.getStringExtra("id")
      ```

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

@@ -240,8 +265,8 @@ launcher.launch(intent)
    intent.putExtra("type", "decrypt_zap_event")
    // 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 npub
-    intent.putExtra("current_user", account.keyPair.pubKey.toNpub())
+    // Send the current logged in user pubkey
+    intent.putExtra("current_user", account.keyPair.pubkey)
    context.startActivity(intent)
    ```
  - result:
@@ -257,7 +282,7 @@ launcher.launch(intent)

 To get the result back from Signer Application you should use contentResolver.query in Kotlin. If you are using another framework check the documentation of your framework or a third party library to get the result.

-If the user did not check the "remember my choice" option, the npub is not in Signer Application or the signer type is not recognized the `contentResolver` will return null
+If the user did not check the "remember my choice" option, the pubkey is not in Signer Application or the signer type is not recognized the `contentResolver` will return null

 For the SIGN_EVENT type Signer Application returns two columns "signature" and "event". The column event is the signed event json

@@ -280,7 +305,7 @@ If the user chose to always reject the event, signer application will return the
    )
    ```
  - result:
-    - Will return the **npub** in the signature column
+    - Will return the **pubkey** in the signature column

      ```kotlin
        if (result == null) return
@@ -288,7 +313,7 @@ If the user chose to always reject the event, signer application will return the
        if (result.moveToFirst()) {
            val index = it.getColumnIndex("signature")
            if (index < 0) return
-            val npub = it.getString(index)
+            val pubkey = it.getString(index)
        }
      ```

@@ -298,7 +323,7 @@ If the user chose to always reject the event, signer application will return the
    ```kotlin
    val result = context.contentResolver.query(
        Uri.parse("content://com.example.signer.SIGN_EVENT"),
-        listOf("$eventJson", "", "${logged_in_user_npub}"),
+        listOf("$eventJson", "", "${logged_in_user_pubkey}"),
        null,
        null,
        null
@@ -324,7 +349,7 @@ If the user chose to always reject the event, signer application will return the
    ```kotlin
    val result = context.contentResolver.query(
        Uri.parse("content://com.example.signer.NIP04_ENCRYPT"),
-        listOf("$plainText", "${hex_pub_key}", "${logged_in_user_npub}"),
+        listOf("$plainText", "${hex_pub_key}", "${logged_in_user_pubkey}"),
        null,
        null,
        null
@@ -348,7 +373,7 @@ If the user chose to always reject the event, signer application will return the
    ```kotlin
    val result = context.contentResolver.query(
        Uri.parse("content://com.example.signer.NIP44_ENCRYPT"),
-        listOf("$plainText", "${hex_pub_key}", "${logged_in_user_npub}"),
+        listOf("$plainText", "${hex_pub_key}", "${logged_in_user_pubkey}"),
        null,
        null,
        null
@@ -372,7 +397,7 @@ If the user chose to always reject the event, signer application will return the
    ```kotlin
    val result = context.contentResolver.query(
        Uri.parse("content://com.example.signer.NIP04_DECRYPT"),
-        listOf("$encryptedText", "${hex_pub_key}", "${logged_in_user_npub}"),
+        listOf("$encryptedText", "${hex_pub_key}", "${logged_in_user_pubkey}"),
        null,
        null,
        null
@@ -396,7 +421,7 @@ If the user chose to always reject the event, signer application will return the
    ```kotlin
    val result = context.contentResolver.query(
        Uri.parse("content://com.example.signer.NIP44_DECRYPT"),
-        listOf("$encryptedText", "${hex_pub_key}", "${logged_in_user_npub}"),
+        listOf("$encryptedText", "${hex_pub_key}", "${logged_in_user_pubkey}"),
        null,
        null,
        null
@@ -414,13 +439,37 @@ If the user chose to always reject the event, signer application will return the
        }
      ```

+- **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 **signature** column
+
+      ```kotlin
+        if (result == null) return
+
+        if (result.moveToFirst()) {
+            val index = it.getColumnIndex("signature")
+            val relayJsonText = it.getString(index)
+        }
+      ```
+
 - **decrypt_zap_event**
  - params:

    ```kotlin
    val result = context.contentResolver.query(
        Uri.parse("content://com.example.signer.DECRYPT_ZAP_EVENT"),
-        listOf("$eventJson", "", "${logged_in_user_npub}"),
+        listOf("$eventJson", "", "${logged_in_user_pubkey}"),
        null,
        null,
        null
@@ -470,28 +519,35 @@ Android intents and browser urls have limitations, so if you are using the `retu
  - params:

    ```js
-    window.href = `nostrsigner:${plainText}?pubKey=${hex_pub_key}&compressionType=none&returnType=signature&type=nip04_encrypt&callbackUrl=https://example.com/?event=`;
+    window.href = `nostrsigner:${plainText}?pubkey=${hex_pub_key}&compressionType=none&returnType=signature&type=nip04_encrypt&callbackUrl=https://example.com/?event=`;
    ```

 - **nip44_encrypt**
  - params:

    ```js
-    window.href = `nostrsigner:${plainText}?pubKey=${hex_pub_key}&compressionType=none&returnType=signature&type=nip44_encrypt&callbackUrl=https://example.com/?event=`;
+    window.href = `nostrsigner:${plainText}?pubkey=${hex_pub_key}&compressionType=none&returnType=signature&type=nip44_encrypt&callbackUrl=https://example.com/?event=`;
    ```

 - **nip04_decrypt**
  - params:

    ```js
-    window.href = `nostrsigner:${encryptedText}?pubKey=${hex_pub_key}&compressionType=none&returnType=signature&type=nip04_decrypt&callbackUrl=https://example.com/?event=`;
+    window.href = `nostrsigner:${encryptedText}?pubkey=${hex_pub_key}&compressionType=none&returnType=signature&type=nip04_decrypt&callbackUrl=https://example.com/?event=`;
    ```

 - **nip44_decrypt**
  - params:

    ```js
-    window.href = `nostrsigner:${encryptedText}?pubKey=${hex_pub_key}&compressionType=none&returnType=signature&type=nip44_decrypt&callbackUrl=https://example.com/?event=`;
+    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**
--- a/56.md
+++ b/56.md
@@ -41,7 +41,7 @@ further qualification and querying.
 Example events
 --------------

-```json
+```jsonc
 {
  "kind": 1984,
  "tags": [
@@ -50,9 +50,11 @@ Example events
    ["l", "NS-nud", "social.nos.ontology"]
  ],
  "content": "",
-  ...
+  // other fields...
 }
+```

+```jsonc
 {
  "kind": 1984,
  "tags": [
@@ -60,16 +62,18 @@ Example events
    ["p", <pubkey>]
  ],
  "content": "He's insulting the king!",
-  ...
+  // other fields...
 }
+```

+```jsonc
 {
  "kind": 1984,
  "tags": [
    ["p", <impersonator pubkey>, "impersonation"]
  ],
  "content": "Profile is impersonating nostr:<victim bech32 pubkey>",
-  ...
+  // other fields...
 }
 ```

--- a/57.md
+++ b/57.md
@@ -36,7 +36,7 @@ A `zap request` is an event of kind `9734` that is _not_ published to relays, bu
 In addition, the event MAY include the following tags:

 - `e` is an optional hex-encoded event id. Clients MUST include this if zapping an event rather than a person.
- `a` is an optional event coordinate that allows tipping parameterized replaceable events such as NIP-23 long-form notes.
+- `a` is an optional event coordinate that allows tipping addressable events such as NIP-23 long-form notes.

 Example:

@@ -171,7 +171,7 @@ A client can retrieve `zap receipt`s on events and pubkeys using a NIP-01 filter

 When an event includes one or more `zap` tags, clients wishing to zap it SHOULD calculate the lnurl pay request based on the tags value instead of the event author's profile field. The tag's second argument is the `hex` string of the receiver's pub key and the third argument is the relay to download the receiver's metadata (Kind-0). An optional fourth parameter specifies the weight (a generalization of a percentage) assigned to the respective receiver. Clients should parse all weights, calculate a sum, and then a percentage to each receiver. If weights are not present, CLIENTS should equally divide the zap amount to all receivers. If weights are only partially present, receivers without a weight should not be zapped (`weight = 0`).

-```js
+```jsonc
 {
    "tags": [
        [ "zap", "82341f882b6eabcd2ba7f1ef90aad961cf074af15b9ef44a09f9d2a8fbfbe6a2", "wss://nostr.oxtr.dev", "1" ],  // 25%
--- a/58.md
+++ b/58.md
@@ -9,12 +9,11 @@ Badges
 Three special events are used to define, award and display badges in
 user profiles:

-1. A "Badge Definition" event is defined as a parameterized replaceable event with kind `30009` having a `d` tag with a value that uniquely identifies the badge (e.g. `bravery`) published by the badge issuer. Badge definitions can be updated.
+1. A "Badge Definition" event is defined as an addressable event with kind `30009` having a `d` tag with a value that uniquely identifies the badge (e.g. `bravery`) published by the badge issuer. Badge definitions can be updated.

 2. A "Badge Award" event is a kind `8` event with a single `a` tag referencing a "Badge Definition" event and one or more `p` tags, one for each pubkey the badge issuer wishes to award. Awarded badges are immutable and non-transferrable.

-3. A "Profile Badges" event is defined as a parameterized replaceable event
-with kind `30008` with a `d` tag with the value `profile_badges`.
+3. A "Profile Badges" event is defined as an _addressable event_ with kind `30008` with a `d` tag with the value `profile_badges`.
 Profile badges contain an ordered list of pairs of `a` and `e` tags referencing a `Badge Definition` and a `Badge Award` for each badge to be displayed.

 ### Badge Definition event
@@ -74,7 +73,7 @@ Clients SHOULD attempt to render the most appropriate badge thumbnail according

 ### Example of a Badge Definition event

-```json
+```jsonc
 {
  "pubkey": "alice",
  "kind": 30009,
@@ -85,13 +84,13 @@ Clients SHOULD attempt to render the most appropriate badge thumbnail according
    ["image", "https://nostr.academy/awards/bravery.png", "1024x1024"],
    ["thumb", "https://nostr.academy/awards/bravery_256x256.png", "256x256"]
  ],
-  ...
+  // other fields...
 }
 ```

 ### Example of Badge Award event

-```json
+```jsonc
 {
  "id": "<badge award event id>",
  "kind": 8,
@@ -101,14 +100,14 @@ Clients SHOULD attempt to render the most appropriate badge thumbnail according
    ["p", "bob", "wss://relay"],
    ["p", "charlie", "wss://relay"]
  ],
-  ...
+  // other fields...
 }
 ```

 ### Example of a Profile Badges event

 Honorable Bob The Brave:
-```json
+```jsonc
 {
  "kind": 30008,
  "pubkey": "bob",
@@ -119,6 +118,6 @@ Honorable Bob The Brave:
    ["a", "30009:alice:honor"],
    ["e", "<honor badge award event id>", "wss://nostr.academy"]
  ],
-  ...
+  // other fields...
 }
 ```
--- a/59.md
+++ b/59.md
@@ -41,7 +41,7 @@ A `seal` is a `kind:13` event that wraps a `rumor` with the sender's regular key
 to a receiver's pubkey but there is no `p` tag pointing to the receiver. There is no way to know who the rumor is for
 without the receiver's or the sender's private key. The only public information in this event is who is signing it.

-```js
+```json
 {
  "id": "<id>",
  "pubkey": "<real author's pubkey>",
@@ -60,7 +60,7 @@ Tags MUST must always be empty in a `kind:13`. The inner event MUST always be un
 A `gift wrap` event is a `kind:1059` event that wraps any other event. `tags` SHOULD include any information
 needed to route the event to its intended recipient, including the recipient's `p` tag or [NIP-13](13.md) proof of work.

-```js
+```json
 {
  "id": "<id>",
  "pubkey": "<random, one-time-use pubkey>",
--- a/64.md
+++ b/64.md
@@ -0,0 +1,146 @@
+NIP-64
+======
+
+Chess (Portable Game Notation)
+------------------------------
+
+`draft` `optional`
+
+This NIP defines `kind:64` notes representing chess games in [PGN][pgn_specification] format, which can be read by humans and is also supported by most chess software.
+
+## Note
+
+### Content
+
+The `.content` of these notes is a string representing a [PGN-database][pgn_formal_syntax].
+
+### Notes
+
+```jsonc
+{
+  "kind": 64,
+  "content": "1. e4 *",
+  // other fields...
+}
+```
+
+```jsonc
+{
+  "kind": 64,
+  "tags": [
+    ["alt", "Fischer vs. Spassky in Belgrade on 1992-11-04 (F/S Return Match, Round 29)"],
+    // rest of tags...
+  ],
+  "content": "[Event \"F/S Return Match\"]\n[Site \"Belgrade, Serbia JUG\"]\n[Date \"1992.11.04\"]\n[Round \"29\"]\n[White \"Fischer, Robert J.\"]\n[Black \"Spassky, Boris V.\"]\n[Result \"1/2-1/2\"]\n\n1. e4 e5 2. Nf3 Nc6 3. Bb5 {This opening is called the Ruy Lopez.} 3... a6\n4. Ba4 Nf6 5. O-O Be7 6. Re1 b5 7. Bb3 d6 8. c3 O-O 9. h3 Nb8 10. d4 Nbd7\n11. c4 c6 12. cxb5 axb5 13. Nc3 Bb7 14. Bg5 b4 15. Nb1 h6 16. Bh4 c5 17. dxe5\nNxe4 18. Bxe7 Qxe7 19. exd6 Qf6 20. Nbd2 Nxd6 21. Nc4 Nxc4 22. Bxc4 Nb6\n23. Ne5 Rae8 24. Bxf7+ Rxf7 25. Nxf7 Rxe1+ 26. Qxe1 Kxf7 27. Qe3 Qg5 28. Qxg5\nhxg5 29. b3 Ke6 30. a3 Kd6 31. axb4 cxb4 32. Ra5 Nd5 33. f3 Bc8 34. Kf2 Bf5\n35. Ra7 g6 36. Ra6+ Kc5 37. Ke1 Nf4 38. g3 Nxh3 39. Kd2 Kb5 40. Rd6 Kc5 41. Ra6\nNf2 42. g4 Bd3 43. Re6 1/2-1/2",
+  // other fields...
+}
+```
+
+## Client Behavior
+
+Clients SHOULD display the content represented as chessboard.
+
+Clients SHOULD publish PGN notes in ["export format"][pgn_export_format] ("strict mode", i.e. created by machines) but expect incoming notes to be in ["import format"][pgn_import_format] ("lax mode", i.e. created by humans).
+
+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.
+
+## Relay Behavior
+
+Relays MAY validate PGN contents and reject invalid notes.
+
+
+## Examples
+
+```pgn
+// A game where nothing is known. Game still in progress, game abandoned, or result otherwise unknown. 
+// Maybe players died before a move has been made.
+*
+```
+
+```pgn
+1. e4 *
+```
+
+```pgn
+[White "Fischer, Robert J."]
+[Black "Spassky, Boris V."]
+
+1. e4 e5 2. Nf3 Nc6 3. Bb5 {This opening is called the Ruy Lopez.} *
+```
+
+```pgn
+[Event "F/S Return Match"]
+[Site "Belgrade, Serbia JUG"]
+[Date "1992.11.04"]
+[Round "29"]
+[White "Fischer, Robert J."]
+[Black "Spassky, Boris V."]
+[Result "1/2-1/2"]
+
+1. e4 e5 2. Nf3 Nc6 3. Bb5 {This opening is called the Ruy Lopez.} 3... a6
+4. Ba4 Nf6 5. O-O Be7 6. Re1 b5 7. Bb3 d6 8. c3 O-O 9. h3 Nb8 10. d4 Nbd7
+11. c4 c6 12. cxb5 axb5 13. Nc3 Bb7 14. Bg5 b4 15. Nb1 h6 16. Bh4 c5 17. dxe5
+Nxe4 18. Bxe7 Qxe7 19. exd6 Qf6 20. Nbd2 Nxd6 21. Nc4 Nxc4 22. Bxc4 Nb6
+23. Ne5 Rae8 24. Bxf7+ Rxf7 25. Nxf7 Rxe1+ 26. Qxe1 Kxf7 27. Qe3 Qg5 28. Qxg5
+hxg5 29. b3 Ke6 30. a3 Kd6 31. axb4 cxb4 32. Ra5 Nd5 33. f3 Bc8 34. Kf2 Bf5
+35. Ra7 g6 36. Ra6+ Kc5 37. Ke1 Nf4 38. g3 Nxh3 39. Kd2 Kb5 40. Rd6 Kc5 41. Ra6
+Nf2 42. g4 Bd3 43. Re6 1/2-1/2
+```
+
+```pgn
+[Event "Hourly HyperBullet Arena"]
+[Site "https://lichess.org/wxx4GldJ"]
+[Date "2017.04.01"]
+[White "T_LUKE"]
+[Black "decidement"]
+[Result "1-0"]
+[UTCDate "2017.04.01"]
+[UTCTime "11:56:14"]
+[WhiteElo "2047"]
+[BlackElo "1984"]
+[WhiteRatingDiff "+10"]
+[BlackRatingDiff "-7"]
+[Variant "Standard"]
+[TimeControl "30+0"]
+[ECO "B00"]
+[Termination "Abandoned"]
+
+1. e4 1-0
+
+
+[Event "Hourly HyperBullet Arena"]
+[Site "https://lichess.org/rospUdSk"]
+[Date "2017.04.01"]
+[White "Bastel"]
+[Black "oslochess"]
+[Result "1-0"]
+[UTCDate "2017.04.01"]
+[UTCTime "11:55:56"]
+[WhiteElo "2212"]
+[BlackElo "2000"]
+[WhiteRatingDiff "+6"]
+[BlackRatingDiff "-4"]
+[Variant "Standard"]
+[TimeControl "30+0"]
+[ECO "A01"]
+[Termination "Normal"]
+
+1. b3 d5 2. Bb2 c6 3. Nc3 Bf5 4. d4 Nf6 5. e3 Nbd7 6. f4 Bg6 7. Nf3 Bh5 8. Bd3 e6 9. O-O Be7 10. Qe1 O-O 11. Ne5 Bg6 12. Nxg6 hxg6 13. e4 dxe4 14. Nxe4 Nxe4 15. Bxe4 Nf6 16. c4 Bd6 17. Bc2 Qc7 18. f5 Be7 19. fxe6 fxe6 20. Qxe6+ Kh8 21. Qh3+ Kg8 22. Bxg6 Qd7 23. Qe3 Bd6 24. Bf5 Qe7 25. Be6+ Kh8 26. Qh3+ Nh7 27. Bf5 Rf6 28. Qxh7# 1-0
+```
+
+## Resources
+- [PGN Specification][pgn_specification]: PGN (Portable Game Notation) specification
+- [PGN Specification Supplement](https://github.com/mliebelt/pgn-spec-commented/blob/main/pgn-spec-supplement.md): Addition for adding graphical elements, clock values, eval, ...
+- [PGN Formal Syntax][pgn_formal_syntax]
+- [PGN Seven Tag Roster][pgn_seven_tag_roster]
+- [PGN Import Format][pgn_import_format]
+- [PGN Export Format][pgn_export_format]
+- [lichess / pgn-viewer (GitHub)](https://github.com/lichess-org/pgn-viewer): PGN viewer widget, designed to be embedded in content pages
+
+[pgn_specification]: https://github.com/mliebelt/pgn-spec-commented/blob/main/pgn-specification.md
+[pgn_formal_syntax]: https://github.com/mliebelt/pgn-spec-commented/blob/main/pgn-specification.md#18-formal-syntax
+[pgn_seven_tag_roster]: https://github.com/mliebelt/pgn-spec-commented/blob/main/pgn-specification.md#811-seven-tag-roster
+[pgn_import_format]: https://github.com/mliebelt/pgn-spec-commented/blob/main/pgn-specification.md#31-import-format-allows-for-manually-prepared-data
+[pgn_export_format]: https://github.com/mliebelt/pgn-spec-commented/blob/main/pgn-specification.md#32-export-format-used-for-program-generated-output
--- a/65.md
+++ b/65.md
@@ -12,7 +12,7 @@ The event MUST include a list of `r` tags with relay URIs and a `read` or `write

 The `.content` is not used.

-```json
+```jsonc
 {
  "kind": 10002,
  "tags": [
@@ -22,7 +22,7 @@ The `.content` is not used.
    ["r", "wss://nostr-relay.example.com", "read"]
  ],
  "content": "",
-  ...other fields
+  // other fields...
 }
 ```

@@ -62,3 +62,7 @@ This NIP allows Clients to connect directly with the most up-to-date relay set f
 5. If a relay signals support for this NIP in their [NIP-11](11.md) document that means they're willing to accept kind 10002 events from a broad range of users, not only their paying customers or whitelisted group.

 6. Clients SHOULD deduplicate connections by normalizing relay URIs according to [RFC 3986](https://datatracker.ietf.org/doc/html/rfc3986#section-6).
+
+## Related articles
+- [Outbox model](https://mikedilger.com/gossip-model/)
+- [What is the Outbox Model?](https://habla.news/u/hodlbod@coracle.social/8YjqXm4SKY-TauwjOfLXS)
--- a/71.md
+++ b/71.md
@@ -2,11 +2,11 @@ NIP-71
 ======

 Video Events
---------------
+------------

 `draft` `optional`

-This specification defines video events representing a dedicated post of externally hosted content. These video events are _parameterized replaceable_ and deletable per [NIP-09](09.md).
+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).

 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.

@@ -16,25 +16,64 @@ There are two types of video events represented by different kinds: horizontal a

 #### Format

-The format uses a parameterized replaceable event kind `34235` for horizontal videos and `34236` for vertical videos.
+The format uses an _addressable event_ kind `34235` for horizontal videos and `34236` for vertical videos.

 The `.content` of these events is a summary or description on the video content.

-The list of tags are as follows:
-* `d` (required) universally unique identifier (UUID). Generated by the client creating the video event.
-* `url` (required) the url to the video file
-* `m` a string indicating the data type of the file. The [MIME types](https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types) format must be used, and they should be lowercase.
+The primary source of video information is the `imeta` tags which is defined in [NIP-92](92.md)
+
+Each `imeta` tag can be used to specify a variant of the video by the `dim` & `m` properties.
+
+Example:
+```json
+[
+  ["imeta", 
+    "dim 1920x1080",
+    "url https://myvideo.com/1080/12345.mp4",
+    "x 3093509d1e0bc604ff60cb9286f4cd7c781553bc8991937befaacfdc28ec5cdc",
+    "m video/mp4",
+    "image https://myvideo.com/1080/12345.jpg",
+    "image https://myotherserver.com/1080/12345.jpg",
+    "fallback https://myotherserver.com/1080/12345.mp4",
+    "fallback https://andanotherserver.com/1080/12345.mp4",
+    "service nip96",
+  ],
+  ["imeta", 
+    "dim 1280x720",
+    "url https://myvideo.com/720/12345.mp4",
+    "x e1d4f808dae475ed32fb23ce52ef8ac82e3cc760702fca10d62d382d2da3697d",
+    "m video/mp4",
+    "image https://myvideo.com/720/12345.jpg",
+    "image https://myotherserver.com/720/12345.jpg",
+    "fallback https://myotherserver.com/720/12345.mp4",
+    "fallback https://andanotherserver.com/720/12345.mp4",
+    "service nip96",
+  ],
+  ["imeta", 
+    "dim 1280x720",
+    "url https://myvideo.com/720/12345.m3u8",
+    "x 704e720af2697f5d6a198ad377789d462054b6e8d790f8a3903afbc1e044014f",
+    "m application/x-mpegURL",
+    "image https://myvideo.com/720/12345.jpg",
+    "image https://myotherserver.com/720/12345.jpg",
+    "fallback https://myotherserver.com/720/12345.m3u8",
+    "fallback https://andanotherserver.com/720/12345.m3u8",
+    "service nip96",
+  ],
+]
+```
+
+Where `url` is the primary server url and `fallback` are other servers hosting the same file, both `url` and `fallback` should be weighted equally and clients are recommended to use any of the provided video urls.
+
+The `image` tag contains a preview image (at the same resolution). Multiple `image` tags may be used to specify fallback copies in the same way `fallback` is used for `url`.
+
+Additionally `service nip96` may be included to allow clients to search the authors NIP-96 server list to find the file using the hash.
+
+### Other tags:
 * `title` (required) title of the video
-* `"published_at"`, for the timestamp in unix seconds (stringified) of the first time the video was published
-* `x` containing the SHA-256 hexencoded string of the file.
-* `size` (optional) size of file in bytes
-* `dim` (optional) size of file in pixels in the form `<width>x<height>`
+* `published_at`, for the timestamp in unix seconds (stringified) of the first time the video was published
 * `duration` (optional) video duration in seconds
-* `magnet` (optional) URI to magnet file
-* `i` (optional) torrent infohash
 * `text-track` (optional, repeated) link to WebVTT file for video, type of supplementary information (captions/subtitles/chapters/metadata), optional language code
-* `thumb` (optional) url of thumbnail with same aspect ratio
-* `image` (optional) url of preview image with same dimensions
 * `content-warning` (optional) warning about content of NSFW video
 * `alt` (optional) description for accessibility
 * `segment` (optional, repeated) start timestamp in format `HH:MM:SS.sss`, end timestamp in format `HH:MM:SS.sss`, chapter/segment title, chapter thumbnail-url
@@ -42,7 +81,7 @@ The list of tags are as follows:
 * `p` (optional, repeated) 32-bytes hex pubkey of a participant in the video, optional recommended relay URL
 * `r` (optional, repeated) references / links to web pages

-```json
+```jsonc
 {
  "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>,
@@ -53,19 +92,23 @@ The list of tags are as follows:
    ["d", "<UUID>"],

    ["title", "<title of video>"],
-    ["thumb", "<thumbnail image for video>"],
    ["published_at", "<unix timestamp>"],
    ["alt", <description>],

    // Video Data
-    ["url",<string with URI of file>],
-    ["m", <MIME type>],
-    ["x",<Hash SHA-256>],
-    ["size", <size of file in bytes>],
+    ["imeta", 
+      "dim 1920x1080",
+      "url https://myvideo.com/1080/12345.mp4",
+      "x 3093509d1e0bc604ff60cb9286f4cd7c781553bc8991937befaacfdc28ec5cdc",
+      "m video/mp4",
+      "image https://myvideo.com/1080/12345.jpg",
+      "image https://myotherserver.com/1080/12345.jpg",
+      "fallback https://myotherserver.com/1080/12345.mp4",
+      "fallback https://andanotherserver.com/1080/12345.mp4",
+      "service nip96",
+    ],
+
    ["duration", <duration of video in seconds>],
-    ["dim", <size of file in pixels>],
-    ["magnet",<magnet URI> ],
-    ["i",<torrent infohash>],
    ["text-track", "<encoded `kind 6000` event>", "<recommended relay urls>"],
    ["content-warning", "<reason>"],
    ["segment", <start>, <end>, "<title>", "<thumbnail URL>"],
@@ -83,36 +126,4 @@ The list of tags are as follows:
    ["r", "<url>"]
  ]
 }
-```
-
-## Video View
-
-A video event view is a response to a video event to track a user's view or progress viewing the video.
-
-### Format
-
-The format uses a parameterized replaceable event kind `34237`.
-
-The `.content` of these events is optional and could be a free-form note that acts like a bookmark for the user.
-
-The list of tags are as follows:
-* `a` (required) reference tag to kind `34235` or `34236` video event being viewed
-* `d` (required) same as `a` reference tag value
-* `viewed` (optional, repeated) timestamp of the user's start time in seconds, timestamp of the user's end time in seconds 
-
-
-```json
-{
-  "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": 34237,
-  "content": "<note>",
-  "tags": [
-    ["a", "<34235 | 34236>:<video event author pubkey>:<d-identifier of video event>", "<optional relay url>"],
-    ["e", "<event-id", "<relay-url>"]
-    ["d", "<34235 | 34236>:<video event author pubkey>:<d-identifier of video event>"],
-    ["viewed", <start>, <end>],
-  ]
-}
-```
+```
--- a/72.md
+++ b/72.md
@@ -35,7 +35,7 @@ The goal of this NIP is to enable public communities. It defines the replaceable
    ["relay", "<relay where to send and receive approvals>", "approvals"],
    ["relay", "<relay where to post requests to and fetch approvals from>"]
  ],
-  ...
+  // other fields...
 }
 ```

@@ -50,7 +50,7 @@ Any Nostr event can be posted to a community. Clients MUST add one or more commu
    ["a", "34550:<community event author pubkey>:<community-d-identifier>", "<optional-relay-url>"],
  ],
  "content": "hello world",
-  // ...
+  // other fields...
 }
 ```

@@ -62,7 +62,7 @@ An approval event MUST include one or more community `a` tags, an `e` or `a` tag

 The event SHOULD also include the JSON-stringified `post request` event inside the `.content`, and a `k` tag with the original post's event kind to allow filtering of approved posts by kind.

-Moderators MAY delete their approval of a post at any time using NIP 09 event deletions.
+Moderators MAY request deletion of their approval of a post at any time using [NIP-09 event deletion requests](09.md).

 ```jsonc
 {
@@ -75,7 +75,7 @@ Moderators MAY delete their approval of a post at any time using NIP 09 event de
    ["k", "<post-request-kind>"]
  ],
  "content": "<the full approved event, JSON-encoded>",
-  // ...
+  // other fields...
 }
 ```

--- a/73.md
+++ b/73.md
@@ -0,0 +1,60 @@
+NIP-73
+======
+
+External Content IDs
+--------------------
+
+`draft` `optional`
+
+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. 
+
+## 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" |
+
+---
+
+## Examples
+
+### Books:
+
+- Book ISBN: `["i", "isbn:9780765382030"]` - https://isbnsearch.org/isbn/9780765382030
+
+Book ISBNs MUST be referenced _**without hyphens**_ as many book search APIs return the ISBNs without hyphens. Removing hypens from ISBNs is trivial, whereas adding the hyphens back in is non-trivial requiring a library.
+
+### Podcasts:
+
+- Podcast RSS Feed GUID: `["i", "podcast:guid:c90e609a-df1e-596a-bd5e-57bcc8aad6cc"]` - https://podcastindex.org/podcast/c90e609a-df1e-596a-bd5e-57bcc8aad6cc
+- Podcast RSS Item GUID: `["i", "podcast:item:guid:d98d189b-dc7b-45b1-8720-d4b98690f31f"]`
+- Podcast RSS Publisher GUID: `["i", "podcast:publisher:guid:18bcbf10-6701-4ffb-b255-bc057390d738"]`
+
+### Movies:
+
+- Movie ISAN: `["i", "isan:0000-0000-401A-0000-7"]` - https://web.isan.org/public/en/isan/0000-0000-401A-0000-7
+
+Movie ISANs SHOULD be referenced  _**without the version part**_ as the versions / edits of movies are not relevant. More info on ISAN parts here -  https://support.isan.org/hc/en-us/articles/360002783131-Records-relations-and-hierarchies-in-the-ISAN-Registry
+
+---
+
+### Optional URL Hints
+
+Each `i` tag MAY have a url hint as the second argument to redirect people to a website if the client isn't opinionated about how to interpret the id:
+
+`["i", "podcast:item:guid:d98d189b-dc7b-45b1-8720-d4b98690f31f", https://fountain.fm/episode/z1y9TMQRuqXl2awyrQxg]`
+
+`["i", "isan:0000-0000-401A-0000-7", https://www.imdb.com/title/tt0120737]`
+
+
--- a/75.md
+++ b/75.md
@@ -21,15 +21,16 @@ The following tags are defined as REQUIRED.

 Example event:

-```json
+```jsonc
 {
  "kind": 9041,
  "tags": [
-    ["relays", "wss://alicerelay.example.com", "wss://bobrelay.example.com", ...],
+    ["relays", "wss://alicerelay.example.com", "wss://bobrelay.example.com", /*...*/],
    ["amount", "210000"],
  ],
  "content": "Nostrasia travel expenses",
-  ...
+  // other fields...
+}
 ```

 The following tags are OPTIONAL.
@@ -38,36 +39,35 @@ The following tags are OPTIONAL.
 - `image` - an image for the goal
 - `summary` - a brief description

-```json
+```jsonc
 {
  "kind": 9041,
  "tags": [
-    ["relays", "wss://alicerelay.example.com", "wss://bobrelay.example.com", ...],
+    ["relays", "wss://alicerelay.example.com", "wss://bobrelay.example.com", /*...*/],
    ["amount", "210000"],
    ["closed_at", "<unix timestamp in seconds>"],
    ["image", "<image URL>"],
    ["summary", "<description of the goal>"],
  ],
  "content": "Nostrasia travel expenses",
-  ...
+  // other fields...
 }
 ```

-The goal MAY include an `r` or `a` tag linking to a URL or parameterized replaceable event.
+The goal MAY include an `r` or `a` tag linking to a URL or addressable event.

 The goal MAY include multiple beneficiary pubkeys by specifying [`zap` tags](57.md#appendix-g-zap-tag-on-other-events).

-Parameterized replaceable events can link to a goal by using a `goal` tag specifying the event id and an optional relay hint.
+Addressable events can link to a goal by using a `goal` tag specifying the event id and an optional relay hint.

-```json
+```jsonc
 {
-  ...
  "kind": 3xxxx,
  "tags": [
-    ...
    ["goal", "<event id>", "<Relay URL (optional)>"],
+    // rest of tags...
  ],
-  ...
+  // other fields...
 }
 ```

@@ -77,7 +77,7 @@ Clients MAY display funding goals on user profiles.

 When zapping a goal event, clients MUST include the relays in the `relays` tag of the goal event in the zap request `relays` tag.

-When zapping a parameterized replaceable event with a `goal` tag, clients SHOULD tag the goal event id in the `e` tag of the zap request.
+When zapping an addressable event with a `goal` tag, clients SHOULD tag the goal event id in the `e` tag of the zap request.

 ## Use cases

--- a/78.md
+++ b/78.md
@@ -12,7 +12,7 @@ Even though interoperability is great, some apps do not want or do not need inte

 ## Nostr event

-This NIP specifies the use of event kind `30078` (parameterized replaceable event) with a `d` tag containing some reference to the app name and context -- or any other arbitrary string. `content` and other `tags` can be anything or in any format.
+This NIP specifies the use of event kind `30078` (an _addressable_ event) with a `d` tag containing some reference to the app name and context -- or any other arbitrary string. `content` and other `tags` can be anything or in any format.

 ## Some use cases

--- a/84.md
+++ b/84.md
@@ -26,14 +26,14 @@ useful when highlighting non-nostr content for which the client might be able to
 (e.g. prompting the user or reading a `<meta name="nostr:nprofile1..." />` tag on the document). A role MAY be included as the
 last value of the tag.

-```json
+```jsonc
 {
  "tags": [
    ["p", "<pubkey-hex>", "<relay-url>", "author"],
    ["p", "<pubkey-hex>", "<relay-url>", "author"],
    ["p", "<pubkey-hex>", "<relay-url>", "editor"]
  ],
-  ...
+  // other fields...
 }
 ```

--- a/89.md
+++ b/89.md
@@ -27,7 +27,7 @@ There are three actors to this workflow:
 ## Events

 ### Recommendation event
-```json
+```jsonc
 {
  "kind": 31989,
  "pubkey": <recommender-user-pubkey>,
@@ -35,7 +35,8 @@ There are three actors to this workflow:
    ["d", <supported-event-kind>],
    ["a", "31990:app1-pubkey:<d-identifier>", "wss://relay1", "ios"],
    ["a", "31990:app2-pubkey:<d-identifier>", "wss://relay2", "web"]
-  ]
+  ],
+  // other fields...
 }
 ```

@@ -47,7 +48,7 @@ The second value of the tag SHOULD be a relay hint.
 The third value of the tag SHOULD be the platform where this recommendation might apply.

 ## Handler information
-```json
+```jsonc
 {
  "kind": 31990,
  "pubkey": "<application-pubkey>",
@@ -59,7 +60,8 @@ The third value of the tag SHOULD be the platform where this recommendation migh
    ["web", "https://..../p/<bech32>", "nprofile"],
    ["web", "https://..../e/<bech32>"],
    ["ios", ".../<bech32>"]
-  ]
+  ],
+  // other fields...
 }
 ```

@@ -77,13 +79,13 @@ A tag without a second value in the array SHOULD be considered a generic handler
 # Client tag
 When publishing events, clients MAY include a `client` tag. Identifying the client that published the note. This tag is a tuple of `name`, `address` identifying a handler event and, a relay `hint` for finding the handler event. This has privacy implications for users, so clients SHOULD allow users to opt-out of using this tag.

-```json
+```jsonc
 {
  "kind": 1,
  "tags": [
    ["client", "My Client", "31990:app1-pubkey:<d-identifier>", "wss://relay1"]
  ]
-  ...
+  // other fields...
 }
 ```

@@ -99,14 +101,14 @@ The client MIGHT query for the user's and the user's follows handler.
 ### User A recommends a `kind:31337`-handler
 User A might be a user of Zapstr, a `kind:31337`-centric client (tracks). Using Zapstr, user A publishes an event recommending Zapstr as a `kind:31337`-handler.

-```json
+```jsonc
 {
  "kind": 31989,
  "tags": [
    ["d", "31337"],
    ["a", "31990:1743058db7078661b94aaf4286429d97ee5257d14a86d6bfa54cb0482b876fb0:abcd", <relay-url>, "web"]
  ],
-  ...
+  // other fields...
 }
 ```

@@ -115,7 +117,7 @@ User B might see in their timeline an event referring to a `kind:31337` event (e

 User B's client, not knowing how to handle a `kind:31337` might display the event using its `alt` tag (as described in NIP-31). When the user clicks on the event, the application queries for a handler for this `kind`:

-```json
+```
 ["REQ", <id>, { "kinds": [31989], "#d": ["31337"], "authors": [<user>, <users-contact-list>] }]
 ```

@@ -126,6 +128,6 @@ User B's client sees the application's `kind:31990` which includes the informati
 ### Alternative query bypassing `kind:31989`
 Alternatively, users might choose to query directly for `kind:31990` for an event kind. Clients SHOULD be careful doing this and use spam-prevention mechanisms or querying high-quality restricted relays to avoid directing users to malicious handlers.

-```json
+```
 ["REQ", <id>, { "kinds": [31990], "#k": [<desired-event-kind>], "authors": [...] }]
 ```
--- a/90.md
+++ b/90.md
@@ -36,7 +36,7 @@ There are two actors in the workflow described in this NIP:
 ## Job request (`kind:5000-5999`)
 A request to process data, published by a customer. This event signals that a customer is interested in receiving the result of some kind of compute.

-```json
+```jsonc
 {
    "kind": 5xxx, // kind in 5000-5999 range
    "content": "",
@@ -46,7 +46,8 @@ A request to process data, published by a customer. This event signals that a cu
        [ "relays", "wss://..." ],
        [ "bid", "<msat-amount>" ],
        [ "t", "bitcoin" ]
-    ]
+    ],
+    // other fields...
 }
 ```

@@ -81,19 +82,18 @@ If the user wants to keep the input parameters a secret, they can encrypt the `i
  ["param", "top-p", "0.7"],
  ["param", "frequency_penalty", "1"]
 ]
-
 ```

 This param data will be encrypted and added to the `content` field and `p` tag should be present

-```json
+```jsonc
 {
  "content": "BE2Y4xvS6HIY7TozIgbEl3sAHkdZoXyLRRkZv4fLPh3R7LtviLKAJM5qpkC7D6VtMbgIt4iNcMpLtpo...",
  "tags": [
    ["p", "04f74530a6ede6b24731b976b8e78fb449ea61f40ff10e3d869a3030c4edc91f"],
    ["encrypted"]
  ],
-  ...
+  // other fields...
 }
 ```

@@ -102,7 +102,7 @@ This param data will be encrypted and added to the `content` field and `p` tag s

 Service providers publish job results, providing the output of the job result. They should tag the original job request event id as well as the customer's pubkey.

-```json
+```jsonc
 {
  "pubkey": "<service-provider pubkey>",
  "content": "<payload>",
@@ -114,7 +114,7 @@ Service providers publish job results, providing the output of the job result. T
    ["p", "<customer's-pubkey>"],
    ["amount", "requested-payment-amount", "<optional-bolt11>"]
  ],
-  ...
+  // other fields...
 }
 ```

@@ -127,7 +127,7 @@ Service providers publish job results, providing the output of the job result. T
 If the request has encrypted params, then output should be encrypted and placed in  `content` field. If the output is encrypted, then avoid including `i` tag with input-data as clear text.
 Add a tag encrypted to mark the output content as `encrypted`

-```json
+```jsonc
 {
  "pubkey": "<service-provider pubkey>",
  "content": "<encrypted payload>",
@@ -139,7 +139,7 @@ Add a tag encrypted to mark the output content as `encrypted`
    ["amount", "requested-payment-amount", "<optional-bolt11>"],
    ["encrypted"]
  ],
-  ...
+  // other fields...
 }
 ```

@@ -147,7 +147,7 @@ Add a tag encrypted to mark the output content as `encrypted`

 Service providers can give feedback about a job back to the customer.

-```json
+```jsonc
 {
  "kind": 7000,
  "content": "<empty-or-payload>",
@@ -157,7 +157,7 @@ Service providers can give feedback about a job back to the customer.
    ["e", "<job-request-id>", "<relay-hint>"],
    ["p", "<customer's-pubkey>"],
  ],
-  ...
+  // other fields...
 }
 ```

@@ -211,7 +211,7 @@ This gives a higher level of flexibility to service providers (which sophisticat
 # Appendix 2: Service provider discoverability
 Service Providers MAY use NIP-89 announcements to advertise their support for job kinds:

-```js
+```jsonc
 {
  "kind": 31990,
  "pubkey": "<pubkey>",
@@ -223,7 +223,7 @@ Service Providers MAY use NIP-89 announcements to advertise their support for jo
    ["k", "5005"], // e.g. translation
    ["t", "bitcoin"] // e.g. optionally advertises it specializes in bitcoin audio transcription that won't confuse "Drivechains" with "Ridechains"
  ],
-  ...
+  // other fields...
 }
 ```

--- a/94.md
+++ b/94.md
@@ -26,27 +26,28 @@ This NIP specifies the use of the `1063` event type, having in `content` a descr
 * `summary` (optional) text excerpt
 * `alt` (optional) description for accessibility
 * `fallback` (optional) zero or more fallback file sources in case `url` fails
+* `service` (optional) service type which is serving the file (eg. [NIP-96](96.md))

-```json
+```jsonc
 {
  "kind": 1063,
  "tags": [
    ["url",<string with URI of file>],
    ["m", <MIME type>],
-    ["x",<Hash SHA-256>],
-    ["ox",<Hash SHA-256>],
+    ["x", <Hash SHA-256>],
+    ["ox", <Hash SHA-256>],
    ["size", <size of file in bytes>],
    ["dim", <size of file in pixels>],
-    ["magnet",<magnet URI> ],
-    ["i",<torrent infohash>],
+    ["magnet", <magnet URI> ],
+    ["i", <torrent infohash>],
    ["blurhash", <value>],
-    ["thumb", <string with thumbnail URI>],
-    ["image", <string with preview URI>],
+    ["thumb", <string with thumbnail URI>, <Hash SHA-256>],
+    ["image", <string with preview URI>, <Hash SHA-256>],
    ["summary", <excerpt>],
    ["alt", <description>]
  ],
  "content": "<caption>",
-  ...
+  // other fields...
 }
 ```

--- a/96.md
+++ b/96.md
@@ -1,6 +1,8 @@
-# NIP-96
+NIP-96
+======

-## HTTP File Storage Integration
+HTTP File Storage Integration
+-----------------------------

 `draft` `optional`

@@ -17,7 +19,7 @@ will not have to learn anything about nostr relays.

 File storage servers wishing to be accessible by nostr users should opt-in by making available an https route at `/.well-known/nostr/nip96.json` with `api_url`:

-```js
+```jsonc
 {
  // Required
  // File upload and deletion are served from this url
@@ -57,7 +59,7 @@ File storage servers wishing to be accessible by nostr users should opt-in by ma
      "file_expiration": [14, 90],
      "media_transformations": {
        "image": [
-          'resizing'
+          "resizing"
        ]
      }
    }
@@ -125,14 +127,14 @@ The `server` MUST link the user's `pubkey` string as the owner of the file so to

 The upload response is a json object as follows:

-```js
+```jsonc
 {
  // "success" if successful or "error" if not
-  status: "success",
+  "status": "success",
  // Free text success, failure or info message
-  message: "Upload successful.",
+  "message": "Upload successful.",
  // Optional. See "Delayed Processing" section
-  processing_url: "...",
+  "processing_url": "...",
  // This uses the NIP-94 event format but DO NOT need
  // to fill some fields like "id", "pubkey", "created_at" and "sig"
  //
@@ -141,9 +143,9 @@ The upload response is a json object as follows:
  // and, optionally, all file metadata the server wants to make available
  //
  // nip94_event field is absent if unsuccessful upload
-  nip94_event: {
+  "nip94_event": {
    // Required tags: "url" and "ox"
-    tags: [
+    "tags": [
      // Can be same from /.well-known/nostr/nip96.json's "download_url" field
      // (or "api_url" field if "download_url" is absent or empty) with appended
      // original file hash.
@@ -164,12 +166,12 @@ The upload response is a json object as follows:
      // The server can but does not need to store this value.
      ["x", "543244319525d9d08dd69cb716a18158a249b7b3b3ec4bbde5435543acb34443"],
      // Optional. Recommended for helping clients to easily know file type before downloading it.
-      ["m", "image/png"]
+      ["m", "image/png"],
      // Optional. Recommended for helping clients to reserve an adequate UI space to show the file before downloading it.
      ["dim", "800x600"]
      // ... other optional NIP-94 tags
    ],
-    content: ""
+    "content": ""
  },
  // ... other custom fields (please consider adding them to this NIP or to NIP-94 tags)
 }
@@ -200,12 +202,12 @@ the file processing is done.

 If the processing isn't done, the server should reply at the `processing_url` url with **200 OK** and the following JSON:

-```
+```jsonc
 {
  // It should be "processing". If "error" it would mean the processing failed.
-  status: "processing",
-  message: "Processing. Please check again later for updated status.",
-  percentage: 15 // Processing percentage. An integer between 0 and 100.
+  "status": "processing",
+  "message": "Processing. Please check again later for updated status.",
+  "percentage": 15 // Processing percentage. An integer between 0 and 100.
 }
 ```

@@ -268,10 +270,10 @@ in the same file hash).

 The successful response is a 200 OK one with just basic JSON fields:

-```
+```json
 {
-  status: "success",
-  message: "File deleted."
+  "status": "success",
+  "message": "File deleted."
 }
 ```

@@ -285,7 +287,7 @@ Returns a list of files linked to the authenticated users pubkey.

 Example Response:

-```js
+```jsonc
 {
  "count": 1, // server page size, eg. max(1, min(server_max_page_size, arg_count))
  "total": 1, // total number of files
@@ -293,17 +295,16 @@ Example Response:
  "files": [
    {
      "tags": [
-        ["ox": "719171db19525d9d08dd69cb716a18158a249b7b3b3ec4bbdec5698dca104b7b"],
-        ["x": "5d2899290e0e69bcd809949ee516a4a1597205390878f780c098707a7f18e3df"],
+        ["ox", "719171db19525d9d08dd69cb716a18158a249b7b3b3ec4bbdec5698dca104b7b"],
+        ["x", "5d2899290e0e69bcd809949ee516a4a1597205390878f780c098707a7f18e3df"],
        ["size", "123456"],
        ["alt", "a meme that makes you laugh"],
        ["expiration",  "1715691139"],
        // ...other metadata
-      ]
+      ],
      "content": "haha funny meme", // caption
      "created_at": 1715691130 // upload timestamp
-    },
-    ...
+    }
  ]
 }
 ```
@@ -322,14 +323,14 @@ Note: HTTP File Storage Server developers may skip this section. This is meant f
 A File Server Preference event is a kind 10096 replaceable event meant to select one or more servers the user wants
 to upload files to. Servers are listed as `server` tags:

-```js
-{
-  // ...
+```json
+{.
  "kind": 10096,
  "content": "",
  "tags": [
    ["server", "https://file.server.one"],
    ["server", "https://file.server.two"]
-  ]
+  ],
+  // other fields...
 }
 ```
--- a/99.md
+++ b/99.md
@@ -6,7 +6,7 @@ Classified Listings

 `draft` `optional`

-This NIP defines `kind:30402`: a parameterized replaceable event to describe classified listings that list any arbitrary product, service, or other thing for sale or offer and includes enough structured metadata to make them useful.
+This NIP defines `kind:30402`: an addressable event to describe classified listings that list any arbitrary product, service, or other thing for sale or offer and includes enough structured metadata to make them useful.

 The category of classifieds includes a very broad range of physical goods, services, work opportunities, rentals, free giveaways, personals, etc. and is distinct from the more strictly structured marketplaces defined in [NIP-15](15.md) that often sell many units of specific products through very specific channels.

@@ -26,7 +26,7 @@ The `.pubkey` field of these events are treated as the party creating the listin

 ### Metadata

- For "tags"/"hashtags" (i.e. categories or keywords of relevance for the listing) the `"t"` event tag should be used, as per [NIP-12](12.md).
+- For "tags"/"hashtags" (i.e. categories or keywords of relevance for the listing) the `"t"` event tag should be used.
 - For images, whether included in the markdown content or not, clients SHOULD use `image` tags as described in [NIP-58](58.md). This allows clients to display images in carousel format more easily.

 The following tags, used for structured metadata, are standardized and SHOULD be included. Other tags may be added as necessary.
@@ -54,7 +54,7 @@ Other standard tags that might be useful.

 ## Example Event

-```json
+```jsonc
 {
  "kind": 30402,
  "created_at": 1675642635,
--- a/BREAKING.md
+++ b/BREAKING.md
@@ -5,6 +5,8 @@ reverse chronological order.

 | Date        | Commit    | NIP      | Change |
 | ----------- | --------- | -------- | ------ |
+| 2024-10-07  | [7bb8997b](https://github.com/nostr-protocol/nips/commit/7bb8997b) | [NIP-55](55.md) | some fields and passing data were changed |
+| 2024-08-18  | [3aff37bd](https://github.com/nostr-protocol/nips/commit/3aff37bd) | [NIP-54](54.md) | content should be Asciidoc |
 | 2024-07-31  | [3ea2f1a4](https://github.com/nostr-protocol/nips/commit/3ea2f1a4) | [NIP-45](45.md) | [444ad28d](https://github.com/nostr-protocol/nips/commit/444ad28d) was reverted |
 | 2024-07-30  | [444ad28d](https://github.com/nostr-protocol/nips/commit/444ad28d) | [NIP-45](45.md) | NIP-45 was deprecated |
 | 2024-07-26  | [ecee40df](https://github.com/nostr-protocol/nips/commit/ecee40df) | [NIP-19](19.md) | `nrelay` was deprecated |
@@ -47,6 +49,7 @@ reverse chronological order.
 | 2023-06-18  | [83cbd3e1](https://github.com/nostr-protocol/nips/commit/83cbd3e1) | [NIP-11](11.md) | 'image' was renamed to 'icon' |
 | 2023-04-13  | [bf0a0da6](https://github.com/nostr-protocol/nips/commit/bf0a0da6) | [NIP-15](15.md) | different NIP was re-added as NIP-15 |
 | 2023-04-09  | [fb5b7c73](https://github.com/nostr-protocol/nips/commit/fb5b7c73) | [NIP-15](15.md) | NIP-15 was merged into NIP-01 |
+| 2023-03-29  | [599e1313](https://github.com/nostr-protocol/nips/commit/599e1313) | [NIP-18](18.md) | NIP-18 was bring back |
 | 2023-03-15  | [e1004d3d](https://github.com/nostr-protocol/nips/commit/e1004d3d) | [NIP-19](19.md) | `1: relay` was changed to optionally |

 Breaking changes prior to 2023-03-01 are not yet documented.
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 - [NIP-06: Basic key derivation from mnemonic seed phrase](06.md)
 - [NIP-07: `window.nostr` capability for web browsers](07.md)
 - [NIP-08: Handling Mentions](08.md) --- **unrecommended**: deprecated in favor of [NIP-27](27.md)
- [NIP-09: Event Deletion](09.md)
+- [NIP-09: Event Deletion Request](09.md)
 - [NIP-10: Conventions for clients' use of `e` and `p` tags in text events](10.md)
 - [NIP-11: Relay Information Document](11.md)
 - [NIP-13: Proof of Work](13.md)
@@ -73,10 +73,12 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 - [NIP-57: Lightning Zaps](57.md)
 - [NIP-58: Badges](58.md)
 - [NIP-59: Gift Wrap](59.md)
+- [NIP-64: Chess (PGN)](64.md)
 - [NIP-65: Relay List Metadata](65.md)
 - [NIP-70: Protected Events](70.md)
 - [NIP-71: Video Events](71.md)
 - [NIP-72: Moderated Communities](72.md)
+- [NIP-73: External Content IDs](73.md)
 - [NIP-75: Zap Goals](75.md)
 - [NIP-78: Application-specific data](78.md)
 - [NIP-84: Highlights](84.md)
@@ -97,7 +99,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `2`           | Recommend Relay                 | 01 (deprecated)                        |
 | `3`           | Follows                         | [02](02.md)                            |
 | `4`           | Encrypted Direct Messages       | [04](04.md)                            |
-| `5`           | Event Deletion                  | [09](09.md)                            |
+| `5`           | Event Deletion Request          | [09](09.md)                            |
 | `6`           | Repost                          | [18](18.md)                            |
 | `7`           | Reaction                        | [25](25.md)                            |
 | `8`           | Badge Award                     | [58](58.md)                            |
@@ -108,11 +110,13 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `13`          | Seal                            | [59](59.md)                            |
 | `14`          | Direct Message                  | [17](17.md)                            |
 | `16`          | Generic Repost                  | [18](18.md)                            |
+| `17`          | Reaction to a website           | [25](25.md)                            |
 | `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)                            |
+| `64`          | Chess (PGN)                     | [64](64.md)                            |
 | `818`         | Merge Requests                  | [54](54.md)                            |
 | `1021`        | Bid                             | [15](15.md)                            |
 | `1022`        | Bid confirmation                | [15](15.md)                            |
@@ -127,6 +131,8 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `1971`        | Problem Tracker                 | [nostrocket][nostrocket]               |
 | `1984`        | Reporting                       | [56](56.md)                            |
 | `1985`        | Label                           | [32](32.md)                            |
+| `1986`        | Relay reviews                   |                                        |
+| `1987`        | AI Embeddings / Vector lists    | [NKBIP-02]                             |
 | `2003`        | Torrent                         | [35](35.md)                            |
 | `2004`        | Torrent Comment                 | [35](35.md)                            |
 | `2022`        | Coinjoin Pool                   | [joinstr][joinstr]                     |
@@ -136,6 +142,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `7000`        | Job Feedback                    | [90](90.md)                            |
 | `9000`-`9030` | Group Control Events            | [29](29.md)                            |
 | `9041`        | Zap Goal                        | [75](75.md)                            |
+| `9467`        | Tidal login                     | [Tidal-nostr]                          |
 | `9734`        | Zap Request                     | [57](57.md)                            |
 | `9735`        | Zap                             | [57](57.md)                            |
 | `9802`        | Highlights                      | [84](84.md)                            |
@@ -151,6 +158,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `10015`       | Interests list                  | [51](51.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)                            |
 | `13194`       | Wallet Info                     | [47](47.md)                            |
 | `21000`       | Lightning Pub RPC               | [Lightning.Pub][lnpub]                 |
@@ -158,6 +166,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `23194`       | Wallet Request                  | [47](47.md)                            |
 | `23195`       | Wallet Response                 | [47](47.md)                            |
 | `24133`       | Nostr Connect                   | [46](46.md)                            |
+| `24242`       | Blobs stored on mediaservers    | [Blossom][blossom]                     |
 | `27235`       | HTTP Auth                       | [98](98.md)                            |
 | `30000`       | Follow sets                     | [51](51.md)                            |
 | `30001`       | Generic lists                   | [51](51.md)                            |
@@ -165,6 +174,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `30003`       | Bookmark sets                   | [51](51.md)                            |
 | `30004`       | Curation sets                   | [51](51.md)                            |
 | `30005`       | Video sets                      | [51](51.md)                            |
+| `30007`       | Kind mute sets                  | [51](51.md)                            |
 | `30008`       | Profile Badges                  | [58](58.md)                            |
 | `30009`       | Badge Definition                | [58](58.md)                            |
 | `30015`       | Interest sets                   | [51](51.md)                            |
@@ -175,16 +185,20 @@ 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]                             |
 | `30063`       | Release artifact sets           | [51](51.md)                            |
 | `30078`       | Application-specific Data       | [78](78.md)                            |
 | `30311`       | Live Event                      | [53](53.md)                            |
 | `30315`       | User Statuses                   | [38](38.md)                            |
+| `30388`       | Slide Set                       | [Corny Chat][cornychat-slideset]       |
 | `30402`       | Classified Listing              | [99](99.md)                            |
 | `30403`       | Draft Classified Listing        | [99](99.md)                            |
 | `30617`       | Repository announcements        | [34](34.md)                            |
 | `30618`       | Repository state announcements  | [34](34.md)                            |
 | `30818`       | Wiki article                    | [54](54.md)                            |
 | `30819`       | Redirects                       | [54](54.md)                            |
+| `31388`       | Link Set                        | [Corny Chat][cornychat-linkset]        |
 | `31890`       | Feed                            | [NUD: Custom Feeds][NUD: Custom Feeds] |
 | `31922`       | Date-Based Calendar Event       | [52](52.md)                            |
 | `31923`       | Time-Based Calendar Event       | [52](52.md)                            |
@@ -198,10 +212,16 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `34550`       | Community Definition            | [72](72.md)                            |
 | `39000-9`     | Group metadata events           | [29](29.md)                            |

-[NUD: Custom Feeds]: https://wikifreedia.xyz/cip-01/97c70a44366a6535c1
+[NUD: Custom Feeds]: https://wikifreedia.xyz/cip-01/
 [nostrocket]: https://github.com/nostrocket/NIPS/blob/main/Problems.md
 [lnpub]: https://github.com/shocknet/Lightning.Pub/blob/master/proto/autogenerated/client.md
+[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
+[blossom]: https://github.com/hzrd149/blossom
+[Tidal-nostr]: https://wikistr.com/tidal-nostr

 ## Message types

@@ -229,56 +249,56 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos

 ## Standardized Tags

-| name              | value                                | other parameters                | NIP                                   |
-| ----------------- | ------------------------------------ | ------------------------------- | ------------------------------------- |
-| `e`               | event id (hex)                       | relay URL, marker, pubkey (hex) | [01](01.md), [10](10.md)              |
-| `p`               | pubkey (hex)                         | relay URL, petname              | [01](01.md), [02](02.md)              |
-| `a`               | coordinates to an event              | relay URL                       | [01](01.md)                           |
-| `d`               | identifier                           | --                              | [01](01.md)                           |
-| `-`               | --                                   | --                              | [70](70.md)                           |
-| `g`               | geohash                              | --                              | [52](52.md)                           |
-| `h`               | group id                             | --                              | [29](29.md)                           |
-| `i`               | identity                             | proof                           | [39](39.md)                           |
-| `k`               | kind number (string)                 | --                              | [18](18.md), [25](25.md), [72](72.md) |
-| `l`               | label, label namespace               | --                              | [32](32.md)                           |
-| `L`               | label namespace                      | --                              | [32](32.md)                           |
-| `m`               | MIME type                            | --                              | [94](94.md)                           |
-| `q`               | event id (hex)                       | relay URL                       | [18](18.md)                           |
-| `r`               | a reference (URL, etc)               | petname                         | [24](24.md)                           |
-| `r`               | relay url                            | marker                          | [65](65.md)                           |
-| `t`               | hashtag                              | --                              |                                       |
-| `alt`             | summary                              | --                              | [31](31.md)                           |
-| `amount`          | millisatoshis, stringified           | --                              | [57](57.md)                           |
-| `bolt11`          | `bolt11` invoice                     | --                              | [57](57.md)                           |
-| `challenge`       | challenge string                     | --                              | [42](42.md)                           |
-| `client`          | name, address                        | relay URL                       | [89](89.md)                           |
-| `clone`           | git clone URL                        | --                              | [34](34.md)                           |
-| `content-warning` | reason                               | --                              | [36](36.md)                           |
-| `delegation`      | pubkey, conditions, delegation token | --                              | [26](26.md)                           |
-| `description`     | description                          | --                              | [34](34.md), [57](57.md), [58](58.md) |
-| `emoji`           | shortcode, image URL                 | --                              | [30](30.md)                           |
-| `encrypted`       | --                                   | --                              | [90](90.md)                           |
-| `expiration`      | unix timestamp (string)              | --                              | [40](40.md)                           |
-| `goal`            | event id (hex)                       | relay URL                       | [75](75.md)                           |
-| `image`           | image URL                            | dimensions in pixels            | [23](23.md), [58](58.md)              |
-| `imeta`           | inline metadata                      | --                              | [92](92.md)                           |
-| `lnurl`           | `bech32` encoded `lnurl`             | --                              | [57](57.md)                           |
-| `location`        | location string                      | --                              | [52](52.md), [99](99.md)              |
-| `name`            | name                                 | --                              | [34](34.md), [58](58.md), [72](72.md) |
-| `nonce`           | random                               | difficulty                      | [13](13.md)                           |
-| `preimage`        | hash of `bolt11` invoice             | --                              | [57](57.md)                           |
-| `price`           | price                                | currency, frequency             | [99](99.md)                           |
-| `proxy`           | external ID                          | protocol                        | [48](48.md)                           |
-| `published_at`    | unix timestamp (string)              | --                              | [23](23.md)                           |
-| `relay`           | relay url                            | --                              | [42](42.md), [17](17.md)              |
-| `relays`          | relay list                           | --                              | [57](57.md)                           |
-| `server`          | file storage server url              | --                              | [96](96.md)                           |
-| `subject`         | subject                              | --                              | [14](14.md), [17](17.md)              |
-| `summary`         | article summary                      | --                              | [23](23.md)                           |
-| `thumb`           | badge thumbnail                      | dimensions in pixels            | [58](58.md)                           |
-| `title`           | article title                        | --                              | [23](23.md)                           |
-| `web`             | webpage URL                          | --                              | [34](34.md)                           |
-| `zap`             | pubkey (hex), relay URL              | weight                          | [57](57.md)                           |
+| name              | value                                | other parameters                | NIP                                                |
+| ----------------- | ------------------------------------ | ------------------------------- | -------------------------------------------------- |
+| `e`               | event id (hex)                       | relay URL, marker, pubkey (hex) | [01](01.md), [10](10.md)                           |
+| `p`               | pubkey (hex)                         | relay URL, petname              | [01](01.md), [02](02.md)                           |
+| `a`               | coordinates to an event              | relay URL                       | [01](01.md)                                        |
+| `d`               | identifier                           | --                              | [01](01.md)                                        |
+| `-`               | --                                   | --                              | [70](70.md)                                        |
+| `g`               | geohash                              | --                              | [52](52.md)                                        |
+| `h`               | group id                             | --                              | [29](29.md)                                        |
+| `i`               | external identity                    | proof, url hint                 | [39](39.md), [73](73.md)                           |
+| `k`               | kind                                 | --                              | [18](18.md), [25](25.md), [72](72.md), [73](73.md) |
+| `l`               | label, label namespace               | --                              | [32](32.md)                                        |
+| `L`               | label namespace                      | --                              | [32](32.md)                                        |
+| `m`               | MIME type                            | --                              | [94](94.md)                                        |
+| `q`               | event id (hex)                       | relay URL, pubkey (hex)         | [18](18.md)                                        |
+| `r`               | a reference (URL, etc)               | --                              | [24](24.md), [25](25.md)                           |
+| `r`               | relay url                            | marker                          | [65](65.md)                                        |
+| `t`               | hashtag                              | --                              | [24](24.md), [34](34.md)                           |
+| `alt`             | summary                              | --                              | [31](31.md)                                        |
+| `amount`          | millisatoshis, stringified           | --                              | [57](57.md)                                        |
+| `bolt11`          | `bolt11` invoice                     | --                              | [57](57.md)                                        |
+| `challenge`       | challenge string                     | --                              | [42](42.md)                                        |
+| `client`          | name, address                        | relay URL                       | [89](89.md)                                        |
+| `clone`           | git clone URL                        | --                              | [34](34.md)                                        |
+| `content-warning` | reason                               | --                              | [36](36.md)                                        |
+| `delegation`      | pubkey, conditions, delegation token | --                              | [26](26.md)                                        |
+| `description`     | description                          | --                              | [34](34.md), [57](57.md), [58](58.md)              |
+| `emoji`           | shortcode, image URL                 | --                              | [30](30.md)                                        |
+| `encrypted`       | --                                   | --                              | [90](90.md)                                        |
+| `expiration`      | unix timestamp (string)              | --                              | [40](40.md)                                        |
+| `goal`            | event id (hex)                       | relay URL                       | [75](75.md)                                        |
+| `image`           | image URL                            | dimensions in pixels            | [23](23.md), [52](52.md), [58](58.md)              |
+| `imeta`           | inline metadata                      | --                              | [92](92.md)                                        |
+| `lnurl`           | `bech32` encoded `lnurl`             | --                              | [57](57.md)                                        |
+| `location`        | location string                      | --                              | [52](52.md), [99](99.md)                           |
+| `name`            | name                                 | --                              | [34](34.md), [58](58.md), [72](72.md)              |
+| `nonce`           | random                               | difficulty                      | [13](13.md)                                        |
+| `preimage`        | hash of `bolt11` invoice             | --                              | [57](57.md)                                        |
+| `price`           | price                                | currency, frequency             | [99](99.md)                                        |
+| `proxy`           | external ID                          | protocol                        | [48](48.md)                                        |
+| `published_at`    | unix timestamp (string)              | --                              | [23](23.md)                                        |
+| `relay`           | relay url                            | --                              | [42](42.md), [17](17.md)                           |
+| `relays`          | relay list                           | --                              | [57](57.md)                                        |
+| `server`          | file storage server url              | --                              | [96](96.md)                                        |
+| `subject`         | subject                              | --                              | [14](14.md), [17](17.md), [34](34.md)              |
+| `summary`         | summary                              | --                              | [23](23.md), [52](52.md)                           |
+| `thumb`           | badge thumbnail                      | dimensions in pixels            | [58](58.md)                                        |
+| `title`           | article title                        | --                              | [23](23.md)                                        |
+| `web`             | webpage URL                          | --                              | [34](34.md)                                        |
+| `zap`             | pubkey (hex), relay URL              | weight                          | [57](57.md)                                        |

 Please update these lists when proposing new NIPs.
Author	SHA1	Message	Date
pablof7z	7fc031151c	change number	2024-10-21 12:27:00 +01:00
pablof7z	086335713c	reformat	2024-10-20 01:05:23 +01:00
pablof7z	5e2ad4b3bb	add note about timing analysis	2024-10-20 01:04:11 +01:00
pablof7z	b5774a1338	wip	2024-10-20 00:57:11 +01:00
hodlbod	07de7ea7e5	Merge pull request #1524 from AsaiToshiya/AsaiToshiya-patch-27 README: add NIP-73 `k` tag	2024-10-18 14:20:59 -07:00
Asai Toshiya	743e925ca5	Merge branch 'master' into AsaiToshiya-patch-27	2024-10-18 22:57:17 +09:00
Kieran	1cda2dcc59	Merge pull request #1261 from nostr-protocol/nip71-imeta NIP-71: `imeta`	2024-10-15 11:16:49 +01:00
Kieran	1e2f19863c	Merge branch 'master' into nip71-imeta	2024-10-15 11:15:54 +01:00
hodlbod	e381b577c9	Merge pull request #1530 from AsaiToshiya/AsaiToshiya-patch-28 BREAKING.md: add NIP-55 change	2024-10-09 08:40:23 -07:00
Asai Toshiya	79cc2ef215	add NIP-55 change.	2024-10-10 00:28:12 +09:00
Asai Toshiya	22c11cb243	update `q` tag params.	2024-10-08 21:01:53 +09:00
Alex Gleason	38af1efe77	Merge pull request #1525 from coracle-social/clarify-quote-reposts Clarify quote reposts	2024-10-07 15:47:54 -05:00
hodlbod	23ef4aa05b	Merge pull request #1527 from AsaiToshiya/remove-nip12-mention NIP-23, NIP-99: remove NIP-12 mention	2024-10-07 09:58:12 -07:00
Asai Toshiya	10c112defe	NIP-23, NIP-99: remove NIP-12 mention	2024-10-08 01:40:41 +09:00
Jon Staab	4769b1658a	Refer to nip 21 instead of 19	2024-10-07 08:56:52 -07:00
Vic	db13d12eb6	Add Corny Chat Slide Set and Link Set kinds (#1152 )	2024-10-07 08:03:20 -03:00
DASHU	7bb8997be5	fix some info of nip55 to be same as other nips	2024-10-07 07:57:03 -03:00
Jon Staab	7df7deebf5	Move generic reposts back to bottom for a simpler diff	2024-10-03 09:39:03 -07:00
Jon Staab	2053aee0c2	Remove addresses and tags from quote reposts	2024-10-03 09:35:09 -07:00
hodlbod	f5a6fb258f	Update 18.md Co-authored-by: Asai Toshiya <to.asai.60@gmail.com>	2024-10-03 09:31:17 -07:00
Jon Staab	78b6615c21	recommend k tag for quotes	2024-10-02 14:50:10 -07:00
Jon Staab	02e934acb7	Clarify quote reposts	2024-10-02 13:22:52 -07:00
Asai Toshiya	7f67ce53fb	Format tags table	2024-10-02 23:19:35 +09:00
Asai Toshiya	344b0b9a72	README: add NIP-73 link to `k` tag	2024-10-02 23:15:20 +09:00
hodlbod	e830a73cbd	Merge pull request #1523 from coracle-social/clarify-filters Clarify tag filters	2024-09-30 09:47:10 -07:00
Jon Staab	ce2234e0ba	Clarify tag filters	2024-09-30 09:18:13 -07:00
fiatjaf	a736e629be	complete renaming to "addressable" events. as noticed by @bezysoftware at https://github.com/nostr-protocol/nips/pull/1437#issuecomment-2380626514. I don't know how so many of these instances were left from the original PR at following `ca3c52e3e7`.	2024-09-28 12:29:03 -03:00
hodlbod	4438b892d8	Merge pull request #1508 from MerryOscar/expand-external-content-ids NIP-73 - Expand External Content IDs	2024-09-25 15:15:46 -07:00
Lux	4e73e94d41	fix typo on nip96 (#1511 ) Fixing typo	2024-09-22 06:47:39 -03:00
fiatjaf	d82f68aa2e	update link to blossom on README.	2024-09-21 11:52:09 -03:00
dluvian	ea36ec9ed7	Add `subject` and `t` tags to git issues (#1446 ) * Add subject and and l tags to git issues * Replace `l` with `t` tags * Add nip34 to tag table * List nip34 under subject instead of summary	2024-09-20 17:08:47 -03:00
Oscar Merry	79786bb7bb	Expand External Content IDs	2024-09-20 16:21:15 +01:00
Asai Toshiya	ff39a11611	Merge pull request #1469 from AsaiToshiya/AsaiToshiya-patch-27 NIP-65: add link to outbox model article	2024-09-19 08:33:11 +09:00
fiatjaf	6cd598d02c	remove NIP-88 polls temporarily. due to some crazy fight happening at https://github.com/nostr-protocol/nips/pull/1501 I'm removing this until people can become more reasonable.	2024-09-17 18:56:57 -03:00
Alex Gleason	2baf7c87ef	Merge pull request #1501 from alexgleason/polls-replaceable NIP-88: make poll response a parameterized replaceable event	2024-09-17 16:17:00 -05:00
Alex Gleason	3d8bf682b6	NIP-88: make poll response a parameterized replaceable event	2024-09-17 09:22:40 -05:00
fiatjaf	d534bade71	renumber polls NIP to 88. this one: https://github.com/nostr-protocol/nips/pull/1346	2024-09-17 11:04:01 -03:00
fiatjaf_	4bf0c01144	Merge pull request #1346 from abhay-raizada/nostr-polls NIP-118, Polls on Nostr	2024-09-17 11:01:18 -03:00
fiatjaf	efcc86950d	remove this annoying file.	2024-09-13 16:17:35 -03:00
Zig Blathazar	37a02e817b	custom emojis in reactions (#1492 )	2024-09-12 10:15:47 -03:00
hodlbod	8a427ea6d6	Merge pull request #1488 from kehiy/md make *.md linguist detectable.	2024-09-11 06:24:31 -07:00
kehiy	d8ab9849b3	make *.md linguist detectable.	2024-09-11 13:17:16 +03:30
hodlbod	97a42449a8	Merge pull request #1487 from ZigBalthazar/patch-1 Update 10.md	2024-09-10 14:19:48 -07:00
Zig Blathazar	c343175a32	Update 10.md	2024-09-10 23:37:36 +03:30
Jon Staab	e7eb776288	Revert example code update	2024-09-09 17:41:57 -03:00
Asai Toshiya	7edd3d23a9	README: update kinds table	2024-09-10 00:32:25 +09:00
hodlbod	c02b161d9e	Merge pull request #1477 from kehiy/jsonc format(all): JSON formatting	2024-09-03 13:56:56 -07:00
K	c8dc1eadff	Update 96.md	2024-09-03 23:47:11 +03:30
kehiy	e6552476aa	format(all): json formatting	2024-09-03 20:41:31 +03:30
fiatjaf	378dfaa5db	nip54: remove markdown leftovers.	2024-09-03 14:07:46 -03:00
Vitor Pamplona	a928d11fb5	Merge pull request #1466 from paulmillr/patch-2 nip44: clarify ecdh hashing	2024-09-03 08:37:21 -04:00
kehiy	b4a2561df7	style: fix header styles in same format	2024-09-02 22:51:48 -03:00
Silberengel	14ec14dac9	Missing events added to README, including NKBIP-01 and NKBIP-02 (#1464 ) * Missing events added to README, including NKBIP-01 and NKBIP-02 * Just format * kind conflict resolved, 2nd blossom kind added * Revert "kind conflict resolved, 2nd blossom kind added" This reverts commit `5a8ecc0c27`. * formatting changes merged, kind conflict resolved, 2nd blossom kind added * relay reviews --------- Co-authored-by: Asai Toshiya <to.asai.60@gmail.com> Co-authored-by: fiatjaf_ <fiatjaf@gmail.com>	2024-09-02 22:51:07 -03:00
Asai Toshiya	d9eb17ce86	NIP-65: add links to outbox model articles	2024-09-03 01:16:36 +09:00
Paul Miller	be17e5dcd9	Clarify function name in libsecp256k1	2024-09-01 16:13:12 +02:00
Paul Miller	1002104ece	nip44: clarify ecdh hashing	2024-09-01 00:44:30 +02:00
hodlbod	24e97c2539	Merge pull request #1333 from coracle-social/clarify-nip01 Clarify what happens when a duplicate subscription is sent, remove CLOSED on duplicate subscription	2024-08-31 06:45:41 -07:00
hodlbod	8184749f5b	Merge pull request #1455 from dtonon/nip05-note NIP-05: add identification vs verification note	2024-08-29 08:30:02 -07:00
dtonon	da34c57e99	NIP-05: add identification vs verification note	2024-08-29 16:37:02 +02:00
Vitor Pamplona	fade0164f5	Merge pull request #1445 from bezysoftware/patch-3 NIP-17 Fix kind number	2024-08-25 16:57:35 -04:00
Tomas Bezouska	27c67f0c71	Update 17.md	2024-08-25 22:55:25 +02:00
Asai Toshiya	c7a357285d	BREAKING.md: add changes	2024-08-21 23:27:27 +09:00
fiatjaf	b3c1a56269	nip13: remove section about pow prefix querying. prefix searching was removed from the spec.	2024-08-20 15:42:40 -03:00
fiatjaf_	ca3c52e3e7	rename "parameterized replaceable event" to "addressable event" (#1418 )	2024-08-20 12:56:05 -03:00
Alex Gleason	d0962aac09	Merge pull request #1428 from alexgleason/hashtag Define the `t` tag in NIP-24	2024-08-20 09:43:58 -05:00
Alex Gleason	e30eb40eef	NIP-24: t-tag only has to be a lowercase string	2024-08-20 09:42:59 -05:00
Asai Toshiya	61d251b3a4	Merge pull request #1172 from SnowCait/kind-mute-sets Kind mute sets	2024-08-20 19:28:17 +09:00
fiatjaf	3aff37bd4b	nip54: change to asciidoc, markdown is trash.	2024-08-18 15:01:37 -03:00
sepehr-safari	62ac522333	add kind 9022 for leave request	2024-08-18 15:01:00 -03:00
sepehr-safari	055101786b	add kind 9008 for deleting a group	2024-08-18 15:01:00 -03:00
Alex Gleason	1d3744784c	Define the `t` tag in NIP-24	2024-08-15 20:28:53 -05:00
Alex Gleason	2c7e2af15f	Merge pull request #1425 from tyiu/rename-delete-to-retract Update NIP-09 to rename to deletion request	2024-08-15 16:34:52 -05:00
Terry Yiu	0ee877275a	Update NIP-09 to rename to deletion request	2024-08-15 01:19:07 -04:00
Terry Yiu	95885afe2d	Update NIP-09 to rename deletion to retraction	2024-08-14 20:08:41 -04:00
hodlbod	645a562a8b	Merge pull request #1424 from AsaiToshiya/AsaiToshiya-patch-26 README: add NIP-52 link to `image` and `summary` tags	2024-08-14 08:38:24 -07:00
Asai Toshiya	452fcc05a0	README: add NIP-52 link to `image` and `summary` tags	2024-08-14 23:44:30 +09:00
hodlbod	f8e108e61d	Merge pull request #1414 from tyiu/nip52-rsvp-e-and-p-tags Amend NIP-52 to include e and p tags to calendar event RSVPs	2024-08-12 08:40:57 -07:00
fiatjaf_	ed15e318f4	Merge pull request #1094 from theborakompanioni/nip-64 NIP-64: Chess (Portable Game Notation)	2024-08-12 10:42:52 -03:00
theborakompanioni	5d37fea585	docs(NIP-64): add chess to title make clear that the nip is about chess	2024-08-12 13:27:41 +02:00
theborakompanioni	e735ef9aef	docs(NIP-64): change kind from 30 to 64	2024-08-12 13:26:23 +02:00
theborakompanioni	653642205e	docs(NIP-64): move examples section to bottom	2024-08-12 13:26:23 +02:00
theborakompanioni	d476dea62f	docs(NIP-64): remove FEN tags	2024-08-12 13:26:23 +02:00
theborakompanioni	e444914668	docs(NIP-64): Portable Game Notation	2024-08-12 13:26:22 +02:00
Terry Yiu	ec1f0fcada	Update NIP-52 change to not be backwards incompatible by restoring required 'a' tag and clarify how clients should or may interpret the optional 'e' tag	2024-08-11 15:50:39 -04:00
Don	744bce8fca	NIP-25: reactions to a website (#1381 ) * NIP-25: reactions to a website * add note about URL normalization --------- Co-authored-by: fiatjaf_ <fiatjaf@gmail.com>	2024-08-08 12:36:08 -03:00
Terry Yiu	d36b24c82a	Revise NIP-52 amendments so that they are backwards compatible	2024-08-08 01:04:25 -04:00
Terry Yiu	8d451b3dc3	Merge remote-tracking branch 'upstream/master' into nip52-rsvp-e-and-p-tags	2024-08-07 23:44:28 -04:00
Vic	6de688f459	Add used fields to Calendar Time Event in NIP-52 (#1137 ) * Add used fields to Calendar Time Event in NIP-52 Cornychat.com relies on a `t` tag of `audiospace` for filtering. Flockstr.com relies on optional and previously undocumented `audio` and `image` tags for rendering. * Update 52.md * Change tag for `about` to `summary`	2024-08-07 17:45:21 +09:00
Terry Yiu	dea4bebf4b	Amend NIP-52 to include e and p tags to calendar event RSVPs	2024-08-06 23:55:47 -04:00
hodlbod	738c4809a1	Merge pull request #1185 from MerryOscar/external-content-ids NIP-73 - External Content IDs	2024-08-06 09:34:24 -07:00
hodlbod	5f651db43f	Merge pull request #1412 from haorendashu/remove-nip45-code-block-type remove nip45 code block type	2024-08-06 06:42:21 -07:00
haorendashu	5277ee76be	remove nip45 code block type remove nip45 code block type and then code will not highlight error.	2024-08-06 21:03:40 +08:00
Oscar Merry	4d9eb32dc9	Use NIP-73	2024-08-05 23:51:04 +01:00
Oscar Merry	14c3310039	Add Podcast Publisher GUID	2024-08-05 23:16:49 +01:00
Oscar Merry	29eec055c2	Merge branch 'nostr-protocol:master' into external-content-ids	2024-08-05 23:08:41 +01:00
Abhay Raizada	c258875395	Remove settings, fine tuning	2024-07-16 23:03:28 +05:30
abhay-raizada	21587e2367	Finalize Draft	2024-07-05 08:28:13 +05:30
Jon Staab	f6b08429a2	Clarify what happens when a duplicate subscription is sent, remove CLOSED on duplicate subscription	2024-06-27 17:00:16 -07:00
abhay-raizada	70f1be5866	Polls On Nostr	2024-06-25 14:28:02 +05:30
Oscar Merry	13b830d228	Add Optional URL Hints	2024-06-17 13:45:06 +01:00
Oscar Merry	45351b561d	Merge branch 'nostr-protocol:master' into external-content-ids	2024-06-17 13:38:45 +01:00
kieran	53afaaece6	nip71 imeta	2024-05-27 12:18:27 +01:00
Oscar Merry	32004283da	Merge branch 'master' into external-content-ids	2024-05-20 11:12:03 +01:00
Oscar Merry	d33b223c6a	Remove Media Type Prefix	2024-05-16 20:44:45 +01:00
Oscar Merry	b7bb46ac03	Use ISANs for Movies, Include Actual Examples	2024-05-09 12:27:43 +01:00
Oscar Merry	280eb498e0	Draft External Content IDs	2024-04-19 14:30:45 +01:00
雪猫	e97df14103	Kind mute sets	2024-04-13 12:39:24 +09:00