Merge branch 'master' into simplify-nuts

Co-authored-by: Tiago Balas <eskema23@gmail.com>

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>]`

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
 {

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.

61.md

@@ -60,7 +60,7 @@ Clients MUST prefix the public key they P2PK-lock with `"02"` (for nostr<>cashu
 
 * `.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.
+  * `proof` is one ore 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.
@@ -94,11 +94,12 @@ Multiple `kind:9321` events can be tagged in the same `kind:7376` event.
     "content": nip44_encrypt([
         [ "direction", "in" ], // in = received, out = sent
         [ "amount", "1" ],
-        [ "e", "<7375-event-id>", "<relay-hint>", "created" ] // new token event that was created
+        [ "e", "<7375-event-id>", "relay-hint", "created" ] // new token event that was created
     ]),
     "tags": [
-        [ "e", "<9321-event-id>", "<relay-hint>", "redeemed" ], // nutzap event that has been redeemed
-        [ "p", "<sender-pubkey>" ] // pubkey of the author of the 9321 event (nutzap sender)
+        [ "a", "37375:<pubkey>:my-wallet" ], // an optional wallet tag
+        [ "e", "<9321-event-id>", "relay-hint", "redeemed" ], // nutzap event that has been redeemed
+        [ "p", "sender-pubkey" ] // pubkey of the author of the 9321 event (nutzap sender)
     ]
 }
 ```

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
 

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

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
 [

README.md

@@ -183,7 +183,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)                            |
@@ -233,6 +232,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
 | `31990`       | Handler information             | [89](89.md)                            |                         |
 | `32267`       | Software Application            |                                        |                        |
 | `34550`       | Community Definition            | [72](72.md)                            |
+| `37375`       | Cashu Wallet Event              | [60](60.md)                            |
 | `38383`       | Peer-to-peer Order events       | [69](69.md)                            |
 | `39000-9`     | Group metadata events           | [29](29.md)                            |