upleb.uk

Public git repos — served from a NIP-34 GRASP relay at git.upleb.uk

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfiatjaf_ <fiatjaf@gmail.com>2025-02-03 15:23:38 -0300
committerGitHub <noreply@github.com>2025-02-03 15:23:38 -0300
commit4ab75f0c3db12c9213b915e5e91041dc892b75ae (patch)
treedbb2b632f6bd2709d17e342b3a1eb7bc23be434c
parentbb88c66c1dbbdaed6283e594f33e59452ae9eada (diff)
parent8577545faad887396d413707bc9020d024407818 (diff)
Merge branch 'master' into simplify-nuts
-rw-r--r--60.md3
-rw-r--r--BREAKING.md1
-rw-r--r--README.md2
3 files changed, 4 insertions, 2 deletions
diff --git a/60.md b/60.md
index 469acd9..87449d2 100644
--- a/60.md
+++ b/60.md
@@ -71,7 +71,6 @@ There can be multiple `kind:7375` events for the same mint, and multiple proofs
71 * `proofs`: unecoded proofs 71 * `proofs`: unecoded proofs
72 * `del`: token-ids that were destroyed by the creation of this token. This assists with state transitions. 72 * `del`: token-ids that were destroyed by the creation of this token. This assists with state transitions.
73 73
74### Spending proofs
75When 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). 74When 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).
76 75
77The `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. 76The `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.
@@ -100,6 +99,8 @@ Clients MUST add `e` tags to create references of destroyed and created token ev
100* `destroyed` - A token event was destroyed. 99* `destroyed` - A token event was destroyed.
101* `redeemed` - A [NIP-61](61.md) nutzap was redeemed. 100* `redeemed` - A [NIP-61](61.md) nutzap was redeemed.
102 101
102All tags can be [NIP-44](44.md) encrypted. Clients SHOULD leave `e` tags with a `redeemed` marker unencrypted.
103
103Multiple `e` tags can be added, and should be encrypted, except for tags with the `redeemed` marker. 104Multiple `e` tags can be added, and should be encrypted, except for tags with the `redeemed` marker.
104 105
105# Flow 106# Flow
diff --git a/BREAKING.md b/BREAKING.md
index 66f1a9f..ca79a0e 100644
--- a/BREAKING.md
+++ b/BREAKING.md
@@ -5,6 +5,7 @@ reverse chronological order.
5 5
6| Date | Commit | NIP | Change | 6| Date | Commit | NIP | Change |
7| ----------- | --------- | -------- | ------ | 7| ----------- | --------- | -------- | ------ |
8| 2025-01-31 | [6a4b125a](https://github.com/nostr-protocol/nips/commit/6a4b125a) | [71](71.md) | video events were changed to regular |
8| 2024-12-05 | [6d16019e](https://github.com/nostr-protocol/nips/commit/6d16019e) | [46](46.md) | message encryption was changed to NIP-44 | 9| 2024-12-05 | [6d16019e](https://github.com/nostr-protocol/nips/commit/6d16019e) | [46](46.md) | message encryption was changed to NIP-44 |
9| 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) | 10| 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) |
10| 2024-11-12 | [926a51e7](https://github.com/nostr-protocol/nips/commit/926a51e7) | [46](46.md) | NIP-05 login was removed | 11| 2024-11-12 | [926a51e7](https://github.com/nostr-protocol/nips/commit/926a51e7) | [46](46.md) | NIP-05 login was removed |
diff --git a/README.md b/README.md
index 5c1d4ec..d1100e1 100644
--- a/README.md
+++ b/README.md
@@ -175,7 +175,7 @@ They exist to document what may be implemented by [Nostr](https://github.com/nos
175| `10006` | Blocked relays list | [51](51.md) | 175| `10006` | Blocked relays list | [51](51.md) |
176| `10007` | Search relays list | [51](51.md) | 176| `10007` | Search relays list | [51](51.md) |
177| `10009` | User groups | [51](51.md), [29](29.md) | 177| `10009` | User groups | [51](51.md), [29](29.md) |
178| `10013` | Draft relays | [37](37.md) | 178| `10013` | Private event relay list | [37](37.md) |
179| `10015` | Interests list | [51](51.md) | 179| `10015` | Interests list | [51](51.md) |
180| `10019` | Nutzap Mint Recommendation | [61](61.md) | 180| `10019` | Nutzap Mint Recommendation | [61](61.md) |
181| `10030` | User emoji list | [51](51.md) | 181| `10030` | User emoji list | [51](51.md) |