From b5a7b67d78ad2b8ea52d81704be6b71a9cc80dac Mon Sep 17 00:00:00 2001
From: Semisol <45574030+Semisol@users.noreply.github.com>
Date: Mon, 3 Jul 2023 18:02:15 +0300
Subject: [PATCH 001/263] Clarify JSON serialization for the `id` field

---
 01.md | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/01.md b/01.md
index 2ff81eb..9258d2f 100644
--- a/01.md
+++ b/01.md
@@ -30,7 +30,7 @@ The only object type that exists is the `event`, which has the following format
 }
 ```
 
-To obtain the `event.id`, we `sha256` the serialized event. The serialization is done over the UTF-8 JSON-serialized string (with no white space or line breaks) of the following structure:
+To obtain the `event.id`, we `sha256` the serialized event. The serialization is done over the UTF-8 JSON-serialized string (which is described below) of the following structure:
 
 ```json
 [
@@ -43,6 +43,14 @@ To obtain the `event.id`, we `sha256` the serialized event. The serialization is
 ]
 ```
 
+To prevent implementation differences from creating a different event ID for the same event, the following rules MUST be followed while serializing:
+- No whitespace, line breaks or other unnecessary formatting should be included in the output JSON.
+- No characters except the following should be escaped, and instead should be included verbatim:
+  - The line break, `0x0A`, as `\n`
+  - A double quote, `0x22`, as `\"`
+  - A backspace, `0x5C`, as `\\`
+- UTF-8 should be used for encoding.
+
 ## Communication between clients and relays
 
 Relays expose a websocket endpoint to which clients can connect.

From 3f8658ecc11e593f85a6a8d7de109d0b8f3254df Mon Sep 17 00:00:00 2001
From: Semisol <45574030+Semisol@users.noreply.github.com>
Date: Tue, 4 Jul 2023 13:49:52 +0300
Subject: [PATCH 002/263] Fix typo

---
 01.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/01.md b/01.md
index 9258d2f..70aae44 100644
--- a/01.md
+++ b/01.md
@@ -48,7 +48,7 @@ To prevent implementation differences from creating a different event ID for the
 - No characters except the following should be escaped, and instead should be included verbatim:
   - The line break, `0x0A`, as `\n`
   - A double quote, `0x22`, as `\"`
-  - A backspace, `0x5C`, as `\\`
+  - A backslash, `0x5C`, as `\\`
 - UTF-8 should be used for encoding.
 
 ## Communication between clients and relays

From 21d71791c89f41fb93f84b69d6db253bb7b403c4 Mon Sep 17 00:00:00 2001
From: Semisol <45574030+Semisol@users.noreply.github.com>
Date: Tue, 4 Jul 2023 13:55:15 +0300
Subject: [PATCH 003/263] Add carriage returns and tab characters since those
 may be in some events

---
 01.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/01.md b/01.md
index 70aae44..f5673b3 100644
--- a/01.md
+++ b/01.md
@@ -49,6 +49,8 @@ To prevent implementation differences from creating a different event ID for the
   - The line break, `0x0A`, as `\n`
   - A double quote, `0x22`, as `\"`
   - A backslash, `0x5C`, as `\\`
+  - A carriage return, `0x0D`, as `\r`
+  - A tab character, `0x09`, as `\t`
 - UTF-8 should be used for encoding.
 
 ## Communication between clients and relays

From 86e44b75eb166b600affdc5248e0fe246a6ebe9b Mon Sep 17 00:00:00 2001
From: greenart7c3 <greenart7c3@proton.me>
Date: Wed, 8 Nov 2023 10:22:43 -0300
Subject: [PATCH 004/263] Android Signer Application nip

---
 100.md | 495 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 495 insertions(+)
 create mode 100644 100.md

diff --git a/100.md b/100.md
new file mode 100644
index 0000000..3b8bc8e
--- /dev/null
+++ b/100.md
@@ -0,0 +1,495 @@
+# NIP-100
+
+## Android Signer Application
+
+`draft` `optional` `author:greenart7c3`
+
+This NIP describes a method for 2-way communication between a android signer and any Nostr client on Android. The Android signer is an Android Application and the Client can be a Web Client or an Android Application.
+
+# Usage for Android applications
+
+The Android signer uses Intents and Content Resolvers to communicate between applications.
+
+To be able to use The Android signer in your application you should add the package name of the signer to your AndroidManifest.xml:
+
+```xml
+<queries>
+    <package android:name="com.example.signer"/>
+</queries>
+```
+
+## Using Intents
+
+To get the result back from the Signer Appication you should use registerForActivityResult or rememberLauncherForActivityResult in Kotlin. If you are using another framework check the documentation of your framework or a third party library to get the result.
+
+Create the Intent using the **nostrsigner** scheme:
+
+```kotlin
+val intent = Intent(Intent.ACTION_VIEW, Uri.parse("nostrsigner:$content"))
+```
+
+* Set the Signer package name
+
+```kotlin
+intent.`package` = "com.example.signer"
+```
+
+### Methods
+
+- **get_public_key**
+  - params:
+
+    ```kotlin
+    val intent = Intent(Intent.ACTION_VIEW, Uri.parse("nostrsigner:"))
+    intent.`package` = "com.example.signer"
+    intent.putExtra("type", "get_public_key")
+    context.startActivity(intent)
+    ```
+  - result:
+    - If the user approved intent it will return the **npub** in the signature field
+
+      ```kotlin
+      val npub = intent.data?.getStringExtra("signature")
+      ```
+
+- **sign_event**
+  - params:
+
+    ```kotlin
+    val intent = Intent(Intent.ACTION_VIEW, Uri.parse("nostrsigner:$eventJson"))
+    intent.`package` = "com.example.signer"
+    intent.putExtra("type", "sign_event")
+    // to control the result in your application in case you are not waiting the result before sending another intent
+    intent.putExtra("id", event.id)
+    // Send the current logged in user npub
+    intent.putExtra("current_user", account.keyPair.pubKey.toNpub())
+    
+    context.startActivity(intent)
+    ```
+  - result:
+    - If the user approved intent it will return the **signature**, **id** and **event** fields
+
+      ```kotlin
+      val signature = intent.data?.getStringExtra("signature")
+      // the id you sent
+      val id = intent.data?.getStringExtra("id")
+      val signedEventJson = intent.data?.getStringExtra("event")
+      ```
+
+- **nip04_encrypt**
+  - params:
+
+    ```kotlin
+    val intent = Intent(Intent.ACTION_VIEW, Uri.parse("nostrsigner:$plaintext"))
+    intent.`package` = "com.example.signer"
+    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)
+    
+    context.startActivity(intent)
+    ```
+  - result:
+    - If the user approved intent it will return the **signature** and **id** fields
+
+      ```kotlin
+      val encryptedText = intent.data?.getStringExtra("signature")
+      // the id you sent
+      val id = intent.data?.getStringExtra("id")
+      ```
+
+- **nip44_encrypt**
+  - params:
+
+    ```kotlin
+    val intent = Intent(Intent.ACTION_VIEW, Uri.parse("nostrsigner:$plaintext"))
+    intent.`package` = "com.example.signer"
+    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)
+    
+    context.startActivity(intent)
+    ```
+  - result:
+    - If the user approved intent it will return the **signature** and **id** fields
+
+      ```kotlin
+      val encryptedText = intent.data?.getStringExtra("signature")
+      // the id you sent
+      val id = intent.data?.getStringExtra("id")
+      ```      
+
+- **nip04_decrypt**
+  - params:
+
+    ```kotlin
+    val intent = Intent(Intent.ACTION_VIEW, Uri.parse("nostrsigner:$encryptedText"))
+    intent.`package` = "com.example.signer"
+    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)
+    
+    context.startActivity(intent)
+    ```
+  - result:
+    - If the user approved intent it will return the **signature** and **id** fields
+
+      ```kotlin
+      val plainText = intent.data?.getStringExtra("signature")
+      // the id you sent
+      val id = intent.data?.getStringExtra("id")
+      ```      
+
+- **nip44_decrypt**
+  - params:
+
+    ```kotlin
+    val intent = Intent(Intent.ACTION_VIEW, Uri.parse("nostrsigner:$encryptedText"))
+    intent.`package` = "com.example.signer"
+    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)
+    
+    context.startActivity(intent)
+    ```
+  - result:
+    - If the user approved intent it will return the **signature** and **id** fields
+
+      ```kotlin
+      val plainText = intent.data?.getStringExtra("signature")
+      // the id you sent
+      val id = intent.data?.getStringExtra("id")
+      ```        
+
+- **decrypt_zap_event**
+  - params:
+
+    ```kotlin
+    val intent = Intent(Intent.ACTION_VIEW, Uri.parse("nostrsigner:$eventJson"))
+    intent.`package` = "com.example.signer"
+    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())
+    context.startActivity(intent)
+    ```
+  - result:
+    - If the user approved intent it will return the **signature** and **id** fields
+
+      ```kotlin
+      val eventJson = intent.data?.getStringExtra("signature")
+      // the id you sent
+      val id = intent.data?.getStringExtra("id")
+      ```         
+
+## Using Content Resolver
+
+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
+
+For the SIGN_EVENT type Signer Application returns two columns "signature" and "event". The column event is the signed event json
+
+For the other types Signer Application returns the column "signature"
+
+### Methods
+
+- **get_public_key**
+  - params:
+
+    ```kotlin
+    val result = context.contentResolver.query(
+        Uri.parse("content://com.example.signer.GET_PUBLIC_KEY"),
+        listOf("login"),
+        null,
+        null,
+        null
+    )
+    ```
+  - result:
+    - Will return the **npub** in the signature column
+
+      ```kotlin
+        if (result == null) return
+
+        if (result.moveToFirst()) {
+            val index = it.getColumnIndex("signature")
+            if (index < 0) return
+            val npub = it.getString(index)
+        }
+      ```
+
+- **sign_event**
+  - params:
+
+    ```kotlin
+    val result = context.contentResolver.query(
+        Uri.parse("content://com.example.signer.SIGN_EVENT"),
+        listOf("$eventJson", "", "${logged_in_user_npub}"),
+        null,
+        null,
+        null
+    )
+    ```
+  - result:
+    - Will return the **signature** and the **event** columns
+
+      ```kotlin
+        if (result == null) return
+
+        if (result.moveToFirst()) {
+            val index = it.getColumnIndex("signature")
+            val indexJson = it.getColumnIndex("event")
+            val signature = it.getString(index)
+            val eventJson = it.getString(indexJson)
+        }
+      ```
+
+- **nip04_encrypt**
+  - params:
+
+    ```kotlin
+    val result = context.contentResolver.query(
+        Uri.parse("content://com.example.signer.NIP04_ENCRYPT"),
+        listOf("$plainText", "${hex_pub_key}", "${logged_in_user_npub}"),
+        null,
+        null,
+        null
+    )
+    ```
+  - result:
+    - Will return the **signature** column
+
+      ```kotlin
+        if (result == null) return
+
+        if (result.moveToFirst()) {
+            val index = it.getColumnIndex("signature")
+            val encryptedText = it.getString(index)
+        }
+      ```
+
+- **nip44_encrypt**
+  - params:
+
+    ```kotlin
+    val result = context.contentResolver.query(
+        Uri.parse("content://com.example.signer.NIP44_ENCRYPT"),
+        listOf("$plainText", "${hex_pub_key}", "${logged_in_user_npub}"),
+        null,
+        null,
+        null
+    )
+    ```
+  - result:
+    - Will return the **signature** column
+
+      ```kotlin
+        if (result == null) return
+
+        if (result.moveToFirst()) {
+            val index = it.getColumnIndex("signature")
+            val encryptedText = it.getString(index)
+        }
+      ```    
+
+- **nip04_decrypt**
+  - params:
+
+    ```kotlin
+    val result = context.contentResolver.query(
+        Uri.parse("content://com.example.signer.NIP04_DECRYPT"),
+        listOf("$encryptedText", "${hex_pub_key}", "${logged_in_user_npub}"),
+        null,
+        null,
+        null
+    )
+    ```
+  - result:
+    - Will return the **signature** column
+
+      ```kotlin
+        if (result == null) return
+
+        if (result.moveToFirst()) {
+            val index = it.getColumnIndex("signature")
+            val encryptedText = it.getString(index)
+        }
+      ```    
+
+- **nip44_decrypt**
+  - params:
+
+    ```kotlin
+    val result = context.contentResolver.query(
+        Uri.parse("content://com.example.signer.NIP44_DECRYPT"),
+        listOf("$encryptedText", "${hex_pub_key}", "${logged_in_user_npub}"),
+        null,
+        null,
+        null
+    )
+    ```
+  - result:
+    - Will return the **signature** column
+
+      ```kotlin
+        if (result == null) return
+
+        if (result.moveToFirst()) {
+            val index = it.getColumnIndex("signature")
+            val encryptedText = 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}"),
+        null,
+        null,
+        null
+    )
+    ```
+  - result:
+    - Will return the **signature** column
+
+      ```kotlin
+        if (result == null) return
+
+        if (result.moveToFirst()) {
+            val index = it.getColumnIndex("signature")
+            val eventJson = it.getString(index)
+        }
+      ```    
+
+# Usage for Web Applications
+
+Since web applications can't receive a result from the intent you should add a modal to paste the signature or the event json or create a callback url.
+
+If you send the callback url parameter Signer Application will send the result to the url.
+
+If you don't send a callback url Signer Application will copy the result to the clipboard.
+
+You can configure the returnType to be **signature** or **event**.
+
+Android intents and browsers url has limitations, so if you are using the returnType of **event** consider using the parameter **compressionType=gzip** that will return "Signer1" + Base 64 gzip encoded event json
+
+## Methods
+
+- **get_public_key**
+  - params:
+
+    ```js
+    const intent = `intent:#Intent;scheme=nostrsigner;S.compressionType=none;S.returnType=signature;S.type=get_public_key;S.callbackUrl=https://example.com/?event=;end`;
+
+    window.href = intent;
+    ```
+
+- **sign_event**
+  - params:
+
+    ```js
+    const intent = `intent:${eventJson}#Intent;scheme=nostrsigner;S.compressionType=none;S.returnType=signature;S.type=sign_event;S.callbackUrl=https://example.com/?event=;end`;
+
+    window.href = intent;
+    ``` 
+
+- **nip04_encrypt**
+  - params:
+
+    ```js
+    const intent = `intent:${plainText}#Intent;scheme=nostrsigner;S.pubKey=${hex_pub_key};S.compressionType=none;S.returnType=signature;S.type=nip04_encrypt;S.callbackUrl=https://example.com/?event=;end`;
+
+    window.href = intent;
+    ``` 
+
+- **nip44_encrypt**
+  - params:
+
+    ```js
+    const intent = `intent:${plainText}#Intent;scheme=nostrsigner;S.pubKey=${hex_pub_key};S.compressionType=none;S.returnType=signature;S.type=nip44_encrypt;S.callbackUrl=https://example.com/?event=;end`;
+
+    window.href = intent;
+    ```   
+
+- **nip04_decrypt**
+  - params:
+
+    ```js
+    const intent = `intent:${encryptedText}#Intent;scheme=nostrsigner;S.pubKey=${hex_pub_key};S.compressionType=none;S.returnType=signature;S.type=nip44_encrypt;S.callbackUrl=https://example.com/?event=;end`;
+
+    window.href = intent;
+    ```     
+
+- **nip44_decrypt**
+  - params:
+
+    ```js
+    const intent = `intent:${encryptedText}#Intent;scheme=nostrsigner;S.pubKey=${hex_pub_key};S.compressionType=none;S.returnType=signature;S.type=nip44_decrypt;S.callbackUrl=https://example.com/?event=;end`;
+
+    window.href = intent;
+    ```     
+
+- **decrypt_zap_event**
+  - params:
+
+    ```js
+    const intent = `intent:${eventJson}#Intent;scheme=nostrsigner;S.compressionType=none;S.returnType=signature;S.type=decrypt_zap_event;S.callbackUrl=https://example.com/?event=;end`;
+
+    window.href = intent;
+    ```          
+
+## Example
+
+```js
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Document</title>
+</head>
+<body>
+    <h1>Test</h1>
+       
+    <script>
+        window.onload = function() {
+            var url = new URL(window.location.href);
+            var params = url.searchParams;
+            if (params) {
+                var param1 = params.get("event");
+                if (param1) alert(param1)
+            }
+            let json = {
+                kind: 1,
+                content: "test"
+            }
+            let encodedJson = encodeURIComponent(JSON.stringify(json))
+            var newAnchor = document.createElement("a");
+            newAnchor.href = `intent:${encodedJson}#Intent;scheme=nostrsigner;S.compressionType=none;S.returnType=signature;S.type=sign_event;S.callbackUrl=https://example.com/?event=;end`;
+            newAnchor.textContent = "Open External Signer";
+            document.body.appendChild(newAnchor)
+        }
+    </script>
+</body>
+</html>
+```
\ No newline at end of file

From 5dc6071978bc7c2dcee807d16ef085192971ac27 Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Wed, 15 Nov 2023 00:22:09 -0300
Subject: [PATCH 005/263] cut, simplify and update NIP-51 to reflect the
 real-world usage.

---
 51.md     | 151 ++++--------------------------------------------------
 README.md | 117 +++++++++++++++++++++---------------------
 2 files changed, 69 insertions(+), 199 deletions(-)

diff --git a/51.md b/51.md
index e4d7c24..c74487f 100644
--- a/51.md
+++ b/51.md
@@ -6,148 +6,19 @@ Lists
 
 `draft` `optional` `author:fiatjaf` `author:arcbtc` `author:monlovesmango` `author:eskema` `author:gzuuus`
 
-A "list" event is defined as having a list of public and/or private tags. Public tags will be listed in the event `tags`. Private tags will be encrypted in the event `content`. Encryption for private tags will use [NIP-04 - Encrypted Direct Message](04.md) encryption, using the list author's private and public key for the shared secret. A distinct event kind should be used for each list type created.
+This NIP defines lists of things that users can create. Lists can contain references to anything, and these references can be **public** or **private**.
 
-If a list should only be defined once per user (like the "mute" list) the list is declared as a _replaceable event_. These lists may be referred to as "replaceable lists". Otherwise, the list is a _parameterized replaceable event_ and the list name will be used as the `d` tag. These lists may be referred to as "parameterized replaceable lists".
+Public items in a list are specified in the event `tags` array, while private items are specified in a JSON array that mimics the structure of the event `tags` array, but stringified and encrypted using the same scheme from [NIP-04](04.md) (the shared key is computed using the author's public and private key) and stored in the `.content`.
 
-## Replaceable List Event Example
+## Generic lists
 
-Lets say a user wants to create a 'Mute' list and has keys:
-```
-priv: fb505c65d4df950f5d28c9e4d285ee12ffaf315deef1fc24e3c7cd1e7e35f2b1
-pub: b1a5c93edcc8d586566fde53a20bdb50049a97b15483cb763854e57016e0fa3d
-```
-The user wants to publicly include these users:
+The kinds `30000` and `30001` have been reserved for generic lists. These must be accompanied by a `d` tag identifying the list, but these are generally client-specific, except in the standard cases specified below.
 
-```json
-["p", "3bf0c63fcb93463407af97a5e5ee64fa883d107ef9e558472c4eb9aaaefa459d"],
-["p", "32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245"]
-```
-and privately include these users (below is the JSON that would be encrypted and placed in the event content):
+## Standard lists
 
-```json
-[
-    ["p", "9ec7a778167afb1d30c4833de9322da0c08ba71a69e1911d5578d3144bb56437"],
-    ["p", "8c0da4862130283ff9e67d889df264177a508974e2feb96de139804ea66d6168"]
-]
-```
-
-Then the user would create a 'Mute' list event like below:
-
-```json
-{
-  "kind": 10000,
-  "tags": [
-    ["p", "3bf0c63fcb93463407af97a5e5ee64fa883d107ef9e558472c4eb9aaaefa459d"],
-    ["p", "32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245"],
-  ],
-  "content": "VezuSvWak++ASjFMRqBPWS3mK5pZ0vRLL325iuIL4S+r8n9z+DuMau5vMElz1tGC/UqCDmbzE2kwplafaFo/FnIZMdEj4pdxgptyBV1ifZpH3TEF6OMjEtqbYRRqnxgIXsuOSXaerWgpi0pm+raHQPseoELQI/SZ1cvtFqEUCXdXpa5AYaSd+quEuthAEw7V1jP+5TDRCEC8jiLosBVhCtaPpLcrm8HydMYJ2XB6Ixs=?iv=/rtV49RFm0XyFEwG62Eo9A==",
-  ...other fields
-}
-```
-
-
-## Parameterized Replaceable List Event Example
-
-Lets say a user wants to create a 'Categorized People' list of `nostr` people and has keys:
-```
-priv: fb505c65d4df950f5d28c9e4d285ee12ffaf315deef1fc24e3c7cd1e7e35f2b1
-pub: b1a5c93edcc8d586566fde53a20bdb50049a97b15483cb763854e57016e0fa3d
-```
-The user wants to publicly include these users:
-
-```json
-["p", "3bf0c63fcb93463407af97a5e5ee64fa883d107ef9e558472c4eb9aaaefa459d"],
-["p", "32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245"]
-```
-and privately include these users (below is the JSON that would be encrypted and placed in the event content):
-
-```json
-[
-    ["p", "9ec7a778167afb1d30c4833de9322da0c08ba71a69e1911d5578d3144bb56437"],
-    ["p", "8c0da4862130283ff9e67d889df264177a508974e2feb96de139804ea66d6168"]
-]
-```
-
-Then the user would create a 'Categorized People' list event like below:
-
-```json
-{
-  "kind": 30000,
-  "tags": [
-    ["d", "nostr"],
-    ["p", "3bf0c63fcb93463407af97a5e5ee64fa883d107ef9e558472c4eb9aaaefa459d"],
-    ["p", "32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245"],
-  ],
-  "content": "VezuSvWak++ASjFMRqBPWS3mK5pZ0vRLL325iuIL4S+r8n9z+DuMau5vMElz1tGC/UqCDmbzE2kwplafaFo/FnIZMdEj4pdxgptyBV1ifZpH3TEF6OMjEtqbYRRqnxgIXsuOSXaerWgpi0pm+raHQPseoELQI/SZ1cvtFqEUCXdXpa5AYaSd+quEuthAEw7V1jP+5TDRCEC8jiLosBVhCtaPpLcrm8HydMYJ2XB6Ixs=?iv=/rtV49RFm0XyFEwG62Eo9A==",
-  ...other fields
-}
-```
-
-Lets say a user wants to create a 'Categorized Bookmarks' list of `bookmarks` and has keys:
-```
-priv: fb505c65d4df950f5d28c9e4d285ee12ffaf315deef1fc24e3c7cd1e7e35f2b1
-pub: b1a5c93edcc8d586566fde53a20bdb50049a97b15483cb763854e57016e0fa3d
-```
-The user wants to publicly include these bookmarks:
-
-```json
-["e", "5c83da77af1dec6d7289834998ad7aafbd9e2191396d75ec3cc27f5a77226f36", "wss://nostr.example.com"],
-["a", "30023:f7234bd4c1394dda46d09f35bd384dd30cc552ad5541990f98844fb06676e9ca:abcd", "wss://nostr.example.com"],
-["r", "https://github.com/nostr-protocol/nostr", "Nostr repository"],
-```
-and privately include these bookmarks (below is the JSON that would be encrypted and placed in the event content):
-
-```json
-[
-    ["r", "https://my-private.bookmark", "My private bookmark"],
-    ["a", "30001:f7234bd4c1394dda46d09f35bd384dd30cc552ad5541990f98844fb06676e9ca:abcd", "wss://nostr.example.com"],
-]
-```
-
-Then the user would create a 'Categorized Bookmarks' list event like below:
-
-```json
-{
-  "kind": 30001,
-  "tags": [
-    ["d", "bookmarks"],
-    ["e", "5c83da77af1dec6d7289834998ad7aafbd9e2191396d75ec3cc27f5a77226f36", "wss://nostr.example.com"],
-    ["a", "30023:f7234bd4c1394dda46d09f35bd384dd30cc552ad5541990f98844fb06676e9ca:abcd", "wss://nostr.example.com"],
-    ["r", "https://github.com/nostr-protocol/nostr", "Nostr repository"],
-  ],
-  "content": "y3AyaLJfnmYr9x9Od9o4aYrmL9+Ynmsim5y2ONrU0urOTq+V81CyAthQ2mUOWE9xwGgrizhY7ILdQwWhy6FK0sA33GHtC0egUJw1zIdknPe7BZjznD570yk/8RXYgGyDKdexME+RMYykrnYFxq1+y/h00kmJg4u+Gpn+ZjmVhNYxl9b+TiBOAXG9UxnK/H0AmUqDpcldn6+j1/AiStwYZhD1UZ3jzDIk2qcCDy7MlGnYhSP+kNmG+2b0T/D1L0Z7?iv=PGJJfPE84gacAh7T0e6duQ==",
-  ...other fields
-}
-```
-
-## List Event Kinds
-
-| kind   | list type               |
-| ------ | ----------------------- |
-| 10000  | Mute                    |
-| 10001  | Pin                     |
-| 30000  | Categorized People      |
-| 30001  | Categorized Bookmarks   |
-| 30002  | Categorized Relay Sets  |
-
-
-### Mute List
-
-An event with kind `10000` is defined as a replaceable list event for listing content a user wants to mute. Any standardized tag can be included in a Mute List.
-
-### Pin List
-
-An event with kind `10001` is defined as a replaceable list event for listing content a user wants to pin. Any standardized tag can be included in a Pin List.
-
-### Categorized People List
-
-An event with kind `30000` is defined as a parameterized replaceable list event for categorizing people. The 'd' parameter for this event holds the category name of the list. The tags included in these lists MUST follow the format of kind 3 events as defined in [NIP-02 - Contact List and Petnames](02.md).
-
-### Categorized Bookmarks List
-
-An event of kind `30001` is defined as a parameterized replaceable list event for categorizing bookmarks. The 'd' parameter for this event holds the category name of the list. The bookmark lists may contain metadata tags such as 'title', 'image', 'summary' as defined in [NIP-23 - Long-form Content](23.md). Any standardized tag can be included in a Categorized Bookmark List.
-
-### Categorized Relay Set
-
-An event of kind `30002` is defined as a parameterized replaceable list event for categorizing relays. The 'd' parameter for this event holds the category name of the list. The relays lists may contain metadata tags such as 'title', 'image', 'summary' as defined in [NIP-23 - Long-form Content](23.md). These sets can be used by clients in order to determine which relays to query in different scenarios.
+| name           | kind  | "d" tag        | description                                                                                   | expected tag items                                |
+| ---            | ---   | ---            | ---                                                                                           | ---                                               |
+| Muted list     | 30000 | `"mute"`       | things the user doesn't want to see in their feeds                                            | `"p"` (pubkeys), `"t"` (hashtags)                 |
+| Bookmarks list | 30001 | `"bookmark"`   | things the user intends to save for the future                                                | `"e"` (kind:1 notes), `"a"` (kind:30023 articles) |
+| Pin list       | 30001 | `"pin"`        | events the user intends to showcase in their profile page                                     | `"e"` (kind:1 notes)                              |
+| Relay sets     | 30002 | (user-defined) | user-defined relay groups the user can easily pick and choose from during variadic operations | `"relay"` (relay URLs)                            |
diff --git a/README.md b/README.md
index 483056d..74411ca 100644
--- a/README.md
+++ b/README.md
@@ -74,66 +74,65 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 - [NIP-99: Classified Listings](99.md)
 
 ## Event Kinds
-| kind          | description                | NIP         |
-| ------------- | -------------------------- | ----------- |
-| `0`           | Metadata                   | [1](01.md)  |
-| `1`           | Short Text Note            | [1](01.md)  |
-| `2`           | Recommend Relay            |             |
-| `3`           | Contacts                   | [2](02.md)  |
-| `4`           | Encrypted Direct Messages  | [4](04.md)  |
-| `5`           | Event Deletion             | [9](09.md)  |
-| `6`           | Repost                     | [18](18.md) |
-| `7`           | Reaction                   | [25](25.md) |
-| `8`           | Badge Award                | [58](58.md) |
-| `16`          | Generic Repost             | [18](18.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) |
-| `1063`        | File Metadata              | [94](94.md) |
-| `1311`        | Live Chat Message          | [53](53.md) |
-| `1040`        | OpenTimestamps             | [03](03.md) |
+| kind          | description                | NIP                                                              |
+| ------------- | -------------------------- | -----------                                                      |
+| `0`           | Metadata                   | [1](01.md)                                                       |
+| `1`           | Short Text Note            | [1](01.md)                                                       |
+| `2`           | Recommend Relay            |                                                                  |
+| `3`           | Contacts                   | [2](02.md)                                                       |
+| `4`           | Encrypted Direct Messages  | [4](04.md)                                                       |
+| `5`           | Event Deletion             | [9](09.md)                                                       |
+| `6`           | Repost                     | [18](18.md)                                                      |
+| `7`           | Reaction                   | [25](25.md)                                                      |
+| `8`           | Badge Award                | [58](58.md)                                                      |
+| `16`          | Generic Repost             | [18](18.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)                                                      |
+| `1063`        | File Metadata              | [94](94.md)                                                      |
+| `1311`        | Live Chat Message          | [53](53.md)                                                      |
+| `1040`        | OpenTimestamps             | [03](03.md)                                                      |
 | `1971`        | Problem Tracker            | [1971](https://github.com/nostrocket/NIPS/blob/main/Problems.md) |
-| `1984`        | Reporting                  | [56](56.md) |
-| `1985`        | Label                      | [32](32.md) |
-| `4550`        | Community Post Approval    | [72](72.md) |
-| `5000`-`5999` | Job Request                | [90](90.md) |
-| `6000`-`6999` | Job Result                 | [90](90.md) |
-| `7000`        | Job Feedback               | [90](90.md) |
-| `9041`        | Zap Goal                   | [75](75.md) |
-| `9734`        | Zap Request                | [57](57.md) |
-| `9735`        | Zap                        | [57](57.md) |
-| `9802`        | Highlights                 | [84](84.md) |
-| `10000`       | Mute List                  | [51](51.md) |
-| `10001`       | Pin List                   | [51](51.md) |
-| `10002`       | Relay List Metadata        | [65](65.md) |
-| `13194`       | Wallet Info                | [47](47.md) |
-| `22242`       | Client Authentication      | [42](42.md) |
-| `23194`       | Wallet Request             | [47](47.md) |
-| `23195`       | Wallet Response            | [47](47.md) |
-| `24133`       | Nostr Connect              | [46](46.md) |
-| `27235`       | HTTP Auth                  | [98](98.md) |
-| `30000`       | Categorized People List    | [51](51.md) |
-| `30001`       | Categorized Bookmark List  | [51](51.md) |
-| `30008`       | Profile Badges             | [58](58.md) |
-| `30009`       | Badge Definition           | [58](58.md) |
-| `30017`       | Create or update a stall   | [15](15.md) |
-| `30018`       | Create or update a product | [15](15.md) |
-| `30023`       | Long-form Content          | [23](23.md) |
-| `30024`       | Draft Long-form Content    | [23](23.md) |
-| `30078`       | Application-specific Data  | [78](78.md) |
-| `30311`       | Live Event                 | [53](53.md) |
-| `30315`       | User Statuses              | [38](38.md) |
-| `30402`       | Classified Listing         | [99](99.md) |
-| `30403`       | Draft Classified Listing   | [99](99.md) |
-| `31922`       | Date-Based Calendar Event  | [52](52.md) |
-| `31923`       | Time-Based Calendar Event  | [52](52.md) |
-| `31924`       | Calendar                   | [52](52.md) |
-| `31925`       | Calendar Event RSVP        | [52](52.md) |
-| `31989`       | Handler recommendation     | [89](89.md) |
-| `31990`       | Handler information        | [89](89.md) |
-| `34550`       | Community Definition       | [72](72.md) |
+| `1984`        | Reporting                  | [56](56.md)                                                      |
+| `1985`        | Label                      | [32](32.md)                                                      |
+| `4550`        | Community Post Approval    | [72](72.md)                                                      |
+| `5000`-`5999` | Job Request                | [90](90.md)                                                      |
+| `6000`-`6999` | Job Result                 | [90](90.md)                                                      |
+| `7000`        | Job Feedback               | [90](90.md)                                                      |
+| `9041`        | Zap Goal                   | [75](75.md)                                                      |
+| `9734`        | Zap Request                | [57](57.md)                                                      |
+| `9735`        | Zap                        | [57](57.md)                                                      |
+| `9802`        | Highlights                 | [84](84.md)                                                      |
+| `10002`       | Relay List Metadata        | [65](65.md)                                                      |
+| `13194`       | Wallet Info                | [47](47.md)                                                      |
+| `22242`       | Client Authentication      | [42](42.md)                                                      |
+| `23194`       | Wallet Request             | [47](47.md)                                                      |
+| `23195`       | Wallet Response            | [47](47.md)                                                      |
+| `24133`       | Nostr Connect              | [46](46.md)                                                      |
+| `27235`       | HTTP Auth                  | [98](98.md)                                                      |
+| `30000`       | People List                | [51](51.md)                                                      |
+| `30001`       | Things List                | [51](51.md)                                                      |
+| `30002`       | Relay Set                  | [51](51.md)                                                      |
+| `30008`       | Profile Badges             | [58](58.md)                                                      |
+| `30009`       | Badge Definition           | [58](58.md)                                                      |
+| `30017`       | Create or update a stall   | [15](15.md)                                                      |
+| `30018`       | Create or update a product | [15](15.md)                                                      |
+| `30023`       | Long-form Content          | [23](23.md)                                                      |
+| `30024`       | Draft Long-form Content    | [23](23.md)                                                      |
+| `30078`       | Application-specific Data  | [78](78.md)                                                      |
+| `30311`       | Live Event                 | [53](53.md)                                                      |
+| `30315`       | User Statuses              | [38](38.md)                                                      |
+| `30402`       | Classified Listing         | [99](99.md)                                                      |
+| `30403`       | Draft Classified Listing   | [99](99.md)                                                      |
+| `31922`       | Date-Based Calendar Event  | [52](52.md)                                                      |
+| `31923`       | Time-Based Calendar Event  | [52](52.md)                                                      |
+| `31924`       | Calendar                   | [52](52.md)                                                      |
+| `31925`       | Calendar Event RSVP        | [52](52.md)                                                      |
+| `31989`       | Handler recommendation     | [89](89.md)                                                      |
+| `31990`       | Handler information        | [89](89.md)                                                      |
+| `34550`       | Community Definition       | [72](72.md)                                                      |
 
 ## Message types
 

From da05b5d9150200cec5a498ac180b6391abeddd69 Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Wed, 15 Nov 2023 00:47:15 -0300
Subject: [PATCH 006/263] add "communities" list and examples.

---
 51.md | 44 ++++++++++++++++++++++++++++++++++++++------
 1 file changed, 38 insertions(+), 6 deletions(-)

diff --git a/51.md b/51.md
index c74487f..3ac8995 100644
--- a/51.md
+++ b/51.md
@@ -16,9 +16,41 @@ The kinds `30000` and `30001` have been reserved for generic lists. These must b
 
 ## Standard lists
 
-| name           | kind  | "d" tag        | description                                                                                   | expected tag items                                |
-| ---            | ---   | ---            | ---                                                                                           | ---                                               |
-| Muted list     | 30000 | `"mute"`       | things the user doesn't want to see in their feeds                                            | `"p"` (pubkeys), `"t"` (hashtags)                 |
-| Bookmarks list | 30001 | `"bookmark"`   | things the user intends to save for the future                                                | `"e"` (kind:1 notes), `"a"` (kind:30023 articles) |
-| Pin list       | 30001 | `"pin"`        | events the user intends to showcase in their profile page                                     | `"e"` (kind:1 notes)                              |
-| Relay sets     | 30002 | (user-defined) | user-defined relay groups the user can easily pick and choose from during variadic operations | `"relay"` (relay URLs)                            |
+| name             | kind  | "d" tag         | description                                                                                   | expected tag items                                |
+| ---              | ---   | ---             | ---                                                                                           | ---                                               |
+| Mute list       | 30000 | `"mute"`        | things the user doesn't want to see in their feeds                                            | `"p"` (pubkeys), `"t"` (hashtags)                 |
+| Bookmarks list   | 30001 | `"bookmark"`    | things the user intends to save for the future                                                | `"e"` (kind:1 notes), `"a"` (kind:30023 articles) |
+| Pin list         | 30001 | `"pin"`         | events the user intends to showcase in their profile page                                     | `"e"` (kind:1 notes)                              |
+| Communities list | 30001 | `"communities"` | [NIP-72](72.md) communities the user belongs to                                               | `"a"` (kind:34550 community definitions)          |
+| Relay sets       | 30002 | (user-defined)  | user-defined relay groups the user can easily pick and choose from during variadic operations | `"relay"` (relay URLs)                            |
+
+## Examples
+
+### A _Mute list_ with some public items and some encrypted items
+
+```json
+{
+  "id": "a92a316b75e44cfdc19986c634049158d4206fcc0b7b9c7ccbcdabe28beebcd0",
+  "pubkey": "854043ae8f1f97430ca8c1f1a090bdde6488bd5115c7a45307a2a212750ae4cb",
+  "created_at": 1699597889,
+  "kind": 30000,
+  "tags": [
+    ["d", "mute"],
+    ["p", "07caba282f76441955b695551c3c5c742e5b9202a3784780f8086fdcdc1da3a9"],
+    ["p", "a55c15f5e41d5aebd236eca5e0142789c5385703f1a7485aa4b38d94fd18dcc4"]
+  ],
+  "content": "TJob1dQrf2ndsmdbeGU+05HT5GMnBSx3fx8QdDY/g3NvCa7klfzgaQCmRZuo1d3WQjHDOjzSY1+MgTK5WjewFFumCcOZniWtOMSga9tJk1ky00tLoUUzyLnb1v9x95h/iT/KpkICJyAwUZ+LoJBUzLrK52wNTMt8M5jSLvCkRx8C0BmEwA/00pjOp4eRndy19H4WUUehhjfV2/VV/k4hMAjJ7Bb5Hp9xdmzmCLX9+64+MyeIQQjQAHPj8dkSsRahP7KS3MgMpjaF8nL48Bg5suZMxJayXGVp3BLtgRZx5z5nOk9xyrYk+71e2tnP9IDvSMkiSe76BcMct+m7kGVrRcavDI4n62goNNh25IpghT+a1OjjkpXt9me5wmaL7fxffV1pchdm+A7KJKIUU3kLC7QbUifF22EucRA9xiEyxETusNludBXN24O3llTbOy4vYFsq35BeZl4v1Cse7n2htZicVkItMz3wjzj1q1I1VqbnorNXFgllkRZn4/YXfTG/RMnoK/bDogRapOV+XToZ+IvsN0BqwKSUDx+ydKpci6htDRF2WDRkU+VQMqwM0CoLzy2H6A2cqyMMMD9SLRRzBg==?iv=S3rFeFr1gsYqmQA7bNnNTQ==",
+  "sig": "1173822c53261f8cffe7efbf43ba4a97a9198b3e402c2a1df130f42a8985a2d0d3430f4de350db184141e45ca844ab4e5364ea80f11d720e36357e1853dba6ca"
+}
+```
+
+## Encryption process pseudocode
+
+```scala
+val private_items = [
+  ["p", "07caba282f76441955b695551c3c5c742e5b9202a3784780f8086fdcdc1da3a9"],
+  ["a", "a55c15f5e41d5aebd236eca5e0142789c5385703f1a7485aa4b38d94fd18dcc4"],
+]
+val base64blob = nip04.encrypt(json.encode_to_string(private_items))
+event.content = base64blob
+```

From 1bbd87c42fe6ca6caa7582fdb89a355b6dfc70f4 Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Wed, 15 Nov 2023 07:33:26 -0300
Subject: [PATCH 007/263] distinction between lists and sets.

---
 51.md | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/51.md b/51.md
index 3ac8995..b184f42 100644
--- a/51.md
+++ b/51.md
@@ -14,19 +14,31 @@ Public items in a list are specified in the event `tags` array, while private it
 
 The kinds `30000` and `30001` have been reserved for generic lists. These must be accompanied by a `d` tag identifying the list, but these are generally client-specific, except in the standard cases specified below.
 
-## Standard lists
+### Standard lists
 
-| name             | kind  | "d" tag         | description                                                                                   | expected tag items                                |
-| ---              | ---   | ---             | ---                                                                                           | ---                                               |
-| Mute list       | 30000 | `"mute"`        | things the user doesn't want to see in their feeds                                            | `"p"` (pubkeys), `"t"` (hashtags)                 |
-| Bookmarks list   | 30001 | `"bookmark"`    | things the user intends to save for the future                                                | `"e"` (kind:1 notes), `"a"` (kind:30023 articles) |
-| Pin list         | 30001 | `"pin"`         | events the user intends to showcase in their profile page                                     | `"e"` (kind:1 notes)                              |
-| Communities list | 30001 | `"communities"` | [NIP-72](72.md) communities the user belongs to                                               | `"a"` (kind:34550 community definitions)          |
-| Relay sets       | 30002 | (user-defined)  | user-defined relay groups the user can easily pick and choose from during variadic operations | `"relay"` (relay URLs)                            |
+These are some standards that emerged in the wild:
+
+| name             | kind  | "d" tag         | description                                               | expected tag items                                |
+| ---              | ---   | ---             | ---                                                       | ---                                               |
+| Mute list        | 30000 | `"mute"`        | things the user doesn't want to see in their feeds        | `"p"` (pubkeys), `"t"` (hashtags)                 |
+| Bookmarks list   | 30001 | `"bookmark"`    | things the user intends to save for the future            | `"e"` (kind:1 notes), `"a"` (kind:30023 articles) |
+| Pin list         | 30001 | `"pin"`         | events the user intends to showcase in their profile page | `"e"` (kind:1 notes)                              |
+| Communities list | 30001 | `"communities"` | [NIP-72](72.md) communities the user belongs to           | `"a"` (kind:34550 community definitions)          |
+
+## Sets
+
+Sets are lists with well-defined meaning and purpose and user-assigned `d` tags meant to be displayed in the UI. For example, _relay sets_ can be displayed in a dropdown UI to give users the option to switch to which relays they will publish an event or from which relays they will read the replies to an event; or _curation sets_ can be used by apps to showcase curations made by others tagged to different topics.
+
+Aside from their main identifier, the `"d"` tag, sets can optionally have a `"title"`, an `"image"` and a `"description"` tag that can be used to enhance their UI.
+
+| name                  | kind  | description                                                                                   | expected tag items          |
+| ---                   | ---   | ---                                                                                           | ---                         |
+| Relay sets            | 30002 | user-defined relay groups the user can easily pick and choose from during variadic operations | `"relay"` (relay URLs)      |
+| Article Curation sets | 30003 | groups of articles picked by users as interesting and/or belonging to the same category       | `"a"` (kind:30023 articles) |
 
 ## Examples
 
-### A _Mute list_ with some public items and some encrypted items
+### A _mute list_ with some public items and some encrypted items
 
 ```json
 {

From cf1b17280f5ba97c7f3bf1f699494f1551de8064 Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Wed, 15 Nov 2023 08:24:46 -0300
Subject: [PATCH 008/263] bring back kind:10000 mute lists, deprecation notice
 about kind:30000/"mute" and more examples.

---
 51.md | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 105 insertions(+), 15 deletions(-)

diff --git a/51.md b/51.md
index b184f42..d113f80 100644
--- a/51.md
+++ b/51.md
@@ -6,35 +6,64 @@ Lists
 
 `draft` `optional` `author:fiatjaf` `author:arcbtc` `author:monlovesmango` `author:eskema` `author:gzuuus`
 
-This NIP defines lists of things that users can create. Lists can contain references to anything, and these references can be **public** or **private**.
+This NIP defines lists of things that users can create. Lists can contain references to anything, and these
+references can be **public** or **private**.
 
-Public items in a list are specified in the event `tags` array, while private items are specified in a JSON array that mimics the structure of the event `tags` array, but stringified and encrypted using the same scheme from [NIP-04](04.md) (the shared key is computed using the author's public and private key) and stored in the `.content`.
+Public items in a list are specified in the event `tags` array, while private items are specified in a JSON
+array that mimics the structure of the event `tags` array, but stringified and encrypted using the same
+scheme from [NIP-04](04.md) (the shared key is computed using the author's public and private key) and
+stored in the `.content`.
 
-## Generic lists
+## Types of lists
 
-The kinds `30000` and `30001` have been reserved for generic lists. These must be accompanied by a `d` tag identifying the list, but these are generally client-specific, except in the standard cases specified below.
+### Generic lists
 
-### Standard lists
+The kind `30001` has been reserved for generic lists. These must be accompanied by a `d` tag identifying the
+list, but these have no standard meaning and are generally client-specific (except in the standard cases
+specified below).
 
-These are some standards that emerged in the wild:
+## Standard lists
+
+Users are expected to have a single list of each of these types. They have special meaning and clients may
+rely on them to augment the user profile or browsing experience.
+
+For example, _mute lists_ can contain the public keys of spammers and bad actors users don't want to see in
+their feeds or receive annoying notifications from.
 
 | name             | kind  | "d" tag         | description                                               | expected tag items                                |
 | ---              | ---   | ---             | ---                                                       | ---                                               |
-| Mute list        | 30000 | `"mute"`        | things the user doesn't want to see in their feeds        | `"p"` (pubkeys), `"t"` (hashtags)                 |
+| Mute list        | 10000 |                 | things the user doesn't want to see in their feeds        | `"p"` (pubkeys), `"t"` (hashtags)                 |
 | Bookmarks list   | 30001 | `"bookmark"`    | things the user intends to save for the future            | `"e"` (kind:1 notes), `"a"` (kind:30023 articles) |
 | Pin list         | 30001 | `"pin"`         | events the user intends to showcase in their profile page | `"e"` (kind:1 notes)                              |
 | Communities list | 30001 | `"communities"` | [NIP-72](72.md) communities the user belongs to           | `"a"` (kind:34550 community definitions)          |
 
 ## Sets
 
-Sets are lists with well-defined meaning and purpose and user-assigned `d` tags meant to be displayed in the UI. For example, _relay sets_ can be displayed in a dropdown UI to give users the option to switch to which relays they will publish an event or from which relays they will read the replies to an event; or _curation sets_ can be used by apps to showcase curations made by others tagged to different topics.
+Sets are lists with well-defined meaning that can enhance the functionality and the UI of clients that rely
+on them. Unlike standard lists, users are expected to have more than one set of each kind, therefore each of
+them must be assigned a different `"d"` identifier.
 
-Aside from their main identifier, the `"d"` tag, sets can optionally have a `"title"`, an `"image"` and a `"description"` tag that can be used to enhance their UI.
+For example, _relay sets_ can be displayed in a dropdown UI to give users the option to switch to which
+relays they will publish an event or from which relays they will read the replies to an event; _curation sets_
+can be used by apps to showcase curations made by others tagged to different topics.
 
-| name                  | kind  | description                                                                                   | expected tag items          |
-| ---                   | ---   | ---                                                                                           | ---                         |
-| Relay sets            | 30002 | user-defined relay groups the user can easily pick and choose from during variadic operations | `"relay"` (relay URLs)      |
-| Article Curation sets | 30003 | groups of articles picked by users as interesting and/or belonging to the same category       | `"a"` (kind:30023 articles) |
+Aside from their main identifier, the `"d"` tag, sets can optionally have a `"title"`, an `"image"` and a
+`"description"` tag that can be used to enhance their UI.
+
+| name                  | kind  | description                                                                                   | expected tag items                                |
+| ---                   | ---   | ---                                                                                           | ---                                               |
+| Relay sets            | 30002 | user-defined relay groups the user can easily pick and choose from during variadic operations | `"relay"` (relay URLs)                            |
+| Article 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) |
+
+## Deprecated standard lists
+
+Some clients have used these lists in the past, but they should work on transitioning to the [standard formats](#standard-lists) above:
+
+- kind:30000 and `d` "mute"
+
+| kind  | "d" tag  | use instead            |
+| ---   | ---      | ---                    |
+| 30000 | `"mute"` | kind 10000 _mute list_ |
 
 ## Examples
 
@@ -45,9 +74,8 @@ Aside from their main identifier, the `"d"` tag, sets can optionally have a `"ti
   "id": "a92a316b75e44cfdc19986c634049158d4206fcc0b7b9c7ccbcdabe28beebcd0",
   "pubkey": "854043ae8f1f97430ca8c1f1a090bdde6488bd5115c7a45307a2a212750ae4cb",
   "created_at": 1699597889,
-  "kind": 30000,
+  "kind": 10000,
   "tags": [
-    ["d", "mute"],
     ["p", "07caba282f76441955b695551c3c5c742e5b9202a3784780f8086fdcdc1da3a9"],
     ["p", "a55c15f5e41d5aebd236eca5e0142789c5385703f1a7485aa4b38d94fd18dcc4"]
   ],
@@ -56,6 +84,68 @@ Aside from their main identifier, the `"d"` tag, sets can optionally have a `"ti
 }
 ```
 
+### A _communities list_ with just public items
+
+```json
+{
+  "id": "da6b18c5452b5a60bf49588fc13ae4d1a047519c13e49a77b3184e6188c7bb1c",
+  "pubkey": "83fd07de9b763334cc9d46f2785c2558e6c2eabfe7d0c6ec214667cbaec50d47",
+  "created_at": 1689082210,
+  "kind": 30001,
+  "tags": [
+    [
+      "d",
+      "communities"
+    ],
+    [
+      "a",
+      "34550:83fd07de9b763334cc9d46f2785c2558e6c2eabfe7d0c6ec214667cbaec50d47:meme"
+    ],
+    [
+      "a",
+      "34550:b9a537523bba2fcdae857d90d8a760de4f2139c9f90d986f747ce7d0ec0d173d:NoBullshitBitcoin"
+    ]
+  ],
+  "content": "",
+  "sig": "e400cc8bf24955243137e4456b22142fdff400a7950cf0b0ac2ee86ed78671e2fddf9a9b40c77ccf8397f9c21d608b3fab3678ff13713fc3f97a4394cf766079"
+}
+```
+
+### A _curation set_ of articles and notes about yaks
+
+```
+{
+  "id": "567b41fc9060c758c4216fe5f8d3df7c57daad7ae757fa4606f0c39d4dd220ef",
+  "pubkey": "d6dc95542e18b8b7aec2f14610f55c335abebec76f3db9e58c254661d0593a0c",
+  "created_at": 1695327657,
+  "kind": 30004,
+  "tags": [
+    [
+      "d",
+      "jvdy9i4"
+    ],
+    [
+      "title",
+      "Yaks"
+    ],
+    [
+      "summary",
+      "The domestic yak, also known as the Tartary ox, grunting ox, or hairy cattle, is a species of long-haired domesticated cattle found throughout the Himalayan region of the Indian subcontinent, the Tibetan Plateau, Gilgit-Baltistan, Tajikistan and as far north as Mongolia and Siberia."
+    ],
+    [
+      "image",
+      "https://cdn.britannica.com/40/188540-050-9AC748DE/Yak-Himalayas-Nepal.jpg"
+    ],
+    ["a", "30023:26dc95542e18b8b7aec2f14610f55c335abebec76f3db9e58c254661d0593a0c:95ODQzw3ajNoZ8SyMDOzQ"],
+    ["a", "30023:54af95542e18b8b7aec2f14610f55c335abebec76f3db9e58c254661d0593a0c:1-MYP8dAhramH9J5gJWKx"],
+    ["a", "30023:f8fe95542e18b8b7aec2f14610f55c335abebec76f3db9e58c254661d0593a0c:D2Tbd38bGrFvU0bIbvSMt"],
+    ["e", "d78ba0d5dce22bfff9db0a9e996c9ef27e2c91051de0c4e1da340e0326b4941e"]
+  ],
+  "content": "",
+  "sig": "a9a4e2192eede77e6c9d24ddfab95ba3ff7c03fbd07ad011fff245abea431fb4d3787c2d04aad001cb039cb8de91d83ce30e9a94f82ac3c5a2372aa1294a96bd"
+}
+```
+
 ## Encryption process pseudocode
 
 ```scala

From fd288d4ea9c5aef08747f91db90339b73cce0640 Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Wed, 15 Nov 2023 08:28:59 -0300
Subject: [PATCH 009/263] update readme kind list.

---
 README.md | 121 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 62 insertions(+), 59 deletions(-)

diff --git a/README.md b/README.md
index 74411ca..94be17e 100644
--- a/README.md
+++ b/README.md
@@ -74,65 +74,68 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 - [NIP-99: Classified Listings](99.md)
 
 ## Event Kinds
-| kind          | description                | NIP                                                              |
-| ------------- | -------------------------- | -----------                                                      |
-| `0`           | Metadata                   | [1](01.md)                                                       |
-| `1`           | Short Text Note            | [1](01.md)                                                       |
-| `2`           | Recommend Relay            |                                                                  |
-| `3`           | Contacts                   | [2](02.md)                                                       |
-| `4`           | Encrypted Direct Messages  | [4](04.md)                                                       |
-| `5`           | Event Deletion             | [9](09.md)                                                       |
-| `6`           | Repost                     | [18](18.md)                                                      |
-| `7`           | Reaction                   | [25](25.md)                                                      |
-| `8`           | Badge Award                | [58](58.md)                                                      |
-| `16`          | Generic Repost             | [18](18.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)                                                      |
-| `1063`        | File Metadata              | [94](94.md)                                                      |
-| `1311`        | Live Chat Message          | [53](53.md)                                                      |
-| `1040`        | OpenTimestamps             | [03](03.md)                                                      |
-| `1971`        | Problem Tracker            | [1971](https://github.com/nostrocket/NIPS/blob/main/Problems.md) |
-| `1984`        | Reporting                  | [56](56.md)                                                      |
-| `1985`        | Label                      | [32](32.md)                                                      |
-| `4550`        | Community Post Approval    | [72](72.md)                                                      |
-| `5000`-`5999` | Job Request                | [90](90.md)                                                      |
-| `6000`-`6999` | Job Result                 | [90](90.md)                                                      |
-| `7000`        | Job Feedback               | [90](90.md)                                                      |
-| `9041`        | Zap Goal                   | [75](75.md)                                                      |
-| `9734`        | Zap Request                | [57](57.md)                                                      |
-| `9735`        | Zap                        | [57](57.md)                                                      |
-| `9802`        | Highlights                 | [84](84.md)                                                      |
-| `10002`       | Relay List Metadata        | [65](65.md)                                                      |
-| `13194`       | Wallet Info                | [47](47.md)                                                      |
-| `22242`       | Client Authentication      | [42](42.md)                                                      |
-| `23194`       | Wallet Request             | [47](47.md)                                                      |
-| `23195`       | Wallet Response            | [47](47.md)                                                      |
-| `24133`       | Nostr Connect              | [46](46.md)                                                      |
-| `27235`       | HTTP Auth                  | [98](98.md)                                                      |
-| `30000`       | People List                | [51](51.md)                                                      |
-| `30001`       | Things List                | [51](51.md)                                                      |
-| `30002`       | Relay Set                  | [51](51.md)                                                      |
-| `30008`       | Profile Badges             | [58](58.md)                                                      |
-| `30009`       | Badge Definition           | [58](58.md)                                                      |
-| `30017`       | Create or update a stall   | [15](15.md)                                                      |
-| `30018`       | Create or update a product | [15](15.md)                                                      |
-| `30023`       | Long-form Content          | [23](23.md)                                                      |
-| `30024`       | Draft Long-form Content    | [23](23.md)                                                      |
-| `30078`       | Application-specific Data  | [78](78.md)                                                      |
-| `30311`       | Live Event                 | [53](53.md)                                                      |
-| `30315`       | User Statuses              | [38](38.md)                                                      |
-| `30402`       | Classified Listing         | [99](99.md)                                                      |
-| `30403`       | Draft Classified Listing   | [99](99.md)                                                      |
-| `31922`       | Date-Based Calendar Event  | [52](52.md)                                                      |
-| `31923`       | Time-Based Calendar Event  | [52](52.md)                                                      |
-| `31924`       | Calendar                   | [52](52.md)                                                      |
-| `31925`       | Calendar Event RSVP        | [52](52.md)                                                      |
-| `31989`       | Handler recommendation     | [89](89.md)                                                      |
-| `31990`       | Handler information        | [89](89.md)                                                      |
-| `34550`       | Community Definition       | [72](72.md)                                                      |
+| kind          | description                | NIP                                |
+| ------------- | -------------------------- | -----------                        |
+| `0`           | Metadata                   | [1](01.md)                         |
+| `1`           | Short Text Note            | [1](01.md)                         |
+| `2`           | Recommend Relay            |                                    |
+| `3`           | Contacts                   | [2](02.md)                         |
+| `4`           | Encrypted Direct Messages  | [4](04.md)                         |
+| `5`           | Event Deletion             | [9](09.md)                         |
+| `6`           | Repost                     | [18](18.md)                        |
+| `7`           | Reaction                   | [25](25.md)                        |
+| `8`           | Badge Award                | [58](58.md)                        |
+| `16`          | Generic Repost             | [18](18.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)                        |
+| `1063`        | File Metadata              | [94](94.md)                        |
+| `1311`        | Live Chat Message          | [53](53.md)                        |
+| `1040`        | OpenTimestamps             | [03](03.md)                        |
+| `1971`        | Problem Tracker            | [nostrocket-1971][nostrocket-1971] |
+| `1984`        | Reporting                  | [56](56.md)                        |
+| `1985`        | Label                      | [32](32.md)                        |
+| `4550`        | Community Post Approval    | [72](72.md)                        |
+| `5000`-`5999` | Job Request                | [90](90.md)                        |
+| `6000`-`6999` | Job Result                 | [90](90.md)                        |
+| `7000`        | Job Feedback               | [90](90.md)                        |
+| `9041`        | Zap Goal                   | [75](75.md)                        |
+| `9734`        | Zap Request                | [57](57.md)                        |
+| `9735`        | Zap                        | [57](57.md)                        |
+| `9802`        | Highlights                 | [84](84.md)                        |
+| `10000`       | Mute list                  | [65](65.md)                        |
+| `10002`       | Relay List Metadata        | [65](65.md)                        |
+| `13194`       | Wallet Info                | [47](47.md)                        |
+| `22242`       | Client Authentication      | [42](42.md)                        |
+| `23194`       | Wallet Request             | [47](47.md)                        |
+| `23195`       | Wallet Response            | [47](47.md)                        |
+| `24133`       | Nostr Connect              | [46](46.md)                        |
+| `27235`       | HTTP Auth                  | [98](98.md)                        |
+| `30001`       | Generic lists              | [51](51.md)                        |
+| `30002`       | Relay sets                 | [51](51.md)                        |
+| `30004`       | Curation sets              | [51](51.md)                        |
+| `30008`       | Profile Badges             | [58](58.md)                        |
+| `30009`       | Badge Definition           | [58](58.md)                        |
+| `30017`       | Create or update a stall   | [15](15.md)                        |
+| `30018`       | Create or update a product | [15](15.md)                        |
+| `30023`       | Long-form Content          | [23](23.md)                        |
+| `30024`       | Draft Long-form Content    | [23](23.md)                        |
+| `30078`       | Application-specific Data  | [78](78.md)                        |
+| `30311`       | Live Event                 | [53](53.md)                        |
+| `30315`       | User Statuses              | [38](38.md)                        |
+| `30402`       | Classified Listing         | [99](99.md)                        |
+| `30403`       | Draft Classified Listing   | [99](99.md)                        |
+| `31922`       | Date-Based Calendar Event  | [52](52.md)                        |
+| `31923`       | Time-Based Calendar Event  | [52](52.md)                        |
+| `31924`       | Calendar                   | [52](52.md)                        |
+| `31925`       | Calendar Event RSVP        | [52](52.md)                        |
+| `31989`       | Handler recommendation     | [89](89.md)                        |
+| `31990`       | Handler information        | [89](89.md)                        |
+| `34550`       | Community Definition       | [72](72.md)                        |
+
+[nostrocket-1971]: https://github.com/nostrocket/NIPS/blob/main/Problems.md
 
 ## Message types
 

From 54befcc09a3fdd804ee3f98a8a670c582cd101cc Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Wed, 15 Nov 2023 15:32:09 -0300
Subject: [PATCH 010/263] deprecate the 30001 ad-hoc pin/bookmark/communities
 lists and use new kinds.

---
 51.md     | 23 ++++++++++++-----------
 README.md |  5 ++++-
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/51.md b/51.md
index d113f80..d316bad 100644
--- a/51.md
+++ b/51.md
@@ -30,12 +30,12 @@ rely on them to augment the user profile or browsing experience.
 For example, _mute lists_ can contain the public keys of spammers and bad actors users don't want to see in
 their feeds or receive annoying notifications from.
 
-| name             | kind  | "d" tag         | description                                               | expected tag items                                |
-| ---              | ---   | ---             | ---                                                       | ---                                               |
-| Mute list        | 10000 |                 | things the user doesn't want to see in their feeds        | `"p"` (pubkeys), `"t"` (hashtags)                 |
-| Bookmarks list   | 30001 | `"bookmark"`    | things the user intends to save for the future            | `"e"` (kind:1 notes), `"a"` (kind:30023 articles) |
-| Pin list         | 30001 | `"pin"`         | events the user intends to showcase in their profile page | `"e"` (kind:1 notes)                              |
-| Communities list | 30001 | `"communities"` | [NIP-72](72.md) communities the user belongs to           | `"a"` (kind:34550 community definitions)          |
+| name             | kind  | description                                               | expected tag items                                |
+| ---              | ---   | ---                                                       | ---                                               |
+| Mute list        | 10000 | things the user doesn't want to see in their feeds        | `"p"` (pubkeys), `"t"` (hashtags)                 |
+| Pin list         | 10001 | events the user intends to showcase in their profile page | `"e"` (kind:1 notes)                              |
+| Bookmarks list   | 10003 | things the user intends to save for the future            | `"e"` (kind:1 notes), `"a"` (kind:30023 articles) |
+| Communities list | 10004 | [NIP-72](72.md) communities the user belongs to           | `"a"` (kind:34550 community definitions)          |
 
 ## Sets
 
@@ -59,11 +59,12 @@ Aside from their main identifier, the `"d"` tag, sets can optionally have a `"ti
 
 Some clients have used these lists in the past, but they should work on transitioning to the [standard formats](#standard-lists) above:
 
-- kind:30000 and `d` "mute"
-
-| kind  | "d" tag  | use instead            |
-| ---   | ---      | ---                    |
-| 30000 | `"mute"` | kind 10000 _mute list_ |
+| kind  | "d" tag         | use instead                   |
+| ---   | ---             | ---                           |
+| 30000 | `"mute"`        | kind 10000 _mute list_        |
+| 30001 | `"pin"`         | kind 10001 _pin list_         |
+| 30001 | `"bookmark"`    | kind 10003 _bookmarks list_   |
+| 30001 | `"communities"` | kind 10004 _communities list_ |
 
 ## Examples
 
diff --git a/README.md b/README.md
index 94be17e..c0286ca 100644
--- a/README.md
+++ b/README.md
@@ -105,8 +105,11 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `9734`        | Zap Request                | [57](57.md)                        |
 | `9735`        | Zap                        | [57](57.md)                        |
 | `9802`        | Highlights                 | [84](84.md)                        |
-| `10000`       | Mute list                  | [65](65.md)                        |
+| `10000`       | Mute list                  | [51](51.md)                        |
+| `10001`       | Pin list                   | [51](51.md)                        |
 | `10002`       | Relay List Metadata        | [65](65.md)                        |
+| `10003`       | Bookmark list              | [51](51.md)                        |
+| `10004`       | Communities list           | [51](51.md)                        |
 | `13194`       | Wallet Info                | [47](47.md)                        |
 | `22242`       | Client Authentication      | [42](42.md)                        |
 | `23194`       | Wallet Request             | [47](47.md)                        |

From 61b736574cde8e954efe70da3c8c9116297cebf0 Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Wed, 15 Nov 2023 15:32:22 -0300
Subject: [PATCH 011/263] add kind 30005 follow sets.

---
 51.md     | 9 +++++----
 README.md | 1 +
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/51.md b/51.md
index d316bad..e0bafdb 100644
--- a/51.md
+++ b/51.md
@@ -50,10 +50,11 @@ can be used by apps to showcase curations made by others tagged to different top
 Aside from their main identifier, the `"d"` tag, sets can optionally have a `"title"`, an `"image"` and a
 `"description"` tag that can be used to enhance their UI.
 
-| name                  | kind  | description                                                                                   | expected tag items                                |
-| ---                   | ---   | ---                                                                                           | ---                                               |
-| Relay sets            | 30002 | user-defined relay groups the user can easily pick and choose from during variadic operations | `"relay"` (relay URLs)                            |
-| Article 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) |
+| name          | kind  | description                                                                                   | expected tag items                                |
+| ---           | ---   | ---                                                                                           | ---                                               |
+| Relay sets    | 30002 | user-defined relay groups the user can easily pick and choose from during variadic operations | `"relay"` (relay 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) |
+| Follow sets   | 30005 | categorized groups of users a client may choose to check out in different circumstances       | `"p"` (pubkeys)                                   |
 
 ## Deprecated standard lists
 
diff --git a/README.md b/README.md
index c0286ca..6894daa 100644
--- a/README.md
+++ b/README.md
@@ -119,6 +119,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `30001`       | Generic lists              | [51](51.md)                        |
 | `30002`       | Relay sets                 | [51](51.md)                        |
 | `30004`       | Curation sets              | [51](51.md)                        |
+| `30005`       | Follow sets                | [51](51.md)                        |
 | `30008`       | Profile Badges             | [58](58.md)                        |
 | `30009`       | Badge Definition           | [58](58.md)                        |
 | `30017`       | Create or update a stall   | [15](15.md)                        |

From 4db99145d7ae9df84f3d99681fa2df8320702a75 Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Wed, 15 Nov 2023 15:34:46 -0300
Subject: [PATCH 012/263] remove legacy communities list example.

---
 51.md | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/51.md b/51.md
index e0bafdb..3fc6830 100644
--- a/51.md
+++ b/51.md
@@ -86,33 +86,6 @@ Some clients have used these lists in the past, but they should work on transiti
 }
 ```
 
-### A _communities list_ with just public items
-
-```json
-{
-  "id": "da6b18c5452b5a60bf49588fc13ae4d1a047519c13e49a77b3184e6188c7bb1c",
-  "pubkey": "83fd07de9b763334cc9d46f2785c2558e6c2eabfe7d0c6ec214667cbaec50d47",
-  "created_at": 1689082210,
-  "kind": 30001,
-  "tags": [
-    [
-      "d",
-      "communities"
-    ],
-    [
-      "a",
-      "34550:83fd07de9b763334cc9d46f2785c2558e6c2eabfe7d0c6ec214667cbaec50d47:meme"
-    ],
-    [
-      "a",
-      "34550:b9a537523bba2fcdae857d90d8a760de4f2139c9f90d986f747ce7d0ec0d173d:NoBullshitBitcoin"
-    ]
-  ],
-  "content": "",
-  "sig": "e400cc8bf24955243137e4456b22142fdff400a7950cf0b0ac2ee86ed78671e2fddf9a9b40c77ccf8397f9c21d608b3fab3678ff13713fc3f97a4394cf766079"
-}
-```
-
 ### A _curation set_ of articles and notes about yaks
 
 ```

From 804ee187c2c18d6896ff2ef4e001eb55bd1e7af6 Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Wed, 15 Nov 2023 15:39:23 -0300
Subject: [PATCH 013/263] make follow sets kind 30000 as per @monlovesmango's
 comment.

---
 51.md     | 2 +-
 README.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/51.md b/51.md
index 3fc6830..d319b81 100644
--- a/51.md
+++ b/51.md
@@ -52,9 +52,9 @@ Aside from their main identifier, the `"d"` tag, sets can optionally have a `"ti
 
 | name          | kind  | description                                                                                   | expected tag items                                |
 | ---           | ---   | ---                                                                                           | ---                                               |
+| Follow sets   | 30000 | categorized groups of users a client may choose to check out in different circumstances       | `"p"` (pubkeys)                                   |
 | Relay sets    | 30002 | user-defined relay groups the user can easily pick and choose from during variadic operations | `"relay"` (relay 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) |
-| Follow sets   | 30005 | categorized groups of users a client may choose to check out in different circumstances       | `"p"` (pubkeys)                                   |
 
 ## Deprecated standard lists
 
diff --git a/README.md b/README.md
index 6894daa..23772ad 100644
--- a/README.md
+++ b/README.md
@@ -116,10 +116,10 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `23195`       | Wallet Response            | [47](47.md)                        |
 | `24133`       | Nostr Connect              | [46](46.md)                        |
 | `27235`       | HTTP Auth                  | [98](98.md)                        |
+| `30000`       | Follow sets                | [51](51.md)                        |
 | `30001`       | Generic lists              | [51](51.md)                        |
 | `30002`       | Relay sets                 | [51](51.md)                        |
 | `30004`       | Curation sets              | [51](51.md)                        |
-| `30005`       | Follow sets                | [51](51.md)                        |
 | `30008`       | Profile Badges             | [58](58.md)                        |
 | `30009`       | Badge Definition           | [58](58.md)                        |
 | `30017`       | Create or update a stall   | [15](15.md)                        |

From cd598bad5b90eba56eea67bfa512038112fb1ac8 Mon Sep 17 00:00:00 2001
From: fiatjaf_ <fiatjaf@gmail.com>
Date: Wed, 15 Nov 2023 20:06:00 -0300
Subject: [PATCH 014/263] remove the point that makes kind 30001 be a grab-bag
 of things

Co-authored-by: hodlbod <jstaab@protonmail.com>
---
 51.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/51.md b/51.md
index d319b81..b3256f7 100644
--- a/51.md
+++ b/51.md
@@ -18,9 +18,6 @@ stored in the `.content`.
 
 ### Generic lists
 
-The kind `30001` has been reserved for generic lists. These must be accompanied by a `d` tag identifying the
-list, but these have no standard meaning and are generally client-specific (except in the standard cases
-specified below).
 
 ## Standard lists
 

From 6c3eebf510cd7adb5db6a2598ffb5796693fc4dd Mon Sep 17 00:00:00 2001
From: fiatjaf_ <fiatjaf@gmail.com>
Date: Wed, 15 Nov 2023 20:06:49 -0300
Subject: [PATCH 015/263] clarify that standard lists use normal replaceable
 events

Co-authored-by: hodlbod <jstaab@protonmail.com>
---
 51.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/51.md b/51.md
index b3256f7..1fd3ef5 100644
--- a/51.md
+++ b/51.md
@@ -21,8 +21,9 @@ stored in the `.content`.
 
 ## Standard lists
 
-Users are expected to have a single list of each of these types. They have special meaning and clients may
-rely on them to augment the user profile or browsing experience.
+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.
 
 For example, _mute lists_ can contain the public keys of spammers and bad actors users don't want to see in
 their feeds or receive annoying notifications from.

From 31382e57a1fabea855300461e7ef2dc751aaba61 Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Wed, 15 Nov 2023 20:52:10 -0300
Subject: [PATCH 016/263] add muted words, blocked relays, search relays, chat
 groups, emoji list and emoji sets. update set metadata tags.

following @vitorpamplona, @frnandu, @snowcait, @hzrd149
closes https://github.com/nostr-protocol/nips/pull/559
closes https://github.com/nostr-protocol/nips/pull/673
---
 51.md     | 46 ++++++++++++++++++----------------------------
 README.md |  5 +++++
 2 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/51.md b/51.md
index 1fd3ef5..8671370 100644
--- a/51.md
+++ b/51.md
@@ -16,9 +16,6 @@ stored in the `.content`.
 
 ## Types of lists
 
-### Generic lists
-
-
 ## Standard lists
 
 Standard lists use non-parameterized replaceable events, meaning users may only have a single list
@@ -28,12 +25,16 @@ browsing experience.
 For example, _mute lists_ can contain the public keys of spammers and bad actors users don't want to see in
 their feeds or receive annoying notifications from.
 
-| name             | kind  | description                                               | expected tag items                                |
-| ---              | ---   | ---                                                       | ---                                               |
-| Mute list        | 10000 | things the user doesn't want to see in their feeds        | `"p"` (pubkeys), `"t"` (hashtags)                 |
-| Pin list         | 10001 | events the user intends to showcase in their profile page | `"e"` (kind:1 notes)                              |
-| Bookmarks list   | 10003 | things the user intends to save for the future            | `"e"` (kind:1 notes), `"a"` (kind:30023 articles) |
-| Communities list | 10004 | [NIP-72](72.md) communities the user belongs to           | `"a"` (kind:34550 community definitions)          |
+| name           | kind  | description                                               | expected tag items                                                              |
+| ---            | ---   | ---                                                       | ---                                                                             |
+| Mute list      | 10000 | things the user doesn't want to see in their feeds        | `"p"` (pubkeys), `"t"` (hashtags), `"word"` (lowercase string), `"e"` (threads) |
+| Pinned notes   | 10001 | events the user intends to showcase in their profile page | `"e"` (kind:1 notes)                                                            |
+| Bookmarks      | 10003 | things the user intends to save for the future            | `"e"` (kind:1 notes), `"a"` (kind:30023 articles)                               |
+| Communities    | 10004 | [NIP-72](72.md) communities the user belongs to           | `"a"` (kind:34550 community definitions)                                        |
+| Public chats   | 10005 | [NIP-28](28.md) chat channels the user is in              | `"e"` (kind:40 community definitions)                                           |
+| Blocked relays | 10006 | relays clients should never connect to                    | `"relay"` (relay URLs)                                                          |
+| Search relays  | 10007 | relays clients should use when performing search queries  | `"relay"` (relay URLs)                                                          |
+| Emojis         | 10030 | user preferred emojis and pointers to emoji sets          | `"emoji"` (see [NIP-30](30.md)) and `"a"` (kind:30030 emoji set)                |
 
 ## Sets
 
@@ -45,18 +46,19 @@ For example, _relay sets_ can be displayed in a dropdown UI to give users the op
 relays they will publish an event or from which relays they will read the replies to an event; _curation sets_
 can be used by apps to showcase curations made by others tagged to different topics.
 
-Aside from their main identifier, the `"d"` tag, sets can optionally have a `"title"`, an `"image"` and a
-`"description"` tag that can be used to enhance their UI.
+Aside from their main identifier, the `"d"` tag, sets can optionally have a `"name"`, a `"picture"` and an
+`"about"` tag that can be used to enhance their UI.
 
 | name          | kind  | description                                                                                   | expected tag items                                |
 | ---           | ---   | ---                                                                                           | ---                                               |
 | Follow sets   | 30000 | categorized groups of users a client may choose to check out in different circumstances       | `"p"` (pubkeys)                                   |
 | Relay sets    | 30002 | user-defined relay groups the user can easily pick and choose from during variadic operations | `"relay"` (relay 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) |
+| Emoji sets    | 30030 | categorized emoji groups                                                                      | `"emoji"` (see [NIP-30](30.md))                   |
 
 ## Deprecated standard lists
 
-Some clients have used these lists in the past, but they should work on transitioning to the [standard formats](#standard-lists) above:
+Some clients have used these lists in the past, but they should work on transitioning to the [standard formats](#standard-lists) above.
 
 | kind  | "d" tag         | use instead                   |
 | ---   | ---             | ---                           |
@@ -93,22 +95,10 @@ Some clients have used these lists in the past, but they should work on transiti
   "created_at": 1695327657,
   "kind": 30004,
   "tags": [
-    [
-      "d",
-      "jvdy9i4"
-    ],
-    [
-      "title",
-      "Yaks"
-    ],
-    [
-      "summary",
-      "The domestic yak, also known as the Tartary ox, grunting ox, or hairy cattle, is a species of long-haired domesticated cattle found throughout the Himalayan region of the Indian subcontinent, the Tibetan Plateau, Gilgit-Baltistan, Tajikistan and as far north as Mongolia and Siberia."
-    ],
-    [
-      "image",
-      "https://cdn.britannica.com/40/188540-050-9AC748DE/Yak-Himalayas-Nepal.jpg"
-    ],
+    ["d", "jvdy9i4"],
+    ["name", "Yaks"],
+    ["picture", "https://cdn.britannica.com/40/188540-050-9AC748DE/Yak-Himalayas-Nepal.jpg"],
+    ["about", "The domestic yak, also known as the Tartary ox, grunting ox, or hairy cattle, is a species of long-haired domesticated cattle found throughout the Himalayan region of the Indian subcontinent, the Tibetan Plateau, Gilgit-Baltistan, Tajikistan and as far north as Mongolia and Siberia."],
     ["a", "30023:26dc95542e18b8b7aec2f14610f55c335abebec76f3db9e58c254661d0593a0c:95ODQzw3ajNoZ8SyMDOzQ"],
     ["a", "30023:54af95542e18b8b7aec2f14610f55c335abebec76f3db9e58c254661d0593a0c:1-MYP8dAhramH9J5gJWKx"],
     ["a", "30023:f8fe95542e18b8b7aec2f14610f55c335abebec76f3db9e58c254661d0593a0c:D2Tbd38bGrFvU0bIbvSMt"],
diff --git a/README.md b/README.md
index 23772ad..91d6f84 100644
--- a/README.md
+++ b/README.md
@@ -110,6 +110,10 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `10002`       | Relay List Metadata        | [65](65.md)                        |
 | `10003`       | Bookmark list              | [51](51.md)                        |
 | `10004`       | Communities list           | [51](51.md)                        |
+| `10005`       | Public chats list          | [51](51.md)                        |
+| `10006`       | Blocked relays list        | [51](51.md)                        |
+| `10007`       | Search relays list         | [51](51.md)                        |
+| `10030`       | User emoji list            | [51](51.md)                        |
 | `13194`       | Wallet Info                | [47](47.md)                        |
 | `22242`       | Client Authentication      | [42](42.md)                        |
 | `23194`       | Wallet Request             | [47](47.md)                        |
@@ -122,6 +126,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `30004`       | Curation sets              | [51](51.md)                        |
 | `30008`       | Profile Badges             | [58](58.md)                        |
 | `30009`       | Badge Definition           | [58](58.md)                        |
+| `30030`       | Emoji sets                 | [51](51.md)                        |
 | `30017`       | Create or update a stall   | [15](15.md)                        |
 | `30018`       | Create or update a product | [15](15.md)                        |
 | `30023`       | Long-form Content          | [23](23.md)                        |

From 2a0b701ff77d4ffd686661d829b7b7091e29589b Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Thu, 16 Nov 2023 12:26:50 -0300
Subject: [PATCH 017/263] add bookmark sets (following @staab).

---
 51.md     | 33 +++++++++++++++++----------------
 README.md |  1 +
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/51.md b/51.md
index 8671370..ab15be4 100644
--- a/51.md
+++ b/51.md
@@ -25,16 +25,16 @@ browsing experience.
 For example, _mute lists_ can contain the public keys of spammers and bad actors users don't want to see in
 their feeds or receive annoying notifications from.
 
-| name           | kind  | description                                               | expected tag items                                                              |
-| ---            | ---   | ---                                                       | ---                                                                             |
-| Mute list      | 10000 | things the user doesn't want to see in their feeds        | `"p"` (pubkeys), `"t"` (hashtags), `"word"` (lowercase string), `"e"` (threads) |
-| Pinned notes   | 10001 | events the user intends to showcase in their profile page | `"e"` (kind:1 notes)                                                            |
-| Bookmarks      | 10003 | things the user intends to save for the future            | `"e"` (kind:1 notes), `"a"` (kind:30023 articles)                               |
-| Communities    | 10004 | [NIP-72](72.md) communities the user belongs to           | `"a"` (kind:34550 community definitions)                                        |
-| Public chats   | 10005 | [NIP-28](28.md) chat channels the user is in              | `"e"` (kind:40 community definitions)                                           |
-| Blocked relays | 10006 | relays clients should never connect to                    | `"relay"` (relay URLs)                                                          |
-| Search relays  | 10007 | relays clients should use when performing search queries  | `"relay"` (relay URLs)                                                          |
-| Emojis         | 10030 | user preferred emojis and pointers to emoji sets          | `"emoji"` (see [NIP-30](30.md)) and `"a"` (kind:30030 emoji set)                |
+| name           | kind  | description                                                 | expected tag items                                                                |
+| ---            | ---   | ---                                                         | ---                                                                               |
+| Mute list      | 10000 | things the user doesn't want to see in their feeds          | `"p"` (pubkeys), `"t"` (hashtags), `"word"` (lowercase string), `"e"` (threads)   |
+| Pinned notes   | 10001 | events the user intends to showcase in their profile page   | `"e"` (kind:1 notes)                                                              |
+| Bookmarks      | 10003 | uncategorized, "global" list of things a user wants to save | `"e"` (kind:1 notes), `"a"` (kind:30023 articles), `"t"` (hashtags), `"r" (URLs)` |
+| Communities    | 10004 | [NIP-72](72.md) communities the user belongs to             | `"a"` (kind:34550 community definitions)                                          |
+| Public chats   | 10005 | [NIP-28](28.md) chat channels the user is in                | `"e"` (kind:40 community definitions)                                             |
+| Blocked relays | 10006 | relays clients should never connect to                      | `"relay"` (relay URLs)                                                            |
+| Search relays  | 10007 | relays clients should use when performing search queries    | `"relay"` (relay URLs)                                                            |
+| Emojis         | 10030 | user preferred emojis and pointers to emoji sets            | `"emoji"` (see [NIP-30](30.md)) and `"a"` (kind:30030 emoji set)                  |
 
 ## Sets
 
@@ -49,12 +49,13 @@ can be used by apps to showcase curations made by others tagged to different top
 Aside from their main identifier, the `"d"` tag, sets can optionally have a `"name"`, a `"picture"` and an
 `"about"` tag that can be used to enhance their UI.
 
-| name          | kind  | description                                                                                   | expected tag items                                |
-| ---           | ---   | ---                                                                                           | ---                                               |
-| Follow sets   | 30000 | categorized groups of users a client may choose to check out in different circumstances       | `"p"` (pubkeys)                                   |
-| Relay sets    | 30002 | user-defined relay groups the user can easily pick and choose from during variadic operations | `"relay"` (relay 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) |
-| Emoji sets    | 30030 | categorized emoji groups                                                                      | `"emoji"` (see [NIP-30](30.md))                   |
+| name          | kind  | description                                                                                  | expected tag items                                                                |
+| ---           | ---   | ---                                                                                          | ---                                                                               |
+| Follow sets   | 30000 | categorized groups of users a client may choose to check out in different circumstances      | `"p"` (pubkeys)                                                                   |
+| Relay sets    | 30002 | user-defined relay groups the user can easily pick and choose from during various operations | `"relay"` (relay URLs)                                                            |
+| Bookmark sets | 30003 | user-defined bookmarks categories , for when bookmarks must be in labeled separate groups    | `"e"` (kind:1 notes), `"a"` (kind:30023 articles), `"t"` (hashtags), `"r" (URLs)` |
+| Curation sets | 30004 | groups of articles picked by users as interesting and/or belonging to the same category      | `"a"` (kind:30023 articles), `"e"` (kind:1 notes)                                 |
+| Emoji sets    | 30030 | categorized emoji groups                                                                     | `"emoji"` (see [NIP-30](30.md))                                                   |
 
 ## Deprecated standard lists
 
diff --git a/README.md b/README.md
index 91d6f84..36d5fc0 100644
--- a/README.md
+++ b/README.md
@@ -123,6 +123,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `30000`       | Follow sets                | [51](51.md)                        |
 | `30001`       | Generic lists              | [51](51.md)                        |
 | `30002`       | Relay sets                 | [51](51.md)                        |
+| `30003`       | Bookmark sets              | [51](51.md)                        |
 | `30004`       | Curation sets              | [51](51.md)                        |
 | `30008`       | Profile Badges             | [58](58.md)                        |
 | `30009`       | Badge Definition           | [58](58.md)                        |

From 4a77fc5c402ec6c4cbdb574f9260e62fd2fc7bf4 Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Thu, 16 Nov 2023 15:50:39 -0300
Subject: [PATCH 018/263] add interests list and interests sets (following
 @erskingardner and @pablof7z).

---
 51.md     | 2 ++
 README.md | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/51.md b/51.md
index ab15be4..bcab8b8 100644
--- a/51.md
+++ b/51.md
@@ -34,6 +34,7 @@ their feeds or receive annoying notifications from.
 | Public chats   | 10005 | [NIP-28](28.md) chat channels the user is in                | `"e"` (kind:40 community definitions)                                             |
 | Blocked relays | 10006 | relays clients should never connect to                      | `"relay"` (relay URLs)                                                            |
 | Search relays  | 10007 | relays clients should use when performing search queries    | `"relay"` (relay URLs)                                                            |
+| Interests      | 10015 | topics a user may be interested in and pointers             | `"t"` (hashtags) and `"a" (kind:30015 interest set)`                              |
 | Emojis         | 10030 | user preferred emojis and pointers to emoji sets            | `"emoji"` (see [NIP-30](30.md)) and `"a"` (kind:30030 emoji set)                  |
 
 ## Sets
@@ -55,6 +56,7 @@ Aside from their main identifier, the `"d"` tag, sets can optionally have a `"na
 | Relay sets    | 30002 | user-defined relay groups the user can easily pick and choose from during various operations | `"relay"` (relay URLs)                                                            |
 | Bookmark sets | 30003 | user-defined bookmarks categories , for when bookmarks must be in labeled separate groups    | `"e"` (kind:1 notes), `"a"` (kind:30023 articles), `"t"` (hashtags), `"r" (URLs)` |
 | Curation sets | 30004 | groups of articles picked by users as interesting and/or belonging to the same category      | `"a"` (kind:30023 articles), `"e"` (kind:1 notes)                                 |
+| 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))                                                   |
 
 ## Deprecated standard lists
diff --git a/README.md b/README.md
index 36d5fc0..790f0b6 100644
--- a/README.md
+++ b/README.md
@@ -113,6 +113,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `10005`       | Public chats list          | [51](51.md)                        |
 | `10006`       | Blocked relays list        | [51](51.md)                        |
 | `10007`       | Search relays list         | [51](51.md)                        |
+| `10015`       | Interests list             | [51](51.md)                        |
 | `10030`       | User emoji list            | [51](51.md)                        |
 | `13194`       | Wallet Info                | [47](47.md)                        |
 | `22242`       | Client Authentication      | [42](42.md)                        |
@@ -127,6 +128,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `30004`       | Curation sets              | [51](51.md)                        |
 | `30008`       | Profile Badges             | [58](58.md)                        |
 | `30009`       | Badge Definition           | [58](58.md)                        |
+| `30015`       | Interest sets              | [51](51.md)                        |
 | `30030`       | Emoji sets                 | [51](51.md)                        |
 | `30017`       | Create or update a stall   | [15](15.md)                        |
 | `30018`       | Create or update a product | [15](15.md)                        |

From 4d709d1804de45bab3739ce814d4b0c0b211c273 Mon Sep 17 00:00:00 2001
From: Semisol <45574030+Semisol@users.noreply.github.com>
Date: Fri, 17 Nov 2023 18:12:47 +0300
Subject: [PATCH 019/263] add form feed and backspace

---
 01.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/01.md b/01.md
index f5673b3..0840f2e 100644
--- a/01.md
+++ b/01.md
@@ -46,11 +46,13 @@ To obtain the `event.id`, we `sha256` the serialized event. The serialization is
 To prevent implementation differences from creating a different event ID for the same event, the following rules MUST be followed while serializing:
 - No whitespace, line breaks or other unnecessary formatting should be included in the output JSON.
 - No characters except the following should be escaped, and instead should be included verbatim:
-  - The line break, `0x0A`, as `\n`
+  - A line break, `0x0A`, as `\n`
   - A double quote, `0x22`, as `\"`
   - A backslash, `0x5C`, as `\\`
   - A carriage return, `0x0D`, as `\r`
   - A tab character, `0x09`, as `\t`
+  - A backspace, `0x08`, as `\b`
+  - A form feed, `0x0C`, as `\f`
 - UTF-8 should be used for encoding.
 
 ## Communication between clients and relays

From 5f1d10fad24a1c860dc46e87e371b517500ed49b Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Fri, 17 Nov 2023 18:05:23 -0500
Subject: [PATCH 020/263] Adds contributor images to the readme.

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index 483056d..1274b92 100644
--- a/README.md
+++ b/README.md
@@ -230,3 +230,9 @@ mailing lists where you can work on NIPs before submitting them here:
 ## License
 
 All NIPs are public domain.
+
+## Contributors
+
+<a align="center" href="https://github.com/nostr-protocol/nips/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=nostr-protocol/nips" />
+</a>

From 33e7650bab299b980e053e8c44e93fb895dc4df5 Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Thu, 16 Nov 2023 10:52:35 -0300
Subject: [PATCH 021/263] give a better and updated explanation of how nips
 work in the readme.

---
 README.md | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 1274b92..8e970ea 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # NIPs
 
 NIPs stand for **Nostr Implementation Possibilities**.
+
 They exist to document what may be implemented by [Nostr](https://github.com/nostr-protocol/nostr)-compatible _relay_ and _client_ software.
 
 ---
@@ -12,7 +13,8 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
   - [Relay to Client](#relay-to-client)
 - [Standardized Tags](#standardized-tags)
 - [Criteria for acceptance of NIPs](#criteria-for-acceptance-of-nips)
-- [Mailing Lists](#mailing-lists)
+- [Is this repository a centralizing factor?](#is-this-repository-a-centralizing-factor)
+- [How this repository works](#how-this-repository-works)
 - [License](#license)
 
 ---
@@ -212,20 +214,19 @@ Please update these lists when proposing NIPs introducing new event kinds.
 4. There should be no more than one way of doing the same thing.
 5. Other rules will be made up when necessary.
 
-## Mailing Lists
+## Is this repository a centralizing factor?
 
-The nostr ecosystem is getting large with many different organizations, relays
-and clients. Following the nips repo on github is becoming more difficult and
-noisy. To coordinate on protocol development outside of github, there are
-mailing lists where you can work on NIPs before submitting them here:
+To promote interoperability, we standards that everybody can follow, and we need them to define a **single way of doing each thing** without ever hurting **backwards-compatibility**, and for that purpose there is no way around getting everybody to agree on the same thing and keep a centralized index of these standards. However the fact that such index exists doesn't hurt the decentralization of Nostr. _At any point the central index can be challenged if it is failing to fulfill the needs of the protocol_ and it can migrate to other places and be maintained by other people.
 
-* [w3c nostr community group][w3-nostr] - [public-nostr@w3.org][mailto-w3] - requires signup
-* [nostr-protocol google group][nostr-google-group] - [nostr-protocol@googlegroups.com][mailto-google] - no signup required
+It can even fork into multiple and then some clients would go one way, others would go another way, and some clients would adhere to both competing standards. This would hurt the simplicity, openness and interoperability of Nostr a little, but everything would still work in the short term.
 
-[w3-nostr]: https://www.w3.org/community/nostr/
-[mailto-w3]: mailto:public-nostr@w3.org
-[nostr-google-group]: https://groups.google.com/g/nostr-protocol
-[mailto-google]: mailto:nostr-protocol@googlegroups.com
+There is a list of notable Nostr software developers who have commit access to this repository, but that exists mostly for practical reasons, as by the nature of the thing we're dealing with the repository owner can revoke membership and rewrite history as they want -- and if these actions are unjustified or perceived as bad or evil the community must react.
+
+## How this repository works
+
+Standards may emerge in two ways: the first way is that someone starts doing something, then others copy it; the second way is that someone has an idea of a new standard that could benefit multiple clients and the protocol in general without breaking **backwards-compatibility** and the principle of having **a single way of doing things**, then they write that idea and submit it to this repository, other interested parties read it and give their feedback, then once most people reasonably agree we codify that in a NIP which client and relay developers that are interested in the feature can proceed to implement.
+
+These two ways of standardizing things are supported by this repository. Although the second is preferred, an effort will be made to codify standards emerged outside this repository into NIPs that can be later referenced and easily understood and implemented by others -- but obviously as in any human system discretion may be applied when standards are considered harmful.
 
 ## License
 

From b5b46b629fb1b4dae4780d8d165bddd68d4cda68 Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Sat, 18 Nov 2023 08:21:15 -0300
Subject: [PATCH 022/263] reformat NIP-11.

---
 11.md | 154 +++++++++++++++++++++++++++++++---------------------------
 1 file changed, 82 insertions(+), 72 deletions(-)

diff --git a/11.md b/11.md
index 017e5d4..e05cb1f 100644
--- a/11.md
+++ b/11.md
@@ -25,42 +25,42 @@ When a relay receives an HTTP(s) request with an `Accept` header of `application
 Any field may be omitted, and clients MUST ignore any additional fields they do not understand. Relays MUST accept CORS requests by sending `Access-Control-Allow-Origin`, `Access-Control-Allow-Headers`, and `Access-Control-Allow-Methods` headers.
 
 Field Descriptions
------------------
+------------------
 
-### Name ###
+### Name
 
 A relay may select a `name` for use in client software.  This is a string, and SHOULD be less than 30 characters to avoid client truncation.
 
-### Description ###
+### Description
 
 Detailed plain-text information about the relay may be contained in the `description` string.  It is recommended that this contain no markup, formatting or line breaks for word wrapping, and simply use double newline characters to separate paragraphs.  There are no limitations on length.
 
-### Pubkey ###
+### Pubkey
 
 An administrative contact may be listed with a `pubkey`, in the same format as Nostr events (32-byte hex for a `secp256k1` public key).  If a contact is listed, this provides clients with a recommended address to send encrypted direct messages (See `NIP-04`) to a system administrator.  Expected uses of this address are to report abuse or illegal content, file bug reports, or request other technical assistance.
 
 Relay operators have no obligation to respond to direct messages.
 
-### Contact ###
+### Contact
 
 An alternative contact may be listed under the `contact` field as well, with the same purpose as `pubkey`.  Use of a Nostr public key and direct message SHOULD be preferred over this.  Contents of this field SHOULD be a URI, using schemes such as `mailto` or `https` to provide users with a means of contact.
 
-### Supported NIPs ###
+### Supported NIPs
 
 As the Nostr protocol evolves, some functionality may only be available by relays that implement a specific `NIP`.  This field is an array of the integer identifiers of `NIP`s that are implemented in the relay.  Examples would include `1`, for `"NIP-01"` and `9`, for `"NIP-09"`.  Client-side `NIPs` SHOULD NOT be advertised, and can be ignored by clients.
 
-### Software ###
+### Software
 
 The relay server implementation MAY be provided in the `software` attribute.  If present, this MUST be a URL to the project's homepage.
 
-### Version ###
+### Version
 
 The relay MAY choose to publish its software version as a string attribute.  The string format is defined by the relay implementation.  It is recommended this be a version number or commit identifier.
 
 Extra Fields
------------------
+------------
 
-### Server Limitations ###
+### Server Limitations
 
 These are limitations imposed by the relay on clients. Your client
 should expect that requests which exceed these *practical* limitations
@@ -68,22 +68,21 @@ are rejected or fail immediately.
 
 ```json
 {
-...
+  ...
   "limitation": {
-        "max_message_length": 16384,
-        "max_subscriptions": 20,
-        "max_filters": 100,
-        "max_limit": 5000,
-        "max_subid_length": 100,
-        "max_event_tags": 100,
-        "max_content_length": 8196,
-        "min_pow_difficulty": 30,
-        "auth_required": true,
-        "payment_required": true,
-        "created_at_lower_limit":31536000,
-        "created_at_upper_limit":3,
+    "max_message_length": 16384,
+    "max_subscriptions": 20,
+    "max_filters": 100,
+    "max_limit": 5000,
+    "max_subid_length": 100,
+    "max_event_tags": 100,
+    "max_content_length": 8196,
+    "min_pow_difficulty": 30,
+    "auth_required": true,
+    "payment_required": true,
+    "created_at_lower_limit": 31536000,
+    "created_at_upper_limit": 3
   }
-...
 }
 ```
 
@@ -129,7 +128,7 @@ Even if set to False, authentication may be required for specific actions.
 
 - `created_at_upper_limit`: 'created_at' upper limit as defined in [NIP-22](22.md)
 
-### Event Retention ###
+### Event Retention
 
 There may be a cost associated with storing data forever, so relays
 may wish to state retention times. The values stated here are defaults
@@ -142,14 +141,12 @@ all, and preferably an error will be provided when those are received.
 
 ```json
 {
-...
   "retention": [
-    { "kinds": [0, 1, [5, 7], [40, 49]], "time": 3600 },
-    { "kinds": [[40000, 49999]], "time": 100 },
-    { "kinds": [[30000, 39999]], "count": 1000 },
-    { "time": 3600, "count": 10000 }
+    {"kinds": [0, 1, [5, 7], [40, 49]], "time": 3600},
+    {"kinds": [[40000, 49999]], "time": 100},
+    {"kinds": [[30000, 39999]], "count": 1000},
+    {"time": 3600, "count": 10000}
   ]
-...
 }
 ```
 
@@ -165,8 +162,7 @@ support their protocol quickly via a single HTTP fetch.
 
 There is no need to specify retention times for _ephemeral events_ since they are not retained.
 
-
-### Content Limitations ###
+### 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
@@ -185,9 +181,8 @@ flexibility is up to the client software.
 
 ```json
 {
-...
-  "relay_countries": [ "CA", "US" ],
-...
+  ...
+  "relay_countries": [ "CA", "US" ]
 }
 ```
 
@@ -199,7 +194,7 @@ country of the legal entities who own the relay, so it's very
 likely a number of countries are involved.
 
 
-### Community Preferences ###
+### Community Preferences
 
 For public text notes at least, a relay may try to foster a
 local community. This would encourage users to follow the global
@@ -208,11 +203,10 @@ To support this goal, relays MAY specify some of the following values.
 
 ```json
 {
-...
+  ...
   "language_tags": [ "en", "en-419" ],
   "tags": [ "sfw-only", "bitcoin-only", "anime" ],
-  "posting_policy": "https://example.com/posting-policy.html",
-...
+  "posting_policy": "https://example.com/posting-policy.html"
 }
 ```
 
@@ -239,59 +233,75 @@ detail and legal terms. Use the `tags` field to signify limitations
 on content, or topics to be discussed, which could be machine
 processed by appropriate client software.
 
-### Pay-To-Relay ###
+### Pay-to-Relay
 
 Relays that require payments may want to expose their fee schedules.
 
 ```json
 {
-...
+  ...
   "payments_url": "https://my-relay/payments",
   "fees": {
     "admission": [{ "amount": 1000000, "unit": "msats" }],
     "subscription": [{ "amount": 5000000, "unit": "msats", "period": 2592000 }],
     "publication": [{ "kinds": [4], "amount": 100, "unit": "msats" }],
-  },
-...
+  }
 }
 ```
 
-### Icon ###
+### Icon
 
 A URL pointing to an image to be used as an icon for the relay. Recommended to be squared in shape.
 
 ```json
 {
-...
+  ...
   "icon": "https://nostr.build/i/53866b44135a27d624e99c6165cabd76ac8f72797209700acb189fce75021f47.jpg",
-...
 }
 ```
 
-### Examples ###
-As of 2 May 2023 the following `curl` command provided these results.
+### Examples
 
-	>curl -H "Accept: application/nostr+json" https://eden.nostr.land
+As of 2 May 2023 the following command provided these results:
 
-	{"name":"eden.nostr.land",
-	"description":"Eden Nostr Land - Toronto 1-01",
-	"pubkey":"00000000827ffaa94bfea288c3dfce4422c794fbb96625b6b31e9049f729d700",
-	"contact":"me@ricardocabral.io",
-	"supported_nips":[1,2,4,9,11,12,15,16,20,22,26,28,33,40],
-	"supported_nip_extensions":["11a"],
-	"software":"git+https://github.com/Cameri/nostream.git",
-	"version":"1.22.6",
-	"limitation":{"max_message_length":1048576,
-				  "max_subscriptions":10,
-				  "max_filters":2500,
-				  "max_limit":5000,
-				  "max_subid_length":256,
-				  "max_event_tags":2500,
-				  "max_content_length":65536,
-				  "min_pow_difficulty":0,
-				  "auth_required":false,
-				  "payment_required":true},
-	"payments_url":"https://eden.nostr.land/invoices",
-	"fees":{"admission":[{"amount":5000000,"unit":"msats"}],
-	        "publication":[]}},
-    "icon": "https://nostr.build/i/53866b44135a27d624e99c6165cabd76ac8f72797209700acb189fce75021f47.jpg"
+```
+~> curl -H "Accept: application/nostr+json" https://eden.nostr.land | jq
+
+{
+  "description": "nostr.land family of relays (us-or-01)",
+  "name": "nostr.land",
+  "pubkey": "52b4a076bcbbbdc3a1aefa3735816cf74993b1b8db202b01c883c58be7fad8bd",
+  "software": "custom",
+  "supported_nips": [
+    1,
+    2,
+    4,
+    9,
+    11,
+    12,
+    16,
+    20,
+    22,
+    28,
+    33,
+    40
+  ],
+  "version": "1.0.1",
+  "limitation": {
+    "payment_required": true,
+    "max_message_length": 65535,
+    "max_event_tags": 2000,
+    "max_subscriptions": 20,
+    "auth_required": false
+  },
+  "payments_url": "https://eden.nostr.land",
+  "fees": {
+    "subscription": [
+      {
+        "amount": 2500000,
+        "unit": "msats",
+        "period": 2592000
+      }
+    ]
+  },
+}

From 7aa751be46d515d7612998a4da88285cb0957cd3 Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Sat, 18 Nov 2023 08:22:42 -0300
Subject: [PATCH 023/263] NIP-03: explain why a single attestation is
 recommended.

---
 03.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/03.md b/03.md
index 8b7deb6..74e010c 100644
--- a/03.md
+++ b/03.md
@@ -20,7 +20,7 @@ This NIP defines an event with `kind:1040` that can contain an [OpenTimestamps](
 ```
 
 - The OpenTimestamps proof MUST prove the referenced `e` event id as its digest.
-- The `content` MUST be the full content of an `.ots` file containing at least one Bitcoin attestation. This file SHOULD contain a **single** Bitcoin attestation and no reference to "pending" attestations since they are useless in this context.
+- The `content` MUST be the full content of an `.ots` file containing at least one Bitcoin attestation. This file SHOULD contain a **single** Bitcoin attestation (as not more than one valid attestation is necessary and less bytes is better than more) and no reference to "pending" attestations since they are useless in this context.
 
 ### Example OpenTimestamps proof verification flow
 

From b0df71824f9967130b54150b64cc70fa94bffec2 Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Sat, 18 Nov 2023 08:48:49 -0300
Subject: [PATCH 024/263] NIP-72: reformat and clarify some things.

---
 72.md | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/72.md b/72.md
index 833336c..74c7f08 100644
--- a/72.md
+++ b/72.md
@@ -10,16 +10,15 @@ The goal of this NIP is to create moderator-approved public communities around a
 
 # Community Definition
 
-`Kind:34550` SHOULD include any field that helps define the community and the set of moderators. `relay` tags MAY be used to describe the preferred relay to download requests and approvals.
+`kind:34550` SHOULD include any field that helps define the community and the set of moderators. `relay` tags MAY be used to describe the preferred relay to download requests and approvals.
 
 ```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": 34550,
   "tags": [
-    ["d", "<Community name>"],
+    ["d", "<community-d-identifier>"],
     ["description", "<Community description>"],
     ["image", "<Community image url>", "<Width>x<Height>"],
 
@@ -41,18 +40,16 @@ The goal of this NIP is to create moderator-approved public communities around a
 
 # New Post Request
 
-Any Nostr event can be a post request. Clients MUST add the community's `a` tag to the new post event in order to be presented for the moderator's approval.
+Any Nostr event can be submitted to a community by anyone for approval. Clients MUST add the community's `a` tag to the new post event in order to be presented for the moderator's approval.
 
 ```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": 1,
   "tags": [
-    ["a", "34550:<Community event author pubkey>:<d-identifier of the community>", "<Optional relay url>"],
+    ["a", "34550:<community event author pubkey>:<community-d-identifier>", "<optional-relay-url>"],
   ],
-  "content": "<My content>"
+  "content": "hello world"
 }
 ```
 
@@ -64,17 +61,16 @@ The post-approval event MUST include `a` tags of the communities the moderator i
 
 ```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": 4550,
   "tags": [
-    ["a", "34550:<Community event author pubkey>:<d-identifier of the community>", "<Optional relay url>"],
-    ["e", "<Post Request ID>", "<Optional relay url>"],
-    ["p", "<Post Request Author ID>", "<Optional relay url>"],
-    ["k", "<New Post Request kind>"],
+    ["a", "34550:<event-author-pubkey>:<community-d-identifier>", "<optional-relay-url>"],
+    ["e", "<post-id>", "<optional-relay-url>"],
+    ["p", "<port-author-pubkey>", "<optional-relay-url>"],
+    ["k", "<post-request-kind>"]
   ],
-  "content": "<New Post Request JSON>"
+  "content": "<the full approved event, JSON-encoded>"
 }
 ```
 
@@ -91,11 +87,15 @@ Community clients SHOULD display posts that have been approved by at least 1 mod
 The following filter displays the approved posts.
 
 ```js
-{
-  "authors": ["<Author pubkey>", "<Moderator1 pubkey>", "<Moderator2 pubkey>", "<Moderator3 pubkey>", ...],
-  "kinds": [4550],
-  "#a": ["34550:<Community event author pubkey>:<d-identifier of the community>"],
-}
+[
+  "REQ",
+  "_",
+  {
+    "authors": ["<owner-pubkey>", "<moderator1-pubkey>", "<moderator2-pubkey>", "<moderator3-pubkey>", ...],
+    "kinds": [4550],
+    "#a": ["34550:<Community event author pubkey>:<d-identifier of the community>"],
+  }
+]
 ```
 
 Clients MAY hide approvals by blocked moderators at the user's request.

From 5dcfe85306434f21ecb1e7a47edd92b2e3e64f9a Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Sat, 18 Nov 2023 09:13:12 -0300
Subject: [PATCH 025/263] reformat a bunch of json things and small nitpicks.

---
 11.md |  18 +++---
 13.md |   6 +-
 14.md |   8 ++-
 15.md | 205 ++++++++++++++++++++++++++++++----------------------------
 28.md |  46 ++++++-------
 32.md |   9 ++-
 36.md |  26 ++++----
 39.md |  28 ++++----
 40.md |  24 +++----
 42.md |  14 ++--
 45.md |  21 ++++--
 53.md |  30 ++++-----
 56.md |   1 -
 72.md |  14 ++--
 75.md |  17 +++--
 84.md |  11 +++-
 89.md |  84 ++++++++++++------------
 90.md | 147 +++++++++++++++++++++--------------------
 94.md |   7 +-
 98.md |  28 ++++----
 99.md |   6 +-
 21 files changed, 385 insertions(+), 365 deletions(-)

diff --git a/11.md b/11.md
index e05cb1f..ab05f31 100644
--- a/11.md
+++ b/11.md
@@ -68,7 +68,6 @@ are rejected or fail immediately.
 
 ```json
 {
-  ...
   "limitation": {
     "max_message_length": 16384,
     "max_subscriptions": 20,
@@ -82,7 +81,8 @@ are rejected or fail immediately.
     "payment_required": true,
     "created_at_lower_limit": 31536000,
     "created_at_upper_limit": 3
-  }
+  },
+  ...
 }
 ```
 
@@ -181,8 +181,8 @@ flexibility is up to the client software.
 
 ```json
 {
+  "relay_countries": [ "CA", "US" ],
   ...
-  "relay_countries": [ "CA", "US" ]
 }
 ```
 
@@ -203,10 +203,10 @@ To support this goal, relays MAY specify some of the following values.
 
 ```json
 {
+  "language_tags": ["en", "en-419"],
+  "tags": ["sfw-only", "bitcoin-only", "anime"],
+  "posting_policy": "https://example.com/posting-policy.html",
   ...
-  "language_tags": [ "en", "en-419" ],
-  "tags": [ "sfw-only", "bitcoin-only", "anime" ],
-  "posting_policy": "https://example.com/posting-policy.html"
 }
 ```
 
@@ -239,13 +239,13 @@ Relays that require payments may want to expose their fee schedules.
 
 ```json
 {
-  ...
   "payments_url": "https://my-relay/payments",
   "fees": {
     "admission": [{ "amount": 1000000, "unit": "msats" }],
     "subscription": [{ "amount": 5000000, "unit": "msats", "period": 2592000 }],
     "publication": [{ "kinds": [4], "amount": 100, "unit": "msats" }],
-  }
+  },
+  ...
 }
 ```
 
@@ -255,8 +255,8 @@ A URL pointing to an image to be used as an icon for the relay. Recommended to b
 
 ```json
 {
-  ...
   "icon": "https://nostr.build/i/53866b44135a27d624e99c6165cabd76ac8f72797209700acb189fce75021f47.jpg",
+  ...
 }
 ```
 
diff --git a/13.md b/13.md
index 4b15bbe..53c4d1b 100644
--- a/13.md
+++ b/13.md
@@ -35,11 +35,7 @@ Example mined note
   "created_at": 1651794653,
   "kind": 1,
   "tags": [
-    [
-      "nonce",
-      "776797",
-      "21"
-    ]
+    ["nonce", "776797", "21"]
   ],
   "content": "It's just me mining my own business",
   "sig": "284622fc0a3f4f1303455d5175f7ba962a3300d136085b9566801bc2e0699de0c7e31e44c81fb40ad9049173742e904713c3594a1da0fc5d2382a25c11aba977"
diff --git a/14.md b/14.md
index 72e5e39..480c4c5 100644
--- a/14.md
+++ b/14.md
@@ -6,14 +6,16 @@ Subject tag in Text events
 
 `draft` `optional`
 
-This NIP defines the use of the "subject" tag in text (kind: 1) events.  
+This NIP defines the use of the "subject" tag in text (kind: 1) events.
 (implemented in more-speech)
 
-`["subject": <string>]`
+```json
+["subject": <string>]
+```
 
 Browsers often display threaded lists of messages.  The contents of the subject tag can be used in such lists, instead of the more ad hoc approach of using the first few words of the message.  This is very similar to the way email browsers display lists of incoming emails by subject rather than by contents.
 
 When replying to a message with a subject, clients SHOULD replicate the subject tag.  Clients MAY adorn the subject to denote
-that it is a reply.  e.g. by prepending "Re:".  
+that it is a reply.  e.g. by prepending "Re:".
 
 Subjects should generally be shorter than 80 chars.  Long subjects will likely be trimmed by clients.
diff --git a/15.md b/15.md
index 0ee000f..51b7792 100644
--- a/15.md
+++ b/15.md
@@ -1,14 +1,14 @@
 NIP-15
 ======
 
-Nostr Marketplace (for resilient marketplaces)
------------------------------------
+Nostr Marketplace
+-----------------
 
-`draft` `optional` 
+`draft` `optional`
 
-> Based on https://github.com/lnbits/Diagon-Alley
+Based on https://github.com/lnbits/Diagon-Alley.
 
-> Implemented in [NostrMarket](https://github.com/lnbits/nostrmarket) and [Plebeian Market](https://github.com/PlebeianTech/plebeian-market) 
+Implemented in [NostrMarket](https://github.com/lnbits/nostrmarket) and [Plebeian Market](https://github.com/PlebeianTech/plebeian-market).
 
 ## Terms
 
@@ -35,29 +35,30 @@ The `merchant` admin software can be purely clientside, but for `convenience` an
 A merchant can publish these events:
 | Kind      |                    | Description                                                                                                     |
 | --------- | ------------------ | --------------------------------------------------------------------------------------------------------------- |
-| `0    `   | `set_meta`         | The merchant description (similar with any `nostr` public key).                                                 |
+| `0`       | `set_meta`         | The merchant description (similar with any `nostr` public key).                                                 |
 | `30017`   | `set_stall`        | Create or update a stall.                                                                                       |
 | `30018`   | `set_product`      | Create or update a product.                                                                                     |
-| `4    `   | `direct_message`   | Communicate with the customer. The messages can be plain-text or JSON.                                          |
-| `5    `   | `delete`           | Delete a product or a stall.                                                                                    |
+| `4`       | `direct_message`   | Communicate with the customer. The messages can be plain-text or JSON.                                          |
+| `5`       | `delete`           | Delete a product or a stall.                                                                                    |
 
 ### Event `30017`: Create or update a stall.
 
-**Event Content**:
+**Event Content**
+
 ```json
 {
-    "id": <String, UUID generated by the merchant. Sequential IDs (`0`, `1`, `2`...) are discouraged>,
-    "name": <String, stall name>,
-    "description": <String (optional), stall description>,
-    "currency": <String, currency used>,
-    "shipping": [
-        {
-            "id": <String, UUID of the shipping zone, generated by the merchant>,
-            "name": <String (optional), zone name>,
-            "cost": <float, base cost for shipping. The currency is defined at the stall level>,
-            "regions": [<String, regions included in this zone>],
-        }
-    ]
+  "id": <string, id generated by the merchant. Sequential IDs (`0`, `1`, `2`...) are discouraged>,
+  "name": <string, stall name>,
+  "description": <string (optional), stall description>,
+  "currency": <string, currency used>,
+  "shipping": [
+    {
+      "id": <string, id of the shipping zone, generated by the merchant>,
+      "name": <string (optional), zone name>,
+      "cost": <float, base cost for shipping. The currency is defined at the stall level>,
+      "regions": [<string, regions included in this zone>],
+    }
+  ]
 }
 ```
 
@@ -70,34 +71,39 @@ Fields that are not self-explanatory:
    - each shipping zone contains the base cost for orders made to that shipping zone, but a specific shipping cost per
    product can also be specified if the shipping cost for that product is higher than what's specified by the base cost.
 
-**Event Tags**:
+**Event Tags**
+
 ```json
-  "tags": [["d", <String, id of stall]]
+{
+  "tags": [["d", <string, id of stall]],
+  ...
+}
 ```
  - the `d` tag is required, its value MUST be the same as the stall `id`.
 
 ### Event `30018`: Create or update a product
 
-**Event Content**:
+**Event Content**
+
 ```json
 {
-    "id": <String, UUID generated by the merchant.Sequential IDs (`0`, `1`, `2`...) are discouraged>,
-    "stall_id": <String, UUID of the stall to which this product belong to>,
-    "name": <String, product name>,
-    "description": <String (optional), product description>,
-    "images": <[String], array of image URLs, optional>,
-    "currency": <String, currency used>,
-    "price": <float, cost of product>,
-    "quantity": <int or null, available items>,
-    "specs": [
-        [<String, spec key>, <String, spec value>]
-    ],
-    "shipping": [
-        {
-            "id": <String, UUID of the shipping zone. Must match one of the zones defined for the stall>,
-            "cost": <float, extra cost for shipping. The currency is defined at the stall level>,
-        }
-    ]
+  "id": <string, id generated by the merchant (sequential ids are discouraged)>,
+  "stall_id": <string, id of the stall to which this product belong to>,
+  "name": <string, product name>,
+  "description": <string (optional), product description>,
+  "images": <[string], array of image URLs, optional>,
+  "currency": <string, currency used>,
+  "price": <float, cost of product>,
+  "quantity": <int or null, available items>,
+  "specs": [
+    [<string, spec key>, <string, spec value>]
+  ],
+  "shipping": [
+    {
+      "id": <string, id of the shipping zone (must match one of the zones defined for the stall)>,
+      "cost": <float, extra cost for shipping. The currency is defined at the stall level>,
+    }
+  ]
 }
 ```
 
@@ -114,16 +120,18 @@ Fields that are not self-explanatory:
    - the `id` should match the id of the shipping zone, as defined in the `shipping` field of the stall
    - to calculate the total cost of shipping for an order, the user will choose a shipping option during checkout, and then the client must consider this costs:
      - the `base cost from the stall` for the chosen shipping option
-     - the result of multiplying the product units by the `shipping costs specified in the product`, if any. 
+     - the result of multiplying the product units by the `shipping costs specified in the product`, if any.
+
+**Event Tags**
 
-**Event Tags**:
 ```json
   "tags": [
-       ["d", <String, id of product],
-       ["t", <String (optional), product category],
-       ["t", <String (optional), product category],
-       ...
-    ]
+    ["d", <string, id of product],
+    ["t", <string (optional), product category],
+    ["t", <string (optional), product category],
+    ...
+  ],
+  ...
 ```
 
  - the `d` tag is required, its value MUST be the same as the product `id`.
@@ -147,23 +155,23 @@ The below json goes in content of [NIP04](https://github.com/nostr-protocol/nips
 
 ```json
 {
-    "id": <String, UUID generated by the customer>,
-    "type": 0,
-    "name": <String (optional), ???>,
-    "address": <String (optional), for physical goods an address should be provided>
-    "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>,
-        "email": <String (optional), if the customer wants to be contacted by email>,
-    },
-    "items": [
-        {
-            "product_id": <String, UUID of the product>,
-            "quantity": <int, how many products the customer is ordering>
-        }
-    ],
-    "shipping_id": <String, UUID of the shipping zone>
+  "id": <string, id generated by the customer>,
+  "type": 0,
+  "name": <string (optional), ???>,
+  "address": <string (optional), for physical goods an address should be provided>
+  "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>,
+    "email": <string (optional), if the customer wants to be contacted by email>,
+  },
+  "items": [
+    {
+      "product_id": <string, id of the product>,
+      "quantity": <int, how many products the customer is ordering>
+    }
+  ],
+  "shipping_id": <string, id of the shipping zone>
 }
 
 ```
@@ -186,23 +194,23 @@ The below json goes in `content` of [NIP04](https://github.com/nostr-protocol/ni
 
 ```json
 {
-    "id": <String, UUID of the order>,
-    "type": 1,
-    "message": <String, message to customer, optional>,
-    "payment_options": [
-        {
-            "type": <String, option type>,
-            "link": <String, url, btc address, ln invoice, etc>
-        },
-        {
-            "type": <String, option type>,
-            "link": <String, url, btc address, ln invoice, etc>
-        },
-                {
-            "type": <String, option type>,
-            "link": <String, url, btc address, ln invoice, etc>
-        }
-    ]
+  "id": <string, id of the order>,
+  "type": 1,
+  "message": <string, message to customer, optional>,
+  "payment_options": [
+    {
+      "type": <string, option type>,
+      "link": <string, url, btc address, ln invoice, etc>
+    },
+    {
+      "type": <string, option type>,
+      "link": <string, url, btc address, ln invoice, etc>
+    },
+    {
+      "type": <string, option type>,
+      "link": <string, url, btc address, ln invoice, etc>
+    }
+  ]
 }
 ```
 
@@ -214,11 +222,11 @@ The below json goes in `content` of [NIP04](https://github.com/nostr-protocol/ni
 
 ```json
 {
-    "id": <String, UUID of the order>,
-    "type": 2,
-    "message": <String, message to customer>,
-    "paid": <Bool, true/false has received payment>,
-    "shipped": <Bool, true/false has been shipped>,
+  "id": <string, id of the order>,
+  "type": 2,
+  "message": <string, message to customer>,
+  "paid": <bool: has received payment>,
+  "shipped": <bool: has been shipped>,
 }
 ```
 ## Customize Marketplace
@@ -226,19 +234,20 @@ Create a customized user experience using the `naddr` from [NIP-19](https://gith
 
 ### Event `30019`: Create or update marketplace UI/UX
 
-**Event Content**:
+**Event Content**
+
 ```json
 {
-    "name": <String (optional), market name>,
-    "about": <String (optional), market description>,
-    "ui": {
-      "picture": <String (optional), market logo image URL>,
-      "banner": <String (optional), market logo banner URL>,
-      "theme": <String (optional), market theme>,
-      "darkMode": <Bool, true/false>
-    },
-    "merchants": <[String] (optional), array of pubkeys>,
-    ...
+  "name": <string (optional), market name>,
+  "about": <string (optional), market description>,
+  "ui": {
+    "picture": <string (optional), market logo image URL>,
+    "banner": <string (optional), market logo banner URL>,
+    "theme": <string (optional), market theme>,
+    "darkMode": <bool, true/false>
+  },
+  "merchants": [array of pubkeys (optional)],
+  ...
 }
 ```
 
diff --git a/28.md b/28.md
index 59e9389..2dcf800 100644
--- a/28.md
+++ b/28.md
@@ -27,8 +27,8 @@ In the channel creation `content` field, Client SHOULD include basic channel met
 
 ```json
 {
-    "content": "{\"name\": \"Demo Channel\", \"about\": \"A test channel.\", \"picture\": \"https://placekitten.com/200/200\"}",
-    ...
+  "content": "{\"name\": \"Demo Channel\", \"about\": \"A test channel.\", \"picture\": \"https://placekitten.com/200/200\"}",
+  ...
 }
 ```
 
@@ -37,7 +37,7 @@ In the channel creation `content` field, Client SHOULD include basic channel met
 
 Update a channel's public metadata.
 
-Clients and relays SHOULD handle kind 41 events similar to kind 33 replaceable events, where the information is used to update the metadata, without modifying the event id for the channel.  Only the most recent kind 41 is needed to be stored.
+Clients and relays SHOULD handle kind 41 events similar to kind 33 replaceable events, where the information is used to update the metadata, without modifying the event id for the channel.Only the most recent kind 41 is needed to be stored.
 
 Clients SHOULD ignore kind 41s from pubkeys other than the kind 40 pubkey.
 
@@ -53,9 +53,9 @@ Clients SHOULD use [NIP-10](10.md) marked "e" tags to recommend a relay.
 
 ```json
 {
-    "content": "{\"name\": \"Updated Demo Channel\", \"about\": \"Updating a test channel.\", \"picture\": \"https://placekitten.com/201/201\"}",
-    "tags": [["e", <channel_create_event_id>, <relay-url>]],
-    ...
+  "content": "{\"name\": \"Updated Demo Channel\", \"about\": \"Updating a test channel.\", \"picture\": \"https://placekitten.com/201/201\"}",
+  "tags": [["e", <channel_create_event_id>, <relay-url>]],
+  ...
 }
 ```
 
@@ -72,9 +72,9 @@ Root message:
 
 ```json
 {
-    "content": <string>,
-    "tags": [["e", <kind_40_event_id>, <relay-url>, "root"]],
-    ...
+  "content": <string>,
+  "tags": [["e", <kind_40_event_id>, <relay-url>, "root"]],
+  ...
 }
 ```
 
@@ -82,14 +82,14 @@ Reply to another message:
 
 ```json
 {
-    "content": <string>,
-    "tags": [
-        ["e", <kind_40_event_id>, <relay-url>, "root"],
-        ["e", <kind_42_event_id>, <relay-url>, "reply"],
-        ["p", <pubkey>, <relay-url>],
-        ...
-    ],
-    ...
+  "content": <string>,
+  "tags": [
+      ["e", <kind_40_event_id>, <relay-url>, "root"],
+      ["e", <kind_42_event_id>, <relay-url>, "reply"],
+      ["p", <pubkey>, <relay-url>],
+      ...
+  ],
+  ...
 }
 ```
 
@@ -108,9 +108,9 @@ Clients MAY hide event 42s for other users other than the user who sent the even
 
 ```json
 {
-    "content": "{\"reason\": \"Dick pic\"}",
-    "tags": [["e", <kind_42_event_id>]],
-    ...
+  "content": "{\"reason\": \"Dick pic\"}",
+  "tags": [["e", <kind_42_event_id>]],
+  ...
 }
 ```
 
@@ -126,9 +126,9 @@ Clients MAY hide event 42s for users other than the user who sent the event 44.
 
 ```json
 {
-    "content": "{\"reason\": \"Posting dick pics\"}",
-    "tags": [["p", <pubkey>]],
-    ...
+  "content": "{\"reason\": \"Posting dick pics\"}",
+  "tags": [["p", <pubkey>]],
+  ...
 }
 ```
 
diff --git a/32.md b/32.md
index dfcb35e..be4e872 100644
--- a/32.md
+++ b/32.md
@@ -64,7 +64,8 @@ A suggestion that multiple pubkeys be associated with the `permies` topic.
     ["l", "permies", "#t"],
     ["p", <pubkey1>, <relay_url>],
     ["p", <pubkey2>, <relay_url>]
-  ]
+  ],
+  ...
 }
 ```
 
@@ -78,7 +79,8 @@ A report flagging violence toward a human being as defined by ontology.example.c
     ["l", "VI-hum", "com.example.ontology"],
     ["p", <pubkey1>, <relay_url>],
     ["p", <pubkey2>, <relay_url>]
-  ]
+  ],
+  ...
 }
 ```
 
@@ -92,6 +94,7 @@ A moderation suggestion for a chat event.
     ["l", "approve", "nip28.moderation"],
     ["e", <kind40_event_id>, <relay_url>]
   ],
+  ...
 }
 ```
 
@@ -105,6 +108,7 @@ Assignment of a license to an event.
     ["l", "MIT", "license"],
     ["e", <event_id>, <relay_url>]
   ],
+  ...
 }
 ```
 
@@ -119,6 +123,7 @@ 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!",
+  ...
 }
 ```
 
diff --git a/36.md b/36.md
index db4c4f2..b10262c 100644
--- a/36.md
+++ b/36.md
@@ -24,18 +24,18 @@ options:
 
 ```json
 {
-    "pubkey": "<pub-key>",
-    "created_at": 1000000000,
-    "kind": 1,
-    "tags": [
-      ["t", "hastag"],
-      ["L", "content-warning"],
-      ["l", "reason", "content-warning"],
-      ["L", "social.nos.ontology"],
-      ["l", "NS-nud", "social.nos.ontology"],
-      ["content-warning", "reason"] /* reason is optional */
-    ],
-    "content": "sensitive content with #hastag\n",
-    "id": "<event-id>"
+  "pubkey": "<pub-key>",
+  "created_at": 1000000000,
+  "kind": 1,
+  "tags": [
+    ["t", "hastag"],
+    ["L", "content-warning"],
+    ["l", "reason", "content-warning"],
+    ["L", "social.nos.ontology"],
+    ["l", "NS-nud", "social.nos.ontology"],
+    ["content-warning", "<optional reason>"]
+  ],
+  "content": "sensitive content with #hastag\n",
+  "id": "<event-id>"
 }
 ```
diff --git a/39.md b/39.md
index c9970fa..c819e43 100644
--- a/39.md
+++ b/39.md
@@ -15,15 +15,13 @@ Nostr protocol users may have other online identities such as usernames, profile
 A new optional `i` tag is introduced for `kind 0` metadata event contents in addition to name, about, picture fields as included in [NIP-01](https://github.com/nostr-protocol/nips/blob/master/01.md):
 ```json
 {
-    "id": <id>,
-    "pubkey": <pubkey>,
-    ...
-    "tags": [
-        ["i", "github:semisol", "9721ce4ee4fceb91c9711ca2a6c9a5ab"],
-        ["i", "twitter:semisol_public", "1619358434134196225"],
-        ["i", "mastodon:bitcoinhackers.org/@semisol", "109775066355589974"]
-        ["i", "telegram:1087295469", "nostrdirectory/770"]
-    ]
+  "tags": [
+    ["i", "github:semisol", "9721ce4ee4fceb91c9711ca2a6c9a5ab"],
+    ["i", "twitter:semisol_public", "1619358434134196225"],
+    ["i", "mastodon:bitcoinhackers.org/@semisol", "109775066355589974"]
+    ["i", "telegram:1087295469", "nostrdirectory/770"]
+  ],
+  ...
 }
 ```
 
@@ -31,9 +29,9 @@ An `i` tag will have two parameters, which are defined as the following:
 1. `platform:identity`: This is the platform name (for example `github`) and the identity on that platform (for example `semisol`) joined together with `:`.
 2. `proof`: String or object that points to the proof of owning this identity.
 
-Clients SHOULD process any `i` tags with more than 2 values for future extensibility.  
-Identity provider names SHOULD only include `a-z`, `0-9` and the characters `._-/` and MUST NOT include `:`.  
-Identity names SHOULD be normalized if possible by replacing uppercase letters with lowercase letters, and if there are multiple aliases for an entity the primary one should be used.  
+Clients SHOULD process any `i` tags with more than 2 values for future extensibility.
+Identity provider names SHOULD only include `a-z`, `0-9` and the characters `._-/` and MUST NOT include `:`.
+Identity names SHOULD be normalized if possible by replacing uppercase letters with lowercase letters, and if there are multiple aliases for an entity the primary one should be used.
 
 ## Claim types
 
@@ -41,14 +39,14 @@ Identity names SHOULD be normalized if possible by replacing uppercase letters w
 
 Identity: A GitHub username.
 
-Proof: A GitHub Gist ID. This Gist should be created by `<identity>` with a single file that has the text `Verifying that I control the following Nostr public key: <npub encoded public key>`.  
+Proof: A GitHub Gist ID. This Gist should be created by `<identity>` with a single file that has the text `Verifying that I control the following Nostr public key: <npub encoded public key>`.
 This can be located at `https://gist.github.com/<identity>/<proof>`.
 
 ### `twitter`
 
 Identity: A Twitter username.
 
-Proof: A Tweet ID. The tweet should be posted by `<identity>` and have the text `Verifying my account on nostr My Public Key: "<npub encoded public key>"`.  
+Proof: A Tweet ID. The tweet should be posted by `<identity>` and have the text `Verifying my account on nostr My Public Key: "<npub encoded public key>"`.
 This can be located at `https://twitter.com/<identity>/status/<proof>`.
 
 ### `mastodon`
@@ -62,5 +60,5 @@ This can be located at `https://<identity>/<proof>`.
 
 Identity: A Telegram user ID.
 
-Proof: A string in the format `<ref>/<id>` which points to a message published in the public channel or group with name `<ref>` and message ID `<id>`. This message should be sent by user ID `<identity>` and have the text `Verifying that I control the following Nostr public key: "<npub encoded public key>"`.  
+Proof: A string in the format `<ref>/<id>` which points to a message published in the public channel or group with name `<ref>` and message ID `<id>`. This message should be sent by user ID `<identity>` and have the text `Verifying that I control the following Nostr public key: "<npub encoded public key>"`.
 This can be located at `https://t.me/<proof>`.
diff --git a/40.md b/40.md
index b8a0336..909747f 100644
--- a/40.md
+++ b/40.md
@@ -2,7 +2,7 @@ NIP-40
 ======
 
 Expiration Timestamp
------------------------------------
+--------------------
 
 `draft` `optional`
 
@@ -20,14 +20,14 @@ values:
 
 ```json
 {
-    "pubkey": "<pub-key>",
-    "created_at": 1000000000,
-    "kind": 1,
-    "tags": [
-      ["expiration", "1600000000"]
-    ],
-    "content": "This message will expire at the specified timestamp and be deleted by relays.\n",
-    "id": "<event-id>"
+  "pubkey": "<pub-key>",
+  "created_at": 1000000000,
+  "kind": 1,
+  "tags": [
+    ["expiration", "1600000000"]
+  ],
+  "content": "This message will expire at the specified timestamp and be deleted by relays.\n",
+  "id": "<event-id>"
 }
 ```
 
@@ -43,9 +43,9 @@ Clients SHOULD ignore events that have expired.
 Relay Behavior
 --------------
 
-Relays MAY NOT delete expired messages immediately on expiration and MAY persist them indefinitely.  
-Relays SHOULD NOT send expired events to clients, even if they are stored.  
-Relays SHOULD drop any events that are published to them if they are expired.  
+Relays MAY NOT delete expired messages immediately on expiration and MAY persist them indefinitely.
+Relays SHOULD NOT send expired events to clients, even if they are stored.
+Relays SHOULD drop any events that are published to them if they are expired.
 An expiration timestamp does not affect storage of ephemeral events.
 
 Suggested Use Cases
diff --git a/42.md b/42.md
index 9f0c24d..e380e89 100644
--- a/42.md
+++ b/42.md
@@ -24,13 +24,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 is of the following form:
 
-```
+```json
 ["AUTH", <challenge-string>]
 ```
 
 And, when sent by clients, of the following form:
 
-```
+```json
 ["AUTH", <signed-event-json>]
 ```
 
@@ -41,16 +41,12 @@ Relays MUST exclude `kind: 22242` events from being broadcasted to any client.
 
 ```json
 {
-  "id": "...",
-  "pubkey": "...",
-  "created_at": 1669695536,
   "kind": 22242,
   "tags": [
     ["relay", "wss://relay.example.com/"],
     ["challenge", "challengestringhere"]
   ],
-  "content": "",
-  "sig": "..."
+  ...
 }
 ```
 
@@ -67,13 +63,13 @@ is expected to last for the duration of the WebSocket connection.
 Upon receiving a message from an unauthenticated user it can't fulfill without authentication, a relay may choose to notify the client. For
 that it can use a `NOTICE` or `OK` message with a standard prefix `"restricted: "` that is readable both by humans and machines, for example:
 
-```
+```json
 ["NOTICE", "restricted: we can't serve DMs to unauthenticated users, does your client implement NIP-42?"]
 ```
 
 or it can return an `OK` message noting the reason an event was not written using the same prefix:
 
-```
+```json
 ["OK", <event-id>, false, "restricted: we do not accept events from unauthenticated users, please sign up at https://example.com/"]
 ```
 
diff --git a/45.md b/45.md
index a3abd19..998b952 100644
--- a/45.md
+++ b/45.md
@@ -16,29 +16,36 @@ 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>}]
 ```
 
-Examples:
+## Examples:
 
-```
-# Followers count
+### Followers count
+
+```json
 ["COUNT", <subscription_id>, {"kinds": [3], "#p": [<pubkey>]}]
 ["COUNT", <subscription_id>, {"count": 238}]
+```
 
-# Count posts and reactions
+### Count posts and reactions
+
+```json
 ["COUNT", <subscription_id>, {"kinds": [1, 7], "authors": [<pubkey>]}]
 ["COUNT", <subscription_id>, {"count": 5}]
+```
 
-# Count posts approximately
+### Count posts approximately
+
+```
 ["COUNT", <subscription_id>, {"kinds": [1]}]
 ["COUNT", <subscription_id>, {"count": 93412452, "approximate": true}]
 ```
diff --git a/53.md b/53.md
index c4789ea..d3cc0af 100644
--- a/53.md
+++ b/53.md
@@ -6,17 +6,17 @@ Live Activities
 
 `draft` `optional`
 
-## Abstract
-
 Service providers want to offer live activities to the Nostr network in such a way that participants can easily logged and queried by clients. This NIP describes a general framework to advertise the involvement of pubkeys in such live activities.
 
-# Live Event
+## Concepts
+
+### 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.
 
 For example:
 
-```js
+```json
 {
   "kind": 30311,
   "tags": [
@@ -38,7 +38,7 @@ For example:
     ["relays", "wss://one.com", "wss://two.com", ...]
   ],
   "content": "",
-  ...other fields
+  ...
 }
 ```
 
@@ -52,7 +52,7 @@ Live Activity management clients are expected to constantly update `kind:30311`
 
 The activity MUST be linked to using the [NIP-19](19.md) `naddr` code along with the `a` tag.
 
-## Proof of Agreement to Participate
+### Proof of Agreement to Participate
 
 Event owners can add proof as the 5th term in each `p` tag to clarify the participant's agreement in joining the event. The proof is a signed SHA256 of the complete `a` Tag of the event (`kind:pubkey:dTag`) by each `p`'s private key, encoded in hex.
 
@@ -60,30 +60,28 @@ Clients MAY only display participants if the proof is available or MAY display p
 
 This feature is important to avoid malicious event owners adding large account holders to the event, without their knowledge, to lure their followers into the malicious owner's trap.
 
-# Live Chat Message
+### Live Chat Message
 
 Event `kind:1311` is live chat's channel message. Clients MUST include the `a` tag of the activity with a `root` marker. Other Kind-1 tags such as `reply` and `mention` can also be used.
 
-```js
+```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": 1311,
   "tags": [
     ["a", "30311:<Community event author pubkey>:<d-identifier of the community>", "<Optional relay url>", "root"],
   ],
-  "content": "Zaps to live streams is beautiful."
+  "content": "Zaps to live streams is beautiful.",
+  ...
 }
 ```
 
-# Use Cases
+## Use Cases
 
 Common use cases include meeting rooms/workshops, watch-together activities, or event spaces, such as [live.snort.social](https://live.snort.social) and [nostrnests.com](https://nostrnests.com).
 
-# Example
+## Example
 
-Live Streaming
+### Live Streaming
 
 ```json
 {
@@ -107,7 +105,7 @@ Live Streaming
 }
 ```
 
-Live Streaming chat message
+### Live Streaming chat message
 
 ```json
 {
diff --git a/56.md b/56.md
index 0c951b5..a2861e3 100644
--- a/56.md
+++ b/56.md
@@ -1,4 +1,3 @@
-
 NIP-56
 ======
 
diff --git a/72.md b/72.md
index 74c7f08..c0fffff 100644
--- a/72.md
+++ b/72.md
@@ -14,7 +14,6 @@ The goal of this NIP is to create moderator-approved public communities around a
 
 ```json
 {
-  ...
   "created_at": <Unix timestamp in seconds>,
   "kind": 34550,
   "tags": [
@@ -34,7 +33,8 @@ The goal of this NIP is to create moderator-approved public communities around a
     ["relay", "<relay where to send and receive requests>", "requests"],
     ["relay", "<relay where to send and receive approvals>", "approvals"],
     ["relay", "<relay where to post requests to and fetch approvals from>"]
-  ]
+  ],
+  ...
 }
 ```
 
@@ -44,12 +44,12 @@ Any Nostr event can be submitted to a community by anyone for approval. Clients
 
 ```json
 {
-  ...
   "kind": 1,
   "tags": [
     ["a", "34550:<community event author pubkey>:<community-d-identifier>", "<optional-relay-url>"],
   ],
-  "content": "hello world"
+  "content": "hello world",
+  ...
 }
 ```
 
@@ -61,7 +61,6 @@ The post-approval event MUST include `a` tags of the communities the moderator i
 
 ```json
 {
-  ...
   "pubkey": "<32-bytes lowercase hex-encoded public key of the event creator>",
   "kind": 4550,
   "tags": [
@@ -70,7 +69,8 @@ The post-approval event MUST include `a` tags of the communities the moderator i
     ["p", "<port-author-pubkey>", "<optional-relay-url>"],
     ["k", "<post-request-kind>"]
   ],
-  "content": "<the full approved event, JSON-encoded>"
+  "content": "<the full approved event, JSON-encoded>",
+  ...
 }
 ```
 
@@ -86,7 +86,7 @@ Community clients SHOULD display posts that have been approved by at least 1 mod
 
 The following filter displays the approved posts.
 
-```js
+```json
 [
   "REQ",
   "_",
diff --git a/75.md b/75.md
index 3a89f90..f3cf5d0 100644
--- a/75.md
+++ b/75.md
@@ -1,6 +1,8 @@
-# NIP-75
+NIP-75
+======
 
-## Zap Goals
+Zap Goals
+---------
 
 `draft` `optional`
 
@@ -27,7 +29,7 @@ Example event:
     ["amount", "210000"],
   ],
   "content": "Nostrasia travel expenses",
-  ...other fields
+  ...
 ```
 
 The following tags are OPTIONAL.
@@ -43,7 +45,8 @@ The following tags are OPTIONAL.
     ["closed_at", "<unix timestamp in seconds>"],
   ],
   "content": "Nostrasia travel expenses",
-  ...other fields
+  ...
+}
 ```
 
 The goal MAY include an `r` or `a` tag linking to a URL or parameterized replaceable event.
@@ -54,12 +57,14 @@ Parameterized replaceable events can link to a goal by using a `goal` tag specif
 
 ```json
 {
-  "kind": 3XXXX,
+  ...
+  "kind": 3xxxx,
   "tags": [
     ...
     ["goal", "<event id>", "<Relay URL (optional)>"],
   ],
-  ...other fields
+  ...
+}
 ```
 
 ## Client behavior
diff --git a/84.md b/84.md
index 303cd93..d5f54d4 100644
--- a/84.md
+++ b/84.md
@@ -27,9 +27,14 @@ useful when highlighting non-nostr content for which the client might be able to
 last value of the tag.
 
 ```json
-[ "p", "<pubkey-hex>", "<relay-url>", "author" ],
-[ "p", "<pubkey-hex>", "<relay-url>", "author" ],
-[ "p", "<pubkey-hex>", "<relay-url>", "editor" ],
+{
+  "tags": [
+    ["p", "<pubkey-hex>", "<relay-url>", "author"],
+    ["p", "<pubkey-hex>", "<relay-url>", "author"],
+    ["p", "<pubkey-hex>", "<relay-url>", "editor"]
+  ],
+  ...
+}
 ```
 
 ### Context
diff --git a/89.md b/89.md
index 73cb7bd..be3d075 100644
--- a/89.md
+++ b/89.md
@@ -9,10 +9,12 @@ Recommended Application Handlers
 This NIP describes `kind:31989` and `kind:31990`: a way to discover applications that can handle unknown event-kinds.
 
 ## Rationale
+
 Nostr's discoverability and transparent event interaction is one of its most interesting/novel mechanics.
 This NIP provides a simple way for clients to discover applications that handle events of a specific kind to ensure smooth cross-client and cross-kind interactions.
 
 ### Parties involved
+
 There are three actors to this workflow:
 
 * application that handles a specific event kind (note that an application doesn't necessarily need to be a distinct entity and it could just be the same pubkey as user A)
@@ -22,18 +24,18 @@ There are three actors to this workflow:
 * user B, who seeks a recommendation for an app that handles a specific event kind
     * Queries for `kind:31989` and, based on results, queries for `kind:31990`
 
-# Events
+## Events
 
-## Recommendation event
+### Recommendation event
 ```json
 {
-    "kind": 31989,
-    "pubkey": <recommender-user-pubkey>,
-    "tags": [
-        [ "d", <supported-event-kind> ],
-        [ "a", "31990:app1-pubkey:<d-identifier>", "wss://relay1", "ios" ],
-        [ "a", "31990:app2-pubkey:<d-identifier>", "wss://relay2", "web" ]
-    ]
+  "kind": 31989,
+  "pubkey": <recommender-user-pubkey>,
+  "tags": [
+    ["d", <supported-event-kind>],
+    ["a", "31990:app1-pubkey:<d-identifier>", "wss://relay1", "ios"],
+    ["a", "31990:app2-pubkey:<d-identifier>", "wss://relay2", "web"]
+  ]
 }
 ```
 
@@ -47,34 +49,32 @@ The third value of the tag SHOULD be the platform where this recommendation migh
 ## Handler information
 ```json
 {
-    "kind": 31990,
-    "pubkey": <pubkey>,
-    "content": "<optional-kind:0-style-metadata>",
-    "tags": [
-        [ "d", <random-id> ],
-        [ "k", <supported-event-kind> ],
-        [ "web", "https://..../a/<bech32>", "nevent" ],
-        [ "web", "https://..../p/<bech32>", "nprofile" ],
-        [ "web", "https://..../e/<bech32>" ],
-        [ "ios", ".../<bech32>" ]
-    ]
+  "kind": 31990,
+  "pubkey": "<application-pubkey>",
+  "content": "<optional-kind:0-style-metadata>",
+  "tags": [
+    ["d", <random-id>],
+    ["k", <supported-event-kind>],
+    ["web", "https://..../a/<bech32>", "nevent"],
+    ["web", "https://..../p/<bech32>", "nprofile"],
+    ["web", "https://..../e/<bech32>"],
+    ["ios", ".../<bech32>"]
+  ]
 }
 ```
 
 * `content` is an optional `metadata`-like stringified JSON object, as described in NIP-01. This content is useful when the pubkey creating the `kind:31990` is not an application. If `content` is empty, the `kind:0` of the pubkey should be used to display application information (e.g. name, picture, web, LUD16, etc.)
-
 * `k` tags' value is the event kind that is supported by this `kind:31990`.
 Using a `k` tag(s) (instead of having the kind onf the NIP-33 `d` tag) provides:
     * Multiple `k` tags can exist in the same event if the application supports more than one event kind and their handler URLs are the same.
     * The same pubkey can have multiple events with different apps that handle the same event kind.
-
 * `bech32` in a URL MUST be replaced by clients with the NIP-19-encoded entity that should be loaded by the application.
 
 Multiple tags might be registered by the app, following NIP-19 nomenclature as the second value of the array.
 
 A tag without a second value in the array SHOULD be considered a generic handler for any NIP-19 entity that is not handled by a different tag.
 
-# Client tag
+## Client tag
 When publishing events, clients MAY include a `client` tag in the same format as the recommendation event's `a` tags. This has privacy implications for users, so clients SHOULD allow users to opt-out of using this tag.
 
 ```json
@@ -87,43 +87,45 @@ When publishing events, clients MAY include a `client` tag in the same format as
 }
 ```
 
-# User flow
+## User flow
 A user A who uses a non-`kind:1`-centric nostr app could choose to announce/recommend a certain kind-handler application.
 
 When user B sees an unknown event kind, e.g. in a social-media centric nostr client, the client would allow user B to interact with the unknown-kind event (e.g. tapping on it).
 
 The client MIGHT query for the user's and the user's follows handler.
 
-# Example
+## Example
 
-## User A recommends a `kind:31337`-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
 {
-    "kind": 31989,
-    "tags": [
-        [ "d", "31337" ],
-        [ "a", "31990:1743058db7078661b94aaf4286429d97ee5257d14a86d6bfa54cb0482b876fb0:abcd", <relay-url>, "web" ]
-    ]
+  "kind": 31989,
+  "tags": [
+    ["d", "31337"],
+    ["a", "31990:1743058db7078661b94aaf4286429d97ee5257d14a86d6bfa54cb0482b876fb0:abcd", <relay-url>, "web"]
+  ],
+  ...
 }
 ```
 
-## User B interacts with a `kind:31337`-handler
-User B might see in their timeline an event referring to a `kind:31337` event
-(e.g. a `kind:1` tagging a `kind:31337`).
+### User B interacts with a `kind:31337`-handler
+User B might see in their timeline an event referring to a `kind:31337` event (e.g. a `kind:1` tagging a `kind:31337`).
 
-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`:
+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`:
 
-`["REQ", <id>, '[{ "kinds": [31989], "#d": ["31337"], 'authors': [<user>, <users-contact-list>] }]']`
+```json
+["REQ", <id>, '[{ "kinds": [31989], "#d": ["31337"], 'authors': [<user>, <users-contact-list>] }]']
+```
 
 User B, who follows User A, sees that `kind:31989` event and fetches the `a`-tagged event for the app and handler information.
 
 User B's client sees the application's `kind:31990` which includes the information to redirect the user to the relevant URL with the desired entity replaced in the URL.
 
-## 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 to avoid directing users to malicious handlers.
+### 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.
 
-`["REQ", <id>, '[{ "kinds": [31990], "#k": [<desired-event-kind>], 'authors': [...] }]']`
+```json
+["REQ", <id>, '[{ "kinds": [31990], "#k": [<desired-event-kind>], 'authors': [...] }]']
+```
diff --git a/90.md b/90.md
index c498cdd..6017c98 100644
--- a/90.md
+++ b/90.md
@@ -13,11 +13,11 @@ Money in, data out.
 ## Kinds
 This NIP reserves the range `5000-7000` for data vending machine use.
 
-| Kind | Description |
-| ---- | ----------- |
+| Kind      | Description       |
+| ----      | -----------       |
 | 5000-5999 | Job request kinds |
-| 6000-6999 | Job result |
-| 7000 | Job feedback |
+| 6000-6999 | Job result        |
+| 7000      | Job feedback      |
 
 Job results always use a kind number that is `1000` higher than the job request kind. (e.g. request: `kind:5001` gets a result: `kind:6001`).
 
@@ -67,34 +67,34 @@ All tags are optional.
 * `relays`: List of relays where Service Providers SHOULD publish responses to
 * `p`: Service Providers the customer is interested in. Other SPs MIGHT still choose to process the job
 
-## Encrypted Params 
+## Encrypted Params
 
 If the user wants to keep the input parameters a secret, they can encrypt the `i` and `param` tags with the service provider's 'p' tag and add it to the content field. Add a tag `encrypted` as tags. Encryption for private tags will use [NIP-04 - Encrypted Direct Message encryption](https://github.com/nostr-protocol/nips/blob/master/04.md), using the user's private and service provider's public key for the shared secret
 
 ```json
 [
-    [ "i", "what is the capital of France? ", "text" ],
-    [ "param", "model", "LLaMA-2" ],
-    [ "param", "max_tokens", "512" ],
-    [ "param", "temperature", "0.5" ],
-    [ "param", "top-k", "50" ],
-    [ "param", "top-p", "0.7" ],
-    [ "param", "frequency_penalty", "1" ]
-    
+  ["i", "what is the capital of France? ", "text"],
+  ["param", "model", "LLaMA-2"],
+  ["param", "max_tokens", "512"],
+  ["param", "temperature", "0.5"],
+  ["param", "top-k", "50"],
+  ["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 
-
-```
-"content": "BE2Y4xvS6HIY7TozIgbEl3sAHkdZoXyLRRkZv4fLPh3R7LtviLKAJM5qpkC7D6VtMbgIt4iNcMpLtpo...",
-    "tags": [
-        ["p", "04f74530a6ede6b24731b976b8e78fb449ea61f40ff10e3d869a3030c4edc91f"],
-        ["encrypted"]
-    ]
-
+This param data will be encrypted and added to the `content` field and `p` tag should be present
 
+```json
+{
+  "content": "BE2Y4xvS6HIY7TozIgbEl3sAHkdZoXyLRRkZv4fLPh3R7LtviLKAJM5qpkC7D6VtMbgIt4iNcMpLtpo...",
+  "tags": [
+    ["p", "04f74530a6ede6b24731b976b8e78fb449ea61f40ff10e3d869a3030c4edc91f"],
+    ["encrypted"]
+  ],
+  ...
+}
 ```
 
 
@@ -104,16 +104,17 @@ Service providers publish job results, providing the output of the job result. T
 
 ```json
 {
-    "pubkey": "<service-provider pubkey>",
-    "content": "<payload>",
-    "kind": 6xxx,
-    "tags": [
-        [ "request", "<job-request>" ],
-        [ "e", "<job-request-id>", "<relay-hint>" ],
-        [ "i", "<input-data>" ],
-        [ "p", "<customer's-pubkey>" ],
-        [ "amount", "requested-payment-amount", "<optional-bolt11>" ]
-    ]
+  "pubkey": "<service-provider pubkey>",
+  "content": "<payload>",
+  "kind": 6xxx,
+  "tags": [
+    ["request", "<job-request>"],
+    ["e", "<job-request-id>", "<relay-hint>"],
+    ["i", "<input-data>"],
+    ["p", "<customer's-pubkey>"],
+    ["amount", "requested-payment-amount", "<optional-bolt11>"]
+  ],
+  ...
 }
 ```
 
@@ -123,38 +124,40 @@ Service providers publish job results, providing the output of the job result. T
 
 ## Encrypted Output
 
-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. 
+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
 {
-    "pubkey": "<service-provider pubkey>",
-    "content": "<encrypted payload>",
-    "kind": 6xxx,
-    "tags": [
-        [ "request", "<job-request>" ],
-        [ "e", "<job-request-id>", "<relay-hint>" ],
-        [ "p", "<customer's-pubkey>" ],
-        [ "amount", "requested-payment-amount", "<optional-bolt11>" ],
-        ["encrypted"]
-
-    ]
+  "pubkey": "<service-provider pubkey>",
+  "content": "<encrypted payload>",
+  "kind": 6xxx,
+  "tags": [
+    ["request", "<job-request>"],
+    ["e", "<job-request-id>", "<relay-hint>"],
+    ["p", "<customer's-pubkey>"],
+    ["amount", "requested-payment-amount", "<optional-bolt11>"],
+    ["encrypted"]
+  ],
+  ...
 }
 ```
- 
 
 ## Job feedback
+
 Service providers can give feedback about a job back to the customer.
 
 ```json
 {
-    "kind": 7000,
-    "content": "<empty-or-payload>",
-    "tags": [
-        [ "status", "<status>", "<extra-info>" ],
-        [ "amount", "requested-payment-amount", "<bolt11>" ],
-        [ "e", "<job-request-id>", "<relay-hint>" ],
-        [ "p", "<customer's-pubkey>" ],
-    ]
+  "kind": 7000,
+  "content": "<empty-or-payload>",
+  "tags": [
+    ["status", "<status>", "<extra-info>"],
+    ["amount", "requested-payment-amount", "<bolt11>"],
+    ["e", "<job-request-id>", "<relay-hint>"],
+    ["p", "<customer's-pubkey>"],
+  ],
+  ...
 }
 ```
 
@@ -166,18 +169,19 @@ Service providers can give feedback about a job back to the customer.
 
 ### Job feedback status
 
-| status | description |
-|--------|-------------|
-| `payment-required` | Service Provider requires payment before continuing. |
-| `processing` | Service Provider is processing the job. |
-| `error` | Service Provider was unable to process the job. |
-| `success` | Service Provider successfully processed the job. |
-| `partial` | Service Provider partially processed the job. The `.content` might include a sample of the partial results. |
+| status             | description                                                                                                 |
+| --------           | -------------                                                                                               |
+| `payment-required` | Service Provider requires payment before continuing.                                                        |
+| `processing`       | Service Provider is processing the job.                                                                     |
+| `error`            | Service Provider was unable to process the job.                                                             |
+| `success`          | Service Provider successfully processed the job.                                                            |
+| `partial`          | Service Provider partially processed the job. The `.content` might include a sample of the partial results. |
 
 Any job feedback event MIGHT include results in the `.content` field, as described in the [Job Result](#job-result) section. This is useful for service providers to provide a sample of the results that have been processed so far.
 
 
 # Protocol Flow
+
 * Customer publishes a job request (e.g. `kind:5000` speech-to-text).
 * Service Providers MAY submit `kind:7000` job-feedback events (e.g. `payment-required`, `processing`, `error`, etc.).
 * Upon completion, the service provider publishes the result of the job with a `kind:6000` job-result event.
@@ -207,18 +211,19 @@ 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:
 
-```json
+```js
 {
-    "kind": 31990,
-    "pubkey": "<pubkey>",
-    "content": "{
-        \"name\": \"Translating DVM\",
-        \"about\": \"I'm a DVM specialized in translating Bitcoin content.\"
-    }",
-    "tags": [
-        [ "k", "5005" ], // e.g. translation
-        [ "t", "bitcoin" ] // e.g. optionally advertises it specializes in bitcoin audio transcription that won't confuse "Drivechains" with "Ridechains"
-    ]
+  "kind": 31990,
+  "pubkey": "<pubkey>",
+  "content": "{
+    \"name\": \"Translating DVM\",
+    \"about\": \"I'm a DVM specialized in translating Bitcoin content.\"
+  }",
+  "tags": [
+    ["k", "5005"], // e.g. translation
+    ["t", "bitcoin"] // e.g. optionally advertises it specializes in bitcoin audio transcription that won't confuse "Drivechains" with "Ridechains"
+  ],
+  ...
 }
 ```
 
diff --git a/94.md b/94.md
index 0b76c25..95b6a3b 100644
--- a/94.md
+++ b/94.md
@@ -28,9 +28,6 @@ This NIP specifies the use of the `1063` event type, having in `content` a descr
 
 ```json
 {
-  "id": <32-bytes lowercase hex-encoded sha256 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": 1063,
   "tags": [
     ["url",<string with URI of file>],
@@ -47,8 +44,8 @@ This NIP specifies the use of the `1063` event type, having in `content` a descr
     ["summary", <excerpt>],
     ["alt", <description>]
   ],
-  "content": <caption>,
-  "sig": <64-bytes hex of the signature of the sha256 hash of the serialized event data, which is the same as the "id" field>
+  "content": "<caption>",
+  ...
 }
 ```
 
diff --git a/98.md b/98.md
index e04c7fc..ca52304 100644
--- a/98.md
+++ b/98.md
@@ -2,7 +2,7 @@ NIP-98
 ======
 
 HTTP Auth
--------------------------
+---------
 
 `draft` `optional`
 
@@ -24,22 +24,16 @@ The following tags MUST be included.
 Example event:
 ```json
 {
-    "id": "fe964e758903360f28d8424d092da8494ed207cba823110be3a57dfe4b578734",
-    "pubkey": "63fe6318dc58583cfe16810f86dd09e18bfd76aabc24a0081ce2856f330504ed",
-    "content": "",
-    "kind": 27235,
-    "created_at": 1682327852,
-    "tags": [
-        [
-            "u",
-            "https://api.snort.social/api/v1/n5sp/list"
-        ],
-        [
-            "method",
-            "GET"
-        ]
-    ],
-    "sig": "5ed9d8ec958bc854f997bdc24ac337d005af372324747efe4a00e24f4c30437ff4dd8308684bed467d9d6be3e5a517bb43b1732cc7d33949a3aaf86705c22184"
+  "id": "fe964e758903360f28d8424d092da8494ed207cba823110be3a57dfe4b578734",
+  "pubkey": "63fe6318dc58583cfe16810f86dd09e18bfd76aabc24a0081ce2856f330504ed",
+  "content": "",
+  "kind": 27235,
+  "created_at": 1682327852,
+  "tags": [
+    ["u", "https://api.snort.social/api/v1/n5sp/list"],
+    ["method", "GET"]
+  ],
+  "sig": "5ed9d8ec958bc854f997bdc24ac337d005af372324747efe4a00e24f4c30437ff4dd8308684bed467d9d6be3e5a517bb43b1732cc7d33949a3aaf86705c22184"
 }
 ```
 
diff --git a/99.md b/99.md
index 9e8f1da..e65920c 100644
--- a/99.md
+++ b/99.md
@@ -1,6 +1,8 @@
-# NIP-99
+NIP-99
+======
 
-## Classified Listings
+Classified Listings
+-------------------
 
 `draft` `optional`
 

From 50d20123e2271e2d33323105414b01a0a69559d5 Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Sat, 18 Nov 2023 09:36:59 -0300
Subject: [PATCH 026/263] "restricted_writes" on NIP-11.

---
 11.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/11.md b/11.md
index ab05f31..fe9f0e4 100644
--- a/11.md
+++ b/11.md
@@ -79,6 +79,7 @@ are rejected or fail immediately.
     "min_pow_difficulty": 30,
     "auth_required": true,
     "payment_required": true,
+    "restricted_writes": true,
     "created_at_lower_limit": 31536000,
     "created_at_upper_limit": 3
   },
@@ -124,6 +125,9 @@ Even if set to False, authentication may be required for specific actions.
 
 - `payment_required`: this relay requires payment before a new connection may perform any action.
 
+- `restricted_writes`: this relay requires some kind of condition to be fulfilled in order to
+accept events (not necessarily, but including `payment_required` and `min_pow_difficulty`).
+
 - `created_at_lower_limit`: 'created_at' lower limit as defined in [NIP-22](22.md)
 
 - `created_at_upper_limit`: 'created_at' upper limit as defined in [NIP-22](22.md)

From 2d678bcd5a1beb56097fb9af037e1fe2b2598c5e Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Sat, 18 Nov 2023 11:35:32 -0300
Subject: [PATCH 027/263] metadata tags for lists kept at "title", "image" and
 "description", following @erskingardner and @darecjo.

---
 51.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/51.md b/51.md
index bcab8b8..b42bc8b 100644
--- a/51.md
+++ b/51.md
@@ -47,8 +47,7 @@ For example, _relay sets_ can be displayed in a dropdown UI to give users the op
 relays they will publish an event or from which relays they will read the replies to an event; _curation sets_
 can be used by apps to showcase curations made by others tagged to different topics.
 
-Aside from their main identifier, the `"d"` tag, sets can optionally have a `"name"`, a `"picture"` and an
-`"about"` tag that can be used to enhance their UI.
+Aside from their main identifier, the `"d"` tag, sets can optionally have a `"title"`, an `"image"` and a `"description"` tags that can be used to enhance their UI.
 
 | name          | kind  | description                                                                                  | expected tag items                                                                |
 | ---           | ---   | ---                                                                                          | ---                                                                               |

From 5e6e7a2bc85de7d251b2d7d111c355a9e5ddd0e4 Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Sat, 18 Nov 2023 11:36:20 -0300
Subject: [PATCH 028/263] get rid of these arbitrary markdown linebreaks and
 put everything in the same line.

---
 51.md | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/51.md b/51.md
index b42bc8b..f9f567a 100644
--- a/51.md
+++ b/51.md
@@ -6,24 +6,17 @@ Lists
 
 `draft` `optional` `author:fiatjaf` `author:arcbtc` `author:monlovesmango` `author:eskema` `author:gzuuus`
 
-This NIP defines lists of things that users can create. Lists can contain references to anything, and these
-references can be **public** or **private**.
+This NIP defines lists of things that users can create. Lists can contain references to anything, and these references can be **public** or **private**.
 
-Public items in a list are specified in the event `tags` array, while private items are specified in a JSON
-array that mimics the structure of the event `tags` array, but stringified and encrypted using the same
-scheme from [NIP-04](04.md) (the shared key is computed using the author's public and private key) and
-stored in the `.content`.
+Public items in a list are specified in the event `tags` array, while private items are specified in a JSON array that mimics the structure of the event `tags` array, but stringified and encrypted using the same scheme from [NIP-04](04.md) (the shared key is computed using the author's public and private key) and stored in the `.content`.
 
 ## Types of lists
 
 ## 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 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.
 
-For example, _mute lists_ can contain the public keys of spammers and bad actors users don't want to see in
-their feeds or receive annoying notifications from.
+For example, _mute lists_ can contain the public keys of spammers and bad actors users don't want to see in their feeds or receive annoying notifications from.
 
 | name           | kind  | description                                                 | expected tag items                                                                |
 | ---            | ---   | ---                                                         | ---                                                                               |
@@ -39,13 +32,9 @@ their feeds or receive annoying notifications from.
 
 ## Sets
 
-Sets are lists with well-defined meaning that can enhance the functionality and the UI of clients that rely
-on them. Unlike standard lists, users are expected to have more than one set of each kind, therefore each of
-them must be assigned a different `"d"` identifier.
+Sets are lists with well-defined meaning that can enhance the functionality and the UI of clients that rely on them. Unlike standard lists, users are expected to have more than one set of each kind, therefore each of them must be assigned a different `"d"` identifier.
 
-For example, _relay sets_ can be displayed in a dropdown UI to give users the option to switch to which
-relays they will publish an event or from which relays they will read the replies to an event; _curation sets_
-can be used by apps to showcase curations made by others tagged to different topics.
+For example, _relay sets_ can be displayed in a dropdown UI to give users the option to switch to which relays they will publish an event or from which relays they will read the replies to an event; _curation sets_ can be used by apps to showcase curations made by others tagged to different topics.
 
 Aside from their main identifier, the `"d"` tag, sets can optionally have a `"title"`, an `"image"` and a `"description"` tags that can be used to enhance their UI.
 

From 33a719f34507bf2cbc6717eb5e4b9464daaad23a Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Sun, 19 Nov 2023 07:17:11 -0300
Subject: [PATCH 029/263] fix kind:40 name (following @snowcait).

---
 51.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/51.md b/51.md
index f9f567a..54c0920 100644
--- a/51.md
+++ b/51.md
@@ -24,7 +24,7 @@ For example, _mute lists_ can contain the public keys of spammers and bad actors
 | Pinned notes   | 10001 | events the user intends to showcase in their profile page   | `"e"` (kind:1 notes)                                                              |
 | Bookmarks      | 10003 | uncategorized, "global" list of things a user wants to save | `"e"` (kind:1 notes), `"a"` (kind:30023 articles), `"t"` (hashtags), `"r" (URLs)` |
 | Communities    | 10004 | [NIP-72](72.md) communities the user belongs to             | `"a"` (kind:34550 community definitions)                                          |
-| Public chats   | 10005 | [NIP-28](28.md) chat channels the user is in                | `"e"` (kind:40 community definitions)                                             |
+| Public chats   | 10005 | [NIP-28](28.md) chat channels the user is in                | `"e"` (kind:40 channel definitions)                                             |
 | Blocked relays | 10006 | relays clients should never connect to                      | `"relay"` (relay URLs)                                                            |
 | Search relays  | 10007 | relays clients should use when performing search queries    | `"relay"` (relay URLs)                                                            |
 | Interests      | 10015 | topics a user may be interested in and pointers             | `"t"` (hashtags) and `"a" (kind:30015 interest set)`                              |

From 438812d0a4a9afa5b4985e07771ae2919765b514 Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Sun, 19 Nov 2023 10:17:57 -0300
Subject: [PATCH 030/263] clarify that `restricted_writes` do not include
 normal anti-spam heuristics and other kinds of soft-restrictions.

---
 11.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/11.md b/11.md
index fe9f0e4..615e796 100644
--- a/11.md
+++ b/11.md
@@ -127,6 +127,9 @@ Even if set to False, authentication may be required for specific actions.
 
 - `restricted_writes`: this relay requires some kind of condition to be fulfilled in order to
 accept events (not necessarily, but including `payment_required` and `min_pow_difficulty`).
+This should only be set to `true` when users are expected to know the relay policy before trying
+to write to it -- like belonging to a special pubkey-based whitelist or writing only events of
+a specific niche kind or content. Normal anti-spam heuristics, for example, do not qualify.
 
 - `created_at_lower_limit`: 'created_at' lower limit as defined in [NIP-22](22.md)
 

From cb37a9320e10fcc4d8c064571461311ca613a1d5 Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Wed, 18 Oct 2023 11:48:18 -0300
Subject: [PATCH 031/263] rewrite NIP-46.

---
 46.md | 178 +++++++++++++++++-----------------------------------------
 1 file changed, 50 insertions(+), 128 deletions(-)

diff --git a/46.md b/46.md
index 5318541..ccdb535 100644
--- a/46.md
+++ b/46.md
@@ -2,161 +2,83 @@ NIP-46
 ======
 
 Nostr Connect
-------------------------
+-------------
 
 `draft` `optional`
 
-## Rationale
+This NIP describes a method for 2-way communication between a **remote signer** and a normal Nostr client. The remote signer could be, for example, a hardware device dedicated to signing Nostr events, while the client is a normal Nostr client.
 
-Private keys should be exposed to as few systems - apps, operating systems, devices - as possible as each system adds to the attack surface.
+## Signer Discovery
 
-Entering private keys can also be annoying and requires exposing them to even more systems such as the operating system's clipboard that might be monitored by malicious apps.
+The client must somehow be able to contact the signer through a common relay.
 
+### Started by the signer
 
-## Terms
+The remote signer generates a connection token in the form
 
-* **App**: Nostr app on any platform that *requires* to act on behalf of a nostr account.
-* **Signer**: Nostr app that holds the private key of a nostr account and *can sign* on its behalf.
+```
+<npub1...>#<secret>?relay=wss://...&relay=wss://...
+```
 
+The user copies that token and pastes it in the client UI somehow. Then the client can send events of kind `24133` to the specified relays and wait for responses from the remote signer.
 
-## `TL;DR`
+### Started by the client
 
+The client generates a QR code in the following form (URL-encoded):
 
-**App** and **Signer** sends ephemeral encrypted messages to each other using kind `24133`, using a relay of choice. 
+```
+nostrconnect://<client-key-hex>?relay=wss://...&metadata={"name":"client-name"}
+```
 
-App prompts the Signer to do things such as fetching the public key or signing events.
+The signer scans the QR code and sends a `connect` message to the client in the specified relays.
 
-The `content` field must be an encrypted JSONRPC-ish **request** or **response**.
+## Event payloads
 
-## Signer Protocol
+Event payloads are [NIP-04](04.md)-encrypted JSON blobs that look like JSONRPC.
 
-### Messages
+Events sent by the client to the remote signer have the following format:
 
-#### Request
-
-```json
+```js
 {
-  "id": <random_string>,
-  "method": <one_of_the_methods>,
-  "params": [<anything>, <else>]
+  "pubkey": "<client-key-hex>"
+  "kind": 24133,
+  "tags": [
+    ["p", "<signer-key-hex>"]
+  ],
+  "content": "nip04_encrypted_json({id: <random-string>, method: <see-below>, params: []})",
+  ...
 }
 ```
 
-#### Response
+And the events the remote signer sends to the client have the following format:
 
-```json
-{
-  "id": <request_id>,
-  "result": <anything>,
-  "error": <reason>
-}
+```js
+  "pubkey": "<signer-key-hex>"
+  "kind": 24133,
+  "tags": [
+    ["p", "<client-key-hex>"]
+  ],
+  "content": "nip04_encrypted_json({id: <request-id>, result: <any>, error: <reason-string>})",
+  ...
 ```
 
 ### Methods
 
-
-#### Mandatory 
-
-These are mandatory methods the remote signer app MUST implement:
-
-- **describe**
-  - params []
-  - result `["describe", "get_public_key", "sign_event", "connect", "disconnect", "delegate", ...]`  
-- **get_public_key**
-  - params []
-  - result `pubkey` 
-- **sign_event**
-  - params [`event`]
-  - result `event_with_signature` 
-
-#### optional
-
-
 - **connect**
-  - params [`pubkey`]
-- **disconnect**
-  - params []
-- **delegate** 
-  - params [`delegatee`, `{ kind: number, since: number, until: number }`]
-  - result `{ from: string, to: string, cond: string, sig: string }`
+  - params: [`pubkey`, `secret`]
+  - result: `null`
+- **get_public_key**
+  - params: []
+  - result: `pubkey`
+- **sign_event**
+  - params: [`event`]
+  - result: `event_with_pubkey_id_and_signature`
 - **get_relays**
-  - params []
-  - result `{ [url: string]: {read: boolean, write: boolean} }` 
+  - params: []
+  - result: `{ [url: string]: {read: boolean, write: boolean} }`
 - **nip04_encrypt**
-  - params [`pubkey`, `plaintext`]
-  - result `nip4 ciphertext`
+  - params: [`pubkey`, `plaintext`]
+  - result: `nip4 ciphertext`
 - **nip04_decrypt**
-  - params [`pubkey`, `nip4 ciphertext`]
-  - result [`plaintext`]
-
-
-NOTICE: `pubkey` and `signature` are hex-encoded strings.
-
-
-### Nostr Connect URI
-
-**Signer** discovers **App** by scanning a QR code, clicking on a deep link or copy-pasting an URI.
-
-The **App** generates a special URI with prefix `nostrconnect://` and base path the hex-encoded `pubkey` with the following querystring parameters **URL encoded**
-
-- `relay` URL of the relay of choice where the **App** is connected and the **Signer** must send and listen for messages.
-- `metadata`  metadata JSON of the **App** 
-    - `name` human-readable name of the **App** 
-    - `url` (optional) URL of the website requesting the connection
-    - `description` (optional) description of the **App**
-    - `icons` (optional) array of URLs for icons of the **App**.
-
-#### JavaScript
-
-```js
-const uri = `nostrconnect://<pubkey>?relay=${encodeURIComponent("wss://relay.damus.io")}&metadata=${encodeURIComponent(JSON.stringify({"name": "Example"}))}`
-```
-
-#### Example
-```sh
-nostrconnect://b889ff5b1513b641e2a139f661a661364979c5beee91842f8f0ef42ab558e9d4?relay=wss%3A%2F%2Frelay.damus.io&metadata=%7B%22name%22%3A%22Example%22%7D
-```
-
-
-
-## Flows
-
-The `content` field contains encrypted message as specified by [NIP04](https://github.com/nostr-protocol/nips/blob/master/04.md). The `kind` chosen is `24133`.
-
-### Connect
-
-1. User clicks on **"Connect"** button on a website or scan it with a QR code
-2. It will show an URI to open a "nostr connect" enabled **Signer** 
-3. In the URI there is a pubkey of the **App** ie. `nostrconnect://<pubkey>&relay=<relay>&metadata=<metadata>`
-4. The **Signer** will send a message to ACK the `connect` request, along with his public key
-
-### Disconnect (from App)
-
-1. User clicks on **"Disconnect"** button on the **App**
-2. The **App** will send a message to the **Signer** with a `disconnect` request
-3. The **Signer** will send a message to ACK the `disconnect` request
-
-### Disconnect (from Signer)
-
-1. User clicks on **"Disconnect"** button on the **Signer**
-2. The **Signer** will send a message to the **App** with a `disconnect` request
-
-
-### Get Public Key
-
-1. The **App** will send a message to the **Signer** with a `get_public_key` request
-3. The **Signer** will send back a message with the public key as a response to the `get_public_key` request
-
-### Sign Event
-
-1. The **App** will send a message to the **Signer** with a `sign_event` request along with the **event** to be signed
-2. The **Signer** will show a popup to the user to inspect the event and sign it
-3. The **Signer** will send back a message with the event including the `id` and the schnorr `signature` as a response to the `sign_event` request
-
-### Delegate
-
-1. The **App** will send a message with metadata to the **Signer** with a `delegate` request along with the **conditions** query string and the **pubkey** of the **App** to be delegated.
-2. The **Signer** will show a popup to the user to delegate the **App** to sign on his behalf
-3. The **Signer** will send back a message with the signed [NIP-26 delegation token](https://github.com/nostr-protocol/nips/blob/master/26.md) or reject it
-
-
+  - params: [`pubkey`, `nip4 ciphertext`]
+  - result: [`plaintext`]

From c5c2d86a479d1ca52065b50faddc72220c3896cf Mon Sep 17 00:00:00 2001
From: fiatjaf_ <fiatjaf@gmail.com>
Date: Tue, 21 Nov 2023 20:49:35 -0300
Subject: [PATCH 032/263] peer-pubkey

Co-authored-by: monlovesmango <96307647+monlovesmango@users.noreply.github.com>
---
 46.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/46.md b/46.md
index ccdb535..baefa4b 100644
--- a/46.md
+++ b/46.md
@@ -80,5 +80,5 @@ And the events the remote signer sends to the client have the following format:
   - params: [`pubkey`, `plaintext`]
   - result: `nip4 ciphertext`
 - **nip04_decrypt**
-  - params: [`pubkey`, `nip4 ciphertext`]
+  - params: [`peer-pubkey`, `nip4 ciphertext`]
   - result: [`plaintext`]

From e4bddbee7b90b701ea2041532c88935f5176850e Mon Sep 17 00:00:00 2001
From: fiatjaf_ <fiatjaf@gmail.com>
Date: Tue, 21 Nov 2023 22:25:19 -0300
Subject: [PATCH 033/263] peer-pubkey

Co-authored-by: monlovesmango <96307647+monlovesmango@users.noreply.github.com>
---
 46.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/46.md b/46.md
index baefa4b..6610e82 100644
--- a/46.md
+++ b/46.md
@@ -77,7 +77,7 @@ And the events the remote signer sends to the client have the following format:
   - params: []
   - result: `{ [url: string]: {read: boolean, write: boolean} }`
 - **nip04_encrypt**
-  - params: [`pubkey`, `plaintext`]
+  - params: [`peer-pubkey`, `plaintext`]
   - result: `nip4 ciphertext`
 - **nip04_decrypt**
   - params: [`peer-pubkey`, `nip4 ciphertext`]

From 6c35537ca425f154ca1c92897ab0eac599a80c87 Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Tue, 21 Nov 2023 22:31:13 -0300
Subject: [PATCH 034/263] @v0l improvements.

---
 46.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/46.md b/46.md
index 6610e82..1a9be03 100644
--- a/46.md
+++ b/46.md
@@ -10,7 +10,7 @@ This NIP describes a method for 2-way communication between a **remote signer**
 
 ## Signer Discovery
 
-The client must somehow be able to contact the signer through a common relay.
+The client always starts by generating a random key which is used to communicate with the signer, then it one of the methods below is used to allow the client to know what is the signer public key for the session and which relays to use.
 
 ### Started by the signer
 
@@ -27,7 +27,7 @@ The user copies that token and pastes it in the client UI somehow. Then the clie
 The client generates a QR code in the following form (URL-encoded):
 
 ```
-nostrconnect://<client-key-hex>?relay=wss://...&metadata={"name":"client-name"}
+nostrconnect://<client-key-hex>?relay=wss://...&metadata={"name":"...", "url": "...", "description": "..."}
 ```
 
 The signer scans the QR code and sends a `connect` message to the client in the specified relays.

From 5ae5a6d0553e34afc3cf19e96043f7e0e2b349ef Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Fri, 24 Nov 2023 02:44:12 +0900
Subject: [PATCH 035/263] Remove "NIP-33" (#896)

---
 09.md | 2 +-
 57.md | 4 ++--
 89.md | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/09.md b/09.md
index f92410f..fbbd6e1 100644
--- a/09.md
+++ b/09.md
@@ -8,7 +8,7 @@ Event Deletion
 
 A special event with kind `5`, meaning "deletion" is defined as having a list of one or more `e` tags, each referencing an event the author is requesting to be deleted.
 
-Each tag entry must contain an "e" event id and/or NIP-33 `a` tags intended for deletion.
+Each tag entry must contain an "e" event id and/or `a` tags intended for deletion.
 
 The event's `content` field MAY contain a text note describing the reason for the deletion.
 
diff --git a/57.md b/57.md
index 2b2c97b..759e203 100644
--- 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 NIP-33 event coordinate that allows tipping parameterized replaceable events such as NIP-23 long-form notes.
+- `a` is an optional event coordinate that allows tipping parameterized replaceable events such as NIP-23 long-form notes.
 
 Example:
 
@@ -110,7 +110,7 @@ When a client sends a `zap request` event to a server's lnurl-pay callback URL,
 4. It MUST have 0 or 1 `e` tags
 5. There should be a `relays` tag with the relays to send the `zap receipt` to.
 6. If there is an `amount` tag, it MUST be equal to the `amount` query parameter.
-7. If there is an `a` tag, it MUST be a valid NIP-33 event coordinate
+7. If there is an `a` tag, it MUST be a valid event coordinate
 
 The event MUST then be stored for use later, when the invoice is paid.
 
diff --git a/89.md b/89.md
index be3d075..097bdcb 100644
--- a/89.md
+++ b/89.md
@@ -65,7 +65,7 @@ The third value of the tag SHOULD be the platform where this recommendation migh
 
 * `content` is an optional `metadata`-like stringified JSON object, as described in NIP-01. This content is useful when the pubkey creating the `kind:31990` is not an application. If `content` is empty, the `kind:0` of the pubkey should be used to display application information (e.g. name, picture, web, LUD16, etc.)
 * `k` tags' value is the event kind that is supported by this `kind:31990`.
-Using a `k` tag(s) (instead of having the kind onf the NIP-33 `d` tag) provides:
+Using a `k` tag(s) (instead of having the kind of the `d` tag) provides:
     * Multiple `k` tags can exist in the same event if the application supports more than one event kind and their handler URLs are the same.
     * The same pubkey can have multiple events with different apps that handle the same event kind.
 * `bech32` in a URL MUST be replaced by clients with the NIP-19-encoded entity that should be loaded by the application.

From 1a106c6bff20a9408fe0ec51b265e3c5de86d25f Mon Sep 17 00:00:00 2001
From: Alejandro <bandarra+gith@protonmail.com>
Date: Thu, 23 Nov 2023 19:17:28 +0100
Subject: [PATCH 036/263] [NIP-75] add optional 'image' and 'summary' tags
 (#890)

---
 75.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/75.md b/75.md
index f3cf5d0..c16436a 100644
--- a/75.md
+++ b/75.md
@@ -35,6 +35,8 @@ Example event:
 The following tags are OPTIONAL.
 
 - `closed_at` - timestamp for determining which zaps are included in the tally. Zap receipts published after the `closed_at` timestamp SHOULD NOT count towards the goal progress.
+- `image` - an image for the goal
+- `summary` - a brief description
 
 ```json
 {
@@ -43,6 +45,8 @@ The following tags are OPTIONAL.
     ["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",
   ...

From 6de35f9e6a50cd5bf88c0a350ef369919ac27f06 Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Mon, 27 Nov 2023 06:22:15 -0800
Subject: [PATCH 037/263] Make client hints backwards compatible

---
 89.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/89.md b/89.md
index 097bdcb..43d197f 100644
--- a/89.md
+++ b/89.md
@@ -74,14 +74,14 @@ Multiple tags might be registered by the app, following NIP-19 nomenclature as t
 
 A tag without a second value in the array SHOULD be considered a generic handler for any NIP-19 entity that is not handled by a different tag.
 
-## Client tag
-When publishing events, clients MAY include a `client` tag in the same format as the recommendation event's `a` tags. This has privacy implications for users, so clients SHOULD allow users to opt-out of using this tag.
+# 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
 {
   "kind": 1,
   "tags": [
-    ["client", "31990:app1-pubkey:<d-identifier>", "wss://relay1", "ios"]
+    ["client", "My Client", "31990:app1-pubkey:<d-identifier>", "wss://relay1"]
   ]
   ...
 }

From 70a722b5d6526bf871a06290df8833492ac77b92 Mon Sep 17 00:00:00 2001
From: greenart7c3 <greenart7c3@proton.me>
Date: Wed, 29 Nov 2023 11:22:26 -0300
Subject: [PATCH 038/263] add permissions

---
 100.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/100.md b/100.md
index 3b8bc8e..56b8a91 100644
--- a/100.md
+++ b/100.md
@@ -43,6 +43,17 @@ intent.`package` = "com.example.signer"
     val intent = Intent(Intent.ACTION_VIEW, Uri.parse("nostrsigner:"))
     intent.`package` = "com.example.signer"
     intent.putExtra("type", "get_public_key")
+    // You can send some default permissions for the user authorize for ever
+    val permissions = listOf(
+      Permission(
+          "sign_event",
+          22242
+      ),
+      Permission(
+          "nip44_decrypt"
+      )
+    )
+    intent.putExtra("permissions", permissions.toJson())
     context.startActivity(intent)
     ```
   - result:

From e050386b849d0d293903a46646c89233bf19f489 Mon Sep 17 00:00:00 2001
From: greenart7c3 <greenart7c3@proton.me>
Date: Wed, 29 Nov 2023 11:23:14 -0300
Subject: [PATCH 039/263] signer can return the application package name when
 sign in

---
 100.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/100.md b/100.md
index 56b8a91..2c7b8f9 100644
--- a/100.md
+++ b/100.md
@@ -61,6 +61,8 @@ intent.`package` = "com.example.signer"
 
       ```kotlin
       val npub = intent.data?.getStringExtra("signature")
+      // The package name of the signer application
+      val packageName = intent.data?.getStringExtra("package")
       ```
 
 - **sign_event**

From fb87a03d5f2d0aee4f3916e1cf8338ee69b314a9 Mon Sep 17 00:00:00 2001
From: Leon <lixiao.dev@gmail.com>
Date: Thu, 30 Nov 2023 18:38:48 +0800
Subject: [PATCH 040/263] Update 07.md

Add OneKey to nip07
---
 07.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/07.md b/07.md
index 01af6f4..aa0a5f4 100644
--- a/07.md
+++ b/07.md
@@ -36,3 +36,4 @@ async window.nostr.nip04.decrypt(pubkey, ciphertext): string // takes ciphertext
 - [Spring Browser](https://spring.site) (Android)
 - [nodestr](https://github.com/lightning-digital-entertainment/nodestr) (NodeJS polyfill)
 - [Nostore](https://apps.apple.com/us/app/nostore/id1666553677) (Safari on iOS/MacOS)
+- [OneKey](https://onekey.so/) (Android, IOS, Chrome and derivatives)

From 45e65e9bee4425c0fd7cb9f27a48df0eb1e4783a Mon Sep 17 00:00:00 2001
From: Scott Weldon <open-source@scott-weldon.com>
Date: Thu, 30 Nov 2023 21:21:42 -0800
Subject: [PATCH 041/263] Fix typo

---
 15.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/15.md b/15.md
index 51b7792..1c3154a 100644
--- a/15.md
+++ b/15.md
@@ -108,7 +108,7 @@ Fields that are not self-explanatory:
 ```
 
 Fields that are not self-explanatory:
- - `quantity` can be null in the case of items with unlimited abailability, like digital items, or services
+ - `quantity` can be null in the case of items with unlimited availability, like digital items, or services
  - `specs`:
    - an optional array of key pair values. It allows for the Customer UI to present product specifications in a structure mode. It also allows comparison between products
    - eg: `[["operating_system", "Android 12.0"], ["screen_size", "6.4 inches"], ["connector_type", "USB Type C"]]`

From f2e30c63cb4ede5bbf4c83743d6f5e8e1b875335 Mon Sep 17 00:00:00 2001
From: ok300 <106775972+ok300@users.noreply.github.com>
Date: Fri, 1 Dec 2023 11:08:25 +0100
Subject: [PATCH 042/263] Update NIP58 Badges: Remove section on PoW

---
 58.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/58.md b/58.md
index 9725c82..e2a9f20 100644
--- a/58.md
+++ b/58.md
@@ -62,8 +62,6 @@ Users MAY choose to decorate their profiles with badges for fame, notoriety, rec
 
 ### Recommendations
 
-Badge issuers MAY include some Proof of Work as per [NIP-13](13.md) when minting Badge Definitions or Badge Awards to embed them with a combined energy cost, arguably making them more special and valuable for users that wish to collect them.
-
 Clients MAY whitelist badge issuers (pubkeys) for the purpose of ensuring they retain a valuable/special factor for their users.
 
 Badge image recommended aspect ratio is 1:1 with a high-res size of 1024x1024 pixels.

From cf57f1d068a1c5cbe95df9ecf5c2ca35e227760d Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Fri, 1 Dec 2023 20:45:55 +0900
Subject: [PATCH 043/263] Update tag list

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b8b98d9..2458f7d 100644
--- a/README.md
+++ b/README.md
@@ -184,7 +184,6 @@ Please update these lists when proposing NIPs introducing new event kinds.
 | `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)                           |
-| `alt`             | summary                              | --                   | [31](31.md)                           |
 | `g`               | geohash                              | --                   | [52](52.md)                           |
 | `i`               | identity                             | proof                | [39](39.md)                           |
 | `k`               | kind number (string)                 | --                   | [18](18.md), [25](25.md), [72](72.md) |
@@ -194,13 +193,16 @@ Please update these lists when proposing NIPs introducing new event kinds.
 | `r`               | a reference (URL, etc)               | petname              |                                       |
 | `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)                           |
 | `content-warning` | reason                               | --                   | [36](36.md)                           |
 | `delegation`      | pubkey, conditions, delegation token | --                   | [26](26.md)                           |
 | `description`     | invoice/badge description            | --                   | [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)              |

From d67988e64ee3c0a0df859ad557aa26fb7844f11e Mon Sep 17 00:00:00 2001
From: fiatjaf_ <fiatjaf@gmail.com>
Date: Fri, 1 Dec 2023 13:54:12 -0300
Subject: [PATCH 044/263] delete NIP-22 (#897)

---
 11.md     |  4 ++--
 22.md     | 45 ---------------------------------------------
 README.md |  1 -
 3 files changed, 2 insertions(+), 48 deletions(-)
 delete mode 100644 22.md

diff --git a/11.md b/11.md
index 615e796..45102d7 100644
--- a/11.md
+++ b/11.md
@@ -131,9 +131,9 @@ This should only be set to `true` when users are expected to know the relay poli
 to write to it -- like belonging to a special pubkey-based whitelist or writing only events of
 a specific niche kind or content. Normal anti-spam heuristics, for example, do not qualify.
 
-- `created_at_lower_limit`: 'created_at' lower limit as defined in [NIP-22](22.md)
+- `created_at_lower_limit`: 'created_at' lower limit
 
-- `created_at_upper_limit`: 'created_at' upper limit as defined in [NIP-22](22.md)
+- `created_at_upper_limit`: 'created_at' upper limit
 
 ### Event Retention
 
diff --git a/22.md b/22.md
deleted file mode 100644
index 06af493..0000000
--- a/22.md
+++ /dev/null
@@ -1,45 +0,0 @@
-NIP-22
-======
-
-Event `created_at` Limits
--------------------------
-
-`draft` `optional`
-
-Relays may define both upper and lower limits within which they will consider an event's `created_at` to be acceptable. Both the upper and lower limits MUST be unix timestamps in seconds as defined in [NIP-01](01.md).
-
-If a relay supports this NIP, the relay SHOULD send the client an `OK` result saying the event was not stored for the `created_at` timestamp not being within the permitted limits.
-
-Client Behavior
----------------
-
-Clients SHOULD use the [NIP-11](11.md) `supported_nips` field to learn if a relay uses event `created_at` time limits as defined by this NIP.
-
-Motivation
-----------
-
-This NIP formalizes restrictions on event timestamps as accepted by a relay and allows clients to be aware of relays that have these restrictions.
-
-The event `created_at` field is just a unix timestamp and can be set to a time in the past or future. Relays accept and share events dated to 20 years ago or 50,000 years in the future. This NIP aims to define a way for relays that do not want to store events with *any* timestamp to set their own restrictions.
-
-_Replaceable events_ can behave rather unexpectedly if the user wrote them - or tried to write them - with a wrong system clock. Persisting an update with a backdated system now would result in the update not getting persisted without a notification and if they did the last update with a forward dated system, they will again fail to do another update with the now correct time.
-
-A wide adoption of this NIP could create a better user experience as it would decrease the amount of events that appear wildly out of order or even from impossible dates in the distant past or future.
-
-Keep in mind that there is a use case where a user migrates their old posts onto a new relay. If a relay rejects events that were not recently created, it cannot serve this use case.
-
-
-Python (pseudocode) Example
----------------------------
-
-```python
-import time
-
-TIME = int(time.time())
-LOWER_LIMIT = TIME - (60 * 60 * 24) # Define lower limit as 1 day into the past
-UPPER_LIMIT = TIME + (60 * 15)      # Define upper limit as 15 minutes into the future
-
-if event.created_at not in range(LOWER_LIMIT, UPPER_LIMIT):
-  ws.send('["OK", event.id, False, "invalid: the event created_at field is out of the acceptable range (-24h, +15min) for this relay"]')
-```
-Note: These are just example limits, the relay operator can choose whatever limits they want.
diff --git a/README.md b/README.md
index 2458f7d..6fbea22 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,6 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 - [NIP-18: Reposts](18.md)
 - [NIP-19: bech32-encoded entities](19.md)
 - [NIP-21: `nostr:` URI scheme](21.md)
-- [NIP-22: Event `created_at` Limits](22.md)
 - [NIP-23: Long-form Content](23.md)
 - [NIP-24: Extra metadata fields and tags](24.md)
 - [NIP-25: Reactions](25.md)

From 210e38ae36b9fcc314ce33504232dfa002f43791 Mon Sep 17 00:00:00 2001
From: CapDog <34176400+capitalistdog@users.noreply.github.com>
Date: Sat, 2 Dec 2023 12:44:57 -0500
Subject: [PATCH 045/263] Add kind Lightning.Pub's kind 21000 (#911)

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 6fbea22..d8b2871 100644
--- a/README.md
+++ b/README.md
@@ -117,6 +117,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)                        |
 | `13194`       | Wallet Info                | [47](47.md)                        |
+| `21000`       | Lightning Pub RPC          | [Lightning.Pub](https://github.com/shocknet/Lightning.Pub/blob/master/proto/autogenerated/client.md)|                                |
 | `22242`       | Client Authentication      | [42](42.md)                        |
 | `23194`       | Wallet Request             | [47](47.md)                        |
 | `23195`       | Wallet Response            | [47](47.md)                        |

From 3983a52d3bb720852090ee02911f56ee2701dd73 Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Sat, 2 Dec 2023 14:45:10 -0300
Subject: [PATCH 046/263] latest discoveries.

---
 46.md | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/46.md b/46.md
index 1a9be03..ce31970 100644
--- a/46.md
+++ b/46.md
@@ -12,12 +12,12 @@ This NIP describes a method for 2-way communication between a **remote signer**
 
 The client always starts by generating a random key which is used to communicate with the signer, then it one of the methods below is used to allow the client to know what is the signer public key for the session and which relays to use.
 
-### Started by the signer
+### Started by the signer (nsecBunker)
 
 The remote signer generates a connection token in the form
 
 ```
-<npub1...>#<secret>?relay=wss://...&relay=wss://...
+<npub1...>#<optional-secret>?relay=wss://...&relay=wss://...
 ```
 
 The user copies that token and pastes it in the client UI somehow. Then the client can send events of kind `24133` to the specified relays and wait for responses from the remote signer.
@@ -34,7 +34,7 @@ The signer scans the QR code and sends a `connect` message to the client in the
 
 ## Event payloads
 
-Event payloads are [NIP-04](04.md)-encrypted JSON blobs that look like JSONRPC.
+Event payloads are [NIP-04](04.md)-encrypted JSON blobs that look like JSONRPC messages (their format is specified inside the `.content` of the event formats nelow).
 
 Events sent by the client to the remote signer have the following format:
 
@@ -45,7 +45,7 @@ Events sent by the client to the remote signer have the following format:
   "tags": [
     ["p", "<signer-key-hex>"]
   ],
-  "content": "nip04_encrypted_json({id: <random-string>, method: <see-below>, params: []})",
+  "content": "nip04_encrypted_json({id: <random-string>, method: <see-below>, params: [array_of_strings]})",
   ...
 }
 ```
@@ -58,27 +58,29 @@ And the events the remote signer sends to the client have the following format:
   "tags": [
     ["p", "<client-key-hex>"]
   ],
-  "content": "nip04_encrypted_json({id: <request-id>, result: <any>, error: <reason-string>})",
+  "content": "nip04_encrypted_json({id: <request-id>, result: <string>, error: <reason-string>})",
   ...
 ```
 
+The signer key will always be the key of the user who controls the signer device.
+
 ### Methods
 
 - **connect**
   - params: [`pubkey`, `secret`]
-  - result: `null`
+  - result: `"ack"`
 - **get_public_key**
   - params: []
-  - result: `pubkey`
+  - result: `pubkey-hex`
 - **sign_event**
   - params: [`event`]
-  - result: `event_with_pubkey_id_and_signature`
+  - result: `json_string(event_with_pubkey_id_and_signature)`
 - **get_relays**
   - params: []
-  - result: `{ [url: string]: {read: boolean, write: boolean} }`
+  - result: `json_string({[url: string]: {read: boolean, write: boolean}})`
 - **nip04_encrypt**
-  - params: [`peer-pubkey`, `plaintext`]
-  - result: `nip4 ciphertext`
+  - params: [`third-party-pubkey`, `plaintext`]
+  - result: `nip04-ciphertext`
 - **nip04_decrypt**
-  - params: [`peer-pubkey`, `nip4 ciphertext`]
-  - result: [`plaintext`]
+  - params: [`third-party-pubkey`, `nip04-ciphertext`]
+  - result: `plaintext`

From 131fcab95c49a828a216145b542e05e9bfbf0381 Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Sat, 2 Dec 2023 14:54:42 -0300
Subject: [PATCH 047/263] reformat lightning.pub.

---
 README.md | 149 +++++++++++++++++++++++++++---------------------------
 1 file changed, 75 insertions(+), 74 deletions(-)

diff --git a/README.md b/README.md
index d8b2871..9f2570c 100644
--- a/README.md
+++ b/README.md
@@ -75,81 +75,82 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 - [NIP-99: Classified Listings](99.md)
 
 ## Event Kinds
-| kind          | description                | NIP                                |
-| ------------- | -------------------------- | -----------                        |
-| `0`           | Metadata                   | [1](01.md)                         |
-| `1`           | Short Text Note            | [1](01.md)                         |
-| `2`           | Recommend Relay            |                                    |
-| `3`           | Contacts                   | [2](02.md)                         |
-| `4`           | Encrypted Direct Messages  | [4](04.md)                         |
-| `5`           | Event Deletion             | [9](09.md)                         |
-| `6`           | Repost                     | [18](18.md)                        |
-| `7`           | Reaction                   | [25](25.md)                        |
-| `8`           | Badge Award                | [58](58.md)                        |
-| `16`          | Generic Repost             | [18](18.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)                        |
-| `1063`        | File Metadata              | [94](94.md)                        |
-| `1311`        | Live Chat Message          | [53](53.md)                        |
-| `1040`        | OpenTimestamps             | [03](03.md)                        |
-| `1971`        | Problem Tracker            | [nostrocket-1971][nostrocket-1971] |
-| `1984`        | Reporting                  | [56](56.md)                        |
-| `1985`        | Label                      | [32](32.md)                        |
-| `4550`        | Community Post Approval    | [72](72.md)                        |
-| `5000`-`5999` | Job Request                | [90](90.md)                        |
-| `6000`-`6999` | Job Result                 | [90](90.md)                        |
-| `7000`        | Job Feedback               | [90](90.md)                        |
-| `9041`        | Zap Goal                   | [75](75.md)                        |
-| `9734`        | Zap Request                | [57](57.md)                        |
-| `9735`        | Zap                        | [57](57.md)                        |
-| `9802`        | Highlights                 | [84](84.md)                        |
-| `10000`       | Mute list                  | [51](51.md)                        |
-| `10001`       | Pin list                   | [51](51.md)                        |
-| `10002`       | Relay List Metadata        | [65](65.md)                        |
-| `10003`       | Bookmark list              | [51](51.md)                        |
-| `10004`       | Communities list           | [51](51.md)                        |
-| `10005`       | Public chats list          | [51](51.md)                        |
-| `10006`       | Blocked relays list        | [51](51.md)                        |
-| `10007`       | Search relays list         | [51](51.md)                        |
-| `10015`       | Interests list             | [51](51.md)                        |
-| `10030`       | User emoji list            | [51](51.md)                        |
-| `13194`       | Wallet Info                | [47](47.md)                        |
-| `21000`       | Lightning Pub RPC          | [Lightning.Pub](https://github.com/shocknet/Lightning.Pub/blob/master/proto/autogenerated/client.md)|                                |
-| `22242`       | Client Authentication      | [42](42.md)                        |
-| `23194`       | Wallet Request             | [47](47.md)                        |
-| `23195`       | Wallet Response            | [47](47.md)                        |
-| `24133`       | Nostr Connect              | [46](46.md)                        |
-| `27235`       | HTTP Auth                  | [98](98.md)                        |
-| `30000`       | Follow sets                | [51](51.md)                        |
-| `30001`       | Generic lists              | [51](51.md)                        |
-| `30002`       | Relay sets                 | [51](51.md)                        |
-| `30003`       | Bookmark sets              | [51](51.md)                        |
-| `30004`       | Curation sets              | [51](51.md)                        |
-| `30008`       | Profile Badges             | [58](58.md)                        |
-| `30009`       | Badge Definition           | [58](58.md)                        |
-| `30015`       | Interest sets              | [51](51.md)                        |
-| `30030`       | Emoji sets                 | [51](51.md)                        |
-| `30017`       | Create or update a stall   | [15](15.md)                        |
-| `30018`       | Create or update a product | [15](15.md)                        |
-| `30023`       | Long-form Content          | [23](23.md)                        |
-| `30024`       | Draft Long-form Content    | [23](23.md)                        |
-| `30078`       | Application-specific Data  | [78](78.md)                        |
-| `30311`       | Live Event                 | [53](53.md)                        |
-| `30315`       | User Statuses              | [38](38.md)                        |
-| `30402`       | Classified Listing         | [99](99.md)                        |
-| `30403`       | Draft Classified Listing   | [99](99.md)                        |
-| `31922`       | Date-Based Calendar Event  | [52](52.md)                        |
-| `31923`       | Time-Based Calendar Event  | [52](52.md)                        |
-| `31924`       | Calendar                   | [52](52.md)                        |
-| `31925`       | Calendar Event RSVP        | [52](52.md)                        |
-| `31989`       | Handler recommendation     | [89](89.md)                        |
-| `31990`       | Handler information        | [89](89.md)                        |
-| `34550`       | Community Definition       | [72](72.md)                        |
+| kind          | description                | NIP                      |
+| ------------- | -------------------------- | -----------              |
+| `0`           | Metadata                   | [1](01.md)               |
+| `1`           | Short Text Note            | [1](01.md)               |
+| `2`           | Recommend Relay            |                          |
+| `3`           | Contacts                   | [2](02.md)               |
+| `4`           | Encrypted Direct Messages  | [4](04.md)               |
+| `5`           | Event Deletion             | [9](09.md)               |
+| `6`           | Repost                     | [18](18.md)              |
+| `7`           | Reaction                   | [25](25.md)              |
+| `8`           | Badge Award                | [58](58.md)              |
+| `16`          | Generic Repost             | [18](18.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)              |
+| `1063`        | File Metadata              | [94](94.md)              |
+| `1311`        | Live Chat Message          | [53](53.md)              |
+| `1040`        | OpenTimestamps             | [03](03.md)              |
+| `1971`        | Problem Tracker            | [nostrocket][nostrocket] |
+| `1984`        | Reporting                  | [56](56.md)              |
+| `1985`        | Label                      | [32](32.md)              |
+| `4550`        | Community Post Approval    | [72](72.md)              |
+| `5000`-`5999` | Job Request                | [90](90.md)              |
+| `6000`-`6999` | Job Result                 | [90](90.md)              |
+| `7000`        | Job Feedback               | [90](90.md)              |
+| `9041`        | Zap Goal                   | [75](75.md)              |
+| `9734`        | Zap Request                | [57](57.md)              |
+| `9735`        | Zap                        | [57](57.md)              |
+| `9802`        | Highlights                 | [84](84.md)              |
+| `10000`       | Mute list                  | [51](51.md)              |
+| `10001`       | Pin list                   | [51](51.md)              |
+| `10002`       | Relay List Metadata        | [65](65.md)              |
+| `10003`       | Bookmark list              | [51](51.md)              |
+| `10004`       | Communities list           | [51](51.md)              |
+| `10005`       | Public chats list          | [51](51.md)              |
+| `10006`       | Blocked relays list        | [51](51.md)              |
+| `10007`       | Search relays list         | [51](51.md)              |
+| `10015`       | Interests list             | [51](51.md)              |
+| `10030`       | User emoji list            | [51](51.md)              |
+| `13194`       | Wallet Info                | [47](47.md)              |
+| `21000`       | Lightning Pub RPC          | [Lightning.Pub](lnpub)   |
+| `22242`       | Client Authentication      | [42](42.md)              |
+| `23194`       | Wallet Request             | [47](47.md)              |
+| `23195`       | Wallet Response            | [47](47.md)              |
+| `24133`       | Nostr Connect              | [46](46.md)              |
+| `27235`       | HTTP Auth                  | [98](98.md)              |
+| `30000`       | Follow sets                | [51](51.md)              |
+| `30001`       | Generic lists              | [51](51.md)              |
+| `30002`       | Relay sets                 | [51](51.md)              |
+| `30003`       | Bookmark sets              | [51](51.md)              |
+| `30004`       | Curation sets              | [51](51.md)              |
+| `30008`       | Profile Badges             | [58](58.md)              |
+| `30009`       | Badge Definition           | [58](58.md)              |
+| `30015`       | Interest sets              | [51](51.md)              |
+| `30030`       | Emoji sets                 | [51](51.md)              |
+| `30017`       | Create or update a stall   | [15](15.md)              |
+| `30018`       | Create or update a product | [15](15.md)              |
+| `30023`       | Long-form Content          | [23](23.md)              |
+| `30024`       | Draft Long-form Content    | [23](23.md)              |
+| `30078`       | Application-specific Data  | [78](78.md)              |
+| `30311`       | Live Event                 | [53](53.md)              |
+| `30315`       | User Statuses              | [38](38.md)              |
+| `30402`       | Classified Listing         | [99](99.md)              |
+| `30403`       | Draft Classified Listing   | [99](99.md)              |
+| `31922`       | Date-Based Calendar Event  | [52](52.md)              |
+| `31923`       | Time-Based Calendar Event  | [52](52.md)              |
+| `31924`       | Calendar                   | [52](52.md)              |
+| `31925`       | Calendar Event RSVP        | [52](52.md)              |
+| `31989`       | Handler recommendation     | [89](89.md)              |
+| `31990`       | Handler information        | [89](89.md)              |
+| `34550`       | Community Definition       | [72](72.md)              |
 
-[nostrocket-1971]: https://github.com/nostrocket/NIPS/blob/main/Problems.md
+[nostrocket]: https://github.com/nostrocket/NIPS/blob/main/Problems.md
+[lnpub]: https://github.com/shocknet/Lightning.Pub/blob/master/proto/autogenerated/client.md
 
 ## Message types
 

From 0ba4589550858bb86ed533f90054bfc642aa5350 Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Sat, 2 Dec 2023 15:05:59 -0300
Subject: [PATCH 048/263] remove websocket status code meaning as it is
 replaced by the CLOSED message.

---
 01.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/01.md b/01.md
index dafea1d..681fc99 100644
--- a/01.md
+++ b/01.md
@@ -96,10 +96,6 @@ These are just conventions and relay implementations may differ.
 
 Relays expose a websocket endpoint to which clients can connect. Clients SHOULD open a single websocket connection to each relay and use it for all their subscriptions. Relays MAY limit number of connections from specific IP/client/etc.
 
-### Meaning of WebSocket status codes
-
-- When a websocket is closed by the relay with a status code `4000` that means the client shouldn't try to connect again.
-
 ### From client to relay: sending events and creating subscriptions
 
 Clients can send 3 types of messages, which must be JSON arrays, according to the following patterns:

From 0a97dc04405e33882abfd3e29b94d33e76697a38 Mon Sep 17 00:00:00 2001
From: Mike Dilger <mike@mikedilger.com>
Date: Sun, 3 Dec 2023 13:22:34 +1300
Subject: [PATCH 049/263] Fix sort order of event kinds

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9f2570c..a792ec2 100644
--- a/README.md
+++ b/README.md
@@ -92,9 +92,9 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `42`          | Channel Message            | [28](28.md)              |
 | `43`          | Channel Hide Message       | [28](28.md)              |
 | `44`          | Channel Mute User          | [28](28.md)              |
+| `1040`        | OpenTimestamps             | [03](03.md)              |
 | `1063`        | File Metadata              | [94](94.md)              |
 | `1311`        | Live Chat Message          | [53](53.md)              |
-| `1040`        | OpenTimestamps             | [03](03.md)              |
 | `1971`        | Problem Tracker            | [nostrocket][nostrocket] |
 | `1984`        | Reporting                  | [56](56.md)              |
 | `1985`        | Label                      | [32](32.md)              |
@@ -131,11 +131,11 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `30008`       | Profile Badges             | [58](58.md)              |
 | `30009`       | Badge Definition           | [58](58.md)              |
 | `30015`       | Interest sets              | [51](51.md)              |
-| `30030`       | Emoji sets                 | [51](51.md)              |
 | `30017`       | Create or update a stall   | [15](15.md)              |
 | `30018`       | Create or update a product | [15](15.md)              |
 | `30023`       | Long-form Content          | [23](23.md)              |
 | `30024`       | Draft Long-form Content    | [23](23.md)              |
+| `30030`       | Emoji sets                 | [51](51.md)              |
 | `30078`       | Application-specific Data  | [78](78.md)              |
 | `30311`       | Live Event                 | [53](53.md)              |
 | `30315`       | User Statuses              | [38](38.md)              |

From 9913395d90a602af56404ba2c9a1bc43cac65b26 Mon Sep 17 00:00:00 2001
From: CapDog <34176400+capitalistdog@users.noreply.github.com>
Date: Sat, 2 Dec 2023 16:15:53 -0500
Subject: [PATCH 050/263] fix Lightning.Pub hotlink

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a792ec2..68c295f 100644
--- a/README.md
+++ b/README.md
@@ -117,7 +117,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)              |
 | `13194`       | Wallet Info                | [47](47.md)              |
-| `21000`       | Lightning Pub RPC          | [Lightning.Pub](lnpub)   |
+| `21000`       | Lightning Pub RPC          | [Lightning.Pub][lnpub]   |
 | `22242`       | Client Authentication      | [42](42.md)              |
 | `23194`       | Wallet Request             | [47](47.md)              |
 | `23195`       | Wallet Response            | [47](47.md)              |

From 149ead16791b7c38fa73e55e82613c3b99a2a8eb Mon Sep 17 00:00:00 2001
From: xiaolou86 <20718693+xiaolou86@users.noreply.github.com>
Date: Mon, 4 Dec 2023 15:47:59 +0800
Subject: [PATCH 051/263] fix typo in 47.md

---
 47.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/47.md b/47.md
index d4b7c1f..c6540d5 100644
--- a/47.md
+++ b/47.md
@@ -129,7 +129,7 @@ Errors:
 ## Example pay invoice flow
 
 0. The user scans the QR code generated by the **wallet service** with their **client** application, they follow a `nostr+walletconnect:` deeplink or configure the connection details manually.
-1. **client** sends an event to the **wallet service** service with kind `23194`. The content is a `pay_invoice` request. The private key is the secret from the connection string above.
+1. **client** sends an event to the **wallet service** with kind `23194`. The content is a `pay_invoice` request. The private key is the secret from the connection string above.
 2. **wallet service** verifies that the author's key is authorized to perform the payment, decrypts the payload and sends the payment.
 3. **wallet service** responds to the event by sending an event with kind `23195` and content being a response either containing an error message or a preimage.
 

From 625dad7c1a363c38ed5a198b40888dfbc36e3b76 Mon Sep 17 00:00:00 2001
From: xiaolou86 <20718693+xiaolou86@users.noreply.github.com>
Date: Mon, 4 Dec 2023 16:07:45 +0800
Subject: [PATCH 052/263] fix typo in 10.md

---
 10.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/10.md b/10.md
index 5b19fbd..a434ea0 100644
--- a/10.md
+++ b/10.md
@@ -33,7 +33,7 @@ Where:
 
  * Many "e" tags: `["e", <root-id>]` `["e", <mention-id>]`, ..., `["e", <reply-id>]`<br>
 There may be any number of `<mention-ids>`.  These are the ids of events which may, or may not be in the reply chain.
-They are citings from this event.  `root-id` and `reply-id` are as above.
+They are citing from this event.  `root-id` and `reply-id` are as above.
 
 >This scheme is deprecated because it creates ambiguities that are difficult, or impossible to resolve when an event references another but is not a reply.
 

From 85abb0e02649725578caf0a9e1d3ba162766f1e2 Mon Sep 17 00:00:00 2001
From: xiaolou86 <20718693+xiaolou86@users.noreply.github.com>
Date: Mon, 4 Dec 2023 16:08:03 +0800
Subject: [PATCH 053/263] fix typo in 53.md

---
 53.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/53.md b/53.md
index d3cc0af..e17f965 100644
--- a/53.md
+++ b/53.md
@@ -6,7 +6,7 @@ Live Activities
 
 `draft` `optional`
 
-Service providers want to offer live activities to the Nostr network in such a way that participants can easily logged and queried by clients. This NIP describes a general framework to advertise the involvement of pubkeys in such live activities.
+Service providers want to offer live activities to the Nostr network in such a way that participants can easily log and query by clients. This NIP describes a general framework to advertise the involvement of pubkeys in such live activities.
 
 ## Concepts
 

From 8aba861bdf530f9e15b8d371ab3ce4f1ace61fef Mon Sep 17 00:00:00 2001
From: xiaolou86 <20718693+xiaolou86@users.noreply.github.com>
Date: Mon, 4 Dec 2023 16:08:09 +0800
Subject: [PATCH 054/263] fix typo in 90.md

---
 90.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/90.md b/90.md
index 6017c98..241eb38 100644
--- a/90.md
+++ b/90.md
@@ -34,7 +34,7 @@ There are two actors in the workflow described in this NIP:
 * Service providers (npubs who fulfill jobs)
 
 ## Job request (`kind:5000-5999`)
-A request to process data, published by a customer. This event signals that an customer is interested in receiving the result of some kind of compute.
+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
 {

From 2bd4bf784112aabff9d0fc2dd90fed9107aa5cde Mon Sep 17 00:00:00 2001
From: fiatjaf_ <fiatjaf@gmail.com>
Date: Wed, 6 Dec 2023 12:01:27 -0300
Subject: [PATCH 055/263] `CLOSED` messages for relays that want to reject REQs
 and NIP-42 `AUTH` integration (#902)

Co-authored-by: monlovesmango <96307647+monlovesmango@users.noreply.github.com>
---
 01.md     | 12 +++++++---
 42.md     | 69 ++++++++++++++++++++++++++++++++++++-------------------
 45.md     | 11 ++++++++-
 README.md |  1 +
 4 files changed, 65 insertions(+), 28 deletions(-)

diff --git a/01.md b/01.md
index 681fc99..99c991a 100644
--- a/01.md
+++ b/01.md
@@ -141,19 +141,25 @@ Relays can send 4 types of messages, which must also be JSON arrays, according t
   * `["EVENT", <subscription_id>, <event JSON as defined above>]`, used to send events requested by clients.
   * `["OK", <event_id>, <true|false>, <message>]`, used to indicate acceptance or denial of an `EVENT` message.
   * `["EOSE", <subscription_id>]`, used to indicate the _end of stored events_ and the beginning of events newly received in real-time.
+  * `["CLOSED", <subscription_id>, <message>]`, used to indicate that a subscription was ended on the server side.
   * `["NOTICE", <message>]`, used to send human-readable error messages or other things to clients.
 
 This NIP defines no rules for how `NOTICE` messages should be sent or treated.
 
 - `EVENT` messages MUST be sent only with a subscription ID related to a subscription previously initiated by the client (using the `REQ` message above).
-- `OK` messages MUST be sent in response to `EVENT` messages received from clients, they must have the 3rd parameter set to `true` when an event has been accepted by the relay, `false` otherwise. The 4th parameter MUST always be present, but MAY be an empty string when the 3rd is `true`, otherwise it MUST be a string formed by a machine-readable single-word prefix followed by a `:` and then a human-readable message. The standardized machine-readable prefixes are: `duplicate`, `pow`, `blocked`, `rate-limited`, `invalid`, and `error` for when none of that fits. Some examples:
-
+- `OK` messages MUST be sent in response to `EVENT` messages received from clients, they must have the 3rd parameter set to `true` when an event has been accepted by the relay, `false` otherwise. The 4th parameter MUST always be present, but MAY be an empty string when the 3rd is `true`, otherwise it MUST be a string formed by a machine-readable single-word prefix followed by a `:` and then a human-readable message. Some examples:
   * `["OK", "b1a649ebe8...", true, ""]`
   * `["OK", "b1a649ebe8...", true, "pow: difficulty 25>=24"]`
   * `["OK", "b1a649ebe8...", true, "duplicate: already have this event"]`
   * `["OK", "b1a649ebe8...", false, "blocked: you are banned from posting here"]`
   * `["OK", "b1a649ebe8...", false, "blocked: please register your pubkey at https://my-expensive-relay.example.com"]`
   * `["OK", "b1a649ebe8...", false, "rate-limited: slow down there chief"]`
-  * `["OK", "b1a649ebe8...", false, "invalid: event creation date is too far off from the current time. Is your system clock in sync?"]`
+  * `["OK", "b1a649ebe8...", false, "invalid: event creation date is too far off from the current time"]`
   * `["OK", "b1a649ebe8...", false, "pow: difficulty 26 is less than 30"]`
   * `["OK", "b1a649ebe8...", false, "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"]`
+- The standardized machine-readable prefixes for `OK` and `CLOSED` are: `duplicate`, `pow`, `blocked`, `rate-limited`, `invalid`, and `error` for when none of that fits.
diff --git a/42.md b/42.md
index e380e89..07a0486 100644
--- a/42.md
+++ b/42.md
@@ -12,17 +12,15 @@ This NIP defines a way for clients to authenticate to relays by signing an ephem
 
 A relay may want to require clients to authenticate to access restricted resources. For example,
 
-  - A relay may request payment or other forms of whitelisting to publish events -- this can naïvely be achieved by limiting publication
-    to events signed by the whitelisted key, but with this NIP they may choose to accept any events as long as they are published from an
-    authenticated user;
-  - A relay may limit access to `kind: 4` DMs to only the parties involved in the chat exchange, and for that it may require authentication
-    before clients can query for that kind.
+  - A relay may request payment or other forms of whitelisting to publish events -- this can naïvely be achieved by limiting publication to events signed by the whitelisted key, but with this NIP they may choose to accept any events as long as they are published from an authenticated user;
+  - A relay may limit access to `kind: 4` DMs to only the parties involved in the chat exchange, and for that it may require authentication before clients can query for that kind.
   - A relay may limit subscriptions of any kind to paying users or users whitelisted through any other means, and require authentication.
 
 ## Definitions
 
-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 is of the following form:
+### New client-relay protocol messages
+
+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 is of the following form:
 
 ```json
 ["AUTH", <challenge-string>]
@@ -34,10 +32,11 @@ And, when sent by clients, of the following form:
 ["AUTH", <signed-event-json>]
 ```
 
-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:
+`AUTH` messages sent by clients should be answered with an `OK` message, like any `EVENT` message.
+
+### Canonical authentication event
+
+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
 {
@@ -50,27 +49,49 @@ Relays MUST exclude `kind: 22242` events from being broadcasted to any client.
 }
 ```
 
+### `OK` and `CLOSED` machine-readable prefixes
+
+This NIP defines two new prefixes that can be used in `OK` (in response to event writes by clients) and `CLOSED` (in response to rejected subscriptions by clients):
+
+- `"auth-required: "` - for when a client has not performed `AUTH` and the relay requires that to fulfill the query or write the event.
+- `"restricted: "` - for when a client has already performed `AUTH` but the key used to perform it is still not allowed by the relay or is exceeding its authorization.
+
 ## Protocol flow
 
-At any moment the relay may send an `AUTH` message to the client containing a challenge. After receiving that the client may decide to
-authenticate itself or not. The challenge is expected to be valid for the duration of the connection or until a next challenge is sent by
-the relay.
+At any moment the relay may send an `AUTH` message to the client containing a challenge. The challenge is valid for the duration of the connection or until another challenge is sent by the relay. The client MAY decide to send its `AUTH` event at any point and the authenticated session is valid afterwards for the duration of the connection.
 
-The client may send an auth message right before performing an action for which it knows authentication will be required -- for example, right
-before requesting `kind: 4` chat messages --, or it may do right on connection start or at some other moment it deems best. The authentication
-is expected to last for the duration of the WebSocket connection.
+### `auth-required` in response to a `REQ` message
 
-Upon receiving a message from an unauthenticated user it can't fulfill without authentication, a relay may choose to notify the client. For
-that it can use a `NOTICE` or `OK` message with a standard prefix `"restricted: "` that is readable both by humans and machines, for example:
+Given that a relay is likely to require clients to perform authentication only for certain jobs, like answering a `REQ` or accepting an `EVENT` write, these are some expected common flows:
 
-```json
-["NOTICE", "restricted: we can't serve DMs to unauthenticated users, does your client implement NIP-42?"]
+```
+relay: ["AUTH", "<challenge>"]
+client: ["REQ", "sub_1", {"kinds": [4]}]
+relay: ["CLOSED", "sub_1", "auth-required: we can't serve DMs to unauthenticated users"]
+client: ["AUTH", {"id": "abcdef...", ...}]
+relay: ["OK", "abcdef...", true, ""]
+client: ["REQ", "sub_1", {"kinds": [4]}]
+relay: ["EVENT", "sub_1", {...}]
+relay: ["EVENT", "sub_1", {...}]
+relay: ["EVENT", "sub_1", {...}]
+relay: ["EVENT", "sub_1", {...}]
+...
 ```
 
-or it can return an `OK` message noting the reason an event was not written using the same prefix:
+In this case, the `AUTH` message from the relay could be sent right as the client connects or it can be sent immediately before the `CLOSED` is sent. The only requirement is that _the client must have a stored challenge associated with that relay_ so it can act upon that in response to the `auth-required` `CLOSED` message.
 
-```json
-["OK", <event-id>, false, "restricted: we do not accept events from unauthenticated users, please sign up at https://example.com/"]
+### `auth-required` in response to an `EVENT` message
+
+The same flow is valid for when a client wants to write an `EVENT` to the relay, except now the relay sends back an `OK` message instead of a `CLOSED` message:
+
+```
+relay: ["AUTH", "<challenge>"]
+client: ["EVENT", {"id": "012345...", ...}]
+relay: ["OK", "012345...", false, "auth-required: we only accept events from registered users"]
+client: ["AUTH", {"id": "abcdef...", ...}]
+relay: ["OK", "abcdef...", true, ""]
+client: ["EVENT", {"id": "012345...", ...}]
+relay: ["OK", "012345...", true, ""]
 ```
 
 ## Signed Event Verification
diff --git a/45.md b/45.md
index 998b952..780dfb6 100644
--- a/45.md
+++ b/45.md
@@ -27,7 +27,9 @@ In case a relay uses probabilistic counts, it MAY indicate it in the response wi
 ["COUNT", <subscription_id>, {"count": <integer>}]
 ```
 
-## Examples:
+Whenever the relay decides to refuse to fulfill the `COUNT` request, it MUST return a `CLOSED` message.
+
+## Examples
 
 ### Followers count
 
@@ -49,3 +51,10 @@ In case a relay uses probabilistic counts, it MAY indicate it in the response wi
 ["COUNT", <subscription_id>, {"kinds": [1]}]
 ["COUNT", <subscription_id>, {"count": 93412452, "approximate": true}]
 ```
+
+### Relay refuses to count
+
+```
+["COUNT", <subscription_id>, {"kinds": [4], "authors": [<pubkey>], "#p": [<pubkey>]}]
+["CLOSED", <subscription_id>, "auth-required: cannot count other people's DMs"]
+```
diff --git a/README.md b/README.md
index 68c295f..47b5986 100644
--- a/README.md
+++ b/README.md
@@ -172,6 +172,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `EVENT`  | used to send events requested to clients                | [01](01.md) |
 | `NOTICE` | used to send human-readable messages to clients         | [01](01.md) |
 | `OK`     | used to notify clients if an EVENT was successful       | [01](01.md) |
+| `CLOSED` | used to notify clients that a REQ was ended and why     | [01](01.md) |
 | `AUTH`   | used to send authentication challenges                  | [42](42.md) |
 | `COUNT`  | used to send requested event counts to clients          | [45](45.md) |
 

From 0146892501d63042d13724bae7c887bfa985e251 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 7 Dec 2023 10:01:57 -0600
Subject: [PATCH 056/263] NIP-02: Rename Contact List to Follow List

---
 02.md     | 20 ++++++++++----------
 README.md |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/02.md b/02.md
index 0653d06..8c47a5f 100644
--- a/02.md
+++ b/02.md
@@ -1,12 +1,12 @@
 NIP-02
 ======
 
-Contact List and Petnames
--------------------------
+Follow List
+-----------
 
 `final` `optional`
 
-A special event with kind `3`, meaning "contact list" is defined as having a list of `p` tags, one for each of the followed/known profiles one is following.
+A special event with kind `3`, meaning "follow list" is defined as having a list of `p` tags, one for each of the followed/known profiles one is following.
 
 Each tag entry should contain the key for the profile, a relay URL where events from that key can be found (can be set to an empty string if not needed), and a local name (or "petname") for that profile (can also be set to an empty string or not provided), i.e., `["p", <32-bytes hex key>, <main relay URL>, <petname>]`. The `content` can be anything and should be ignored.
 
@@ -25,27 +25,27 @@ For example:
 }
 ```
 
-Every new contact list that gets published overwrites the past ones, so it should contain all entries. Relays and clients SHOULD delete past contact lists as soon as they receive a new one.
+Every new following list that gets published overwrites the past ones, so it should contain all entries. Relays and clients SHOULD delete past following lists as soon as they receive a new one.
 
 ## Uses
 
-### Contact list backup
+### Follow list backup
 
 If one believes a relay will store their events for sufficient time, they can use this kind-3 event to backup their following list and recover on a different device.
 
 ### Profile discovery and context augmentation
 
-A client may rely on the kind-3 event to display a list of followed people by profiles one is browsing; make lists of suggestions on who to follow based on the contact lists of other people one might be following or browsing; or show the data in other contexts.
+A client may rely on the kind-3 event to display a list of followed people by profiles one is browsing; make lists of suggestions on who to follow based on the follow lists of other people one might be following or browsing; or show the data in other contexts.
 
 ### Relay sharing
 
-A client may publish a full list of contacts with good relays for each of their contacts so other clients may use these to update their internal relay lists if needed, increasing censorship-resistance.
+A client may publish a follow list with good relays for each of their follows so other clients may use these to update their internal relay lists if needed, increasing censorship-resistance.
 
 ### Petname scheme
 
-The data from these contact lists can be used by clients to construct local ["petname"](http://www.skyhunter.com/marcs/petnames/IntroPetNames.html) tables derived from other people's contact lists. This alleviates the need for global human-readable names. For example:
+The data from these follow lists can be used by clients to construct local ["petname"](http://www.skyhunter.com/marcs/petnames/IntroPetNames.html) tables derived from other people's follow lists. This alleviates the need for global human-readable names. For example:
 
-A user has an internal contact list that says
+A user has an internal follow list that says
 
 ```json
 [
@@ -53,7 +53,7 @@ A user has an internal contact list that says
 ]
 ```
 
-And receives two contact lists, one from `21df6d143fb96c2ec9d63726bf9edc71` that says
+And receives two follow lists, one from `21df6d143fb96c2ec9d63726bf9edc71` that says
 
 ```json
 [
diff --git a/README.md b/README.md
index 47b5986..6b83490 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 ## List
 
 - [NIP-01: Basic protocol flow description](01.md)
-- [NIP-02: Contact List and Petnames](02.md)
+- [NIP-02: Follow List](02.md)
 - [NIP-03: OpenTimestamps Attestations for Events](03.md)
 - [NIP-04: Encrypted Direct Message](04.md)
 - [NIP-05: Mapping Nostr keys to DNS-based internet identifiers](05.md)
@@ -80,7 +80,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `0`           | Metadata                   | [1](01.md)               |
 | `1`           | Short Text Note            | [1](01.md)               |
 | `2`           | Recommend Relay            |                          |
-| `3`           | Contacts                   | [2](02.md)               |
+| `3`           | Follows                    | [2](02.md)               |
 | `4`           | Encrypted Direct Messages  | [4](04.md)               |
 | `5`           | Event Deletion             | [9](09.md)               |
 | `6`           | Repost                     | [18](18.md)              |

From d0aef4c1581807a046b00396f67f3dd03cf599e8 Mon Sep 17 00:00:00 2001
From: Pablo Fernandez <p@f7z.io>
Date: Thu, 7 Dec 2023 17:01:25 +0000
Subject: [PATCH 057/263] add nip-44 calls

---
 46.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/46.md b/46.md
index ce31970..3ab71e9 100644
--- a/46.md
+++ b/46.md
@@ -84,3 +84,15 @@ The signer key will always be the key of the user who controls the signer device
 - **nip04_decrypt**
   - params: [`third-party-pubkey`, `nip04-ciphertext`]
   - result: `plaintext`
+- **nip44_get_key**
+  - params: [`third-party-pubkey`]
+  - result: `nip44-conversation-key`
+- **nip44_encrypt**
+  - params: [`third-party-pubkey`, `plaintext`]
+  - result: `nip44-ciphertext`
+- **nip44_decrypt**
+  - params: [`third-party-pubkey`, `nip44-ciphertext`]
+  - result: `plaintext`
+- **ping**
+  - params: []
+  - result: `"pong"`

From ef106ecccad2f764f80cae85f2bc666a419f9e20 Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Thu, 7 Dec 2023 21:18:45 -0300
Subject: [PATCH 058/263] nip-42 phrasing.

---
 42.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/42.md b/42.md
index 07a0486..8c70de4 100644
--- a/42.md
+++ b/42.md
@@ -20,19 +20,19 @@ A relay may want to require clients to authenticate to access restricted resourc
 
 ### New client-relay protocol messages
 
-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 is of the following form:
+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, of the following form:
+And, when sent by clients, the following form:
 
 ```json
 ["AUTH", <signed-event-json>]
 ```
 
-`AUTH` messages sent by clients should be answered with an `OK` message, like any `EVENT` message.
+`AUTH` messages sent by clients MUST be answered with an `OK` message, like any `EVENT` message.
 
 ### Canonical authentication event
 

From 7646386956927cea8be78747b1dda4fead8b1f32 Mon Sep 17 00:00:00 2001
From: zmeyer44 <54515037+zmeyer44@users.noreply.github.com>
Date: Thu, 7 Dec 2023 20:09:08 -0500
Subject: [PATCH 059/263] Create NIP 44 for Video Events

Nip for video events to enable dedicated video clients (e.g. Netflix, YouTube) to be built on nostr.
---
 44.md | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 98 insertions(+)
 create mode 100644 44.md

diff --git a/44.md b/44.md
new file mode 100644
index 0000000..c070c28
--- /dev/null
+++ b/44.md
@@ -0,0 +1,98 @@
+NIP-44
+======
+
+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).
+
+Unlike a `kind 1` event with a video attached, Video Events are meant to contain all necessary metadata concerning the media and to be surfaced in media specific clients rather than general micro-blogging clients. The thought is for events of this kind to be referenced in a YouTube like nostr client where the video itself is at the center of the experience.
+
+## Video Events
+
+#### Format
+
+The format uses a parameterized replaceable event kind `34235`.
+
+The `.content` of these events is optional and should be a summary of the video's contents.
+
+The list of tags are as follows:
+* `d` (required) universally unique identifier (UUID). Generated by the client creating the video event.
+* `title` (required) title of the video
+* `src` (required) a link to the video data
+* `m` (optional) the MIME type of the video data in the `src` tag
+* `summary` (optional) summary/description of the video (same as content)
+* `image` (optional) thumbnail or preview image for the video
+* `text-track` (optional, repeated) link to WebVTT file for video, type of supplementary information (captions/subtitles/chapters/metadata), optional language code
+* `content-warning` (optional) warning about content of NSFW video
+* `t` (optional, repeated) hashtag to categorize video
+* `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
+{
+  "id": <32-bytes lowercase hex-encoded SHA-256 of the the serialized event data>,
+  "pubkey": <32-bytes lowercase hex-encoded public key of the event creator>,
+  "created_at": <Unix timestamp in seconds>,
+  "kind": 34235,
+  "content": "<summary of video>",
+  "tags": [
+    ["d", "<UUID>"],
+
+    ["title", "<title of video>"],
+    ["summary", "<summary of video>"],
+    ["image", "<thumbnail image for video>"],
+
+    // Video Data
+    ["src", "<url>"],
+    ["m", "<MIME type>"],
+    ["text-track", "<url>", "<text track type>", "<optional language>"],
+    ["content-warning", "<reason>"],
+
+    // Participants
+    ["p", "<32-bytes hex of a pubkey>", "<optional recommended relay URL>"],
+    ["p", "<32-bytes hex of a pubkey>", "<optional recommended relay URL>"],
+
+    // Hashtags
+    ["t", "<tag>"],
+    ["t", "<tag>"],
+
+    // Reference links
+    ["r", "<url>"],
+    ["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 `34236`.
+
+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` video event being viewed
+* `d` (required) universally unique identifier. Generated by the client creating the video event view
+* `progress` (optional) timestamp of the user's progress in format `HH:MM:SS.sss`
+
+
+```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": 34236,
+  "content": "<note>",
+  "tags": [
+    ["a", "<34235>:<calendar event author pubkey>:<d-identifier of video event>", "<optional relay url>"],
+    ["d", "<UUID>"],
+    ["progress", "00:08:31.520"],
+  ]
+}
+```

From 01035dadf450085259b4b8a8728cba7a6b4e0cef Mon Sep 17 00:00:00 2001
From: zmeyer44 <54515037+zmeyer44@users.noreply.github.com>
Date: Fri, 8 Dec 2023 07:22:32 -0500
Subject: [PATCH 060/263] Update 44.md

fixing spelling error
---
 44.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/44.md b/44.md
index c070c28..0411ec4 100644
--- a/44.md
+++ b/44.md
@@ -90,7 +90,7 @@ The list of tags are as follows:
   "kind": 34236,
   "content": "<note>",
   "tags": [
-    ["a", "<34235>:<calendar event author pubkey>:<d-identifier of video event>", "<optional relay url>"],
+    ["a", "<34235>:<video event author pubkey>:<d-identifier of video event>", "<optional relay url>"],
     ["d", "<UUID>"],
     ["progress", "00:08:31.520"],
   ]

From a2914eed6d34d2e40ad2e361519bcd52300ef25e Mon Sep 17 00:00:00 2001
From: zmeyer44 <54515037+zmeyer44@users.noreply.github.com>
Date: Fri, 8 Dec 2023 09:06:14 -0500
Subject: [PATCH 061/263] Update 44.md

Adding some of Vitor's suggestions, differentiating between horizontal and vertical video kinds, changing how views are kept track of, and changing some tag names.
---
 44.md | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/44.md b/44.md
index 0411ec4..1c857c8 100644
--- a/44.md
+++ b/44.md
@@ -12,21 +12,26 @@ Unlike a `kind 1` event with a video attached, Video Events are meant to contain
 
 ## Video Events
 
+There are two types of video events represented by different kinds: horizontal and vertical video events. This is meant to allow clients to cater to each as the viewing experience for horizontal (landscape) videos is often different than that of vertical (portrait) videos (Stories, Reels, Shorts, etc).
+
 #### Format
 
-The format uses a parameterized replaceable event kind `34235`.
+The format uses a parameterized replaceable event kind `34235` for horizontal videos and `34236` for vertical videos.
 
 The `.content` of these events is optional and should be a summary of the video's contents.
 
 The list of tags are as follows:
 * `d` (required) universally unique identifier (UUID). Generated by the client creating the video event.
 * `title` (required) title of the video
-* `src` (required) a link to the video data
+* `url` (required) a link to the video data
 * `m` (optional) the MIME type of the video data in the `src` tag
 * `summary` (optional) summary/description of the video (same as content)
-* `image` (optional) thumbnail or preview image for the video
+* `image` (optional) url of preview image with same dimensions
+* `thumb` (optional) url of thumbnail with same aspect ratio
+* `dim` (optional) size of file in pixels in the form <width>x<height>
 * `text-track` (optional, repeated) link to WebVTT file for video, type of supplementary information (captions/subtitles/chapters/metadata), optional language code
 * `content-warning` (optional) warning about content of NSFW video
+* `alt` (optional) description for accessibility
 * `t` (optional, repeated) hashtag to categorize video
 * `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.
@@ -36,20 +41,23 @@ The list of tags are as follows:
   "id": <32-bytes lowercase hex-encoded SHA-256 of the the serialized event data>,
   "pubkey": <32-bytes lowercase hex-encoded public key of the event creator>,
   "created_at": <Unix timestamp in seconds>,
-  "kind": 34235,
+  "kind": 34235 | 34236,
   "content": "<summary of video>",
   "tags": [
     ["d", "<UUID>"],
 
     ["title", "<title of video>"],
     ["summary", "<summary of video>"],
-    ["image", "<thumbnail image for video>"],
+    ["thumb", "<thumbnail image for video>"],
+    ["image", "<preview image for video>"],
+    ["alt", <description>],
 
     // Video Data
-    ["src", "<url>"],
+    ["url", "<url>"],
     ["m", "<MIME type>"],
     ["text-track", "<url>", "<text track type>", "<optional language>"],
     ["content-warning", "<reason>"],
+    ["dim", <size of video in pixels>],
 
     // Participants
     ["p", "<32-bytes hex of a pubkey>", "<optional recommended relay URL>"],
@@ -72,14 +80,14 @@ A video event view is a response to a video event to track a user's view or prog
 
 ### Format
 
-The format uses a parameterized replaceable event kind `34236`.
+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` video event being viewed
-* `d` (required) universally unique identifier. Generated by the client creating the video event view
-* `progress` (optional) timestamp of the user's progress in format `HH:MM:SS.sss`
+* `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 `HH:MM:SS.sss`, timestamp of the user's end time in `HH:MM:SS.sss` 
 
 
 ```json
@@ -87,12 +95,12 @@ The list of tags are as follows:
   "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": 34236,
+  "kind": 34237,
   "content": "<note>",
   "tags": [
-    ["a", "<34235>:<video event author pubkey>:<d-identifier of video event>", "<optional relay url>"],
-    ["d", "<UUID>"],
-    ["progress", "00:08:31.520"],
+    ["a", "<34235 | 34236>:<video event author pubkey>:<d-identifier of video event>", "<optional relay url>"],
+    ["d", "<34235 | 34236>:<video event author pubkey>:<d-identifier of video event>"],
+    ["viewed", <start>, <end>],
   ]
 }
 ```

From ae0fd96907d0767f07fb54ca1de9f197c600cb27 Mon Sep 17 00:00:00 2001
From: Daniel Cadenas <dcadenas@gmail.com>
Date: Fri, 8 Dec 2023 13:19:54 -0300
Subject: [PATCH 062/263] Fix Authorization header string

The previous auth header was for an event in which the tag is `url` instead of `u` so it was not matching the event provided as an example
---
 98.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/98.md b/98.md
index ca52304..be425b2 100644
--- a/98.md
+++ b/98.md
@@ -55,7 +55,8 @@ Using the `Authorization` HTTP header, the `kind 27235` event MUST be `base64` e
 
 Example HTTP Authorization header:
 ```
-Authorization: Nostr eyJpZCI6ImZlOTY0ZTc1ODkwMzM2MGYyOGQ4NDI0ZDA5MmRhODQ5NGVkMjA3Y2JhODIzMTEwYmUzYTU3ZGZlNGI1Nzg3MzQiLCJwdWJrZXkiOiI2M2ZlNjMxOGRjNTg1ODNjZmUxNjgxMGY4NmRkMDllMThiZmQ3NmFhYmMyNGEwMDgxY2UyODU2ZjMzMDUwNGVkIiwiY29udGVudCI6IiIsImtpbmQiOjI3MjM1LCJjcmVhdGVkX2F0IjoxNjgyMzI3ODUyLCJ0YWdzIjpbWyJ1cmwiLCJodHRwczovL2FwaS5zbm9ydC5zb2NpYWwvYXBpL3YxL241c3AvbGlzdCJdLFsibWV0aG9kIiwiR0VUIl1dLCJzaWciOiI1ZWQ5ZDhlYzk1OGJjODU0Zjk5N2JkYzI0YWMzMzdkMDA1YWYzNzIzMjQ3NDdlZmU0YTAwZTI0ZjRjMzA0MzdmZjRkZDgzMDg2ODRiZWQ0NjdkOWQ2YmUzZTVhNTE3YmI0M2IxNzMyY2M3ZDMzOTQ5YTNhYWY4NjcwNWMyMjE4NCJ9
+Authorization: Nostr 
+eyJpZCI6ImZlOTY0ZTc1ODkwMzM2MGYyOGQ4NDI0ZDA5MmRhODQ5NGVkMjA3Y2JhODIzMTEwYmUzYTU3ZGZlNGI1Nzg3MzQiLCJwdWJrZXkiOiI2M2ZlNjMxOGRjNTg1ODNjZmUxNjgxMGY4NmRkMDllMThiZmQ3NmFhYmMyNGEwMDgxY2UyODU2ZjMzMDUwNGVkIiwiY29udGVudCI6IiIsImtpbmQiOjI3MjM1LCJjcmVhdGVkX2F0IjoxNjgyMzI3ODUyLCJ0YWdzIjpbWyJ1IiwiaHR0cHM6Ly9hcGkuc25vcnQuc29jaWFsL2FwaS92MS9uNXNwL2xpc3QiXSxbIm1ldGhvZCIsIkdFVCJdXSwic2lnIjoiNWVkOWQ4ZWM5NThiYzg1NGY5OTdiZGMyNGFjMzM3ZDAwNWFmMzcyMzI0NzQ3ZWZlNGEwMGUyNGY0YzMwNDM3ZmY0ZGQ4MzA4Njg0YmVkNDY3ZDlkNmJlM2U1YTUxN2JiNDNiMTczMmNjN2QzMzk0OWEzYWFmODY3MDVjMjIxODQifQ
 ```
 
 ## Reference Implementations

From b8308a9a040005c7a06369d6f71a6f2db6ee9c92 Mon Sep 17 00:00:00 2001
From: Terry Yiu <963907+tyiu@users.noreply.github.com>
Date: Sun, 3 Dec 2023 10:29:59 +0000
Subject: [PATCH 063/263] Amend NIP-52 to require the content field to be
 provided, and decouple calendar identifier from calendar name

---
 52.md | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/52.md b/52.md
index 15cc8fc..71b1df2 100644
--- a/52.md
+++ b/52.md
@@ -22,14 +22,14 @@ This kind of calendar event starts on a date and ends before a different date in
 
 The format uses a parameterized replaceable event kind `31922`.
 
-The `.content` of these events is optional and should be a detailed description of the calendar event.
+The `.content` of these events should be a detailed description of the calendar event. It is required but can be an empty string.
 
 The list of tags are as follows:
 * `d` (required) universally unique identifier (UUID). Generated by the client creating the calendar event.
 * `name` (required) name of the calendar event
 * `start` (required) inclusive start date in ISO 8601 format (YYYY-MM-DD). Must be less than `end`, if it exists.
 * `end` (optional) exclusive end date in ISO 8601 format (YYYY-MM-DD). If omitted, the calendar event ends on the same date as `start`.
-* `location` (optional) location of the calendar event. e.g. address, GPS coordinates, meeting room name, link to video call
+* `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
 * `t` (optional, repeated) hashtag to categorize calendar event
@@ -78,7 +78,7 @@ This kind of calendar event spans between a start time and end time.
 
 The format uses a parameterized replaceable event kind `31923`.
 
-The `.content` of these events is optional and should be a detailed description of the calendar event.
+The `.content` of these events should be a detailed description of the calendar event. It is required but can be an empty string.
 
 The list of tags are as follows:
 * `d` (required) universally unique identifier (UUID). Generated by the client creating the calendar event.
@@ -87,7 +87,7 @@ 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.
-* `location` (optional) location of the calendar event. e.g. address, GPS coordinates, meeting room name, link to video call
+* `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
 * `t` (optional, repeated) hashtag to categorize calendar event
@@ -137,15 +137,23 @@ A calendar is a collection of calendar events, represented as a custom replaceab
 
 ### Format
 
+The `.content` of these events should be a detailed description of the calendar. It is required but can be an empty string.
+
 The format uses a custom replaceable list of kind `31924` with a list of tags as described below:
-* `d` (required) calendar name
+* `d` (required) universally unique identifier. Generated by the client creating the calendar.
+* `name` (required) calendar name
 * `a` (repeated) reference tag to kind `31922` or `31923` calendar event being responded to
 
 ```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": 31924,
+  "content": "<description of calendar>",
   "tags": [
-    ["d", "<calendar name>"],
+    ["d", "<UUID>"],
+    ["name", "<calendar name>"],
     ["a", "<31922 or 31923>:<calendar event author pubkey>:<d-identifier of calendar event>", "<optional relay url>"],
     ["a", "<31922 or 31923>:<calendar event author pubkey>:<d-identifier of calendar event>", "<optional relay url>"]
   ]

From ec08d65665fd533be685702501b69fe9ce7bdd24 Mon Sep 17 00:00:00 2001
From: Terry Yiu <963907+tyiu@users.noreply.github.com>
Date: Fri, 8 Dec 2023 09:59:44 -0800
Subject: [PATCH 064/263] Deprecate 'name' for 'title' on calendar events and
 add 'title' as a shared tag via NIP-24

---
 24.md |  1 +
 52.md | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/24.md b/24.md
index f830b68..d444a4b 100644
--- a/24.md
+++ b/24.md
@@ -39,3 +39,4 @@ 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`: title of the event
diff --git a/52.md b/52.md
index 71b1df2..4ec6836 100644
--- a/52.md
+++ b/52.md
@@ -26,7 +26,7 @@ The `.content` of these events should be a detailed description of the calendar
 
 The list of tags are as follows:
 * `d` (required) universally unique identifier (UUID). Generated by the client creating the calendar event.
-* `name` (required) name of the calendar event
+* `title` (required) title of the calendar event
 * `start` (required) inclusive start date in ISO 8601 format (YYYY-MM-DD). Must be less than `end`, if it exists.
 * `end` (optional) exclusive end date in ISO 8601 format (YYYY-MM-DD). If omitted, the calendar event ends on the same date as `start`.
 * `location` (optional, repeated) location of the calendar event. e.g. address, GPS coordinates, meeting room name, link to video call
@@ -35,6 +35,9 @@ The list of tags are as follows:
 * `t` (optional, repeated) hashtag to categorize calendar event
 * `r` (optional, repeated) references / links to web pages, documents, video calls, recorded videos, etc.
 
+The following tags are deprecated:
+* `name` name of the calendar event. Use only if `title` is not available.
+
 ```json
 {
   "id": <32-bytes lowercase hex-encoded SHA-256 of the the serialized event data>,
@@ -45,7 +48,7 @@ The list of tags are as follows:
   "tags": [
     ["d", "<UUID>"],
 
-    ["name", "<name of calendar event>"],
+    ["title", "<title of calendar event>"],
 
     // Dates
     ["start", "<YYYY-MM-DD>"],
@@ -82,7 +85,7 @@ The `.content` of these events should be a detailed description of the calendar
 
 The list of tags are as follows:
 * `d` (required) universally unique identifier (UUID). Generated by the client creating the calendar event.
-* `name` (required) name of the calendar event
+* `title` (required) title of the calendar event
 * `start` (required) inclusive start Unix timestamp in seconds. Must be less than `end`, if it exists.
 * `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`
@@ -93,6 +96,9 @@ The list of tags are as follows:
 * `t` (optional, repeated) hashtag to categorize calendar event
 * `r` (optional, repeated) references / links to web pages, documents, video calls, recorded videos, etc.
 
+The following tags are deprecated:
+* `name` name of the calendar event. Use only if `title` is not available.
+
 ```json
 {
   "id": <32-bytes lowercase hex-encoded SHA-256 of the the serialized event data>,
@@ -103,7 +109,7 @@ The list of tags are as follows:
   "tags": [
     ["d", "<UUID>"],
 
-    ["name", "<name of calendar event>"],
+    ["title", "<title of calendar event>"],
 
     // Timestamps
     ["start", "<Unix timestamp in seconds>"],
@@ -141,7 +147,7 @@ The `.content` of these events should be a detailed description of the calendar.
 
 The format uses a custom replaceable list of kind `31924` with a list of tags as described below:
 * `d` (required) universally unique identifier. Generated by the client creating the calendar.
-* `name` (required) calendar name
+* `title` (required) calendar title
 * `a` (repeated) reference tag to kind `31922` or `31923` calendar event being responded to
 
 ```json
@@ -153,7 +159,7 @@ The format uses a custom replaceable list of kind `31924` with a list of tags as
   "content": "<description of calendar>",
   "tags": [
     ["d", "<UUID>"],
-    ["name", "<calendar name>"],
+    ["title", "<calendar title>"],
     ["a", "<31922 or 31923>:<calendar event author pubkey>:<d-identifier of calendar event>", "<optional relay url>"],
     ["a", "<31922 or 31923>:<calendar event author pubkey>:<d-identifier of calendar event>", "<optional relay url>"]
   ]

From cec99e7b13a823d08527790bd46297d545ddb881 Mon Sep 17 00:00:00 2001
From: zmeyer44 <54515037+zmeyer44@users.noreply.github.com>
Date: Sat, 9 Dec 2023 12:55:25 -0500
Subject: [PATCH 065/263] Update 44.md

Updating to reference NIP-94 file metadata event
---
 44.md | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/44.md b/44.md
index 1c857c8..4a80c63 100644
--- a/44.md
+++ b/44.md
@@ -6,9 +6,9 @@ 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 _parameterized replaceable_ and deletable per [NIP-09](09.md). The content of a video event is the stringified JSON of a `kind 1063` File metadata event as described in [NIP-94](94.md).
 
-Unlike a `kind 1` event with a video attached, Video Events are meant to contain all necessary metadata concerning the media and to be surfaced in media specific clients rather than general micro-blogging clients. The thought is for events of this kind to be referenced in a YouTube like nostr client where the video itself is at the center of the experience.
+Unlike a `kind 1` event with a video attached, Video Events are meant to contain all additional metadata concerning the subject media and to be surfaced in video-specific clients rather than general micro-blogging clients. The thought is for events of this kind to be referenced in a Netflix, YouTube, or TikTok like nostr client where the video itself is at the center of the experience.
 
 ## Video Events
 
@@ -18,23 +18,20 @@ There are two types of video events represented by different kinds: horizontal a
 
 The format uses a parameterized replaceable event kind `34235` for horizontal videos and `34236` for vertical videos.
 
-The `.content` of these events is optional and should be a summary of the video's contents.
+The `.content` of these events is the stringified JSON of a `kind 1063` file metadata event.
 
 The list of tags are as follows:
 * `d` (required) universally unique identifier (UUID). Generated by the client creating the video event.
+* `e` (required, repeated) reference tag to kind 1063 file metadata event being posted, optional relay information for the file metadata event, optional quality value (low|medium|high)
 * `title` (required) title of the video
-* `url` (required) a link to the video data
-* `m` (optional) the MIME type of the video data in the `src` tag
 * `summary` (optional) summary/description of the video (same as content)
-* `image` (optional) url of preview image with same dimensions
-* `thumb` (optional) url of thumbnail with same aspect ratio
-* `dim` (optional) size of file in pixels in the form <width>x<height>
+* `url` (optional) a default link to the video data
 * `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
 * `content-warning` (optional) warning about content of NSFW video
-* `alt` (optional) description for accessibility
 * `t` (optional, repeated) hashtag to categorize video
 * `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.
+* `r` (optional, repeated) references / links to web pages
 
 ```json
 {
@@ -42,22 +39,19 @@ The list of tags are as follows:
   "pubkey": <32-bytes lowercase hex-encoded public key of the event creator>,
   "created_at": <Unix timestamp in seconds>,
   "kind": 34235 | 34236,
-  "content": "<summary of video>",
+  "content": "<stringified JSON of kind 1063 event>",
   "tags": [
     ["d", "<UUID>"],
+    ["e", "<hex-id>", "<relay-url>", "<optional quality value>"],
 
     ["title", "<title of video>"],
     ["summary", "<summary of video>"],
     ["thumb", "<thumbnail image for video>"],
-    ["image", "<preview image for video>"],
-    ["alt", <description>],
 
     // Video Data
-    ["url", "<url>"],
-    ["m", "<MIME type>"],
+    ["url", "<optional recommended url>"]
     ["text-track", "<url>", "<text track type>", "<optional language>"],
     ["content-warning", "<reason>"],
-    ["dim", <size of video in pixels>],
 
     // Participants
     ["p", "<32-bytes hex of a pubkey>", "<optional recommended relay URL>"],

From 7afd1049d98a82aa7754f80de80d97dd686cf40e Mon Sep 17 00:00:00 2001
From: zmeyer44 <54515037+zmeyer44@users.noreply.github.com>
Date: Sat, 9 Dec 2023 17:46:53 -0500
Subject: [PATCH 066/263] Update and rename 44.md to 71.md

Changing to NIP-71
---
 44.md => 71.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename 44.md => 71.md (99%)

diff --git a/44.md b/71.md
similarity index 99%
rename from 44.md
rename to 71.md
index 4a80c63..39d6cc8 100644
--- a/44.md
+++ b/71.md
@@ -1,4 +1,4 @@
-NIP-44
+NIP-71
 ======
 
 Video Events

From c84d40f4a6dc39b1d420cdbaf75882ec0b78d478 Mon Sep 17 00:00:00 2001
From: zmeyer44 <54515037+zmeyer44@users.noreply.github.com>
Date: Tue, 12 Dec 2023 11:19:57 -0500
Subject: [PATCH 067/263] Update 71.md

Co-authored-by: Pablo Fernandez <pfer@me.com>
---
 71.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/71.md b/71.md
index 39d6cc8..a18f277 100644
--- a/71.md
+++ b/71.md
@@ -24,7 +24,7 @@ The list of tags are as follows:
 * `d` (required) universally unique identifier (UUID). Generated by the client creating the video event.
 * `e` (required, repeated) reference tag to kind 1063 file metadata event being posted, optional relay information for the file metadata event, optional quality value (low|medium|high)
 * `title` (required) title of the video
-* `summary` (optional) summary/description of the video (same as content)
+* `summary` (optional) summary/description of the video
 * `url` (optional) a default link to the video data
 * `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

From d53f6fba1510db7ad7440ca0c93429a88f1c6fa9 Mon Sep 17 00:00:00 2001
From: zmeyer44 <54515037+zmeyer44@users.noreply.github.com>
Date: Tue, 12 Dec 2023 13:56:28 -0500
Subject: [PATCH 068/263] Update 71.md

After discussing with Pablo, we decided to move away from relying on kind 1063 events and instead use the majority of the same tags for video events. The main motivations behind this are to allow for parameterized replaceable events for video events, prevent excessive `REQ` requests, not stringify event JSON in the `.content` section, ease of filtering by kind number, as well as some others. Happy to discuss this further.
---
 71.md | 37 ++++++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/71.md b/71.md
index a18f277..6d6775a 100644
--- a/71.md
+++ b/71.md
@@ -6,7 +6,7 @@ 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). The content of a video event is the stringified JSON of a `kind 1063` File metadata event as described in [NIP-94](94.md).
+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).
 
 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.
 
@@ -18,17 +18,27 @@ There are two types of video events represented by different kinds: horizontal a
 
 The format uses a parameterized replaceable event kind `34235` for horizontal videos and `34236` for vertical videos.
 
-The `.content` of these events is the stringified JSON of a `kind 1063` file metadata event.
+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.
-* `e` (required, repeated) reference tag to kind 1063 file metadata event being posted, optional relay information for the file metadata event, optional quality value (low|medium|high)
+* `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.
 * `title` (required) title of the video
-* `summary` (optional) summary/description of the video
-* `url` (optional) a default link to the video data
+* `"published_at"`, for the timestamp in unix seconds (stringified) of the first time the video was published
+* `summary` (optional) summary/description of the video (same as `.content`)
+* `"aes-256-gcm"` (optional)  key and nonce for AES-GCM encryption with tagSize always 128bits
+* `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>`
+* `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
 * `t` (optional, repeated) hashtag to categorize video
 * `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
@@ -39,18 +49,27 @@ The list of tags are as follows:
   "pubkey": <32-bytes lowercase hex-encoded public key of the event creator>,
   "created_at": <Unix timestamp in seconds>,
   "kind": 34235 | 34236,
-  "content": "<stringified JSON of kind 1063 event>",
+  "content": "<summary / description of video>",
   "tags": [
     ["d", "<UUID>"],
-    ["e", "<hex-id>", "<relay-url>", "<optional quality value>"],
 
     ["title", "<title of video>"],
     ["summary", "<summary of video>"],
     ["thumb", "<thumbnail image for video>"],
+    ["published_at", "<unix timestamp>"],
+    ["alt", <description>],
 
     // Video Data
-    ["url", "<optional recommended url>"]
-    ["text-track", "<url>", "<text track type>", "<optional language>"],
+    ["url",<string with URI of file>],
+    ["m", <MIME type>],
+    ["x",<Hash SHA-256>],
+    ["aes-256-gcm",<key>, <iv>],
+    ["size", <size of file in bytes>],
+    ["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>"],
 
     // Participants

From 2bd3c7400293c7e142fc68bc8d58176cecb9ab2d Mon Sep 17 00:00:00 2001
From: zmeyer44 <54515037+zmeyer44@users.noreply.github.com>
Date: Tue, 12 Dec 2023 14:01:51 -0500
Subject: [PATCH 069/263] Update 71.md

Adding segments
---
 71.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/71.md b/71.md
index 6d6775a..0a60d61 100644
--- a/71.md
+++ b/71.md
@@ -39,6 +39,7 @@ The list of tags are as follows:
 * `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
 * `t` (optional, repeated) hashtag to categorize video
 * `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
@@ -71,6 +72,7 @@ The list of tags are as follows:
     ["i",<torrent infohash>],
     ["text-track", "<encoded `kind 6000` event>", "<recommended relay urls>"],
     ["content-warning", "<reason>"],
+    ["segment", <start>, <end>, "<title>", "<thumbnail URL>"],
 
     // Participants
     ["p", "<32-bytes hex of a pubkey>", "<optional recommended relay URL>"],

From 822b70a565678222706dd6284eb7abcaadfc5115 Mon Sep 17 00:00:00 2001
From: Paul Miller <paul@paulmillr.com>
Date: Wed, 20 Dec 2023 13:22:02 +0100
Subject: [PATCH 070/263] NIP44 encryption standard, revision 3 (#746)

* Introduce NIP-44 encryption standard

* Finalize NIP-44

* Update spec.

---------

Co-authored-by: Jonathan Staab <shtaab@gmail.com>
---
 04.md     |   4 +-
 07.md     |   6 +-
 44.md     | 296 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 46.md     |   1 +
 README.md |   3 +-
 5 files changed, 306 insertions(+), 4 deletions(-)
 create mode 100644 44.md

diff --git a/04.md b/04.md
index bf6767b..dc232b4 100644
--- a/04.md
+++ b/04.md
@@ -1,10 +1,12 @@
+> __Warning__  `unrecommended`: deprecated in favor of [NIP-44](44.md)
+
 NIP-04
 ======
 
 Encrypted Direct Message
 ------------------------
 
-`final` `optional`
+`final` `unrecommended` `optional`
 
 A special event with kind `4`, meaning "encrypted direct message". It is supposed to have the following attributes:
 
diff --git a/07.md b/07.md
index aa0a5f4..6db0597 100644
--- a/07.md
+++ b/07.md
@@ -18,8 +18,10 @@ async window.nostr.signEvent(event: { created_at: number, kind: number, tags: st
 Aside from these two basic above, the following functions can also be implemented optionally:
 ```
 async window.nostr.getRelays(): { [url: string]: {read: boolean, write: boolean} } // returns a basic map of relay urls to relay policies
-async window.nostr.nip04.encrypt(pubkey, plaintext): string // returns ciphertext and iv as specified in nip-04
-async window.nostr.nip04.decrypt(pubkey, ciphertext): string // takes ciphertext and iv as specified in nip-04
+async window.nostr.nip04.encrypt(pubkey, plaintext): string // returns ciphertext and iv as specified in nip-04 (deprecated)
+async window.nostr.nip04.decrypt(pubkey, ciphertext): string // takes ciphertext and iv as specified in nip-04 (deprecated)
+async window.nostr.nip44.encrypt(sender_privkey, recipient_pubkey, plaintext, version): string // returns encrypted payload as specified in nip-44
+async window.nostr.nip44.decrypt(recipient_privkey, sender_pubkey, payload): string // takes encrypted payload as specified in nip-44
 ```
 
 ### Implementation
diff --git a/44.md b/44.md
new file mode 100644
index 0000000..1282d26
--- /dev/null
+++ b/44.md
@@ -0,0 +1,296 @@
+# NIP-44
+
+## Encrypted Payloads (Versioned)
+
+`optional` `author:paulmillr` `author:staab`
+
+The NIP introduces a new data format for keypair-based encryption. This NIP is versioned
+to allow multiple algorithm choices to exist simultaneously.
+
+Nostr is a key directory. Every nostr user has their own public key, which solves key
+distribution problems present in other solutions. The goal of this NIP is to have a
+simple way to send messages between nostr accounts that cannot be read by everyone.
+
+The scheme has a number of important shortcomings:
+
+- No deniability: it is possible to prove the event was signed by a particular key
+- No forward secrecy: when a user key is compromised, it is possible to decrypt all previous conversations
+- No post-compromise security: when a user key is compromised, it is possible to decrypt all future conversations
+- No post-quantum security: a powerful quantum computer would be able to decrypt the messages
+- IP address leak: user IP may be seen by relays and all intermediaries between user and relay
+- Date leak: the message date is public, since it is a part of NIP 01 event
+- Limited message size leak: padding only partially obscures true message length
+- No attachments: they are not supported
+
+Lack of forward secrecy is partially mitigated: 1) the messages
+should only be stored on relays, specified by the user, instead of a set of
+all public relays 2) the relays are supposed to regularly delete older messages.
+
+For risky situations, users should chat in specialized E2EE messaging software and limit use
+of nostr to exchanging contacts.
+
+## Dependence on NIP-01
+
+It's not enough to use NIP-44 for encryption: the output must also be signed.
+
+In nostr case, the payload is serialized and signed as per NIP-01 rules.
+
+The same event can be serialized in two different ways,
+resulting in two distinct signatures. So, it's important
+to ensure serialization rules, which are defined in NIP-01,
+are the same across different NIP-44 implementations.
+
+After serialization, the event is signed by Schnorr signature over secp256k1,
+defined in BIP340. It's important to ensure the key and signature validity as
+per BIP340 rules.
+
+## Versions
+
+Currently defined encryption algorithms:
+
+- `0x00` - Reserved
+- `0x01` - Deprecated and undefined
+- `0x02` - secp256k1 ECDH, HKDF, padding, ChaCha20, HMAC-SHA256, base64
+
+## Version 2
+
+The algorithm choices are justified in a following way:
+
+- Encrypt-then-mac-then-sign instead of encrypt-then-sign-then-mac:
+  only events wrapped in NIP-01 signed envelope are currently accepted by nostr.
+- ChaCha instead of AES: it's faster and has
+  [better security against multi-key attacks](https://datatracker.ietf.org/doc/draft-irtf-cfrg-aead-limits/)
+- ChaCha instead of XChaCha: XChaCha has not been standardized. Also, we don't need xchacha's improved
+  collision resistance of nonces: every message has a new (key, nonce) pair.
+- HMAC-SHA256 instead of Poly1305: polynomial MACs are much easier to forge
+- SHA256 instead of SHA3 or BLAKE: it is already used in nostr. Also blake's
+  speed advantage is smaller in non-parallel environments
+- Custom padding instead of padmé: better leakage reduction for small messages
+- Base64 encoding instead of an other compression algorithm: it is widely available,
+  and is already used in nostr
+
+### Functions and operations
+
+- Cryptographic methods
+  - `secure_random_bytes(length)` fetches randomness from CSPRNG
+  - `hkdf(IKM, salt, info, L)` represents HKDF [(RFC 5869)](https://datatracker.ietf.org/doc/html/rfc5869) with SHA256 hash function,
+    comprised of methods `hkdf_extract(IKM, salt)` and `hkdf_expand(OKM, info, L)`
+  - `chacha20(key, nonce, data)` is ChaCha20 [(RFC 8439)](https://datatracker.ietf.org/doc/html/rfc8439), with starting counter set to 0
+  - `hmac_sha256(key, message)` is HMAC [(RFC 2104)](https://datatracker.ietf.org/doc/html/rfc2104)
+  - `secp256k1_ecdh(priv_a, pub_b)` is multiplication of point B by
+    scalar a (`a ⋅ B`), defined in
+    [BIP340](https://github.com/bitcoin/bips/blob/e918b50731397872ad2922a1b08a5a4cd1d6d546/bip-0340.mediawiki).
+    The operation produces 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]`
+- 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`
+- Constants `c`:
+  - `min_plaintext_size` is 1. 1b msg is padded to 32b.
+  - `max_plaintext_size` is 65535 (64kb - 1). It is padded to 65536.
+- Functions
+  - `base64_encode(string)` and `base64_decode(bytes)` are Base64 ([RFC 4648](https://datatracker.ietf.org/doc/html/rfc4648), with padding)
+  - `concat` refers to byte array concatenation
+  - `is_equal_ct(a, b)` is constant-time equality check of 2 byte arrays
+  - `utf8_encode(string)` and `utf8_decode(bytes)` transform string to byte array and back
+  - `write_u8(number)` restricts number to values 0..255 and encodes into Big-Endian uint8 byte array
+  - `write_u16_be(number)` restricts number to values 0..65535 and encodes into Big-Endian uint16 byte array
+  - `zeros(length)` creates byte array of length `length >= 0`, filled with zeros
+  - `floor(number)` and `log2(number)` are well-known mathematical methods
+
+User-defined functions:
+
+```py
+# Calculates length of the padded byte array.
+def calc_padded_len(unpadded_len):
+  next_power = 1 << (floor(log2(unpadded_len - 1))) + 1
+  if next_power <= 256:
+    chunk = 32
+  else:
+    chunk = next_power / 8
+  if unpadded_len <= 32:
+    return 32
+  else:
+    return chunk * (floor((len - 1) / chunk) + 1)
+
+# Converts unpadded plaintext to padded bytearray
+def pad(plaintext):
+  unpadded = utf8_encode(plaintext)
+  unpadded_len = len(plaintext)
+  if (unpadded_len < c.min_plaintext_size or
+      unpadded_len > c.max_plaintext_size): raise Exception('invalid plaintext length')
+  prefix = write_u16_be(unpadded_len)
+  suffix = zeros(calc_padded_len(unpadded_len) - unpadded_len)
+  return concat(prefix, unpadded, suffix)
+
+# Converts padded bytearray to unpadded plaintext
+def unpad(padded):
+  unpadded_len = read_uint16_be(padded[0:2])
+  unpadded = padded[2:2+unpadded_len]
+  if (unpadded_len == 0 or
+      len(unpadded) != unpadded_len or
+      len(padded) != 2 + calc_padded_len(unpadded_len)): raise Exception('invalid padding')
+  return utf8_decode(unpadded)
+
+# metadata: always 65b (version: 1b, nonce: 32b, max: 32b)
+# plaintext: 1b to 0xffff
+# padded plaintext: 32b to 0xffff
+# ciphertext: 32b+2 to 0xffff+2
+# raw payload: 99 (65+32+2) to 65603 (65+0xffff+2)
+# compressed payload (base64): 132b to 87472b
+def decode_payload(payload):
+  plen = len(payload)
+  if plen == 0 or payload[0] == '#': raise Exception('unknown version')
+  if plen < 132 or plen > 87472: raise Exception('invalid payload size')
+  data = base64_decode(payload)
+  dlen = len(d)
+  if dlen < 99 or dlen > 65603: raise Exception('invalid data size');
+  vers = data[0]
+  if vers != 2: raise Exception('unknown version ' + vers)
+  nonce = data[1:33]
+  ciphertext = data[33:dlen - 32]
+  mac = data[dlen - 32:dlen]
+  return (nonce, ciphertext, mac)
+
+def hmac_aad(key, message, aad):
+  if len(aad) != 32: raise Exception('AAD associated data must be 32 bytes');
+  return hmac(sha256, key, concat(aad, message));
+
+# Calculates long-term key between users A and B: `get_key(Apriv, Bpub) == get_key(Bpriv, Apub)`
+def get_conversation_key(private_key_a, public_key_b):
+  shared_x = secp256k1_ecdh(private_key_a, public_key_b)
+  return hkdf_extract(IKM=shared_x, salt=utf8_encode('nip44-v2'))
+
+# Calculates unique per-message key
+def get_message_keys(conversation_key, nonce):
+  if len(conversation_key) != 32: raise Exception('invalid conversation_key length')
+  if len(nonce) != 32: raise Exception('invalid nonce length')
+  keys = hkdf_expand(OKM=conversation_key, info=nonce, L=76)
+  chacha_key = keys[0:32]
+  chacha_nonce = keys[32:44]
+  hmac_key = keys[44:76]
+  return (chacha_key, chacha_nonce, hmac_key)
+
+def encrypt(plaintext, conversation_key, nonce):
+  (chacha_key, chacha_nonce, hmac_key) = get_message_keys(conversation_key, nonce)
+  padded = pad(plaintext)
+  ciphertext = chacha20(key=chacha_key, nonce=chacha_nonce, data=padded)
+  mac = hmac_aad(key=hmac_key, message=ciphertext, aad=nonce)
+  return base64_encode(concat(write_u8(2), nonce, ciphertext, mac))
+
+def decrypt(payload, conversation_key):
+  (nonce, ciphertext, mac) = decode_payload(payload)
+  (chacha_key, chacha_nonce, hmac_key) = get_message_keys(conversation_key, nonce)
+  calculated_mac = hmac_aad(key=hmac_key, message=ciphertext, aad=nonce)
+  if not is_equal_ct(calculated_mac, mac): raise Exception('invalid MAC')
+  padded_plaintext = chacha20(key=chacha_key, nonce=chacha_nonce, data=ciphertext)
+  return unpad(padded_plaintext)
+
+# Usage:
+#   conversation_key = get_conversation_key(sender_privkey, recipient_pubkey)
+#   nonce = secure_random_bytes(32)
+#   payload = encrypt('hello world', conversation_key, nonce)
+#   'hello world' == decrypt(payload, conversation_key)
+```
+
+#### Encryption
+
+1. Calculate conversation key
+   - Execute ECDH (scalar multiplication) of public key B by private key A.
+     Output `shared_x` must be unhashed, 32-byte encoded x coordinate of the shared point.
+   - Use HKDF-extract with sha256, `IKM=shared_x` and `salt=utf8_encode('nip44-v2')`
+   - HKDF output will be `conversation_key` between two users
+   - It is always the same, when key roles are swapped: `conv(a, B) == conv(b, A)`
+2. Generate random 32-byte nonce
+   - Always use [CSPRNG](https://en.wikipedia.org/wiki/Cryptographically_secure_pseudorandom_number_generator)
+   - Don't generate nonce from message content
+   - Don't re-use the same nonce between messages: doing so would make them decryptable,
+     but won't leak long-term key
+3. Calculate message keys
+   - The keys are generated from `conversation_key` and `nonce`. Validate that both are 32 bytes
+   - Use HKDF-expand, with sha256, `OKM=conversation_key`, `info=nonce` and `L=76`
+   - Slice 76-byte HKDF output into: `chacha_key` (bytes 0..32), `chacha_nonce` (bytes 32..44), `hmac_key` (bytes 44..76)
+4. Add padding
+   - Content must be encoded from UTF-8 into byte array
+   - Validate plaintext length. Minimum is 1 byte, maximum is 65535 bytes
+   - Padding format is: `[plaintext_length: u16][plaintext][zero_bytes]`
+   - Padding algorithm is related to powers-of-two, with min padded msg size of 32
+   - Plaintext length is encoded in big-endian as first 2 bytes of the padded blob
+5. Encrypt padded content
+   - Use ChaCha20, with key and nonce from step 3
+6. Calculate MAC (message authentication code) with AAD
+   - AAD is used: instead of calculating MAC on ciphertext,
+     it's calculated over a concatenation of `nonce` and `ciphertext`
+   - Validate that AAD (nonce) is 32 bytes
+7. Base64-encode (with padding) params: `concat(version, nonce, ciphertext, mac)`
+
+After encryption, it's necessary to sign it. Use NIP-01 to serialize the event,
+with result base64 assigned to event's `content`. Then, use NIP-01 to sign
+the event using schnorr signature scheme over secp256k1.
+
+#### Decryption
+
+Before decryption, it's necessary to validate the message's pubkey and signature.
+The public key must be a valid non-zero secp256k1 curve point, and signature must be valid
+secp256k1 schnorr signature. For exact validation rules, refer to BIP-340.
+
+1. Check if first payload's character is `#`
+   - `#` is an optional future-proof flag that means non-base64 encoding is used
+   - The `#` is not present in base64 alphabet, but, instead of throwing `base64 is invalid`,
+     an app must say the encryption version is not yet supported
+2. Decode base64
+   - Base64 is decoded into `version, nonce, ciphertext, mac`
+   - If the version is unknown, the app, an app must say the encryption version is not yet supported
+   - Validate length of base64 message to prevent DoS on base64 decoder: it can be in range from 132 to 87472 chars
+   - Validate length of decoded message to verify output of the decoder: it can be in range from 99 to 65603 bytes
+3. Calculate conversation key
+   - See step 1 of Encryption
+4. Calculate message keys
+   - See step 3 of Encryption
+5. Calculate MAC (message authentication code) with AAD and compare
+   - Stop and throw an error if MAC doesn't match the decoded one from step 2
+   - Use constant-time comparison algorithm
+6. Decrypt ciphertext
+   - Use ChaCha20 with key and nonce from step 3
+7. Remove padding
+   - Read the first two BE bytes of plaintext that correspond to plaintext length
+   - Verify that the length of sliced plaintext matches the value of the two BE bytes
+   - Verify that calculated padding from encryption's step 3 matches the actual padding
+
+## Tests and code
+
+A collection of implementations in different languages is
+available [on GitHub](https://github.com/paulmillr/nip44).
+
+We publish extensive test vectors. Instead of having it in the
+document directly, a sha256 checksum of vectors is provided:
+
+    269ed0f69e4c192512cc779e78c555090cebc7c785b609e338a62afc3ce25040  nip44.vectors.json
+
+Example of test vector from the file:
+
+```json
+{
+  "sec1": "0000000000000000000000000000000000000000000000000000000000000001",
+  "sec2": "0000000000000000000000000000000000000000000000000000000000000002",
+  "conversation_key": "c41c775356fd92eadc63ff5a0dc1da211b268cbea22316767095b2871ea1412d",
+  "nonce": "0000000000000000000000000000000000000000000000000000000000000001",
+  "plaintext": "a",
+  "payload": "AgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABee0G5VSK0/9YypIObAtDKfYEAjD35uVkHyB0F4DwrcNaCXlCWZKaArsGrY6M9wnuTMxWfp1RTN9Xga8no+kF5Vsb"
+}
+```
+
+The file also contains intermediate values. A quick guidance with regards to its usage:
+
+- `valid.get_conversation_key`: calculate conversation_key from secret key sec1 and public key pub2
+- `valid.get_message_keys`: calculate chacha_key, chacha_nocne, hmac_key from conversation_key and nonce
+- `valid.calc_padded_len`: take unpadded length (first value), calculate padded length (second value)
+- `valid.encrypt_decrypt`: emulate real conversation. Calculate
+  pub2 from sec2, verify conversation_key from (sec1, pub2), encrypt, verify payload,
+  then calculate pub1 from sec1, verify conversation_key from (sec2, pub1), decrypt, verify plaintext.
+- `valid.encrypt_decrypt_long_msg`: same as previous step, but instead of a full plaintext and payload,
+  their checksum is provided.
+- `invalid.encrypt_msg_lengths`
+- `invalid.get_conversation_key`: calculating converastion_key must throw an error
+- `invalid.decrypt`: decrypting message content must throw an error
diff --git a/46.md b/46.md
index 3ab71e9..1f8e6c8 100644
--- a/46.md
+++ b/46.md
@@ -96,3 +96,4 @@ The signer key will always be the key of the user who controls the signer device
 - **ping**
   - params: []
   - result: `"pong"`
+
diff --git a/README.md b/README.md
index 6b83490..a66c466 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 - [NIP-01: Basic protocol flow description](01.md)
 - [NIP-02: Follow List](02.md)
 - [NIP-03: OpenTimestamps Attestations for Events](03.md)
-- [NIP-04: Encrypted Direct Message](04.md)
+- [NIP-04: Encrypted Direct Message](04.md) --- **unrecommended**: deprecated in favor of [NIP-44](44.md)
 - [NIP-05: Mapping Nostr keys to DNS-based internet identifiers](05.md)
 - [NIP-06: Basic key derivation from mnemonic seed phrase](06.md)
 - [NIP-07: `window.nostr` capability for web browsers](07.md)
@@ -52,6 +52,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 - [NIP-39: External Identities in Profiles](39.md)
 - [NIP-40: Expiration Timestamp](40.md)
 - [NIP-42: Authentication of clients to relays](42.md)
+- [NIP-44: Versioned Encryption](44.md)
 - [NIP-45: Counting results](45.md)
 - [NIP-46: Nostr Connect](46.md)
 - [NIP-47: Wallet Connect](47.md)

From 4199f202365fc4c1a464b1033d040597bccbb08d Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Wed, 20 Dec 2023 13:56:03 -0300
Subject: [PATCH 071/263] nip-44: remove author names and arbitrary
 line-breaks.

---
 44.md | 66 ++++++++++++++++++-----------------------------------------
 1 file changed, 20 insertions(+), 46 deletions(-)

diff --git a/44.md b/44.md
index 1282d26..e66a7b3 100644
--- a/44.md
+++ b/44.md
@@ -2,7 +2,7 @@
 
 ## Encrypted Payloads (Versioned)
 
-`optional` `author:paulmillr` `author:staab`
+`optional`
 
 The NIP introduces a new data format for keypair-based encryption. This NIP is versioned
 to allow multiple algorithm choices to exist simultaneously.
@@ -22,12 +22,11 @@ The scheme has a number of important shortcomings:
 - Limited message size leak: padding only partially obscures true message length
 - No attachments: they are not supported
 
-Lack of forward secrecy is partially mitigated: 1) the messages
-should only be stored on relays, specified by the user, instead of a set of
-all public relays 2) the relays are supposed to regularly delete older messages.
+Lack of forward secrecy is partially mitigated by these two factors:
+  1. the messages should only be stored on relays, specified by the user, instead of a set of all public relays.
+  2. the relays are supposed to regularly delete older messages.
 
-For risky situations, users should chat in specialized E2EE messaging software and limit use
-of nostr to exchanging contacts.
+For risky situations, users should chat in specialized E2EE messaging software and limit use of nostr to exchanging contacts.
 
 ## Dependence on NIP-01
 
@@ -35,14 +34,9 @@ It's not enough to use NIP-44 for encryption: the output must also be signed.
 
 In nostr case, the payload is serialized and signed as per NIP-01 rules.
 
-The same event can be serialized in two different ways,
-resulting in two distinct signatures. So, it's important
-to ensure serialization rules, which are defined in NIP-01,
-are the same across different NIP-44 implementations.
+The same event can be serialized in two different ways, resulting in two distinct signatures. So, it's important to ensure serialization rules, which are defined in NIP-01, are the same across different NIP-44 implementations.
 
-After serialization, the event is signed by Schnorr signature over secp256k1,
-defined in BIP340. It's important to ensure the key and signature validity as
-per BIP340 rules.
+After serialization, the event is signed by Schnorr signature over secp256k1, defined in BIP340. It's important to ensure the key and signature validity as per BIP340 rules.
 
 ## Versions
 
@@ -56,18 +50,12 @@ Currently defined encryption algorithms:
 
 The algorithm choices are justified in a following way:
 
-- Encrypt-then-mac-then-sign instead of encrypt-then-sign-then-mac:
-  only events wrapped in NIP-01 signed envelope are currently accepted by nostr.
-- ChaCha instead of AES: it's faster and has
-  [better security against multi-key attacks](https://datatracker.ietf.org/doc/draft-irtf-cfrg-aead-limits/)
-- ChaCha instead of XChaCha: XChaCha has not been standardized. Also, we don't need xchacha's improved
-  collision resistance of nonces: every message has a new (key, nonce) pair.
-- HMAC-SHA256 instead of Poly1305: polynomial MACs are much easier to forge
-- SHA256 instead of SHA3 or BLAKE: it is already used in nostr. Also blake's
-  speed advantage is smaller in non-parallel environments
-- Custom padding instead of padmé: better leakage reduction for small messages
-- Base64 encoding instead of an other compression algorithm: it is widely available,
-  and is already used in nostr
+- Encrypt-then-mac-then-sign instead of encrypt-then-sign-then-mac: only events wrapped in NIP-01 signed envelope are currently accepted by nostr.
+- ChaCha instead of AES: it's faster and has [better security against multi-key attacks](https://datatracker.ietf.org/doc/draft-irtf-cfrg-aead-limits/)
+- ChaCha instead of XChaCha: XChaCha has not been standardized. Also, we don't need xchacha's improved collision resistance of nonces: every message has a new (key, nonce) pair.
+- HMAC-SHA256 instead of Poly1305: polynomial MACs are much easier to forge SHA256 instead of SHA3 or BLAKE: it is already used in nostr. Also blake's
+  speed advantage is smaller in non-parallel environments - Custom padding instead of padmé: better leakage reduction for small messages
+- Base64 encoding instead of an other compression algorithm: it is widely available, and is already used in nostr
 
 ### Functions and operations
 
@@ -77,12 +65,7 @@ The algorithm choices are justified in a following way:
     comprised of methods `hkdf_extract(IKM, salt)` and `hkdf_expand(OKM, info, L)`
   - `chacha20(key, nonce, data)` is ChaCha20 [(RFC 8439)](https://datatracker.ietf.org/doc/html/rfc8439), with starting counter set to 0
   - `hmac_sha256(key, message)` is HMAC [(RFC 2104)](https://datatracker.ietf.org/doc/html/rfc2104)
-  - `secp256k1_ecdh(priv_a, pub_b)` is multiplication of point B by
-    scalar a (`a ⋅ B`), defined in
-    [BIP340](https://github.com/bitcoin/bips/blob/e918b50731397872ad2922a1b08a5a4cd1d6d546/bip-0340.mediawiki).
-    The operation produces 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]`
+  - `secp256k1_ecdh(priv_a, pub_b)` is multiplication of point B by scalar a (`a ⋅ B`), defined in [BIP340](https://github.com/bitcoin/bips/blob/e918b50731397872ad2922a1b08a5a4cd1d6d546/bip-0340.mediawiki). The operation produces 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]`
 - 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`
@@ -225,15 +208,11 @@ def decrypt(payload, conversation_key):
    - Validate that AAD (nonce) is 32 bytes
 7. Base64-encode (with padding) params: `concat(version, nonce, ciphertext, mac)`
 
-After encryption, it's necessary to sign it. Use NIP-01 to serialize the event,
-with result base64 assigned to event's `content`. Then, use NIP-01 to sign
-the event using schnorr signature scheme over secp256k1.
+After encryption, it's necessary to sign it. Use NIP-01 to serialize the event, with result base64 assigned to event's `content`. Then, use NIP-01 to sign the event using schnorr signature scheme over secp256k1.
 
 #### Decryption
 
-Before decryption, it's necessary to validate the message's pubkey and signature.
-The public key must be a valid non-zero secp256k1 curve point, and signature must be valid
-secp256k1 schnorr signature. For exact validation rules, refer to BIP-340.
+Before decryption, it's necessary to validate the message's pubkey and signature. The public key must be a valid non-zero secp256k1 curve point, and signature must be valid secp256k1 schnorr signature. For exact validation rules, refer to BIP-340.
 
 1. Check if first payload's character is `#`
    - `#` is an optional future-proof flag that means non-base64 encoding is used
@@ -260,11 +239,9 @@ secp256k1 schnorr signature. For exact validation rules, refer to BIP-340.
 
 ## Tests and code
 
-A collection of implementations in different languages is
-available [on GitHub](https://github.com/paulmillr/nip44).
+A collection of implementations in different languages is available at https://github.com/paulmillr/nip44.
 
-We publish extensive test vectors. Instead of having it in the
-document directly, a sha256 checksum of vectors is provided:
+We publish extensive test vectors. Instead of having it in the document directly, a sha256 checksum of vectors is provided:
 
     269ed0f69e4c192512cc779e78c555090cebc7c785b609e338a62afc3ce25040  nip44.vectors.json
 
@@ -286,11 +263,8 @@ The file also contains intermediate values. A quick guidance with regards to its
 - `valid.get_conversation_key`: calculate conversation_key from secret key sec1 and public key pub2
 - `valid.get_message_keys`: calculate chacha_key, chacha_nocne, hmac_key from conversation_key and nonce
 - `valid.calc_padded_len`: take unpadded length (first value), calculate padded length (second value)
-- `valid.encrypt_decrypt`: emulate real conversation. Calculate
-  pub2 from sec2, verify conversation_key from (sec1, pub2), encrypt, verify payload,
-  then calculate pub1 from sec1, verify conversation_key from (sec2, pub1), decrypt, verify plaintext.
-- `valid.encrypt_decrypt_long_msg`: same as previous step, but instead of a full plaintext and payload,
-  their checksum is provided.
+- `valid.encrypt_decrypt`: emulate real conversation. Calculate pub2 from sec2, verify conversation_key from (sec1, pub2), encrypt, verify payload, then calculate pub1 from sec1, verify conversation_key from (sec2, pub1), decrypt, verify plaintext.
+- `valid.encrypt_decrypt_long_msg`: same as previous step, but instead of a full plaintext and payload, their checksum is provided.
 - `invalid.encrypt_msg_lengths`
 - `invalid.get_conversation_key`: calculating converastion_key must throw an error
 - `invalid.decrypt`: decrypting message content must throw an error

From 9be51261c0d1aeff2a99591d978b88bf7e5766b3 Mon Sep 17 00:00:00 2001
From: Paul Miller <paul@paulmillr.com>
Date: Wed, 20 Dec 2023 20:18:43 +0300
Subject: [PATCH 072/263] nip-44: add audit notice

---
 44.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/44.md b/44.md
index e66a7b3..d69c688 100644
--- a/44.md
+++ b/44.md
@@ -237,6 +237,12 @@ Before decryption, it's necessary to validate the message's pubkey and signature
    - Verify that the length of sliced plaintext matches the value of the two BE bytes
    - Verify that calculated padding from encryption's step 3 matches the actual padding
 
+## Audit
+
+The v2 of the standard has been subject to an audit by [Cure53](https://cure53.de) in December 2023.
+Check out [audit-2023.12.pdf](https://github.com/paulmillr/nip44/blob/ce63c2eaf345e9f7f93b48f829e6bdeb7e7d7964/audit-2023.12.pdf)
+and [auditor's website](https://cure53.de/audit-report_nip44-implementations.pdf).
+
 ## Tests and code
 
 A collection of implementations in different languages is available at https://github.com/paulmillr/nip44.

From ff533d7a99715b0524f93a182f6c2169fe3b25b1 Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Wed, 20 Dec 2023 14:39:35 -0300
Subject: [PATCH 073/263] remove nip44 calls from nip07 temporarily.

---
 07.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/07.md b/07.md
index 6db0597..90772ee 100644
--- a/07.md
+++ b/07.md
@@ -20,8 +20,6 @@ Aside from these two basic above, the following functions can also be implemente
 async window.nostr.getRelays(): { [url: string]: {read: boolean, write: boolean} } // returns a basic map of relay urls to relay policies
 async window.nostr.nip04.encrypt(pubkey, plaintext): string // returns ciphertext and iv as specified in nip-04 (deprecated)
 async window.nostr.nip04.decrypt(pubkey, ciphertext): string // takes ciphertext and iv as specified in nip-04 (deprecated)
-async window.nostr.nip44.encrypt(sender_privkey, recipient_pubkey, plaintext, version): string // returns encrypted payload as specified in nip-44
-async window.nostr.nip44.decrypt(recipient_privkey, sender_pubkey, payload): string // takes encrypted payload as specified in nip-44
 ```
 
 ### Implementation

From 732b0ce0a49fbdfa35dfae164f25ee9db947f1c2 Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Wed, 20 Dec 2023 11:28:43 -0800
Subject: [PATCH 074/263] Clean up NIP 44 to clarify separation of concerns
 (encryption vs messaging), improve formatting and clarify
 encryption/decryption steps

---
 44.md | 245 +++++++++++++++++++++++++++++++---------------------------
 1 file changed, 130 insertions(+), 115 deletions(-)

diff --git a/44.md b/44.md
index d69c688..5093acd 100644
--- a/44.md
+++ b/44.md
@@ -1,42 +1,14 @@
-# NIP-44
+NIP-44
+=====
 
-## Encrypted Payloads (Versioned)
+Encrypted Payloads (Versioned)
+------------------------------
 
 `optional`
 
 The NIP introduces a new data format for keypair-based encryption. This NIP is versioned
-to allow multiple algorithm choices to exist simultaneously.
-
-Nostr is a key directory. Every nostr user has their own public key, which solves key
-distribution problems present in other solutions. The goal of this NIP is to have a
-simple way to send messages between nostr accounts that cannot be read by everyone.
-
-The scheme has a number of important shortcomings:
-
-- No deniability: it is possible to prove the event was signed by a particular key
-- No forward secrecy: when a user key is compromised, it is possible to decrypt all previous conversations
-- No post-compromise security: when a user key is compromised, it is possible to decrypt all future conversations
-- No post-quantum security: a powerful quantum computer would be able to decrypt the messages
-- IP address leak: user IP may be seen by relays and all intermediaries between user and relay
-- Date leak: the message date is public, since it is a part of NIP 01 event
-- Limited message size leak: padding only partially obscures true message length
-- No attachments: they are not supported
-
-Lack of forward secrecy is partially mitigated by these two factors:
-  1. the messages should only be stored on relays, specified by the user, instead of a set of all public relays.
-  2. the relays are supposed to regularly delete older messages.
-
-For risky situations, users should chat in specialized E2EE messaging software and limit use of nostr to exchanging contacts.
-
-## Dependence on NIP-01
-
-It's not enough to use NIP-44 for encryption: the output must also be signed.
-
-In nostr case, the payload is serialized and signed as per NIP-01 rules.
-
-The same event can be serialized in two different ways, resulting in two distinct signatures. So, it's important to ensure serialization rules, which are defined in NIP-01, are the same across different NIP-44 implementations.
-
-After serialization, the event is signed by Schnorr signature over secp256k1, defined in BIP340. It's important to ensure the key and signature validity as per BIP340 rules.
+to allow multiple algorithm choices to exist simultaneously. This format may be used for
+many things, but MUST be used in the context of a signed event as described in NIP 01.
 
 ## Versions
 
@@ -46,29 +18,129 @@ Currently defined encryption algorithms:
 - `0x01` - Deprecated and undefined
 - `0x02` - secp256k1 ECDH, HKDF, padding, ChaCha20, HMAC-SHA256, base64
 
+## Limitations
+
+Every nostr user has their own public key, which solves key distribution problems present
+in other solutions. However, nostr's relay-based architecture makes it difficult to implement
+more robust private messaging protocols with things like metadata hiding, forward secrecy,
+and post compromise secrecy.
+
+The goal of this NIP is to have a _simple_ way to encrypt payloads used in the context of a signed
+event. When applying this NIP to any use case, it's important to keep in mind your users' threat
+model and this NIP's limitations. For high-risk situations, users should chat in specialized E2EE
+messaging software and limit use of nostr to exchanging contacts.
+
+On its own, messages sent using this scheme has a number of important shortcomings:
+
+- No deniability: it is possible to prove an event was signed by a particular key
+- No forward secrecy: when a key is compromised, it is possible to decrypt all previous conversations
+- No post-compromise security: when a key is compromised, it is possible to decrypt all future conversations
+- No post-quantum security: a powerful quantum computer would be able to decrypt the messages
+- IP address leak: user IP may be seen by relays and all intermediaries between user and relay
+- Date leak: `created_at` is public, since it is a part of NIP 01 event
+- Limited message size leak: padding only partially obscures true message length
+- No attachments: they are not supported
+
+Lack of forward secrecy may be partially mitigated by only sending messages to trusted relays, and asking
+relays to delete stored messages after a certain duration has elapsed.
+
 ## Version 2
 
-The algorithm choices are justified in a following way:
+NIP-44 version 2 has the following design characteristics:
 
-- Encrypt-then-mac-then-sign instead of encrypt-then-sign-then-mac: only events wrapped in NIP-01 signed envelope are currently accepted by nostr.
-- ChaCha instead of AES: it's faster and has [better security against multi-key attacks](https://datatracker.ietf.org/doc/draft-irtf-cfrg-aead-limits/)
-- ChaCha instead of XChaCha: XChaCha has not been standardized. Also, we don't need xchacha's improved collision resistance of nonces: every message has a new (key, nonce) pair.
-- HMAC-SHA256 instead of Poly1305: polynomial MACs are much easier to forge SHA256 instead of SHA3 or BLAKE: it is already used in nostr. Also blake's
-  speed advantage is smaller in non-parallel environments - Custom padding instead of padmé: better leakage reduction for small messages
-- Base64 encoding instead of an other compression algorithm: it is widely available, and is already used in nostr
+- Payloads are authenticated using a MAC before signing rather than afterwards because events are assumed
+  to be signed as specified in NIP-01. The outer signature serves to authenticate the full payload, and MUST
+  be validated before decrypting.
+- ChaCha is used instead of AES because it's faster and has
+  [better security against multi-key attacks](https://datatracker.ietf.org/doc/draft-irtf-cfrg-aead-limits/).
+- ChaCha is used instead of XChaCha because XChaCha has not been standardized. Also, xChaCha's improved collision
+  resistance of nonces isn't necessary since every message has a new (key, nonce) pair.
+- HMAC-SHA256 is used instead of Poly1305 because polynomial MACs are much easier to forge.
+- SHA256 is used instead of SHA3 or BLAKE because it is already used in nostr. Also BLAKE's speed advantage
+  is smaller in non-parallel environments.
+- A custom padding scheme is used instead of padmé because it provides better leakage reduction for small messages.
+- Base64 encoding is used instead of another compression algorithm because it is widely available, and is already used in nostr.
 
-### Functions and operations
+### Encryption
+
+1. Calculate a conversation key
+   - Execute ECDH (scalar multiplication) of public key B by private key A
+     Output `shared_x` must be unhashed, 32-byte encoded x coordinate of the shared point
+   - Use HKDF-extract with sha256, `IKM=shared_x` and `salt=utf8_encode('nip44-v2')`
+   - HKDF output will be a `conversation_key` between two users.
+   - It is always the same, when key roles are swapped: `conv(a, B) == conv(b, A)`
+2. Generate a random 32-byte nonce
+   - Always use [CSPRNG](https://en.wikipedia.org/wiki/Cryptographically_secure_pseudorandom_number_generator)
+   - Don't generate a nonce from message content
+   - Don't re-use the same nonce between messages: doing so would make them decryptable,
+     but won't leak the long-term key
+3. Calculate message keys
+   - The keys are generated from `conversation_key` and `nonce`. Validate that both are 32 bytes long
+   - Use HKDF-expand, with sha256, `OKM=conversation_key`, `info=nonce` and `L=76`
+   - Slice 76-byte HKDF output into: `chacha_key` (bytes 0..32), `chacha_nonce` (bytes 32..44), `hmac_key` (bytes 44..76)
+4. Add padding
+   - Content must be encoded from UTF-8 into byte array
+   - Validate plaintext length. Minimum is 1 byte, maximum is 65535 bytes
+   - Padding format is: `[plaintext_length: u16][plaintext][zero_bytes]`
+   - Padding algorithm is related to powers-of-two, with min padded msg size of 32
+   - Plaintext length is encoded in big-endian as first 2 bytes of the padded blob
+5. Encrypt padded content
+   - Use ChaCha20, with key and nonce from step 3
+6. Calculate MAC (message authentication code)
+   - AAD (additional authenticated data) is used - instead of calculating MAC on ciphertext,
+     it's calculated over a concatenation of `nonce` and `ciphertext`
+   - Validate that AAD (nonce) is 32 bytes
+7. Base64-encode (with padding) params using `concat(version, nonce, ciphertext, mac)`
+
+Encrypted payloads MUST be included in an event's payload, hashed, and signed as defined in NIP 01, using schnorr
+signature scheme over secp256k1.
+
+### Decryption
+
+Before decryption, the event's pubkey and signature MUST be validated as defined in NIP 01. The public key MUST be
+a valid non-zero secp256k1 curve point, and the signature must be valid secp256k1 schnorr signature. For exact
+validation rules, refer to BIP-340.
+
+1. Check if first payload's character is `#`
+   - `#` is an optional future-proof flag that means non-base64 encoding is used
+   - The `#` is not present in base64 alphabet, but, instead of throwing `base64 is invalid`,
+     implementations MUST indicate that the encryption version is not yet supported
+2. Decode base64
+   - Base64 is decoded into `version, nonce, ciphertext, mac`
+   - If the version is unknown, implementations must indicate that the encryption version is not supported
+   - Validate length of base64 message to prevent DoS on base64 decoder: it can be in range from 132 to 87472 chars
+   - Validate length of decoded message to verify output of the decoder: it can be in range from 99 to 65603 bytes
+3. Calculate conversation key
+   - See step 1 of (encryption)[#Encryption]
+4. Calculate message keys
+   - See step 3 of (encryption)[#Encryption]
+5. Calculate MAC (message authentication code) with AAD and compare
+   - Stop and throw an error if MAC doesn't match the decoded one from step 2
+   - Use constant-time comparison algorithm
+6. Decrypt ciphertext
+   - Use ChaCha20 with key and nonce from step 3
+7. Remove padding
+   - Read the first two BE bytes of plaintext that correspond to plaintext length
+   - Verify that the length of sliced plaintext matches the value of the two BE bytes
+   - Verify that calculated padding from step 3 of the (encryption)[#Encryption] process matches the actual padding
+
+### Details
 
 - Cryptographic methods
-  - `secure_random_bytes(length)` fetches randomness from CSPRNG
-  - `hkdf(IKM, salt, info, L)` represents HKDF [(RFC 5869)](https://datatracker.ietf.org/doc/html/rfc5869) with SHA256 hash function,
-    comprised of methods `hkdf_extract(IKM, salt)` and `hkdf_expand(OKM, info, L)`
-  - `chacha20(key, nonce, data)` is ChaCha20 [(RFC 8439)](https://datatracker.ietf.org/doc/html/rfc8439), with starting counter set to 0
-  - `hmac_sha256(key, message)` is HMAC [(RFC 2104)](https://datatracker.ietf.org/doc/html/rfc2104)
-  - `secp256k1_ecdh(priv_a, pub_b)` is multiplication of point B by scalar a (`a ⋅ B`), defined in [BIP340](https://github.com/bitcoin/bips/blob/e918b50731397872ad2922a1b08a5a4cd1d6d546/bip-0340.mediawiki). The operation produces 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]`
+  - `secure_random_bytes(length)` fetches randomness from CSPRNG.
+  - `hkdf(IKM, salt, info, L)` represents HKDF [(RFC 5869)](https://datatracker.ietf.org/doc/html/rfc5869)
+    with SHA256 hash function comprised of methods `hkdf_extract(IKM, salt)` and `hkdf_expand(OKM, info, L)`.
+  - `chacha20(key, nonce, data)` is ChaCha20 [(RFC 8439)](https://datatracker.ietf.org/doc/html/rfc8439) with
+    starting counter set to 0.
+  - `hmac_sha256(key, message)` is HMAC [(RFC 2104)](https://datatracker.ietf.org/doc/html/rfc2104).
+  - `secp256k1_ecdh(priv_a, pub_b)` is multiplication of point B by scalar a (`a ⋅ B`), defined in
+    [BIP340](https://github.com/bitcoin/bips/blob/e918b50731397872ad2922a1b08a5a4cd1d6d546/bip-0340.mediawiki).
+    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]`.
 - 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`
+  - `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`.
 - Constants `c`:
   - `min_plaintext_size` is 1. 1b msg is padded to 32b.
   - `max_plaintext_size` is 65535 (64kb - 1). It is padded to 65536.
@@ -82,7 +154,10 @@ The algorithm choices are justified in a following way:
   - `zeros(length)` creates byte array of length `length >= 0`, filled with zeros
   - `floor(number)` and `log2(number)` are well-known mathematical methods
 
-User-defined functions:
+### Implementation pseudocode
+
+The following is a collection of python-like pseudocode functions which implement the above primitives,
+intended to guide impelmenters. A collection of implementations in different languages is available at https://github.com/paulmillr/nip44.
 
 ```py
 # Calculates length of the padded byte array.
@@ -177,73 +252,13 @@ def decrypt(payload, conversation_key):
 #   'hello world' == decrypt(payload, conversation_key)
 ```
 
-#### Encryption
+### Audit
 
-1. Calculate conversation key
-   - Execute ECDH (scalar multiplication) of public key B by private key A.
-     Output `shared_x` must be unhashed, 32-byte encoded x coordinate of the shared point.
-   - Use HKDF-extract with sha256, `IKM=shared_x` and `salt=utf8_encode('nip44-v2')`
-   - HKDF output will be `conversation_key` between two users
-   - It is always the same, when key roles are swapped: `conv(a, B) == conv(b, A)`
-2. Generate random 32-byte nonce
-   - Always use [CSPRNG](https://en.wikipedia.org/wiki/Cryptographically_secure_pseudorandom_number_generator)
-   - Don't generate nonce from message content
-   - Don't re-use the same nonce between messages: doing so would make them decryptable,
-     but won't leak long-term key
-3. Calculate message keys
-   - The keys are generated from `conversation_key` and `nonce`. Validate that both are 32 bytes
-   - Use HKDF-expand, with sha256, `OKM=conversation_key`, `info=nonce` and `L=76`
-   - Slice 76-byte HKDF output into: `chacha_key` (bytes 0..32), `chacha_nonce` (bytes 32..44), `hmac_key` (bytes 44..76)
-4. Add padding
-   - Content must be encoded from UTF-8 into byte array
-   - Validate plaintext length. Minimum is 1 byte, maximum is 65535 bytes
-   - Padding format is: `[plaintext_length: u16][plaintext][zero_bytes]`
-   - Padding algorithm is related to powers-of-two, with min padded msg size of 32
-   - Plaintext length is encoded in big-endian as first 2 bytes of the padded blob
-5. Encrypt padded content
-   - Use ChaCha20, with key and nonce from step 3
-6. Calculate MAC (message authentication code) with AAD
-   - AAD is used: instead of calculating MAC on ciphertext,
-     it's calculated over a concatenation of `nonce` and `ciphertext`
-   - Validate that AAD (nonce) is 32 bytes
-7. Base64-encode (with padding) params: `concat(version, nonce, ciphertext, mac)`
-
-After encryption, it's necessary to sign it. Use NIP-01 to serialize the event, with result base64 assigned to event's `content`. Then, use NIP-01 to sign the event using schnorr signature scheme over secp256k1.
-
-#### Decryption
-
-Before decryption, it's necessary to validate the message's pubkey and signature. The public key must be a valid non-zero secp256k1 curve point, and signature must be valid secp256k1 schnorr signature. For exact validation rules, refer to BIP-340.
-
-1. Check if first payload's character is `#`
-   - `#` is an optional future-proof flag that means non-base64 encoding is used
-   - The `#` is not present in base64 alphabet, but, instead of throwing `base64 is invalid`,
-     an app must say the encryption version is not yet supported
-2. Decode base64
-   - Base64 is decoded into `version, nonce, ciphertext, mac`
-   - If the version is unknown, the app, an app must say the encryption version is not yet supported
-   - Validate length of base64 message to prevent DoS on base64 decoder: it can be in range from 132 to 87472 chars
-   - Validate length of decoded message to verify output of the decoder: it can be in range from 99 to 65603 bytes
-3. Calculate conversation key
-   - See step 1 of Encryption
-4. Calculate message keys
-   - See step 3 of Encryption
-5. Calculate MAC (message authentication code) with AAD and compare
-   - Stop and throw an error if MAC doesn't match the decoded one from step 2
-   - Use constant-time comparison algorithm
-6. Decrypt ciphertext
-   - Use ChaCha20 with key and nonce from step 3
-7. Remove padding
-   - Read the first two BE bytes of plaintext that correspond to plaintext length
-   - Verify that the length of sliced plaintext matches the value of the two BE bytes
-   - Verify that calculated padding from encryption's step 3 matches the actual padding
-
-## Audit
-
-The v2 of the standard has been subject to an audit by [Cure53](https://cure53.de) in December 2023.
+The v2 of the standard was audited by [Cure53](https://cure53.de) in December 2023.
 Check out [audit-2023.12.pdf](https://github.com/paulmillr/nip44/blob/ce63c2eaf345e9f7f93b48f829e6bdeb7e7d7964/audit-2023.12.pdf)
 and [auditor's website](https://cure53.de/audit-report_nip44-implementations.pdf).
 
-## Tests and code
+### Tests and code
 
 A collection of implementations in different languages is available at https://github.com/paulmillr/nip44.
 
@@ -251,7 +266,7 @@ We publish extensive test vectors. Instead of having it in the document directly
 
     269ed0f69e4c192512cc779e78c555090cebc7c785b609e338a62afc3ce25040  nip44.vectors.json
 
-Example of test vector from the file:
+Example of a test vector from the file:
 
 ```json
 {

From 2b78cc9304f775b8391f62b7fe61e99a3fdc905b Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Wed, 20 Dec 2023 11:35:12 -0800
Subject: [PATCH 075/263] Add clarification about not replacing nip 04

---
 44.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/44.md b/44.md
index 5093acd..8bc4038 100644
--- a/44.md
+++ b/44.md
@@ -10,6 +10,10 @@ The NIP introduces a new data format for keypair-based encryption. This NIP is v
 to allow multiple algorithm choices to exist simultaneously. This format may be used for
 many things, but MUST be used in the context of a signed event as described in NIP 01.
 
+*Note*: this format DOES NOT define any `kind`s related to a new direct messaging standard,
+only the encryption required to define one. It SHOULD NOT be used as a drop-in replacement
+for NIP 04 payloads.
+
 ## Versions
 
 Currently defined encryption algorithms:
@@ -30,7 +34,7 @@ event. When applying this NIP to any use case, it's important to keep in mind yo
 model and this NIP's limitations. For high-risk situations, users should chat in specialized E2EE
 messaging software and limit use of nostr to exchanging contacts.
 
-On its own, messages sent using this scheme has a number of important shortcomings:
+On its own, messages sent using this scheme have a number of important shortcomings:
 
 - No deniability: it is possible to prove an event was signed by a particular key
 - No forward secrecy: when a key is compromised, it is possible to decrypt all previous conversations

From 5ed4232584f3ab34192291daf985742248fb14ea Mon Sep 17 00:00:00 2001
From: Josua Schmid <josua.schmid@renuo.ch>
Date: Fri, 22 Dec 2023 09:58:49 +0100
Subject: [PATCH 076/263] Mention deprecation of kind 2

Kind `2` was [consciously](https://github.com/nostr-protocol/nips/pull/703#issuecomment-1672098794) removed in https://github.com/nostr-protocol/nips/commit/72bb8a128b2d7d3c2c654644cd68d0d0fe58a3b1#diff-39307f1617417657ee9874be314f13aabdc74401b124d0afe8217f2919c9c7d8L105. Mentioning the fact should help prevent further confusion.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a66c466..ce1542b 100644
--- a/README.md
+++ b/README.md
@@ -80,7 +80,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | ------------- | -------------------------- | -----------              |
 | `0`           | Metadata                   | [1](01.md)               |
 | `1`           | Short Text Note            | [1](01.md)               |
-| `2`           | Recommend Relay            |                          |
+| `2`           | Recommend Relay            | 1 (before 2023-08-13)    |
 | `3`           | Follows                    | [2](02.md)               |
 | `4`           | Encrypted Direct Messages  | [4](04.md)               |
 | `5`           | Event Deletion             | [9](09.md)               |

From d30f03316f0b3ab56faba94b0abfcb9041b81764 Mon Sep 17 00:00:00 2001
From: Josua Schmid <josua.schmid@renuo.ch>
Date: Fri, 22 Dec 2023 14:54:17 +0100
Subject: [PATCH 077/263] Emphasis on multiple filters in NIP-01
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As mentioned further down in NIP-01

> A REQ message may contain multiple filters.

The comma makes it more clear that the message array can container more than 3 items. So it is understood easily to match

```
// correct:
["REQ", <subscription_id>, filters1, filters2, …]
```

instead of

```
// wrong:
["REQ", <subscription_id>, [filters1, filters2, …]]
```
---
 01.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/01.md b/01.md
index 99c991a..0cf03ed 100644
--- a/01.md
+++ b/01.md
@@ -101,7 +101,7 @@ Relays expose a websocket endpoint to which clients can connect. Clients SHOULD
 Clients can send 3 types of messages, which must be JSON arrays, according to the following patterns:
 
   * `["EVENT", <event JSON as defined above>]`, used to publish events.
-  * `["REQ", <subscription_id>, <filters JSON>...]`, used to request events and subscribe to new updates.
+  * `["REQ", <subscription_id>, <filters JSON>, ...]`, used to request events and subscribe to new updates.
   * `["CLOSE", <subscription_id>]`, used to stop previous subscriptions.
 
 `<subscription_id>` is an arbitrary, non-empty string of max length 64 chars, that should be used to represent a subscription. Relays should manage `<subscription_id>`s independently for each WebSocket connection; even if `<subscription_id>`s are the same string, they should be treated as different subscriptions for different connections.

From 91244c50cdb77fd94021d0847148e091b8d468d1 Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Sat, 23 Dec 2023 01:07:55 +0900
Subject: [PATCH 078/263] Add leading zero to NIP numbers

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index ce1542b..2467eb6 100644
--- a/README.md
+++ b/README.md
@@ -78,12 +78,12 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 ## Event Kinds
 | kind          | description                | NIP                      |
 | ------------- | -------------------------- | -----------              |
-| `0`           | Metadata                   | [1](01.md)               |
-| `1`           | Short Text Note            | [1](01.md)               |
-| `2`           | Recommend Relay            | 1 (before 2023-08-13)    |
-| `3`           | Follows                    | [2](02.md)               |
-| `4`           | Encrypted Direct Messages  | [4](04.md)               |
-| `5`           | Event Deletion             | [9](09.md)               |
+| `0`           | Metadata                   | [01](01.md)              |
+| `1`           | Short Text Note            | [01](01.md)              |
+| `2`           | Recommend Relay            | 01 (before 2023-08-13)   |
+| `3`           | Follows                    | [02](02.md)              |
+| `4`           | Encrypted Direct Messages  | [04](04.md)              |
+| `5`           | Event Deletion             | [09](09.md)              |
 | `6`           | Repost                     | [18](18.md)              |
 | `7`           | Reaction                   | [25](25.md)              |
 | `8`           | Badge Award                | [58](58.md)              |

From 95218740e2a78dbe941f09b09360541731d8f55e Mon Sep 17 00:00:00 2001
From: jiftechnify <jiftech.stlfy@gmail.com>
Date: Mon, 25 Dec 2023 12:00:05 +0900
Subject: [PATCH 079/263] fix typos

---
 44.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/44.md b/44.md
index 8bc4038..0efa482 100644
--- a/44.md
+++ b/44.md
@@ -80,7 +80,7 @@ NIP-44 version 2 has the following design characteristics:
      but won't leak the long-term key
 3. Calculate message keys
    - The keys are generated from `conversation_key` and `nonce`. Validate that both are 32 bytes long
-   - Use HKDF-expand, with sha256, `OKM=conversation_key`, `info=nonce` and `L=76`
+   - Use HKDF-expand, with sha256, `PRK=conversation_key`, `info=nonce` and `L=76`
    - Slice 76-byte HKDF output into: `chacha_key` (bytes 0..32), `chacha_nonce` (bytes 32..44), `hmac_key` (bytes 44..76)
 4. Add padding
    - Content must be encoded from UTF-8 into byte array
@@ -115,9 +115,9 @@ validation rules, refer to BIP-340.
    - Validate length of base64 message to prevent DoS on base64 decoder: it can be in range from 132 to 87472 chars
    - Validate length of decoded message to verify output of the decoder: it can be in range from 99 to 65603 bytes
 3. Calculate conversation key
-   - See step 1 of (encryption)[#Encryption]
+   - See step 1 of [encryption](#Encryption)
 4. Calculate message keys
-   - See step 3 of (encryption)[#Encryption]
+   - See step 3 of [encryption](#Encryption)
 5. Calculate MAC (message authentication code) with AAD and compare
    - Stop and throw an error if MAC doesn't match the decoded one from step 2
    - Use constant-time comparison algorithm
@@ -126,7 +126,7 @@ validation rules, refer to BIP-340.
 7. Remove padding
    - Read the first two BE bytes of plaintext that correspond to plaintext length
    - Verify that the length of sliced plaintext matches the value of the two BE bytes
-   - Verify that calculated padding from step 3 of the (encryption)[#Encryption] process matches the actual padding
+   - Verify that calculated padding from step 3 of the [encryption](#Encryption) process matches the actual padding
 
 ### Details
 
@@ -291,5 +291,5 @@ The file also contains intermediate values. A quick guidance with regards to its
 - `valid.encrypt_decrypt`: emulate real conversation. Calculate pub2 from sec2, verify conversation_key from (sec1, pub2), encrypt, verify payload, then calculate pub1 from sec1, verify conversation_key from (sec2, pub1), decrypt, verify plaintext.
 - `valid.encrypt_decrypt_long_msg`: same as previous step, but instead of a full plaintext and payload, their checksum is provided.
 - `invalid.encrypt_msg_lengths`
-- `invalid.get_conversation_key`: calculating converastion_key must throw an error
+- `invalid.get_conversation_key`: calculating conversation_key must throw an error
 - `invalid.decrypt`: decrypting message content must throw an error

From 3b065c3c0467def35f5d38a688a1adf98d944183 Mon Sep 17 00:00:00 2001
From: Josua Schmid <josua.schmid@renuo.ch>
Date: Tue, 26 Dec 2023 20:54:06 +0100
Subject: [PATCH 080/263] Reword REQ for multiple filters

---
 01.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/01.md b/01.md
index 0cf03ed..eed20a5 100644
--- a/01.md
+++ b/01.md
@@ -101,12 +101,12 @@ Relays expose a websocket endpoint to which clients can connect. Clients SHOULD
 Clients can send 3 types of messages, which must be JSON arrays, according to the following patterns:
 
   * `["EVENT", <event JSON as defined above>]`, used to publish events.
-  * `["REQ", <subscription_id>, <filters JSON>, ...]`, used to request events and subscribe to new updates.
+  * `["REQ", <subscription_id>, <filters1>, <filters2>, ...]`, used to request events and subscribe to new updates.
   * `["CLOSE", <subscription_id>]`, used to stop previous subscriptions.
 
 `<subscription_id>` is an arbitrary, non-empty string of max length 64 chars, that should be used to represent a subscription. Relays should manage `<subscription_id>`s independently for each WebSocket connection; even if `<subscription_id>`s are the same string, they should be treated as different subscriptions for different connections.
 
-`<filters>` is a JSON object that determines what events will be sent in that subscription, it can have the following attributes:
+`<filtersX>` is a JSON object that determines what events will be sent in that subscription, it can have the following attributes:
 
 ```json
 {

From 8e5a275f991c8fe31aba9db0ea0dac2586d50ca3 Mon Sep 17 00:00:00 2001
From: Josua Schmid <josua.schmid@renuo.ch>
Date: Tue, 26 Dec 2023 21:57:04 +0100
Subject: [PATCH 081/263] NIP-01 Tighten-up subscription_id management rule

Rephrase to "MUST" so that one does not assume a connection could `CLOSE` any `subscription_id`, which it must not.
---
 01.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/01.md b/01.md
index eed20a5..ec872c3 100644
--- a/01.md
+++ b/01.md
@@ -104,7 +104,7 @@ Clients can send 3 types of messages, which must be JSON arrays, according to th
   * `["REQ", <subscription_id>, <filters1>, <filters2>, ...]`, used to request events and subscribe to new updates.
   * `["CLOSE", <subscription_id>]`, used to stop previous subscriptions.
 
-`<subscription_id>` is an arbitrary, non-empty string of max length 64 chars, that should be used to represent a subscription. Relays should manage `<subscription_id>`s independently for each WebSocket connection; even if `<subscription_id>`s are the same string, they should be treated as different subscriptions for different connections.
+`<subscription_id>` is an arbitrary, non-empty string of max length 64 chars. It represents a subscription per connection. Relays MUST manage `<subscription_id>`s independently for each WebSocket connection. `<subscription_id>`s are not guarantueed to be globally unique.
 
 `<filtersX>` is a JSON object that determines what events will be sent in that subscription, it can have the following attributes:
 

From 0266d86b41d9b0684fa181700069d7553af505ef Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Wed, 27 Dec 2023 19:37:20 +0900
Subject: [PATCH 082/263] Simplify list of NIP-07 implementations

---
 07.md | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/07.md b/07.md
index 90772ee..12ae647 100644
--- a/07.md
+++ b/07.md
@@ -24,16 +24,4 @@ async window.nostr.nip04.decrypt(pubkey, ciphertext): string // takes ciphertext
 
 ### Implementation
 
-- [horse](https://github.com/fiatjaf/horse) (Chrome and derivatives)
-- [nos2x](https://github.com/fiatjaf/nos2x) (Chrome and derivatives)
-- [Alby](https://getalby.com) (Chrome and derivatives, Firefox)
-- [Blockcore](https://www.blockcore.net/wallet) (Chrome and derivatives)
-- [nos2x-fox](https://diegogurpegui.com/nos2x-fox/) (Firefox)
-- [Flamingo](https://www.getflamingo.org/) (Chrome and derivatives)
-- [AKA Profiles](https://github.com/neilck/aka-extension) (Chrome, stores multiple keys)
-- [TokenPocket](https://www.tokenpocket.pro/) (Android, IOS, Chrome and derivatives)
-- [Nostrmo](https://github.com/haorendashu/nostrmo_faq#download) (Android, IOS)
-- [Spring Browser](https://spring.site) (Android)
-- [nodestr](https://github.com/lightning-digital-entertainment/nodestr) (NodeJS polyfill)
-- [Nostore](https://apps.apple.com/us/app/nostore/id1666553677) (Safari on iOS/MacOS)
-- [OneKey](https://onekey.so/) (Android, IOS, Chrome and derivatives)
+See https://github.com/aljazceru/awesome-nostr#nip-07-browser-extensions.

From 5e0cfb62ece24ea55346f5fdcdc62ddc824139fb Mon Sep 17 00:00:00 2001
From: Josua Schmid <josua.schmid@renuo.ch>
Date: Wed, 27 Dec 2023 15:06:36 +0100
Subject: [PATCH 083/263] Rephrase deprecation of kind 2 (#943)

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 2467eb6..bf340a8 100644
--- a/README.md
+++ b/README.md
@@ -77,10 +77,10 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 
 ## Event Kinds
 | kind          | description                | NIP                      |
-| ------------- | -------------------------- | -----------              |
+| ------------- | -------------------------- | ------------------------ |
 | `0`           | Metadata                   | [01](01.md)              |
 | `1`           | Short Text Note            | [01](01.md)              |
-| `2`           | Recommend Relay            | 01 (before 2023-08-13)   |
+| `2`           | Recommend Relay            | 01 (deprecated)          |
 | `3`           | Follows                    | [02](02.md)              |
 | `4`           | Encrypted Direct Messages  | [04](04.md)              |
 | `5`           | Event Deletion             | [09](09.md)              |

From 17c67ef5577c8ac5419a1081aadea57e30f8c133 Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Tue, 26 Dec 2023 09:09:18 -0500
Subject: [PATCH 084/263] Removes the `aes-256-gcm` tag since no one seems to
 be using. People that wish to use encryption can now use the new NIP-44
 scheme.

---
 94.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/94.md b/94.md
index 95b6a3b..84a3d12 100644
--- a/94.md
+++ b/94.md
@@ -6,7 +6,7 @@ File Metadata
 
 `draft` `optional`
 
-The purpose of this NIP is to allow an organization and classification of shared files. So that relays can filter and organize in any way that is of interest. With that, multiple types of filesharing clients can be created. NIP-94 support is not expected to be implemented by "social" clients that deal with kind:1 notes or by longform clients that deal with kind:30023 articles.
+The purpose of this NIP is to allow an organization and classification of shared files. So that relays can filter and organize in any way that is of interest. With that, multiple types of filesharing clients can be created. NIP-94 support is not expected to be implemented by "social" clients that deal with `kind:1` notes or by longform clients that deal with `kind:30023` articles.
 
 ## Event format
 
@@ -14,7 +14,6 @@ This NIP specifies the use of the `1063` event type, having in `content` a descr
 
 * `url` the url to download the 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.
-* `"aes-256-gcm"` (optional)  key and nonce for AES-GCM encryption with tagSize always 128bits
 * `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>`
@@ -31,7 +30,6 @@ This NIP specifies the use of the `1063` event type, having in `content` a descr
   "kind": 1063,
   "tags": [
     ["url",<string with URI of file>],
-    ["aes-256-gcm",<key>, <iv>],
     ["m", <MIME type>],
     ["x",<Hash SHA-256>],
     ["size", <size of file in bytes>],

From 8136be6eab526de8bdb22436431ea75831846395 Mon Sep 17 00:00:00 2001
From: zmeyer44 <54515037+zmeyer44@users.noreply.github.com>
Date: Wed, 27 Dec 2023 08:26:15 -0600
Subject: [PATCH 085/263] Update 71.md

Changed view start and end time to seconds
---
 71.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/71.md b/71.md
index 0a60d61..1daee7b 100644
--- a/71.md
+++ b/71.md
@@ -102,7 +102,7 @@ The `.content` of these events is optional and could be a free-form note that ac
 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 `HH:MM:SS.sss`, timestamp of the user's end time in `HH:MM:SS.sss` 
+* `viewed` (optional, repeated) timestamp of the user's start time in seconds, timestamp of the user's end time in seconds 
 
 
 ```json

From f316b219f4389021addbca02f1cb383eb8cb36d2 Mon Sep 17 00:00:00 2001
From: zmeyer44 <54515037+zmeyer44@users.noreply.github.com>
Date: Fri, 29 Dec 2023 14:15:42 -0600
Subject: [PATCH 086/263] Update 71.md

Co-authored-by: Pablo Fernandez <pfer@me.com>
---
 71.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/71.md b/71.md
index 1daee7b..6b3fc0f 100644
--- a/71.md
+++ b/71.md
@@ -114,6 +114,7 @@ The list of tags are as follows:
   "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>],
   ]

From 54328d8979e5883922549293406bd77558fb34a7 Mon Sep 17 00:00:00 2001
From: zmeyer44 <54515037+zmeyer44@users.noreply.github.com>
Date: Fri, 29 Dec 2023 17:25:13 -0600
Subject: [PATCH 087/263] Removing "summary" tag

Content in the summary tag is duplicated in the .content field
---
 71.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/71.md b/71.md
index 6b3fc0f..3b8efca 100644
--- a/71.md
+++ b/71.md
@@ -26,7 +26,6 @@ The list of tags are as follows:
 * `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.
 * `title` (required) title of the video
 * `"published_at"`, for the timestamp in unix seconds (stringified) of the first time the video was published
-* `summary` (optional) summary/description of the video (same as `.content`)
 * `"aes-256-gcm"` (optional)  key and nonce for AES-GCM encryption with tagSize always 128bits
 * `x` containing the SHA-256 hexencoded string of the file.
 * `size` (optional) size of file in bytes
@@ -55,7 +54,6 @@ The list of tags are as follows:
     ["d", "<UUID>"],
 
     ["title", "<title of video>"],
-    ["summary", "<summary of video>"],
     ["thumb", "<thumbnail image for video>"],
     ["published_at", "<unix timestamp>"],
     ["alt", <description>],

From 27fef638e2460139cc9078427a0aec0ce4470517 Mon Sep 17 00:00:00 2001
From: Pablo Fernandez <p@f7z.io>
Date: Mon, 1 Jan 2024 02:08:56 +0000
Subject: [PATCH 088/263] index zap senders with P tag (#954)

---
 57.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/57.md b/57.md
index 759e203..6d89620 100644
--- a/57.md
+++ b/57.md
@@ -111,6 +111,7 @@ When a client sends a `zap request` event to a server's lnurl-pay callback URL,
 5. There should be a `relays` tag with the relays to send the `zap receipt` to.
 6. If there is an `amount` tag, it MUST be equal to the `amount` query parameter.
 7. If there is an `a` tag, it MUST be a valid event coordinate
+8. There MUST be 0 or 1 `P` tags. If there is one, it MUST be equal to the `zap receipt`'s `pubkey`.
 
 The event MUST then be stored for use later, when the invoice is paid.
 
@@ -128,7 +129,7 @@ The following should be true of the `zap receipt` event:
 
 - The `content` SHOULD be empty.
 - The `created_at` date SHOULD be set to the invoice `paid_at` date for idempotency.
-- `tags` MUST include the `p` tag AND optional `e` tag from the `zap request` AND optional `a` tag from the `zap request`.
+- `tags` MUST include the `p` tag (zap recipient) AND optional `e` tag from the `zap request` AND optional `a` tag from the `zap request` AND optional `P` tag from the pubkey of the zap request (zap sender).
 - The `zap receipt` MUST have a `bolt11` tag containing the description hash bolt11 invoice.
 - The `zap receipt` MUST contain a `description` tag which is the JSON-encoded invoice description.
 - `SHA256(description)` MUST match the description hash in the bolt11 invoice.
@@ -148,13 +149,13 @@ Example `zap receipt`:
     "kind": 9735,
     "tags": [
       ["p", "32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245"],
+      ["P", "97c70a44366a6535c145b333f973ea86dfdc2d7a99da618c40c64705ad98e322"],
       ["e", "3624762a1274dd9636e0c552b53086d70bc88c165bc4dc0f9e836a1eaf86c3b8"],
       ["bolt11", "lnbc10u1p3unwfusp5t9r3yymhpfqculx78u027lxspgxcr2n2987mx2j55nnfs95nxnzqpp5jmrh92pfld78spqs78v9euf2385t83uvpwk9ldrlvf6ch7tpascqhp5zvkrmemgth3tufcvflmzjzfvjt023nazlhljz2n9hattj4f8jq8qxqyjw5qcqpjrzjqtc4fc44feggv7065fqe5m4ytjarg3repr5j9el35xhmtfexc42yczarjuqqfzqqqqqqqqlgqqqqqqgq9q9qxpqysgq079nkq507a5tw7xgttmj4u990j7wfggtrasah5gd4ywfr2pjcn29383tphp4t48gquelz9z78p4cq7ml3nrrphw5w6eckhjwmhezhnqpy6gyf0"],
-      ["description", "{\"pubkey\":\"32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245\",\"content\":\"\",\"id\":\"d9cc14d50fcb8c27539aacf776882942c1a11ea4472f8cdec1dea82fab66279d\",\"created_at\":1674164539,\"sig\":\"77127f636577e9029276be060332ea565deaf89ff215a494ccff16ae3f757065e2bc59b2e8c113dd407917a010b3abd36c8d7ad84c0e3ab7dab3a0b0caa9835d\",\"kind\":9734,\"tags\":[[\"e\",\"3624762a1274dd9636e0c552b53086d70bc88c165bc4dc0f9e836a1eaf86c3b8\"],[\"p\",\"32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245\"],[\"relays\",\"wss://relay.damus.io\",\"wss://nostr-relay.wlvs.space\",\"wss://nostr.fmt.wiz.biz\",\"wss://relay.nostr.bg\",\"wss://nostr.oxtr.dev\",\"wss://nostr.v0l.io\",\"wss://brb.io\",\"wss://nostr.bitcoiner.social\",\"ws://monad.jb55.com:8080\",\"wss://relay.snort.social\"]]}"],
+      ["description", "{\"pubkey\":\"97c70a44366a6535c145b333f973ea86dfdc2d7a99da618c40c64705ad98e322\",\"content\":\"\",\"id\":\"d9cc14d50fcb8c27539aacf776882942c1a11ea4472f8cdec1dea82fab66279d\",\"created_at\":1674164539,\"sig\":\"77127f636577e9029276be060332ea565deaf89ff215a494ccff16ae3f757065e2bc59b2e8c113dd407917a010b3abd36c8d7ad84c0e3ab7dab3a0b0caa9835d\",\"kind\":9734,\"tags\":[[\"e\",\"3624762a1274dd9636e0c552b53086d70bc88c165bc4dc0f9e836a1eaf86c3b8\"],[\"p\",\"32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245\"],[\"relays\",\"wss://relay.damus.io\",\"wss://nostr-relay.wlvs.space\",\"wss://nostr.fmt.wiz.biz\",\"wss://relay.nostr.bg\",\"wss://nostr.oxtr.dev\",\"wss://nostr.v0l.io\",\"wss://brb.io\",\"wss://nostr.bitcoiner.social\",\"ws://monad.jb55.com:8080\",\"wss://relay.snort.social\"]]}"],
       ["preimage", "5d006d2cf1e73c7148e7519a4c68adc81642ce0e25a432b2434c99f97344c15f"]
     ],
     "content": "",
-    "sig": "b0a3c5c984ceb777ac455b2f659505df51585d5fd97a0ec1fdb5f3347d392080d4b420240434a3afd909207195dac1e2f7e3df26ba862a45afd8bfe101c2b1cc"
   }
 ```
 

From 3d8652ea147facb07adb51031e6b21f7e663dc10 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Mon, 1 Jan 2024 12:21:50 -0600
Subject: [PATCH 089/263] NIP-02, NIP-51: new tags should be added to the end
 of the list Fixes https://github.com/nostr-protocol/nips/issues/958

---
 02.md | 2 ++
 51.md | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/02.md b/02.md
index 8c47a5f..8b0aee1 100644
--- a/02.md
+++ b/02.md
@@ -27,6 +27,8 @@ For example:
 
 Every new following list that gets published overwrites the past ones, so it should contain all entries. Relays and clients SHOULD delete past following lists as soon as they receive a new one.
 
+Whenever new follows are added to an existing list, clients SHOULD append them to the end of the list, so they are stored in chronological order.
+
 ## Uses
 
 ### Follow list backup
diff --git a/51.md b/51.md
index f5a9a74..507c515 100644
--- a/51.md
+++ b/51.md
@@ -10,6 +10,8 @@ This NIP defines lists of things that users can create. Lists can contain refere
 
 Public items in a list are specified in the event `tags` array, while private items are specified in a JSON array that mimics the structure of the event `tags` array, but stringified and encrypted using the same scheme from [NIP-04](04.md) (the shared key is computed using the author's public and private key) and stored in the `.content`.
 
+When new items are added to an existing list, clients SHOULD append them to the end of the list, so they are stored in chronological order.
+
 ## Types of lists
 
 ## Standard lists

From 402c330ce9d7d0d4aadb6e73acbc8c9375e04594 Mon Sep 17 00:00:00 2001
From: GoodDaisy <90915921+GoodDaisy@users.noreply.github.com>
Date: Fri, 5 Jan 2024 11:59:49 +0800
Subject: [PATCH 090/263] Fix typo in 01.md

---
 01.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/01.md b/01.md
index ecac6f6..80ee792 100644
--- a/01.md
+++ b/01.md
@@ -116,7 +116,7 @@ Clients can send 3 types of messages, which must be JSON arrays, according to th
   * `["REQ", <subscription_id>, <filters1>, <filters2>, ...]`, used to request events and subscribe to new updates.
   * `["CLOSE", <subscription_id>]`, used to stop previous subscriptions.
 
-`<subscription_id>` is an arbitrary, non-empty string of max length 64 chars. It represents a subscription per connection. Relays MUST manage `<subscription_id>`s independently for each WebSocket connection. `<subscription_id>`s are not guarantueed to be globally unique.
+`<subscription_id>` is an arbitrary, non-empty string of max length 64 chars. It represents a subscription per connection. Relays MUST manage `<subscription_id>`s independently for each WebSocket connection. `<subscription_id>`s are not guaranteed to be globally unique.
 
 `<filtersX>` is a JSON object that determines what events will be sent in that subscription, it can have the following attributes:
 

From 8bfcbebae4d423cbf7b1b0c24ff4d1ad3964dca1 Mon Sep 17 00:00:00 2001
From: GoodDaisy <90915921+GoodDaisy@users.noreply.github.com>
Date: Fri, 5 Jan 2024 11:59:58 +0800
Subject: [PATCH 091/263] Fix typo in 50.md

---
 50.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/50.md b/50.md
index 2bdf1ff..9d1a54c 100644
--- a/50.md
+++ b/50.md
@@ -41,7 +41,7 @@ implementation details between relays.
 Clients MAY verify that events returned by a relay match the specified query in a way that suits the
 client's use case, and MAY stop querying relays that have low precision.
 
-Relays SHOULD exclude spam from search results by default if they supports some form of spam filtering.
+Relays SHOULD exclude spam from search results by default if they support some form of spam filtering.
 
 ## Extensions
 

From 2409f821a43fb42e40fdf0f348da6bb6855c2211 Mon Sep 17 00:00:00 2001
From: shuoer86 <129674997+shuoer86@users.noreply.github.com>
Date: Sat, 6 Jan 2024 09:47:07 +0800
Subject: [PATCH 092/263] fix typo 44.md

---
 44.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/44.md b/44.md
index 0efa482..f3071ea 100644
--- a/44.md
+++ b/44.md
@@ -161,7 +161,7 @@ validation rules, refer to BIP-340.
 ### Implementation pseudocode
 
 The following is a collection of python-like pseudocode functions which implement the above primitives,
-intended to guide impelmenters. A collection of implementations in different languages is available at https://github.com/paulmillr/nip44.
+intended to guide implementers. A collection of implementations in different languages is available at https://github.com/paulmillr/nip44.
 
 ```py
 # Calculates length of the padded byte array.
@@ -286,7 +286,7 @@ Example of a test vector from the file:
 The file also contains intermediate values. A quick guidance with regards to its usage:
 
 - `valid.get_conversation_key`: calculate conversation_key from secret key sec1 and public key pub2
-- `valid.get_message_keys`: calculate chacha_key, chacha_nocne, hmac_key from conversation_key and nonce
+- `valid.get_message_keys`: calculate chacha_key, chacha_nonce, hmac_key from conversation_key and nonce
 - `valid.calc_padded_len`: take unpadded length (first value), calculate padded length (second value)
 - `valid.encrypt_decrypt`: emulate real conversation. Calculate pub2 from sec2, verify conversation_key from (sec1, pub2), encrypt, verify payload, then calculate pub1 from sec1, verify conversation_key from (sec2, pub1), decrypt, verify plaintext.
 - `valid.encrypt_decrypt_long_msg`: same as previous step, but instead of a full plaintext and payload, their checksum is provided.

From 74a586d6ae04594987f1c950cfdbd5ca0e83542b Mon Sep 17 00:00:00 2001
From: shuoer86 <129674997+shuoer86@users.noreply.github.com>
Date: Sat, 6 Jan 2024 09:47:17 +0800
Subject: [PATCH 093/263] fix typo 53.md

---
 53.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/53.md b/53.md
index e17f965..fad2622 100644
--- a/53.md
+++ b/53.md
@@ -94,7 +94,7 @@ Common use cases include meeting rooms/workshops, watch-together activities, or
     ["title", "Adult Swim Metalocalypse"],
     ["summary", "Live stream from IPTV-ORG collection"],
     ["streaming", "https://adultswim-vodlive.cdn.turner.com/live/metalocalypse/stream.m3u8"],
-	["starts", "1687182672"]
+    ["starts", "1687182672"],
     ["status", "live"],
     ["t", "animation"],
     ["t", "iptv"],

From 13c9202ba39e351a08d034db6cd9194d7c989949 Mon Sep 17 00:00:00 2001
From: zmeyer44 <54515037+zmeyer44@users.noreply.github.com>
Date: Sun, 7 Jan 2024 15:32:03 +0000
Subject: [PATCH 094/263] Update 51.md to add support for video lists

---
 51.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/51.md b/51.md
index f5a9a74..a5ecd32 100644
--- a/51.md
+++ b/51.md
@@ -44,6 +44,7 @@ Aside from their main identifier, the `"d"` tag, sets can optionally have a `"ti
 | Relay sets    | 30002 | user-defined relay groups the user can easily pick and choose from during various operations | `"relay"` (relay URLs)                                                            |
 | Bookmark sets | 30003 | user-defined bookmarks categories , for when bookmarks must be in labeled separate groups    | `"e"` (kind:1 notes), `"a"` (kind:30023 articles), `"t"` (hashtags), `"r" (URLs)` |
 | Curation sets | 30004 | groups of articles picked by users as interesting and/or belonging to the same category      | `"a"` (kind:30023 articles), `"e"` (kind:1 notes)                                 |
+| Curation sets | 30005 | groups of videos picked by users as interesting and/or belonging to the same category      | `"a"` (kind:34235 videos), `"e"` (kind:1 notes)                                 |
 | 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))                                                   |
 

From ad40fbdab3c01be0fe553d8da41ff60863b9c4f0 Mon Sep 17 00:00:00 2001
From: zmeyer44 <54515037+zmeyer44@users.noreply.github.com>
Date: Sun, 7 Jan 2024 20:00:04 +0000
Subject: [PATCH 095/263] remove kind 1 option

---
 51.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/51.md b/51.md
index a5ecd32..38e772d 100644
--- a/51.md
+++ b/51.md
@@ -44,7 +44,7 @@ Aside from their main identifier, the `"d"` tag, sets can optionally have a `"ti
 | Relay sets    | 30002 | user-defined relay groups the user can easily pick and choose from during various operations | `"relay"` (relay URLs)                                                            |
 | Bookmark sets | 30003 | user-defined bookmarks categories , for when bookmarks must be in labeled separate groups    | `"e"` (kind:1 notes), `"a"` (kind:30023 articles), `"t"` (hashtags), `"r" (URLs)` |
 | Curation sets | 30004 | groups of articles picked by users as interesting and/or belonging to the same category      | `"a"` (kind:30023 articles), `"e"` (kind:1 notes)                                 |
-| Curation sets | 30005 | groups of videos picked by users as interesting and/or belonging to the same category      | `"a"` (kind:34235 videos), `"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)                               |
 | 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))                                                   |
 

From cfc8dfce8936867826bbf2cb79c3a8c8b21789fe Mon Sep 17 00:00:00 2001
From: vuittont60 <81072379+vuittont60@users.noreply.github.com>
Date: Mon, 8 Jan 2024 13:50:52 +0800
Subject: [PATCH 096/263] nip-46: fix typo

---
 46.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/46.md b/46.md
index 1f8e6c8..05247c5 100644
--- a/46.md
+++ b/46.md
@@ -34,7 +34,7 @@ The signer scans the QR code and sends a `connect` message to the client in the
 
 ## Event payloads
 
-Event payloads are [NIP-04](04.md)-encrypted JSON blobs that look like JSONRPC messages (their format is specified inside the `.content` of the event formats nelow).
+Event payloads are [NIP-04](04.md)-encrypted JSON blobs that look like JSONRPC messages (their format is specified inside the `.content` of the event formats below).
 
 Events sent by the client to the remote signer have the following format:
 

From 0cd480dd84a3cd5fd693edba8abdf4a424ddd033 Mon Sep 17 00:00:00 2001
From: vuittont60 <81072379+vuittont60@users.noreply.github.com>
Date: Mon, 8 Jan 2024 13:51:27 +0800
Subject: [PATCH 097/263] nip-58: fix typo

---
 58.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/58.md b/58.md
index e2a9f20..0ecef25 100644
--- a/58.md
+++ b/58.md
@@ -28,7 +28,7 @@ The following tags MAY be present:
 - A `name` tag with a short name for the badge.
 - `image` tag whose value is the URL of a high-resolution image representing the badge. The second value optionally specifies the dimensions of the image as  `width`x`height` in pixels. Badge recommended dimensions is 1024x1024 pixels.
 - A `description` tag whose value MAY contain a textual representation of the
-image, the meaning behind the badge, or the reason of it's issuance.
+image, the meaning behind the badge, or the reason of its issuance.
 - One or more `thumb` tags whose first value is an URL pointing to a thumbnail version of the image referenced in the `image` tag. The second value optionally specifies the dimensions of the thumbnail as `width`x`height` in pixels.
 
 ### Badge Award event

From b0e6c01321633f5e0de6ebf6676f018a218459a9 Mon Sep 17 00:00:00 2001
From: arthurfranca <arthur.a.franca@gmail.com>
Date: Mon, 8 Jan 2024 14:05:01 -0300
Subject: [PATCH 098/263] NIP-96 - HTTP File Storage Integration (#547)

* Add NIP-95 - File Storage

* Add missing response info

* Make it clear that is is an HTTP file storage server integration

* Add monetization suggestion

* Use zap split tags for monetization suggestion

* Add resize option

* Add Zap Gates Integration

* Replace /nip96 convention with /.well-known/nostr.json configuration

* Relays can choose to also act as HTTP file storage server

* Remove nip96 tag in favor of x tags third element

* Fix typo

* Remove redirect cooperation

* Replaced 422 with 400 status code

* Update 96.md

Co-authored-by: Jon Staab <jstaab@protonmail.com>

* Update 96.md

Co-authored-by: Jon Staab <jstaab@protonmail.com>

* Update 96.md

Co-authored-by: Jon Staab <jstaab@protonmail.com>

* Update 96.md

Co-authored-by: Jon Staab <jstaab@protonmail.com>

* Update 96.md

Co-authored-by: Jon Staab <jstaab@protonmail.com>

* Update 96.md

Co-authored-by: Jon Staab <jstaab@protonmail.com>

* Update 96.md

Co-authored-by: Jon Staab <jstaab@protonmail.com>

* Make file expiration a range and add terms_of_service

* Add optional content_type field

* Add plans and tos

* Remove monetization

* Apply minor fixes

* Update 96.md

Co-authored-by: Semisol <45574030+Semisol@users.noreply.github.com>

* Fix after review

* Add kind 10096

* Apply suggestions

* Add suggestions

* Remove duplicate field

* Add optional is_nip98_required plan config

* Add suggestions

* Replace x with ox tag for original file hash

* Make minor changes

* Remove nip96 namespace response field

* Add note about alternative file processing flow

* Simplify processing flow

* Add nostrcheck to server list

* Add audio/* example

* Explain what metadata to show before processing is done

* Add nostrage to list

* Add eta

* Add sove to list and replace eta with percentage

* Fix status code

* Add nostr.build to list

* Add sovbit

* Add optional extra http servers to ox tag

* Add void.cat to list

* Small fix

* Remove ox third array element

---------

Co-authored-by: Jon Staab <jstaab@protonmail.com>
Co-authored-by: Semisol <45574030+Semisol@users.noreply.github.com>
---
 94.md     |   2 +
 96.md     | 302 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 README.md |   1 +
 3 files changed, 305 insertions(+)
 create mode 100644 96.md

diff --git a/94.md b/94.md
index 84a3d12..eb8117a 100644
--- a/94.md
+++ b/94.md
@@ -15,6 +15,7 @@ This NIP specifies the use of the `1063` event type, having in `content` a descr
 * `url` the url to download the 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.
 * `x` containing the SHA-256 hexencoded string of the file.
+* `ox` containing the SHA-256 hexencoded string of the original file, before any transformations done by the upload server
 * `size` (optional) size of file in bytes
 * `dim` (optional) size of file in pixels in the form `<width>x<height>`
 * `magnet` (optional) URI to magnet file
@@ -32,6 +33,7 @@ This NIP specifies the use of the `1063` event type, having in `content` a descr
     ["url",<string with URI of file>],
     ["m", <MIME type>],
     ["x",<Hash SHA-256>],
+    ["ox",<Hash SHA-256>],
     ["size", <size of file in bytes>],
     ["dim", <size of file in pixels>],
     ["magnet",<magnet URI> ],
diff --git a/96.md b/96.md
new file mode 100644
index 0000000..2641b2a
--- /dev/null
+++ b/96.md
@@ -0,0 +1,302 @@
+NIP-96
+======
+
+HTTP File Storage Integration
+-----------------------------
+
+`draft` `optional` `author:arthurfranca` `author:Semisol` `author:staab` `author:v0l` `author:bndw` `author:michaelhall923` `author:fishcakeday` `author:quentintaranpino`
+
+## Introduction
+
+This NIP defines a REST API for HTTP file storage servers intended to be used in conjunction with the nostr network.
+The API will enable nostr users to upload files and later reference them by url on nostr notes.
+
+The spec DOES NOT use regular nostr events through websockets for
+storing, requesting nor retrieving data because, for simplicity, the server
+will not have to learn anything about nostr relays.
+
+## Server Adaptation
+
+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
+{
+  // Required
+  // File upload and deletion are served from this url
+  // Also downloads if "download_url" field is absent or empty string
+  "api_url": "https://your-file-server.example/custom-api-path",
+  // Optional
+  // If absent, downloads are served from the api_url
+  "download_url": "https://a-cdn.example/a-path",
+  // Optional
+  // Note: This field is not meant to be set by HTTP Servers.
+  // Use this if you are a nostr relay using your /.well-known/nostr/nip96.json
+  // just to redirect to someone else's http file storage server's /.well-known/nostr/nip96.json
+  // In this case, "api_url" field must be an empty string
+  "delegated_to_url": "https://your-file-server.example",
+  // Optional
+  "supported_nips": [60],
+  // Optional
+  "tos_url": "https://your-file-server.example/terms-of-service",
+  // Optional
+  "content_types": ["image/jpeg", "video/webm", "audio/*"],
+  // Optional
+  "plans": {
+    // "free" is the only standardized plan key and
+    // clients may use its presence to learn if server offers free storage
+    "free": {
+      "name": "Free Tier",
+      // Default is true
+      // All plans MUST support NIP-98 uploads
+      // but some plans may also allow uploads without it
+      "is_nip98_required": true,
+      "url": "https://...", // plan's landing page if there is one
+      "max_byte_size": 10485760,
+      // Range in days / 0 for no expiration
+      // [7, 0] means it may vary from 7 days to unlimited persistence,
+      // [0, 0] means it has no expiration
+      // early expiration may be due to low traffic or any other factor
+      "file_expiration": [14, 90],
+      "media_transformations": {
+        "image": [
+          'resizing'
+        ]
+      }
+    }
+  }
+}
+```
+
+### Relay Hints
+
+Note: This section is not meant to be used by HTTP Servers.
+
+A nostr relay MAY redirect to someone else's HTTP file storage server by
+adding a `/.well-known/nostr/nip96.json` with "delegated_to_url" field
+pointing to the url where the server hosts its own
+`/.well-known/nostr/nip96.json`. In this case, the "api_url" field must
+be an empty string and all other fields must be absent.
+
+If the nostr relay is also an HTTP file storage server,
+it must use the "api_url" field instead.
+
+### List of Supporting File Storage Servers
+
+| Name          | Domain                    |
+| ------------- | ------------------------- |
+| nostrcheck.me | https://nostrcheck.me     |
+| nostrage      | https://nostrage.com      |
+| sove          | https://sove.rent         |
+| nostr.build   | https://nostr.build       |
+| sovbit        | https://files.sovbit.host |
+| void.cat      | https://void.cat          |
+
+## Upload
+
+A file can be uploaded one at a time to `https://your-file-server.example/custom-api-path` (route from `https://your-file-server.example/.well-known/nostr/nip96.json` "api_url" field) as `multipart/form-data` content type using `POST` method with the file object set to the `file` form data field.
+
+`Clients` must add an [NIP-98](98.md) `Authorization` header (**optionally** with the encoded `payload` tag set to the base64-encoded 256-bit SHA-256 hash of the file - not the hash of the whole request body).
+If using an html form, use an `Authorization` form data field instead.
+
+These following **optional** form data fields MAY be used by `servers` and SHOULD be sent by `clients`:
+- `expiration`: string of the UNIX timestamp in seconds. Empty string if file should be stored forever. The server isn't required to honor this;
+- `size`: string of the file byte size. This is just a value the server can use to reject early if the file size exceeds the server limits;
+- `alt`: (recommended) strict description text for visibility-impaired users;
+- `caption`: loose description;
+- `media_type`: "avatar" or "banner". Informs the server if the file will be used as an avatar or banner. If absent, the server will interpret it as a normal upload, without special treatment;
+- `content_type`: mime type such as "image/jpeg". This is just a value the server can use to reject early if the mime type isn't supported.
+
+
+Others custom form data fields may be used depending on specific `server` support.
+The `server` isn't required to store any metadata sent by `clients`.
+
+Note for `clients`: if using an HTML form, it is important for the `file` form field to be the **last** one, or be re-ordered right before sending or be appended as the last field of XHR2's FormData object.
+
+The `filename` embedded in the file may not be honored by the `server`, which could internally store just the SHA-256 hash value as the file name, ignoring extra metadata.
+The hash is enough to uniquely identify a file, that's why it will be used on the "download" and "delete" routes.
+
+The `server` MUST link the user's `pubkey` string (which is embedded in the decoded header value) as the owner of the file so to later allow them to delete the file.
+Note that if a file with the same hash of a previously received file (so the same file) is uploaded by another user, the server doesn't need to store the new file.
+It should just add the new user's `pubkey` to the list of the owners of the already stored file with said hash (if it wants to save space by keeping just one copy of the same file, because multiple uploads of the same file results in the same file hash).
+
+The `server` MAY also store the `Authorization` header/field value (decoded or not) for accountability purpose as this proves that the user with the unique pubkey did ask for the upload of the file with a specific hash. However, storing the pubkey is sufficient to establish ownership.
+
+The `server` MUST reject with 413 Payload Too Large if file size exceeds limits.
+
+The `server` MUST reject with 400 Bad Request status if some fields are invalid.
+
+The `server` MUST reply to the upload with 200 OK status if the `payload` tag value contains an already used SHA-256 hash (if file is already owned by the same pubkey) or reject the upload with 403 Forbidden status if it isn't the same of the received file.
+
+The `server` MAY reject the upload with 402 Payment Required status if the user has a pending payment (Payment flow is not strictly required. Server owners decide if the storage is free or not. Monetization schemes may be added later to correlated NIPs.).
+
+On successful uploads the `server` MUST reply with **201 Created** HTTP status code or **202 Accepted** if a `processing_url` field is added
+to the response so that the `client` can follow the processing status (see [Delayed Processing](#delayed-processing) section).
+
+The upload response is a json object as follows:
+
+```js
+{
+  // "success" if successful or "error" if not
+  status: "success",
+  // Free text success, failure or info message
+  message: "Upload successful.",
+  // Optional. See "Delayed Processing" section
+  processing_url: "...",
+  // This uses the NIP-94 event format but DO NOT need
+  // to fill some fields like "id", "pubkey", "created_at" and "sig"
+  //
+  // This holds the download url ("url"),
+  // the ORIGINAL file hash before server transformations ("ox")
+  // and, optionally, all file metadata the server wants to make available
+  //
+  // nip94_event field is absent if unsuccessful upload
+  nip94_event: {
+    // Required tags: "url" and "ox"
+    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.
+      //
+      // Note we appended .png file extension to the `ox` value
+      // (it is optional but extremely recommended to add the extension as it will help nostr clients
+      // with detecting the file type by using regular expression)
+      //
+      // Could also be any url to download the file
+      // (using or not using the /.well-known/nostr/nip96.json's "download_url" prefix),
+      // for load balancing purposes for example.
+      ["url", "https://your-file-server.example/custom-api-path/719171db19525d9d08dd69cb716a18158a249b7b3b3ec4bbdec5698dca104b7b.png"],
+      // SHA-256 hash of the ORIGINAL file, before transformations.
+      // The server MUST store it even though it represents the ORIGINAL file because
+      // users may try to download/delete the transformed file using this value
+      ["ox", "719171db19525d9d08dd69cb716a18158a249b7b3b3ec4bbdec5698dca104b7b"],
+      // Optional. SHA-256 hash of the saved file after any server transformations.
+      // 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"]
+      // 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: ""
+  },
+  // ... other custom fields (please consider adding them to this NIP or to NIP-94 tags)
+}
+```
+
+Note that if the server didn't apply any transformation to the received file, both `nip94_event.tags.*.ox` and `nip94_event.tags.*.x` fields will have the same value. The server MUST link the saved file to the SHA-256 hash of the **original** file before any server transformations (the `nip94_event.tags.*.ox` tag value). The **original** file's SHA-256 hash will be used to identify the saved file when downloading or deleting it.
+
+`Clients` may upload the same file to one or many `servers`.
+After successful upload, the `client` may optionally generate and send to any set of nostr `relays` a [NIP-94](94.md) event by including the missing fields.
+
+Alternatively, instead of using NIP-94, the `client` can share or embed on a nostr note just the above url with added "ox" [NIP-54](54.md) inline metadata field and optionally other ones.
+
+### Delayed Processing
+
+Sometimes the server may want to place the uploaded file in a processing queue for deferred file processing.
+
+In that case, the server MUST serve the original file while the processing isn't done, then swap the original file for the processed one when the processing is over. The upload response is the same as usual but some optional metadata like `nip94_event.tags.*.x` and `nip94_event.tags.*.size` won't be available.
+
+The expected resulting metadata that is known in advance should be returned on the response.
+For example, if the file processing would change a file from "jpg" to "webp",
+use ".webp" extension on the `nip94_event.tags.*.url` field value and set "image/webp" to the `nip94_event.tags.*.m` field.
+If some metadata are unknown before processing ends, omit them from the response.
+
+The upload response MAY include a `processing_url` field informing a temporary url that may be used by clients to check if
+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:
+
+```
+{
+  // 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.
+}
+```
+
+When the processing is over, the server replies at the `processing_url` url with **201 Created** status and a regular successful JSON response already mentioned before (now **without** a `processing_url` field), possibly including optional metadata at `nip94_event.tags.*` fields
+that weren't available before processing.
+
+### File compression
+
+File compression and other transformations like metadata stripping can be applied by the server.
+However, for all file actions, such as download and deletion, the **original** file SHA-256 hash is what identifies the file in the url string.
+
+## Download
+
+`Servers` must make available the route `https://your-file-server.example/custom-api-path/<sha256-file-hash>(.ext)` (route taken from `https://your-file-server.example/.well-known/nostr/nip96.json` "api_url" or "download_url" field) with `GET` method for file download.
+
+The primary file download url informed at the upload's response field `nip94_event.tags.*.url`
+can be that or not (it can be any non-standard url the server wants).
+If not, the server still MUST also respond to downloads at the standard url
+mentioned on the previous paragraph, to make it possible for a client
+to try downloading a file on any NIP-96 compatible server by knowing just the SHA-256 file hash.
+
+Note that the "\<sha256-file-hash\>" part is from the **original** file, **not** from the **transformed** file if the uploaded file went through any server transformation.
+
+Supporting ".ext", meaning "file extension", is required for `servers`. It is optional, although recommended, for `clients` to append it to the path.
+When present it may be used by `servers` to know which `Content-Type` header to send (e.g.: "Content-Type": "image/png" for ".png" extension).
+The file extension may be absent because the hash is the only needed string to uniquely identify a file.
+
+Example: `https://your-file-server.example/custom-api-path/719171db19525d9d08dd69cb716a18158a249b7b3b3ec4bbdec5698dca104b7b.png`
+
+### Media Transformations
+
+`Servers` may respond to some media transformation query parameters and ignore those they don't support by serving
+the original media file without transformations.
+
+#### Image Transformations
+
+##### Resizing
+
+Upon upload, `servers` may create resized image variants, such as thumbnails, respecting the original aspect ratio.
+`Clients` may use the `w` query parameter to request an image version with the desired pixel width.
+`Servers` can then serve the variant with the closest width to the parameter value
+or an image variant generated on the fly.
+
+Example: `https://your-file-server.example/custom-api-path/<sha256-file-hash>.png?w=32`
+
+## Deletion
+
+`Servers` must make available the route `https://deletion.domain/deletion-path/<sha256-file-hash>(.ext)` (route taken from `https://your-file-server.example/.well-known/nostr/nip96.json` "api_url" field) with `DELETE` method for file deletion.
+
+Note that the "\<sha256-file-hash\>" part is from the **original** file, **not** from the **transformed** file if the uploaded file went through any server transformation.
+
+The extension is optional as the file hash is the only needed file identification.
+
+`Clients` should send a `DELETE` request to the server deletion route in the above format. It must include a NIP-98 `Authorization` header.
+
+The `server` should reject deletes from users other than the original uploader. The `pubkey` encoded on the header value identifies the user.
+
+It should be noted that more than one user may have uploaded the same file (with the same hash). In this case, a delete must not really delete the file but just remove the user's `pubkey` from the file owners list (considering the server keeps just one copy of the same file, because multiple uploads of the same file results
+in the same file hash).
+
+The successfull response is a 200 OK one with just basic JSON fields:
+
+```
+{
+  status: "success",
+  message: "File deleted."
+}
+```
+
+## Selecting a Server
+
+Note: HTTP File Storage Server developers may skip this section. This is meant for client developers.
+
+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
+{
+  // ...
+  "kind": 10096,
+  "content": "",
+  "tags": [
+    ["server", "https://file.server.one"],
+    ["server", "https://file.server.two"]
+  ]
+}
+```
diff --git a/README.md b/README.md
index bf340a8..678818d 100644
--- a/README.md
+++ b/README.md
@@ -72,6 +72,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 - [NIP-89: Recommended Application Handlers](89.md)
 - [NIP-90: Data Vending Machines](90.md)
 - [NIP-94: File Metadata](94.md)
+- [NIP-96: HTTP File Storage Integration](96.md)
 - [NIP-98: HTTP Auth](98.md)
 - [NIP-99: Classified Listings](99.md)
 

From 4d32f3a1dbdf056172023df71d18dacd8e804e4b Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Tue, 9 Jan 2024 12:35:41 +0900
Subject: [PATCH 099/263] Remove authors

---
 96.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/96.md b/96.md
index 2641b2a..661bd45 100644
--- a/96.md
+++ b/96.md
@@ -4,7 +4,7 @@ NIP-96
 HTTP File Storage Integration
 -----------------------------
 
-`draft` `optional` `author:arthurfranca` `author:Semisol` `author:staab` `author:v0l` `author:bndw` `author:michaelhall923` `author:fishcakeday` `author:quentintaranpino`
+`draft` `optional`
 
 ## Introduction
 

From 56610771b6b0c61b2269fc16f163a004b585f726 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ioan=20Biz=C4=83u?= <i@ibz.me>
Date: Tue, 9 Jan 2024 13:35:40 +0200
Subject: [PATCH 100/263] Add auctions to NIP-15. (#859)

* Add auctions to NIP-15.

* Update 15.md

Co-authored-by: Vlad Stan <stan.v.vlad@gmail.com>

* Address comments from @motorina0.

* Remove reference to removed type=10.

---------

Co-authored-by: Vlad Stan <stan.v.vlad@gmail.com>
---
 15.md | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 77 insertions(+), 1 deletion(-)

diff --git a/15.md b/15.md
index 1c3154a..e2ba639 100644
--- a/15.md
+++ b/15.md
@@ -149,7 +149,6 @@ The `merchant` and the `customer` can exchange JSON messages that represent diff
 | 1            | Merchant | Payment Request     |
 | 2            | Merchant | Order Status Update |
 
-
 ### Step 1: `customer` order (event)
 The below json goes in content of [NIP04](https://github.com/nostr-protocol/nips/blob/master/04.md).
 
@@ -229,7 +228,9 @@ The below json goes in `content` of [NIP04](https://github.com/nostr-protocol/ni
   "shipped": <bool: has been shipped>,
 }
 ```
+
 ## Customize Marketplace
+
 Create a customized user experience using the `naddr` from [NIP-19](https://github.com/nostr-protocol/nips/blob/master/19.md#shareable-identifiers-with-extra-metadata). The use of `naddr` enables easy sharing of marketplace events while incorporating a rich set of metadata. This metadata can include relays, merchant profiles, and more. Subsequently, it allows merchants to be grouped into a market, empowering the market creator to configure the marketplace's user interface and user experience, and share that marketplace. This customization can encompass elements such as market name, description, logo, banner, themes, and even color schemes, offering a tailored and unique marketplace experience.
 
 ### Event `30019`: Create or update marketplace UI/UX
@@ -253,6 +254,81 @@ Create a customized user experience using the `naddr` from [NIP-19](https://gith
 
 This event leverages naddr to enable comprehensive customization and sharing of marketplace configurations, fostering a unique and engaging marketplace environment.
 
+## Auctions
+
+### Event `30020`: Create or update a product sold as an auction
+
+**Event Content**:
+```json
+{
+    "id": <String, UUID generated by the merchant. Sequential IDs (`0`, `1`, `2`...) are discouraged>,
+    "stall_id": <String, UUID of the stall to which this product belong to>,
+    "name": <String, product name>,
+    "description": <String (optional), product description>,
+    "images": <[String], array of image URLs, optional>,
+    "starting_bid": <int>,
+    "start_date": <int (optional) UNIX timestamp, date the auction started / will start>,
+    "duration": <int, number of seconds the auction will run for, excluding eventual time extensions that might happen>,
+    "specs": [
+        [<String, spec key>, <String, spec value>]
+    ],
+    "shipping": [
+        {
+            "id": <String, UUID of the shipping zone. Must match one of the zones defined for the stall>,
+            "cost": <float, extra cost for shipping. The currency is defined at the stall level>,
+        }
+    ]
+}
+```
+
+> [!NOTE]
+> Items sold as an auction are very similar in structure to fixed-price items, with some important differences worth noting.
+
+* The `start_date` can be set to a date in the future if the auction is scheduled to start on that date, or can be omitted if the start date is unknown/hidden. If the start date is not specified, the auction will have to be edited later to set an actual date.
+
+* The auction runs for an initial number of seconds after the `start_date`, specified by `duration`.
+
+### Event `1021`: Bid
+
+```json
+{
+    "content": <int, amount of sats>,
+    "tags": [["e", <event ID of the auction to bid on>]],
+}
+```
+
+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!
+
+### Event `1022`: Bid confirmation
+
+**Event Content**:
+
+```json
+{
+    "status": <String, "accepted" | "rejected" | "pending" | "winner">,
+    "message": <String (optional)>,
+    "duration_extended": <int (optional), number of seconds>,
+}
+```
+
+**Event Tags**:
+```json
+  "tags": [["e" <event ID of the bid being confirmed>], ["e", <event ID of the auction>]],
+```
+
+Bids should be confirmed by the merchant before being considered as valid by other clients. So clients should subscribe to *bid confirmation* events (kind `1022`) for every auction that they follow, in addition to the actual bids and should check that the pubkey of the bid confirmation matches the pubkey of the merchant (in addition to checking the signature).
+
+The `content` field is a JSON which includes *at least* a `status`. `winner` is how the *winning bid* is replied to after the auction ends and the winning bid is picked by the merchant.
+
+The reasons for which a bid can be marked as `rejected` or `pending` are up to the merchant's implementation and configuration - they could be anything from basic validation errors (amount too low) to the bidder being blacklisted or to the bidder lacking sufficient *trust*, which could lead to the bid being marked as `pending` until sufficient verification is performed. The difference between the two is that `pending` bids *might* get approved after additional steps are taken by the bidder, whereas `rejected` bids can not be later approved.
+
+An additional `message` field can appear in the `content` JSON to give further context as of why a bid is `rejected` or `pending`.
+
+Another thing that can happen is - if bids happen very close to the end date of the auction - for the merchant to decide to extend the auction duration for a few more minutes. This is done by passing a `duration_extended` field as part of a bid confirmation, which would contain a number of seconds by which the initial duration is extended. So the actual end date of an auction is always `start_date + duration + (SUM(c.duration_extended) FOR c in all confirmations`.
+
 ## Customer support events
 
 Customer support is handled over whatever communication method was specified. If communicating via nostr, NIP-04 is used https://github.com/nostr-protocol/nips/blob/master/04.md.

From 8331354947f2d577e13eb5da4a56133071cb1019 Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Wed, 10 Jan 2024 10:43:30 -0300
Subject: [PATCH 101/263] remove NIP-52 label cruft.

---
 52.md | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/52.md b/52.md
index 4ec6836..5ac116b 100644
--- a/52.md
+++ b/52.md
@@ -187,10 +187,8 @@ The `.content` of these events is optional and should be a free-form note that a
 The list of tags are as follows:
 * `a` (required) reference tag to kind `31922` or `31923` calendar event being responded to.
 * `d` (required) universally unique identifier. Generated by the client creating the calendar event RSVP.
-* `L` (required) label namespace of `status` per [NIP-32](32.md)
-* `l` (required) label of `accepted`, `declined`, or `tentative` under the label namespace of `status` per [NIP-32](32.md). Determines attendance status to the referenced calendar event.
-* `L` (optional) label namespace of `freebusy` per [NIP-32](32.md). Exists if and only if corresponding `l` tag under the same label namespace exists.
-* `l` (optional) label of `free` or `busy` under the label namespace of `freebusy` per [NIP-32](32.md). 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`. Exists if and only if corresponding `l` tag under the same label namespace exists.
+* `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`.
 
 ```json
 {
@@ -202,10 +200,8 @@ The list of tags are as follows:
   "tags": [
     ["a", "<31922 or 31923>:<calendar event author pubkey>:<d-identifier of calendar event>", "<optional relay url>"],
     ["d", "<UUID>"],
-    ["L", "status"],
-    ["l", "<accepted/declined/tentative>", "status"],
-    ["L", "freebusy"],
-    ["l", "<free/busy>", "freebusy"]
+    ["status", "<accepted/declined/tentative>"],
+    ["fb", "<free/busy>"],
   ]
 }
 ```

From 4b4e9fabfd66a3200222b3b2e71946c2640e701f Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Sat, 13 Jan 2024 01:23:01 +0900
Subject: [PATCH 102/263] Add kind and tag for NIP-96

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 678818d..cf3827e 100644
--- a/README.md
+++ b/README.md
@@ -118,6 +118,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `10007`       | Search relays list         | [51](51.md)              |
 | `10015`       | Interests list             | [51](51.md)              |
 | `10030`       | User emoji list            | [51](51.md)              |
+| `10096`       | File storage server list   | [96](96.md)              |
 | `13194`       | Wallet Info                | [47](47.md)              |
 | `21000`       | Lightning Pub RPC          | [Lightning.Pub][lnpub]   |
 | `22242`       | Client Authentication      | [42](42.md)              |
@@ -220,6 +221,7 @@ Please update these lists when proposing NIPs introducing new event kinds.
 | `published_at`    | unix timestamp (string)              | --                   | [23](23.md)                           |
 | `relay`           | relay url                            | --                   | [42](42.md)                           |
 | `relays`          | relay list                           | --                   | [57](57.md)                           |
+| `server`          | file storage server url              | --                   | [96](96.md)                           |
 | `subject`         | subject                              | --                   | [14](14.md)                           |
 | `summary`         | article summary                      | --                   | [23](23.md)                           |
 | `thumb`           | badge thumbnail                      | dimensions in pixels | [58](58.md)                           |

From 20d33785fc2e2884f28bece04e4fab679b621ec8 Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Sat, 13 Jan 2024 03:46:59 +0900
Subject: [PATCH 103/263] Remove NIP-54 mention temporarily (#981)

* Remove NIP-54 mention temporarily

* Update 96.md

Co-authored-by: arthurfranca <arthur.a.franca@gmail.com>

---------

Co-authored-by: arthurfranca <arthur.a.franca@gmail.com>
---
 96.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/96.md b/96.md
index 661bd45..d8ea105 100644
--- a/96.md
+++ b/96.md
@@ -189,7 +189,7 @@ Note that if the server didn't apply any transformation to the received file, bo
 `Clients` may upload the same file to one or many `servers`.
 After successful upload, the `client` may optionally generate and send to any set of nostr `relays` a [NIP-94](94.md) event by including the missing fields.
 
-Alternatively, instead of using NIP-94, the `client` can share or embed on a nostr note just the above url with added "ox" [NIP-54](54.md) inline metadata field and optionally other ones.
+Alternatively, instead of using NIP-94, the `client` can share or embed on a nostr note just the above url.
 
 ### Delayed Processing
 

From d8d75d9b19e6c66f7d75c771e784cd9dee4d2320 Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Tue, 16 Jan 2024 23:28:23 +0900
Subject: [PATCH 104/263] Fix some minor nitpicks in NIP-15 and NIP-51

---
 15.md | 20 ++++++++++----------
 51.md | 14 +++++++-------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/15.md b/15.md
index e2ba639..55814fb 100644
--- a/15.md
+++ b/15.md
@@ -56,7 +56,7 @@ A merchant can publish these events:
       "id": <string, id of the shipping zone, generated by the merchant>,
       "name": <string (optional), zone name>,
       "cost": <float, base cost for shipping. The currency is defined at the stall level>,
-      "regions": [<string, regions included in this zone>],
+      "regions": [<string, regions included in this zone>]
     }
   ]
 }
@@ -101,7 +101,7 @@ Fields that are not self-explanatory:
   "shipping": [
     {
       "id": <string, id of the shipping zone (must match one of the zones defined for the stall)>,
-      "cost": <float, extra cost for shipping. The currency is defined at the stall level>,
+      "cost": <float, extra cost for shipping. The currency is defined at the stall level>
     }
   ]
 }
@@ -139,7 +139,7 @@ Fields that are not self-explanatory:
 
 ## Checkout events
 
-All checkout events are sent as JSON strings using ([NIP04](https://github.com/nostr-protocol/nips/blob/master/04.md)).
+All checkout events are sent as JSON strings using ([NIP-04](https://github.com/nostr-protocol/nips/blob/master/04.md)).
 
 The `merchant` and the `customer` can exchange JSON messages that represent different actions. Each `JSON` message `MUST` have a `type` field indicating the what the JSON represents. Possible types:
 
@@ -150,19 +150,19 @@ The `merchant` and the `customer` can exchange JSON messages that represent diff
 | 2            | Merchant | Order Status Update |
 
 ### Step 1: `customer` order (event)
-The below json goes in content of [NIP04](https://github.com/nostr-protocol/nips/blob/master/04.md).
+The below JSON goes in content of [NIP-04](https://github.com/nostr-protocol/nips/blob/master/04.md).
 
 ```json
 {
   "id": <string, id generated by the customer>,
   "type": 0,
   "name": <string (optional), ???>,
-  "address": <string (optional), for physical goods an address should be provided>
+  "address": <string (optional), for physical goods an address should be provided>,
   "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>,
-    "email": <string (optional), if the customer wants to be contacted by email>,
+    "email": <string (optional), if the customer wants to be contacted by email>
   },
   "items": [
     {
@@ -182,7 +182,7 @@ _Open_: is `contact.nostr` required?
 
 Sent back from the merchant for payment. Any payment option is valid that the merchant can check.
 
-The below json goes in `content` of [NIP04](https://github.com/nostr-protocol/nips/blob/master/04.md).
+The below JSON goes in `content` of [NIP-04](https://github.com/nostr-protocol/nips/blob/master/04.md).
 
 `payment_options`/`type` include:
 
@@ -217,7 +217,7 @@ The below json goes in `content` of [NIP04](https://github.com/nostr-protocol/ni
 
 Once payment has been received and processed.
 
-The below json goes in `content` of [NIP04](https://github.com/nostr-protocol/nips/blob/master/04.md).
+The below JSON goes in `content` of [NIP-04](https://github.com/nostr-protocol/nips/blob/master/04.md).
 
 ```json
 {
@@ -275,7 +275,7 @@ This event leverages naddr to enable comprehensive customization and sharing of
     "shipping": [
         {
             "id": <String, UUID of the shipping zone. Must match one of the zones defined for the stall>,
-            "cost": <float, extra cost for shipping. The currency is defined at the stall level>,
+            "cost": <float, extra cost for shipping. The currency is defined at the stall level>
         }
     ]
 }
@@ -310,7 +310,7 @@ Bids are simply events of kind `1021` with a `content` field specifying the amou
 {
     "status": <String, "accepted" | "rejected" | "pending" | "winner">,
     "message": <String (optional)>,
-    "duration_extended": <int (optional), number of seconds>,
+    "duration_extended": <int (optional), number of seconds>
 }
 ```
 
diff --git a/51.md b/51.md
index 47ed899..9a1639f 100644
--- a/51.md
+++ b/51.md
@@ -18,18 +18,18 @@ When new items are added to an existing list, clients SHOULD append them to the
 
 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.
 
-For example, _mute lists_ can contain the public keys of spammers and bad actors users don't want to see in their feeds or receive annoying notifications from.
+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.
 
 | name           | kind  | description                                                 | expected tag items                                                                |
 | ---            | ---   | ---                                                         | ---                                                                               |
 | Mute list      | 10000 | things the user doesn't want to see in their feeds          | `"p"` (pubkeys), `"t"` (hashtags), `"word"` (lowercase string), `"e"` (threads)   |
 | Pinned notes   | 10001 | events the user intends to showcase in their profile page   | `"e"` (kind:1 notes)                                                              |
-| Bookmarks      | 10003 | uncategorized, "global" list of things a user wants to save | `"e"` (kind:1 notes), `"a"` (kind:30023 articles), `"t"` (hashtags), `"r" (URLs)` |
+| Bookmarks      | 10003 | uncategorized, "global" list of things a user wants to save | `"e"` (kind:1 notes), `"a"` (kind:30023 articles), `"t"` (hashtags), `"r"` (URLs) |
 | Communities    | 10004 | [NIP-72](72.md) communities the user belongs to             | `"a"` (kind:34550 community definitions)                                          |
-| Public chats   | 10005 | [NIP-28](28.md) chat channels the user is in                | `"e"` (kind:40 channel definitions)                                             |
+| Public chats   | 10005 | [NIP-28](28.md) chat channels the user is in                | `"e"` (kind:40 channel definitions)                                               |
 | Blocked relays | 10006 | relays clients should never connect to                      | `"relay"` (relay URLs)                                                            |
 | Search relays  | 10007 | relays clients should use when performing search queries    | `"relay"` (relay URLs)                                                            |
-| Interests      | 10015 | topics a user may be interested in and pointers             | `"t"` (hashtags) and `"a" (kind:30015 interest set)`                              |
+| Interests      | 10015 | topics a user may be interested in and pointers             | `"t"` (hashtags) and `"a"` (kind:30015 interest set)                              |
 | Emojis         | 10030 | user preferred emojis and pointers to emoji sets            | `"emoji"` (see [NIP-30](30.md)) and `"a"` (kind:30030 emoji set)                  |
 
 ## Sets
@@ -44,9 +44,9 @@ Aside from their main identifier, the `"d"` tag, sets can optionally have a `"ti
 | ---           | ---   | ---                                                                                          | ---                                                                               |
 | Follow sets   | 30000 | categorized groups of users a client may choose to check out in different circumstances      | `"p"` (pubkeys)                                                                   |
 | Relay sets    | 30002 | user-defined relay groups the user can easily pick and choose from during various operations | `"relay"` (relay URLs)                                                            |
-| Bookmark sets | 30003 | user-defined bookmarks categories , for when bookmarks must be in labeled separate groups    | `"e"` (kind:1 notes), `"a"` (kind:30023 articles), `"t"` (hashtags), `"r" (URLs)` |
+| Bookmark sets | 30003 | user-defined bookmarks categories , for when bookmarks must be in labeled separate groups    | `"e"` (kind:1 notes), `"a"` (kind:30023 articles), `"t"` (hashtags), `"r"` (URLs) |
 | Curation sets | 30004 | groups of articles picked by users as interesting and/or belonging to the same category      | `"a"` (kind:30023 articles), `"e"` (kind:1 notes)                                 |
-| Curation sets | 30005 | groups of videos picked by users as interesting and/or belonging to the same category      | `"a"` (kind:34235 videos)                               |
+| Curation sets | 30005 | groups of videos picked by users as interesting and/or belonging to the same category        | `"a"` (kind:34235 videos)                                                         |
 | 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))                                                   |
 
@@ -82,7 +82,7 @@ Some clients have used these lists in the past, but they should work on transiti
 
 ### A _curation set_ of articles and notes about yaks
 
-```
+```json
 {
   "id": "567b41fc9060c758c4216fe5f8d3df7c57daad7ae757fa4606f0c39d4dd220ef",
   "pubkey": "d6dc95542e18b8b7aec2f14610f55c335abebec76f3db9e58c254661d0593a0c",

From d7293a3924143b222ffbda0dba11a373136e1269 Mon Sep 17 00:00:00 2001
From: Jonathan Staab <shtaab@gmail.com>
Date: Fri, 11 Aug 2023 08:34:56 -0700
Subject: [PATCH 105/263] Introduce NIP-59 gift wrap

---
 59.md | 250 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 250 insertions(+)
 create mode 100644 59.md

diff --git a/59.md b/59.md
new file mode 100644
index 0000000..cd841cf
--- /dev/null
+++ b/59.md
@@ -0,0 +1,250 @@
+NIP-59
+======
+
+Gift Wrap
+---------
+
+`optional`
+
+This NIP defines a protocol for encapsulating any nostr event. This makes it possible to obscure most metadata
+for a given event, perform collaborative signing, and more.
+
+This NIP relies on [NIP-44](./44.md)'s versioned encryption algorithms.
+
+# Overview
+
+This protocol uses three main concepts to protect the transmission of a target event: `rumor`s, `seal`s, and `gift wrap`s.
+
+- A `rumor` is a regular nostr event, but is **not signed**. This means that if it is leaked, it cannot be verified.
+- A `rumor` is serialized to JSON, encrypted, and placed in the `content` field of a `seal`. The `seal` is then
+  signed by the author of the note. The only information publicly available on a `seal` is who signed it, but not what was said.
+- A `seal` is serialized to JSON, encrypted, and placed in the `content` field of a `gift wrap`.
+
+This allows the isolation of concerns across layers:
+
+- A rumor carries the content but is unsigned, which means if leaked it will be rejected by relays and clients,
+  and can't be authenticated. This provides a measure of deniability.
+- A seal identifies the author without revealing the content or the recipient.
+- A gift wrap can add metadata (recipient, tags, a different author) without revealing the true author.
+
+# Protocol Description
+
+## 1. The Rumor Event Kind
+
+A `rumor` is the same thing as an unsigned event. Any event kind can be made a `rumor` by removing the signature.
+
+## 2. The Seal Event Kind
+
+A `seal` is a `kind:13` event that wraps a `rumor` with the sender's regular key. The `seal` is **always** encrypted
+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
+{
+  "id": "<id>",
+  "pubkey": "<real author's pubkey>",
+  "content": "<encrypted rumor>",
+  "kind": 13,
+  "created_at": 1686840217,
+  "tags": [],
+  "sig": "<real author's pubkey signature>"
+}
+```
+
+Tags MUST must always be empty in a `kind:13`. The inner event MUST always be unsigned.
+
+## 3. Gift Wrap Event Kind
+
+A `gift wrap` event is a `kind:1059` event that wraps any other event. `tags` MUST include a single `p` tag
+containing the recipient's public key.
+
+The goal is to hide the sender's information, the metadata, and the content of the original event from the public.
+The only public information is the receiver's public key.
+
+```js
+{
+  "id": "<id>",
+  "pubkey": "<random, one-time-use pubkey>",
+  "content": "<encrypted kind 13>",
+  "kind": 1059,
+  "created_at": 1686840217,
+  "tags": [["p", "<Receiver>"]],
+  "sig": "<random, one-time-use pubkey signature>"
+}
+```
+
+# Encrypting Payloads
+
+Encryption is done following NIP-44 on the JSON-encoded event. Place the the encryption payload in the `.content`
+of the wrapper event (either a `seal` or a `gift wrap`).
+
+# Other Considerations
+
+If a `rumor` is intended for more than one party, or if the author wants to retain an encrypted copy, a single
+`rumor` may be wrapped and addressed for each recipient individually.
+
+The canonical `created_at` time belongs to the `rumor`. All other timestamps SHOULD be tweaked to thwart
+time-analysis attacks. Note that some relays don't serve events dated in the future, so all timestamps
+SHOULD be in the past.
+
+Relays may choose not to store gift wrapped events due to them not being publicly useful. Clients MAY choose
+to attach a certain amount of proof-of-work to the wrapper event per NIP-13 in a bid to demonstrate that
+the event is not spam or a denial-of-service attack.
+
+To protect recipient metadata, relays SHOULD guard access to kind 1059 events based on user AUTH. When
+possible, clients should only send wrapped events to relays that offer this protection.
+
+To protect recipient metadata, relays SHOULD only serve kind 1059 events intended for the marked recipient.
+When possible, clients should only send wrapped events to `read` relays for the recipient that implement
+AUTH, and refuse to serve wrapped events to non-recipients.
+
+# An Example
+
+Let's send a wrapped `kind 1` message between two parties asking "Are you going to the party tonight?"
+
+- Author private key: `0beebd062ec8735f4243466049d7747ef5d6594ee838de147f8aab842b15e273`
+- Recipient private key: `e108399bd8424357a710b606ae0c13166d853d327e47a6e5e038197346bdbf45`
+- Ephemeral wrapper key: `4f02eac59266002db5801adc5270700ca69d5b8f761d8732fab2fbf233c90cbd`
+
+## 1. Create an event
+
+Create a `kind 1` event with the message, the receivers, and any other tags you want, signed by the author.
+Do not sign the event.
+
+```json
+{
+  "created_at": 1691518405,
+  "content": "Are you going to the party tonight?",
+  "tags": [],
+  "kind": 1,
+  "pubkey": "611df01bfcf85c26ae65453b772d8f1dfd25c264621c0277e1fc1518686faef9",
+  "id": "9dd003c6d3b73b74a85a9ab099469ce251653a7af76f523671ab828acd2a0ef9"
+}
+```
+
+## 2. Seal the rumor
+
+Encrypt the JSON-encoded `rumor` with a conversation key derived using the author's private key and
+the recipient's public key. Place the result in the `content` field of a `kind 13` `seal` event. Sign
+it with the author's key.
+
+```json
+{
+  "content": "AqBCdwoS7/tPK+QGkPCadJTn8FxGkd24iApo3BR9/M0uw6n4RFAFSPAKKMgkzVMoRyR3ZS/aqATDFvoZJOkE9cPG/TAzmyZvr/WUIS8kLmuI1dCA+itFF6+ULZqbkWS0YcVU0j6UDvMBvVlGTzHz+UHzWYJLUq2LnlynJtFap5k8560+tBGtxi9Gx2NIycKgbOUv0gEqhfVzAwvg1IhTltfSwOeZXvDvd40rozONRxwq8hjKy+4DbfrO0iRtlT7G/eVEO9aJJnqagomFSkqCscttf/o6VeT2+A9JhcSxLmjcKFG3FEK3Try/WkarJa1jM3lMRQqVOZrzHAaLFW/5sXano6DqqC5ERD6CcVVsrny0tYN4iHHB8BHJ9zvjff0NjLGG/v5Wsy31+BwZA8cUlfAZ0f5EYRo9/vKSd8TV0wRb9DQ=",
+  "kind": 13,
+  "created_at": 1703015180,
+  "pubkey": "611df01bfcf85c26ae65453b772d8f1dfd25c264621c0277e1fc1518686faef9",
+  "tags": [],
+  "id": "28a87d7c074d94a58e9e89bb3e9e4e813e2189f285d797b1c56069d36f59eaa7",
+  "sig": "02fc3facf6621196c32912b1ef53bac8f8bfe9db51c0e7102c073103586b0d29c3f39bdaa1e62856c20e90b6c7cc5dc34ca8bb6a528872cf6e65e6284519ad73"
+}
+```
+
+## 3. Wrap the seal
+
+Encrypt the JSON-encoded `kind 13` event with your ephemeral, single-use random key. Place the result
+in the `content` field of a `kind 1059`. Add a single `p` tag containing the recipient's public key.
+Sign the `gift wrap` using the random key generated in the previous step.
+
+```json
+{
+  "content": "AhC3Qj/QsKJFWuf6xroiYip+2yK95qPwJjVvFujhzSguJWb/6TlPpBW0CGFwfufCs2Zyb0JeuLmZhNlnqecAAalC4ZCugB+I9ViA5pxLyFfQjs1lcE6KdX3euCHBLAnE9GL/+IzdV9vZnfJH6atVjvBkNPNzxU+OLCHO/DAPmzmMVx0SR63frRTCz6Cuth40D+VzluKu1/Fg2Q1LSst65DE7o2efTtZ4Z9j15rQAOZfE9jwMCQZt27rBBK3yVwqVEriFpg2mHXc1DDwHhDADO8eiyOTWF1ghDds/DxhMcjkIi/o+FS3gG1dG7gJHu3KkGK5UXpmgyFKt+421m5o++RMD/BylS3iazS1S93IzTLeGfMCk+7IKxuSCO06k1+DaasJJe8RE4/rmismUvwrHu/HDutZWkvOAhd4z4khZo7bJLtiCzZCZ74lZcjOB4CYtuAX2ZGpc4I1iOKkvwTuQy9BWYpkzGg3ZoSWRD6ty7U+KN+fTTmIS4CelhBTT15QVqD02JxfLF7nA6sg3UlYgtiGw61oH68lSbx16P3vwSeQQpEB5JbhofW7t9TLZIbIW/ODnI4hpwj8didtk7IMBI3Ra3uUP7ya6vptkd9TwQkd/7cOFaSJmU+BIsLpOXbirJACMn+URoDXhuEtiO6xirNtrPN8jYqpwvMUm5lMMVzGT3kMMVNBqgbj8Ln8VmqouK0DR+gRyNb8fHT0BFPwsHxDskFk5yhe5c/2VUUoKCGe0kfCcX/EsHbJLUUtlHXmTqaOJpmQnW1tZ/siPwKRl6oEsIJWTUYxPQmrM2fUpYZCuAo/29lTLHiHMlTbarFOd6J/ybIbICy2gRRH/LFSryty3Cnf6aae+A9uizFBUdCwTwffc3vCBae802+R92OL78bbqHKPbSZOXNC+6ybqziezwG+OPWHx1Qk39RYaF0aFsM4uZWrFic97WwVrH5i+/Nsf/OtwWiuH0gV/SqvN1hnkxCTF/+XNn/laWKmS3e7wFzBsG8+qwqwmO9aVbDVMhOmeUXRMkxcj4QreQkHxLkCx97euZpC7xhvYnCHarHTDeD6nVK+xzbPNtzeGzNpYoiMqxZ9bBJwMaHnEoI944Vxoodf51cMIIwpTmmRvAzI1QgrfnOLOUS7uUjQ/IZ1Qa3lY08Nqm9MAGxZ2Ou6R0/Z5z30ha/Q71q6meAs3uHQcpSuRaQeV29IASmye2A2Nif+lmbhV7w8hjFYoaLCRsdchiVyNjOEM4VmxUhX4VEvw6KoCAZ/XvO2eBF/SyNU3Of4SO",
+  "kind": 1059,
+  "created_at": 1703021488,
+  "pubkey": "18b1a75918f1f2c90c23da616bce317d36e348bcf5f7ba55e75949319210c87c",
+  "id": "5c005f3ccf01950aa8d131203248544fb1e41a0d698e846bd419cec3890903ac",
+  "sig": "35fabdae4634eb630880a1896a886e40fd6ea8a60958e30b89b33a93e6235df750097b04f9e13053764251b8bc5dd7e8e0794a3426a90b6bcc7e5ff660f54259"
+  "tags": [["p", "166bf3765ebd1fc55decfe395beff2ea3b2a4e0a8946e7eb578512b555737c99"]],
+}
+```
+
+## 4. Broadcast Selectively
+
+Broadcast the `kind 1059` event to the recipient's relays only. Delete all the other events.
+
+# Code Samples
+
+## JavaScript
+
+```javascript
+import {bytesToHex} from "@noble/hashes/utils"
+import type {EventTemplate, UnsignedEvent, Event} from "nostr-tools"
+import {getPublicKey, getEventHash, nip19, nip44, finalizeEvent, generateSecretKey} from "nostr-tools"
+
+type Rumor = UnsignedEvent & {id: string}
+
+const TWO_DAYS = 2 * 24 * 60 * 60
+
+const now = () => Math.round(Date.now() / 1000)
+const randomNow = () => Math.round(now() - (Math.random() * TWO_DAYS))
+
+const nip44ConversationKey = (privateKey: Uint8Array, publicKey: string) =>
+  nip44.v2.utils.getConversationKey(bytesToHex(privateKey), publicKey)
+
+const nip44Encrypt = (data: EventTemplate, privateKey: Uint8Array, publicKey: string) =>
+  nip44.v2.encrypt(JSON.stringify(data), nip44ConversationKey(privateKey, publicKey))
+
+const nip44Decrypt = (data: Event, privateKey: Uint8Array) =>
+  JSON.parse(nip44.v2.decrypt(data.content, nip44ConversationKey(privateKey, data.pubkey)))
+
+const createRumor = (event: Partial<UnsignedEvent>, privateKey: Uint8Array) => {
+  const rumor = {
+    created_at: now(),
+    content: "",
+    tags: [],
+    ...event,
+    pubkey: getPublicKey(privateKey),
+  } as any
+
+  rumor.id = getEventHash(rumor)
+
+  return rumor as Rumor
+}
+
+const createSeal = (rumor: Rumor, privateKey: Uint8Array, recipientPublicKey: string) => {
+  return finalizeEvent(
+    {
+      kind: 13,
+      content: nip44Encrypt(rumor, privateKey, recipientPublicKey),
+      created_at: randomNow(),
+      tags: [],
+    },
+    privateKey
+  ) as Event
+}
+
+const createWrap = (event: Event, recipientPublicKey: string) => {
+  const randomKey = generateSecretKey()
+
+  return finalizeEvent(
+    {
+      kind: 1059,
+      content: nip44Encrypt(event, randomKey, recipientPublicKey),
+      created_at: randomNow(),
+      tags: [["p", recipientPublicKey]],
+    },
+    randomKey
+  ) as Event
+}
+
+// Test case using the above example
+const senderPrivateKey = nip19.decode(`nsec1p0ht6p3wepe47sjrgesyn4m50m6avk2waqudu9rl324cg2c4ufesyp6rdg`).data
+const recipientPrivateKey = nip19.decode(`nsec1uyyrnx7cgfp40fcskcr2urqnzekc20fj0er6de0q8qvhx34ahazsvs9p36`).data
+const recipientPublicKey = getPublicKey(recipientPrivateKey)
+
+const rumor = createRumor(
+  {
+    kind: 1,
+    content: "Are you going to the party tonight?",
+  },
+  senderPrivateKey
+)
+
+const seal = createSeal(rumor, senderPrivateKey, recipientPublicKey)
+const wrap = createWrap(seal, recipientPublicKey)
+
+// Receiver unwraps with his/her private key.
+
+const unwrappedSeal = nip44Decrypt(wrap, recipientPrivateKey)
+const unsealedRumor = nip44Decrypt(unwrappedSeal, recipientPrivateKey)
+```

From 1a2b21b67eeae2eba8c03215826a32d4a03ae172 Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Tue, 9 Jan 2024 13:39:58 -0800
Subject: [PATCH 106/263] Remove p tag, clarify that NIP 59 does not define a
 messaging protocol on its own

---
 59.md | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/59.md b/59.md
index cd841cf..c990236 100644
--- a/59.md
+++ b/59.md
@@ -9,6 +9,8 @@ Gift Wrap
 This NIP defines a protocol for encapsulating any nostr event. This makes it possible to obscure most metadata
 for a given event, perform collaborative signing, and more.
 
+This NIP *does not* define any messaging protocol. Applications of this NIP should be defined separately.
+
 This NIP relies on [NIP-44](./44.md)'s versioned encryption algorithms.
 
 # Overview
@@ -55,11 +57,8 @@ Tags MUST must always be empty in a `kind:13`. The inner event MUST always be un
 
 ## 3. Gift Wrap Event Kind
 
-A `gift wrap` event is a `kind:1059` event that wraps any other event. `tags` MUST include a single `p` tag
-containing the recipient's public key.
-
-The goal is to hide the sender's information, the metadata, and the content of the original event from the public.
-The only public information is the receiver's public key.
+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 proof of work.
 
 ```js
 {
@@ -68,7 +67,7 @@ The only public information is the receiver's public key.
   "content": "<encrypted kind 13>",
   "kind": 1059,
   "created_at": 1686840217,
-  "tags": [["p", "<Receiver>"]],
+  "tags": [["p", "<recipient pubkey>"]],
   "sig": "<random, one-time-use pubkey signature>"
 }
 ```
@@ -106,6 +105,9 @@ Let's send a wrapped `kind 1` message between two parties asking "Are you going
 - Recipient private key: `e108399bd8424357a710b606ae0c13166d853d327e47a6e5e038197346bdbf45`
 - Ephemeral wrapper key: `4f02eac59266002db5801adc5270700ca69d5b8f761d8732fab2fbf233c90cbd`
 
+Note that this messaging protocol should not be used in practice, this is just an example. Refer to other
+NIPs for concrete messaging protocols that depend on gift wraps.
+
 ## 1. Create an event
 
 Create a `kind 1` event with the message, the receivers, and any other tags you want, signed by the author.
@@ -243,7 +245,7 @@ const rumor = createRumor(
 const seal = createSeal(rumor, senderPrivateKey, recipientPublicKey)
 const wrap = createWrap(seal, recipientPublicKey)
 
-// Receiver unwraps with his/her private key.
+// Recipient unwraps with his/her private key.
 
 const unwrappedSeal = nip44Decrypt(wrap, recipientPrivateKey)
 const unsealedRumor = nip44Decrypt(unwrappedSeal, recipientPrivateKey)

From 9b39fd5ef51eefc85af99b5aefac1a109bc17de3 Mon Sep 17 00:00:00 2001
From: Thabokani <149070269+Thabokani@users.noreply.github.com>
Date: Wed, 17 Jan 2024 16:09:50 +0800
Subject: [PATCH 107/263] NIP-96: fix typo

---
 96.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/96.md b/96.md
index d8ea105..3ebbef8 100644
--- a/96.md
+++ b/96.md
@@ -273,7 +273,7 @@ The `server` should reject deletes from users other than the original uploader.
 It should be noted that more than one user may have uploaded the same file (with the same hash). In this case, a delete must not really delete the file but just remove the user's `pubkey` from the file owners list (considering the server keeps just one copy of the same file, because multiple uploads of the same file results
 in the same file hash).
 
-The successfull response is a 200 OK one with just basic JSON fields:
+The successful response is a 200 OK one with just basic JSON fields:
 
 ```
 {

From c766f8892b46b26a91ac1e570cb605a8074b78b2 Mon Sep 17 00:00:00 2001
From: ekzyis <ekzyis@ekzyis.com>
Date: Thu, 18 Jan 2024 23:32:36 +0100
Subject: [PATCH 108/263] NIP-47: fix typo

---
 47.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/47.md b/47.md
index c6540d5..4916658 100644
--- a/47.md
+++ b/47.md
@@ -17,7 +17,7 @@ This NIP describes a way for clients to access a remote Lightning wallet through
 * **wallet service**: Nostr app that typically runs on an always-on computer (eg. in the cloud or on a Raspberry Pi).  This app has access to the APIs of the wallets it serves.
 
 ## Theory of Operation
- 1. **Users** who which to use this NIP to send lightning payments to other nostr users must first acquire a special "connection" URI from their NIP-47 compliant wallet application.  The wallet application may provide this URI using a QR screen, or a pasteable string, or some other means. 
+ 1. **Users** who wish to use this NIP to send lightning payments to other nostr users must first acquire a special "connection" URI from their NIP-47 compliant wallet application.  The wallet application may provide this URI using a QR screen, or a pasteable string, or some other means. 
  
  2. The **user** should then copy this URI into their **client(s)** by pasting, or scanning the QR, etc.  The **client(s)** should save this URI and use it later whenever the **user** makes a payment.  The **client** should then request an `info` (13194) event from the relay(s) specified in the URI.  The **wallet service** will have sent that event to those relays earlier, and the relays will hold it as a replaceable event.  
  

From d0812229a5569372a6cd1bdb8d148beb1820585d Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Sun, 21 Jan 2024 16:08:45 -0300
Subject: [PATCH 109/263] use jsonc in some places.

---
 01.md | 11 +++++------
 52.md |  4 ++--
 72.md | 10 +++++-----
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/01.md b/01.md
index 80ee792..46316ea 100644
--- a/01.md
+++ b/01.md
@@ -14,7 +14,7 @@ Each user has a keypair. Signatures, public key, and encodings are done accordin
 
 The only object type that exists is the `event`, which has the following format on the wire:
 
-```json
+```jsonc
 {
   "id": <32-bytes lowercase hex-encoded sha256 of the serialized event data>,
   "pubkey": <32-bytes lowercase hex-encoded public key of the event creator>,
@@ -22,7 +22,7 @@ The only object type that exists is the `event`, which has the following format
   "kind": <integer between 0 and 65535>,
   "tags": [
     [<arbitrary string>...],
-    ...
+    // ...
   ],
   "content": <arbitrary string>,
   "sig": <64-bytes lowercase hex of the signature of the sha256 hash of the serialized event data, which is the same as the "id" field>
@@ -58,17 +58,16 @@ To prevent implementation differences from creating a different event ID for the
 
 Each tag is an array of strings of arbitrary size, with some conventions around them. Take a look at the example below:
 
-```json
+```jsonc
 {
-  ...,
   "tags": [
     ["e", "5c83da77af1dec6d7289834998ad7aafbd9e2191396d75ec3cc27f5a77226f36", "wss://nostr.example.com"],
     ["p", "f7234bd4c1394dda46d09f35bd384dd30cc552ad5541990f98844fb06676e9ca"],
     ["a", "30023:f7234bd4c1394dda46d09f35bd384dd30cc552ad5541990f98844fb06676e9ca:abcd", "wss://nostr.example.com"],
     ["alt", "reply"],
-    ...
+    // ...
   ],
-  ...
+  // ...
 }
 ```
 
diff --git a/52.md b/52.md
index 5ac116b..f35d904 100644
--- a/52.md
+++ b/52.md
@@ -38,7 +38,7 @@ The list of tags are as follows:
 The following tags are deprecated:
 * `name` name of the calendar event. Use only if `title` is not available.
 
-```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>,
@@ -99,7 +99,7 @@ The list of tags are as follows:
 The following tags are deprecated:
 * `name` name of the calendar event. Use only if `title` is not available.
 
-```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>,
diff --git a/72.md b/72.md
index c0fffff..4bafce0 100644
--- a/72.md
+++ b/72.md
@@ -12,7 +12,7 @@ The goal of this NIP is to create moderator-approved public communities around a
 
 `kind:34550` SHOULD include any field that helps define the community and the set of moderators. `relay` tags MAY be used to describe the preferred relay to download requests and approvals.
 
-```json
+```jsonc
 {
   "created_at": <Unix timestamp in seconds>,
   "kind": 34550,
@@ -42,14 +42,14 @@ The goal of this NIP is to create moderator-approved public communities around a
 
 Any Nostr event can be submitted to a community by anyone for approval. Clients MUST add the community's `a` tag to the new post event in order to be presented for the moderator's approval.
 
-```json
+```jsonc
 {
   "kind": 1,
   "tags": [
     ["a", "34550:<community event author pubkey>:<community-d-identifier>", "<optional-relay-url>"],
   ],
   "content": "hello world",
-  ...
+  // ...
 }
 ```
 
@@ -59,7 +59,7 @@ Community management clients MAY filter all mentions to a given `kind:34550` eve
 
 The post-approval event MUST include `a` tags of the communities the moderator is posting into (one or more), the `e` tag of the post and `p` tag of the author of the post (for approval notifications). The event SHOULD also include the stringified `post request` event inside the `.content` ([NIP-18-style](18.md)) and a `k` tag with the original post's event kind to allow filtering of approved posts by kind.
 
-```json
+```jsonc
 {
   "pubkey": "<32-bytes lowercase hex-encoded public key of the event creator>",
   "kind": 4550,
@@ -70,7 +70,7 @@ The post-approval event MUST include `a` tags of the communities the moderator i
     ["k", "<post-request-kind>"]
   ],
   "content": "<the full approved event, JSON-encoded>",
-  ...
+  // ...
 }
 ```
 

From c2f34817e38353245b17c586946ef2a354bf9a4c Mon Sep 17 00:00:00 2001
From: benthecarman <benthecarman@live.com>
Date: Wed, 6 Dec 2023 02:33:54 -0600
Subject: [PATCH 110/263] NIP-47: Nostr Wallet Connect Extensions

---
 47.md | 278 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 276 insertions(+), 2 deletions(-)

diff --git a/47.md b/47.md
index b6a4f2b..4cef610 100644
--- a/47.md
+++ b/47.md
@@ -36,6 +36,7 @@ The info event should be a replaceable event that is published by the **wallet s
 a plaintext string with the supported commands, space-separated, eg. `pay_invoice get_balance`. Only the `pay_invoice` command is described in this NIP, but other commands might be defined in different NIPs.
 
 Both the request and response events SHOULD contain one `p` tag, containing the public key of the **wallet service** if this is a request, and the public key of the **user** if this is a response. The response event SHOULD contain an `e` tag with the id of the request event it is responding to.
+Optionally, a request can have an `expiration` tag that has a unix timestamp in seconds. If the request is received after this timestamp, it should be ignored.
 
 The content of requests and responses is encrypted with [NIP04](https://github.com/nostr-protocol/nips/blob/master/04.md), and is a JSON-RPCish object with a semi-fixed structure:
 
@@ -108,7 +109,8 @@ Request:
 {
     "method": "pay_invoice",
     "params": {
-        "invoice": "lnbc50n1..." // bolt11 invoice
+        "invoice": "lnbc50n1...", // bolt11 invoice
+        "amount": 123, // invoice amount in msats, optional
     }
 }
 ```
@@ -117,7 +119,7 @@ Response:
 ```jsonc
 {
     "result_type": "pay_invoice",
-    "result": { 
+    "result": {
         "preimage": "0123456789abcdef..." // preimage of the payment
     }
 }
@@ -126,6 +128,278 @@ Response:
 Errors:
 - `PAYMENT_FAILED`: The payment failed. This may be due to a timeout, exhausting all routes, insufficient capacity or similar.
 
+### `multi_pay_invoice`
+
+Description: Requests payment of multiple invoices.
+
+Request:
+```jsonc
+{
+    "method": "multi_pay_invoice",
+    "params": {
+        "invoices": [
+          {"id":"4da52c32a1", "invoice": "lnbc1...", "amount": 123}, // bolt11 invoice and amount in msats, amount is optional
+          {"id":"3da52c32a1", "invoice": "lnbc50n1..."},
+        ],
+    }
+}
+```
+
+Response:
+
+For every invoice in the request, a separate response event is sent. To differentiate between the responses, each
+response event contains an `d` tag with the id of the invoice it is responding to, if no id was given, then the
+payment hash of the invoice should be used.
+
+```jsonc
+{
+    "result_type": "multi_pay_invoice",
+    "result": {
+        "preimage": "0123456789abcdef..." // preimage of the payment
+    }
+}
+```
+
+Errors:
+- `PAYMENT_FAILED`: The payment failed. This may be due to a timeout, exhausting all routes, insufficient capacity or similar.
+
+### `pay_keysend`
+
+Request:
+```jsonc
+{
+    "method": "pay_keysend",
+    "params": {
+        "amount": 123, // invoice amount in msats, required
+        "pubkey": "03...", // payee pubkey, required
+        "preimage": "0123456789abcdef...", // preimage of the payment, optional
+        "tlv_records: [ // tlv records, optional
+            {
+                "type": 5482373484, // tlv type
+                "value": "0123456789abcdef" // hex encoded tlv value
+            }
+        ]
+    }
+}
+```
+
+Response:
+```jsonc
+{
+    "result_type": "pay_keysend",
+    "result": {
+        "preimage": "0123456789abcdef...", // preimage of the payment
+    }
+}
+```
+
+Errors:
+- `PAYMENT_FAILED`: The payment failed. This may be due to a timeout, exhausting all routes, insufficient capacity or similar.
+
+### `multi_pay_keysend`
+
+Description: Requests multiple keysend payments.
+
+Has an array of keysends, these follow the same semantics as `pay_keysend`, just done in a batch
+
+Request:
+```jsonc
+{
+    "method": "multi_pay_keysend",
+    "params": {
+        "keysends": [
+          {"id": "4c5b24a351", pubkey": "03...", "amount": 123},
+          {"id": "3da52c32a1", "pubkey": "02...", "amount": 567, "preimage": "abc123..", "tlv_records": [{"type": 696969, "value": "77616c5f6872444873305242454d353736"}]},
+        ],
+    }
+}
+```
+
+Response:
+
+For every keysend in the request, a separate response event is sent. To differentiate between the responses, each
+response event contains an `d` tag with the id of the keysend it is responding to, if no id was given, then the
+pubkey should be used.
+
+```jsonc
+{
+    "result_type": "multi_pay_keysend",
+    "result": {
+        "preimage": "0123456789abcdef..." // preimage of the payment
+    }
+}
+```
+
+Errors:
+- `PAYMENT_FAILED`: The payment failed. This may be due to a timeout, exhausting all routes, insufficient capacity or similar.
+
+### `make_invoice`
+
+Request:
+```jsonc
+{
+    "method": "make_invoice",
+    "params": {
+        "amount": 123, // value in msats
+        "description": "string", // invoice's description, optional
+        "description_hash": "string", // invoice's description hash, optional
+        "expiry": 213 // expiry in seconds from time invoice is created, optional
+    }
+}
+```
+
+Response:
+```jsonc
+{
+    "result_type": "make_invoice",
+    "result": {
+        "type": "incoming", // "incoming" for invoices, "outgoing" for payments
+        "invoice": "string", // encoded invoice, optional
+        "description": "string", // invoice's description, optional
+        "description_hash": "string", // invoice's description hash, optional
+        "preimage": "string", // payment's preimage, optional if unpaid
+        "payment_hash": "string", // Payment hash for the payment
+        "amount": 123, // value in msats
+        "fees_paid": 123, // value in msats
+        "created_at": unixtimestamp, // invoice/payment creation time
+        "expires_at": unixtimestamp, // invoice expiration time, optional if not applicable
+        "metadata": {} // generic metadata that can be used to add things like zap/boostagram details for a payer name/comment/etc.
+    }
+}
+```
+
+### `lookup_invoice`
+
+Request:
+```jsonc
+{
+    "method": "lookup_invoice",
+    "params": {
+        "payment_hash": "31afdf1..", // payment hash of the invoice, one of payment_hash or invoice is required
+        "invoice": "lnbc50n1..." // invoice to lookup
+    }
+}
+```
+
+Response:
+```jsonc
+{
+    "result_type": "lookup_invoice",
+    "result": {
+        "type": "incoming", // "incoming" for invoices, "outgoing" for payments
+        "invoice": "string", // encoded invoice, optional
+        "description": "string", // invoice's description, optional
+        "description_hash": "string", // invoice's description hash, optional
+        "preimage": "string", // payment's preimage, optional if unpaid
+        "payment_hash": "string", // Payment hash for the payment
+        "amount": 123, // value in msats
+        "fees_paid": 123, // value in msats
+        "created_at": unixtimestamp, // invoice/payment creation time
+        "expires_at": unixtimestamp, // invoice expiration time, optional if not applicable
+        "settled_at": unixtimestamp, // invoice/payment settlement time, optional if unpaid
+        "metadata": {} // generic metadata that can be used to add things like zap/boostagram details for a payer name/comment/etc.
+    }
+}
+```
+
+Errors:
+- `NOT_FOUND`: The invoice could not be found by the given parameters.
+
+### `list_transactions`
+
+Lists invoices and payments. If `type` is not specified, both invoices and payments are returned.
+The `from` and `until` parameters are timestamps in seconds since epoch. If `from` is not specified, it defaults to 0.
+If `until` is not specified, it defaults to the current time. Transactions are returned in descending order of creation
+time.
+
+Request:
+```jsonc
+{
+    "method": "list_transactions",
+    "params": {
+        "from": 1693876973, // starting timestamp in seconds since epoch (inclusive), optional
+        "until": 1703225078, // ending timestamp in seconds since epoch (inclusive), optional
+        "limit": 10, // maximum number of invoices to return, optional
+        "offset": 0, // offset of the first invoice to return, optional
+        "unpaid": true, // include unpaid invoices, optional, default false
+        "type": "incoming", // "incoming" for invoices, "outgoing" for payments, undefined for both
+    }
+}
+```
+
+Response:
+```jsonc
+{
+    "result_type": "list_transactions",
+    "result": {
+        "transactions": [
+            {
+               "type": "incoming", // "incoming" for invoices, "outgoing" for payments
+               "invoice": "string", // encoded invoice, optional
+               "description": "string", // invoice's description, optional
+               "description_hash": "string", // invoice's description hash, optional
+               "preimage": "string", // payment's preimage, optional if unpaid
+               "payment_hash": "string", // Payment hash for the payment
+               "amount": 123, // value in msats
+               "fees_paid": 123, // value in msats
+               "created_at": unixtimestamp, // invoice/payment creation time
+               "expires_at": unixtimestamp, // invoice expiration time, optional if not applicable
+               "settled_at": unixtimestamp, // invoice/payment settlement time, optional if unpaid
+               "metadata": {} // generic metadata that can be used to add things like zap/boostagram details for a payer name/comment/etc.
+           }
+        ],
+    },
+}
+```
+
+### `get_balance`
+
+Request:
+```jsonc
+{
+    "method": "get_balance",
+    "params": {
+    }
+}
+```
+
+Response:
+```jsonc
+{
+    "result_type": "get_balance",
+    "result": {
+        "balance": 10000, // user's balance in msats
+    }
+}
+```
+
+### `get_info`
+
+Request:
+```jsonc
+{
+    "method": "get_info",
+    "params": {
+    }
+}
+```
+
+Response:
+```jsonc
+{
+    "result_type": "get_info",
+    "result": {
+            "alias": "string",
+            "color": "hex string",
+            "pubkey": "hex string",
+            "network": "string", // mainnet, testnet, signet, or regtest
+            "block_height": 1,
+            "block_hash": "hex string",
+            "methods": ["pay_invoice", "get_balance", "make_invoice", "lookup_invoice", "list_transactions", "get_info"], // list of supported methods for this connection
+    }
+}
+```
+
 ## Example pay invoice flow
 
 0. The user scans the QR code generated by the **wallet service** with their **client** application, they follow a `nostr+walletconnect:` deeplink or configure the connection details manually.

From c55678b30740c1aa4aa968239fb21fb05c38a92c Mon Sep 17 00:00:00 2001
From: greenart7c3 <greenart7c3@proton.me>
Date: Mon, 22 Jan 2024 11:25:25 -0300
Subject: [PATCH 111/263] change androidmanifest.xml, add rejected collumn if
 user chose to always reject some event kind

---
 100.md | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/100.md b/100.md
index 2c7b8f9..cddb806 100644
--- a/100.md
+++ b/100.md
@@ -10,14 +10,32 @@ This NIP describes a method for 2-way communication between a android signer and
 
 The Android signer uses Intents and Content Resolvers to communicate between applications.
 
-To be able to use The Android signer in your application you should add the package name of the signer to your AndroidManifest.xml:
+To be able to use The Android signer in your application you should this to your AndroidManifest.xml:
 
 ```xml
 <queries>
-    <package android:name="com.example.signer"/>
+  <intent>
+    <action android:name="android.intent.action.VIEW" />
+    <category android:name="android.intent.category.BROWSABLE" />
+    <data android:scheme="nostrsigner" />
+  </intent>
 </queries>
 ```
 
+Then you can use this function to check if there's a signer application installed:
+
+```kotlin
+fun isExternalSignerInstalled(context: Context): Boolean {
+  val intent =
+    Intent().apply {
+      action = Intent.ACTION_VIEW
+      data = Uri.parse("nostrsigner:")
+    }
+  val infos = context.packageManager.queryIntentActivities(intent, 0)
+  return infos.size > 0
+}
+```
+
 ## Using Intents
 
 To get the result back from the Signer Appication you should use registerForActivityResult or rememberLauncherForActivityResult in Kotlin. If you are using another framework check the documentation of your framework or a third party library to get the result.
@@ -221,6 +239,8 @@ For the SIGN_EVENT type Signer Application returns two columns "signature" and "
 
 For the other types Signer Application returns the column "signature"
 
+If the user chose to always reject the event signer application will return the column "rejected" and you should not open signer application
+
 ### Methods
 
 - **get_public_key**

From 363e4958cf10fc35f3168ca51374da06c0e5b2ee Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Tue, 23 Jan 2024 13:09:10 +0900
Subject: [PATCH 112/263] Add kinds for NIP-15

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index cf3827e..91179cd 100644
--- a/README.md
+++ b/README.md
@@ -94,6 +94,8 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `42`          | Channel Message            | [28](28.md)              |
 | `43`          | Channel Hide Message       | [28](28.md)              |
 | `44`          | Channel Mute User          | [28](28.md)              |
+| `1021`        | Bid                        | [15](15.md)              |
+| `1022`        | Bid confirmation           | [15](15.md)              |
 | `1040`        | OpenTimestamps             | [03](03.md)              |
 | `1063`        | File Metadata              | [94](94.md)              |
 | `1311`        | Live Chat Message          | [53](53.md)              |
@@ -136,6 +138,8 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `30015`       | Interest sets              | [51](51.md)              |
 | `30017`       | Create or update a stall   | [15](15.md)              |
 | `30018`       | Create or update a product | [15](15.md)              |
+| `30019`       | Marketplace UI/UX          | [15](15.md)              |
+| `30020`       | Product sold as an auction | [15](15.md)              |
 | `30023`       | Long-form Content          | [23](23.md)              |
 | `30024`       | Draft Long-form Content    | [23](23.md)              |
 | `30030`       | Emoji sets                 | [51](51.md)              |

From 6dd003508567dd780f3d8da12f0f9a62449cb992 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ioan=20Biz=C4=83u?= <github@ibz.me>
Date: Tue, 23 Jan 2024 18:36:38 +0200
Subject: [PATCH 113/263] #p refers to pubkeys, *not* "event pubkeys".

---
 01.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/01.md b/01.md
index 46316ea..c1e3748 100644
--- a/01.md
+++ b/01.md
@@ -124,7 +124,7 @@ Clients can send 3 types of messages, which must be JSON arrays, according to th
   "ids": <a list of event ids>,
   "authors": <a list of lowercase pubkeys, the pubkey of an event must be one of these>,
   "kinds": <a list of a kind numbers>,
-  "#<single-letter (a-zA-Z)>": <a list of tag values, for #e — a list of event ids, for #p — a list of event pubkeys etc>,
+  "#<single-letter (a-zA-Z)>": <a list of tag values, for #e — a list of event ids, for #p — a list of pubkeys, etc.>,
   "since": <an integer unix timestamp in seconds, events must be newer than this to pass>,
   "until": <an integer unix timestamp in seconds, events must be older than this to pass>,
   "limit": <maximum number of events relays SHOULD return in the initial query>

From 9fd5be26cd0593b15c61bf3ea219bbfcdec81495 Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Thu, 25 Jan 2024 12:33:25 +0900
Subject: [PATCH 114/263] NIP-30: add supported kinds

---
 30.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/30.md b/30.md
index 5a6f84d..c2f8bb0 100644
--- a/30.md
+++ b/30.md
@@ -6,7 +6,7 @@ Custom Emoji
 
 `draft` `optional`
 
-Custom emoji may be added to **kind 0** and **kind 1** events by including one or more `"emoji"` tags, in the form:
+Custom emoji may be added to **kind 0**, **kind 1**, **kind 7** ([NIP-25](25.md)) and **kind 30315** ([NIP-38](38.md)) events by including one or more `"emoji"` tags, in the form:
 
 ```
 ["emoji", <shortcode>, <image-url>]

From 7ec060375c5aa8697e8b26c2d1088c9077bfa910 Mon Sep 17 00:00:00 2001
From: Michael Dilger <mike@mikedilger.com>
Date: Tue, 30 Jan 2024 04:45:16 +1300
Subject: [PATCH 115/263] NIP-49: Private key encryption (#133)

* Key export/import as implemented by gossip

* Added test data

* Last push didn't make sense, only this direction works

* Multiple updates: 100k rounds, random salt, version number, length indications

* Rename to NIP-49, include in README

* Change encoding to bech32 (ncryptsec)

* Major rework of the algorithm. NIP is now incomplete as I haven't coded it yet.

* renamed

* spelling

* minor fix

* formatting

* MORE CHANGES: scrypt, spelt out more detail of the steps to take

* spelling

* Mostly just removing some unnecesary stuff

* Remove the cafebabe note

* Remove confusing nonce statement

* Change title (and a bit of wording)

* remove author

* remove legacy event

* rename on README

---------

Co-authored-by: Mike Dilger <mike@ezicheq.com>
Co-authored-by: fiatjaf_ <fiatjaf@gmail.com>
---
 49.md     | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 README.md |   1 +
 2 files changed, 113 insertions(+)
 create mode 100644 49.md

diff --git a/49.md b/49.md
new file mode 100644
index 0000000..becc586
--- /dev/null
+++ b/49.md
@@ -0,0 +1,112 @@
+
+NIP-49
+======
+
+Private Key Encryption
+----------------------
+
+`draft` `optional`
+
+This NIP defines a method by which clients can encrypt (and decrypt) a user's private key with a passphrase.
+
+Symmetric Encryption Key derivation
+-----------------------------------
+
+PASSPHRASE = read from the user
+
+LOG\_N = Let the user or implementer choose one byte representing a power of 2 (e.g. 18 represents 262,144) which is used as the number of rounds for scrypt. Larger numbers take more time and more memory, and offer better protection:
+
+    | LOG\_N | MEMORY REQUIRED | APPROX TIME ON FAST COMPUTER |
+    |--------|-----------------|----------------------------- |
+    | 16     | 64 MiB          | 100 ms                       |
+    | 18     | 256 MiB         |                              |
+    | 20     | 1 GiB           | 2 seconds                    |
+    | 21     | 2 GiB           |                              |
+    | 22     | 4 GiB           |                              |
+
+SALT = 16 random bytes
+
+SYMMETRIC_KEY = scrypt(passphrase=PASSPHRASE, salt=SALT, log\_n=LOG\_N, r=8, p=1)
+
+The symmetric key should be 32 bytes long.
+
+This symmetric encryption key is temporary and should be zeroed and discarded after use and not stored or reused for any other purpose.
+
+
+Encrypting a private key
+------------------------
+
+The private key encryption process is as follows:
+
+PRIVATE\_KEY = User's private (secret) secp256k1 key as 32 raw bytes (not hex or bech32 encoded!)
+
+KEY\_SECURITY\_BYTE = one of:
+
+*  0x00 - if the key has been known to have been handled insecurely (stored unencrypted, cut and paste unencrypted, etc)
+*  0x01 - if the key has NOT been known to have been handled insecurely (stored unencrypted, cut and paste unencrypted, etc)
+ * 0x02 - if the client does not track this data
+
+ASSOCIATED\_DATA = KEY\_SECURITY\_BYTE
+
+NONCE = 24 byte random nonce
+
+CIPHERTEXT = XChaCha20-Poly1305(
+    plaintext=PRIVATE\_KEY,
+    associated_data=ASSOCIATED\_DATA,
+    nonce=NONCE,
+    key=SYMMETRIC\_KEY
+)
+
+VERSION\_NUMBER = 0x02
+
+CIPHERTEXT_CONCATENATION = concat(
+    VERSION\_NUMBER,
+    LOG\_N,
+    SALT,
+    NONCE,
+    ASSOCIATED\_DATA,
+    CIPHERTEXT
+)
+
+ENCRYPTED\_PRIVATE\_KEY = bech32_encode('ncryptsec', CIPHERTEXT\_CONCATENATION)
+
+The output prior to bech32 encoding should be 91 bytes long.
+
+The decryption process operates in the reverse.
+
+
+Test Data
+---------
+
+The following encrypted private key:
+
+`ncryptsec1qgg9947rlpvqu76pj5ecreduf9jxhselq2nae2kghhvd5g7dgjtcxfqtd67p9m0w57lspw8gsq6yphnm8623nsl8xn9j4jdzz84zm3frztj3z7s35vpzmqf6ksu8r89qk5z2zxfmu5gv8th8wclt0h4p`
+
+When decrypted with password='nostr' and log_n=16 yields the following hex-encoded private key:
+
+`3501454135014541350145413501453fefb02227e449e57cf4d3a3ce05378683`
+
+The reverse process is non-deterministic due to the random nonce.
+
+Discussion
+----------
+
+### On Key Derivation
+
+Passwords make poor cryptographic keys. Prior to use as a cryptographic key, two things need to happen:
+
+1. An encryption key needs to be deterministically created from the password such that is has a uniform functionally random distribution of bits, such that the symmetric encryption algorithm's assumptions are valid, and
+2. A slow irreversible algorithm should be injected into the process, so that brute-force attempts to decrypt by trying many passwords are severely hampered.
+
+These are achieved using a password-based key derivation function. We use scrypt, which has been proven to be maximally memory hard and which several cryptographers have indicated to the author is better than argon2 even though argon2 won a competition in 2015.
+
+### On the symmetric encryption algorithm
+
+XChaCha20-Poly1305 is typically favored by cryptographers over AES and is less associated with the U.S. government.  It (or it's earlier variant without the 'X') is gaining wide usage, is used in TLS and OpenSSH, and is available in most modern crypto libraries.
+
+Recommendations
+---------
+
+It is not recommended that users publish these encrypted private keys to nostr, as cracking a key may become easier when an attacker can amass many encrypted private keys.
+
+It is recommended that clients zero out the memory of passwords and private keys before freeing that memory.
diff --git a/README.md b/README.md
index 91179cd..9ce96fc 100644
--- a/README.md
+++ b/README.md
@@ -57,6 +57,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 - [NIP-46: Nostr Connect](46.md)
 - [NIP-47: Wallet Connect](47.md)
 - [NIP-48: Proxy Tags](48.md)
+- [NIP-49: Private Key Encryption](49.md)
 - [NIP-50: Search Capability](50.md)
 - [NIP-51: Lists](51.md)
 - [NIP-52: Calendar Events](52.md)

From ee93721ac76bb1e54e7de1d6a7d9f00c6b3c9849 Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Wed, 31 Jan 2024 07:47:56 +0900
Subject: [PATCH 116/263] Add NIP-59 to README

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 9ce96fc..10b1dfb 100644
--- a/README.md
+++ b/README.md
@@ -65,6 +65,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 - [NIP-56: Reporting](56.md)
 - [NIP-57: Lightning Zaps](57.md)
 - [NIP-58: Badges](58.md)
+- [NIP-59: Gift Wrap](59.md)
 - [NIP-65: Relay List Metadata](65.md)
 - [NIP-72: Moderated Communities](72.md)
 - [NIP-75: Zap Goals](75.md)

From f3589b99b0e5e297eea2de6b3686f81541b7d3db Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Thu, 1 Feb 2024 00:11:14 +0900
Subject: [PATCH 117/263] NIP-59: fix typo and nitpicks

---
 59.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/59.md b/59.md
index c990236..7eff2b8 100644
--- a/59.md
+++ b/59.md
@@ -58,7 +58,7 @@ Tags MUST must always be empty in a `kind:13`. The inner event MUST always be un
 ## 3. Gift Wrap Event Kind
 
 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 proof of work.
+needed to route the event to its intended recipient, including the recipient's `p` tag or [NIP-13](13.md) proof of work.
 
 ```js
 {
@@ -74,7 +74,7 @@ needed to route the event to its intended recipient, including the recipient's `
 
 # Encrypting Payloads
 
-Encryption is done following NIP-44 on the JSON-encoded event. Place the the encryption payload in the `.content`
+Encryption is done following [NIP-44](44.md) on the JSON-encoded event. Place the encryption payload in the `.content`
 of the wrapper event (either a `seal` or a `gift wrap`).
 
 # Other Considerations
@@ -87,13 +87,13 @@ time-analysis attacks. Note that some relays don't serve events dated in the fut
 SHOULD be in the past.
 
 Relays may choose not to store gift wrapped events due to them not being publicly useful. Clients MAY choose
-to attach a certain amount of proof-of-work to the wrapper event per NIP-13 in a bid to demonstrate that
+to attach a certain amount of proof-of-work to the wrapper event per [NIP-13](13.md) in a bid to demonstrate that
 the event is not spam or a denial-of-service attack.
 
-To protect recipient metadata, relays SHOULD guard access to kind 1059 events based on user AUTH. When
+To protect recipient metadata, relays SHOULD guard access to `kind 1059` events based on user AUTH. When
 possible, clients should only send wrapped events to relays that offer this protection.
 
-To protect recipient metadata, relays SHOULD only serve kind 1059 events intended for the marked recipient.
+To protect recipient metadata, relays SHOULD only serve `kind 1059` events intended for the marked recipient.
 When possible, clients should only send wrapped events to `read` relays for the recipient that implement
 AUTH, and refuse to serve wrapped events to non-recipients.
 

From 49c9f37229c470b2072f3336a5e1927f0243f41d Mon Sep 17 00:00:00 2001
From: zmeyer44 <zmmeyer44@gmail.com>
Date: Thu, 1 Feb 2024 11:12:47 +0000
Subject: [PATCH 118/263] updated read me

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index 6b83490..0d4805c 100644
--- a/README.md
+++ b/README.md
@@ -64,6 +64,7 @@ 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-65: Relay List Metadata](65.md)
+- [NIP-71: Video Events](71.md)
 - [NIP-72: Moderated Communities](72.md)
 - [NIP-75: Zap Goals](75.md)
 - [NIP-78: Application-specific data](78.md)
@@ -128,6 +129,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `30002`       | Relay sets                 | [51](51.md)              |
 | `30003`       | Bookmark sets              | [51](51.md)              |
 | `30004`       | Curation sets              | [51](51.md)              |
+| `30005`       | Video sets              | [51](51.md)              |
 | `30008`       | Profile Badges             | [58](58.md)              |
 | `30009`       | Badge Definition           | [58](58.md)              |
 | `30015`       | Interest sets              | [51](51.md)              |
@@ -147,6 +149,9 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `31925`       | Calendar Event RSVP        | [52](52.md)              |
 | `31989`       | Handler recommendation     | [89](89.md)              |
 | `31990`       | Handler information        | [89](89.md)              |
+| `34235`       | Video Event       | [71](71.md)              |
+| `34236`       | Short-form Portrait Video Event      | [71](71.md)              |
+| `34237`       | Video View Event      | [71](71.md)              |
 | `34550`       | Community Definition       | [72](72.md)              |
 
 [nostrocket]: https://github.com/nostrocket/NIPS/blob/main/Problems.md

From cc6ac4f0b6d1779929dd7346536807699c21d6b2 Mon Sep 17 00:00:00 2001
From: zmeyer44 <zmmeyer44@gmail.com>
Date: Thu, 1 Feb 2024 11:14:59 +0000
Subject: [PATCH 119/263] making the format a bit nicer

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 0d4805c..1c2f806 100644
--- a/README.md
+++ b/README.md
@@ -149,9 +149,9 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `31925`       | Calendar Event RSVP        | [52](52.md)              |
 | `31989`       | Handler recommendation     | [89](89.md)              |
 | `31990`       | Handler information        | [89](89.md)              |
-| `34235`       | Video Event       | [71](71.md)              |
-| `34236`       | Short-form Portrait Video Event      | [71](71.md)              |
-| `34237`       | Video View Event      | [71](71.md)              |
+| `34235`       | Video Event                | [71](71.md)              |
+| `34236`       | Short-form Portrait Video Event    | [71](71.md)      |
+| `34237`       | Video View Event           | [71](71.md)              |
 | `34550`       | Community Definition       | [72](72.md)              |
 
 [nostrocket]: https://github.com/nostrocket/NIPS/blob/main/Problems.md

From ffef063a44cc1431da39b9fe145bf2a8ff84f302 Mon Sep 17 00:00:00 2001
From: ocknamo <s14pes@gmail.com>
Date: Thu, 1 Feb 2024 23:57:58 +0900
Subject: [PATCH 120/263] fix: Correct PASSPHRASE to PASSWORD in NIP-49

---
 49.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/49.md b/49.md
index becc586..6de05eb 100644
--- a/49.md
+++ b/49.md
@@ -7,12 +7,12 @@ Private Key Encryption
 
 `draft` `optional`
 
-This NIP defines a method by which clients can encrypt (and decrypt) a user's private key with a passphrase.
+This NIP defines a method by which clients can encrypt (and decrypt) a user's private key with a password.
 
 Symmetric Encryption Key derivation
 -----------------------------------
 
-PASSPHRASE = read from the user
+PASSWORD = read from the user
 
 LOG\_N = Let the user or implementer choose one byte representing a power of 2 (e.g. 18 represents 262,144) which is used as the number of rounds for scrypt. Larger numbers take more time and more memory, and offer better protection:
 
@@ -26,7 +26,7 @@ LOG\_N = Let the user or implementer choose one byte representing a power of 2 (
 
 SALT = 16 random bytes
 
-SYMMETRIC_KEY = scrypt(passphrase=PASSPHRASE, salt=SALT, log\_n=LOG\_N, r=8, p=1)
+SYMMETRIC_KEY = scrypt(password=PASSWORD, salt=SALT, log\_n=LOG\_N, r=8, p=1)
 
 The symmetric key should be 32 bytes long.
 

From 2c016b0659a8f29ad2420a4cd844a2dca4956407 Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Mon, 27 Nov 2023 14:47:04 -0800
Subject: [PATCH 121/263] Add imeta tag

---
 29.md | 43 +++++++++++++++++++++++++++++++++++++++++++
 94.md |  1 +
 2 files changed, 44 insertions(+)
 create mode 100644 29.md

diff --git a/29.md b/29.md
new file mode 100644
index 0000000..8c990bb
--- /dev/null
+++ b/29.md
@@ -0,0 +1,43 @@
+NIP029
+======
+
+imeta
+--------------
+
+`imeta` is a tag for adding media attachments to events. `imeta` tags MUST match URLs
+in the event content. Clients may replace imeta URLs with rich previews. `imeta` tags
+contain extra information about the media attachment, which clients can use to provide
+a better experience when loading images.
+
+The `imeta` tag is variadic, and each entry is a space-delimited key/value pair.
+Each `imeta` tag MUST have a `url`, and at least one other field. `imeta` may include
+any field specified by [NIP 94](./94.md). There SHOULD be only one `imeta` tag per url.
+
+## Example
+
+```json
+{
+  "content": "More image metadata tests don’t mind me https://nostr.build/i/my-image.jpg",
+  "kind": 1,
+  "tags": [
+    [
+      "imeta",
+      "url https://nostr.build/i/my-image.jpg",
+      "blurhash eVF$^OI:${M{o#*0-nNFxakD-?xVM}WEWB%iNKxvR-oetmo#R-aen$",
+      "dim 3024x4032",
+      "alt A scenic photo overlooking the coast of Costa Rica",
+      "x <sha256 hash as specified in NIP 94>",
+      "fallback https://nostrcheck.me/alt1.jpg"
+      "fallback https://void.cat/alt1.jpg"
+    ]
+  ]
+}
+```
+
+## Recommended client behavior
+
+When uploading images during a new post, clients MAY include this metadata
+after the image is uploaded and included in the post.
+
+When pasting urls during post composition, the client MAY download the image
+and add this metadata before the post is sent.
diff --git a/94.md b/94.md
index eb8117a..e35dfa1 100644
--- a/94.md
+++ b/94.md
@@ -25,6 +25,7 @@ This NIP specifies the use of the `1063` event type, having in `content` a descr
 * `image` (optional) url of preview image with same dimensions
 * `summary` (optional) text excerpt
 * `alt` (optional) description for accessibility
+* `fallback` (optional) zero or more fallback file sources in case `url` fails
 
 ```json
 {

From 716234149a2544cd59c7f4d04608e71b4fc7aab3 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 1 Feb 2024 15:47:51 -0600
Subject: [PATCH 122/263] NIP-29: add to NIPs list, improve preamble phrasing

---
 29.md     | 14 +++++++-------
 README.md |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/29.md b/29.md
index 8c990bb..dafd51c 100644
--- a/29.md
+++ b/29.md
@@ -1,13 +1,12 @@
-NIP029
+NIP-29
 ======
 
-imeta
---------------
+Media Attachments
+-----------------
 
-`imeta` is a tag for adding media attachments to events. `imeta` tags MUST match URLs
-in the event content. Clients may replace imeta URLs with rich previews. `imeta` tags
-contain extra information about the media attachment, which clients can use to provide
-a better experience when loading images.
+Media attachments (images, videos, and other files) may be added to events by including a URL in the event content, along with a matching `imeta` tag.
+
+`imeta` ("inline metadata") tags add information about media URLs in the event's content. Each `imeta` tag SHOULD match a URL in the event content. Clients may replace imeta URLs with rich previews. `imeta` tags contain extra information about the media attachment, which clients can use to provide a better experience when loading previews.
 
 The `imeta` tag is variadic, and each entry is a space-delimited key/value pair.
 Each `imeta` tag MUST have a `url`, and at least one other field. `imeta` may include
@@ -23,6 +22,7 @@ any field specified by [NIP 94](./94.md). There SHOULD be only one `imeta` tag p
     [
       "imeta",
       "url https://nostr.build/i/my-image.jpg",
+      "m image/jpeg",
       "blurhash eVF$^OI:${M{o#*0-nNFxakD-?xVM}WEWB%iNKxvR-oetmo#R-aen$",
       "dim 3024x4032",
       "alt A scenic photo overlooking the coast of Costa Rica",
diff --git a/README.md b/README.md
index 10b1dfb..28d016b 100644
--- a/README.md
+++ b/README.md
@@ -44,6 +44,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 - [NIP-26: Delegated Event Signing](26.md)
 - [NIP-27: Text Note References](27.md)
 - [NIP-28: Public Chat](28.md)
+- [NIP-29: Media Attachments](29.md)
 - [NIP-30: Custom Emoji](30.md)
 - [NIP-31: Dealing with Unknown Events](31.md)
 - [NIP-32: Labeling](32.md)

From eee64fedb2c81a284fa98e09da57abd06d98dec0 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 1 Feb 2024 15:51:22 -0600
Subject: [PATCH 123/263] NIP-29: remove the redundant last sentence

---
 29.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/29.md b/29.md
index dafd51c..2913619 100644
--- a/29.md
+++ b/29.md
@@ -6,7 +6,7 @@ Media Attachments
 
 Media attachments (images, videos, and other files) may be added to events by including a URL in the event content, along with a matching `imeta` tag.
 
-`imeta` ("inline metadata") tags add information about media URLs in the event's content. Each `imeta` tag SHOULD match a URL in the event content. Clients may replace imeta URLs with rich previews. `imeta` tags contain extra information about the media attachment, which clients can use to provide a better experience when loading previews.
+`imeta` ("inline metadata") tags add information about media URLs in the event's content. Each `imeta` tag SHOULD match a URL in the event content. Clients may replace imeta URLs with rich previews.
 
 The `imeta` tag is variadic, and each entry is a space-delimited key/value pair.
 Each `imeta` tag MUST have a `url`, and at least one other field. `imeta` may include

From 5e14fd7f0851779cda2adbb8fd8bac4547570b15 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 1 Feb 2024 15:52:52 -0600
Subject: [PATCH 124/263] NIP-29: images -> files

---
 29.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/29.md b/29.md
index 2913619..2a22233 100644
--- a/29.md
+++ b/29.md
@@ -36,8 +36,8 @@ any field specified by [NIP 94](./94.md). There SHOULD be only one `imeta` tag p
 
 ## Recommended client behavior
 
-When uploading images during a new post, clients MAY include this metadata
-after the image is uploaded and included in the post.
+When uploading files during a new post, clients MAY include this metadata
+after the file is uploaded and included in the post.
 
-When pasting urls during post composition, the client MAY download the image
+When pasting urls during post composition, the client MAY download the file
 and add this metadata before the post is sent.

From 5196ac196a9e19cfbb9c6cd16d8081dd137e3572 Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Thu, 1 Feb 2024 20:59:37 -0300
Subject: [PATCH 125/263] move `imeta` to NIP-92, add `imeta` tag to README.

---
 29.md => 92.md | 2 +-
 README.md      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
 rename 29.md => 92.md (99%)

diff --git a/29.md b/92.md
similarity index 99%
rename from 29.md
rename to 92.md
index 2a22233..81d4610 100644
--- a/29.md
+++ b/92.md
@@ -1,4 +1,4 @@
-NIP-29
+NIP-92
 ======
 
 Media Attachments
diff --git a/README.md b/README.md
index 28d016b..438f517 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,6 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 - [NIP-26: Delegated Event Signing](26.md)
 - [NIP-27: Text Note References](27.md)
 - [NIP-28: Public Chat](28.md)
-- [NIP-29: Media Attachments](29.md)
 - [NIP-30: Custom Emoji](30.md)
 - [NIP-31: Dealing with Unknown Events](31.md)
 - [NIP-32: Labeling](32.md)
@@ -74,6 +73,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 - [NIP-84: Highlights](84.md)
 - [NIP-89: Recommended Application Handlers](89.md)
 - [NIP-90: Data Vending Machines](90.md)
+- [NIP-92: Media Attachments](92.md)
 - [NIP-94: File Metadata](94.md)
 - [NIP-96: HTTP File Storage Integration](96.md)
 - [NIP-98: HTTP Auth](98.md)
@@ -218,6 +218,7 @@ Please update these lists when proposing NIPs introducing new event kinds.
 | `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`            | badge name                           | --                   | [58](58.md)                           |

From 6de5ee32f411a91f5001a7d300931a7b1ec9adca Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Sat, 3 Feb 2024 10:28:57 +0900
Subject: [PATCH 126/263] NIP-92: fix typo and nitpicks

---
 92.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/92.md b/92.md
index 81d4610..b857d6c 100644
--- a/92.md
+++ b/92.md
@@ -10,7 +10,7 @@ Media attachments (images, videos, and other files) may be added to events by in
 
 The `imeta` tag is variadic, and each entry is a space-delimited key/value pair.
 Each `imeta` tag MUST have a `url`, and at least one other field. `imeta` may include
-any field specified by [NIP 94](./94.md). There SHOULD be only one `imeta` tag per url.
+any field specified by [NIP 94](./94.md). There SHOULD be only one `imeta` tag per URL.
 
 ## Example
 
@@ -27,7 +27,7 @@ any field specified by [NIP 94](./94.md). There SHOULD be only one `imeta` tag p
       "dim 3024x4032",
       "alt A scenic photo overlooking the coast of Costa Rica",
       "x <sha256 hash as specified in NIP 94>",
-      "fallback https://nostrcheck.me/alt1.jpg"
+      "fallback https://nostrcheck.me/alt1.jpg",
       "fallback https://void.cat/alt1.jpg"
     ]
   ]
@@ -39,5 +39,5 @@ any field specified by [NIP 94](./94.md). There SHOULD be only one `imeta` tag p
 When uploading files during a new post, clients MAY include this metadata
 after the file is uploaded and included in the post.
 
-When pasting urls during post composition, the client MAY download the file
+When pasting URLs during post composition, the client MAY download the file
 and add this metadata before the post is sent.

From c8ba0e2e35bf987b9336d2ff49f452e84620396a Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Mon, 29 Jan 2024 09:05:11 -0800
Subject: [PATCH 127/263] Add status to nip 99

---
 99.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/99.md b/99.md
index e65920c..93550d8 100644
--- a/99.md
+++ b/99.md
@@ -40,6 +40,7 @@ The following tags, used for structured metadata, are standardized and SHOULD be
   - `"<number>"` is the amount in numeric format (but included in the tag as a string)
   - `"<currency>"` is the currency unit in 3-character ISO 4217 format or ISO 4217-like currency code (e.g. `"btc"`, `"eth"`).
   - `"<frequency>"` is optional and can be used to describe recurring payments. SHOULD be in noun format (hour, day, week, month, year, etc.)
+- - `"status"` (optional), the status of the listing. SHOULD be either "active" or "sold".
 
 #### `price` examples
 

From d3dad114e60cb45bb04f2088a68ebd16cf6837df Mon Sep 17 00:00:00 2001
From: fiatjaf_ <fiatjaf@gmail.com>
Date: Tue, 6 Feb 2024 20:29:33 -0300
Subject: [PATCH 128/263] NIP-46: replace npub1...#? notation with bunker://...
 (#1023)

---
 46.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/46.md b/46.md
index 05247c5..94a052e 100644
--- a/46.md
+++ b/46.md
@@ -17,7 +17,7 @@ The client always starts by generating a random key which is used to communicate
 The remote signer generates a connection token in the form
 
 ```
-<npub1...>#<optional-secret>?relay=wss://...&relay=wss://...
+bunker://<hex-pubkey>?relay=wss://...&relay=wss://...&secret=<optional-secret>
 ```
 
 The user copies that token and pastes it in the client UI somehow. Then the client can send events of kind `24133` to the specified relays and wait for responses from the remote signer.
@@ -96,4 +96,3 @@ The signer key will always be the key of the user who controls the signer device
 - **ping**
   - params: []
   - result: `"pong"`
-

From a46338bd6a183f17a292ea578ee69ff15ea6723f Mon Sep 17 00:00:00 2001
From: Thebora Kompanioni <theborakompanioni@users.noreply.github.com>
Date: Thu, 8 Feb 2024 00:03:32 +0100
Subject: [PATCH 129/263] fix(docs): typo in 01.md

---
 01.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/01.md b/01.md
index c1e3748..905e45f 100644
--- a/01.md
+++ b/01.md
@@ -147,7 +147,7 @@ The `limit` property of a filter is only valid for the initial query and MUST be
 
 ### From relay to client: sending events and notices
 
-Relays can send 4 types of messages, which must also be JSON arrays, according to the following patterns:
+Relays can send 5 types of messages, which must also be JSON arrays, according to the following patterns:
 
   * `["EVENT", <subscription_id>, <event JSON as defined above>]`, used to send events requested by clients.
   * `["OK", <event_id>, <true|false>, <message>]`, used to indicate acceptance or denial of an `EVENT` message.

From 94761a5f3bcfb2c4085ae4d42fced450a2da25eb Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Mon, 12 Feb 2024 22:23:21 +0900
Subject: [PATCH 130/263] Add kinds for NIP-59

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 438f517..d1c5250 100644
--- a/README.md
+++ b/README.md
@@ -91,6 +91,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `6`           | Repost                     | [18](18.md)              |
 | `7`           | Reaction                   | [25](25.md)              |
 | `8`           | Badge Award                | [58](58.md)              |
+| `13`          | Seal                       | [59](59.md)              |
 | `16`          | Generic Repost             | [18](18.md)              |
 | `40`          | Channel Creation           | [28](28.md)              |
 | `41`          | Channel Metadata           | [28](28.md)              |
@@ -100,6 +101,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `1021`        | Bid                        | [15](15.md)              |
 | `1022`        | Bid confirmation           | [15](15.md)              |
 | `1040`        | OpenTimestamps             | [03](03.md)              |
+| `1059`        | Gift Wrap                  | [59](59.md)              |
 | `1063`        | File Metadata              | [94](94.md)              |
 | `1311`        | Live Chat Message          | [53](53.md)              |
 | `1971`        | Problem Tracker            | [nostrocket][nostrocket] |

From 3f13eb34bf21f693ee7a8ddaba19229600fd323e Mon Sep 17 00:00:00 2001
From: franzap <126621043+fr4nzap@users.noreply.github.com>
Date: Tue, 13 Feb 2024 12:40:57 +0000
Subject: [PATCH 131/263] File metadata sets (#1040)

* File metadata sets

* Make kind specific to release artifacts

* Update example

* Update README
---
 51.md     | 25 +++++++++++++++++++++++++
 README.md |  1 +
 2 files changed, 26 insertions(+)

diff --git a/51.md b/51.md
index 9a1639f..c58d37a 100644
--- a/51.md
+++ b/51.md
@@ -49,6 +49,7 @@ Aside from their main identifier, the `"d"` tag, sets can optionally have a `"ti
 | Curation sets | 30005 | groups of videos picked by users as interesting and/or belonging to the same category        | `"a"` (kind:34235 videos)                                                         |
 | 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"`  |
 
 ## Deprecated standard lists
 
@@ -103,6 +104,30 @@ Some clients have used these lists in the past, but they should work on transiti
 }
 ```
 
+### A _release artifact set_ of an Example App
+
+```json
+{
+  "id": "567b41fc9060c758c4216fe5f8d3df7c57daad7ae757fa4606f0c39d4dd220ef",
+  "pubkey": "d6dc95542e18b8b7aec2f14610f55c335abebec76f3db9e58c254661d0593a0c",
+  "created_at": 1695327657,
+  "kind": 30063,
+  "tags": [
+    ["d", "ak8dy3v7"],
+    ["i", "com.example.app"],
+    ["version", "0.0.1"],
+    ["title", "Example App"],
+    ["image", "http://cdn.site/p/com.example.app/icon.png"],
+    ["e", "d78ba0d5dce22bfff9db0a9e996c9ef27e2c91051de0c4e1da340e0326b4941e"], // Windows exe
+    ["e", "f27e2c91051de0c4e1da0d5dce22bfff9db0a9340e0326b4941ed78bae996c9e"], // MacOS dmg
+    ["e", "9d24ddfab95ba3ff7c03fbd07ad011fff245abea431fb4d3787c2d04aad02332"], // Linux AppImage
+    ["e", "340e0326b340e0326b4941ed78ba340e0326b4941ed78ba340e0326b49ed78ba"] // PWA
+  ],
+  "content": "Example App is a decentralized marketplace for apps",
+  "sig": "a9a4e2192eede77e6c9d24ddfab95ba3ff7c03fbd07ad011fff245abea431fb4d3787c2d04aad001cb039cb8de91d83ce30e9a94f82ac3c5a2372aa1294a96bd"
+}
+```
+
 ## Encryption process pseudocode
 
 ```scala
diff --git a/README.md b/README.md
index d1c5250..caecc01 100644
--- a/README.md
+++ b/README.md
@@ -148,6 +148,7 @@ 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)              |
+| `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)              |

From b5dc891973a1c5a76c39e9c48409d841d2d687c3 Mon Sep 17 00:00:00 2001
From: franzap <_@franzap.com>
Date: Mon, 12 Feb 2024 19:45:25 +0000
Subject: [PATCH 132/263] Add PGP as NIP-39 external identity

---
 39.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/39.md b/39.md
index c819e43..df1578f 100644
--- a/39.md
+++ b/39.md
@@ -20,6 +20,7 @@ A new optional `i` tag is introduced for `kind 0` metadata event contents in add
     ["i", "twitter:semisol_public", "1619358434134196225"],
     ["i", "mastodon:bitcoinhackers.org/@semisol", "109775066355589974"]
     ["i", "telegram:1087295469", "nostrdirectory/770"]
+    ["i", "pgp:A999B7498D1A8DC473E53C92309F635DAD1B5517", "xsFNBF2V8eEBEADmjYzGOpxEI0J7jQ1qFzlsrjF6NaBSq+UqKw..."]
   ],
   ...
 }
@@ -62,3 +63,9 @@ Identity: A Telegram user ID.
 
 Proof: A string in the format `<ref>/<id>` which points to a message published in the public channel or group with name `<ref>` and message ID `<id>`. This message should be sent by user ID `<identity>` and have the text `Verifying that I control the following Nostr public key: "<npub encoded public key>"`.
 This can be located at `https://t.me/<proof>`.
+
+### `pgp`
+
+Identity: A PGP fingerprint.
+
+Proof: PGP signature of the fingerprint used in the identity field.
\ No newline at end of file

From ded4c1659ce838625705f86bb563df7507d52503 Mon Sep 17 00:00:00 2001
From: greenart7c3 <greenart7c3@proton.me>
Date: Wed, 14 Feb 2024 14:37:42 -0300
Subject: [PATCH 133/263] fix typo

---
 100.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/100.md b/100.md
index cddb806..ee5149a 100644
--- a/100.md
+++ b/100.md
@@ -468,7 +468,7 @@ Android intents and browsers url has limitations, so if you are using the return
   - params:
 
     ```js
-    const intent = `intent:${encryptedText}#Intent;scheme=nostrsigner;S.pubKey=${hex_pub_key};S.compressionType=none;S.returnType=signature;S.type=nip44_encrypt;S.callbackUrl=https://example.com/?event=;end`;
+    const intent = `intent:${encryptedText}#Intent;scheme=nostrsigner;S.pubKey=${hex_pub_key};S.compressionType=none;S.returnType=signature;S.type=nip04_decrypt;S.callbackUrl=https://example.com/?event=;end`;
 
     window.href = intent;
     ```     

From afbb8dd008969c863f6075645d09fcb1ef283ed2 Mon Sep 17 00:00:00 2001
From: Semisol <45574030+Semisol@users.noreply.github.com>
Date: Thu, 15 Feb 2024 01:32:38 +0300
Subject: [PATCH 134/263] remove pgp identity from NIP-39 temporarily

the current scheme recommends signing the *fingerprint* of the pgp key, which doesn't tie into the nostr identity
this commit temporarily undos the commit adding pgp identities until a proper fixed version is merged

just signing the npub string also would not be sufficient, and the message should indicate this is for identity verification

ideally, a link to download key material would also be included
---
 39.md | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/39.md b/39.md
index df1578f..c819e43 100644
--- a/39.md
+++ b/39.md
@@ -20,7 +20,6 @@ A new optional `i` tag is introduced for `kind 0` metadata event contents in add
     ["i", "twitter:semisol_public", "1619358434134196225"],
     ["i", "mastodon:bitcoinhackers.org/@semisol", "109775066355589974"]
     ["i", "telegram:1087295469", "nostrdirectory/770"]
-    ["i", "pgp:A999B7498D1A8DC473E53C92309F635DAD1B5517", "xsFNBF2V8eEBEADmjYzGOpxEI0J7jQ1qFzlsrjF6NaBSq+UqKw..."]
   ],
   ...
 }
@@ -63,9 +62,3 @@ Identity: A Telegram user ID.
 
 Proof: A string in the format `<ref>/<id>` which points to a message published in the public channel or group with name `<ref>` and message ID `<id>`. This message should be sent by user ID `<identity>` and have the text `Verifying that I control the following Nostr public key: "<npub encoded public key>"`.
 This can be located at `https://t.me/<proof>`.
-
-### `pgp`
-
-Identity: A PGP fingerprint.
-
-Proof: PGP signature of the fingerprint used in the identity field.
\ No newline at end of file

From cbec02ab52ffb062f7b7712e0ed6ec524cfe0b6a Mon Sep 17 00:00:00 2001
From: Mike Dilger <mike@mikedilger.com>
Date: Fri, 16 Feb 2024 09:38:21 +1300
Subject: [PATCH 135/263] NIP-49 [breaking]: password normalized to unicode
 NFKC format

---
 49.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/49.md b/49.md
index 6de05eb..addcf74 100644
--- a/49.md
+++ b/49.md
@@ -12,7 +12,7 @@ This NIP defines a method by which clients can encrypt (and decrypt) a user's pr
 Symmetric Encryption Key derivation
 -----------------------------------
 
-PASSWORD = read from the user
+PASSWORD = Read from the user. The password should be unicode normalized to NFKC format to ensure that the password can be entered identically on other computers/clients.
 
 LOG\_N = Let the user or implementer choose one byte representing a power of 2 (e.g. 18 represents 262,144) which is used as the number of rounds for scrypt. Larger numbers take more time and more memory, and offer better protection:
 

From 62c48eff58d6dd4d2b0a817bbb36cd75087f0ae3 Mon Sep 17 00:00:00 2001
From: Michael Dilger <mike@mikedilger.com>
Date: Fri, 16 Feb 2024 14:15:32 +1300
Subject: [PATCH 136/263] Breaking changes list (#1052)

* Start of new BREAKING.md changes list

* more

* Make NIP column into links

* notes

* Make commits links

* Remove optional P tag entry, was not breaking

* Update BREAKING with nip-49 breaking change
---
 BREAKING.md | 21 +++++++++++++++++++++
 README.md   |  5 +++++
 2 files changed, 26 insertions(+)
 create mode 100644 BREAKING.md

diff --git a/BREAKING.md b/BREAKING.md
new file mode 100644
index 0000000..2a85a28
--- /dev/null
+++ b/BREAKING.md
@@ -0,0 +1,21 @@
+# Breaking Changes
+
+This is a history of NIP changes that potentially break pre-existing implementations, in
+reverse chronological order.
+
+| Date        | Commit    | NIP      | Change |
+| ----------- | --------- | -------- | ------ |
+| 2024-02-16  | [cbec02ab](https://github.com/nostr-protocol/nips/commit/cbec02ab) | [NIP-49](49.md) | Password first normalized to NFKC |
+| 2024-02-15  | [afbb8dd0](https://github.com/nostr-protocol/nips/commit/afbb8dd0) | [NIP-39](39.md) | PGP identity was removed |
+| 2024-02-07  | [d3dad114](https://github.com/nostr-protocol/nips/commit/d3dad114)  | [NIP-46](46.md) | Connection token format was changed |
+| 2024-01-30  | [1a2b21b6](https://github.com/nostr-protocol/nips/commit/1a2b21b6)  | [NIP-59](59.md) | 'p' tag became optional |
+| 2023-01-27  | [c2f34817](https://github.com/nostr-protocol/nips/commit/c2f34817)  | [NIP-47](47.md) | optional expiration tag should be honored |
+| 2024-01-10  | [3d8652ea](https://github.com/nostr-protocol/nips/commit/3d8652ea)  | [NIP-02](02.md) | list entries should be chronological |
+| 2024-01-10  | [3d8652ea](https://github.com/nostr-protocol/nips/commit/3d8652ea)  | [NIP-51](51.md) | list entries should be chronological |
+
+Breaking changes prior to 2024-01-01 are not yet documented.
+
+## NOTES
+
+- If it isn't clear that a change is breaking or not, we list it.
+- The date is the date it was merged, not necessarily the date of the commit.
diff --git a/README.md b/README.md
index caecc01..b9ca8aa 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 - [Criteria for acceptance of NIPs](#criteria-for-acceptance-of-nips)
 - [Is this repository a centralizing factor?](#is-this-repository-a-centralizing-factor)
 - [How this repository works](#how-this-repository-works)
+- [Breaking Changes](#breaking-changes)
 - [License](#license)
 
 ---
@@ -261,6 +262,10 @@ Standards may emerge in two ways: the first way is that someone starts doing som
 
 These two ways of standardizing things are supported by this repository. Although the second is preferred, an effort will be made to codify standards emerged outside this repository into NIPs that can be later referenced and easily understood and implemented by others -- but obviously as in any human system discretion may be applied when standards are considered harmful.
 
+## Breaking Changes
+
+[Breaking Changes](BREAKING.md)
+
 ## License
 
 All NIPs are public domain.

From 36d22815878186285825511358e66a52d2bf95e4 Mon Sep 17 00:00:00 2001
From: Michael Dilger <mike@mikedilger.com>
Date: Fri, 16 Feb 2024 15:54:47 +1300
Subject: [PATCH 137/263] NIP-49 test vector for unicode normalization (#1054)

* NIP-49 [breaking]: password normalized to unicode NFKC format

* Test vector for unicode normalization
---
 49.md | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/49.md b/49.md
index addcf74..da58ba2 100644
--- a/49.md
+++ b/49.md
@@ -78,6 +78,22 @@ The decryption process operates in the reverse.
 Test Data
 ---------
 
+## Password Unicode Normalization
+
+The following password input: "ÅΩẛ̣"
+- Unicode Codepoints: U+212B U+2126 U+1E9B U+0323
+- UTF-8 bytes: [0xE2, 0x84, 0xAB, 0xE2, 0x84, 0xA6, 0xE1, 0xBA, 0x9B, 0xCC, 0xA3]
+
+Should be converted into the unicode normalized NFKC format prior to use in scrypt: "ÅΩẛ̣"
+- Unicode Codepoints: U+00C5 U+03A9 U+1E69
+- UTF-8 bytes: [0xC3, 0x85, 0xCE, 0xA9, 0xE1, 0xB9, 0xA9]
+
+## Encryption
+
+The encryption process is non-deterministic due to the random nonce.
+
+## Decryption
+
 The following encrypted private key:
 
 `ncryptsec1qgg9947rlpvqu76pj5ecreduf9jxhselq2nae2kghhvd5g7dgjtcxfqtd67p9m0w57lspw8gsq6yphnm8623nsl8xn9j4jdzz84zm3frztj3z7s35vpzmqf6ksu8r89qk5z2zxfmu5gv8th8wclt0h4p`
@@ -86,8 +102,6 @@ When decrypted with password='nostr' and log_n=16 yields the following hex-encod
 
 `3501454135014541350145413501453fefb02227e449e57cf4d3a3ce05378683`
 
-The reverse process is non-deterministic due to the random nonce.
-
 Discussion
 ----------
 

From 71b0cbc2de50ca9088398bb3cbf8f9eb6d5a7b53 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 20 Feb 2024 12:06:06 -0600
Subject: [PATCH 138/263] NIP-07: add NIP-44 calls

---
 07.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/07.md b/07.md
index 12ae647..18ca730 100644
--- a/07.md
+++ b/07.md
@@ -20,6 +20,8 @@ Aside from these two basic above, the following functions can also be implemente
 async window.nostr.getRelays(): { [url: string]: {read: boolean, write: boolean} } // returns a basic map of relay urls to relay policies
 async window.nostr.nip04.encrypt(pubkey, plaintext): string // returns ciphertext and iv as specified in nip-04 (deprecated)
 async window.nostr.nip04.decrypt(pubkey, ciphertext): string // takes ciphertext and iv as specified in nip-04 (deprecated)
+async window.nostr.nip44.encrypt(pubkey, plaintext): string // returns ciphertext and iv as specified in nip-44
+async window.nostr.nip44.decrypt(pubkey, ciphertext): string // takes ciphertext and iv as specified in nip-44
 ```
 
 ### Implementation

From 2390058a3260d778e62df066c0d5bb5e803d2527 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 20 Feb 2024 12:09:40 -0600
Subject: [PATCH 139/263] NIP-07: remove "and iv" from NIP-44 comments

---
 07.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/07.md b/07.md
index 18ca730..6c66322 100644
--- a/07.md
+++ b/07.md
@@ -20,8 +20,8 @@ Aside from these two basic above, the following functions can also be implemente
 async window.nostr.getRelays(): { [url: string]: {read: boolean, write: boolean} } // returns a basic map of relay urls to relay policies
 async window.nostr.nip04.encrypt(pubkey, plaintext): string // returns ciphertext and iv as specified in nip-04 (deprecated)
 async window.nostr.nip04.decrypt(pubkey, ciphertext): string // takes ciphertext and iv as specified in nip-04 (deprecated)
-async window.nostr.nip44.encrypt(pubkey, plaintext): string // returns ciphertext and iv as specified in nip-44
-async window.nostr.nip44.decrypt(pubkey, ciphertext): string // takes ciphertext and iv as specified in nip-44
+async window.nostr.nip44.encrypt(pubkey, plaintext): string // returns ciphertext as specified in nip-44
+async window.nostr.nip44.decrypt(pubkey, ciphertext): string // takes ciphertext as specified in nip-44
 ```
 
 ### Implementation

From cbffa7a5de845bd6ed939c77de5540904d011d4b Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Wed, 21 Feb 2024 05:26:44 +0900
Subject: [PATCH 140/263] BREAKING.md: update the history (#1055)

* BREAKING.md: add NIP changes until 2023-12-01

* Update BREAKING.md

* BREAKING.md: add NIP changes until 2023-11-01

* Update BREAKING.md

* Remove change to NIP-22 in 2023-12-02

* BREAKING.md: add NIP changes until 2023-08-01

* BREAKING.md: add NIP changes until 2023-04-01

* BREAKING.md: add NIP changes until 2023-03-01

* BREAKING.md: add NIP changes

* Just format
---
 BREAKING.md | 36 ++++++++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/BREAKING.md b/BREAKING.md
index 2a85a28..cd8c03d 100644
--- a/BREAKING.md
+++ b/BREAKING.md
@@ -7,13 +7,37 @@ reverse chronological order.
 | ----------- | --------- | -------- | ------ |
 | 2024-02-16  | [cbec02ab](https://github.com/nostr-protocol/nips/commit/cbec02ab) | [NIP-49](49.md) | Password first normalized to NFKC |
 | 2024-02-15  | [afbb8dd0](https://github.com/nostr-protocol/nips/commit/afbb8dd0) | [NIP-39](39.md) | PGP identity was removed |
-| 2024-02-07  | [d3dad114](https://github.com/nostr-protocol/nips/commit/d3dad114)  | [NIP-46](46.md) | Connection token format was changed |
-| 2024-01-30  | [1a2b21b6](https://github.com/nostr-protocol/nips/commit/1a2b21b6)  | [NIP-59](59.md) | 'p' tag became optional |
-| 2023-01-27  | [c2f34817](https://github.com/nostr-protocol/nips/commit/c2f34817)  | [NIP-47](47.md) | optional expiration tag should be honored |
-| 2024-01-10  | [3d8652ea](https://github.com/nostr-protocol/nips/commit/3d8652ea)  | [NIP-02](02.md) | list entries should be chronological |
-| 2024-01-10  | [3d8652ea](https://github.com/nostr-protocol/nips/commit/3d8652ea)  | [NIP-51](51.md) | list entries should be chronological |
+| 2024-02-07  | [d3dad114](https://github.com/nostr-protocol/nips/commit/d3dad114) | [NIP-46](46.md) | Connection token format was changed |
+| 2024-01-30  | [1a2b21b6](https://github.com/nostr-protocol/nips/commit/1a2b21b6) | [NIP-59](59.md) | 'p' tag became optional |
+| 2023-01-27  | [c2f34817](https://github.com/nostr-protocol/nips/commit/c2f34817) | [NIP-47](47.md) | optional expiration tag should be honored |
+| 2024-01-10  | [3d8652ea](https://github.com/nostr-protocol/nips/commit/3d8652ea) | [NIP-02](02.md) | list entries should be chronological |
+| 2024-01-10  | [3d8652ea](https://github.com/nostr-protocol/nips/commit/3d8652ea) | [NIP-51](51.md) | list entries should be chronological |
+| 2023-12-30  | [29869821](https://github.com/nostr-protocol/nips/commit/29869821) | [NIP-52](52.md) | 'name' tag was removed (use 'title' tag instead) |
+| 2023-12-27  | [17c67ef5](https://github.com/nostr-protocol/nips/commit/17c67ef5) | [NIP-94](94.md) | 'aes-256-gcm' tag was removed |
+| 2023-12-03  | [0ba45895](https://github.com/nostr-protocol/nips/commit/0ba45895) | [NIP-01](01.md) | WebSocket status code `4000` was replaced by 'CLOSED' message |
+| 2023-11-28  | [6de35f9e](https://github.com/nostr-protocol/nips/commit/6de35f9e) | [NIP-89](89.md) | 'client' tag value was changed |
+| 2023-11-20  | [7822a8b1](https://github.com/nostr-protocol/nips/commit/7822a8b1) | [NIP-51](51.md) | `kind: 30000` and `kind: 30001` were deprecated |
+| 2023-11-11  | [cbdca1e9](https://github.com/nostr-protocol/nips/commit/cbdca1e9) | [NIP-84](84.md) | 'range' tag was removed |
+| 2023-11-07  | [108b7f16](https://github.com/nostr-protocol/nips/commit/108b7f16) | [NIP-01](01.md) | 'OK' message must have 4 items |
+| 2023-10-17  | [cf672b76](https://github.com/nostr-protocol/nips/commit/cf672b76) | [NIP-03](03.md) | 'block' tag was removed |
+| 2023-09-29  | [7dc6385f](https://github.com/nostr-protocol/nips/commit/7dc6385f) | [NIP-57](57.md) | optional 'a' tag was included in `zap receipt` |
+| 2023-08-21  | [89915e02](https://github.com/nostr-protocol/nips/commit/89915e02) | [NIP-11](11.md) | 'min_prefix' was removed |
+| 2023-08-20  | [37c4375e](https://github.com/nostr-protocol/nips/commit/37c4375e) | [NIP-01](01.md) | replaceable events with same timestamp should be retained event with lowest id |
+| 2023-08-15  | [88ee873c](https://github.com/nostr-protocol/nips/commit/88ee873c) | [NIP-15](15.md) | 'countries' tag was renamed to 'regions' |
+| 2023-08-14  | [72bb8a12](https://github.com/nostr-protocol/nips/commit/72bb8a12) | [NIP-12](12.md) | NIP-12, 16, 20 and 33 were merged into NIP-01 |
+| 2023-08-14  | [72bb8a12](https://github.com/nostr-protocol/nips/commit/72bb8a12) | [NIP-16](16.md) | NIP-12, 16, 20 and 33 were merged into NIP-01 |
+| 2023-08-14  | [72bb8a12](https://github.com/nostr-protocol/nips/commit/72bb8a12) | [NIP-20](20.md) | NIP-12, 16, 20 and 33 were merged into NIP-01 |
+| 2023-08-14  | [72bb8a12](https://github.com/nostr-protocol/nips/commit/72bb8a12) | [NIP-33](33.md) | NIP-12, 16, 20 and 33 were merged into NIP-01 |
+| 2023-08-11  | [d87f8617](https://github.com/nostr-protocol/nips/commit/d87f8617) | [NIP-25](25.md) | empty `content` should be considered as "+" |
+| 2023-08-01  | [5d63b157](https://github.com/nostr-protocol/nips/commit/5d63b157) | [NIP-57](57.md) | 'zap' tag was changed |
+| 2023-07-15  | [d1814405](https://github.com/nostr-protocol/nips/commit/d1814405) | [NIP-01](01.md) | `since` and `until` filters should be `since <= created_at <= until` |
+| 2023-07-12  | [a1cd2bd8](https://github.com/nostr-protocol/nips/commit/a1cd2bd8) | [NIP-25](25.md) | custom emoji was supported |
+| 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-15  | [e1004d3d](https://github.com/nostr-protocol/nips/commit/e1004d3d) | [NIP-19](19.md) | `1: relay` was changed to optionally |
 
-Breaking changes prior to 2024-01-01 are not yet documented.
+Breaking changes prior to 2023-03-01 are not yet documented.
 
 ## NOTES
 

From c6cd655c1cba483fa9932b76e5ec62bafc56bc33 Mon Sep 17 00:00:00 2001
From: JeffG <202880+erskingardner@users.noreply.github.com>
Date: Tue, 20 Feb 2024 21:56:17 +0100
Subject: [PATCH 141/263] New version of NIP-46 (#1047)

* New version of NIP-46

* Update pubkey references

* Document what we have

* Update terms and kind number in discovery

* Update encypt/decrypt calls to handle arrays. Add redirect_uri param for auth_challenges

* Move remote signer commands to own section, add appendix for oauth-like stuff.

* Add diagrams
---
 46.md | 261 +++++++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 193 insertions(+), 68 deletions(-)

diff --git a/46.md b/46.md
index 94a052e..13a2fe4 100644
--- a/46.md
+++ b/46.md
@@ -1,98 +1,223 @@
-NIP-46
-======
+# NIP-46 - Nostr Remote Signing
 
-Nostr Connect
--------------
+## Rationale
 
-`draft` `optional`
+Private keys should be exposed to as few systems - apps, operating systems, devices - as possible as each system adds to the attack surface.
 
-This NIP describes a method for 2-way communication between a **remote signer** and a normal Nostr client. The remote signer could be, for example, a hardware device dedicated to signing Nostr events, while the client is a normal Nostr client.
+This NIP describes a method for 2-way communication between a remote signer and a Nostr client. The remote signer could be, for example, a hardware device dedicated to signing Nostr events, while the client is a normal Nostr client.
 
-## Signer Discovery
+## Terminology
 
-The client always starts by generating a random key which is used to communicate with the signer, then it one of the methods below is used to allow the client to know what is the signer public key for the session and which relays to use.
+- **Local keypair**: A local public and private key-pair used to encrypt content and communicate with the remote signer. Usually created by the client application.
+- **Remote user pubkey**: The public key that the user wants to sign as. The remote signer has control of the private key that matches this public key.
+- **Remote signer pubkey**: This is the public key of the remote signer itself. This is needed in both `create_account` command because you don't yet have a remote user pubkey.
 
-### Started by the signer (nsecBunker)
+All pubkeys specified in this NIP are in hex format.
 
-The remote signer generates a connection token in the form
+## Initiating a connection
+
+To initiate a connection between a client and a remote signer there are a few different options.
+
+### Direct connection initiated by remote signer
+
+This is most common in a situation where you have your own nsecbunker or other type of remote signer and want to connect through a client that supports remote signing.
+
+The remote signer would provide a connection token in the form:
 
 ```
-bunker://<hex-pubkey>?relay=wss://...&relay=wss://...&secret=<optional-secret>
+bunker://<remote-pubkey>?relay=<wss://relay-to-connect-on>&relay=<wss://another-relay-to-connect-on>&secret=<optional-secret-value>
 ```
 
-The user copies that token and pastes it in the client UI somehow. Then the client can send events of kind `24133` to the specified relays and wait for responses from the remote signer.
+This token is pasted into the client by the user and the client then uses the details to connect to the remote signer via the specified relay(s).
 
-### Started by the client
+### Direct connection initiated by the client
 
-The client generates a QR code in the following form (URL-encoded):
+In this case, basically the opposite direction of the first case, the client provides a connection token (or encodes the token in a QR code) and the signer initiates a connection to the client via the specified relay(s).
 
 ```
-nostrconnect://<client-key-hex>?relay=wss://...&metadata={"name":"...", "url": "...", "description": "..."}
+nostrconnect://<local-keypair-pubkey>?relay=<wss://relay-to-connect-on>&metadata=<json metadata in the form: {"name":"...", "url": "...", "description": "..."}>
 ```
 
-The signer scans the QR code and sends a `connect` message to the client in the specified relays.
+## The flow
 
-## Event payloads
+1. Client creates a local keypair. This keypair doesn't need to be communicated to the user since it's largely disposable (i.e. the user doesn't need to see this pubkey). Clients might choose to store it locally and they should delete it when the user logs out.
+2. Client gets the remote user pubkey (either via a `bunker://` connection string or a NIP-05 login-flow; shown below)
+3. Clients use the local keypair to send requests to the remote signer by `p`-tagging and encrypting to the remote user pubkey.
+4. The remote signer responds to the client by `p`-tagging and encrypting to the local keypair pubkey.
 
-Event payloads are [NIP-04](04.md)-encrypted JSON blobs that look like JSONRPC messages (their format is specified inside the `.content` of the event formats below).
+### Example flow for signing an event
 
-Events sent by the client to the remote signer have the following format:
+- Remote user pubkey (e.g. signing as) `fa984bd7dbb282f07e16e7ae87b26a2a7b9b90b7246a44771f0cf5ae58018f52`
+- Local pubkey is `eff37350d839ce3707332348af4549a96051bd695d3223af4aabce4993531d86`
 
-```js
+#### Signature request
+
+```json
 {
-  "pubkey": "<client-key-hex>"
-  "kind": 24133,
-  "tags": [
-    ["p", "<signer-key-hex>"]
-  ],
-  "content": "nip04_encrypted_json({id: <random-string>, method: <see-below>, params: [array_of_strings]})",
-  ...
+    "kind": 24133,
+    "pubkey": "eff37350d839ce3707332348af4549a96051bd695d3223af4aabce4993531d86",
+    "content": nip04({
+        "id": <random_string>,
+        "method": "sign_event",
+        "params": [json_stringified(<{
+            content: "Hello, I'm signing remotely",
+            pubkey: "fa984bd7dbb282f07e16e7ae87b26a2a7b9b90b7246a44771f0cf5ae58018f52",
+            // ...the rest of the event data
+        }>)]
+    }),
+    "tags": [["p", "fa984bd7dbb282f07e16e7ae87b26a2a7b9b90b7246a44771f0cf5ae58018f52"]], // p-tags the remote user pubkey
 }
 ```
 
-And the events the remote signer sends to the client have the following format:
+#### Response event
 
-```js
-  "pubkey": "<signer-key-hex>"
-  "kind": 24133,
-  "tags": [
-    ["p", "<client-key-hex>"]
-  ],
-  "content": "nip04_encrypted_json({id: <request-id>, result: <string>, error: <reason-string>})",
-  ...
+```json
+{
+    "kind": 24133,
+    "pubkey": "fa984bd7dbb282f07e16e7ae87b26a2a7b9b90b7246a44771f0cf5ae58018f52",
+    "content": nip04({
+        "id": <random_string>,
+        "result": json_stringified(<signed-event>)
+    }),
+    "tags": [["p", "eff37350d839ce3707332348af4549a96051bd695d3223af4aabce4993531d86"]], // p-tags the local keypair pubkey
+}
 ```
 
-The signer key will always be the key of the user who controls the signer device.
+#### Diagram
 
-### Methods
+![signing-example](https://i.nostr.build/P3gW.png)
 
-- **connect**
-  - params: [`pubkey`, `secret`]
-  - result: `"ack"`
-- **get_public_key**
-  - params: []
-  - result: `pubkey-hex`
-- **sign_event**
-  - params: [`event`]
-  - result: `json_string(event_with_pubkey_id_and_signature)`
-- **get_relays**
-  - params: []
-  - result: `json_string({[url: string]: {read: boolean, write: boolean}})`
-- **nip04_encrypt**
-  - params: [`third-party-pubkey`, `plaintext`]
-  - result: `nip04-ciphertext`
-- **nip04_decrypt**
-  - params: [`third-party-pubkey`, `nip04-ciphertext`]
-  - result: `plaintext`
-- **nip44_get_key**
-  - params: [`third-party-pubkey`]
-  - result: `nip44-conversation-key`
-- **nip44_encrypt**
-  - params: [`third-party-pubkey`, `plaintext`]
-  - result: `nip44-ciphertext`
-- **nip44_decrypt**
-  - params: [`third-party-pubkey`, `nip44-ciphertext`]
-  - result: `plaintext`
-- **ping**
-  - params: []
-  - result: `"pong"`
+## Request Events `kind: 24133`
+
+```json
+{
+    "id": <id>,
+    "kind": 24133,
+    "pubkey": <local_keypair_pubkey>,
+    "content": <nip04(<request>)>,
+    "tags": [["p", <remote_user_pubkey>]], // NB: in the `create_account` event, the remote signer pubkey should be `p` tagged.
+    "created_at": <unix timestamp in seconds>,
+}
+```
+
+The `content` field is a JSON-RPC-like message that is [NIP-04](https://github.com/nostr-protocol/nips/blob/master/04.md) encrypted and has the following structure:
+
+```json
+{
+    "id": <random_string>,
+    "method": <method_name>,
+    "params": [array_of_strings]
+}
+```
+
+- `id` is a random string that is a request ID. This same ID will be sent back in the response payload.
+- `method` is the name of the method/command (detailed below).
+- `params` is a positional array of string parameters.
+
+### Methods/Commands
+
+Each of the following are methods that the client sends to the remote signer.
+
+| Command                  | Params                                            | Result                                                                 |
+| ------------------------ | ------------------------------------------------- | ---------------------------------------------------------------------- |
+| `connect`                | `[<remote_user_pubkey>, <optional_secret>]`       | "ack"                                                                  |
+| `sign_event`             | `[<json_stringified_event_to_sign>]`              | `json_stringified(<signed_event>)`                                     |
+| `ping`                   | `[]`                                              | "pong"                                                                 |
+| `get_relays`             | `[]`                                              | `json_stringified({<relay_url>: {read: <boolean>, write: <boolean>}})` |
+| `get_public_key`         | `[]`                                              | `<hex-pubkey>`                                                         |
+| `nip04_encrypt`          | `[<third_party_pubkey>, <plaintext_to_encrypt>]`  | `<nip04_ciphertext>`                                                   |
+| `nip04_decrypt`          | `[<third_party_pubkey>, <ciphertext_to_decrypt>]` | `<plaintext>`                                                          |
+| `nip44_conversation_key` | Potential future addition                         |                                                                        |
+| `nip44_encrypt`          | Potential future addition                         |                                                                        |
+| `nip44_decrypt`          | Potential future addition                         |                                                                        |
+
+## Response Events `kind:24133`
+
+```json
+{
+    "id": <id>,
+    "kind": 24133,
+    "pubkey": <remote_signer_pubkey>,
+    "content": <nip04(<response>)>,
+    "tags": [["p", <local_keypair_pubkey>]],
+    "created_at": <unix timestamp in seconds>,
+}
+```
+
+The `content` field is a JSON-RPC-like message that is [NIP-04](https://github.com/nostr-protocol/nips/blob/master/04.md) encrypted and has the following structure:
+
+```json
+{
+    "id": <request_id>,
+    "result": <results_string>,
+    "error": <error_string>
+}
+```
+
+- `id` is the request ID that this response is for.
+- `results` is a string of the result of the call (this can be either a string or a JSON stringified object)
+- `error` is an error in string form.
+
+### Auth Challenges
+
+An Auth Challenge is a response that a remote signer can send back when it needs the user to authenticate via other means. This is currently used in the OAuth-like flow enabled by signers like [Nsecbunker](https://github.com/kind-0/nsecbunkerd/). The response `content` object will take the following form:
+
+```json
+{
+    "id": <request_id>,
+    "result": "auth_url",
+    "error": <URL_to_display_to_end_user>
+}
+```
+
+Clients should display (in a popup or new tab) the URL from the `error` field and then subscribe/listen for another response from the remote signer (reusing the same request ID). This event will be sent once the user authenticates in the other window (or will never arrive if the user doesn't authenticate). It's also possible to add a `redirect_uri` url parameter to the auth_url, which is helpful in situations when a client cannot open a new window or tab to display the auth challenge.
+
+#### Example event signing request with auth challenge
+
+![signing-example-with-auth-challenge](https://i.nostr.build/W3aj.png)
+
+## Remote Signer Commands
+
+Remote signers might support additional commands when communicating directly with it. These commands follow the same flow as noted above, the only difference is that when the client sends a request event, the `p`-tag is the pubkey of the remote signer itself and the `content` payload is encrypted to the same remote signer pubkey.
+
+### Methods/Commands
+
+Each of the following are methods that the client sends to the remote signer.
+
+| Command          | Params                                     | Result                               |
+| ---------------- | ------------------------------------------ | ------------------------------------ |
+| `create_account` | `[<username>, <domain>, <optional_email>]` | `<newly_created_remote_user_pubkey>` |
+
+## Appendix
+
+### NIP-05 Login Flow
+
+Clients might choose to present a more familiar login flow, so users can type a NIP-05 address instead of a `bunker://` string.
+
+When the user types a NIP-05 the client:
+
+- Queries the `/.well-known/nostr.json` file from the domain for the NIP-05 address provided to get the user's pubkey (this is the **remote user pubkey**)
+- In the same `/.well-known/nostr.json` file, queries for the `nip46` key to get the relays that the remote signer will be listening on.
+- Now the client has enough information to send commands to the remote signer on behalf of the user.
+
+### OAuth-like Flow
+
+#### Remote signer discovery via NIP-89
+
+In this last case, most often used to fascilitate an OAuth-like signin flow, the client first looks for remote signers that have announced themselves via NIP-89 application handler events.
+
+First the client will query for `kind: 31990` events that have a `k` tag of `24133`.
+
+These are generally shown to a user, and once the user selects which remote signer to use and provides the remote user pubkey they want to use (via npub, pubkey, or nip-05 value), the client can initiate a connection. Note that it's on the user to select the remote signer that is actually managing the remote key that they would like to use in this case. If the remote user pubkey is managed on another remote signer, the connection will fail.
+
+In addition, it's important that clients validate that the pubkey of the announced remote signer matches the pubkey of the `_` entry in the `/.well-known/nostr.json` file of the remote signer's announced domain.
+
+Clients that allow users to create new accounts should also consider validating the availability of a given username in the namespace of remote signer's domain by checking the `/.well-known/nostr.json` file for existing usernames. Clients can then show users feedback in the UI before sending a `create_account` event to the remote signer and receiving an error in return. Ideally, remote signers would also respond with understandable error messages if a client tries to create an account with an existing username.
+
+#### Example Oauth-like flow to create a new user account with Nsecbunker
+
+Coming soon...
+
+## References
+
+- [NIP-04 - Encryption](https://github.com/nostr-protocol/nips/blob/master/04.md)

From 9c7ae62e53e6e423d301575546581c700b6f9d9f Mon Sep 17 00:00:00 2001
From: monlovesmango <monlovesmango@protonmail.com>
Date: Tue, 20 Feb 2024 16:17:40 -0600
Subject: [PATCH 142/263] update nip44 encrypt/decrypt

---
 46.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/46.md b/46.md
index 13a2fe4..b894640 100644
--- a/46.md
+++ b/46.md
@@ -126,10 +126,10 @@ Each of the following are methods that the client sends to the remote signer.
 | `get_relays`             | `[]`                                              | `json_stringified({<relay_url>: {read: <boolean>, write: <boolean>}})` |
 | `get_public_key`         | `[]`                                              | `<hex-pubkey>`                                                         |
 | `nip04_encrypt`          | `[<third_party_pubkey>, <plaintext_to_encrypt>]`  | `<nip04_ciphertext>`                                                   |
-| `nip04_decrypt`          | `[<third_party_pubkey>, <ciphertext_to_decrypt>]` | `<plaintext>`                                                          |
+| `nip04_decrypt`          | `[<third_party_pubkey>, <nip04_ciphertext_to_decrypt>]` | `<plaintext>`                                                          |
 | `nip44_conversation_key` | Potential future addition                         |                                                                        |
-| `nip44_encrypt`          | Potential future addition                         |                                                                        |
-| `nip44_decrypt`          | Potential future addition                         |                                                                        |
+| `nip44_encrypt`          | `[<third_party_pubkey>, <plaintext_to_encrypt>]`  | `<nip44_ciphertext>`                                                   |
+| `nip44_decrypt`          | `[<third_party_pubkey>, <nip44_ciphertext_to_decrypt>]` | `<plaintext>`                                                          |
 
 ## Response Events `kind:24133`
 

From ff39f492e1aebdb401100b3e6f848ca0600ef9b1 Mon Sep 17 00:00:00 2001
From: monlovesmango <96307647+monlovesmango@users.noreply.github.com>
Date: Tue, 20 Feb 2024 16:29:01 -0600
Subject: [PATCH 143/263] update nip44_get_conversation_key

---
 46.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/46.md b/46.md
index b894640..db805fb 100644
--- a/46.md
+++ b/46.md
@@ -126,10 +126,10 @@ Each of the following are methods that the client sends to the remote signer.
 | `get_relays`             | `[]`                                              | `json_stringified({<relay_url>: {read: <boolean>, write: <boolean>}})` |
 | `get_public_key`         | `[]`                                              | `<hex-pubkey>`                                                         |
 | `nip04_encrypt`          | `[<third_party_pubkey>, <plaintext_to_encrypt>]`  | `<nip04_ciphertext>`                                                   |
-| `nip04_decrypt`          | `[<third_party_pubkey>, <nip04_ciphertext_to_decrypt>]` | `<plaintext>`                                                          |
-| `nip44_conversation_key` | Potential future addition                         |                                                                        |
+| `nip04_decrypt`          | `[<third_party_pubkey>, <nip04_ciphertext_to_decrypt>]` | `<plaintext>`                                                    |
+| `nip44_get_conversation_key` | `[<third_party_pubkey>]`                       | `<nip44_conversation_key>`                                            |
 | `nip44_encrypt`          | `[<third_party_pubkey>, <plaintext_to_encrypt>]`  | `<nip44_ciphertext>`                                                   |
-| `nip44_decrypt`          | `[<third_party_pubkey>, <nip44_ciphertext_to_decrypt>]` | `<plaintext>`                                                          |
+| `nip44_decrypt`          | `[<third_party_pubkey>, <nip44_ciphertext_to_decrypt>]` | `<plaintext>`                                                    |
 
 ## Response Events `kind:24133`
 

From 0045106dd1d08c38006d9a1c089081202078496e Mon Sep 17 00:00:00 2001
From: monlovesmango <96307647+monlovesmango@users.noreply.github.com>
Date: Wed, 21 Feb 2024 10:03:33 -0600
Subject: [PATCH 144/263] leave nip44_get_conversation_key undefined for now

---
 46.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/46.md b/46.md
index db805fb..b0e5c76 100644
--- a/46.md
+++ b/46.md
@@ -127,9 +127,9 @@ Each of the following are methods that the client sends to the remote signer.
 | `get_public_key`         | `[]`                                              | `<hex-pubkey>`                                                         |
 | `nip04_encrypt`          | `[<third_party_pubkey>, <plaintext_to_encrypt>]`  | `<nip04_ciphertext>`                                                   |
 | `nip04_decrypt`          | `[<third_party_pubkey>, <nip04_ciphertext_to_decrypt>]` | `<plaintext>`                                                    |
-| `nip44_get_conversation_key` | `[<third_party_pubkey>]`                       | `<nip44_conversation_key>`                                            |
 | `nip44_encrypt`          | `[<third_party_pubkey>, <plaintext_to_encrypt>]`  | `<nip44_ciphertext>`                                                   |
 | `nip44_decrypt`          | `[<third_party_pubkey>, <nip44_ciphertext_to_decrypt>]` | `<plaintext>`                                                    |
+| `nip44_get_conversation_key`| _Potential future addition_                    |                                                                        |
 
 ## Response Events `kind:24133`
 

From f1f992e95ee369c766d486807ad208c0769532dd Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Wed, 21 Feb 2024 08:17:42 -0800
Subject: [PATCH 145/263] Remove get_conversation_key

---
 46.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/46.md b/46.md
index b0e5c76..d934300 100644
--- a/46.md
+++ b/46.md
@@ -129,7 +129,6 @@ Each of the following are methods that the client sends to the remote signer.
 | `nip04_decrypt`          | `[<third_party_pubkey>, <nip04_ciphertext_to_decrypt>]` | `<plaintext>`                                                    |
 | `nip44_encrypt`          | `[<third_party_pubkey>, <plaintext_to_encrypt>]`  | `<nip44_ciphertext>`                                                   |
 | `nip44_decrypt`          | `[<third_party_pubkey>, <nip44_ciphertext_to_decrypt>]` | `<plaintext>`                                                    |
-| `nip44_get_conversation_key`| _Potential future addition_                    |                                                                        |
 
 ## Response Events `kind:24133`
 

From 4313fbf7a5c1d7d2c29e414ed68104641f3286fa Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Thu, 22 Feb 2024 12:30:18 +0900
Subject: [PATCH 146/263] NIP-46, NIP-49, NIP-65: fix typos

---
 46.md |  4 ++--
 49.md | 14 +++++++-------
 65.md |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/46.md b/46.md
index d934300..eb96494 100644
--- a/46.md
+++ b/46.md
@@ -96,7 +96,7 @@ nostrconnect://<local-keypair-pubkey>?relay=<wss://relay-to-connect-on>&metadata
     "pubkey": <local_keypair_pubkey>,
     "content": <nip04(<request>)>,
     "tags": [["p", <remote_user_pubkey>]], // NB: in the `create_account` event, the remote signer pubkey should be `p` tagged.
-    "created_at": <unix timestamp in seconds>,
+    "created_at": <unix timestamp in seconds>
 }
 ```
 
@@ -139,7 +139,7 @@ Each of the following are methods that the client sends to the remote signer.
     "pubkey": <remote_signer_pubkey>,
     "content": <nip04(<response>)>,
     "tags": [["p", <local_keypair_pubkey>]],
-    "created_at": <unix timestamp in seconds>,
+    "created_at": <unix timestamp in seconds>
 }
 ```
 
diff --git a/49.md b/49.md
index da58ba2..731f132 100644
--- a/49.md
+++ b/49.md
@@ -16,13 +16,13 @@ PASSWORD = Read from the user. The password should be unicode normalized to NFKC
 
 LOG\_N = Let the user or implementer choose one byte representing a power of 2 (e.g. 18 represents 262,144) which is used as the number of rounds for scrypt. Larger numbers take more time and more memory, and offer better protection:
 
-    | LOG\_N | MEMORY REQUIRED | APPROX TIME ON FAST COMPUTER |
-    |--------|-----------------|----------------------------- |
-    | 16     | 64 MiB          | 100 ms                       |
-    | 18     | 256 MiB         |                              |
-    | 20     | 1 GiB           | 2 seconds                    |
-    | 21     | 2 GiB           |                              |
-    | 22     | 4 GiB           |                              |
+    | LOG_N | MEMORY REQUIRED | APPROX TIME ON FAST COMPUTER |
+    |-------|-----------------|----------------------------- |
+    | 16    | 64 MiB          | 100 ms                       |
+    | 18    | 256 MiB         |                              |
+    | 20    | 1 GiB           | 2 seconds                    |
+    | 21    | 2 GiB           |                              |
+    | 22    | 4 GiB           |                              |
 
 SALT = 16 random bytes
 
diff --git a/65.md b/65.md
index 4a6f5a1..1a2d7e8 100644
--- a/65.md
+++ b/65.md
@@ -19,7 +19,7 @@ The `.content` is not used.
     ["r", "wss://alicerelay.example.com"],
     ["r", "wss://brando-relay.com"],
     ["r", "wss://expensive-relay.example2.com", "write"],
-    ["r", "wss://nostr-relay.example.com", "read"],
+    ["r", "wss://nostr-relay.example.com", "read"]
   ],
   "content": "",
   ...other fields

From 996ef456057c6f91320411098c259c3b68f3cc77 Mon Sep 17 00:00:00 2001
From: William Casarin <jb55@jb55.com>
Date: Thu, 22 Feb 2024 11:38:39 -0800
Subject: [PATCH 147/263] Use `q` instead of `e` tags for quote reposts

Signed-off-by: William Casarin <jb55@jb55.com>
---
 18.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/18.md b/18.md
index ba96c89..27c5915 100644
--- a/18.md
+++ b/18.md
@@ -20,9 +20,10 @@ reposted.
 
 ## Quote Reposts
 
-Quote reposts are `kind 1` events with an embedded `e` tag
-(see [NIP-08](08.md) and [NIP-27](27.md)). Because a quote repost includes
-an `e` tag, it may show up along replies to the reposted note.
+Quote reposts are `kind 1` events with an embedded `q` tag of the note being
+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.
 
 ## Generic Reposts
 

From 84236acdd9fa84206beb27a4c7353a191393bf41 Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Fri, 23 Feb 2024 22:48:42 +0900
Subject: [PATCH 148/263] NIP-92: Clarify that `imeta` tag can be ignored

---
 92.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/92.md b/92.md
index b857d6c..b332d21 100644
--- a/92.md
+++ b/92.md
@@ -41,3 +41,5 @@ after the file is uploaded and included in the post.
 
 When pasting URLs during post composition, the client MAY download the file
 and add this metadata before the post is sent.
+
+The client MAY ignore `imeta` tags that do not match the URL in the event content.

From 383eb594b4cabc4d8f606937c86440037b77a8f8 Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Mon, 26 Feb 2024 10:07:55 +0900
Subject: [PATCH 149/263] README: add q tag

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index b9ca8aa..634ea05 100644
--- a/README.md
+++ b/README.md
@@ -206,6 +206,7 @@ Please update these lists when proposing NIPs introducing new event kinds.
 | `l`               | label, label namespace               | annotations          | [32](32.md)                           |
 | `L`               | label namespace                      | --                   | [32](32.md)                           |
 | `m`               | MIME type                            | --                   | [94](94.md)                           |
+| `q`               | event id (hex)                       | relay URL, marker    | [18](18.md)                           |
 | `r`               | a reference (URL, etc)               | petname              |                                       |
 | `r`               | relay url                            | marker               | [65](65.md)                           |
 | `t`               | hashtag                              | --                   |                                       |

From c9b3abfa3c531a926f0865d10e6d5ed746da3825 Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Mon, 26 Feb 2024 12:30:49 +0900
Subject: [PATCH 150/263] Remove marker

Co-authored-by: Alex Gleason <alex@alexgleason.me>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 634ea05..3273ab0 100644
--- a/README.md
+++ b/README.md
@@ -206,7 +206,7 @@ Please update these lists when proposing NIPs introducing new event kinds.
 | `l`               | label, label namespace               | annotations          | [32](32.md)                           |
 | `L`               | label namespace                      | --                   | [32](32.md)                           |
 | `m`               | MIME type                            | --                   | [94](94.md)                           |
-| `q`               | event id (hex)                       | relay URL, marker    | [18](18.md)                           |
+| `q`               | event id (hex)                       | relay URL    | [18](18.md)                           |
 | `r`               | a reference (URL, etc)               | petname              |                                       |
 | `r`               | relay url                            | marker               | [65](65.md)                           |
 | `t`               | hashtag                              | --                   |                                       |

From 5b2461eb01f784d546f77cfc21af26bf7e4b6670 Mon Sep 17 00:00:00 2001
From: fiatjaf_ <fiatjaf@gmail.com>
Date: Wed, 28 Feb 2024 11:50:54 -0300
Subject: [PATCH 151/263] NIP-29: Simple Groups (#566)

* NIP-29: Simple Group Chat.

* split hostname and subgroup path into two different tag items.

* add and remove permissions actions.

* fix kind number for moderation event.

* add missing / to "flavors" in example.

* some new ideas + making this universal and not only applicable to chat.

* fix delete-message => delete-event.

* flesh out the entire thing.

* saner approach with multiple kinds for moderation.

* delete-event as kind 9005.

* update meta events description.

* `public` and `open` tags and join request event.

* edit-group-status permission.

* add kinds to README.

* add kind:12

* add nip-10 note

* add optional list of members

* admins prefixed by "p".

* remove "alt" from event templates for brevity.

* add kind 10009 for public list of simple groups.

* update "previous" stuff.

* remove naddr stuff, use a different identifier format.

* remove reference to trimmed signatures until that is more developed.

* add kind:10 threaded chat replies.

---------

Co-authored-by: Pablo Fernandez <p@f7z.io>
---
 29.md     | 197 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 51.md     |   1 +
 README.md |   8 +++
 3 files changed, 206 insertions(+)
 create mode 100644 29.md

diff --git a/29.md b/29.md
new file mode 100644
index 0000000..0f4a579
--- /dev/null
+++ b/29.md
@@ -0,0 +1,197 @@
+NIP-29
+======
+
+Relay-based Groups
+------------------
+
+`draft` `optional`
+
+This NIP defines a standard for groups that are only writable by a closed set of users. They can be public for reading by external users or not.
+
+Groups are identified by a random string of any length that serves as an _id_.
+
+There is no way to create a group, what happens is just that relays (most likely when asked by users) will create rules around some specific ids so these ids can serve as an actual group, henceforth messages sent to that group will be subject to these rules.
+
+Normally a group will originally belong to one specific relay, but the community may choose to move the group to other relays or even fork the group so it exists in different forms -- still using the same _id_ -- across different relays.
+
+## 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.
+
+## Group identifier
+
+A group may be identified by a string in the format `<host>'<group-id>`. For example, a group with _id_ `abcdef` hosted at the relay `wss://groups.nostr.com` would be identified by the string `groups.nostr.com'abcdef`.
+
+## The `h` tag
+
+Events sent by users to groups (chat messages, text notes, moderation events etc) must have an `h` tag with the value set to the group _id_.
+
+## Timeline references
+
+In order to not be used out of context, events sent to these groups may contain references to previous events seen from the same relay in the `previous` tag. The choice of which previous events to pick belongs to the clients. The references are to be made using the first 8 characters (4 bytes) of any event in the last 50 events seen by the user in the relay, excluding events by themselves. There can be any number of references (including zero), but it's recommended that clients include at least 3 and that relays enforce this.
+
+This is a hack to prevent messages from being broadcasted to external relays that have forks of one group out of context. Relays are expected to reject any events that contain timeline references to events not found in their own database. Clients should also check these to keep relays honest about them.
+
+## Late publication
+
+Relays should prevent late publication (messages published now with a timestamp from days or even hours ago) unless they are open to receive a group forked or moved from another relay.
+
+## Event definitions
+
+- *text root note* (`kind:11`)
+
+This is the basic unit of a "microblog" root text note sent to a group.
+
+```js
+  "kind": 11,
+  "content": "hello my friends lovers of pizza",
+  "tags": [
+    ["h", "<group-id>"],
+    ["previous", "<event-id-first-chars>", "<event-id-first-chars>", ...]
+  ]
+  ...
+```
+
+- *threaded text reply* (`kind:12`)
+
+This is the basic unit of a "microblog" reply note sent to a group. It's the same as `kind:11`, except for the fact that it must be used whenever it's in reply to some other note (either in reply to a `kind:11` or a `kind:12`). `kind:12` events SHOULD use NIP-10 markers, leaving an empty relay url:
+
+* `["e", "<kind-11-root-id>", "", "root"]`
+* `["e", "<kind-12-event-id>", "", "reply"]`
+
+- *chat message* (`kind:9`)
+
+This is the basic unit of a _chat message_ sent to a group.
+
+```js
+  "kind": 9,
+  "content": "hello my friends lovers of pizza",
+  "tags": [
+    ["h", "<group-id>"],
+    ["previous", "<event-id-first-chars>", "<event-id-first-chars>", ...]
+  ]
+  ...
+```
+
+- *chat message threaded reply* (`kind:10`)
+
+Similar to `kind:12`, this is the basic unit of a chat message sent to a group. This is intended for in-chat threads that may be hidden by default. Not all in-chat replies MUST use `kind:10`, only when the intention is to create a hidden thread that isn't part of the normal flow of the chat (although clients are free to display those by default too).
+
+`kind:10` SHOULD use NIP-10 markers, just like `kind:12`.
+
+- *join request* (`kind:9021`)
+
+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
+{
+  "kind": 9021,
+  "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
+{
+  "kind": 90xx,
+  "content": "optional reason",
+  "tags": [
+    ["h", "<group-id>"],
+    ["previous", ...]
+  ]
+}
+```
+
+Each moderation action uses a different kind and requires different arguments, which are given as tags. These are defined in the following table:
+
+| kind | name                | tags                                      |
+| ---  | ---                 | ---                                       |
+| 9000 | `add-user`          | `p` (pubkey hex)                          |
+| 9001 | `remove-user`       | `p` (pubkey hex)                          |
+| 9002 | `edit-metadata`     | `name`, `about`, `picture` (string)       |
+| 9003 | `add-permission`    | `p` (pubkey), `permission` (name)         |
+| 9004 | `remove-permission` | `p` (pubkey), `permission` (name)         |
+| 9005 | `delete-event`      | `e` (id hex)                              |
+| 9006 | `edit-group-status` | `public` or `private`, `open` or `closed` |
+
+- *group metadata* (`kind:39000`) (optional)
+
+This event defines the metadata for the group -- basically how clients should display it. It must be generated and signed by the relay in which is found. Relays shouldn't accept these events if they're signed by anyone else.
+
+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
+{
+  "kind": 39000,
+  "content": "",
+  "tags": [
+    ["d", "<group-id>"],
+    ["name", "Pizza Lovers"],
+    ["picture", "https://pizza.com/pizza.png"],
+    ["about", "a group for people who love pizza"],
+    ["public"], // or ["private"]
+    ["open"] // or ["closed"]
+  ]
+  ...
+}
+```
+
+`name`, `picture` and `about` are basic metadata for the group for display purposes. `public` signals the group can be _read_ by anyone, while `private` signals that only AUTHed users can read. `open` signals that anyone can request to join and the request will be automatically granted, while `closed` signals that members must be pre-approved or that requests to join will be manually handled.
+
+- *group admins* (`kind:39001`) (optional)
+
+Similar to the group metadata, this event is supposed to be generated by relays that host the group.
+
+Each admin gets a label that is only used for display purposes, and a list of permissions it has are listed afterwards. These permissions can inform client building UI, but ultimately are evaluated by the relay in order to become effective.
+
+The list of capabilities, as defined by this NIP, for now, is the following:
+
+- `add-user`
+- `edit-metadata`
+- `delete-event`
+- `remove-user`
+- `add-permission`
+- `remove-permission`
+- `edit-group-status`
+
+```js
+{
+  "kind": 39001,
+  "content": "list of admins for the pizza lovers group",
+  "tags": [
+    ["d", "<group-id>"],
+    ["p", "<pubkey1-as-hex>", "ceo", "add-user", "edit-metadata", "delete-event", "remove-user"],
+    ["p", "<pubkey2-as-hex>", "secretary", "add-user", "delete-event"]
+  ]
+  ...
+}
+```
+
+- *group members* (`kind:39002`) (optional)
+
+Similar to *group admins*, this event is supposed to be generated by relays that host the group.
+
+It's a NIP-51-like list of pubkeys that are members of the group. Relays might choose to not to publish this information or to restrict what pubkeys can fetch it.
+
+```json
+{
+  "kind": 39002,
+  "content": "list of members for the pizza lovers group",
+  "tags": [
+    ["d", "<group-id>"],
+    ["p", "<admin1>"],
+    ["p", "<member-pubkey1>"],
+    ["p", "<member-pubkey2>"],
+  ]
+}
+```
+
+## Storing the list of groups a user belongs to
+
+A definition for kind `10009` was included in [NIP-51](51.md) that allows clients to store the list of groups a user wants to remember being in.
diff --git a/51.md b/51.md
index c58d37a..95acbc8 100644
--- a/51.md
+++ b/51.md
@@ -29,6 +29,7 @@ For example, _mute list_ can contain the public keys of spammers and bad actors
 | Public chats   | 10005 | [NIP-28](28.md) chat channels the user is in                | `"e"` (kind:40 channel definitions)                                               |
 | Blocked relays | 10006 | relays clients should never connect to                      | `"relay"` (relay URLs)                                                            |
 | Search relays  | 10007 | relays clients should use when performing search queries    | `"relay"` (relay URLs)                                                            |
+| Simple groups  | 10009 | [NIP-29](29.md) groups the user is in                       | `"group"` ([NIP-29](29.md) group ids + mandatory relay URL)                       |
 | Interests      | 10015 | topics a user may be interested in and pointers             | `"t"` (hashtags) and `"a"` (kind:30015 interest set)                              |
 | Emojis         | 10030 | user preferred emojis and pointers to emoji sets            | `"emoji"` (see [NIP-30](30.md)) and `"a"` (kind:30030 emoji set)                  |
 
diff --git a/README.md b/README.md
index 3273ab0..505e3e0 100644
--- a/README.md
+++ b/README.md
@@ -45,6 +45,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 - [NIP-26: Delegated Event Signing](26.md)
 - [NIP-27: Text Note References](27.md)
 - [NIP-28: Public Chat](28.md)
+- [NIP-29: Relay-based Groups](29.md)
 - [NIP-30: Custom Emoji](30.md)
 - [NIP-31: Dealing with Unknown Events](31.md)
 - [NIP-32: Labeling](32.md)
@@ -92,6 +93,10 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `6`           | Repost                     | [18](18.md)              |
 | `7`           | Reaction                   | [25](25.md)              |
 | `8`           | Badge Award                | [58](58.md)              |
+| `9`           | Group Chat Message         | [29](29.md)              |
+| `10`          | Group Chat Threaded Reply  | [29](29.md)              |
+| `11`          | Group Thread               | [29](29.md)              |
+| `12`          | Group Thread Reply         | [29](29.md)              |
 | `13`          | Seal                       | [59](59.md)              |
 | `16`          | Generic Repost             | [18](18.md)              |
 | `40`          | Channel Creation           | [28](28.md)              |
@@ -112,6 +117,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `5000`-`5999` | Job Request                | [90](90.md)              |
 | `6000`-`6999` | Job Result                 | [90](90.md)              |
 | `7000`        | Job Feedback               | [90](90.md)              |
+| `9000`-`9030` | Group Control Events       | [29](29.md)              |
 | `9041`        | Zap Goal                   | [75](75.md)              |
 | `9734`        | Zap Request                | [57](57.md)              |
 | `9735`        | Zap                        | [57](57.md)              |
@@ -124,6 +130,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `10005`       | Public chats list          | [51](51.md)              |
 | `10006`       | Blocked relays list        | [51](51.md)              |
 | `10007`       | Search relays list         | [51](51.md)              |
+| `10009`       | User groups                | [51](51.md), [29](29.md) |
 | `10015`       | Interests list             | [51](51.md)              |
 | `10030`       | User emoji list            | [51](51.md)              |
 | `10096`       | File storage server list   | [96](96.md)              |
@@ -161,6 +168,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `31925`       | Calendar Event RSVP        | [52](52.md)              |
 | `31989`       | Handler recommendation     | [89](89.md)              |
 | `31990`       | Handler information        | [89](89.md)              |
+| `39000-9`     | Group metadata events      | [29](29.md)              |
 | `34550`       | Community Definition       | [72](72.md)              |
 
 [nostrocket]: https://github.com/nostrocket/NIPS/blob/main/Problems.md

From ac1221fa5d855fd838e29d71c636897feae6c3a2 Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Tue, 5 Mar 2024 10:34:01 +0900
Subject: [PATCH 152/263] BREAKING.md: add NIP-18 change

---
 BREAKING.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/BREAKING.md b/BREAKING.md
index cd8c03d..3693c34 100644
--- a/BREAKING.md
+++ b/BREAKING.md
@@ -5,6 +5,7 @@ reverse chronological order.
 
 | Date        | Commit    | NIP      | Change |
 | ----------- | --------- | -------- | ------ |
+| 2024-02-25  | [4a171cb0](https://github.com/nostr-protocol/nips/commit/4a171cb0) | [NIP-18](18.md) | quote repost should use `q` tag |
 | 2024-02-16  | [cbec02ab](https://github.com/nostr-protocol/nips/commit/cbec02ab) | [NIP-49](49.md) | Password first normalized to NFKC |
 | 2024-02-15  | [afbb8dd0](https://github.com/nostr-protocol/nips/commit/afbb8dd0) | [NIP-39](39.md) | PGP identity was removed |
 | 2024-02-07  | [d3dad114](https://github.com/nostr-protocol/nips/commit/d3dad114) | [NIP-46](46.md) | Connection token format was changed |

From 9a283796ce95261c960d1b9ffc13e8f278079956 Mon Sep 17 00:00:00 2001
From: fiatjaf_ <fiatjaf@gmail.com>
Date: Tue, 5 Mar 2024 08:57:59 -0300
Subject: [PATCH 153/263] NIP-34: git stuff (#997)

* NIP-34: git stuff.

* repository head.

* threads/issues and replies.

* add "p" optional tags to events.

* add list of things to do later in the end.

* multiple values in some tags instead of multiple tags.

* replace "patches", "issues" tags and replace that with "relays".

* bring in tags that allow for a commit id to be stable.

* edit "reply" kind to say it should follow normal NIP-10 threading rules.

* update "things to be added later".

* add commit time to "committer" tag.

* remove "head" tag.

* mention the possibility of mentioning others users in patches.

Co-authored-by: DanConwayDev <114834599+DanConwayDev@users.noreply.github.com>

* clarify commit-pgp-sig.

* clarify requirements and threading of replies.

* add t=root tag.

---------

Co-authored-by: DanConwayDev <114834599+DanConwayDev@users.noreply.github.com>
---
 34.md | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 102 insertions(+)
 create mode 100644 34.md

diff --git a/34.md b/34.md
new file mode 100644
index 0000000..651407d
--- /dev/null
+++ b/34.md
@@ -0,0 +1,102 @@
+NIP-34
+======
+
+`git` stuff
+-----------
+
+`draft` `optional`
+
+This NIP defines all the ways code collaboration using and adjacent to [`git`](https://git-scm.com/) can be done using Nostr.
+
+## Repository announcements
+
+Git repositories are hosted in Git-enabled servers, but their existence can be announced using Nostr events, as well as their willingness to receive patches, bug reports and comments in general.
+
+```jsonc
+{
+  "kind": 30617,
+  "content": "",
+  "tags": [
+    ["d", "<repo-id>"],
+    ["name", "<human-readable project name>"],
+    ["description", "brief human-readable project description>"],
+    ["web", "<url for browsing>", ...], // a webpage url, if the git server being used provides such a thing
+    ["clone", "<url for git-cloning>", ...], // a url to be given to `git clone` so anyone can clone it
+    ["relays", "<relay-url>", ...] // relays that this repository will monitor for patches and issues
+  ]
+}
+```
+
+The tags `web`, `clone`, `relays` can have multiple values.
+
+Except `d`, all tags are optional.
+
+## Patches
+
+Patches can be sent by anyone to any repository. Patches to a specific repository SHOULD be sent to the relays specified in that repository's announcement event's `"relays"` tag. Patch events SHOULD include an `a` tag pointing to that repository's announcement address.
+
+```jsonc
+{
+  "kind": 1617,
+  "content": "<patch>", // contents of <git format-patch>
+  "tags": [
+    ["a", "30617:<base-repo-owner-pubkey>:<base-repo-id>"],
+    ["p", "<repository-owner>"],
+    ["p", "<other-user>"], // optionally send the patch to another user to bring it to their attention
+
+    // for the first patch in a thread or series
+    ["t", "root"],
+
+    // optional tags for when it is desirable that the merged patch has a stable commit id
+    // these fields are necessary for ensuring that the commit resulting from applying a patch
+    // has the same id as it had in the proposer's machine -- all these tags can be omitted
+    // if the maintainer doesn't care about these things
+    ["commit", "<current-commit-id>"],
+    ["parent-commit", "<parent-commit-id>"],
+    ["commit-pgp-sig", "-----BEGIN PGP SIGNATURE-----..."], // empty string for unsigned commit
+    ["committer", "<name>", "<email>", "<timestamp>", "<timezone offset in minutes>"],
+  ]
+}
+```
+
+## 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.
+
+```jsonc
+{
+  "kind": 1621,
+  "content": "<markdown text>",
+  "tags": [
+    ["a", "30617:<base-repo-owner-pubkey>:<base-repo-id>"],
+    ["p", "<repository-owner>"]
+  ]
+}
+```
+
+## Replies
+
+Replies are also Markdown text. The difference is that they MUST be issued as replies to either a `kind:1621` _issue_ or a `kind:1617` _patch_ event. The threading of replies and patches should follow NIP-10 rules.
+
+```jsonc
+{
+  "kind": 1622,
+  "content": "<markdown text>",
+  "tags": [
+    ["a", "30617:<base-repo-owner-pubkey>:<base-repo-id>", "<relay-url>"],
+    ["e", "<issue-or-patch-id-hex>", "", "root"],
+
+    // 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"],
+    // ...
+  ]
+}
+```
+
+## Possible things to be added later
+
+- "status" kind (for letting people know a patch was merged or an issue was fixed or won't be fixed)
+- "branch merge" kind (specifying a URL from where to fetch the branch to be merged)
+- "cover letter" kind (to which multiple patches can refer and serve as a unifying layer to them)
+- inline file comments kind (we probably need one for patches and a different one for merged files)

From 808569e562e774c17bd0caccf28b6ac95bc0641a Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Wed, 6 Mar 2024 12:35:59 +0900
Subject: [PATCH 154/263] README: add NIP-34

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 505e3e0..5d163fd 100644
--- a/README.md
+++ b/README.md
@@ -49,6 +49,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 - [NIP-30: Custom Emoji](30.md)
 - [NIP-31: Dealing with Unknown Events](31.md)
 - [NIP-32: Labeling](32.md)
+- [NIP-34: `git` stuff](34.md)
 - [NIP-36: Sensitive Content](36.md)
 - [NIP-38: User Statuses](38.md)
 - [NIP-39: External Identities in Profiles](39.md)

From 1166fb9fb5e359a023de613417861ae2cb23e6a7 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 6 Mar 2024 13:59:36 -0600
Subject: [PATCH 155/263] NIP-50: search by nip05 domain

---
 50.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/50.md b/50.md
index 9d1a54c..6603303 100644
--- a/50.md
+++ b/50.md
@@ -47,3 +47,4 @@ Relays SHOULD exclude spam from search results by default if they support some f
 
 Relay MAY support these extensions:
 - `include:spam` - turn off spam filtering, if it was enabled by default
+- `domain:<domain>` - include events from users whose valid nip05 domain matches the domain

From 6871b3b334c3ae6ec23266b42d238859805a1ebe Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Thu, 7 Mar 2024 06:45:35 +0900
Subject: [PATCH 156/263] README: add kinds and tags for NIP-34

---
 README.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 5d163fd..90a6394 100644
--- a/README.md
+++ b/README.md
@@ -111,6 +111,9 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `1059`        | Gift Wrap                  | [59](59.md)              |
 | `1063`        | File Metadata              | [94](94.md)              |
 | `1311`        | Live Chat Message          | [53](53.md)              |
+| `1617`        | Patches                    | [34](34.md)              |
+| `1621`        | Issues                     | [34](34.md)              |
+| `1622`        | Replies                    | [34](34.md)              |
 | `1971`        | Problem Tracker            | [nostrocket][nostrocket] |
 | `1984`        | Reporting                  | [56](56.md)              |
 | `1985`        | Label                      | [32](32.md)              |
@@ -163,6 +166,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `30315`       | User Statuses              | [38](38.md)              |
 | `30402`       | Classified Listing         | [99](99.md)              |
 | `30403`       | Draft Classified Listing   | [99](99.md)              |
+| `30617`       | Repository announcements   | [34](34.md)              |
 | `31922`       | Date-Based Calendar Event  | [52](52.md)              |
 | `31923`       | Time-Based Calendar Event  | [52](52.md)              |
 | `31924`       | Calendar                   | [52](52.md)              |
@@ -224,9 +228,10 @@ Please update these lists when proposing NIPs introducing new event kinds.
 | `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`     | invoice/badge description            | --                   | [57](57.md), [58](58.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)                           |
@@ -235,7 +240,7 @@ Please update these lists when proposing NIPs introducing new event kinds.
 | `imeta`           | inline metadata                      | --                   | [92](92.md)                           |
 | `lnurl`           | `bech32` encoded `lnurl`             | --                   | [57](57.md)                           |
 | `location`        | location string                      | --                   | [52](52.md), [99](99.md)              |
-| `name`            | badge name                           | --                   | [58](58.md)                           |
+| `name`            | name                                 | --                   | [34](34.md), [58](58.md)              |
 | `nonce`           | random                               | --                   | [13](13.md)                           |
 | `preimage`        | hash of `bolt11` invoice             | --                   | [57](57.md)                           |
 | `price`           | price                                | currency, frequency  | [99](99.md)                           |
@@ -248,6 +253,7 @@ Please update these lists when proposing NIPs introducing new event kinds.
 | `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)                           |
 
 ## Criteria for acceptance of NIPs

From bf7294b22362539eda549d8a7fd0d85261f40b3f Mon Sep 17 00:00:00 2001
From: greenart7c3 <greenart7c3@proton.me>
Date: Fri, 8 Mar 2024 07:59:54 -0300
Subject: [PATCH 157/263] Removed author

---
 100.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/100.md b/100.md
index ee5149a..bf77396 100644
--- a/100.md
+++ b/100.md
@@ -2,7 +2,7 @@
 
 ## Android Signer Application
 
-`draft` `optional` `author:greenart7c3`
+`draft` `optional`
 
 This NIP describes a method for 2-way communication between a android signer and any Nostr client on Android. The Android signer is an Android Application and the Client can be a Web Client or an Android Application.
 

From 07074d8ba2615609fb702030151e191edcc91909 Mon Sep 17 00:00:00 2001
From: greenart7c3 <115044884+greenart7c3@users.noreply.github.com>
Date: Fri, 8 Mar 2024 09:20:19 -0300
Subject: [PATCH 158/263] Apply suggestions from code review

Co-authored-by: dluvian <133484344+dluvian@users.noreply.github.com>
---
 100.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/100.md b/100.md
index bf77396..06d6b35 100644
--- a/100.md
+++ b/100.md
@@ -4,13 +4,13 @@
 
 `draft` `optional`
 
-This NIP describes a method for 2-way communication between a android signer and any Nostr client on Android. The Android signer is an Android Application and the Client can be a Web Client or an Android Application.
+This NIP describes a method for 2-way communication between an Android signer and any Nostr client on Android. The Android signer is an Android Application and the client can be a web client or an Android application.
 
 # Usage for Android applications
 
 The Android signer uses Intents and Content Resolvers to communicate between applications.
 
-To be able to use The Android signer in your application you should this to your AndroidManifest.xml:
+To be able to use the Android signer in your application you should add this to your AndroidManifest.xml:
 
 ```xml
 <queries>
@@ -38,7 +38,7 @@ fun isExternalSignerInstalled(context: Context): Boolean {
 
 ## Using Intents
 
-To get the result back from the Signer Appication you should use registerForActivityResult or rememberLauncherForActivityResult in Kotlin. If you are using another framework check the documentation of your framework or a third party library to get the result.
+To get the result back from the Signer Application you should use `registerForActivityResult` or `rememberLauncherForActivityResult` in Kotlin. If you are using another framework check the documentation of your framework or a third party library to get the result.
 
 Create the Intent using the **nostrsigner** scheme:
 

From d11f50bd0ad6663eb53e1da495f8a8b91bb194f5 Mon Sep 17 00:00:00 2001
From: "nostr.wine" <124309146+nostr-wine@users.noreply.github.com>
Date: Fri, 8 Mar 2024 11:23:22 -0500
Subject: [PATCH 159/263] NIP-50: add event classification extensions

---
 50.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/50.md b/50.md
index 6603303..a3fcf87 100644
--- a/50.md
+++ b/50.md
@@ -47,4 +47,8 @@ Relays SHOULD exclude spam from search results by default if they support some f
 
 Relay MAY support these extensions:
 - `include:spam` - turn off spam filtering, if it was enabled by default
-- `domain:<domain>` - include events from users whose valid nip05 domain matches the domain
+- `domain:<domain>` - include only events from users whose valid nip05 domain matches the domain
+- `topic:<topic>` - include only events within a classified topic (short string, one to two words)
+- `language:<two letter ISO 639-1 language code>` - include only events of a specified language
+- `sentiment:<negative/neutral/positive>` - include only events of a specific sentiment
+- `nsfw:<true/false>` - include or exclude nsfw events (default: true)

From 0438236268194cfec1e0e02579e29e75bd52b173 Mon Sep 17 00:00:00 2001
From: "nostr.wine" <124309146+nostr-wine@users.noreply.github.com>
Date: Fri, 8 Mar 2024 12:05:49 -0500
Subject: [PATCH 160/263] Update 50.md

---
 50.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/50.md b/50.md
index a3fcf87..a6e02be 100644
--- a/50.md
+++ b/50.md
@@ -48,7 +48,6 @@ Relays SHOULD exclude spam from search results by default if they support some f
 Relay MAY support these extensions:
 - `include:spam` - turn off spam filtering, if it was enabled by default
 - `domain:<domain>` - include only events from users whose valid nip05 domain matches the domain
-- `topic:<topic>` - include only events within a classified topic (short string, one to two words)
 - `language:<two letter ISO 639-1 language code>` - include only events of a specified language
 - `sentiment:<negative/neutral/positive>` - include only events of a specific sentiment
 - `nsfw:<true/false>` - include or exclude nsfw events (default: true)

From de71f998289a829ac4b2c0b0e601b02a2bf755b6 Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Wed, 13 Mar 2024 12:46:16 +0900
Subject: [PATCH 161/263] NIP-96: simplify server list

---
 96.md | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/96.md b/96.md
index 3ebbef8..f7d901f 100644
--- a/96.md
+++ b/96.md
@@ -82,14 +82,7 @@ it must use the "api_url" field instead.
 
 ### List of Supporting File Storage Servers
 
-| Name          | Domain                    |
-| ------------- | ------------------------- |
-| nostrcheck.me | https://nostrcheck.me     |
-| nostrage      | https://nostrage.com      |
-| sove          | https://sove.rent         |
-| nostr.build   | https://nostr.build       |
-| sovbit        | https://files.sovbit.host |
-| void.cat      | https://void.cat          |
+See https://github.com/aljazceru/awesome-nostr#nip-96-file-storage-servers.
 
 ## Upload
 

From 4f33dbc2b86684f9bf26dd1b0fc9789e3cbf2165 Mon Sep 17 00:00:00 2001
From: silberengel <silberengel7@protonmail.com>
Date: Mon, 18 Mar 2024 08:01:06 +0100
Subject: [PATCH 162/263] Added bot field to denote automated npubs

---
 24.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/24.md b/24.md
index d444a4b..449101a 100644
--- a/24.md
+++ b/24.md
@@ -16,6 +16,7 @@ These are extra fields not specified in NIP-01 that may be present in the string
   - `display_name`: an alternative, bigger name with richer characters than `name`. `name` should always be set regardless of the presence of `display_name` in the metadata.
   - `website`: a web URL related in any way to the event author.
   - `banner`: an URL to a wide (~1024x768) picture to be optionally displayed in the background of a profile screen.
+  - `bot`: a boolean to clarify that the content is entirely or partially the result of automation, such as with chatbots or newsfeeds.
 
 ### Deprecated fields
 

From 4842f8612f55d9c11ef228338f6ef6f658e788a1 Mon Sep 17 00:00:00 2001
From: greenart7c3 <115044884+greenart7c3@users.noreply.github.com>
Date: Mon, 18 Mar 2024 15:00:30 -0300
Subject: [PATCH 163/263] Apply suggestions from code review

Co-authored-by: dluvian <133484344+dluvian@users.noreply.github.com>
---
 100.md | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/100.md b/100.md
index 06d6b35..386ec80 100644
--- a/100.md
+++ b/100.md
@@ -46,7 +46,7 @@ Create the Intent using the **nostrsigner** scheme:
 val intent = Intent(Intent.ACTION_VIEW, Uri.parse("nostrsigner:$content"))
 ```
 
-* Set the Signer package name
+Set the Signer package name:
 
 ```kotlin
 intent.`package` = "com.example.signer"
@@ -61,14 +61,14 @@ intent.`package` = "com.example.signer"
     val intent = Intent(Intent.ACTION_VIEW, Uri.parse("nostrsigner:"))
     intent.`package` = "com.example.signer"
     intent.putExtra("type", "get_public_key")
-    // You can send some default permissions for the user authorize for ever
+    // You can send some default permissions for the user to authorize for ever
     val permissions = listOf(
       Permission(
-          "sign_event",
-          22242
+          type = "sign_event",  // Is it type?
+          kind = 22242 // Is it kind?
       ),
       Permission(
-          "nip44_decrypt"
+          type = "nip44_decrypt"
       )
     )
     intent.putExtra("permissions", permissions.toJson())
@@ -90,10 +90,10 @@ intent.`package` = "com.example.signer"
     val intent = Intent(Intent.ACTION_VIEW, Uri.parse("nostrsigner:$eventJson"))
     intent.`package` = "com.example.signer"
     intent.putExtra("type", "sign_event")
-    // to control the result in your application in case you are not waiting the result before sending another intent
+    // To handle results when not waiting between intents
     intent.putExtra("id", event.id)
     // Send the current logged in user npub
-    intent.putExtra("current_user", account.keyPair.pubKey.toNpub())
+    intent.putExtra("current_user", npub)
     
     context.startActivity(intent)
     ```
@@ -102,7 +102,7 @@ intent.`package` = "com.example.signer"
 
       ```kotlin
       val signature = intent.data?.getStringExtra("signature")
-      // the id you sent
+      // The id you sent
       val id = intent.data?.getStringExtra("id")
       val signedEventJson = intent.data?.getStringExtra("event")
       ```
@@ -233,13 +233,13 @@ intent.`package` = "com.example.signer"
 
 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 npub 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
 
 For the other types Signer Application returns the column "signature"
 
-If the user chose to always reject the event signer application will return the column "rejected" and you should not open signer application
+If the user chose to always reject the event, signer application will return the column "rejected" and you should not open signer application
 
 ### Methods
 
@@ -416,15 +416,15 @@ If the user chose to always reject the event signer application will return the
 
 # Usage for Web Applications
 
-Since web applications can't receive a result from the intent you should add a modal to paste the signature or the event json or create a callback url.
+Since web applications can't receive a result from the intent, you should add a modal to paste the signature or the event json or create a callback url.
 
-If you send the callback url parameter Signer Application will send the result to the url.
+If you send the callback url parameter, Signer Application will send the result to the url.
 
-If you don't send a callback url Signer Application will copy the result to the clipboard.
+If you don't send a callback url, Signer Application will copy the result to the clipboard.
 
-You can configure the returnType to be **signature** or **event**.
+You can configure the `returnType` to be **signature** or **event**.
 
-Android intents and browsers url has limitations, so if you are using the returnType of **event** consider using the parameter **compressionType=gzip** that will return "Signer1" + Base 64 gzip encoded event json
+Android intents and browser urls have limitations, so if you are using the `returnType` of **event** consider using the parameter **compressionType=gzip** that will return "Signer1" + Base64 gzip encoded event json
 
 ## Methods
 

From 6b26ebe6c5c9834549aa9adec0d066bc5c6aae88 Mon Sep 17 00:00:00 2001
From: greenart7c3 <115044884+greenart7c3@users.noreply.github.com>
Date: Mon, 18 Mar 2024 15:01:03 -0300
Subject: [PATCH 164/263] Update 100.md

---
 100.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/100.md b/100.md
index 386ec80..79ced80 100644
--- a/100.md
+++ b/100.md
@@ -64,8 +64,8 @@ intent.`package` = "com.example.signer"
     // You can send some default permissions for the user to authorize for ever
     val permissions = listOf(
       Permission(
-          type = "sign_event",  // Is it type?
-          kind = 22242 // Is it kind?
+          type = "sign_event",
+          kind = 22242
       ),
       Permission(
           type = "nip44_decrypt"
@@ -525,4 +525,4 @@ Android intents and browser urls have limitations, so if you are using the `retu
     </script>
 </body>
 </html>
-```
\ No newline at end of file
+```

From a2aaa3c00b18e2e11dceae9400cd6fc429562622 Mon Sep 17 00:00:00 2001
From: greenart7c3 <115044884+greenart7c3@users.noreply.github.com>
Date: Mon, 18 Mar 2024 15:10:25 -0300
Subject: [PATCH 165/263] add example of rememberLauncherForActivityResult

---
 100.md | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/100.md b/100.md
index 79ced80..24bf09f 100644
--- a/100.md
+++ b/100.md
@@ -40,6 +40,24 @@ fun isExternalSignerInstalled(context: Context): Boolean {
 
 To get the result back from the Signer Application you should use `registerForActivityResult` or `rememberLauncherForActivityResult` in Kotlin. If you are using another framework check the documentation of your framework or a third party library to get the result.
 
+```kotlin
+val launcher = rememberLauncherForActivityResult(
+    contract = ActivityResultContracts.StartActivityForResult(),
+    onResult = { result ->
+        if (result.resultCode != Activity.RESULT_OK) {
+            Toast.makeText(
+                context,
+                "Sign request rejected",
+                Toast.LENGTH_SHORT
+            ).show()
+        } else {
+            val signature = activityResult.data?.getStringExtra("signature")
+            // Do something with signature ...
+        }
+    }
+)
+```
+
 Create the Intent using the **nostrsigner** scheme:
 
 ```kotlin
@@ -52,6 +70,12 @@ Set the Signer package name:
 intent.`package` = "com.example.signer"
 ```
 
+Send the Intent:
+
+```kotlin
+launcher.launch(intent)
+```
+
 ### Methods
 
 - **get_public_key**

From 527f62d0106e6cfee10fe5e58ee54f0f99a57fac Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Tue, 19 Mar 2024 05:59:29 -0700
Subject: [PATCH 166/263] relax requirements for NIP 32 L tags

---
 32.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/32.md b/32.md
index be4e872..4641473 100644
--- a/32.md
+++ b/32.md
@@ -20,7 +20,7 @@ Label Namespace Tag
 An `L` tag can be any string, but publishers SHOULD ensure they are unambiguous by using a well-defined namespace
 (such as an ISO standard) or reverse domain name notation.
 
-`L` tags are REQUIRED in order to support searching by namespace rather than by a specific tag. The special `ugc`
+`L` tags are RECOMMENDED in order to support searching by namespace rather than by a specific tag. The special `ugc`
 ("user generated content") namespace MAY be used when the label content is provided by an end user.
 
 `L` tags starting with `#` indicate that the label target should be associated with the label's value.
@@ -29,7 +29,7 @@ This is a way of attaching standard nostr tags to events, pubkeys, relays, urls,
 Label Tag
 ----
 
-An `l` tag's value can be any string. `l` tags MUST include a `mark` matching an `L` tag value in the same event.
+An `l` tag's value can be any string. If using an `L` tag, `l` tags MUST include a `mark` matching an `L` tag value in the same event.
 
 Label Target
 ----
@@ -42,7 +42,7 @@ or topics respectively. As with NIP-01, a relay hint SHOULD be included when usi
 Content
 -------
 
-Labels should be short, meaningful strings. Longer discussions, such as for a review, or an
+Labels should be short, meaningful strings. Longer discussions, such as for an
 explanation of why something was labeled the way it was, should go in the event's `content` field.
 
 Self-Reporting

From 46a6bf331ae823dad079a9740f37d57e58b92358 Mon Sep 17 00:00:00 2001
From: utxo <github@utxo.one>
Date: Thu, 21 Mar 2024 10:15:02 -0400
Subject: [PATCH 167/263] Make relay attribute recommended in NIP-05

---
 05.md | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/05.md b/05.md
index 6437550..a4b804c 100644
--- a/05.md
+++ b/05.md
@@ -1,8 +1,6 @@
-NIP-05
-======
+# NIP-05
 
-Mapping Nostr keys to DNS-based internet identifiers
-----------------------------------------------------
+## Mapping Nostr keys to DNS-based internet identifiers
 
 `final` `optional`
 
@@ -33,9 +31,9 @@ It will make a GET request to `https://example.com/.well-known/nostr.json?name=b
     "bob": "b0635d6a9851d3aed0cd6c495b282167acf761729078d975fc341b22650b07b9"
   }
 }
-````
+```
 
-or with the **optional** `"relays"` attribute:
+or with the **recommended** `"relays"` attribute:
 
 ```json
 {
@@ -43,14 +41,17 @@ or with the **optional** `"relays"` attribute:
     "bob": "b0635d6a9851d3aed0cd6c495b282167acf761729078d975fc341b22650b07b9"
   },
   "relays": {
-    "b0635d6a9851d3aed0cd6c495b282167acf761729078d975fc341b22650b07b9": [ "wss://relay.example.com", "wss://relay2.example.com" ]
+    "b0635d6a9851d3aed0cd6c495b282167acf761729078d975fc341b22650b07b9": [
+      "wss://relay.example.com",
+      "wss://relay2.example.com"
+    ]
   }
 }
-````
+```
 
 If the pubkey matches the one given in `"names"` (as in the example above) that means the association is right and the `"nip05"` identifier is valid and can be displayed.
 
-The optional `"relays"` attribute may contain an object with public keys as properties and arrays of relay URLs as values. When present, that can be used to help clients learn in which relays the specific user may be found. Web servers which serve `/.well-known/nostr.json` files dynamically based on the query string SHOULD also serve the relays data for any name they serve in the same reply when that is available.
+The recommended `"relays"` attribute may contain an object with public keys as properties and arrays of relay URLs as values. When present, that can be used to help clients learn in which relays the specific user may be found. Web servers which serve `/.well-known/nostr.json` files dynamically based on the query string SHOULD also serve the relays data for any name they serve in the same reply when that is available.
 
 ## Finding users from their NIP-05 identifier
 

From 965eb45b30b6000da976addcf3163858abadcf07 Mon Sep 17 00:00:00 2001
From: utxo <github@utxo.one>
Date: Thu, 21 Mar 2024 10:18:42 -0400
Subject: [PATCH 168/263] remove prettier formatting

---
 05.md | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/05.md b/05.md
index a4b804c..405078a 100644
--- a/05.md
+++ b/05.md
@@ -1,6 +1,8 @@
-# NIP-05
+NIP-05
+======
 
-## Mapping Nostr keys to DNS-based internet identifiers
+Mapping Nostr keys to DNS-based internet identifiers
+----------------------------------------------------
 
 `final` `optional`
 
@@ -31,7 +33,7 @@ It will make a GET request to `https://example.com/.well-known/nostr.json?name=b
     "bob": "b0635d6a9851d3aed0cd6c495b282167acf761729078d975fc341b22650b07b9"
   }
 }
-```
+````
 
 or with the **recommended** `"relays"` attribute:
 
@@ -41,13 +43,10 @@ or with the **recommended** `"relays"` attribute:
     "bob": "b0635d6a9851d3aed0cd6c495b282167acf761729078d975fc341b22650b07b9"
   },
   "relays": {
-    "b0635d6a9851d3aed0cd6c495b282167acf761729078d975fc341b22650b07b9": [
-      "wss://relay.example.com",
-      "wss://relay2.example.com"
-    ]
+    "b0635d6a9851d3aed0cd6c495b282167acf761729078d975fc341b22650b07b9": [ "wss://relay.example.com", "wss://relay2.example.com" ]
   }
 }
-```
+````
 
 If the pubkey matches the one given in `"names"` (as in the example above) that means the association is right and the `"nip05"` identifier is valid and can be displayed.
 

From 4b79bc67c471f77061d62704538e5fdd6ac28ae8 Mon Sep 17 00:00:00 2001
From: "Nostr.Band" <124499563+nostrband@users.noreply.github.com>
Date: Fri, 22 Mar 2024 08:01:37 +0100
Subject: [PATCH 169/263] Add optional_requested_permissions

This is implemented in nsec.app, nostr.band, Coracle and Nostrudel, so maybe it's time to update the NIP.
---
 46.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/46.md b/46.md
index eb96494..8ba65d9 100644
--- a/46.md
+++ b/46.md
@@ -120,7 +120,7 @@ Each of the following are methods that the client sends to the remote signer.
 
 | Command                  | Params                                            | Result                                                                 |
 | ------------------------ | ------------------------------------------------- | ---------------------------------------------------------------------- |
-| `connect`                | `[<remote_user_pubkey>, <optional_secret>]`       | "ack"                                                                  |
+| `connect`                | `[<remote_user_pubkey>, <optional_secret>, <optional_requested_permissions>]`       | "ack"                                                                  |
 | `sign_event`             | `[<json_stringified_event_to_sign>]`              | `json_stringified(<signed_event>)`                                     |
 | `ping`                   | `[]`                                              | "pong"                                                                 |
 | `get_relays`             | `[]`                                              | `json_stringified({<relay_url>: {read: <boolean>, write: <boolean>}})` |
@@ -130,6 +130,10 @@ Each of the following are methods that the client sends to the remote signer.
 | `nip44_encrypt`          | `[<third_party_pubkey>, <plaintext_to_encrypt>]`  | `<nip44_ciphertext>`                                                   |
 | `nip44_decrypt`          | `[<third_party_pubkey>, <nip44_ciphertext_to_decrypt>]` | `<plaintext>`                                                    |
 
+### Requested permissions
+
+The `connect` method may be provided with `optional_requested_permissions` for user convenience. The permissions are a comma-separated list of `method[:params]`, i.e. `nip04_encrypt,sign_event:4` meaning permissions to call `nip04_encrypt` and to call `sign_event` with `kind:4`. Optional parameter for `sign_event` is the kind number, parameters for other methods are to be defined later. 
+
 ## Response Events `kind:24133`
 
 ```json
@@ -185,7 +189,7 @@ Each of the following are methods that the client sends to the remote signer.
 
 | Command          | Params                                     | Result                               |
 | ---------------- | ------------------------------------------ | ------------------------------------ |
-| `create_account` | `[<username>, <domain>, <optional_email>]` | `<newly_created_remote_user_pubkey>` |
+| `create_account` | `[<username>, <domain>, <optional_email>, <optional_requested_permissions>]` | `<newly_created_remote_user_pubkey>` |
 
 ## Appendix
 

From 769432efc42b69e5f23956a98d944238bba8d461 Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Fri, 29 Mar 2024 08:06:00 +0900
Subject: [PATCH 170/263] README: fix order of kinds

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 90a6394..c3c5ef0 100644
--- a/README.md
+++ b/README.md
@@ -173,8 +173,8 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `31925`       | Calendar Event RSVP        | [52](52.md)              |
 | `31989`       | Handler recommendation     | [89](89.md)              |
 | `31990`       | Handler information        | [89](89.md)              |
-| `39000-9`     | Group metadata events      | [29](29.md)              |
 | `34550`       | Community Definition       | [72](72.md)              |
+| `39000-9`     | Group metadata events      | [29](29.md)              |
 
 [nostrocket]: https://github.com/nostrocket/NIPS/blob/main/Problems.md
 [lnpub]: https://github.com/shocknet/Lightning.Pub/blob/master/proto/autogenerated/client.md

From 881780186077154f35abef89fe60c6d28343c8fd Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Thu, 28 Mar 2024 16:57:00 -0400
Subject: [PATCH 171/263] Clarifies relays to be used for NIP-28

---
 28.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/28.md b/28.md
index 2dcf800..65ebb3f 100644
--- a/28.md
+++ b/28.md
@@ -23,11 +23,11 @@ Client-centric moderation gives client developers discretion over what types of
 
 Create a public chat channel.
 
-In the channel creation `content` field, Client SHOULD include basic channel metadata (`name`, `about`, `picture` as specified in kind 41).
+In the channel creation `content` field, Client SHOULD include basic channel metadata (`name`, `about`, `picture` and `relays` as specified in kind 41).
 
 ```json
 {
-  "content": "{\"name\": \"Demo Channel\", \"about\": \"A test channel.\", \"picture\": \"https://placekitten.com/200/200\"}",
+  "content": "{\"name\": \"Demo Channel\", \"about\": \"A test channel.\", \"picture\": \"https://placekitten.com/200/200\", \"relays\": [\"wss://nos.lol\", \"wss://nostr.mom\"]}",
   ...
 }
 ```
@@ -46,6 +46,7 @@ Clients SHOULD support basic metadata fields:
 - `name` - string - Channel name
 - `about` - string - Channel description
 - `picture` - string - URL of channel picture
+- `relays` - array - List of relays to download and broadcast events to
 
 Clients MAY add additional metadata fields.
 
@@ -53,7 +54,7 @@ Clients SHOULD use [NIP-10](10.md) marked "e" tags to recommend a relay.
 
 ```json
 {
-  "content": "{\"name\": \"Updated Demo Channel\", \"about\": \"Updating a test channel.\", \"picture\": \"https://placekitten.com/201/201\"}",
+  "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>]],
   ...
 }
@@ -132,12 +133,11 @@ Clients MAY hide event 42s for users other than the user who sent the event 44.
 }
 ```
 
-## NIP-10 relay recommendations
+## Relay recommendations
 
-For [NIP-10](10.md) relay recommendations, clients generally SHOULD use the relay URL of the original (oldest) kind 40 event.
-
-Clients MAY recommend any relay URL. For example, if a relay hosting the original kind 40 event for a channel goes offline, clients could instead fetch channel data from a backup relay, or a relay that clients trust more than the original relay.
+Clients SHOULD use the relay URLs of the metadata events. 
 
+Clients MAY use any relay URL. For example, if a relay hosting the original kind 40 event for a channel goes offline, clients could instead fetch channel data from a backup relay, or a relay that clients trust more than the original relay.
 
 Motivation
 ----------

From 9971db355164815c986251f8f89d1c7c70ec9e53 Mon Sep 17 00:00:00 2001
From: arthurfranca <arthur.a.franca@gmail.com>
Date: Sat, 30 Mar 2024 22:33:24 -0300
Subject: [PATCH 172/263] Minor fix to nip01

---
 01.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/01.md b/01.md
index 905e45f..a91febc 100644
--- a/01.md
+++ b/01.md
@@ -81,7 +81,7 @@ This NIP defines 3 standard tags that can be used across all event kinds with th
     - 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>]`
 
-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.
 
 ### Kinds
 

From af5d4074886916877c350dbdfec61e62a9875255 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 2 Apr 2024 10:00:07 -0500
Subject: [PATCH 173/263] Update BREAKING.md for NIP-46 (stringified params)

---
 BREAKING.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/BREAKING.md b/BREAKING.md
index 3693c34..8024814 100644
--- a/BREAKING.md
+++ b/BREAKING.md
@@ -6,6 +6,7 @@ reverse chronological order.
 | Date        | Commit    | NIP      | Change |
 | ----------- | --------- | -------- | ------ |
 | 2024-02-25  | [4a171cb0](https://github.com/nostr-protocol/nips/commit/4a171cb0) | [NIP-18](18.md) | quote repost should use `q` tag |
+| 2024-02-10  | [c6cd655c](https://github.com/nostr-protocol/nips/commit/c6cd655c) | [NIP-46](46.md) | Params were stringified |
 | 2024-02-16  | [cbec02ab](https://github.com/nostr-protocol/nips/commit/cbec02ab) | [NIP-49](49.md) | Password first normalized to NFKC |
 | 2024-02-15  | [afbb8dd0](https://github.com/nostr-protocol/nips/commit/afbb8dd0) | [NIP-39](39.md) | PGP identity was removed |
 | 2024-02-07  | [d3dad114](https://github.com/nostr-protocol/nips/commit/d3dad114) | [NIP-46](46.md) | Connection token format was changed |

From ca97490cdf4d499752bee2fa589514e2a474419b Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Wed, 3 Apr 2024 13:09:22 +0900
Subject: [PATCH 174/263] NIP-58: minor JSON fix

---
 58.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/58.md b/58.md
index 0ecef25..4a9ed4c 100644
--- a/58.md
+++ b/58.md
@@ -83,7 +83,7 @@ Clients SHOULD attempt to render the most appropriate badge thumbnail according
     ["name", "Medal of Bravery"],
     ["description", "Awarded to users demonstrating bravery"],
     ["image", "https://nostr.academy/awards/bravery.png", "1024x1024"],
-    ["thumb", "https://nostr.academy/awards/bravery_256x256.png", "256x256"],
+    ["thumb", "https://nostr.academy/awards/bravery_256x256.png", "256x256"]
   ],
   ...
 }
@@ -99,7 +99,7 @@ Clients SHOULD attempt to render the most appropriate badge thumbnail according
   "tags": [
     ["a", "30009:alice:bravery"],
     ["p", "bob", "wss://relay"],
-    ["p", "charlie", "wss://relay"],
+    ["p", "charlie", "wss://relay"]
   ],
   ...
 }
@@ -117,7 +117,7 @@ Honorable Bob The Brave:
     ["a", "30009:alice:bravery"],
     ["e", "<bravery badge award event id>", "wss://nostr.academy"],
     ["a", "30009:alice:honor"],
-    ["e", "<honor badge award event id>", "wss://nostr.academy"],
+    ["e", "<honor badge award event id>", "wss://nostr.academy"]
   ],
   ...
 }

From 3c75180fb7947c133a063ba475067a3b8f42d619 Mon Sep 17 00:00:00 2001
From: Matthew Lorentz <matt@lorentz.is>
Date: Wed, 3 Apr 2024 10:50:02 -0400
Subject: [PATCH 175/263] Add  category to reports

---
 56.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/56.md b/56.md
index a2861e3..d6978c2 100644
--- a/56.md
+++ b/56.md
@@ -28,6 +28,7 @@ being reported, which consists of the following report types:
 - `illegal` - something which may be illegal in some jurisdiction
 - `spam` - spam
 - `impersonation` - someone pretending to be someone else
+- `other` - for reports that don't fit in the above categories
 
 Some report tags only make sense for profile reports, such as `impersonation`
 

From b224f6d05d5b208b632e8e1f5ac489b7f27079ae Mon Sep 17 00:00:00 2001
From: Matthew Lorentz <matt@lorentz.is>
Date: Wed, 3 Apr 2024 10:59:37 -0400
Subject: [PATCH 176/263] Update description of NIP-56

---
 56.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/56.md b/56.md
index d6978c2..3209b80 100644
--- a/56.md
+++ b/56.md
@@ -4,10 +4,12 @@ NIP-56
 Reporting
 ---------
 
-`draft` `optional`
+`optional`
 
-A report is a `kind 1984` note that is used to report other notes for spam,
-illegal and explicit content.
+A report is a `kind 1984` event that signals to users and relays that 
+some referenced content is objectionable. The definition of objectionable is
+obviously subjective and all agents on the network (users, apps, relays, etc.) 
+may consume and take action on them as they see fit.
 
 The `content` MAY contain additional information submitted by the entity
 reporting the content.

From b765b3c0301958d46115b834872bbd0c8bac588c Mon Sep 17 00:00:00 2001
From: kuiperanon <164939804+kuiperanon@users.noreply.github.com>
Date: Tue, 9 Apr 2024 11:25:05 -0500
Subject: [PATCH 177/263] Clarify use of ambiguous terminology in spec of
 bunker token

It's very confusing as to whether it refers to remote user pubkey vs remote signer pubkey. This is complicated further by the typo in the explanation of "remote signer pubkey".
---
 46.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/46.md b/46.md
index 8ba65d9..56b8402 100644
--- a/46.md
+++ b/46.md
@@ -25,7 +25,7 @@ This is most common in a situation where you have your own nsecbunker or other t
 The remote signer would provide a connection token in the form:
 
 ```
-bunker://<remote-pubkey>?relay=<wss://relay-to-connect-on>&relay=<wss://another-relay-to-connect-on>&secret=<optional-secret-value>
+bunker://<remote-user-pubkey>?relay=<wss://relay-to-connect-on>&relay=<wss://another-relay-to-connect-on>&secret=<optional-secret-value>
 ```
 
 This token is pasted into the client by the user and the client then uses the details to connect to the remote signer via the specified relay(s).

From d607a288b5db72a84f3d6cc8fd42304d31e1f66b Mon Sep 17 00:00:00 2001
From: DanConwayDev <DanConwayDev@protonmail.com>
Date: Thu, 7 Mar 2024 07:59:16 +0000
Subject: [PATCH 178/263] NIP-34: clarify nip10 thread application

for consistancy and so that the intended order of patches is easier to ascertain

enables additional patches to be appended to a patch set, supporting a PR-like workflow alongside
patch-over-email-like workflow
---
 34.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/34.md b/34.md
index 651407d..2a7f489 100644
--- a/34.md
+++ b/34.md
@@ -35,6 +35,10 @@ Except `d`, all tags are optional.
 
 Patches can be sent by anyone to any repository. Patches to a specific repository SHOULD be sent to the relays specified in that repository's announcement event's `"relays"` tag. Patch events SHOULD include an `a` tag pointing to that repository's announcement address.
 
+Patches in a patch set SHOULD include a NIP-10 `e` `reply` tag pointing to the previous patch. 
+
+The first patch revision in a patch revision SHOULD include a NIP-10 `e` `reply` to the original root patch.
+
 ```jsonc
 {
   "kind": 1617,

From 46ea8dcf9cedd1f64e9444b70ac0ed24e40bbe1a Mon Sep 17 00:00:00 2001
From: DanConwayDev <DanConwayDev@protonmail.com>
Date: Thu, 7 Mar 2024 08:03:48 +0000
Subject: [PATCH 179/263] NIP-34: add repo-id standard

suggested guidance for repo-id
---
 34.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/34.md b/34.md
index 2a7f489..7eea92b 100644
--- a/34.md
+++ b/34.md
@@ -17,7 +17,7 @@ Git repositories are hosted in Git-enabled servers, but their existence can be a
   "kind": 30617,
   "content": "",
   "tags": [
-    ["d", "<repo-id>"],
+    ["d", "<repo-id>"], // usually kebab-case short name
     ["name", "<human-readable project name>"],
     ["description", "brief human-readable project description>"],
     ["web", "<url for browsing>", ...], // a webpage url, if the git server being used provides such a thing

From cb0d35a5f9f1b88a270f7fbbfbdb97e095e28d56 Mon Sep 17 00:00:00 2001
From: DanConwayDev <DanConwayDev@protonmail.com>
Date: Thu, 7 Mar 2024 08:25:49 +0000
Subject: [PATCH 180/263] NIP-34: optional additional repo maintainers

can be used by clients to tag multiple maintainers in patches

helps clients identify whether multiple repo events for the same repository
are complementary or in competion
---
 34.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/34.md b/34.md
index 7eea92b..bb7e3ee 100644
--- a/34.md
+++ b/34.md
@@ -23,11 +23,12 @@ Git repositories are hosted in Git-enabled servers, but their existence can be a
     ["web", "<url for browsing>", ...], // a webpage url, if the git server being used provides such a thing
     ["clone", "<url for git-cloning>", ...], // a url to be given to `git clone` so anyone can clone it
     ["relays", "<relay-url>", ...] // relays that this repository will monitor for patches and issues
+    ["maintainers", "<other-recognized-maintainer>", ...]
   ]
 }
 ```
 
-The tags `web`, `clone`, `relays` can have multiple values.
+The tags `web`, `clone`, `relays`, `maintainers` can have multiple values.
 
 Except `d`, all tags are optional.
 

From 8225a018c72c4d11b575ed4e57fa587d08c09027 Mon Sep 17 00:00:00 2001
From: DanConwayDev <DanConwayDev@protonmail.com>
Date: Thu, 7 Mar 2024 09:01:19 +0000
Subject: [PATCH 181/263] NIP-34: optional tags to improve discoverability

earliest-unique-commit r tag enables clients to:
 - retrieve all repo events refering to a local git repo
 - group repo events with different identifers that refer to same repo
 - retrieve all patches for a local repo,
   irespective of the tagged repo event

current-commit-id r tag enables clients to prevent accidental submission of a patch,
which has already been proposed

root-revision tag enables clients to filter out proposal revisions
from a list of proposals
---
 34.md | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/34.md b/34.md
index bb7e3ee..fefc7af 100644
--- a/34.md
+++ b/34.md
@@ -23,6 +23,8 @@ Git repositories are hosted in Git-enabled servers, but their existence can be a
     ["web", "<url for browsing>", ...], // a webpage url, if the git server being used provides such a thing
     ["clone", "<url for git-cloning>", ...], // a url to be given to `git clone` so anyone can clone it
     ["relays", "<relay-url>", ...] // relays that this repository will monitor for patches and issues
+    ["earliest-unique-commit", "<commit-id>"] // usually root commit but a recent commit for forks
+    ["r", "<earliest-unique-commit-id>"] // so clients can subscribe to all events related to a local git repo
     ["maintainers", "<other-recognized-maintainer>", ...]
   ]
 }
@@ -46,17 +48,20 @@ The first patch revision in a patch revision SHOULD include a NIP-10 `e` `reply`
   "content": "<patch>", // contents of <git format-patch>
   "tags": [
     ["a", "30617:<base-repo-owner-pubkey>:<base-repo-id>"],
+    ["r", "<earliest-unique-commit-id-of-repo>"] // so clients can subscribe to all patches sent to a local git repo
     ["p", "<repository-owner>"],
     ["p", "<other-user>"], // optionally send the patch to another user to bring it to their attention
 
-    // for the first patch in a thread or series
-    ["t", "root"],
+    ["t", "root"], // ommited for additional patches in a series
+    // for the first patch in a revision
+    ["t", "root-revision"],
 
     // optional tags for when it is desirable that the merged patch has a stable commit id
     // these fields are necessary for ensuring that the commit resulting from applying a patch
     // has the same id as it had in the proposer's machine -- all these tags can be omitted
     // if the maintainer doesn't care about these things
     ["commit", "<current-commit-id>"],
+    ["r", "<current-commit-id>"] // so clients can find existing patches for a specific commit
     ["parent-commit", "<parent-commit-id>"],
     ["commit-pgp-sig", "-----BEGIN PGP SIGNATURE-----..."], // empty string for unsigned commit
     ["committer", "<name>", "<email>", "<timestamp>", "<timezone offset in minutes>"],

From 0b62729e318497922822c39471ab31a869563ba5 Mon Sep 17 00:00:00 2001
From: DanConwayDev <DanConwayDev@protonmail.com>
Date: Thu, 7 Mar 2024 09:20:25 +0000
Subject: [PATCH 182/263] NIP-34: clarify cover letters

remove cover letters from 'possible things to be added later' and
add a clarification that can they can be added through patches
---
 34.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/34.md b/34.md
index fefc7af..c6e7225 100644
--- a/34.md
+++ b/34.md
@@ -69,6 +69,8 @@ The first patch revision in a patch revision SHOULD include a NIP-10 `e` `reply`
 }
 ```
 
+The first patch in a series MAY be a cover letter in the format produced by `git format-patch`.
+
 ## 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.
@@ -108,5 +110,4 @@ Replies are also Markdown text. The difference is that they MUST be issued as re
 
 - "status" kind (for letting people know a patch was merged or an issue was fixed or won't be fixed)
 - "branch merge" kind (specifying a URL from where to fetch the branch to be merged)
-- "cover letter" kind (to which multiple patches can refer and serve as a unifying layer to them)
 - inline file comments kind (we probably need one for patches and a different one for merged files)

From 403b5199a490b6a148063003e00924f5e79ba36c Mon Sep 17 00:00:00 2001
From: DanConwayDev <DanConwayDev@protonmail.com>
Date: Thu, 7 Mar 2024 10:21:06 +0000
Subject: [PATCH 183/263] NIP-34: add status events

merge-commit and applied-commit-id tags enable discussion of patches to be
mapped to lines of code accepted into the master branch
---
 34.md | 40 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/34.md b/34.md
index c6e7225..f72fcf2 100644
--- a/34.md
+++ b/34.md
@@ -106,8 +106,46 @@ Replies are also Markdown text. The difference is that they MUST be issued as re
 }
 ```
 
+## Status
+
+Root Patches and Issues have a Status that defaults to 'Open' and can be set by issuing Status events.
+
+```jsonc
+{
+  "kind": 1630, // Open
+  "kind": 1631, // Applied / Merged for Patches; Resolved for Issues
+  "kind": 1632, // Closed
+  "kind": 1633, // Draft
+  "content": "<markdown text>",
+  "tags": [
+    ["e", "<issue-or-original-root-patch-id-hex>", "", "root"],
+    ["e", "<accepted-revision-root-id-hex>", "", "reply"], // for when revisions applied
+    ["p", "<repository-owner>"],
+    ["p", "<root-event-author>"],
+    ["p", "<revision-author>"],
+
+    // optional for improved subscription filter efficency
+    ["a", "30617:<base-repo-owner-pubkey>:<base-repo-id>", "<relay-url>"],
+    ["r", "<earliest-unique-commit-id-of-repo>"]
+
+    // optional for `1631` status
+    ["e", "<applied-or-merged-patch-event-id>", "", "mention"], // for each
+    // when merged
+    ["merge-commit", "<merge-commit-id>"]
+    ["r", "<merge-commit-id>"] 
+    // when applied
+    ["applied-as-commits", "<commit-id-in-master-branch>", ...]
+    ["r", "<applied-commit-id>"] // for each
+  ]
+}
+```
+
+The Status event with the largest created_at date is valid.
+
+The Status of a patch-revision defaults to either that of the root-patch, or `1632` (Closed) if the root-patch's Status is `1631` and the patch-revision isn't tagged in the `1631` event. 
+
+
 ## Possible things to be added later
 
-- "status" kind (for letting people know a patch was merged or an issue was fixed or won't be fixed)
 - "branch merge" kind (specifying a URL from where to fetch the branch to be merged)
 - inline file comments kind (we probably need one for patches and a different one for merged files)

From eb3a857288fe99d99b73e07dfa28ac548fc10efb Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Mon, 22 Apr 2024 12:35:48 +0900
Subject: [PATCH 184/263] README: add status kinds of NIP-34

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index c3c5ef0..5fcdaf7 100644
--- a/README.md
+++ b/README.md
@@ -114,6 +114,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `1617`        | Patches                    | [34](34.md)              |
 | `1621`        | Issues                     | [34](34.md)              |
 | `1622`        | Replies                    | [34](34.md)              |
+| `1630`-`1633` | Status                     | [34](34.md)              |
 | `1971`        | Problem Tracker            | [nostrocket][nostrocket] |
 | `1984`        | Reporting                  | [56](56.md)              |
 | `1985`        | Label                      | [32](32.md)              |

From df30012430c88d49fb5b124992b04d5c61b6338b Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Wed, 24 Apr 2024 15:31:45 -0400
Subject: [PATCH 185/263] NIP-17 (old 24) Sealed Gift-Wrapped Messages for
 Private DMs and Small Group Chats (#686)

---
 04.md     |   2 +-
 11.md     |   2 +-
 17.md     | 154 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 README.md |   9 ++--
 4 files changed, 162 insertions(+), 5 deletions(-)
 create mode 100644 17.md

diff --git a/04.md b/04.md
index dc232b4..a561a2f 100644
--- a/04.md
+++ b/04.md
@@ -1,4 +1,4 @@
-> __Warning__  `unrecommended`: deprecated in favor of [NIP-44](44.md)
+> __Warning__  `unrecommended`: deprecated in favor of [NIP-17](17.md)
 
 NIP-04
 ======
diff --git a/11.md b/11.md
index 45102d7..a50038a 100644
--- a/11.md
+++ b/11.md
@@ -37,7 +37,7 @@ Detailed plain-text information about the relay may be contained in the `descrip
 
 ### Pubkey
 
-An administrative contact may be listed with a `pubkey`, in the same format as Nostr events (32-byte hex for a `secp256k1` public key).  If a contact is listed, this provides clients with a recommended address to send encrypted direct messages (See `NIP-04`) to a system administrator.  Expected uses of this address are to report abuse or illegal content, file bug reports, or request other technical assistance.
+An administrative contact may be listed with a `pubkey`, in the same format as Nostr events (32-byte hex for a `secp256k1` public key).  If a contact is listed, this provides clients with a recommended address to send encrypted direct messages (See [NIP-17](17.md)) to a system administrator.  Expected uses of this address are to report abuse or illegal content, file bug reports, or request other technical assistance.
 
 Relay operators have no obligation to respond to direct messages.
 
diff --git a/17.md b/17.md
new file mode 100644
index 0000000..cc04a88
--- /dev/null
+++ b/17.md
@@ -0,0 +1,154 @@
+NIP-17
+======
+
+Private Direct Messages
+-----------------------
+
+`draft` `optional`
+
+This NIP defines an encrypted direct messaging scheme using [NIP-44](44.md) encryption and [NIP-59](59.md) seals and gift wraps. 
+
+## Direct Message Kind
+
+Kind `14` is a chat message. `p` tags identify one or more receivers of the message.
+
+```js
+{
+  "id": "<usual hash>",
+  "pubkey": "<sender-pubkey>",
+  "created_at": now(),
+  "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>"],
+    ...
+  ],
+  "content": "<message-in-plain-text>",
+}
+```
+
+`.content` MUST be plain text. Fields `id` and `created_at` are required. 
+
+Tags that mention, quote and assemble threading structures MUST follow [NIP-10](10.md). 
+
+Kind `14`s MUST never be signed. If it is signed, the message might leak to relays and become **fully public**.
+
+## Chat Rooms
+
+The set of `pubkey` + `p` tags defines a chat room. If a new `p` tag is added or a current one is removed, a new room is created with clean message history. 
+
+Clients SHOULD render messages of the same room in a continuous thread. 
+
+An optional `subject` tag defines the current name/topic of the conversation. Any member can change the topic by simply submitting a new `subject` to an existing `pubkey` + `p`-tags room. There is no need to send `subject` in every message. The newest `subject` in the thread is the subject of the conversation. 
+
+## Encrypting
+
+Following [NIP-59](59.md), the **unsigned** `kind:14` chat message must be sealed (`kind:13`) and then gift-wrapped (`kind:1059`) to each receiver and the sender individually.
+
+```js
+{
+  "id": "<usual hash>",
+  "pubkey": randomPublicKey,
+  "created_at": randomTimeUpTo2DaysInThePast(), 
+  "kind": 1059, // gift wrap
+  "tags": [
+    ["p", receiverPublicKey, "<relay-url>"] // receiver
+  ],
+  "content": nip44Encrypt(
+    {
+      "id": "<usual hash>",
+      "pubkey": senderPublicKey,
+      "created_at": randomTimeUpTo2DaysInThePast(), 
+      "kind": 13, // seal
+      "tags": [], // no tags
+      "content": nip44Encrypt(unsignedKind14, senderPrivateKey, receiverPublicKey),
+      "sig": "<signed by senderPrivateKey>"
+    },
+    randomPrivateKey, receiverPublicKey
+  ),
+  "sig": "<signed by randomPrivateKey>"
+}
+```
+
+The encryption algorithm MUST use the latest version of [NIP-44](44.md). 
+
+Clients MUST verify if pubkey of the `kind:13` is the same pubkey on the `kind:14`, otherwise any sender can impersonate others by simply changing the pubkey on `kind:14`.
+
+Clients SHOULD randomize `created_at` in up to two days in the past in both the seal and the gift wrap to make sure grouping by `created_at` doesn't reveal any metadata. 
+
+The gift wrap's `p`-tag can be the receiver's main pubkey or an alias key created to receive DMs without exposing the receiver's identity.
+
+Clients CAN offer disappearing messages by setting an `expiration` tag in the gift wrap of each receiver or by not generating a gift wrap to the sender's public key
+
+## Publishing 
+
+Kind `10050` indicates the user's preferred relays to receive DMs. The event MUST include a list of `relay` tags with relay URIs.
+
+```js
+{
+  "kind": 10050,
+  "tags": [
+    ["relay", "wss://inbox.nostr.wine"],
+    ["relay", "wss://myrelay.nostr1.com"],
+  ],
+  "content": "",
+  //...other fields
+}
+```
+
+Clients SHOULD publish kind `14` events to the `10050`-listed relays, falling back to `read` relays of [NIP-65](65.md) if `kind:10050` is not available.
+
+Clients SHOULD guide users to keep `kind:10050` lists small (1-3 relays) and SHOULD spread it to as many relays as viable. 
+
+## Benefits & Limitations
+
+This NIP offers the following privacy and security features: 
+
+1. **No Metadata Leak**: Participant identities, each message's real date and time, event kinds, and other event tags are all hidden from the public. Senders and receivers cannot be linked with public information alone.
+2. **No Public Group Identifiers**: There is no public central queue, channel or otherwise converging identifier to correlate or count all messages in the same group. 
+3. **No Moderation**: There are no group admins: no invitations or bans.
+4. **No Shared Secrets**: No secret must be known to all members that can leak or be mistakenly shared
+5. **Fully Recoverable**: Messages can be fully recoverable by any client with the user's private key
+6. **Optional Forward Secrecy**: Users and clients can opt-in for "disappearing messages".
+7. **Uses Public Relays**: Messages can flow through public relays without loss of privacy. Private relays can increase privacy further, but they are not required.
+8. **Cold Storage**: Users can unilaterally opt-in to sharing their messages with a separate key that is exclusive for DM backup and recovery.
+
+The main limitation of this approach is having to send a separate encrypted event to each receiver. Group chats with more than 100 participants should find a more suitable messaging scheme. 
+
+----
+
+## Examples
+
+This example sends the message `Hola, que tal?` from `nsec1w8udu59ydjvedgs3yv5qccshcj8k05fh3l60k9x57asjrqdpa00qkmr89m` to `nsec12ywtkplvyq5t6twdqwwygavp5lm4fhuang89c943nf2z92eez43szvn4dt`. 
+
+The two final GiftWraps, one to the receiver and the other to the sender, are:
+
+```json
+{
+   "id":"2886780f7349afc1344047524540ee716f7bdc1b64191699855662330bf235d8",
+   "pubkey":"8f8a7ec43b77d25799281207e1a47f7a654755055788f7482653f9c9661c6d51",
+   "created_at":1703128320,
+   "kind":1059,
+   "tags":[
+      [ "p", "918e2da906df4ccd12c8ac672d8335add131a4cf9d27ce42b3bb3625755f0788"]
+   ],
+   "content":"AsqzdlMsG304G8h08bE67dhAR1gFTzTckUUyuvndZ8LrGCvwI4pgC3d6hyAK0Wo9gtkLqSr2rT2RyHlE5wRqbCOlQ8WvJEKwqwIJwT5PO3l2RxvGCHDbd1b1o40ZgIVwwLCfOWJ86I5upXe8K5AgpxYTOM1BD+SbgI5jOMA8tgpRoitJedVSvBZsmwAxXM7o7sbOON4MXHzOqOZpALpS2zgBDXSAaYAsTdEM4qqFeik+zTk3+L6NYuftGidqVluicwSGS2viYWr5OiJ1zrj1ERhYSGLpQnPKrqDaDi7R1KrHGFGyLgkJveY/45y0rv9aVIw9IWF11u53cf2CP7akACel2WvZdl1htEwFu/v9cFXD06fNVZjfx3OssKM/uHPE9XvZttQboAvP5UoK6lv9o3d+0GM4/3zP+yO3C0NExz1ZgFmbGFz703YJzM+zpKCOXaZyzPjADXp8qBBeVc5lmJqiCL4solZpxA1865yPigPAZcc9acSUlg23J1dptFK4n3Tl5HfSHP+oZ/QS/SHWbVFCtq7ZMQSRxLgEitfglTNz9P1CnpMwmW/Y4Gm5zdkv0JrdUVrn2UO9ARdHlPsW5ARgDmzaxnJypkfoHXNfxGGXWRk0sKLbz/ipnaQP/eFJv/ibNuSfqL6E4BnN/tHJSHYEaTQ/PdrA2i9laG3vJti3kAl5Ih87ct0w/tzYfp4SRPhEF1zzue9G/16eJEMzwmhQ5Ec7jJVcVGa4RltqnuF8unUu3iSRTQ+/MNNUkK6Mk+YuaJJs6Fjw6tRHuWi57SdKKv7GGkr0zlBUU2Dyo1MwpAqzsCcCTeQSv+8qt4wLf4uhU9Br7F/L0ZY9bFgh6iLDCdB+4iABXyZwT7Ufn762195hrSHcU4Okt0Zns9EeiBOFxnmpXEslYkYBpXw70GmymQfJlFOfoEp93QKCMS2DAEVeI51dJV1e+6t3pCSsQN69Vg6jUCsm1TMxSs2VX4BRbq562+VffchvW2BB4gMjsvHVUSRl8i5/ZSDlfzSPXcSGALLHBRzy+gn0oXXJ/447VHYZJDL3Ig8+QW5oFMgnWYhuwI5QSLEyflUrfSz+Pdwn/5eyjybXKJftePBD9Q+8NQ8zulU5sqvsMeIx/bBUx0fmOXsS3vjqCXW5IjkmSUV7q54GewZqTQBlcx+90xh/LSUxXex7UwZwRnifvyCbZ+zwNTHNb12chYeNjMV7kAIr3cGQv8vlOMM8ajyaZ5KVy7HpSXQjz4PGT2/nXbL5jKt8Lx0erGXsSsazkdoYDG3U",
+   "sig":"a3c6ce632b145c0869423c1afaff4a6d764a9b64dedaf15f170b944ead67227518a72e455567ca1c2a0d187832cecbde7ed478395ec4c95dd3e71749ed66c480"
+}
+```
+ 
+```json
+{
+   "id":"162b0611a1911cfcb30f8a5502792b346e535a45658b3a31ae5c178465509721",
+   "pubkey":"626be2af274b29ea4816ad672ee452b7cf96bbb4836815a55699ae402183f512",
+   "created_at":1702711587,
+   "kind":1059,
+   "tags":[
+      [ "p", "44900586091b284416a0c001f677f9c49f7639a55c3f1e2ec130a8e1a7998e1b"]
+   ],
+   "content":"AsTClTzr0gzXXji7uye5UB6LYrx3HDjWGdkNaBS6BAX9CpHa+Vvtt5oI2xJrmWLen+Fo2NBOFazvl285Gb3HSM82gVycrzx1HUAaQDUG6HI7XBEGqBhQMUNwNMiN2dnilBMFC3Yc8ehCJT/gkbiNKOpwd2rFibMFRMDKai2mq2lBtPJF18oszKOjA+XlOJV8JRbmcAanTbEK5nA/GnG3eGUiUzhiYBoHomj3vztYYxc0QYHOx0WxiHY8dsC6jPsXC7f6k4P+Hv5ZiyTfzvjkSJOckel1lZuE5SfeZ0nduqTlxREGeBJ8amOykgEIKdH2VZBZB+qtOMc7ez9dz4wffGwBDA7912NFS2dPBr6txHNxBUkDZKFbuD5wijvonZDvfWq43tZspO4NutSokZB99uEiRH8NAUdGTiNb25m9JcDhVfdmABqTg5fIwwTwlem5aXIy8b66lmqqz2LBzJtnJDu36bDwkILph3kmvaKPD8qJXmPQ4yGpxIbYSTCohgt2/I0TKJNmqNvSN+IVoUuC7ZOfUV9lOV8Ri0AMfSr2YsdZ9ofV5o82ClZWlWiSWZwy6ypa7CuT1PEGHzywB4CZ5ucpO60Z7hnBQxHLiAQIO/QhiBp1rmrdQZFN6PUEjFDloykoeHe345Yqy9Ke95HIKUCS9yJurD+nZjjgOxZjoFCsB1hQAwINTIS3FbYOibZnQwv8PXvcSOqVZxC9U0+WuagK7IwxzhGZY3vLRrX01oujiRrevB4xbW7Oxi/Agp7CQGlJXCgmRE8Rhm+Vj2s+wc/4VLNZRHDcwtfejogjrjdi8p6nfUyqoQRRPARzRGUnnCbh+LqhigT6gQf3sVilnydMRScEc0/YYNLWnaw9nbyBa7wFBAiGbJwO40k39wj+xT6HTSbSUgFZzopxroO3f/o4+ubx2+IL3fkev22mEN38+dFmYF3zE+hpE7jVxrJpC3EP9PLoFgFPKCuctMnjXmeHoiGs756N5r1Mm1ffZu4H19MSuALJlxQR7VXE/LzxRXDuaB2u9days/6muP6gbGX1ASxbJd/ou8+viHmSC/ioHzNjItVCPaJjDyc6bv+gs1NPCt0qZ69G+JmgHW/PsMMeL4n5bh74g0fJSHqiI9ewEmOG/8bedSREv2XXtKV39STxPweceIOh0k23s3N6+wvuSUAJE7u1LkDo14cobtZ/MCw/QhimYPd1u5HnEJvRhPxz0nVPz0QqL/YQeOkAYk7uzgeb2yPzJ6DBtnTnGDkglekhVzQBFRJdk740LEj6swkJ",
+   "sig":"c94e74533b482aa8eeeb54ae72a5303e0b21f62909ca43c8ef06b0357412d6f8a92f96e1a205102753777fd25321a58fba3fb384eee114bd53ce6c06a1c22bab"
+}
+``` 
diff --git a/README.md b/README.md
index 5fcdaf7..619c984 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 - [NIP-01: Basic protocol flow description](01.md)
 - [NIP-02: Follow List](02.md)
 - [NIP-03: OpenTimestamps Attestations for Events](03.md)
-- [NIP-04: Encrypted Direct Message](04.md) --- **unrecommended**: deprecated in favor of [NIP-44](44.md)
+- [NIP-04: Encrypted Direct Message](04.md) --- **unrecommended**: deprecated in favor of [NIP-17](17.md)
 - [NIP-05: Mapping Nostr keys to DNS-based internet identifiers](05.md)
 - [NIP-06: Basic key derivation from mnemonic seed phrase](06.md)
 - [NIP-07: `window.nostr` capability for web browsers](07.md)
@@ -36,6 +36,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 - [NIP-13: Proof of Work](13.md)
 - [NIP-14: Subject tag in text events](14.md)
 - [NIP-15: Nostr Marketplace (for resilient marketplaces)](15.md)
+- [NIP-17: Private Direct Messages](17.md)
 - [NIP-18: Reposts](18.md)
 - [NIP-19: bech32-encoded entities](19.md)
 - [NIP-21: `nostr:` URI scheme](21.md)
@@ -99,6 +100,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `11`          | Group Thread               | [29](29.md)              |
 | `12`          | Group Thread Reply         | [29](29.md)              |
 | `13`          | Seal                       | [59](59.md)              |
+| `14`          | Direct Message             | [17](17.md)              |
 | `16`          | Generic Repost             | [18](18.md)              |
 | `40`          | Channel Creation           | [28](28.md)              |
 | `41`          | Channel Metadata           | [28](28.md)              |
@@ -138,6 +140,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `10009`       | User groups                | [51](51.md), [29](29.md) |
 | `10015`       | Interests list             | [51](51.md)              |
 | `10030`       | User emoji list            | [51](51.md)              |
+| `10050`       | Relay list to receive DMs  | [17](17.md)              |
 | `10096`       | File storage server list   | [96](96.md)              |
 | `13194`       | Wallet Info                | [47](47.md)              |
 | `21000`       | Lightning Pub RPC          | [Lightning.Pub][lnpub]   |
@@ -247,10 +250,10 @@ Please update these lists when proposing NIPs introducing new event kinds.
 | `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)                           |
+| `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)                           |
+| `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)                           |

From 7dfb11b435a903c703bc38216eca805cefa494d4 Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Wed, 24 Apr 2024 17:20:45 -0300
Subject: [PATCH 186/263] nip17: relay considerations and implementation
 details.

---
 17.md | 52 +++++++++++++++++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 21 deletions(-)

diff --git a/17.md b/17.md
index cc04a88..0f51367 100644
--- a/17.md
+++ b/17.md
@@ -6,7 +6,7 @@ Private Direct Messages
 
 `draft` `optional`
 
-This NIP defines an encrypted direct messaging scheme using [NIP-44](44.md) encryption and [NIP-59](59.md) seals and gift wraps. 
+This NIP defines an encrypted direct messaging scheme using [NIP-44](44.md) encryption and [NIP-59](59.md) seals and gift wraps.
 
 ## Direct Message Kind
 
@@ -18,7 +18,7 @@ Kind `14` is a chat message. `p` tags identify one or more receivers of the mess
   "pubkey": "<sender-pubkey>",
   "created_at": now(),
   "kind": 14,
-  "tags": [ 
+  "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
@@ -29,19 +29,19 @@ Kind `14` is a chat message. `p` tags identify one or more receivers of the mess
 }
 ```
 
-`.content` MUST be plain text. Fields `id` and `created_at` are required. 
+`.content` MUST be plain text. Fields `id` and `created_at` are required.
 
-Tags that mention, quote and assemble threading structures MUST follow [NIP-10](10.md). 
+Tags that mention, quote and assemble threading structures MUST follow [NIP-10](10.md).
 
 Kind `14`s MUST never be signed. If it is signed, the message might leak to relays and become **fully public**.
 
 ## Chat Rooms
 
-The set of `pubkey` + `p` tags defines a chat room. If a new `p` tag is added or a current one is removed, a new room is created with clean message history. 
+The set of `pubkey` + `p` tags defines a chat room. If a new `p` tag is added or a current one is removed, a new room is created with clean message history.
 
-Clients SHOULD render messages of the same room in a continuous thread. 
+Clients SHOULD render messages of the same room in a continuous thread.
 
-An optional `subject` tag defines the current name/topic of the conversation. Any member can change the topic by simply submitting a new `subject` to an existing `pubkey` + `p`-tags room. There is no need to send `subject` in every message. The newest `subject` in the thread is the subject of the conversation. 
+An optional `subject` tag defines the current name/topic of the conversation. Any member can change the topic by simply submitting a new `subject` to an existing `pubkey` + `p`-tags room. There is no need to send `subject` in every message. The newest `subject` in the thread is the subject of the conversation.
 
 ## Encrypting
 
@@ -51,7 +51,7 @@ Following [NIP-59](59.md), the **unsigned** `kind:14` chat message must be seale
 {
   "id": "<usual hash>",
   "pubkey": randomPublicKey,
-  "created_at": randomTimeUpTo2DaysInThePast(), 
+  "created_at": randomTimeUpTo2DaysInThePast(),
   "kind": 1059, // gift wrap
   "tags": [
     ["p", receiverPublicKey, "<relay-url>"] // receiver
@@ -60,7 +60,7 @@ Following [NIP-59](59.md), the **unsigned** `kind:14` chat message must be seale
     {
       "id": "<usual hash>",
       "pubkey": senderPublicKey,
-      "created_at": randomTimeUpTo2DaysInThePast(), 
+      "created_at": randomTimeUpTo2DaysInThePast(),
       "kind": 13, // seal
       "tags": [], // no tags
       "content": nip44Encrypt(unsignedKind14, senderPrivateKey, receiverPublicKey),
@@ -72,17 +72,17 @@ Following [NIP-59](59.md), the **unsigned** `kind:14` chat message must be seale
 }
 ```
 
-The encryption algorithm MUST use the latest version of [NIP-44](44.md). 
+The encryption algorithm MUST use the latest version of [NIP-44](44.md).
 
 Clients MUST verify if pubkey of the `kind:13` is the same pubkey on the `kind:14`, otherwise any sender can impersonate others by simply changing the pubkey on `kind:14`.
 
-Clients SHOULD randomize `created_at` in up to two days in the past in both the seal and the gift wrap to make sure grouping by `created_at` doesn't reveal any metadata. 
+Clients SHOULD randomize `created_at` in up to two days in the past in both the seal and the gift wrap to make sure grouping by `created_at` doesn't reveal any metadata.
 
 The gift wrap's `p`-tag can be the receiver's main pubkey or an alias key created to receive DMs without exposing the receiver's identity.
 
 Clients CAN offer disappearing messages by setting an `expiration` tag in the gift wrap of each receiver or by not generating a gift wrap to the sender's public key
 
-## Publishing 
+## Publishing
 
 Kind `10050` indicates the user's preferred relays to receive DMs. The event MUST include a list of `relay` tags with relay URIs.
 
@@ -98,16 +98,22 @@ Kind `10050` indicates the user's preferred relays to receive DMs. The event MUS
 }
 ```
 
-Clients SHOULD publish kind `14` events to the `10050`-listed relays, falling back to `read` relays of [NIP-65](65.md) if `kind:10050` is not available.
+Clients SHOULD publish kind `14` events to the `10050`-listed relays. If that is not found that indicates the user is not ready to receive messages under this NIP and clients shouldn't try.
 
-Clients SHOULD guide users to keep `kind:10050` lists small (1-3 relays) and SHOULD spread it to as many relays as viable. 
+## Relays
+
+It's advisable that relays do not serve `kind:14` to clients other than the ones tagged in them.
+
+It's advisable that users choose relays that conform to these practices.
+
+Clients SHOULD guide users to keep `kind:10050` lists small (1-3 relays) and SHOULD spread it to as many relays as viable.
 
 ## Benefits & Limitations
 
-This NIP offers the following privacy and security features: 
+This NIP offers the following privacy and security features:
 
 1. **No Metadata Leak**: Participant identities, each message's real date and time, event kinds, and other event tags are all hidden from the public. Senders and receivers cannot be linked with public information alone.
-2. **No Public Group Identifiers**: There is no public central queue, channel or otherwise converging identifier to correlate or count all messages in the same group. 
+2. **No Public Group Identifiers**: There is no public central queue, channel or otherwise converging identifier to correlate or count all messages in the same group.
 3. **No Moderation**: There are no group admins: no invitations or bans.
 4. **No Shared Secrets**: No secret must be known to all members that can leak or be mistakenly shared
 5. **Fully Recoverable**: Messages can be fully recoverable by any client with the user's private key
@@ -115,13 +121,17 @@ This NIP offers the following privacy and security features:
 7. **Uses Public Relays**: Messages can flow through public relays without loss of privacy. Private relays can increase privacy further, but they are not required.
 8. **Cold Storage**: Users can unilaterally opt-in to sharing their messages with a separate key that is exclusive for DM backup and recovery.
 
-The main limitation of this approach is having to send a separate encrypted event to each receiver. Group chats with more than 100 participants should find a more suitable messaging scheme. 
+The main limitation of this approach is having to send a separate encrypted event to each receiver. Group chats with more than 100 participants should find a more suitable messaging scheme.
 
-----
+## Implementation
+
+Clients implementing this NIP should by default only connect to the set of relays found in their `kind:10050` list. From that they should be able to load all messages both sent and received as well as get new live updates, making it for a very simple and lightweight implementation that should be fast.
+
+When sending a message to anyone, clients must then connect to the relays in the receiver's `kind:10050` and send the events there, but can disconnect right after unless more messages are expected to be sent (e.g. the chat tab is still selected). Clients should also send a copy of their outgoing messages to their own `kind:10050` relay set.
 
 ## Examples
 
-This example sends the message `Hola, que tal?` from `nsec1w8udu59ydjvedgs3yv5qccshcj8k05fh3l60k9x57asjrqdpa00qkmr89m` to `nsec12ywtkplvyq5t6twdqwwygavp5lm4fhuang89c943nf2z92eez43szvn4dt`. 
+This example sends the message `Hola, que tal?` from `nsec1w8udu59ydjvedgs3yv5qccshcj8k05fh3l60k9x57asjrqdpa00qkmr89m` to `nsec12ywtkplvyq5t6twdqwwygavp5lm4fhuang89c943nf2z92eez43szvn4dt`.
 
 The two final GiftWraps, one to the receiver and the other to the sender, are:
 
@@ -138,7 +148,7 @@ The two final GiftWraps, one to the receiver and the other to the sender, are:
    "sig":"a3c6ce632b145c0869423c1afaff4a6d764a9b64dedaf15f170b944ead67227518a72e455567ca1c2a0d187832cecbde7ed478395ec4c95dd3e71749ed66c480"
 }
 ```
- 
+
 ```json
 {
    "id":"162b0611a1911cfcb30f8a5502792b346e535a45658b3a31ae5c178465509721",
@@ -151,4 +161,4 @@ The two final GiftWraps, one to the receiver and the other to the sender, are:
    "content":"AsTClTzr0gzXXji7uye5UB6LYrx3HDjWGdkNaBS6BAX9CpHa+Vvtt5oI2xJrmWLen+Fo2NBOFazvl285Gb3HSM82gVycrzx1HUAaQDUG6HI7XBEGqBhQMUNwNMiN2dnilBMFC3Yc8ehCJT/gkbiNKOpwd2rFibMFRMDKai2mq2lBtPJF18oszKOjA+XlOJV8JRbmcAanTbEK5nA/GnG3eGUiUzhiYBoHomj3vztYYxc0QYHOx0WxiHY8dsC6jPsXC7f6k4P+Hv5ZiyTfzvjkSJOckel1lZuE5SfeZ0nduqTlxREGeBJ8amOykgEIKdH2VZBZB+qtOMc7ez9dz4wffGwBDA7912NFS2dPBr6txHNxBUkDZKFbuD5wijvonZDvfWq43tZspO4NutSokZB99uEiRH8NAUdGTiNb25m9JcDhVfdmABqTg5fIwwTwlem5aXIy8b66lmqqz2LBzJtnJDu36bDwkILph3kmvaKPD8qJXmPQ4yGpxIbYSTCohgt2/I0TKJNmqNvSN+IVoUuC7ZOfUV9lOV8Ri0AMfSr2YsdZ9ofV5o82ClZWlWiSWZwy6ypa7CuT1PEGHzywB4CZ5ucpO60Z7hnBQxHLiAQIO/QhiBp1rmrdQZFN6PUEjFDloykoeHe345Yqy9Ke95HIKUCS9yJurD+nZjjgOxZjoFCsB1hQAwINTIS3FbYOibZnQwv8PXvcSOqVZxC9U0+WuagK7IwxzhGZY3vLRrX01oujiRrevB4xbW7Oxi/Agp7CQGlJXCgmRE8Rhm+Vj2s+wc/4VLNZRHDcwtfejogjrjdi8p6nfUyqoQRRPARzRGUnnCbh+LqhigT6gQf3sVilnydMRScEc0/YYNLWnaw9nbyBa7wFBAiGbJwO40k39wj+xT6HTSbSUgFZzopxroO3f/o4+ubx2+IL3fkev22mEN38+dFmYF3zE+hpE7jVxrJpC3EP9PLoFgFPKCuctMnjXmeHoiGs756N5r1Mm1ffZu4H19MSuALJlxQR7VXE/LzxRXDuaB2u9days/6muP6gbGX1ASxbJd/ou8+viHmSC/ioHzNjItVCPaJjDyc6bv+gs1NPCt0qZ69G+JmgHW/PsMMeL4n5bh74g0fJSHqiI9ewEmOG/8bedSREv2XXtKV39STxPweceIOh0k23s3N6+wvuSUAJE7u1LkDo14cobtZ/MCw/QhimYPd1u5HnEJvRhPxz0nVPz0QqL/YQeOkAYk7uzgeb2yPzJ6DBtnTnGDkglekhVzQBFRJdk740LEj6swkJ",
    "sig":"c94e74533b482aa8eeeb54ae72a5303e0b21f62909ca43c8ef06b0357412d6f8a92f96e1a205102753777fd25321a58fba3fb384eee114bd53ce6c06a1c22bab"
 }
-``` 
+```

From 6071f3489eabe50eea748a2585a73c02a23d96cf Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 25 Apr 2024 06:38:36 -0500
Subject: [PATCH 187/263] NIP-46: "error" property of response is optional
 (#1195)

* NIP-46: clarify "error" property of response

* NIP-46: It's -> Its

* optionally

Co-authored-by: Asai Toshiya <to.asai.60@gmail.com>

---------

Co-authored-by: fiatjaf_ <fiatjaf@gmail.com>
Co-authored-by: Asai Toshiya <to.asai.60@gmail.com>
---
 46.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/46.md b/46.md
index 56b8402..d4b5728 100644
--- a/46.md
+++ b/46.md
@@ -153,13 +153,13 @@ The `content` field is a JSON-RPC-like message that is [NIP-04](https://github.c
 {
     "id": <request_id>,
     "result": <results_string>,
-    "error": <error_string>
+    "error": <optional_error_string>
 }
 ```
 
 - `id` is the request ID that this response is for.
 - `results` is a string of the result of the call (this can be either a string or a JSON stringified object)
-- `error` is an error in string form.
+- `error`, _optionally_, it is an error in string form, if any. Its presence indicates an error with the request.
 
 ### Auth Challenges
 

From 243b2865826edff22eebe5ec6e893c711802c7e5 Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Thu, 25 Apr 2024 18:03:38 -0300
Subject: [PATCH 188/263] nip46: signer should fill in pubkey, id and sig on
 sign_event.

---
 46.md | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/46.md b/46.md
index d4b5728..e0a5b2e 100644
--- a/46.md
+++ b/46.md
@@ -61,8 +61,9 @@ nostrconnect://<local-keypair-pubkey>?relay=<wss://relay-to-connect-on>&metadata
         "method": "sign_event",
         "params": [json_stringified(<{
             content: "Hello, I'm signing remotely",
-            pubkey: "fa984bd7dbb282f07e16e7ae87b26a2a7b9b90b7246a44771f0cf5ae58018f52",
-            // ...the rest of the event data
+            kind: 1,
+            tags: [],
+            created_at: 1714078911
         }>)]
     }),
     "tags": [["p", "fa984bd7dbb282f07e16e7ae87b26a2a7b9b90b7246a44771f0cf5ae58018f52"]], // p-tags the remote user pubkey
@@ -118,21 +119,21 @@ The `content` field is a JSON-RPC-like message that is [NIP-04](https://github.c
 
 Each of the following are methods that the client sends to the remote signer.
 
-| Command                  | Params                                            | Result                                                                 |
-| ------------------------ | ------------------------------------------------- | ---------------------------------------------------------------------- |
-| `connect`                | `[<remote_user_pubkey>, <optional_secret>, <optional_requested_permissions>]`       | "ack"                                                                  |
-| `sign_event`             | `[<json_stringified_event_to_sign>]`              | `json_stringified(<signed_event>)`                                     |
-| `ping`                   | `[]`                                              | "pong"                                                                 |
-| `get_relays`             | `[]`                                              | `json_stringified({<relay_url>: {read: <boolean>, write: <boolean>}})` |
-| `get_public_key`         | `[]`                                              | `<hex-pubkey>`                                                         |
-| `nip04_encrypt`          | `[<third_party_pubkey>, <plaintext_to_encrypt>]`  | `<nip04_ciphertext>`                                                   |
-| `nip04_decrypt`          | `[<third_party_pubkey>, <nip04_ciphertext_to_decrypt>]` | `<plaintext>`                                                    |
-| `nip44_encrypt`          | `[<third_party_pubkey>, <plaintext_to_encrypt>]`  | `<nip44_ciphertext>`                                                   |
-| `nip44_decrypt`          | `[<third_party_pubkey>, <nip44_ciphertext_to_decrypt>]` | `<plaintext>`                                                    |
+| Command                  | Params                                                                        | Result                                                                 |
+| ------------------------ | -------------------------------------------------                             | ---------------------------------------------------------------------- |
+| `connect`                | `[<remote_user_pubkey>, <optional_secret>, <optional_requested_permissions>]` | "ack"                                                                  |
+| `sign_event`             | `[<{kind, content, tags, created_at}>]`                                       | `json_stringified(<signed_event>)`                                     |
+| `ping`                   | `[]`                                                                          | "pong"                                                                 |
+| `get_relays`             | `[]`                                                                          | `json_stringified({<relay_url>: {read: <boolean>, write: <boolean>}})` |
+| `get_public_key`         | `[]`                                                                          | `<hex-pubkey>`                                                         |
+| `nip04_encrypt`          | `[<third_party_pubkey>, <plaintext_to_encrypt>]`                              | `<nip04_ciphertext>`                                                   |
+| `nip04_decrypt`          | `[<third_party_pubkey>, <nip04_ciphertext_to_decrypt>]`                       | `<plaintext>`                                                          |
+| `nip44_encrypt`          | `[<third_party_pubkey>, <plaintext_to_encrypt>]`                              | `<nip44_ciphertext>`                                                   |
+| `nip44_decrypt`          | `[<third_party_pubkey>, <nip44_ciphertext_to_decrypt>]`                       | `<plaintext>`                                                          |
 
 ### Requested permissions
 
-The `connect` method may be provided with `optional_requested_permissions` for user convenience. The permissions are a comma-separated list of `method[:params]`, i.e. `nip04_encrypt,sign_event:4` meaning permissions to call `nip04_encrypt` and to call `sign_event` with `kind:4`. Optional parameter for `sign_event` is the kind number, parameters for other methods are to be defined later. 
+The `connect` method may be provided with `optional_requested_permissions` for user convenience. The permissions are a comma-separated list of `method[:params]`, i.e. `nip04_encrypt,sign_event:4` meaning permissions to call `nip04_encrypt` and to call `sign_event` with `kind:4`. Optional parameter for `sign_event` is the kind number, parameters for other methods are to be defined later.
 
 ## Response Events `kind:24133`
 

From b21e996a89a9fe2acb09136792c75b1dd8eb59f8 Mon Sep 17 00:00:00 2001
From: greenart7c3 <greenart7c3@proton.me>
Date: Mon, 29 Apr 2024 08:55:55 -0300
Subject: [PATCH 189/263] Change web app methods do use nostrsigner: instead of
 intent:

---
 100.md | 30 ++++++++----------------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/100.md b/100.md
index 06d6b35..99feebf 100644
--- a/100.md
+++ b/100.md
@@ -432,63 +432,49 @@ Android intents and browsers url has limitations, so if you are using the return
   - params:
 
     ```js
-    const intent = `intent:#Intent;scheme=nostrsigner;S.compressionType=none;S.returnType=signature;S.type=get_public_key;S.callbackUrl=https://example.com/?event=;end`;
-
-    window.href = intent;
+    window.href = `nostrsigner:?compressionType=none;returnType=signature;type=get_public_key;callbackUrl=https://example.com/?event=`;
     ```
 
 - **sign_event**
   - params:
 
     ```js
-    const intent = `intent:${eventJson}#Intent;scheme=nostrsigner;S.compressionType=none;S.returnType=signature;S.type=sign_event;S.callbackUrl=https://example.com/?event=;end`;
-
-    window.href = intent;
+    window.href = `nostrsigner:${eventJson}?compressionType=none;returnType=signature;type=sign_event;callbackUrl=https://example.com/?event=`;
     ``` 
 
 - **nip04_encrypt**
   - params:
 
     ```js
-    const intent = `intent:${plainText}#Intent;scheme=nostrsigner;S.pubKey=${hex_pub_key};S.compressionType=none;S.returnType=signature;S.type=nip04_encrypt;S.callbackUrl=https://example.com/?event=;end`;
-
-    window.href = intent;
+    window.href = `nostrsigner:${plainText}?pubKey=${hex_pub_key};compressionType=none;returnType=signature;type=nip04_encrypt;callbackUrl=https://example.com/?event=`;
     ``` 
 
 - **nip44_encrypt**
   - params:
 
     ```js
-    const intent = `intent:${plainText}#Intent;scheme=nostrsigner;S.pubKey=${hex_pub_key};S.compressionType=none;S.returnType=signature;S.type=nip44_encrypt;S.callbackUrl=https://example.com/?event=;end`;
-
-    window.href = intent;
+    window.href = `nostrsigner:${plainText}?pubKey=${hex_pub_key};compressionType=none;returnType=signature;type=nip44_encrypt;callbackUrl=https://example.com/?event=`;
     ```   
 
 - **nip04_decrypt**
   - params:
 
     ```js
-    const intent = `intent:${encryptedText}#Intent;scheme=nostrsigner;S.pubKey=${hex_pub_key};S.compressionType=none;S.returnType=signature;S.type=nip04_decrypt;S.callbackUrl=https://example.com/?event=;end`;
-
-    window.href = intent;
+    window.href = `nostrsigner:${encryptedText}?pubKey=${hex_pub_key};compressionType=none;returnType=signature;type=nip04_decrypt;callbackUrl=https://example.com/?event=`;
     ```     
 
 - **nip44_decrypt**
   - params:
 
     ```js
-    const intent = `intent:${encryptedText}#Intent;scheme=nostrsigner;S.pubKey=${hex_pub_key};S.compressionType=none;S.returnType=signature;S.type=nip44_decrypt;S.callbackUrl=https://example.com/?event=;end`;
-
-    window.href = intent;
+    window.href = `nostrsigner:${encryptedText}?pubKey=${hex_pub_key};compressionType=none;returnType=signature;type=nip44_decrypt;callbackUrl=https://example.com/?event=`;
     ```     
 
 - **decrypt_zap_event**
   - params:
 
     ```js
-    const intent = `intent:${eventJson}#Intent;scheme=nostrsigner;S.compressionType=none;S.returnType=signature;S.type=decrypt_zap_event;S.callbackUrl=https://example.com/?event=;end`;
-
-    window.href = intent;
+    window.href = `nostrsigner:${eventJson}?compressionType=none;returnType=signature;type=decrypt_zap_event;callbackUrl=https://example.com/?event=`;
     ```          
 
 ## Example
@@ -518,7 +504,7 @@ Android intents and browsers url has limitations, so if you are using the return
             }
             let encodedJson = encodeURIComponent(JSON.stringify(json))
             var newAnchor = document.createElement("a");
-            newAnchor.href = `intent:${encodedJson}#Intent;scheme=nostrsigner;S.compressionType=none;S.returnType=signature;S.type=sign_event;S.callbackUrl=https://example.com/?event=;end`;
+            newAnchor.href = `nostrsigner:${encodedJson}?compressionType=none;returnType=signature;type=sign_event;callbackUrl=https://example.com/?event=`;
             newAnchor.textContent = "Open External Signer";
             document.body.appendChild(newAnchor)
         }

From ff24a56355471761d89399167a75a74e3bbb5677 Mon Sep 17 00:00:00 2001
From: greenart7c3 <greenart7c3@proton.me>
Date: Mon, 29 Apr 2024 09:25:04 -0300
Subject: [PATCH 190/263] ; -> &

---
 100.md | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/100.md b/100.md
index 571d1eb..4a304c3 100644
--- a/100.md
+++ b/100.md
@@ -456,49 +456,49 @@ Android intents and browser urls have limitations, so if you are using the `retu
   - params:
 
     ```js
-    window.href = `nostrsigner:?compressionType=none;returnType=signature;type=get_public_key;callbackUrl=https://example.com/?event=`;
+    window.href = `nostrsigner:?compressionType=none&returnType=signature&type=get_public_key&callbackUrl=https://example.com/?event=`;
     ```
 
 - **sign_event**
   - params:
 
     ```js
-    window.href = `nostrsigner:${eventJson}?compressionType=none;returnType=signature;type=sign_event;callbackUrl=https://example.com/?event=`;
+    window.href = `nostrsigner:${eventJson}?compressionType=none&returnType=signature&type=sign_event&callbackUrl=https://example.com/?event=`;
     ``` 
 
 - **nip04_encrypt**
   - 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=`;
     ```     
 
 - **decrypt_zap_event**
   - params:
 
     ```js
-    window.href = `nostrsigner:${eventJson}?compressionType=none;returnType=signature;type=decrypt_zap_event;callbackUrl=https://example.com/?event=`;
+    window.href = `nostrsigner:${eventJson}?compressionType=none&returnType=signature&type=decrypt_zap_event&callbackUrl=https://example.com/?event=`;
     ```          
 
 ## Example
@@ -528,7 +528,7 @@ Android intents and browser urls have limitations, so if you are using the `retu
             }
             let encodedJson = encodeURIComponent(JSON.stringify(json))
             var newAnchor = document.createElement("a");
-            newAnchor.href = `nostrsigner:${encodedJson}?compressionType=none;returnType=signature;type=sign_event;callbackUrl=https://example.com/?event=`;
+            newAnchor.href = `nostrsigner:${encodedJson}?compressionType=none&returnType=signature&type=sign_event&callbackUrl=https://example.com/?event=`;
             newAnchor.textContent = "Open External Signer";
             document.body.appendChild(newAnchor)
         }

From bad8826211ca2eb8660e4bd68b292d14616d3669 Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Wed, 24 Apr 2024 18:44:36 -0300
Subject: [PATCH 191/263] nip34: simplify `r` tag for earliest unique commit.

---
 34.md | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/34.md b/34.md
index f72fcf2..03ee039 100644
--- a/34.md
+++ b/34.md
@@ -23,8 +23,7 @@ Git repositories are hosted in Git-enabled servers, but their existence can be a
     ["web", "<url for browsing>", ...], // a webpage url, if the git server being used provides such a thing
     ["clone", "<url for git-cloning>", ...], // a url to be given to `git clone` so anyone can clone it
     ["relays", "<relay-url>", ...] // relays that this repository will monitor for patches and issues
-    ["earliest-unique-commit", "<commit-id>"] // usually root commit but a recent commit for forks
-    ["r", "<earliest-unique-commit-id>"] // so clients can subscribe to all events related to a local git repo
+    ["r", "<earliest-unique-commit-id>", "euc"]
     ["maintainers", "<other-recognized-maintainer>", ...]
   ]
 }
@@ -32,13 +31,15 @@ Git repositories are hosted in Git-enabled servers, but their existence can be a
 
 The tags `web`, `clone`, `relays`, `maintainers` can have multiple values.
 
+The `r` tag annotated with the `"euc"` marker should be the commit ID of the earliest unique commit of this repo, made to identify it among forks and group it with other repositories hosted elsewhere that may represent essentially the same project. In most cases it will be the root commit of a repository. In case of a permanent fork between two projects, then the first commit after the fork should be used.
+
 Except `d`, all tags are optional.
 
 ## Patches
 
 Patches can be sent by anyone to any repository. Patches to a specific repository SHOULD be sent to the relays specified in that repository's announcement event's `"relays"` tag. Patch events SHOULD include an `a` tag pointing to that repository's announcement address.
 
-Patches in a patch set SHOULD include a NIP-10 `e` `reply` tag pointing to the previous patch. 
+Patches in a patch set SHOULD include a NIP-10 `e` `reply` tag pointing to the previous patch.
 
 The first patch revision in a patch revision SHOULD include a NIP-10 `e` `reply` to the original root patch.
 
@@ -132,7 +133,7 @@ Root Patches and Issues have a Status that defaults to 'Open' and can be set by
     ["e", "<applied-or-merged-patch-event-id>", "", "mention"], // for each
     // when merged
     ["merge-commit", "<merge-commit-id>"]
-    ["r", "<merge-commit-id>"] 
+    ["r", "<merge-commit-id>"]
     // when applied
     ["applied-as-commits", "<commit-id-in-master-branch>", ...]
     ["r", "<applied-commit-id>"] // for each
@@ -142,7 +143,7 @@ Root Patches and Issues have a Status that defaults to 'Open' and can be set by
 
 The Status event with the largest created_at date is valid.
 
-The Status of a patch-revision defaults to either that of the root-patch, or `1632` (Closed) if the root-patch's Status is `1631` and the patch-revision isn't tagged in the `1631` event. 
+The Status of a patch-revision defaults to either that of the root-patch, or `1632` (Closed) if the root-patch's Status is `1631` and the patch-revision isn't tagged in the `1631` event.
 
 
 ## Possible things to be added later

From 88246c27414d11983dced414462b2be2d010fad8 Mon Sep 17 00:00:00 2001
From: Leo Wandersleb <leo@leowandersleb.de>
Date: Wed, 24 Apr 2024 12:18:27 -0400
Subject: [PATCH 192/263] Require tags to have at least one string

fixes #1193
---
 01.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/01.md b/01.md
index a91febc..8be85bc 100644
--- a/01.md
+++ b/01.md
@@ -56,7 +56,7 @@ To prevent implementation differences from creating a different event ID for the
 
 ### Tags
 
-Each tag is an array of strings of arbitrary size, with some conventions around them. Take a look at the example below:
+Each tag is an array of one or more strings, with some conventions around them. Take a look at the example below:
 
 ```jsonc
 {

From ef5eacd48904a5cee0b4e51c4b7d46a9606a7351 Mon Sep 17 00:00:00 2001
From: Lucas Nuic <165694895+lucasnuic@users.noreply.github.com>
Date: Wed, 1 May 2024 22:48:11 -0300
Subject: [PATCH 193/263] =?UTF-8?q?=E2=80=9Cdecentralized=20reporting=20of?=
 =?UTF-8?q?=20digital=20threats=20such=20as=20malware=E2=80=9D=20in=20nost?=
 =?UTF-8?q?r?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I added new tags for reporting bad things like malware
---
 56.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/56.md b/56.md
index 3209b80..190e0b4 100644
--- a/56.md
+++ b/56.md
@@ -26,6 +26,7 @@ A `report type` string MUST be included as the 3rd entry to the `e` or `p` tag
 being reported, which consists of the following report types:
 
 - `nudity` - depictions of nudity, porn, etc.
+- `malware` - depictions of malware, virus, Trojan Horse, worm, robot, spyware, adware, back door, ransomware, rootkit, kidnapper, etc.
 - `profanity` - profanity, hateful speech, etc.
 - `illegal` - something which may be illegal in some jurisdiction
 - `spam` - spam

From 2b490b168e4b51e1c441d985ca89e5e1f426a610 Mon Sep 17 00:00:00 2001
From: Lucas Nuic <165694895+lucasnuic@users.noreply.github.com>
Date: Wed, 1 May 2024 23:29:14 -0300
Subject: [PATCH 194/263] fixed typo

---
 56.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/56.md b/56.md
index 190e0b4..fc8d898 100644
--- a/56.md
+++ b/56.md
@@ -26,7 +26,7 @@ A `report type` string MUST be included as the 3rd entry to the `e` or `p` tag
 being reported, which consists of the following report types:
 
 - `nudity` - depictions of nudity, porn, etc.
-- `malware` - depictions of malware, virus, Trojan Horse, worm, robot, spyware, adware, back door, ransomware, rootkit, kidnapper, etc.
+- `malware` - virus, trojan horse, worm, robot, spyware, adware, back door, ransomware, rootkit, kidnapper, etc.
 - `profanity` - profanity, hateful speech, etc.
 - `illegal` - something which may be illegal in some jurisdiction
 - `spam` - spam

From 218fbb1cc7ac900fd256f666cb6add590cabb24a Mon Sep 17 00:00:00 2001
From: fiatjaf_ <fiatjaf@gmail.com>
Date: Thu, 2 May 2024 11:04:55 -0300
Subject: [PATCH 195/263] NIP-54: decentralized wikis (#787)

* draft of NIP-34: decentralized wikis.

* add merge requests.

* add merge request flow

* update nip number

---------

Co-authored-by: Pablo Fernandez <p@f7z.io>
---
 51.md     |  26 +++++++-------
 54.md     | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 README.md |   2 ++
 3 files changed, 122 insertions(+), 12 deletions(-)
 create mode 100644 54.md

diff --git a/51.md b/51.md
index 95acbc8..fb40b26 100644
--- a/51.md
+++ b/51.md
@@ -20,18 +20,20 @@ Standard lists use non-parameterized replaceable events, meaning users may only
 
 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.
 
-| name           | kind  | description                                                 | expected tag items                                                                |
-| ---            | ---   | ---                                                         | ---                                                                               |
-| Mute list      | 10000 | things the user doesn't want to see in their feeds          | `"p"` (pubkeys), `"t"` (hashtags), `"word"` (lowercase string), `"e"` (threads)   |
-| Pinned notes   | 10001 | events the user intends to showcase in their profile page   | `"e"` (kind:1 notes)                                                              |
-| Bookmarks      | 10003 | uncategorized, "global" list of things a user wants to save | `"e"` (kind:1 notes), `"a"` (kind:30023 articles), `"t"` (hashtags), `"r"` (URLs) |
-| Communities    | 10004 | [NIP-72](72.md) communities the user belongs to             | `"a"` (kind:34550 community definitions)                                          |
-| Public chats   | 10005 | [NIP-28](28.md) chat channels the user is in                | `"e"` (kind:40 channel definitions)                                               |
-| Blocked relays | 10006 | relays clients should never connect to                      | `"relay"` (relay URLs)                                                            |
-| Search relays  | 10007 | relays clients should use when performing search queries    | `"relay"` (relay URLs)                                                            |
-| Simple groups  | 10009 | [NIP-29](29.md) groups the user is in                       | `"group"` ([NIP-29](29.md) group ids + mandatory relay URL)                       |
-| Interests      | 10015 | topics a user may be interested in and pointers             | `"t"` (hashtags) and `"a"` (kind:30015 interest set)                              |
-| Emojis         | 10030 | user preferred emojis and pointers to emoji sets            | `"emoji"` (see [NIP-30](30.md)) and `"a"` (kind:30030 emoji set)                  |
+| name              | kind  | description                                                 | expected tag items                                                                |
+| ---               | ---   | ---                                                         | ---                                                                               |
+| Mute list         | 10000 | things the user doesn't want to see in their feeds          | `"p"` (pubkeys), `"t"` (hashtags), `"word"` (lowercase string), `"e"` (threads)   |
+| Pinned notes      | 10001 | events the user intends to showcase in their profile page   | `"e"` (kind:1 notes)                                                              |
+| Bookmarks         | 10003 | uncategorized, "global" list of things a user wants to save | `"e"` (kind:1 notes), `"a"` (kind:30023 articles), `"t"` (hashtags), `"r"` (URLs) |
+| Communities       | 10004 | [NIP-72](72.md) communities the user belongs to             | `"a"` (kind:34550 community definitions)                                          |
+| Public chats      | 10005 | [NIP-28](28.md) chat channels the user is in                | `"e"` (kind:40 channel definitions)                                               |
+| Blocked relays    | 10006 | relays clients should never connect to                      | `"relay"` (relay URLs)                                                            |
+| Search relays     | 10007 | relays clients should use when performing search queries    | `"relay"` (relay URLs)                                                            |
+| Simple groups     | 10009 | [NIP-29](29.md) groups the user is in                       | `"group"` ([NIP-29](29.md) group ids + mandatory relay URL)                       |
+| Interests         | 10015 | topics a user may be interested in and pointers             | `"t"` (hashtags) and `"a"` (kind:30015 interest set)                              |
+| Emojis            | 10030 | user preferred emojis and pointers to emoji sets            | `"emoji"` (see [NIP-30](30.md)) and `"a"` (kind:30030 emoji set)                  |
+| Good wiki authors | 10101 | [NIP-54](54.md) user recommended wiki authors               | `"p"` (pubkeys)                                                                   |
+| Good wiki relays  | 10102 | [NIP-54](54.md) relays deemed to only host useful articles  | `"relay"` (relay URLs)                                                            |
 
 ## Sets
 
diff --git a/54.md b/54.md
new file mode 100644
index 0000000..9063ca9
--- /dev/null
+++ b/54.md
@@ -0,0 +1,106 @@
+NIP-54
+======
+
+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.
+
+Articles are identified by lowercase, normalized ascii `d` tags.
+
+### Articles
+```js
+{
+   "content": "A wiki is a hypertext publication collaboratively edited and managed by its own audience.",
+   "tags": [
+       [ "d", "wiki" ],
+       [ "title", "Wiki" ],
+   ]
+}
+```
+
+[INSERT NORMALIZATION EXAMPLES]
+
+The content should be Markdown, following the same rules as of [NIP-23](23.md), although it takes some extra (optional) metadata 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.
+
+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.
+
+### 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.
+
+[INSERT EVENT EXAMPLE]
+
+### Redirects
+
+Event `kind:30819` is also defined to stand for "wiki redirects", i.e. if one thinks `Shell structure` should redirect to `Thin-shell structure` they can issue one of these events instead of replicating the content. These events can be used for automatically redirecting between articles on a client, but also for generating crowdsourced "disambiguation" pages ([common in Wikipedia](https://en.wikipedia.org/wiki/Help:Disambiguation)).
+
+[INSERT EVENT EXAMPLE]
+
+How to decide what article to display
+-------------------------------------
+
+As there could be many articles for each given name, some kind of prioritization must be done by clients. Criteria for this should vary between users and clients, but some means that can be used are described below:
+
+### Reactions
+
+[NIP-25](25.md) reactions are very simple and can be used to create a simple web-of-trust between wiki article writers and their content. While just counting a raw number of "likes" is unproductive, reacting to any wiki article event with a `+` can be interpreted as a recommendation for that article specifically and a partial recommendation of the author of that article. When 2 or 3-level deep recommendations are followed, suddenly a big part of all the articles may have some form of tagging.
+
+### Relays
+
+[NIP-51](51.md) lists of relays can be created with the kind 10102 and then used by wiki clients in order to determine where to query articles first and to rank these differently in relation to other events fetched from other relays.
+
+### Contact lists
+
+[NIP-02](02.md) contact lists can form the basis of a recommendation system that is then expanded with relay lists and reaction lists through nested queries. These lists form a good starting point only because they are so widespread.
+
+### Wiki-related contact lists
+
+[NIP-51](51.md) lists can also be used to create a list of users that are trusted only in the context of wiki authorship or wiki curationship.
+
+Forks
+---------
+Wiki-events can tag other wiki-events with a `fork` marker to specify that this event came from a different version. Both `a` and `e` tags SHOULD be used and have the `fork` marker applied, to identify the exact version it was forked from.
+
+Deference
+---------
+Wiki-events can tag other wiki-events with a `defer` marker to indicate that it considers someone else's entry as a "better" version of itself. If using a `defer` marker both `a` and `e` tags SHOULD be used.
+
+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 indepedent 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?
+-------------
+
+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.
+
+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.
+
+# 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.
+
+```js
+{
+   "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>' ],
+       [ "p", "<destination-pubkey>" ],
+       [ "e", "<version-to-be-merged>", "<relay-url>", "source" ]
+   ]
+}
+```
+
+`.content`: an optional explanation detailing why this merge is being requested.
+`a` tag: tag of the article which should be modified (i.e. the target of this merge request).
+`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 `-`
diff --git a/README.md b/README.md
index 619c984..b3736ea 100644
--- a/README.md
+++ b/README.md
@@ -66,6 +66,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 - [NIP-51: Lists](51.md)
 - [NIP-52: Calendar Events](52.md)
 - [NIP-53: Live Activities](53.md)
+- [NIP-54: Wiki](54.md)
 - [NIP-56: Reporting](56.md)
 - [NIP-57: Lightning Zaps](57.md)
 - [NIP-58: Badges](58.md)
@@ -171,6 +172,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `30402`       | Classified Listing         | [99](99.md)              |
 | `30403`       | Draft Classified Listing   | [99](99.md)              |
 | `30617`       | Repository announcements   | [34](34.md)              |
+| `30818`       | Wiki article               | [54](54.md)              |
 | `31922`       | Date-Based Calendar Event  | [52](52.md)              |
 | `31923`       | Time-Based Calendar Event  | [52](52.md)              |
 | `31924`       | Calendar                   | [52](52.md)              |

From dcb5d0f18d6b0c60bda9abc79c6cca99a4d86177 Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Thu, 2 May 2024 11:32:58 -0300
Subject: [PATCH 196/263] small fixes on nip 54.

---
 54.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/54.md b/54.md
index 9063ca9..7870330 100644
--- a/54.md
+++ b/54.md
@@ -3,6 +3,7 @@ NIP-54
 
 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.
@@ -10,7 +11,7 @@ This NIP defines `kind:30818` (a _parameterized replaceable event_) for long-for
 Articles are identified by lowercase, normalized ascii `d` tags.
 
 ### Articles
-```js
+```jsonc
 {
    "content": "A wiki is a hypertext publication collaboratively edited and managed by its own audience.",
    "tags": [
@@ -85,7 +86,7 @@ On the other hand, Markdown has proven to work well for small scale wikis and on
 # 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.
 
-```js
+```jsonc
 {
    "content": "I added information about how to make hot ice-creams",
    "kind": 818,

From 3834c6b60474a677b53847743212df27710e64ec Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Sat, 4 May 2024 16:10:13 -0400
Subject: [PATCH 197/263] Simplifying reactions

---
 25.md | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/25.md b/25.md
index 3b4aa59..bdee066 100644
--- a/25.md
+++ b/25.md
@@ -25,14 +25,13 @@ consider it a "+".
 Tags
 ----
 
-The reaction event SHOULD include `e` and `p` tags from the note the user is
-reacting to. This allows users to be notified of reactions to posts they were
-mentioned in. Including the `e` tags enables clients to pull all the reactions
-associated with individual posts or all the posts in a thread.
+The reaction event SHOULD include `e` and `p` tags pointing to the note the user is
+reacting to. The `p` tag allows authors to be notified. The `e` tags enables clients 
+to pull all the reactions to individual posts.
 
-The last `e` tag MUST be the `id` of the note that is being reacted to. 
+The `e` tag MUST be the `id` of the note that is being reacted to. 
 
-The last `p` tag MUST be the `pubkey` of the event being reacted to.
+The `p` tag MUST be the `pubkey` of the event being reacted to.
 
 The reaction event MAY include a `k` tag with the stringified kind number
 of the reacted event as its value.
@@ -41,9 +40,6 @@ Example code
 
 ```swift
 func make_like_event(pubkey: String, privkey: String, liked: NostrEvent) -> NostrEvent {
-    var tags: [[String]] = liked.tags.filter { 
-    	tag in tag.count >= 2 && (tag[0] == "e" || tag[0] == "p") 
-    }
     tags.append(["e", liked.id])
     tags.append(["p", liked.pubkey])
     tags.append(["k", liked.kind])

From 4bcf91944a9e53680cc928424e7af145242b1a39 Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Sat, 4 May 2024 16:35:39 -0400
Subject: [PATCH 198/263] adds a tags.

---
 25.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/25.md b/25.md
index bdee066..7cc96b5 100644
--- a/25.md
+++ b/25.md
@@ -25,12 +25,15 @@ consider it a "+".
 Tags
 ----
 
-The reaction event SHOULD include `e` and `p` tags pointing to the note the user is
+The reaction event SHOULD include `a`, `e` and `p` tags pointing to the note the user is
 reacting to. The `p` tag allows authors to be notified. The `e` tags enables clients 
-to pull all the reactions to individual posts.
+to pull all the reactions to individual events and `a` tags enables clients to seek reactions
+for all versions of a replaceable event. 
 
 The `e` tag MUST be the `id` of the note that is being reacted to. 
 
+The `a` tag MUST contain the coordinates (`kind:pubkey:d-tag`) of the replaceable being reacted to. 
+
 The `p` tag MUST be the `pubkey` of the event being reacted to.
 
 The reaction event MAY include a `k` tag with the stringified kind number

From c1360c4f0b111143747bad6226df6f00499f5cfe Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Sat, 4 May 2024 23:34:37 -0300
Subject: [PATCH 199/263] nip54: add normalization rules.

---
 54.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/54.md b/54.md
index 7870330..c481eb6 100644
--- a/54.md
+++ b/54.md
@@ -21,7 +21,12 @@ Articles are identified by lowercase, normalized ascii `d` tags.
 }
 ```
 
-[INSERT NORMALIZATION EXAMPLES]
+### `d` tag normalization rules
+
+- Any non-letter character MUST be converted to a `-`.
+- All letters MUST be converted to lowercase.
+
+### Content rules
 
 The content should be Markdown, following the same rules as of [NIP-23](23.md), although it takes some extra (optional) metadata tags:
 

From 4fa65b81cede9eaf8375d4f92bc80cf298190e0c Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Sat, 4 May 2024 23:36:48 -0300
Subject: [PATCH 200/263] nip54: fix json indentation.

---
 54.md | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/54.md b/54.md
index c481eb6..2090182 100644
--- a/54.md
+++ b/54.md
@@ -13,11 +13,11 @@ Articles are identified by lowercase, normalized ascii `d` tags.
 ### Articles
 ```jsonc
 {
-   "content": "A wiki is a hypertext publication collaboratively edited and managed by its own audience.",
-   "tags": [
-       [ "d", "wiki" ],
-       [ "title", "Wiki" ],
-   ]
+  "content": "A wiki is a hypertext publication collaboratively edited and managed by its own audience.",
+  "tags": [
+    ["d", "wiki"],
+    ["title", "Wiki"],
+  ]
 }
 ```
 
@@ -93,14 +93,14 @@ Users can request other users to get their entries merged into someone else's en
 
 ```jsonc
 {
-   "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>' ],
-       [ "p", "<destination-pubkey>" ],
-       [ "e", "<version-to-be-merged>", "<relay-url>", "source" ]
-   ]
+  "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>' ],
+    [ "p", "<destination-pubkey>" ],
+    [ "e", "<version-to-be-merged>", "<relay-url>", "source" ]
+  ]
 }
 ```
 

From cb9bddb8dfd11972286215d9bdee7434764ccf7b Mon Sep 17 00:00:00 2001
From: Adam Shannon <adamkshannon@gmail.com>
Date: Sat, 11 May 2024 11:52:32 -0500
Subject: [PATCH 201/263] all: minor spelling fixes

---
 34.md | 2 +-
 46.md | 2 +-
 54.md | 2 +-
 72.md | 2 +-
 90.md | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/34.md b/34.md
index 03ee039..fcc2cec 100644
--- a/34.md
+++ b/34.md
@@ -125,7 +125,7 @@ Root Patches and Issues have a Status that defaults to 'Open' and can be set by
     ["p", "<root-event-author>"],
     ["p", "<revision-author>"],
 
-    // optional for improved subscription filter efficency
+    // optional for improved subscription filter efficiency
     ["a", "30617:<base-repo-owner-pubkey>:<base-repo-id>", "<relay-url>"],
     ["r", "<earliest-unique-commit-id-of-repo>"]
 
diff --git a/46.md b/46.md
index e0a5b2e..1528116 100644
--- a/46.md
+++ b/46.md
@@ -208,7 +208,7 @@ When the user types a NIP-05 the client:
 
 #### Remote signer discovery via NIP-89
 
-In this last case, most often used to fascilitate an OAuth-like signin flow, the client first looks for remote signers that have announced themselves via NIP-89 application handler events.
+In this last case, most often used to facilitate an OAuth-like signin flow, the client first looks for remote signers that have announced themselves via NIP-89 application handler events.
 
 First the client will query for `kind: 31990` events that have a `k` tag of `24133`.
 
diff --git a/54.md b/54.md
index 2090182..8823af9 100644
--- a/54.md
+++ b/54.md
@@ -79,7 +79,7 @@ Wiki-events can tag other wiki-events with a `defer` marker to indicate that it
 
 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 indepedent 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.
+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?
 -------------
diff --git a/72.md b/72.md
index 4bafce0..5a8be0a 100644
--- a/72.md
+++ b/72.md
@@ -76,7 +76,7 @@ The post-approval event MUST include `a` tags of the communities the moderator i
 
 It's recommended that multiple moderators approve posts to avoid deleting them from the community when a moderator is removed from the owner's list. In case the full list of moderators must be rotated, the new moderator set must sign new approvals for posts in the past or the community will restart. The owner can also periodically copy and re-sign of each moderator's approval events to make sure posts don't disappear with moderators.
 
-Post Approvals of replaceable events can be created in three ways: (i) by tagging the replaceable event as an `e` tag if moderators want to approve each individual change to the repleceable event; (ii) by tagging the replaceable event as an `a` tag if the moderator authorizes the replaceable event author to make changes without additional approvals and (iii) by tagging the replaceable event with both its `e` and `a` tag which empowers clients to display the original and updated versions of the event, with appropriate remarks in the UI. Since relays are instructed to delete old versions of a replaceable event, the `.content` of an `e`-approval MUST have the specific version of the event or Clients might not be able to find that version of the content anywhere.
+Post Approvals of replaceable events can be created in three ways: (i) by tagging the replaceable event as an `e` tag if moderators want to approve each individual change to the replaceable event; (ii) by tagging the replaceable event as an `a` tag if the moderator authorizes the replaceable event author to make changes without additional approvals and (iii) by tagging the replaceable event with both its `e` and `a` tag which empowers clients to display the original and updated versions of the event, with appropriate remarks in the UI. Since relays are instructed to delete old versions of a replaceable event, the `.content` of an `e`-approval MUST have the specific version of the event or Clients might not be able to find that version of the content anywhere.
 
 Clients SHOULD evaluate any non-`34550:*` `a` tag as posts to be included in all `34550:*` `a` tags.
 
diff --git a/90.md b/90.md
index 241eb38..2b499a8 100644
--- a/90.md
+++ b/90.md
@@ -199,7 +199,7 @@ Some service providers might choose to submit a `payment-required` as the first
 It's not up to this NIP to define how individual vending machines should choose to run their business.
 
 # Cancellation
-A job request might be cancelled by publishing a `kind:5` delete request event tagging the job request event.
+A job request might be canceled by publishing a `kind:5` delete request event tagging the job request event.
 
 # Appendix 1: Job chaining
 A Customer MAY request multiple jobs to be processed as a chain, where the output of a job is the input of another job. (e.g. podcast transcription -> summarization of the transcription). This is done by specifying as input an event id of a different job with the `job` type.

From c2d9b40d5bcf2d04cd04c19b42065e5158ecbab8 Mon Sep 17 00:00:00 2001
From: Adam Shannon <adamkshannon@gmail.com>
Date: Sat, 11 May 2024 12:38:01 -0500
Subject: [PATCH 202/263] nip90: fix links

---
 90.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/90.md b/90.md
index 2b499a8..5a15ebb 100644
--- a/90.md
+++ b/90.md
@@ -162,8 +162,8 @@ Service providers can give feedback about a job back to the customer.
 ```
 
 * `content`: Either empty or a job-result (e.g. for partial-result samples)
-* `amount` tag: as defined in the [Job Result](#job-result) section.
-* `status` tag: Service Providers SHOULD indicate what this feedback status refers to. [Appendix 1](#appendix-1-job-feedback-status) defines status. Extra human-readable information can be added as an extra argument.
+* `amount` tag: as defined in the [Job Result](#job-result-kind6000-6999) section.
+* `status` tag: Service Providers SHOULD indicate what this feedback status refers to. [Job Feedback Status](#job-feedback-status) defines status. Extra human-readable information can be added as an extra argument.
 
 * NOTE: If the input params requires input to be encrypted, then `content` field will have encrypted payload with `p` tag as key.
 
@@ -177,7 +177,7 @@ Service providers can give feedback about a job back to the customer.
 | `success`          | Service Provider successfully processed the job.                                                            |
 | `partial`          | Service Provider partially processed the job. The `.content` might include a sample of the partial results. |
 
-Any job feedback event MIGHT include results in the `.content` field, as described in the [Job Result](#job-result) section. This is useful for service providers to provide a sample of the results that have been processed so far.
+Any job feedback event MIGHT include results in the `.content` field, as described in the [Job Result](#job-result-kind6000-6999) section. This is useful for service providers to provide a sample of the results that have been processed so far.
 
 
 # Protocol Flow

From 9f13e76f022317a915386c1053dc8bac0a1a0dd3 Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Mon, 13 May 2024 21:11:30 +0900
Subject: [PATCH 203/263] BREAKING.md: add NIP-34 change

---
 BREAKING.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/BREAKING.md b/BREAKING.md
index 8024814..b59bc8b 100644
--- a/BREAKING.md
+++ b/BREAKING.md
@@ -5,6 +5,7 @@ reverse chronological order.
 
 | Date        | Commit    | NIP      | Change |
 | ----------- | --------- | -------- | ------ |
+| 2024-04-30  | [bad88262](https://github.com/nostr-protocol/nips/commit/bad88262) | [NIP-34](34.md) | 'earliest-unique-commit' tag was removed (use 'r' tag instead) |
 | 2024-02-25  | [4a171cb0](https://github.com/nostr-protocol/nips/commit/4a171cb0) | [NIP-18](18.md) | quote repost should use `q` tag |
 | 2024-02-10  | [c6cd655c](https://github.com/nostr-protocol/nips/commit/c6cd655c) | [NIP-46](46.md) | Params were stringified |
 | 2024-02-16  | [cbec02ab](https://github.com/nostr-protocol/nips/commit/cbec02ab) | [NIP-49](49.md) | Password first normalized to NFKC |

From 38ee6511dc3ac9fb1b5b91920963844e2a9a0ada Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Tue, 14 May 2024 01:17:46 +0900
Subject: [PATCH 204/263] BREAKING.md: fix date

---
 BREAKING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BREAKING.md b/BREAKING.md
index b59bc8b..7b48ee0 100644
--- a/BREAKING.md
+++ b/BREAKING.md
@@ -7,7 +7,7 @@ reverse chronological order.
 | ----------- | --------- | -------- | ------ |
 | 2024-04-30  | [bad88262](https://github.com/nostr-protocol/nips/commit/bad88262) | [NIP-34](34.md) | 'earliest-unique-commit' tag was removed (use 'r' tag instead) |
 | 2024-02-25  | [4a171cb0](https://github.com/nostr-protocol/nips/commit/4a171cb0) | [NIP-18](18.md) | quote repost should use `q` tag |
-| 2024-02-10  | [c6cd655c](https://github.com/nostr-protocol/nips/commit/c6cd655c) | [NIP-46](46.md) | Params were stringified |
+| 2024-02-21  | [c6cd655c](https://github.com/nostr-protocol/nips/commit/c6cd655c) | [NIP-46](46.md) | Params were stringified |
 | 2024-02-16  | [cbec02ab](https://github.com/nostr-protocol/nips/commit/cbec02ab) | [NIP-49](49.md) | Password first normalized to NFKC |
 | 2024-02-15  | [afbb8dd0](https://github.com/nostr-protocol/nips/commit/afbb8dd0) | [NIP-39](39.md) | PGP identity was removed |
 | 2024-02-07  | [d3dad114](https://github.com/nostr-protocol/nips/commit/d3dad114) | [NIP-46](46.md) | Connection token format was changed |

From 824d0b7eacceed0dd4ae3d3a4225f6c9722d05c2 Mon Sep 17 00:00:00 2001
From: kieran <kieran@harkin.me>
Date: Sun, 14 Apr 2024 18:22:01 +0100
Subject: [PATCH 205/263] torrents

---
 35.md | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 35.md

diff --git a/35.md b/35.md
new file mode 100644
index 0000000..878e935
--- /dev/null
+++ b/35.md
@@ -0,0 +1,61 @@
+NIP-35
+======
+
+Torrents
+-----------
+
+`draft` `optional`
+
+This NIP defined a new `kind 2003` which is Torrent. 
+
+`kind 2003` is a simple torrent index where there is enough information to search for content and construct the magnet link. No torrent files exist on nostr.
+
+## Tags
+- `btih`: V1 BitTorrent Info Hash, as seen in the [magnet link](https://www.bittorrent.org/beps/bep_0053.html) `magnet:?xt=urn:btih:HASH`
+- `file`: A file entry inside the torrent, including the full path ie. `info/example.txt`
+
+In order to make torrents searchable by general category, you SHOULD include a few tags like `movie`, `tv`, `HD`, `UHD` etc.
+
+## Tag prefixes
+
+Tag prefixes are used to label the content with references, ie. `["t", "imdb:1234"]`
+
+- `tcat`: A comma separated text category path, ie. `["t", "tcat:video,movie,4k"]`, this should also match the `newznab` category in a best effort approach.
+- `newznab`: The category ID from [newznab](https://github.com/Prowlarr/Prowlarr/blob/develop/src/NzbDrone.Core/Indexers/NewznabStandardCategory.cs)
+- `tmdb`: [The movie database](https://www.themoviedb.org/) id.
+- `ttvdb`: [TV database](https://thetvdb.com/) id.
+- `imdb`: [IMDB](https://www.imdb.com/) id.
+- `mal`: [MyAnimeList](https://myanimelist.net/) id.
+- `anilist`: [AniList](https://anilist.co/) id.
+
+A second level prefix should be included where the database supports multiple media types.
+- `tmdb:movie:693134` maps to `themoviedb.org/movie/693134`
+- `ttvdb:movie:290272` maps to `thetvdb.com/movies/dune-part-two`
+- `mal:anime:9253` maps to `myanimelist.net/anime/9253`
+- `mal:manga:17517` maps to `myanimelist.net/manga/17517`
+
+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.
+
+```json
+{
+  "kind": 2003,›
+  "content": "<long-description-pre-formatted>",
+  "tags": [
+    ["title", "<torrent-title>"],
+    ["btih", "<bittorrent-info-hash>"],
+    ["file", "<file-name>", "<file-size-in-bytes>"],
+    ["file", "<file-name>", "<file-size-in-bytes>"],
+    ["t", "tcat:video,movie,4k"],
+    ["t", "newznab:2045"],
+    ["t", "imdb:tt15239678"],
+    ["t", "tmdb:movie:693134"],
+    ["t", "ttvdb:movie:290272"],
+    ["t", "movie"],
+    ["t", "4k"],
+  ]
+}
+```
+
+## Implementations
+1. [dtan.xyz](https://git.v0l.io/Kieran/dtan)
+2. [nostrudel.ninja](https://github.com/hzrd149/nostrudel/tree/next/src/views/torrents)
\ No newline at end of file

From 021a8f5bc7fd64ce701f7b57e9a79ee5d1387834 Mon Sep 17 00:00:00 2001
From: kieran <kieran@harkin.me>
Date: Sun, 14 Apr 2024 18:23:41 +0100
Subject: [PATCH 206/263] remove weird char

---
 35.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/35.md b/35.md
index 878e935..33ed2be 100644
--- a/35.md
+++ b/35.md
@@ -38,7 +38,7 @@ In some cases the url mapping isnt direct, mapping the url in general is out of
 
 ```json
 {
-  "kind": 2003,›
+  "kind": 2003,
   "content": "<long-description-pre-formatted>",
   "tags": [
     ["title", "<torrent-title>"],

From 33d173b1c9122a26c36c1d0671e3008906966c20 Mon Sep 17 00:00:00 2001
From: kieran <kieran@harkin.me>
Date: Thu, 18 Apr 2024 09:40:20 +0100
Subject: [PATCH 207/263] Add comments / make infohash indexed like NIP94

---
 35.md | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/35.md b/35.md
index 33ed2be..4e80e3e 100644
--- a/35.md
+++ b/35.md
@@ -6,13 +6,14 @@ Torrents
 
 `draft` `optional`
 
-This NIP defined a new `kind 2003` which is Torrent. 
+This NIP defined a new `kind 2003` which is a Torrent. 
 
 `kind 2003` is a simple torrent index where there is enough information to search for content and construct the magnet link. No torrent files exist on nostr.
 
 ## Tags
-- `btih`: V1 BitTorrent Info Hash, as seen in the [magnet link](https://www.bittorrent.org/beps/bep_0053.html) `magnet:?xt=urn:btih:HASH`
+- `i`: V1 BitTorrent Info Hash, as seen in the [magnet link](https://www.bittorrent.org/beps/bep_0053.html) `magnet:?xt=urn:btih:HASH`
 - `file`: A file entry inside the torrent, including the full path ie. `info/example.txt`
+- `tracker`: (Optional) A tracker to use for this torrent
 
 In order to make torrents searchable by general category, you SHOULD include a few tags like `movie`, `tv`, `HD`, `UHD` etc.
 
@@ -36,15 +37,17 @@ 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.
 
-```json
+```jsonc
 {
   "kind": 2003,
   "content": "<long-description-pre-formatted>",
   "tags": [
     ["title", "<torrent-title>"],
-    ["btih", "<bittorrent-info-hash>"],
+    ["i", "<bittorrent-info-hash>"],
     ["file", "<file-name>", "<file-size-in-bytes>"],
     ["file", "<file-name>", "<file-size-in-bytes>"],
+    ["tracker", "udp://mytacker.com:1337"],
+    ["tracker", "http://1337-tracker.net/announce"],
     ["t", "tcat:video,movie,4k"],
     ["t", "newznab:2045"],
     ["t", "imdb:tt15239678"],
@@ -56,6 +59,12 @@ In some cases the url mapping isnt direct, mapping the url in general is out of
 }
 ```
 
+## Torrent Comments
+
+A torrent comment is a `kind 2004` event which is used to reply to a torrent event.
+
+This event works exactly like a `kind 1` and should follow `NIP-10` for tagging.
+
 ## Implementations
 1. [dtan.xyz](https://git.v0l.io/Kieran/dtan)
 2. [nostrudel.ninja](https://github.com/hzrd149/nostrudel/tree/next/src/views/torrents)
\ No newline at end of file

From f59df9c24fb0c3f3e494f26a13cef7f48bd3851d Mon Sep 17 00:00:00 2001
From: kieran <kieran@harkin.me>
Date: Thu, 16 May 2024 15:28:04 +0100
Subject: [PATCH 208/263] update tag keys

---
 35.md | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/35.md b/35.md
index 4e80e3e..04cfb46 100644
--- a/35.md
+++ b/35.md
@@ -11,7 +11,7 @@ This NIP defined a new `kind 2003` which is a Torrent.
 `kind 2003` is a simple torrent index where there is enough information to search for content and construct the magnet link. No torrent files exist on nostr.
 
 ## Tags
-- `i`: V1 BitTorrent Info Hash, as seen in the [magnet link](https://www.bittorrent.org/beps/bep_0053.html) `magnet:?xt=urn:btih:HASH`
+- `x`: V1 BitTorrent Info Hash, as seen in the [magnet link](https://www.bittorrent.org/beps/bep_0053.html) `magnet:?xt=urn:btih:HASH`
 - `file`: A file entry inside the torrent, including the full path ie. `info/example.txt`
 - `tracker`: (Optional) A tracker to use for this torrent
 
@@ -19,9 +19,9 @@ In order to make torrents searchable by general category, you SHOULD include a f
 
 ## Tag prefixes
 
-Tag prefixes are used to label the content with references, ie. `["t", "imdb:1234"]`
+Tag prefixes are used to label the content with references, ie. `["i", "imdb:1234"]`
 
-- `tcat`: A comma separated text category path, ie. `["t", "tcat:video,movie,4k"]`, this should also match the `newznab` category in a best effort approach.
+- `tcat`: A comma separated text category path, ie. `["i", "tcat:video,movie,4k"]`, this should also match the `newznab` category in a best effort approach.
 - `newznab`: The category ID from [newznab](https://github.com/Prowlarr/Prowlarr/blob/develop/src/NzbDrone.Core/Indexers/NewznabStandardCategory.cs)
 - `tmdb`: [The movie database](https://www.themoviedb.org/) id.
 - `ttvdb`: [TV database](https://thetvdb.com/) id.
@@ -43,16 +43,16 @@ In some cases the url mapping isnt direct, mapping the url in general is out of
   "content": "<long-description-pre-formatted>",
   "tags": [
     ["title", "<torrent-title>"],
-    ["i", "<bittorrent-info-hash>"],
+    ["x", "<bittorrent-info-hash>"],
     ["file", "<file-name>", "<file-size-in-bytes>"],
     ["file", "<file-name>", "<file-size-in-bytes>"],
     ["tracker", "udp://mytacker.com:1337"],
     ["tracker", "http://1337-tracker.net/announce"],
-    ["t", "tcat:video,movie,4k"],
-    ["t", "newznab:2045"],
-    ["t", "imdb:tt15239678"],
-    ["t", "tmdb:movie:693134"],
-    ["t", "ttvdb:movie:290272"],
+    ["i", "tcat:video,movie,4k"],
+    ["i", "newznab:2045"],
+    ["i", "imdb:tt15239678"],
+    ["i", "tmdb:movie:693134"],
+    ["i", "ttvdb:movie:290272"],
     ["t", "movie"],
     ["t", "4k"],
   ]

From dda408f48774eb41f116aad8024a84e73ab894ac Mon Sep 17 00:00:00 2001
From: kieran <kieran@harkin.me>
Date: Thu, 16 May 2024 15:29:09 +0100
Subject: [PATCH 209/263] update readme

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index b3736ea..8847888 100644
--- a/README.md
+++ b/README.md
@@ -121,6 +121,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)              |
+| `2003`        | Torrent                    | [35](35.md)              |
+| `2004`        | Torrent Comment            | [35](35.md)              |
 | `4550`        | Community Post Approval    | [72](72.md)              |
 | `5000`-`5999` | Job Request                | [90](90.md)              |
 | `6000`-`6999` | Job Result                 | [90](90.md)              |

From b1f771302a6a1a94c888b619e08a9c302df85fc2 Mon Sep 17 00:00:00 2001
From: Sam Samskies <samsamskies@gmail.com>
Date: Sat, 11 May 2024 14:58:40 -0500
Subject: [PATCH 210/263] fix NWC connection string example

---
 47.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/47.md b/47.md
index 9033847..0f93b20 100644
--- a/47.md
+++ b/47.md
@@ -95,7 +95,7 @@ The **client** should then store this connection and use it when the user wants
 
 ### Example connection string
 ```sh
-nostr+walletconnect:b889ff5b1513b641e2a139f661a661364979c5beee91842f8f0ef42ab558e9d4?relay=wss%3A%2F%2Frelay.damus.io&secret=71a8c14c1407c113601079c4302dab36460f0ccd0ad506f1f2dc73b5100e4f3c
+nostr+walletconnect://b889ff5b1513b641e2a139f661a661364979c5beee91842f8f0ef42ab558e9d4?relay=wss%3A%2F%2Frelay.damus.io&secret=71a8c14c1407c113601079c4302dab36460f0ccd0ad506f1f2dc73b5100e4f3c
 ```
 
 ## Commands

From 734f379a2a2f225f76f87cdcf074c997a0d40d35 Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Tue, 23 Apr 2024 11:34:17 -0700
Subject: [PATCH 211/263] Add ontolo to nip 32

---
 32.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/32.md b/32.md
index be4e872..92497a6 100644
--- a/32.md
+++ b/32.md
@@ -151,3 +151,11 @@ A good heuristic for whether a use case fits this NIP is whether labels would ev
 For example, many events might be labeled with a particular place, topic, or pubkey, but labels
 with specific values like "John Doe" or "3.18743" are not labels, they are values, and should
 be handled in some other way.
+
+
+Appendix: Known Ontologies
+-------------------------
+
+Below is a non-exhaustive list of ontologies currently in widespread use.
+
+- (social.ontolo.categories)[https://ontolo.social/]

From caee48316f811f928d92c44892ea173d990b2ebc Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Fri, 17 May 2024 19:45:27 +0900
Subject: [PATCH 212/263] NIP-24: clarify meaning of "event" for title

---
 24.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/24.md b/24.md
index 449101a..b21f48e 100644
--- a/24.md
+++ b/24.md
@@ -40,4 +40,4 @@ 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`: title of the event
+  - `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

From 1da44a5b712363da6ed2aa149f498da08d087782 Mon Sep 17 00:00:00 2001
From: Terry Yiu <963907+tyiu@users.noreply.github.com>
Date: Fri, 17 May 2024 08:13:02 -0400
Subject: [PATCH 213/263] Add missing comma in the example gift wrap JSON for
 NIP-59

---
 59.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/59.md b/59.md
index 7eff2b8..4dc857f 100644
--- a/59.md
+++ b/59.md
@@ -155,7 +155,7 @@ Sign the `gift wrap` using the random key generated in the previous step.
   "created_at": 1703021488,
   "pubkey": "18b1a75918f1f2c90c23da616bce317d36e348bcf5f7ba55e75949319210c87c",
   "id": "5c005f3ccf01950aa8d131203248544fb1e41a0d698e846bd419cec3890903ac",
-  "sig": "35fabdae4634eb630880a1896a886e40fd6ea8a60958e30b89b33a93e6235df750097b04f9e13053764251b8bc5dd7e8e0794a3426a90b6bcc7e5ff660f54259"
+  "sig": "35fabdae4634eb630880a1896a886e40fd6ea8a60958e30b89b33a93e6235df750097b04f9e13053764251b8bc5dd7e8e0794a3426a90b6bcc7e5ff660f54259",
   "tags": [["p", "166bf3765ebd1fc55decfe395beff2ea3b2a4e0a8946e7eb578512b555737c99"]],
 }
 ```

From a59ce8970ae8fb9c05bcd9e716e95187e9db6c17 Mon Sep 17 00:00:00 2001
From: Braydon Fuller <courier@braydon.com>
Date: Fri, 17 May 2024 12:02:21 -0700
Subject: [PATCH 214/263] Fix connection string protocol description. (#1243)

* Fix connection string protocol description.

* Update `nostr+walletconnect` reference.
---
 47.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/47.md b/47.md
index 0f93b20..983d2c9 100644
--- a/47.md
+++ b/47.md
@@ -81,7 +81,7 @@ If the command was successful, the `error` field must be null.
 ## Nostr Wallet Connect URI
 **client** discovers **wallet service** by scanning a QR code, handling a deeplink or pasting in a URI.
 
-The **wallet service** generates this connection URI with protocol `nostr+walletconnect:` and base path it's hex-encoded `pubkey` with the following query string parameters: 
+The **wallet service** generates this connection URI with protocol `nostr+walletconnect://` and base path it's hex-encoded `pubkey` with the following query string parameters:
 
 - `relay` Required. URL of the relay where the **wallet service** is connected and will be listening for events. May be more than one.
 - `secret` Required. 32-byte randomly generated hex encoded string. The **client** MUST use this to sign events and encrypt payloads when communicating with the **wallet service**.
@@ -402,7 +402,7 @@ Response:
 
 ## Example pay invoice flow
 
-0. The user scans the QR code generated by the **wallet service** with their **client** application, they follow a `nostr+walletconnect:` deeplink or configure the connection details manually.
+0. The user scans the QR code generated by the **wallet service** with their **client** application, they follow a `nostr+walletconnect://` deeplink or configure the connection details manually.
 1. **client** sends an event to the **wallet service** with kind `23194`. The content is a `pay_invoice` request. The private key is the secret from the connection string above.
 2. **wallet service** verifies that the author's key is authorized to perform the payment, decrypts the payload and sends the payment.
 3. **wallet service** responds to the event by sending an event with kind `23195` and content being a response either containing an error message or a preimage.

From b151a28fe38e1fa7858a42b43b352f9a1ec89588 Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Sat, 18 May 2024 22:02:14 +0900
Subject: [PATCH 215/263] README: add missing kinds of NIP-54

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index b3736ea..3209df9 100644
--- a/README.md
+++ b/README.md
@@ -108,6 +108,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `42`          | Channel Message            | [28](28.md)              |
 | `43`          | Channel Hide Message       | [28](28.md)              |
 | `44`          | Channel Mute User          | [28](28.md)              |
+| `818`         | Merge Requests             | [54](54.md)              |
 | `1021`        | Bid                        | [15](15.md)              |
 | `1022`        | Bid confirmation           | [15](15.md)              |
 | `1040`        | OpenTimestamps             | [03](03.md)              |
@@ -173,6 +174,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `30403`       | Draft Classified Listing   | [99](99.md)              |
 | `30617`       | Repository announcements   | [34](34.md)              |
 | `30818`       | Wiki article               | [54](54.md)              |
+| `30819`       | Redirects                  | [54](54.md)              |
 | `31922`       | Date-Based Calendar Event  | [52](52.md)              |
 | `31923`       | Time-Based Calendar Event  | [52](52.md)              |
 | `31924`       | Calendar                   | [52](52.md)              |

From d68899881c647bc031c4e62fd0501323e8bad7f8 Mon Sep 17 00:00:00 2001
From: kieran <kieran@harkin.me>
Date: Fri, 12 Apr 2024 10:50:47 +0100
Subject: [PATCH 216/263] pubkey on e tags

---
 10.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/10.md b/10.md
index a434ea0..dfd4cb9 100644
--- a/10.md
+++ b/10.md
@@ -38,13 +38,14 @@ They are citing from this event.  `root-id` and `reply-id` are as above.
 >This scheme is deprecated because it creates ambiguities that are difficult, or impossible to resolve when an event references another but is not a reply.
 
 ## Marked "e" tags (PREFERRED)
-`["e", <event-id>, <relay-url>, <marker>]`
+`["e", <event-id>, <relay-url>, <marker>, <pubkey>]`
 
 Where:
 
  * `<event-id>` is the id of the event being referenced.
  * `<relay-url>` is the URL of a recommended relay associated with the reference. Clients SHOULD add a valid `<relay-URL>` field, but may instead leave it as `""`.
  * `<marker>` is optional and if present is one of `"reply"`, `"root"`, or `"mention"`.
+ * `<pubkey>` is optional, SHOULD be the pubkey of the author of the referenced event
 
 Those marked with `"reply"` denote the id of the reply event being responded to.  Those marked with `"root"` denote the root id of the reply thread being responded to. For top level replies (those replying directly to the root event), only the `"root"` marker should be used. Those marked with `"mention"` denote a quoted or reposted event id.
 
@@ -52,6 +53,7 @@ A direct reply to the root of a thread should have a single marked "e" tag of ty
 
 >This scheme is preferred because it allows events to mention others without confusing them with `<reply-id>` or `<root-id>`.
 
+`<pubkey>` SHOULD be the pubkey of the author of the `e` tagged event, this is used in the outbox model to search for that event from the authors write relays where relay hints did not resolve the event.
 
 ## The "p" tag
 Used in a text event contains a list of pubkeys used to record who is involved in a reply thread.

From 8d6d58871542dfcbb3f9d5d610a13a1e17358e58 Mon Sep 17 00:00:00 2001
From: kieran <kieran@harkin.me>
Date: Tue, 14 May 2024 13:59:59 +0100
Subject: [PATCH 217/263] nip96 list uploads

---
 96.md | 108 ++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 68 insertions(+), 40 deletions(-)

diff --git a/96.md b/96.md
index f7d901f..4203b63 100644
--- a/96.md
+++ b/96.md
@@ -84,46 +84,43 @@ it must use the "api_url" field instead.
 
 See https://github.com/aljazceru/awesome-nostr#nip-96-file-storage-servers.
 
+
+## Auth 
+
+When indicated, `clients` must add an [NIP-98](98.md) `Authorization` header (**optionally** with the encoded `payload` tag set to the base64-encoded 256-bit SHA-256 hash of the file - not the hash of the whole request body).
+
 ## Upload
 
-A file can be uploaded one at a time to `https://your-file-server.example/custom-api-path` (route from `https://your-file-server.example/.well-known/nostr/nip96.json` "api_url" field) as `multipart/form-data` content type using `POST` method with the file object set to the `file` form data field.
+`POST $api_url` as `multipart/form-data`.
 
-`Clients` must add an [NIP-98](98.md) `Authorization` header (**optionally** with the encoded `payload` tag set to the base64-encoded 256-bit SHA-256 hash of the file - not the hash of the whole request body).
-If using an html form, use an `Authorization` form data field instead.
+**AUTH required**
 
-These following **optional** form data fields MAY be used by `servers` and SHOULD be sent by `clients`:
-- `expiration`: string of the UNIX timestamp in seconds. Empty string if file should be stored forever. The server isn't required to honor this;
-- `size`: string of the file byte size. This is just a value the server can use to reject early if the file size exceeds the server limits;
-- `alt`: (recommended) strict description text for visibility-impaired users;
-- `caption`: loose description;
-- `media_type`: "avatar" or "banner". Informs the server if the file will be used as an avatar or banner. If absent, the server will interpret it as a normal upload, without special treatment;
+List of form fields:
+- `file`: **REQUIRED** the file to upload
+- `caption`: **RECOMMENDED** loose description;
+- `expiration`: UNIX timestamp in seconds. Empty string if file should be stored forever. The server isn't required to honor this.
+- `size`: File byte size. This is just a value the server can use to reject early if the file size exceeds the server limits.
+- `alt`: **RECOMMENDED** strict description text for visibility-impaired users.
+- `media_type`: "avatar" or "banner". Informs the server if the file will be used as an avatar or banner. If absent, the server will interpret it as a normal upload, without special treatment.
 - `content_type`: mime type such as "image/jpeg". This is just a value the server can use to reject early if the mime type isn't supported.
 
-
 Others custom form data fields may be used depending on specific `server` support.
 The `server` isn't required to store any metadata sent by `clients`.
 
-Note for `clients`: if using an HTML form, it is important for the `file` form field to be the **last** one, or be re-ordered right before sending or be appended as the last field of XHR2's FormData object.
-
 The `filename` embedded in the file may not be honored by the `server`, which could internally store just the SHA-256 hash value as the file name, ignoring extra metadata.
-The hash is enough to uniquely identify a file, that's why it will be used on the "download" and "delete" routes.
+The hash is enough to uniquely identify a file, that's why it will be used on the `download` and `delete` routes.
 
-The `server` MUST link the user's `pubkey` string (which is embedded in the decoded header value) as the owner of the file so to later allow them to delete the file.
-Note that if a file with the same hash of a previously received file (so the same file) is uploaded by another user, the server doesn't need to store the new file.
-It should just add the new user's `pubkey` to the list of the owners of the already stored file with said hash (if it wants to save space by keeping just one copy of the same file, because multiple uploads of the same file results in the same file hash).
+The `server` MUST link the user's `pubkey` string as the owner of the file so to later allow them to delete the file.
 
-The `server` MAY also store the `Authorization` header/field value (decoded or not) for accountability purpose as this proves that the user with the unique pubkey did ask for the upload of the file with a specific hash. However, storing the pubkey is sufficient to establish ownership.
+### Response codes
 
-The `server` MUST reject with 413 Payload Too Large if file size exceeds limits.
-
-The `server` MUST reject with 400 Bad Request status if some fields are invalid.
-
-The `server` MUST reply to the upload with 200 OK status if the `payload` tag value contains an already used SHA-256 hash (if file is already owned by the same pubkey) or reject the upload with 403 Forbidden status if it isn't the same of the received file.
-
-The `server` MAY reject the upload with 402 Payment Required status if the user has a pending payment (Payment flow is not strictly required. Server owners decide if the storage is free or not. Monetization schemes may be added later to correlated NIPs.).
-
-On successful uploads the `server` MUST reply with **201 Created** HTTP status code or **202 Accepted** if a `processing_url` field is added
-to the response so that the `client` can follow the processing status (see [Delayed Processing](#delayed-processing) section).
+- `200 OK`: File upload exists, but is successful (Existing hash)
+- `201 Created`: File upload successful (New hash)
+- `202 Accepted`: File upload is awaiting processing, see [Delayed Processing](#delayed-processing) section
+- `413 Payload Too Large`: File size exceeds limit
+- `400 Bad Request`: Form data is invalid or not supported.
+- `403 Forbidden`: User is not allowed to upload or the uploaded file hash didnt match the hash included in the `Authorization` header `payload` tag.
+- `402 Payment Required`: Payment is required by the server, **this flow is undefined**.
 
 The upload response is a json object as follows:
 
@@ -179,11 +176,13 @@ The upload response is a json object as follows:
 
 Note that if the server didn't apply any transformation to the received file, both `nip94_event.tags.*.ox` and `nip94_event.tags.*.x` fields will have the same value. The server MUST link the saved file to the SHA-256 hash of the **original** file before any server transformations (the `nip94_event.tags.*.ox` tag value). The **original** file's SHA-256 hash will be used to identify the saved file when downloading or deleting it.
 
-`Clients` may upload the same file to one or many `servers`.
+`clients` may upload the same file to one or many `servers`.
 After successful upload, the `client` may optionally generate and send to any set of nostr `relays` a [NIP-94](94.md) event by including the missing fields.
 
 Alternatively, instead of using NIP-94, the `client` can share or embed on a nostr note just the above url.
 
+`clients` may also use the tags from the `nip94_event` to construct an `imeta` tag
+
 ### Delayed Processing
 
 Sometimes the server may want to place the uploaded file in a processing queue for deferred file processing.
@@ -219,7 +218,7 @@ However, for all file actions, such as download and deletion, the **original** f
 
 ## Download
 
-`Servers` must make available the route `https://your-file-server.example/custom-api-path/<sha256-file-hash>(.ext)` (route taken from `https://your-file-server.example/.well-known/nostr/nip96.json` "api_url" or "download_url" field) with `GET` method for file download.
+`GET $api_url/<sha256-hash>(.ext)`
 
 The primary file download url informed at the upload's response field `nip94_event.tags.*.url`
 can be that or not (it can be any non-standard url the server wants).
@@ -227,17 +226,17 @@ If not, the server still MUST also respond to downloads at the standard url
 mentioned on the previous paragraph, to make it possible for a client
 to try downloading a file on any NIP-96 compatible server by knowing just the SHA-256 file hash.
 
-Note that the "\<sha256-file-hash\>" part is from the **original** file, **not** from the **transformed** file if the uploaded file went through any server transformation.
+Note that the "\<sha256-hash\>" part is from the **original** file, **not** from the **transformed** file if the uploaded file went through any server transformation.
 
 Supporting ".ext", meaning "file extension", is required for `servers`. It is optional, although recommended, for `clients` to append it to the path.
 When present it may be used by `servers` to know which `Content-Type` header to send (e.g.: "Content-Type": "image/png" for ".png" extension).
 The file extension may be absent because the hash is the only needed string to uniquely identify a file.
 
-Example: `https://your-file-server.example/custom-api-path/719171db19525d9d08dd69cb716a18158a249b7b3b3ec4bbdec5698dca104b7b.png`
+Example: `$api_url/719171db19525d9d08dd69cb716a18158a249b7b3b3ec4bbdec5698dca104b7b.png`
 
 ### Media Transformations
 
-`Servers` may respond to some media transformation query parameters and ignore those they don't support by serving
+`servers` may respond to some media transformation query parameters and ignore those they don't support by serving
 the original media file without transformations.
 
 #### Image Transformations
@@ -245,23 +244,23 @@ the original media file without transformations.
 ##### Resizing
 
 Upon upload, `servers` may create resized image variants, such as thumbnails, respecting the original aspect ratio.
-`Clients` may use the `w` query parameter to request an image version with the desired pixel width.
-`Servers` can then serve the variant with the closest width to the parameter value
+`clients` may use the `w` query parameter to request an image version with the desired pixel width.
+`servers` can then serve the variant with the closest width to the parameter value
 or an image variant generated on the fly.
 
-Example: `https://your-file-server.example/custom-api-path/<sha256-file-hash>.png?w=32`
+Example: `$api_url/<sha256-hash>.png?w=32`
 
 ## Deletion
 
-`Servers` must make available the route `https://deletion.domain/deletion-path/<sha256-file-hash>(.ext)` (route taken from `https://your-file-server.example/.well-known/nostr/nip96.json` "api_url" field) with `DELETE` method for file deletion.
+`DELETE $api_url/<sha256-hash>(.ext)`
 
-Note that the "\<sha256-file-hash\>" part is from the **original** file, **not** from the **transformed** file if the uploaded file went through any server transformation.
+**AUTH required**
+
+Note that the `/<sha256-hash>` part is from the **original** file, **not** from the **transformed** file if the uploaded file went through any server transformation.
 
 The extension is optional as the file hash is the only needed file identification.
 
-`Clients` should send a `DELETE` request to the server deletion route in the above format. It must include a NIP-98 `Authorization` header.
-
-The `server` should reject deletes from users other than the original uploader. The `pubkey` encoded on the header value identifies the user.
+The `server` should reject deletes from users other than the original uploader with the appropriate http response code (403 Forbidden).
 
 It should be noted that more than one user may have uploaded the same file (with the same hash). In this case, a delete must not really delete the file but just remove the user's `pubkey` from the file owners list (considering the server keeps just one copy of the same file, because multiple uploads of the same file results
 in the same file hash).
@@ -275,6 +274,35 @@ The successful response is a 200 OK one with just basic JSON fields:
 }
 ```
 
+## Listing files
+
+`GET $api_url`
+
+**AUTH required**
+
+Returns a list of files linked to the authenticated users pubkey.
+
+Example Response:
+```js
+[
+  { 
+    "id": "<sha256-hash>",
+    "nip94_event": {...},
+    "expires": 1715691139, // unix timestamp
+    "size": 123456, 
+    "alt": "a meme that makes you laugh",
+    "caption": "haha funny meme"
+  },
+  ...
+]
+```
+
+`<sha256-hash>` is the **original hash**, ie. `ox`
+
+`nip94_event` is the same as in the upload result.
+
+`alt` / `caption` are optional.
+
 ## Selecting a Server
 
 Note: HTTP File Storage Server developers may skip this section. This is meant for client developers.

From bd9c7a1b8e372b3c8e518861b1f4ea5c92ef1888 Mon Sep 17 00:00:00 2001
From: kieran <kieran@harkin.me>
Date: Mon, 20 May 2024 21:38:36 +0100
Subject: [PATCH 218/263] add pagination / drop duplicate fields

---
 96.md | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/96.md b/96.md
index 4203b63..e882870 100644
--- a/96.md
+++ b/96.md
@@ -1,8 +1,6 @@
-NIP-96
-======
+# NIP-96
 
-HTTP File Storage Integration
------------------------------
+## HTTP File Storage Integration
 
 `draft` `optional`
 
@@ -84,8 +82,7 @@ it must use the "api_url" field instead.
 
 See https://github.com/aljazceru/awesome-nostr#nip-96-file-storage-servers.
 
-
-## Auth 
+## Auth
 
 When indicated, `clients` must add an [NIP-98](98.md) `Authorization` header (**optionally** with the encoded `payload` tag set to the base64-encoded 256-bit SHA-256 hash of the file - not the hash of the whole request body).
 
@@ -96,6 +93,7 @@ When indicated, `clients` must add an [NIP-98](98.md) `Authorization` header (**
 **AUTH required**
 
 List of form fields:
+
 - `file`: **REQUIRED** the file to upload
 - `caption`: **RECOMMENDED** loose description;
 - `expiration`: UNIX timestamp in seconds. Empty string if file should be stored forever. The server isn't required to honor this.
@@ -276,22 +274,27 @@ The successful response is a 200 OK one with just basic JSON fields:
 
 ## Listing files
 
-`GET $api_url`
+`GET $api_url?page=x&count=y`
 
 **AUTH required**
 
 Returns a list of files linked to the authenticated users pubkey.
 
 Example Response:
+
 ```js
 [
-  { 
+  {
     "id": "<sha256-hash>",
-    "nip94_event": {...},
-    "expires": 1715691139, // unix timestamp
-    "size": 123456, 
-    "alt": "a meme that makes you laugh",
-    "caption": "haha funny meme"
+    "nip94_event": {
+      "tags": [
+        ["size", "123456"],
+        ["alt", "a meme that makes you laugh"],
+        ["expiration",  "1715691139"]
+        // ...other metadata
+      ]
+      "content": "haha funny meme" // caption
+    }
   },
   ...
 ]
@@ -301,7 +304,10 @@ Example Response:
 
 `nip94_event` is the same as in the upload result.
 
-`alt` / `caption` are optional.
+### Query args
+
+- `page` page number (`offset=page*count`)
+- `count` number of items per page
 
 ## Selecting a Server
 

From 744b788427ce56d1cde99c5ccf4739bcaa8c75fb Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Wed, 22 May 2024 21:21:44 +0900
Subject: [PATCH 219/263] README: add NIP-35 and `e` tag pubkey

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d45a42b..d93469f 100644
--- a/README.md
+++ b/README.md
@@ -51,6 +51,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 - [NIP-31: Dealing with Unknown Events](31.md)
 - [NIP-32: Labeling](32.md)
 - [NIP-34: `git` stuff](34.md)
+- [NIP-35: Torrents](35.md)
 - [NIP-36: Sensitive Content](36.md)
 - [NIP-38: User Statuses](38.md)
 - [NIP-39: External Identities in Profiles](39.md)
@@ -224,7 +225,7 @@ Please update these lists when proposing NIPs introducing new event kinds.
 
 | name              | value                                | other parameters     | NIP                                   |
 | ----------------- | ------------------------------------ | -------------------- | ------------------------------------- |
-| `e`               | event id (hex)                       | relay URL, marker    | [01](01.md), [10](10.md)              |
+| `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)                           |

From 12655c739c489beab33cb264c8f6298aadddd955 Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Wed, 22 May 2024 21:28:00 +0900
Subject: [PATCH 220/263] Format tags table

---
 README.md | 96 +++++++++++++++++++++++++++----------------------------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/README.md b/README.md
index d93469f..e430f13 100644
--- a/README.md
+++ b/README.md
@@ -223,54 +223,54 @@ Please update these lists when proposing NIPs introducing new event kinds.
 
 ## 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)                           |
-| `g`               | geohash                              | --                   | [52](52.md)                           |
-| `i`               | identity                             | proof                | [39](39.md)                           |
-| `k`               | kind number (string)                 | --                   | [18](18.md), [25](25.md), [72](72.md) |
-| `l`               | label, label namespace               | annotations          | [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              |                                       |
-| `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)              |
-| `nonce`           | random                               | --                   | [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)                           |
+| `g`               | geohash                              | --                              | [52](52.md)                           |
+| `i`               | identity                             | proof                           | [39](39.md)                           |
+| `k`               | kind number (string)                 | --                              | [18](18.md), [25](25.md), [72](72.md) |
+| `l`               | label, label namespace               | annotations                     | [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                         |                                       |
+| `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)              |
+| `nonce`           | random                               | --                              | [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)                           |
 
 ## Criteria for acceptance of NIPs
 

From 0cb9b605190cb3a821b8d24d27e495bbfe92c09d Mon Sep 17 00:00:00 2001
From: hodlbod <jstaab@protonmail.com>
Date: Thu, 23 May 2024 20:31:36 -0700
Subject: [PATCH 221/263] Add CIP-01 (#1251)

* Add CIP-01

* Rename cip to nud

---------

Co-authored-by: Jon Staab <shtaab@gmail.com>
---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index e430f13..d5b6219 100644
--- a/README.md
+++ b/README.md
@@ -180,6 +180,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `30617`       | Repository announcements   | [34](34.md)              |
 | `30818`       | Wiki article               | [54](54.md)              |
 | `30819`       | Redirects                  | [54](54.md)              |
+| `31890`       | Feed                       | [NUD: Custom Feeds](https://wikifreedia.xyz/cip-01/97c70a44366a6535c1)              |
 | `31922`       | Date-Based Calendar Event  | [52](52.md)              |
 | `31923`       | Time-Based Calendar Event  | [52](52.md)              |
 | `31924`       | Calendar                   | [52](52.md)              |
@@ -192,6 +193,7 @@ 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
 [nostrocket]: https://github.com/nostrocket/NIPS/blob/main/Problems.md
 [lnpub]: https://github.com/shocknet/Lightning.Pub/blob/master/proto/autogenerated/client.md
 

From f5be59b052e48f9f0352b6207c2c08a85e7d0308 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=A1clav=20Navr=C3=A1til?= <vaclav@navratil.vn>
Date: Fri, 24 May 2024 16:20:25 +0200
Subject: [PATCH 222/263] Fix of otherwise unverifiable event

I'm reverting a change made by @arkin0x in commit: https://github.com/nostr-protocol/nips/commit/6fb9e54f7b4886272f7464aba2f0971543d8df40#diff-cb504c91ef546f76741fb8fd4c13b1f97e4b5ce2a9d78afa545fb6ec799e06c2L39 which renders the example event unverifiable because of a changed hash.
---
 13.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/13.md b/13.md
index 53c4d1b..99289c2 100644
--- a/13.md
+++ b/13.md
@@ -35,7 +35,7 @@ Example mined note
   "created_at": 1651794653,
   "kind": 1,
   "tags": [
-    ["nonce", "776797", "21"]
+    ["nonce", "776797", "20"]
   ],
   "content": "It's just me mining my own business",
   "sig": "284622fc0a3f4f1303455d5175f7ba962a3300d136085b9566801bc2e0699de0c7e31e44c81fb40ad9049173742e904713c3594a1da0fc5d2382a25c11aba977"

From ca6dddde808be705785aa84dbe1fbe93adf9462c Mon Sep 17 00:00:00 2001
From: "P. Reis" <76563803+patrickReiis@users.noreply.github.com>
Date: Fri, 24 May 2024 15:04:45 -0300
Subject: [PATCH 223/263] nip01: mention extra metadata fields may be set

---
 01.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/01.md b/01.md
index 8be85bc..6b6f13b 100644
--- a/01.md
+++ b/01.md
@@ -87,7 +87,7 @@ As a convention, all single-letter (only english alphabet letters: a-z, A-Z) key
 
 Kinds specify how clients should interpret the meaning of each event and the other fields of each event (e.g. an `"r"` tag may have a meaning in an event of kind 1 and an entirely different meaning in an event of kind 10002). Each NIP may define the meaning of a set of kinds that weren't defined elsewhere. This NIP defines two basic kinds:
 
-- `0`: **metadata**: the `content` is set to a stringified JSON object `{name: <username>, about: <string>, picture: <url, string>}` describing the user who created the event. A relay may delete older events once it gets a new one for the same pubkey.
+- `0`: **metadata**: the `content` is set to a stringified JSON object `{name: <username>, about: <string>, picture: <url, string>}` describing the user who created the event. [Extra metadata fields](24.md) may be set. A relay may delete older events once it gets a new one for the same pubkey.
 - `1`: **text note**: the `content` is set to the **plaintext** content of a note (anything the user wants to say). Content that must be parsed, such as Markdown and HTML, should not be used. Clients should also not parse content as those.
 
 And also a convention for kind ranges that allow for easier experimentation and flexibility of relay implementation:

From 092da0a4635523c0888b59c2229baa9c2e951115 Mon Sep 17 00:00:00 2001
From: hodlbod <jstaab@protonmail.com>
Date: Fri, 24 May 2024 13:19:31 -0700
Subject: [PATCH 224/263] Update 01.md

Co-authored-by: Asai Toshiya <to.asai.60@gmail.com>
---
 01.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/01.md b/01.md
index 6b6f13b..b51fdf0 100644
--- a/01.md
+++ b/01.md
@@ -87,7 +87,7 @@ As a convention, all single-letter (only english alphabet letters: a-z, A-Z) key
 
 Kinds specify how clients should interpret the meaning of each event and the other fields of each event (e.g. an `"r"` tag may have a meaning in an event of kind 1 and an entirely different meaning in an event of kind 10002). Each NIP may define the meaning of a set of kinds that weren't defined elsewhere. This NIP defines two basic kinds:
 
-- `0`: **metadata**: the `content` is set to a stringified JSON object `{name: <username>, about: <string>, picture: <url, string>}` describing the user who created the event. [Extra metadata fields](24.md) may be set. A relay may delete older events once it gets a new one for the same pubkey.
+- `0`: **metadata**: the `content` is set to a stringified JSON object `{name: <username>, about: <string>, picture: <url, string>}` describing the user who created the event. [Extra metadata fields](24.md#kind-0) may be set. A relay may delete older events once it gets a new one for the same pubkey.
 - `1`: **text note**: the `content` is set to the **plaintext** content of a note (anything the user wants to say). Content that must be parsed, such as Markdown and HTML, should not be used. Clients should also not parse content as those.
 
 And also a convention for kind ranges that allow for easier experimentation and flexibility of relay implementation:

From 5d1d1c178ec1761bac4867f69ae1c59bc7c0ca37 Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Sat, 25 May 2024 01:41:15 +0900
Subject: [PATCH 225/263] NIP-71: remove `aes-256-gcm` tag

---
 71.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/71.md b/71.md
index 3b8efca..a811434 100644
--- a/71.md
+++ b/71.md
@@ -26,7 +26,6 @@ The list of tags are as follows:
 * `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.
 * `title` (required) title of the video
 * `"published_at"`, for the timestamp in unix seconds (stringified) of the first time the video was published
-* `"aes-256-gcm"` (optional)  key and nonce for AES-GCM encryption with tagSize always 128bits
 * `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>`
@@ -62,7 +61,6 @@ The list of tags are as follows:
     ["url",<string with URI of file>],
     ["m", <MIME type>],
     ["x",<Hash SHA-256>],
-    ["aes-256-gcm",<key>, <iv>],
     ["size", <size of file in bytes>],
     ["duration", <duration of video in seconds>],
     ["dim", <size of file in pixels>],

From 92d5837b0cf474503b9ebdf2676ba266fc265bdd Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Sat, 25 May 2024 09:46:46 -0300
Subject: [PATCH 226/263] nip54: clarify wikilink format.

---
 54.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/54.md b/54.md
index 8823af9..fe46918 100644
--- a/54.md
+++ b/54.md
@@ -36,6 +36,11 @@ The content should be Markdown, following the same rules as of [NIP-23](23.md),
 
 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.
 
+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`.
+
 ### 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.

From 765c7313979af899cbc3b6b582b415a41e71904d Mon Sep 17 00:00:00 2001
From: /dev/fd0 <147166694+1440000bytes@users.noreply.github.com>
Date: Sun, 26 May 2024 10:58:14 +0000
Subject: [PATCH 227/263] add joinstr event kind in README (#1257)

* add joinstr event kind

* remove extra spaces

* change kind number

Co-authored-by: fiatjaf_ <fiatjaf@gmail.com>

---------

Co-authored-by: fiatjaf_ <fiatjaf@gmail.com>
---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index d5b6219..b058952 100644
--- a/README.md
+++ b/README.md
@@ -192,10 +192,12 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `34237`       | Video View Event           | [71](71.md)              |
 | `34550`       | Community Definition       | [72](72.md)              |
 | `39000-9`     | Group metadata events      | [29](29.md)              |
+| `2022`       | Coinjoin Pool              | [joinstr][joinstr]       |
 
 [NUD: Custom Feeds]: https://wikifreedia.xyz/cip-01/97c70a44366a6535c1
 [nostrocket]: https://github.com/nostrocket/NIPS/blob/main/Problems.md
 [lnpub]: https://github.com/shocknet/Lightning.Pub/blob/master/proto/autogenerated/client.md
+[joinstr]: https://gitlab.com/1440000bytes/joinstr/-/blob/main/NIP.md
 
 ## Message types
 

From a649a75e5a7dbd958a3066f914af8854d022440a Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Sun, 26 May 2024 23:57:05 +0900
Subject: [PATCH 228/263] README: fix order of kinds

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b058952..0709a48 100644
--- a/README.md
+++ b/README.md
@@ -126,6 +126,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `1985`        | Label                      | [32](32.md)              |
 | `2003`        | Torrent                    | [35](35.md)              |
 | `2004`        | Torrent Comment            | [35](35.md)              |
+| `2022`       | Coinjoin Pool              | [joinstr][joinstr]       |
 | `4550`        | Community Post Approval    | [72](72.md)              |
 | `5000`-`5999` | Job Request                | [90](90.md)              |
 | `6000`-`6999` | Job Result                 | [90](90.md)              |
@@ -192,7 +193,6 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `34237`       | Video View Event           | [71](71.md)              |
 | `34550`       | Community Definition       | [72](72.md)              |
 | `39000-9`     | Group metadata events      | [29](29.md)              |
-| `2022`       | Coinjoin Pool              | [joinstr][joinstr]       |
 
 [NUD: Custom Feeds]: https://wikifreedia.xyz/cip-01/97c70a44366a6535c1
 [nostrocket]: https://github.com/nostrocket/NIPS/blob/main/Problems.md

From deb00734930f18e5d9440a6a459ead28f639cbd2 Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Mon, 27 May 2024 12:40:01 +0900
Subject: [PATCH 229/263] README: add `nonce` tag difficulty

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0709a48..f0af4f0 100644
--- a/README.md
+++ b/README.md
@@ -261,7 +261,7 @@ Please update these lists when proposing NIPs introducing new event kinds.
 | `lnurl`           | `bech32` encoded `lnurl`             | --                              | [57](57.md)                           |
 | `location`        | location string                      | --                              | [52](52.md), [99](99.md)              |
 | `name`            | name                                 | --                              | [34](34.md), [58](58.md)              |
-| `nonce`           | random                               | --                              | [13](13.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)                           |

From 17593a41ab7ca51305db07cbfe1866f88e790206 Mon Sep 17 00:00:00 2001
From: Kieran <kieran@harkin.me>
Date: Mon, 27 May 2024 14:52:49 +0100
Subject: [PATCH 230/263] NIP-96: no transform (#1262)

* no_transform

* Update 96.md

Co-authored-by: Santos <34815293+sant0s12@users.noreply.github.com>

---------

Co-authored-by: Santos <34815293+sant0s12@users.noreply.github.com>
---
 96.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/96.md b/96.md
index e882870..c8b3170 100644
--- a/96.md
+++ b/96.md
@@ -101,6 +101,7 @@ List of form fields:
 - `alt`: **RECOMMENDED** strict description text for visibility-impaired users.
 - `media_type`: "avatar" or "banner". Informs the server if the file will be used as an avatar or banner. If absent, the server will interpret it as a normal upload, without special treatment.
 - `content_type`: mime type such as "image/jpeg". This is just a value the server can use to reject early if the mime type isn't supported.
+- `no_transform`: "true" asks server not to transform the file and serve the uploaded file as is, may be rejected.
 
 Others custom form data fields may be used depending on specific `server` support.
 The `server` isn't required to store any metadata sent by `clients`.
@@ -110,6 +111,8 @@ The hash is enough to uniquely identify a file, that's why it will be used on th
 
 The `server` MUST link the user's `pubkey` string as the owner of the file so to later allow them to delete the file.
 
+`no_transform` can be used to replicate a file to multiple servers for redundancy, clients can use the [server list](#selecting-a-server) to find alternative servers which might contain the same file. When uploading a file and requesting `no_transform` clients should check that the hash matches in the response in order to detect if the file was modified.
+
 ### Response codes
 
 - `200 OK`: File upload exists, but is successful (Existing hash)

From 8199b795716a253655db5f7cce7463202e0d47d0 Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Mon, 27 May 2024 08:31:29 -0700
Subject: [PATCH 231/263] Raise bar for NIP implementation

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f0af4f0..ffa6393 100644
--- a/README.md
+++ b/README.md
@@ -278,7 +278,7 @@ Please update these lists when proposing NIPs introducing new event kinds.
 
 ## Criteria for acceptance of NIPs
 
-1. They should be implemented in at least two clients and one relay -- when applicable.
+1. They should be fully implemented in at least two clients and one relay -- when applicable.
 2. They should make sense.
 3. They should be optional and backwards-compatible: care must be taken such that clients and relays that choose to not implement them do not stop working when interacting with the ones that choose to.
 4. There should be no more than one way of doing the same thing.

From 244666ed0d6cb13b7459e9710ad3ab67bec61b4c Mon Sep 17 00:00:00 2001
From: Basanta Goswami <36882714+basantagoswami@users.noreply.github.com>
Date: Sun, 25 Feb 2024 02:43:07 +0530
Subject: [PATCH 232/263] small nitpicks

---
 02.md | 4 +++-
 25.md | 3 +--
 53.md | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/02.md b/02.md
index 8b0aee1..4029b22 100644
--- a/02.md
+++ b/02.md
@@ -8,7 +8,9 @@ Follow List
 
 A special event with kind `3`, meaning "follow list" is defined as having a list of `p` tags, one for each of the followed/known profiles one is following.
 
-Each tag entry should contain the key for the profile, a relay URL where events from that key can be found (can be set to an empty string if not needed), and a local name (or "petname") for that profile (can also be set to an empty string or not provided), i.e., `["p", <32-bytes hex key>, <main relay URL>, <petname>]`. The `content` can be anything and should be ignored.
+Each tag entry should contain the key for the profile, a relay URL where events from that key can be found (can be set to an empty string if not needed), and a local name (or "petname") for that profile (can also be set to an empty string or not provided), i.e., `["p", <32-bytes hex key>, <main relay URL>, <petname>]`.
+
+The `.content` is not used.
 
 For example:
 
diff --git a/25.md b/25.md
index 7cc96b5..698f3fb 100644
--- a/25.md
+++ b/25.md
@@ -67,8 +67,7 @@ content as an emoji if shortcode is specified.
   "tags": [
     ["emoji", "soapbox", "https://gleasonator.com/emoji/Gleasonator/soapbox.png"]
   ],
-  "pubkey": "79c2cae114ea28a981e7559b4fe7854a473521a8d22a66bbab9fa248eb820ff6",
-  "created_at": 1682790000
+  ...other fields
 }
 ```
 
diff --git a/53.md b/53.md
index fad2622..0b1cb81 100644
--- a/53.md
+++ b/53.md
@@ -77,7 +77,7 @@ Event `kind:1311` is live chat's channel message. Clients MUST include the `a` t
 
 ## Use Cases
 
-Common use cases include meeting rooms/workshops, watch-together activities, or event spaces, such as [live.snort.social](https://live.snort.social) and [nostrnests.com](https://nostrnests.com).
+Common use cases include meeting rooms/workshops, watch-together activities, or event spaces, such as [zap.stream](https://zap.stream).
 
 ## Example
 

From 5c796c19fd6330628a0b328bfcf5270cb2bc3aff Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Wed, 29 May 2024 13:08:31 +0900
Subject: [PATCH 233/263] NIP-38: move description of content to Live Statuses
 section

---
 38.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/38.md b/38.md
index 911d5b1..4f2c06d 100644
--- a/38.md
+++ b/38.md
@@ -46,6 +46,8 @@ 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 `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.
+
 # Client behavior
 
 Clients MAY display this next to the username on posts or profiles to provide live user status information.
@@ -57,5 +59,3 @@ Clients MAY display this next to the username on posts or profiles to provide li
 * Nostr music streaming services that update your music status when you're listening
 * Podcasting apps that update your music status when you're listening to a podcast, with a link for others to listen as well
 * Clients can use the system media player to update playing music status
-
-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.

From 7bf5e327f7c0fef06173b10c3300767acd20d884 Mon Sep 17 00:00:00 2001
From: kieran <kieran@harkin.me>
Date: Wed, 29 May 2024 14:26:00 +0100
Subject: [PATCH 234/263] update list response

---
 96.md | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/96.md b/96.md
index c8b3170..2f25351 100644
--- a/96.md
+++ b/96.md
@@ -286,26 +286,29 @@ Returns a list of files linked to the authenticated users pubkey.
 Example Response:
 
 ```js
-[
-  {
-    "id": "<sha256-hash>",
-    "nip94_event": {
+{
+  "count": 1, // server page size, eg. max(1, min(server_max_page_size, arg_count))
+  "total": 1, // total number of files
+  "page": 0, // the current page number
+  "files": [
+    {
       "tags": [
+        ["ox": "719171db19525d9d08dd69cb716a18158a249b7b3b3ec4bbdec5698dca104b7b"],
+        ["x": "5d2899290e0e69bcd809949ee516a4a1597205390878f780c098707a7f18e3df"],
         ["size", "123456"],
         ["alt", "a meme that makes you laugh"],
-        ["expiration",  "1715691139"]
+        ["expiration",  "1715691139"],
         // ...other metadata
       ]
-      "content": "haha funny meme" // caption
-    }
-  },
-  ...
-]
+      "content": "haha funny meme", // caption
+      "created_at": 1715691130 // upload timestmap
+    },
+    ...
+  ]
+}
 ```
 
-`<sha256-hash>` is the **original hash**, ie. `ox`
-
-`nip94_event` is the same as in the upload result.
+`files` contains an array of NIP-94 events
 
 ### Query args
 

From 30a5723f88f3c6e001bdd453de38144ba2f8f0b4 Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Fri, 31 May 2024 12:43:13 +0900
Subject: [PATCH 235/263] BREAKING.md: add NIP-71 change

---
 BREAKING.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/BREAKING.md b/BREAKING.md
index 7b48ee0..720d27b 100644
--- a/BREAKING.md
+++ b/BREAKING.md
@@ -5,6 +5,7 @@ reverse chronological order.
 
 | Date        | Commit    | NIP      | Change |
 | ----------- | --------- | -------- | ------ |
+| 2024-05-25  | [5d1d1c17](https://github.com/nostr-protocol/nips/commit/5d1d1c17) | [NIP-71](71.md) | 'aes-256-gcm' tag was removed |
 | 2024-04-30  | [bad88262](https://github.com/nostr-protocol/nips/commit/bad88262) | [NIP-34](34.md) | 'earliest-unique-commit' tag was removed (use 'r' tag instead) |
 | 2024-02-25  | [4a171cb0](https://github.com/nostr-protocol/nips/commit/4a171cb0) | [NIP-18](18.md) | quote repost should use `q` tag |
 | 2024-02-21  | [c6cd655c](https://github.com/nostr-protocol/nips/commit/c6cd655c) | [NIP-46](46.md) | Params were stringified |

From fcc1b0baf653d70402b2f379eeb5d881885aae00 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 2 Jun 2024 16:38:01 -0500
Subject: [PATCH 236/263] Link `r` tag in the README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ffa6393..c9368af 100644
--- a/README.md
+++ b/README.md
@@ -240,7 +240,7 @@ Please update these lists when proposing NIPs introducing new event kinds.
 | `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                         |                                       |
+| `r`               | a reference (URL, etc)               | petname                         | [24](24.md)                           |
 | `r`               | relay url                            | marker                          | [65](65.md)                           |
 | `t`               | hashtag                              | --                              |                                       |
 | `alt`             | summary                              | --                              | [31](31.md)                           |

From fd2b5d2bfbb5dd95df4d8e3535845d6b77658da0 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 2 Jun 2024 18:19:42 -0500
Subject: [PATCH 237/263] NIP-32: fix markdown link

---
 32.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/32.md b/32.md
index 92497a6..32358b5 100644
--- a/32.md
+++ b/32.md
@@ -158,4 +158,4 @@ Appendix: Known Ontologies
 
 Below is a non-exhaustive list of ontologies currently in widespread use.
 
-- (social.ontolo.categories)[https://ontolo.social/]
+- [social.ontolo.categories](https://ontolo.social/)

From 23d605140bdbe6ccc43c6ebbcd2412a05ff262fa Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Tue, 4 Jun 2024 10:57:24 +0900
Subject: [PATCH 238/263] README: add NIP-100 to list

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index c9368af..bd78784 100644
--- a/README.md
+++ b/README.md
@@ -85,6 +85,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 - [NIP-96: HTTP File Storage Integration](96.md)
 - [NIP-98: HTTP Auth](98.md)
 - [NIP-99: Classified Listings](99.md)
+- [NIP-100: Android Signer Application](100.md)
 
 ## Event Kinds
 | kind          | description                | NIP                      |

From a6dfc7b5e513ea3070abcded3608b28e4d4a1512 Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Wed, 5 Jun 2024 15:24:43 -0300
Subject: [PATCH 239/263] fix broken nip number.

---
 100.md => 55.md | 42 +++++++++++++++++++++---------------------
 README.md       |  2 +-
 2 files changed, 22 insertions(+), 22 deletions(-)
 rename 100.md => 55.md (98%)

diff --git a/100.md b/55.md
similarity index 98%
rename from 100.md
rename to 55.md
index 4a304c3..4565e8c 100644
--- a/100.md
+++ b/55.md
@@ -1,4 +1,4 @@
-# NIP-100
+# NIP-55
 
 ## Android Signer Application
 
@@ -118,7 +118,7 @@ launcher.launch(intent)
     intent.putExtra("id", event.id)
     // Send the current logged in user npub
     intent.putExtra("current_user", npub)
-    
+
     context.startActivity(intent)
     ```
   - result:
@@ -144,7 +144,7 @@ launcher.launch(intent)
     intent.putExtra("current_user", account.keyPair.pubKey.toNpub())
     // Send the hex pubKey that will be used for encrypting the data
     intent.putExtra("pubKey", pubKey)
-    
+
     context.startActivity(intent)
     ```
   - result:
@@ -169,7 +169,7 @@ launcher.launch(intent)
     intent.putExtra("current_user", account.keyPair.pubKey.toNpub())
     // Send the hex pubKey that will be used for encrypting the data
     intent.putExtra("pubKey", pubKey)
-    
+
     context.startActivity(intent)
     ```
   - result:
@@ -179,7 +179,7 @@ launcher.launch(intent)
       val encryptedText = intent.data?.getStringExtra("signature")
       // the id you sent
       val id = intent.data?.getStringExtra("id")
-      ```      
+      ```
 
 - **nip04_decrypt**
   - params:
@@ -194,7 +194,7 @@ launcher.launch(intent)
     intent.putExtra("current_user", account.keyPair.pubKey.toNpub())
     // Send the hex pubKey that will be used for decrypting the data
     intent.putExtra("pubKey", pubKey)
-    
+
     context.startActivity(intent)
     ```
   - result:
@@ -204,7 +204,7 @@ launcher.launch(intent)
       val plainText = intent.data?.getStringExtra("signature")
       // the id you sent
       val id = intent.data?.getStringExtra("id")
-      ```      
+      ```
 
 - **nip44_decrypt**
   - params:
@@ -219,7 +219,7 @@ launcher.launch(intent)
     intent.putExtra("current_user", account.keyPair.pubKey.toNpub())
     // Send the hex pubKey that will be used for decrypting the data
     intent.putExtra("pubKey", pubKey)
-    
+
     context.startActivity(intent)
     ```
   - result:
@@ -229,7 +229,7 @@ launcher.launch(intent)
       val plainText = intent.data?.getStringExtra("signature")
       // the id you sent
       val id = intent.data?.getStringExtra("id")
-      ```        
+      ```
 
 - **decrypt_zap_event**
   - params:
@@ -251,7 +251,7 @@ launcher.launch(intent)
       val eventJson = intent.data?.getStringExtra("signature")
       // the id you sent
       val id = intent.data?.getStringExtra("id")
-      ```         
+      ```
 
 ## Using Content Resolver
 
@@ -364,7 +364,7 @@ If the user chose to always reject the event, signer application will return the
             val index = it.getColumnIndex("signature")
             val encryptedText = it.getString(index)
         }
-      ```    
+      ```
 
 - **nip04_decrypt**
   - params:
@@ -388,7 +388,7 @@ If the user chose to always reject the event, signer application will return the
             val index = it.getColumnIndex("signature")
             val encryptedText = it.getString(index)
         }
-      ```    
+      ```
 
 - **nip44_decrypt**
   - params:
@@ -412,7 +412,7 @@ If the user chose to always reject the event, signer application will return the
             val index = it.getColumnIndex("signature")
             val encryptedText = it.getString(index)
         }
-      ```      
+      ```
 
 - **decrypt_zap_event**
   - params:
@@ -436,7 +436,7 @@ If the user chose to always reject the event, signer application will return the
             val index = it.getColumnIndex("signature")
             val eventJson = it.getString(index)
         }
-      ```    
+      ```
 
 # Usage for Web Applications
 
@@ -464,42 +464,42 @@ Android intents and browser urls have limitations, so if you are using the `retu
 
     ```js
     window.href = `nostrsigner:${eventJson}?compressionType=none&returnType=signature&type=sign_event&callbackUrl=https://example.com/?event=`;
-    ``` 
+    ```
 
 - **nip04_encrypt**
   - params:
 
     ```js
     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=`;
-    ```   
+    ```
 
 - **nip04_decrypt**
   - params:
 
     ```js
     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=`;
-    ```     
+    ```
 
 - **decrypt_zap_event**
   - params:
 
     ```js
     window.href = `nostrsigner:${eventJson}?compressionType=none&returnType=signature&type=decrypt_zap_event&callbackUrl=https://example.com/?event=`;
-    ```          
+    ```
 
 ## Example
 
@@ -513,7 +513,7 @@ Android intents and browser urls have limitations, so if you are using the `retu
 </head>
 <body>
     <h1>Test</h1>
-       
+
     <script>
         window.onload = function() {
             var url = new URL(window.location.href);
diff --git a/README.md b/README.md
index bd78784..de85654 100644
--- a/README.md
+++ b/README.md
@@ -68,6 +68,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 - [NIP-52: Calendar Events](52.md)
 - [NIP-53: Live Activities](53.md)
 - [NIP-54: Wiki](54.md)
+- [NIP-55: Android Signer Application](100.md)
 - [NIP-56: Reporting](56.md)
 - [NIP-57: Lightning Zaps](57.md)
 - [NIP-58: Badges](58.md)
@@ -85,7 +86,6 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 - [NIP-96: HTTP File Storage Integration](96.md)
 - [NIP-98: HTTP Auth](98.md)
 - [NIP-99: Classified Listings](99.md)
-- [NIP-100: Android Signer Application](100.md)
 
 ## Event Kinds
 | kind          | description                | NIP                      |

From ffe8c6699b2070589d3b677dfe94b83f7714354d Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Thu, 6 Jun 2024 09:57:54 +0900
Subject: [PATCH 240/263] README: update remark

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index de85654..18fae53 100644
--- a/README.md
+++ b/README.md
@@ -224,8 +224,6 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `AUTH`   | used to send authentication challenges                  | [42](42.md) |
 | `COUNT`  | used to send requested event counts to clients          | [45](45.md) |
 
-Please update these lists when proposing NIPs introducing new event kinds.
-
 ## Standardized Tags
 
 | name              | value                                | other parameters                | NIP                                   |
@@ -277,6 +275,8 @@ Please update these lists when proposing NIPs introducing new event kinds.
 | `web`             | webpage URL                          | --                              | [34](34.md)                           |
 | `zap`             | pubkey (hex), relay URL              | weight                          | [57](57.md)                           |
 
+Please update these lists when proposing new NIPs.
+
 ## Criteria for acceptance of NIPs
 
 1. They should be fully implemented in at least two clients and one relay -- when applicable.

From 58e94b20ceb59326901415e2bdd678c51fab262b Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Thu, 6 Jun 2024 08:57:35 -0300
Subject: [PATCH 241/263] Revert "Simplifying reactions"

This reverts commit 3834c6b60474a677b53847743212df27710e64ec.

see https://github.com/nostrability/nostrability/issues/48
---
 25.md | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/25.md b/25.md
index 698f3fb..17c203e 100644
--- a/25.md
+++ b/25.md
@@ -25,24 +25,23 @@ consider it a "+".
 Tags
 ----
 
-The reaction event SHOULD include `a`, `e` and `p` tags pointing to the note the user is
-reacting to. The `p` tag allows authors to be notified. The `e` tags enables clients 
-to pull all the reactions to individual events and `a` tags enables clients to seek reactions
-for all versions of a replaceable event. 
+The reaction event SHOULD include `e` and `p` tags from the note the user is reacting to (and optionally `a` tags if the target is a replaceable event). This allows users to be notified of reactions to posts they were mentioned in. Including the `e` tags enables clients to pull all the reactions associated with individual posts or all the posts in a thread. `a` tags enables clients to seek reactions for all versions of a replaceable event.
 
-The `e` tag MUST be the `id` of the note that is being reacted to. 
+The last `e` tag MUST be the `id` of the note that is being reacted to.
 
-The `a` tag MUST contain the coordinates (`kind:pubkey:d-tag`) of the replaceable being reacted to. 
+The last `p` tag MUST be the `pubkey` of the event being reacted to.
 
-The `p` tag MUST be the `pubkey` of the event being reacted to.
+The `a` tag MUST contain the coordinates (`kind:pubkey:d-tag`) of the replaceable being reacted to.
 
-The reaction event MAY include a `k` tag with the stringified kind number
-of the reacted event as its value.
+The reaction event MAY include a `k` tag with the stringified kind number of the reacted event as its value.
 
 Example code
 
 ```swift
 func make_like_event(pubkey: String, privkey: String, liked: NostrEvent) -> NostrEvent {
+    var tags: [[String]] = liked.tags.filter {
+    	tag in tag.count >= 2 && (tag[0] == "e" || tag[0] == "p")
+    }
     tags.append(["e", liked.id])
     tags.append(["p", liked.pubkey])
     tags.append(["k", liked.kind])

From e49f1349913d657ad5177282ba20f570d55dc16a Mon Sep 17 00:00:00 2001
From: Satochip <Toporin@users.noreply.github.com>
Date: Thu, 6 Jun 2024 15:11:52 +0200
Subject: [PATCH 242/263] Update README.md

Correct wrng link for NIP-55
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 18fae53..87c5cb3 100644
--- a/README.md
+++ b/README.md
@@ -68,7 +68,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 - [NIP-52: Calendar Events](52.md)
 - [NIP-53: Live Activities](53.md)
 - [NIP-54: Wiki](54.md)
-- [NIP-55: Android Signer Application](100.md)
+- [NIP-55: Android Signer Application](55.md)
 - [NIP-56: Reporting](56.md)
 - [NIP-57: Lightning Zaps](57.md)
 - [NIP-58: Badges](58.md)

From cfcc2e48cd3555e9e458a32f816e0d1ea4994a40 Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Fri, 7 Jun 2024 10:47:58 -0400
Subject: [PATCH 243/263] Defines the order of the results for NIP-50

---
 50.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/50.md b/50.md
index a6e02be..f2b7b19 100644
--- a/50.md
+++ b/50.md
@@ -26,6 +26,9 @@ Relays SHOULD interpret the query to the best of their ability and return events
 Relays SHOULD perform matching against `content` event field, and MAY perform
 matching against other fields if that makes sense in the context of a specific kind. 
 
+Results SHOULD be returned in the order of their matching score, not by the usual `.created_at`. 
+The `limit` filter SHOULD be applied after sorting by matching score.
+
 A query string may contain `key:value` pairs (two words separated by colon), these are extensions, relays SHOULD ignore 
 extensions they don't support.
 

From 61ed2716a812abda1c46ff59035b69099b7078b3 Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Fri, 7 Jun 2024 11:53:06 -0400
Subject: [PATCH 244/263] Update 50.md

Co-authored-by: hodlbod <jstaab@protonmail.com>
---
 50.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/50.md b/50.md
index f2b7b19..2a31cb1 100644
--- a/50.md
+++ b/50.md
@@ -26,9 +26,8 @@ Relays SHOULD interpret the query to the best of their ability and return events
 Relays SHOULD perform matching against `content` event field, and MAY perform
 matching against other fields if that makes sense in the context of a specific kind. 
 
-Results SHOULD be returned in the order of their matching score, not by the usual `.created_at`. 
-The `limit` filter SHOULD be applied after sorting by matching score.
-
+Results SHOULD be returned in descending order by quality of search result (as defined by the implementation),
+not by the usual `.created_at`. The `limit` filter SHOULD be applied after sorting by matching score.
 A query string may contain `key:value` pairs (two words separated by colon), these are extensions, relays SHOULD ignore 
 extensions they don't support.
 

From 9361b1817e6d81fa98d7c61ed0e778fc97ce25cf Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Fri, 7 Jun 2024 09:34:20 -0700
Subject: [PATCH 245/263] Strongly encourage marks on labels

---
 32.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/32.md b/32.md
index 4641473..6e6bf70 100644
--- a/32.md
+++ b/32.md
@@ -29,7 +29,9 @@ This is a way of attaching standard nostr tags to events, pubkeys, relays, urls,
 Label Tag
 ----
 
-An `l` tag's value can be any string. If using an `L` tag, `l` tags MUST include a `mark` matching an `L` tag value in the same event.
+An `l` tag's value can be any string. If using an `L` tag, `l` tags MUST include a mark matching an `L`
+tag value in the same event. If no `L` tag is included, a mark SHOULD still be included. If none is
+included, `ugc` is implied.
 
 Label Target
 ----

From 9e223f3bffd720f882a65ddc96a2c85739b5f252 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 7 Jun 2024 12:37:29 -0500
Subject: [PATCH 246/263] NIP-09: clarify "a" tag deletions

---
 09.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/09.md b/09.md
index fbbd6e1..5e79ac2 100644
--- a/09.md
+++ b/09.md
@@ -32,6 +32,8 @@ Relays SHOULD delete or stop publishing any referenced events that have an ident
 
 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.
 
+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.
+
 ## 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.

From c30971ff0c79da57dd011df9906ae0a4ad487aca Mon Sep 17 00:00:00 2001
From: "P. Reis" <patrickpereirareal1@gmail.com>
Date: Fri, 7 Jun 2024 18:44:33 -0300
Subject: [PATCH 247/263] NIP-57: Clarify description tag

---
 57.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From ee114a1dacf85133f80ffd54f68eae46cd95e67d Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Sat, 8 Jun 2024 23:05:18 +0900
Subject: [PATCH 248/263] README: remove `l` tag annotations

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 87c5cb3..99c4245 100644
--- a/README.md
+++ b/README.md
@@ -235,7 +235,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `g`               | geohash                              | --                              | [52](52.md)                           |
 | `i`               | identity                             | proof                           | [39](39.md)                           |
 | `k`               | kind number (string)                 | --                              | [18](18.md), [25](25.md), [72](72.md) |
-| `l`               | label, label namespace               | annotations                     | [32](32.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)                           |

From df05c19980f6d1639918132ae2095bdc8aa4c524 Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Sun, 9 Jun 2024 23:19:04 +0900
Subject: [PATCH 249/263] BREAKING.md: add changes

---
 BREAKING.md | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/BREAKING.md b/BREAKING.md
index 720d27b..c8255cd 100644
--- a/BREAKING.md
+++ b/BREAKING.md
@@ -5,7 +5,10 @@ reverse chronological order.
 
 | Date        | Commit    | NIP      | Change |
 | ----------- | --------- | -------- | ------ |
+| 2024-06-06  | [58e94b20](https://github.com/nostr-protocol/nips/commit/58e94b20) | [NIP-25](25.md) | [8073c848](https://github.com/nostr-protocol/nips/commit/8073c848) was reverted |
+| 2024-06-06  | [a6dfc7b5](https://github.com/nostr-protocol/nips/commit/a6dfc7b5) | [NIP-55](55.md) | NIP number was changed |
 | 2024-05-25  | [5d1d1c17](https://github.com/nostr-protocol/nips/commit/5d1d1c17) | [NIP-71](71.md) | 'aes-256-gcm' tag was removed |
+| 2024-05-07  | [8073c848](https://github.com/nostr-protocol/nips/commit/8073c848) | [NIP-25](25.md) | e-tags were changed to not include entire thread |
 | 2024-04-30  | [bad88262](https://github.com/nostr-protocol/nips/commit/bad88262) | [NIP-34](34.md) | 'earliest-unique-commit' tag was removed (use 'r' tag instead) |
 | 2024-02-25  | [4a171cb0](https://github.com/nostr-protocol/nips/commit/4a171cb0) | [NIP-18](18.md) | quote repost should use `q` tag |
 | 2024-02-21  | [c6cd655c](https://github.com/nostr-protocol/nips/commit/c6cd655c) | [NIP-46](46.md) | Params were stringified |
@@ -20,8 +23,9 @@ reverse chronological order.
 | 2023-12-27  | [17c67ef5](https://github.com/nostr-protocol/nips/commit/17c67ef5) | [NIP-94](94.md) | 'aes-256-gcm' tag was removed |
 | 2023-12-03  | [0ba45895](https://github.com/nostr-protocol/nips/commit/0ba45895) | [NIP-01](01.md) | WebSocket status code `4000` was replaced by 'CLOSED' message |
 | 2023-11-28  | [6de35f9e](https://github.com/nostr-protocol/nips/commit/6de35f9e) | [NIP-89](89.md) | 'client' tag value was changed |
-| 2023-11-20  | [7822a8b1](https://github.com/nostr-protocol/nips/commit/7822a8b1) | [NIP-51](51.md) | `kind: 30000` and `kind: 30001` were deprecated |
+| 2023-11-20  | [7822a8b1](https://github.com/nostr-protocol/nips/commit/7822a8b1) | [NIP-51](51.md) | `kind: 30000` and `kind: 30001` were deprecated |
 | 2023-11-11  | [cbdca1e9](https://github.com/nostr-protocol/nips/commit/cbdca1e9) | [NIP-84](84.md) | 'range' tag was removed |
+| 2023-11-10  | [c945d8bd](https://github.com/nostr-protocol/nips/commit/c945d8bd) | [NIP-32](32.md) | 'l' tag annotations was removed |
 | 2023-11-07  | [108b7f16](https://github.com/nostr-protocol/nips/commit/108b7f16) | [NIP-01](01.md) | 'OK' message must have 4 items |
 | 2023-10-17  | [cf672b76](https://github.com/nostr-protocol/nips/commit/cf672b76) | [NIP-03](03.md) | 'block' tag was removed |
 | 2023-09-29  | [7dc6385f](https://github.com/nostr-protocol/nips/commit/7dc6385f) | [NIP-57](57.md) | optional 'a' tag was included in `zap receipt` |
@@ -34,10 +38,10 @@ reverse chronological order.
 | 2023-08-14  | [72bb8a12](https://github.com/nostr-protocol/nips/commit/72bb8a12) | [NIP-33](33.md) | NIP-12, 16, 20 and 33 were merged into NIP-01 |
 | 2023-08-11  | [d87f8617](https://github.com/nostr-protocol/nips/commit/d87f8617) | [NIP-25](25.md) | empty `content` should be considered as "+" |
 | 2023-08-01  | [5d63b157](https://github.com/nostr-protocol/nips/commit/5d63b157) | [NIP-57](57.md) | 'zap' tag was changed |
-| 2023-07-15  | [d1814405](https://github.com/nostr-protocol/nips/commit/d1814405) | [NIP-01](01.md) | `since` and `until` filters should be `since <= created_at <= until` |
+| 2023-07-15  | [d1814405](https://github.com/nostr-protocol/nips/commit/d1814405) | [NIP-01](01.md) | `since` and `until` filters should be `since <= created_at <= until` |
 | 2023-07-12  | [a1cd2bd8](https://github.com/nostr-protocol/nips/commit/a1cd2bd8) | [NIP-25](25.md) | custom emoji was supported |
 | 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-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-15  | [e1004d3d](https://github.com/nostr-protocol/nips/commit/e1004d3d) | [NIP-19](19.md) | `1: relay` was changed to optionally |
 
@@ -47,3 +51,4 @@ Breaking changes prior to 2023-03-01 are not yet documented.
 
 - If it isn't clear that a change is breaking or not, we list it.
 - The date is the date it was merged, not necessarily the date of the commit.
+

From 326ad34690c707b983a28524d85d8da3441ca7b3 Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Thu, 13 Jun 2024 21:02:35 +0900
Subject: [PATCH 250/263] NIP-24: fix missing rename

---
 24.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/24.md b/24.md
index b21f48e..3adec24 100644
--- a/24.md
+++ b/24.md
@@ -28,7 +28,7 @@ These are fields that should be ignored or removed when found in the wild:
 kind 3
 ======
 
-These are extra fields not specified in NIP-02 that may be present in the stringified JSON of contacts events:
+These are extra fields not specified in NIP-02 that may be present in the stringified JSON of follow events:
 
 ### Deprecated fields
 

From 2a8597b32dccd9b57f4a698b479e808a0625f69e Mon Sep 17 00:00:00 2001
From: Arman The Parman <77603167+ArmanTheParman@users.noreply.github.com>
Date: Sat, 15 Jun 2024 19:34:47 +1000
Subject: [PATCH 251/263] Update 01.md

Small grammatical change for easier reading
---
 01.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/01.md b/01.md
index b51fdf0..cdd8b90 100644
--- a/01.md
+++ b/01.md
@@ -43,7 +43,7 @@ To obtain the `event.id`, we `sha256` the serialized event. The serialization is
 ```
 
 To prevent implementation differences from creating a different event ID for the same event, the following rules MUST be followed while serializing:
-- No whitespace, line breaks or other unnecessary formatting should be included in the output JSON.
+- Whitespace, line breaks or other unnecessary formatting should not be included in the output JSON.
 - No characters except the following should be escaped, and instead should be included verbatim:
   - A line break, `0x0A`, as `\n`
   - A double quote, `0x22`, as `\"`

From a52d170c8cc5c99cf658d184922dcfe4e8177660 Mon Sep 17 00:00:00 2001
From: Arman The Parman <77603167+ArmanTheParman@users.noreply.github.com>
Date: Sun, 16 Jun 2024 19:20:00 +1000
Subject: [PATCH 252/263] Update 01.md

This is not a correction but a suggestion...

When I first read it, it wasn't clear that metadata is specifically for a user and not inclusive of other things (eg not metadata about a photo).

Adding this one extra word here would have helped me understand that immediately.
---
 01.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/01.md b/01.md
index cdd8b90..d47c261 100644
--- a/01.md
+++ b/01.md
@@ -87,7 +87,7 @@ As a convention, all single-letter (only english alphabet letters: a-z, A-Z) key
 
 Kinds specify how clients should interpret the meaning of each event and the other fields of each event (e.g. an `"r"` tag may have a meaning in an event of kind 1 and an entirely different meaning in an event of kind 10002). Each NIP may define the meaning of a set of kinds that weren't defined elsewhere. This NIP defines two basic kinds:
 
-- `0`: **metadata**: the `content` is set to a stringified JSON object `{name: <username>, about: <string>, picture: <url, string>}` describing the user who created the event. [Extra metadata fields](24.md#kind-0) may be set. A relay may delete older events once it gets a new one for the same pubkey.
+- `0`: **user's metadata**: the `content` is set to a stringified JSON object `{name: <username>, about: <string>, picture: <url, string>}` describing the user who created the event. [Extra metadata fields](24.md#kind-0) may be set. A relay may delete older events once it gets a new one for the same pubkey.
 - `1`: **text note**: the `content` is set to the **plaintext** content of a note (anything the user wants to say). Content that must be parsed, such as Markdown and HTML, should not be used. Clients should also not parse content as those.
 
 And also a convention for kind ranges that allow for easier experimentation and flexibility of relay implementation:

From 9d8be011c75e8efc7f8a255b9a503571c63f576a Mon Sep 17 00:00:00 2001
From: Arman The Parman <77603167+ArmanTheParman@users.noreply.github.com>
Date: Sun, 16 Jun 2024 23:38:14 +1000
Subject: [PATCH 253/263] Update README.md

Changed Metadata to User's Metadata, to reduce ambiguity.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 99c4245..067c436 100644
--- a/README.md
+++ b/README.md
@@ -90,7 +90,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 ## Event Kinds
 | kind          | description                | NIP                      |
 | ------------- | -------------------------- | ------------------------ |
-| `0`           | Metadata                   | [01](01.md)              |
+| `0`           | User's Metadata                   | [01](01.md)              |
 | `1`           | Short Text Note            | [01](01.md)              |
 | `2`           | Recommend Relay            | 01 (deprecated)          |
 | `3`           | Follows                    | [02](02.md)              |

From 4f787adcd1cf23ec4d395b26c3a54cd1188fef49 Mon Sep 17 00:00:00 2001
From: Arman The Parman <77603167+ArmanTheParman@users.noreply.github.com>
Date: Sun, 16 Jun 2024 23:42:45 +1000
Subject: [PATCH 254/263] Update 05.md

Changed metadata to user's metadata
---
 05.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/05.md b/05.md
index 405078a..f3a051c 100644
--- a/05.md
+++ b/05.md
@@ -6,11 +6,11 @@ Mapping Nostr keys to DNS-based internet identifiers
 
 `final` `optional`
 
-On events of kind `0` (`metadata`) one can specify the key `"nip05"` with an [internet identifier](https://datatracker.ietf.org/doc/html/rfc5322#section-3.4.1) (an email-like address) as the value. Although there is a link to a very liberal "internet identifier" specification above, NIP-05 assumes the `<local-part>` part will be restricted to the characters `a-z0-9-_.`, case-insensitive.
+On events of kind `0` (`user's metadata`) one can specify the key `"nip05"` with an [internet identifier](https://datatracker.ietf.org/doc/html/rfc5322#section-3.4.1) (an email-like address) as the value. Although there is a link to a very liberal "internet identifier" specification above, NIP-05 assumes the `<local-part>` part will be restricted to the characters `a-z0-9-_.`, case-insensitive.
 
 Upon seeing that, the client splits the identifier into `<local-part>` and `<domain>` and use these values to make a GET request to `https://<domain>/.well-known/nostr.json?name=<local-part>`.
 
-The result should be a JSON document object with a key `"names"` that should then be a mapping of names to hex formatted public keys. If the public key for the given `<name>` matches the `pubkey` from the `metadata` event, the client then concludes that the given pubkey can indeed be referenced by its identifier.
+The result should be a JSON document object with a key `"names"` that should then be a mapping of names to hex formatted public keys. If the public key for the given `<name>` matches the `pubkey` from the `user's metadata` event, the client then concludes that the given pubkey can indeed be referenced by its identifier.
 
 ### Example
 

From c576737ba42772a561c6ebfd9faf0baae6d19b17 Mon Sep 17 00:00:00 2001
From: Arman The Parman <77603167+ArmanTheParman@users.noreply.github.com>
Date: Mon, 17 Jun 2024 05:33:49 +1000
Subject: [PATCH 255/263] parentheses > commas (#1308)

* Update 01.md

A few small changes that can potentially help a broader audience (non-developers) follow the meaning.

* monospace hex

Co-authored-by: Asai Toshiya <to.asai.60@gmail.com>

---------

Co-authored-by: fiatjaf_ <fiatjaf@gmail.com>
Co-authored-by: Asai Toshiya <to.asai.60@gmail.com>
---
 01.md | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/01.md b/01.md
index cdd8b90..aa7fda2 100644
--- a/01.md
+++ b/01.md
@@ -43,16 +43,16 @@ To obtain the `event.id`, we `sha256` the serialized event. The serialization is
 ```
 
 To prevent implementation differences from creating a different event ID for the same event, the following rules MUST be followed while serializing:
-- Whitespace, line breaks or other unnecessary formatting should not be included in the output JSON.
-- No characters except the following should be escaped, and instead should be included verbatim:
-  - A line break, `0x0A`, as `\n`
-  - A double quote, `0x22`, as `\"`
-  - A backslash, `0x5C`, as `\\`
-  - A carriage return, `0x0D`, as `\r`
-  - A tab character, `0x09`, as `\t`
-  - A backspace, `0x08`, as `\b`
-  - A form feed, `0x0C`, as `\f`
 - UTF-8 should be used for encoding.
+- Whitespace, line breaks or other unnecessary formatting should not be included in the output JSON.
+- The following characters in the content field must be escaped as shown, and all other characters must be included verbatim:
+  - A line break (`0x0A`), use `\n`
+  - A double quote (`0x22`), use `\"`
+  - A backslash (`0x5C`), use `\\`
+  - A carriage return (`0x0D`), use `\r`
+  - A tab character (`0x09`), use `\t`
+  - A backspace, (`0x08`), use `\b`
+  - A form feed, (`0x0C`), use `\f`
 
 ### Tags
 

From 1728f93d17fe399fa6e0911e7bb69d2e159ca572 Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Mon, 17 Jun 2024 12:38:57 -0300
Subject: [PATCH 256/263] "user metadata" and fix table on readme.

---
 01.md     | 2 +-
 05.md     | 2 +-
 README.md | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/01.md b/01.md
index 94db77a..60d9785 100644
--- a/01.md
+++ b/01.md
@@ -87,7 +87,7 @@ As a convention, all single-letter (only english alphabet letters: a-z, A-Z) key
 
 Kinds specify how clients should interpret the meaning of each event and the other fields of each event (e.g. an `"r"` tag may have a meaning in an event of kind 1 and an entirely different meaning in an event of kind 10002). Each NIP may define the meaning of a set of kinds that weren't defined elsewhere. This NIP defines two basic kinds:
 
-- `0`: **user's metadata**: the `content` is set to a stringified JSON object `{name: <username>, about: <string>, picture: <url, string>}` describing the user who created the event. [Extra metadata fields](24.md#kind-0) may be set. A relay may delete older events once it gets a new one for the same pubkey.
+- `0`: **user metadata**: the `content` is set to a stringified JSON object `{name: <username>, about: <string>, picture: <url, string>}` describing the user who created the event. [Extra metadata fields](24.md#kind-0) may be set. A relay may delete older events once it gets a new one for the same pubkey.
 - `1`: **text note**: the `content` is set to the **plaintext** content of a note (anything the user wants to say). Content that must be parsed, such as Markdown and HTML, should not be used. Clients should also not parse content as those.
 
 And also a convention for kind ranges that allow for easier experimentation and flexibility of relay implementation:
diff --git a/05.md b/05.md
index f3a051c..a1d488d 100644
--- a/05.md
+++ b/05.md
@@ -6,7 +6,7 @@ Mapping Nostr keys to DNS-based internet identifiers
 
 `final` `optional`
 
-On events of kind `0` (`user's metadata`) one can specify the key `"nip05"` with an [internet identifier](https://datatracker.ietf.org/doc/html/rfc5322#section-3.4.1) (an email-like address) as the value. Although there is a link to a very liberal "internet identifier" specification above, NIP-05 assumes the `<local-part>` part will be restricted to the characters `a-z0-9-_.`, case-insensitive.
+On events of kind `0` (`user metadata`) one can specify the key `"nip05"` with an [internet identifier](https://datatracker.ietf.org/doc/html/rfc5322#section-3.4.1) (an email-like address) as the value. Although there is a link to a very liberal "internet identifier" specification above, NIP-05 assumes the `<local-part>` part will be restricted to the characters `a-z0-9-_.`, case-insensitive.
 
 Upon seeing that, the client splits the identifier into `<local-part>` and `<domain>` and use these values to make a GET request to `https://<domain>/.well-known/nostr.json?name=<local-part>`.
 
diff --git a/README.md b/README.md
index 067c436..02773a5 100644
--- a/README.md
+++ b/README.md
@@ -90,7 +90,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 ## Event Kinds
 | kind          | description                | NIP                      |
 | ------------- | -------------------------- | ------------------------ |
-| `0`           | User's Metadata                   | [01](01.md)              |
+| `0`           | User Metadata              | [01](01.md)              |
 | `1`           | Short Text Note            | [01](01.md)              |
 | `2`           | Recommend Relay            | 01 (deprecated)          |
 | `3`           | Follows                    | [02](02.md)              |

From 08657b3bc17b2ce0076905d07eea9b214060e222 Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Fri, 21 Jun 2024 12:52:26 +0900
Subject: [PATCH 257/263] NIP-28: simplify and fix kind 41

---
 28.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/28.md b/28.md
index 65ebb3f..1632088 100644
--- a/28.md
+++ b/28.md
@@ -37,7 +37,7 @@ In the channel creation `content` field, Client SHOULD include basic channel met
 
 Update a channel's public metadata.
 
-Clients and relays SHOULD handle kind 41 events similar to kind 33 replaceable events, where the information is used to update the metadata, without modifying the event id for the channel.Only the most recent kind 41 is needed to be stored.
+Kind 41 is used to update the metadata without modifying the event id for the channel. Only the most recent kind 41 per `e` tag value MAY be available.
 
 Clients SHOULD ignore kind 41s from pubkeys other than the kind 40 pubkey.
 

From 4aa18e329a8858ed46727b970c28652c5a0f7b43 Mon Sep 17 00:00:00 2001
From: Arjen Stens <18398758+ArjenStens@users.noreply.github.com>
Date: Sun, 23 Jun 2024 02:40:57 +0200
Subject: [PATCH 258/263] Clarify which kinds have lifetime of 'regular' 
 (#1315)

* Clarify which kinds have lifetime of 'regular'

* Missed space

* Document kind 41 as replaceable

* Revert "Document kind 41 as replaceable"

This reverts commit eead2f5a749cfee6de131944e0e73350759e28b4.
---
 01.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/01.md b/01.md
index 60d9785..c11a095 100644
--- a/01.md
+++ b/01.md
@@ -92,7 +92,7 @@ Kinds specify how clients should interpret the meaning of each event and the oth
 
 And also a convention for kind ranges that allow for easier experimentation and flexibility of relay implementation:
 
-- for kind `n` such that `1000 <= n < 10000`, events are **regular**, which means they're all expected to be stored by relays.
+- 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.

From a551c5b69337021f83f7886ecfd211915737a771 Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Wed, 26 Jun 2024 00:12:58 +0900
Subject: [PATCH 259/263] NIP-89: fix `REQ` examples

---
 89.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/89.md b/89.md
index 43d197f..54aa30b 100644
--- a/89.md
+++ b/89.md
@@ -116,7 +116,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>] }]']
+["REQ", <id>, { "kinds": [31989], "#d": ["31337"], "authors": [<user>, <users-contact-list>] }]
 ```
 
 User B, who follows User A, sees that `kind:31989` event and fetches the `a`-tagged event for the app and handler information.
@@ -127,5 +127,5 @@ User B's client sees the application's `kind:31990` which includes the informati
 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': [...] }]']
+["REQ", <id>, { "kinds": [31990], "#k": [<desired-event-kind>], "authors": [...] }]
 ```

From 346ecd11140d05dcc68c9c0b69846a9d1ce1a9b0 Mon Sep 17 00:00:00 2001
From: Asai Toshiya <to.asai.60@gmail.com>
Date: Fri, 28 Jun 2024 19:01:52 +0900
Subject: [PATCH 260/263] README: add `h` tag

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 02773a5..34e0b0d 100644
--- a/README.md
+++ b/README.md
@@ -233,6 +233,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `a`               | coordinates to an event              | relay URL                       | [01](01.md)                           |
 | `d`               | identifier                           | --                              | [01](01.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)                           |

From cc4a7a4e494e8d655fcf97ed03760f725f566ef2 Mon Sep 17 00:00:00 2001
From: "P. Reis" <patrickpereirareal1@gmail.com>
Date: Wed, 3 Jul 2024 14:43:53 -0300
Subject: [PATCH 261/263] NIP-27: fix broken link, use njump

---
 27.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/27.md b/27.md
index efd2c12..133f8ef 100644
--- a/27.md
+++ b/27.md
@@ -20,7 +20,7 @@ A reader client that receives an event with such `nostr:...` mentions in its `.c
 
 Suppose Bob is writing a note in a client that has search-and-autocomplete functionality for users that is triggered when they write the character `@`.
 
-As Bob types `"hello @mat"` the client will prompt him to autocomplete with [mattn's profile](https://gateway.nostr.com/p/2c7cc62a697ea3a7826521f3fd34f0cb273693cbe5e9310f35449f43622a5cdc), showing a picture and name.
+As Bob types `"hello @mat"` the client will prompt him to autocomplete with [mattn's profile](https://njump.me/npub1937vv2nf06360qn9y8el6d8sevnndy7tuh5nzre4gj05xc32tnwqauhaj6), showing a picture and name.
 
 Bob presses "enter" and now he sees his typed note as `"hello @mattn"`, `@mattn` is highlighted, indicating that it is a mention. Internally, however, the event looks like this:
 

From c60ca888efbdc9b8fa4bbfbace372409d0b2161a Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Thu, 4 Jul 2024 09:57:40 -0300
Subject: [PATCH 262/263] nip29: create-group event kind.

---
 29.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/29.md b/29.md
index 0f4a579..74dfd66 100644
--- a/29.md
+++ b/29.md
@@ -119,6 +119,7 @@ Each moderation action uses a different kind and requires different arguments, w
 | 9004 | `remove-permission` | `p` (pubkey), `permission` (name)         |
 | 9005 | `delete-event`      | `e` (id hex)                              |
 | 9006 | `edit-group-status` | `public` or `private`, `open` or `closed` |
+| 9007 | `create-group`      |                                           |
 
 - *group metadata* (`kind:39000`) (optional)
 

From 8c47577ecb6b3ae6ad840e5b4d187a3f3a6b97c8 Mon Sep 17 00:00:00 2001
From: Cody Casterline <cody.casterline@gmail.com>
Date: Fri, 5 Jul 2024 09:31:23 -0700
Subject: [PATCH 263/263] More precisely document since/until bounds. (#1284)

* More precisely document since/until bounds.

Lower in this document, this is expressed as "since <= created_at <= until".

But the English description said that these values had to be "newer than" or "older than".

These two were in conflict. I assume the inclusive behavior is the intended one, since that documentation was added later to clarify. This just makes both cases match.

* Update 01.md

Co-authored-by: Alex Gleason <alex@alexgleason.me>

* Update 01.md

Co-authored-by: Alex Gleason <alex@alexgleason.me>

---------

Co-authored-by: Alex Gleason <alex@alexgleason.me>
---
 01.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/01.md b/01.md
index c11a095..c7d7273 100644
--- a/01.md
+++ b/01.md
@@ -125,8 +125,8 @@ Clients can send 3 types of messages, which must be JSON arrays, according to th
   "authors": <a list of lowercase pubkeys, the pubkey of an event must be one of these>,
   "kinds": <a list of a kind numbers>,
   "#<single-letter (a-zA-Z)>": <a list of tag values, for #e — a list of event ids, for #p — a list of pubkeys, etc.>,
-  "since": <an integer unix timestamp in seconds, events must be newer than this to pass>,
-  "until": <an integer unix timestamp in seconds, events must be older than this to pass>,
+  "since": <an integer unix timestamp in seconds. Events must have a created_at >= to this to pass>,
+  "until": <an integer unix timestamp in seconds. Events must have a created_at <= to this to pass>,
   "limit": <maximum number of events relays SHOULD return in the initial query>
 }
 ```