Update 94.md

Adding `duration` and `bitrate` to NIP-94 to cover NIP-71 content

01.md

@@ -75,7 +75,7 @@ The first element of the tag array is referred to as the tag _name_ or _key_ and
 
 This NIP defines 3 standard tags that can be used across all event kinds with the same meaning. They are as follows:
 
-- The `e` tag, used to refer to an event: `["e", <32-bytes lowercase hex of the id of another event>, <recommended relay URL, optional>, <32-bytes lowercase hex of the author's pubkey, optional>]`
+- The `e` tag, used to refer to an event: `["e", <32-bytes lowercase hex of the id of another event>, <recommended relay URL, optional>]`
 - The `p` tag, used to refer to another user: `["p", <32-bytes lowercase hex of a pubkey>, <recommended relay URL, optional>]`
 - The `a` tag, used to refer to an addressable or replaceable event
     - for an addressable event: `["a", <kind integer>:<32-bytes lowercase hex of a pubkey>:<d tag value>, <recommended relay URL, optional>]`
@@ -89,7 +89,7 @@ Kinds specify how clients should interpret the meaning of each event and the oth
 
 This NIP defines one basic kind:
 
-- `0`: **user metadata**: the `content` is set to a stringified JSON object `{name: <nickname or full name>, about: <short bio>, picture: <url of the image>}` describing the user who created the event. [Extra metadata fields](24.md#kind-0) may be set. A relay may delete older events once it gets a new one for the same pubkey.
+- `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.
 
 And also a convention for kind ranges that allow for easier experimentation and flexibility of relay implementation:
 

22.md

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

31.md

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

47.md

@@ -82,7 +82,7 @@ If the command was successful, the `error` field must be null.
 
 The notification event SHOULD contain one `p` tag, the public key of the **user**.
 
-The content of notifications is encrypted with [NIP04](04.md), and is a JSON-RPCish object with a semi-fixed structure:
+The content of notifications is encrypted with [NIP04](https://github.com/nostr-protocol/nips/blob/master/04.md), and is a JSON-RPCish object with a semi-fixed structure:
 
 ```jsonc
 {

51.md

@@ -50,7 +50,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:21 videos)                                                              |
+| Curation sets         | 30005 | groups of videos picked by users as interesting and/or belonging to the same category        | `"a"` (kind:34235 videos)                                                           |
 | Kind mute sets        | 30007 | mute pubkeys by kinds<br>`"d"` tag MUST be the kind string                                   | `"p"` (pubkeys)                                                                     |
 | Interest sets         | 30015 | interest topics represented by a bunch of "hashtags"                                         | `"t"` (hashtags)                                                                    |
 | Emoji sets            | 30030 | categorized emoji groups                                                                     | `"emoji"` (see [NIP-30](30.md))                                                     |

56.md

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

57.md

@@ -132,7 +132,7 @@ The following should be true of the `zap receipt` event:
 - `tags` MUST include the `p` tag (zap recipient) AND optional `e` tag from the `zap request` AND optional `a` tag from the `zap request` AND optional `P` tag from the pubkey of the zap request (zap sender).
 - The `zap receipt` MUST have a `bolt11` tag containing the description hash bolt11 invoice.
 - The `zap receipt` MUST contain a `description` tag which is the JSON-encoded zap request.
-- `SHA256(description)` SHOULD match the description hash in the bolt11 invoice.
+- `SHA256(description)` MUST match the description hash in the bolt11 invoice.
 - The `zap receipt` MAY contain a `preimage` tag to match against the payment hash of the bolt11 invoice. This isn't really a payment proof, there is no real way to prove that the invoice is real or has been paid. You are trusting the author of the `zap receipt` for the legitimacy of the payment.
 
 The `zap receipt` is not a proof of payment, all it proves is that some nostr user fetched an invoice. The existence of the `zap receipt` implies the invoice as paid, but it could be a lie given a rogue implementation.

60.md

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

61.md

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

64.md

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

68.md

@@ -89,4 +89,4 @@ Only the following media types are accepted:
 - `image/png`: Portable Network Graphics (PNG)
 - `image/webp`: Web Picture format (WEBP)
 
-Picture events might be used with [NIP-71](71.md)'s kind `22` to display short vertical videos in the same feed.
+Picture events might be used with [NIP-71](71.md)'s kind `34236` to display short vertical videos in the same feed.

69.md

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

71.md

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

90.md

@@ -70,7 +70,7 @@ All tags are optional.
 
 ## Encrypted Params
 
-If the user wants to keep the input parameters a secret, they can encrypt the `i` and `param` tags with the service provider's 'p' tag and add it to the content field. Add a tag `encrypted` as tags. Encryption for private tags will use [NIP-04 - Encrypted Direct Message encryption](04.md), using the user's private and service provider's public key for the shared secret
+If the user wants to keep the input parameters a secret, they can encrypt the `i` and `param` tags with the service provider's 'p' tag and add it to the content field. Add a tag `encrypted` as tags. Encryption for private tags will use [NIP-04 - Encrypted Direct Message encryption](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
 [

92.md

@@ -6,10 +6,10 @@ Media Attachments
 
 Media attachments (images, videos, and other files) may be added to events by including a URL in the event content, along with a matching `imeta` tag.
 
-`imeta` ("inline metadata") tags MAY add information about media URLs in the event's content. Each `imeta` tag SHOULD match a URL in the event content. Clients MAY replace imeta URLs with rich previews.
+`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
+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

94.md

@@ -15,7 +15,7 @@ This NIP specifies the use of the `1063` event kind, 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
+* `ox` (optional) 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
@@ -27,6 +27,8 @@ This NIP specifies the use of the `1063` event kind, having in `content` a descr
 * `alt` (optional) description for accessibility
 * `fallback` (optional) zero or more fallback file sources in case `url` fails
 * `service` (optional) service type which is serving the file (eg. [NIP-96](96.md))
+* `duration` (optional) duration of media (video/audio) in seconds
+* `bitrate` (optional) average bitrate of media (video/audio) in bits/sec
 
 ```jsonc
 {

BREAKING.md

@@ -5,7 +5,6 @@ reverse chronological order.
 
 | Date        | Commit    | NIP      | Change |
 | ----------- | --------- | -------- | ------ |
-| 2025-01-31  | [6a4b125a](https://github.com/nostr-protocol/nips/commit/6a4b125a) | [71](71.md) | video events were changed to regular |
 | 2024-12-05  | [6d16019e](https://github.com/nostr-protocol/nips/commit/6d16019e) | [46](46.md) | message encryption was changed to NIP-44 |
 | 2024-11-12  | [2838e3bd](https://github.com/nostr-protocol/nips/commit/2838e3bd) | [29](29.md) | `kind: 12` and `kind: 10` were removed (use `kind: 1111` instead) |
 | 2024-11-12  | [926a51e7](https://github.com/nostr-protocol/nips/commit/926a51e7) | [46](46.md) | NIP-05 login was removed |

README.md

@@ -122,8 +122,6 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `16`          | Generic Repost                  | [18](18.md)                            |
 | `17`          | Reaction to a website           | [25](25.md)                            |
 | `20`          | Picture                         | [68](68.md)                            |
-| `21`          | Video Event                     | [71](71.md)                            |
-| `22`          | Short-form Portrait Video Event | [71](71.md)                            |
 | `40`          | Channel Creation                | [28](28.md)                            |
 | `41`          | Channel Metadata                | [28](28.md)                            |
 | `42`          | Channel Message                 | [28](28.md)                            |
@@ -175,7 +173,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `10006`       | Blocked relays list             | [51](51.md)                            |
 | `10007`       | Search relays list              | [51](51.md)                            |
 | `10009`       | User groups                     | [51](51.md), [29](29.md)               |
-| `10013`       | Private event relay list        | [37](37.md)                            |
+| `10013`       | Draft relays                    | [37](37.md)                            |
 | `10015`       | Interests list                  | [51](51.md)                            |
 | `10019`       | Nutzap Mint Recommendation      | [61](61.md)                            |
 | `10030`       | User emoji list                 | [51](51.md)                            |
@@ -183,7 +181,6 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `10063`       | User server list                | [Blossom][blossom]                     |
 | `10096`       | File storage server list        | [96](96.md)                            |
 | `13194`       | Wallet Info                     | [47](47.md)                            |
-| `17375`       | Cashu Wallet Event              | [60](60.md)                            |
 | `21000`       | Lightning Pub RPC               | [Lightning.Pub][lnpub]                 |
 | `22242`       | Client Authentication           | [42](42.md)                            |
 | `23194`       | Wallet Request                  | [47](47.md)                            |
@@ -230,9 +227,12 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `31924`       | Calendar                        | [52](52.md)                            |
 | `31925`       | Calendar Event RSVP             | [52](52.md)                            |
 | `31989`       | Handler recommendation          | [89](89.md)                            |
-| `31990`       | Handler information             | [89](89.md)                            |                         |
-| `32267`       | Software Application            |                                        |                        |
+| `31990`       | Handler information             | [89](89.md)                            |
+| `32267`       | Software Application            |                                        |
+| `34235`       | Video Event                     | [71](71.md)                            |
+| `34236`       | Short-form Portrait Video Event | [71](71.md)                            |
 | `34550`       | Community Definition            | [72](72.md)                            |
+| `37375`       | Cashu Wallet Event              | [60](60.md)                            |
 | `38383`       | Peer-to-peer Order events       | [69](69.md)                            |
 | `39000-9`     | Group metadata events           | [29](29.md)                            |