Merge 1f9cb8713d into 8124633a39

Merge pull request #807 from daira/zip-253-stub
Add ZIP 253 stub
2024-04-23 22:23:40 -07:00 · 2024-04-23 19:23:08 +01:00 · 2024-04-23 19:08:47 +01:00 · 2024-04-18 23:09:43 +01:00 · 2024-04-14 15:50:15 +01:00 · 2024-03-03 15:52:33 -07:00
3 changed files with 11 additions and 1 deletions
--- a/zip-0253.rst
+++ b/zip-0253.rst
@ -0,0 +1,8 @@
+::
+
+  ZIP: 253
+  Title: Deployment of the NU6 Network Upgrade
+  Owners: Daira-Emma Hopwood <daira-emma@electriccoin.co>
+  Status: Reserved
+  Category: Consensus / Network
+  Discussions-To: <https://github.com/zcash/zips/issues/806>
--- a/zip-0316.rst
+++ b/zip-0316.rst
@ -323,11 +323,13 @@ A Revision 0 UA/UVK is distinguished from a Revision 1 UA/UVK by its
 Human-Readable Part, as follows.

 Let *prefix* be:
+
 * “``u``”, if this is a UA/UVK prior to `Revision 1`_;
 * “``ur``”, if this is a UA/UVK from `Revision 1`_ onward.

 The Human-Readable Parts (as defined in [#bip-0350]_) of Unified
 Addresses are defined as:
+
 * *prefix*, for Unified Addresses on Mainnet;
 * *prefix* || “``test``”, for Unified Addresses on Testnet.

--- a/zip-0320.rst
+++ b/zip-0320.rst
@ -5,7 +5,7 @@
  Owners: Daira-Emma Hopwood <daira@electriccoin.co>
          Kris Nuttycombe <kris@nutty.land>
  Credits: Hanh
-  Status: Draft
+  Status: Proposed
  Category: Standards / Wallet
  Created: 2024-01-12
  License: MIT
Author	SHA1	Message	Date
Andrew Arnott	dbdd5033e0	Merge `1f9cb8713d` into `8124633a39`	2024-04-23 22:23:40 -07:00
Daira-Emma Hopwood	8124633a39	Merge pull request #807 from daira/zip-253-stub Add ZIP 253 stub	2024-04-23 19:23:08 +01:00
str4d	affc145506	Merge pull request #817 from daira/zip-320-to-proposed ZIP 320 to Proposed	2024-04-23 19:08:47 +01:00
Daira-Emma Hopwood	5d253b61d5	ZIP 320 to Proposed. Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>	2024-04-18 23:09:43 +01:00
Daira-Emma Hopwood	7d790904cd	Add stub for ZIP 253. Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>	2024-04-14 15:50:15 +01:00
Andrew Arnott	1f9cb8713d	Fix formatting of bulleted lists	2024-03-03 15:52:33 -07:00