Compare commits

..

10 Commits

Author SHA1 Message Date
fiatjaf_
2430e960c7 Merge branch 'master' into simplify-nuts 2025-02-03 22:35:28 -03:00
fiatjaf
f9cba8846f nip61: improve confusing final consideration. 2025-02-03 22:34:29 -03:00
fiatjaf_
4ab75f0c3d Merge branch 'master' into simplify-nuts 2025-02-03 15:23:38 -03:00
fiatjaf
bb88c66c1d remove units everywhere. 2025-02-03 09:32:39 -03:00
fiatjaf
22660b4c66 remove traces of "wallet id". 2025-02-02 22:14:10 -03:00
fiatjaf
c2adb4b780 migrate to single replaceable and remove units, remove wallet name and description, force all tags to be encrypted always except for "redeemed". 2025-02-01 15:17:42 -03:00
fiatjaf
195e504c00 remove "amount" from nutzap. 2025-01-31 15:30:29 -03:00
fiatjaf_
deb01f43d8 another balance
Co-authored-by: Tiago Balas <eskema23@gmail.com>
2025-01-31 14:50:29 -03:00
fiatjaf_
6e040513e0 remove balance here too
Co-authored-by: Tiago Balas <eskema23@gmail.com>
2025-01-31 13:01:27 -03:00
fiatjaf
1fe24a6149 nip60/61 updates. 2025-01-31 00:01:15 -03:00
8 changed files with 9 additions and 12 deletions

2
31.md
View File

@@ -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. 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).

2
47.md
View File

@@ -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 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 ```jsonc
{ {

5
60.md
View File

@@ -28,9 +28,7 @@ This NIP doesn't deal with users' *receiving* money from someone else, it's just
"content": nip44_encrypt([ "content": nip44_encrypt([
[ "privkey", "hexkey" ], [ "privkey", "hexkey" ],
[ "mint", "https://mint1" ], [ "mint", "https://mint1" ],
[ "mint", "https://mint2" ], [ "mint", "https://mint2" ]
[ "relay", "wss://relay1" ],
[ "relay", "wss://relay2" ]
]), ]),
"tags": [] "tags": []
} }
@@ -41,7 +39,6 @@ The wallet event is an replaceable event `kind:17375`.
Tags: Tags:
* `mint` - Mint(s) this wallet uses -- there MUST be one or more mint tags. * `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. * `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` - Relay(s) where wallet events should be published. If present, clients SHOULD publish all wallet-related events (`kind:7375`, `kind:7376`, etc.) to these relays. There MAY be multiple `relay` entries. If no `relay` entries are present, clients SHOULD fall back to using the user's [NIP-65](65.md) relays.
## Token Event ## Token Event
Token events are used to record unspent proofs. Token events are used to record unspent proofs.

2
61.md
View File

@@ -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 * `.content` is an optional comment for the nutzap
* `.tags`: * `.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`. * `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. * `p` is the Nostr identity public key of nutzap recipient.
* `e` is the event that is being nutzapped, if any. * `e` is the event that is being nutzapped, if any.

2
64.md
View File

@@ -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 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 ## Relay Behavior

4
69.md
View File

@@ -12,7 +12,7 @@ This NIP defines a simple standard for peer-to-peer order events, which enables
## The event ## 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 ```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. - `name` [Name]: The name of the maker.
- `g` [Geohash]: The geohash of the operation, it can be useful in a face to face trade. - `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. - `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. - `y` < Platform >: The platform that created the order.
- `z` < Document >: `order`. - `z` < Document >: `order`.

2
90.md
View File

@@ -70,7 +70,7 @@ All tags are optional.
## 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](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 ```json
[ [

View File

@@ -183,7 +183,6 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
| `10063` | User server list | [Blossom][blossom] | | `10063` | User server list | [Blossom][blossom] |
| `10096` | File storage server list | [96](96.md) | | `10096` | File storage server list | [96](96.md) |
| `13194` | Wallet Info | [47](47.md) | | `13194` | Wallet Info | [47](47.md) |
| `17375` | Cashu Wallet Event | [60](60.md) |
| `21000` | Lightning Pub RPC | [Lightning.Pub][lnpub] | | `21000` | Lightning Pub RPC | [Lightning.Pub][lnpub] |
| `22242` | Client Authentication | [42](42.md) | | `22242` | Client Authentication | [42](42.md) |
| `23194` | Wallet Request | [47](47.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) | | | `31990` | Handler information | [89](89.md) | |
| `32267` | Software Application | | | | `32267` | Software Application | | |
| `34550` | Community Definition | [72](72.md) | | `34550` | Community Definition | [72](72.md) |
| `37375` | Cashu Wallet Event | [60](60.md) |
| `38383` | Peer-to-peer Order events | [69](69.md) | | `38383` | Peer-to-peer Order events | [69](69.md) |
| `39000-9` | Group metadata events | [29](29.md) | | `39000-9` | Group metadata events | [29](29.md) |