Merge 39470f2af0 into 8124633a39

Merge pull request #807 from daira/zip-253-stub
Add ZIP 253 stub
2024-04-23 21:41:23 -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 16:52:55 -07:00
3 changed files with 13 additions and 1 deletions
--- a/zip-0173.rst
+++ b/zip-0173.rst
@ -300,6 +300,10 @@ Reference implementations

  * `In C++ <https://github.com/zcash/zcash/blob/master/src/bech32.cpp>`_

+* Encoders and decoders written specifically for Zcash:
+
+  * `For C# <https://github.com/nerdcash/Nerdbank.Cryptocurrencies/blob/main/src/Nerdbank.Cryptocurrencies/Bech32.cs>`_ (Bech32 and Bech32m)
+
 * Encoders and decoders written for Bitcoin:

  * `For C <https://github.com/sipa/bech32/tree/master/ref/c>`_
--- 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-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	e0ba227c7a	Merge `39470f2af0` into `8124633a39`	2024-04-23 21:41:23 -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	39470f2af0	Add C# reference implementation to list in ZIP-173	2024-03-03 16:52:55 -07:00