From 6a55ee546c74d6343302c7f7fe961f3de7676c38 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Tue, 30 Jul 2024 22:03:07 +0000 Subject: [PATCH 1/3] Move _config.yml into the subdirectory we are rendering This was missed in the refactor PR. --- _config.yml => rendered/_config.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename _config.yml => rendered/_config.yml (100%) diff --git a/_config.yml b/rendered/_config.yml similarity index 100% rename from _config.yml rename to rendered/_config.yml From 945da8d7582d0597d5f6c198b9a7c93e10b0ddd9 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Tue, 30 Jul 2024 22:15:06 +0000 Subject: [PATCH 2/3] Assign ZIP 2001 to draft-nuttycom-lockbox-streams --- README.rst | 3 ++- rendered/draft-nuttycom-funding-allocation.html | 10 +++++----- rendered/draft-zf-community-dev-fund-2-proposal.html | 6 +++--- rendered/index.html | 3 ++- ...aft-nuttycom-lockbox-streams.html => zip-2001.html} | 4 ++-- zips/draft-nuttycom-funding-allocation.rst | 10 +++++----- zips/draft-zf-community-dev-fund-2-proposal.rst | 4 ++-- ...draft-nuttycom-lockbox-streams.rst => zip-2001.rst} | 2 +- 8 files changed, 22 insertions(+), 20 deletions(-) rename rendered/{draft-nuttycom-lockbox-streams.html => zip-2001.html} (98%) rename zips/{draft-nuttycom-lockbox-streams.rst => zip-2001.rst} (99%) diff --git a/README.rst b/README.rst index 2725e4e5..b64cba68 100644 --- a/README.rst +++ b/README.rst @@ -149,6 +149,7 @@ written. 402 New Wallet Database Format Reserved 403 Verification Behaviour of zcashd Reserved 416 Support for Unified Addresses in zcashd Reserved + 2001 Lockbox Funding Streams Draft guide-markdown {Something Short and To the Point} Draft guide {Something Short and To the Point} Draft @@ -168,7 +169,6 @@ be deleted. Blocks should balance exactly Manufacturing Consent; Re-Establishing a Dev Fund for ECC, ZF, ZCG, Qedit, FPF, and ZecHub Block Reward Allocation for Non-Direct Development Funding - Lockbox Funding Streams Establishing a Hybrid Dev Fund for ZF, ZCG and a Dev Fund Reserve @@ -301,6 +301,7 @@ Index of ZIPs 1012 Dev Fund to ECC + ZF + Major Grants Obsolete 1013 Keep It Simple, Zcashers: 10% to ECC, 10% to ZF Obsolete 1014 Establishing a Dev Fund for ECC, ZF, and Major Grants Active + 2001 Lockbox Funding Streams Draft guide-markdown {Something Short and To the Point} Draft guide {Something Short and To the Point} Draft diff --git a/rendered/draft-nuttycom-funding-allocation.html b/rendered/draft-nuttycom-funding-allocation.html index a71b7227..873d3046 100644 --- a/rendered/draft-nuttycom-funding-allocation.html +++ b/rendered/draft-nuttycom-funding-allocation.html @@ -23,7 +23,7 @@ Pull-Request: <https://githu

The key words "MUST", "REQUIRED", "MUST NOT", "SHOULD", and "MAY" in this document are to be interpreted as described in BCP 14 1 when, and only when, they appear in all capitals.

Abstract

-

This ZIP proposes several options for the allocation of a percentage of the Zcash block subsidy, post-November 2024 halving, to an in-protocol "lockbox." The "lockbox" will be a separate pool of issued funds tracked by the protocol, as described in ZIP <TBD>: Lockbox Funding Streams 4. No disbursement mechanism is currently defined for this "lockbox"; the Zcash community will need to decide upon and specify a suitable decentralized mechanism for permitting withdrawals from this lockbox in a future ZIP in order to make these funds available for funding grants to ecosystem participants.

+

This ZIP proposes several options for the allocation of a percentage of the Zcash block subsidy, post-November 2024 halving, to an in-protocol "lockbox." The "lockbox" will be a separate pool of issued funds tracked by the protocol, as described in ZIP 2001: Lockbox Funding Streams 4. No disbursement mechanism is currently defined for this "lockbox"; the Zcash community will need to decide upon and specify a suitable decentralized mechanism for permitting withdrawals from this lockbox in a future ZIP in order to make these funds available for funding grants to ecosystem participants.

The proposed lockbox addresses significant issues observed with ZIP 1014 3, such as regulatory risks, inefficiencies due to funding of organizations instead of projects, and centralization. While the exact disbursement mechanism for the lockbox funds is yet to be determined and will be addressed in a future ZIP, the goal is to employ a decentralized mechanism that ensures community involvement and efficient, project-specific funding. This approach is intended to potentially improve regulatory compliance, reduce inefficiencies, and enhance the decentralization of Zcash's funding structure.

Motivation

@@ -41,7 +41,7 @@ Pull-Request: <https://githu

Requirements

    -
  1. In-Protocol Lockbox: The alternatives presented in this ZIP depend upon the Lockbox Funding Streams proposal 4.
    2. +
  2. In-Protocol Lockbox: The alternatives presented in this ZIP depend upon the Lockbox Funding Streams proposal 4.
  3. Regulatory Considerations: The allocation of funds should minimize regulatory risks by avoiding direct funding of specific organizations. The design should enable and encourage compliance with applicable laws and regulations to support the long-term sustainability of the funding model.
@@ -54,7 +54,7 @@ Pull-Request: <https://githu

Specification

-

The following alternatives all depend upon the Lockbox Funding Streams proposal 4 for storage of funds into a deferred value pool.

+

The following alternatives all depend upon the Lockbox Funding Streams proposal 4 for storage of funds into a deferred value pool.

Some of the alternatives described below do not specify a termination height for the funding streams they propose. In these cases, the termination height is set to u32::MAX_VALUE. A future network upgrade that alters the maximum possible block height MUST also alter these termination heights.

Alternatives

@@ -314,11 +314,11 @@ Pull-Request: <https://githu - +
- +
4Draft ZIP: Lockbox Funding StreamsZIP 2001: Lockbox Funding Streams
diff --git a/rendered/draft-zf-community-dev-fund-2-proposal.html b/rendered/draft-zf-community-dev-fund-2-proposal.html index d20c5e91..4fdd60ea 100644 --- a/rendered/draft-zf-community-dev-fund-2-proposal.html +++ b/rendered/draft-zf-community-dev-fund-2-proposal.html @@ -28,7 +28,7 @@ Pull-Request:

"Section 501(c)(3)" refers to that section of the U.S. Internal Revenue Code (Title 26 of the U.S. Code). 14

"Zcash Community Advisory Panel", also called "ZCAP", refers to the panel of community members assembled by the Zcash Foundation and described at 13.

The terms "Testnet" and "Mainnet" are to be interpreted as described in section 3.12 of the Zcash Protocol Specification 3.

-

“Lockbox” refers to a deferred funding pool of issued Zcash value as described in 12.

+

“Lockbox” refers to a deferred funding pool of issued Zcash value as described in ZIP 2001 12.

“Dev Fund Reserve”, also called “DFR”, refers to the funds that are to be stored in the Lockbox as a result of the changes described in this ZIP.

Abstract

@@ -250,11 +250,11 @@ Pull-Request: - +
- +
12Draft ZIP: Lockbox for Decentralized Grants AllocationZIP 2001: Lockbox Funding Streams
diff --git a/rendered/index.html b/rendered/index.html index dfdadc94..fe6a43b2 100644 --- a/rendered/index.html +++ b/rendered/index.html @@ -114,6 +114,7 @@ 402 New Wallet Database Format Reserved 403 Verification Behaviour of zcashd Reserved 416 Support for Unified Addresses in zcashd Reserved + 2001 Lockbox Funding Streams Draft guide-markdown {Something Short and To the Point} Draft guide {Something Short and To the Point} Draft
@@ -124,7 +125,6 @@ Blocks should balance exactly Manufacturing Consent; Re-Establishing a Dev Fund for ECC, ZF, ZCG, Qedit, FPF, and ZecHub Block Reward Allocation for Non-Direct Development Funding - Lockbox Funding Streams Establishing a Hybrid Dev Fund for ZF, ZCG and a Dev Fund Reserve

Withdrawn, Rejected, or Obsolete ZIPs

@@ -247,6 +247,7 @@ 1012 Dev Fund to ECC + ZF + Major Grants Obsolete 1013 Keep It Simple, Zcashers: 10% to ECC, 10% to ZF Obsolete 1014 Establishing a Dev Fund for ECC, ZF, and Major Grants Active + 2001 Lockbox Funding Streams Draft guide-markdown {Something Short and To the Point} Draft guide {Something Short and To the Point} Draft
diff --git a/rendered/draft-nuttycom-lockbox-streams.html b/rendered/zip-2001.html similarity index 98% rename from rendered/draft-nuttycom-lockbox-streams.html rename to rendered/zip-2001.html index f49dedae..4677832e 100644 --- a/rendered/draft-nuttycom-lockbox-streams.html +++ b/rendered/zip-2001.html @@ -1,13 +1,13 @@ - Draft nuttycom-lockbox-streams: Lockbox Funding Streams + ZIP 2001: Lockbox Funding Streams
- 
ZIP: Unassigned
+        
ZIP: 2001
 Title: Lockbox Funding Streams
 Owners: Kris Nuttycombe <kris@nutty.land>
 Credits: Daira-Emma Hopwood <daira-emma@electriccoin.co>
diff --git a/zips/draft-nuttycom-funding-allocation.rst b/zips/draft-nuttycom-funding-allocation.rst
index d6d9fbf8..15b2bd51 100644
--- a/zips/draft-nuttycom-funding-allocation.rst
+++ b/zips/draft-nuttycom-funding-allocation.rst
@@ -27,8 +27,8 @@ Abstract
 This ZIP proposes several options for the allocation of a percentage of the
 Zcash block subsidy, post-November 2024 halving, to an in-protocol "lockbox."
 The "lockbox" will be a separate pool of issued funds tracked by the protocol,
-as described in ZIP : Lockbox Funding Streams
-[#draft-nuttycom-lockbox-streams]_. No disbursement mechanism is currently defined
+as described in ZIP 2001: Lockbox Funding Streams
+[#zip-2001]_. No disbursement mechanism is currently defined
 for this "lockbox"; the Zcash community will need to decide upon and specify a
 suitable decentralized mechanism for permitting withdrawals from this lockbox
 in a future ZIP in order to make these funds available for funding grants to
@@ -105,7 +105,7 @@ Requirements
 ============
 
 1. **In-Protocol Lockbox**: The alternatives presented in this ZIP depend upon
-   the Lockbox Funding Streams proposal [#draft-nuttycom-lockbox-streams]_.
+   the Lockbox Funding Streams proposal [#zip-2001]_.
 
 2. **Regulatory Considerations**: The allocation of funds should minimize
    regulatory risks by avoiding direct funding of specific organizations. The
@@ -141,7 +141,7 @@ Specification
 =============
 
 The following alternatives all depend upon the Lockbox Funding Streams proposal
-[#draft-nuttycom-lockbox-streams]_ for storage of funds into a deferred value
+[#zip-2001]_ for storage of funds into a deferred value
 pool.
 
 Some of the alternatives described below do not specify a termination height
@@ -608,4 +608,4 @@ References
     Lowercase in RFC 2119 Key Words" `_
 .. [#osd] `The Open Source Definition `_
 .. [#zip-1014] `ZIP 1014: Dev Fund Proposal and Governance `_
-.. [#draft-nuttycom-lockbox-streams] `Draft ZIP: Lockbox Funding Streams `_
+.. [#zip-2001] `ZIP 2001: Lockbox Funding Streams `_
diff --git a/zips/draft-zf-community-dev-fund-2-proposal.rst b/zips/draft-zf-community-dev-fund-2-proposal.rst
index c55c65fd..30182c7f 100644
--- a/zips/draft-zf-community-dev-fund-2-proposal.rst
+++ b/zips/draft-zf-community-dev-fund-2-proposal.rst
@@ -54,7 +54,7 @@ The terms "Testnet" and "Mainnet" are to be interpreted as described in
 section 3.12 of the Zcash Protocol Specification [#protocol-networks]_.
 
 “Lockbox” refers to a deferred funding pool of issued Zcash value as described 
-in [#draft-nuttycom-lockbox-streams]_.
+in ZIP 2001 [#zip-2001]_.
 
 “Dev Fund Reserve”, also called “DFR”, refers to the funds that are to be 
 stored in the Lockbox as a result of the changes described in this ZIP. 
@@ -493,7 +493,7 @@ References
 .. [#zip-1011] `ZIP 1011: Decentralize the Dev Fee `_
 .. [#zip-1012] `ZIP 1012: Dev Fund to ECC + ZF + Major Grants `_
 .. [#zip-1014] `ZIP 1014: Establishing a Dev Fund for ECC, ZF, and Major Grants `_
-.. [#draft-nuttycom-lockbox-streams] `Draft ZIP: Lockbox for Decentralized Grants Allocation `_
+.. [#zip-2001] `ZIP 2001: Lockbox Funding Streams `_
 .. [#zcap] `Zcash Community Advisory Panel `_
 .. [#section501c3] `U.S. Code, Title 26, Section 501(c)(3) `_
 
diff --git a/zips/draft-nuttycom-lockbox-streams.rst b/zips/zip-2001.rst
similarity index 99%
rename from zips/draft-nuttycom-lockbox-streams.rst
rename to zips/zip-2001.rst
index 65a130a0..9be3855c 100644
--- a/zips/draft-nuttycom-lockbox-streams.rst
+++ b/zips/zip-2001.rst
@@ -1,6 +1,6 @@
 ::
 
-  ZIP: Unassigned
+  ZIP: 2001
   Title: Lockbox Funding Streams
   Owners: Kris Nuttycombe 
   Credits: Daira-Emma Hopwood 

From ede4b1cb32dee2959cbc29104a7668457939d043 Mon Sep 17 00:00:00 2001
From: Jack Grigg 
Date: Tue, 30 Jul 2024 22:23:53 +0000
Subject: [PATCH 3/3] Attempt to redirect `/draft-nuttycom-lockbox-streams` to
 `/zip-2001`

---
 rendered/_config.yml                         | 2 ++
 rendered/draft-nuttycom-lockbox-streams.html | 3 +++
 2 files changed, 5 insertions(+)
 create mode 100644 rendered/draft-nuttycom-lockbox-streams.html

diff --git a/rendered/_config.yml b/rendered/_config.yml
index 0bacc557..bf43952e 100644
--- a/rendered/_config.yml
+++ b/rendered/_config.yml
@@ -1,3 +1,5 @@
 theme: jekyll-theme-tactile
 url: "https://zips.z.cash"
 markdown: GFM
+gems:
+  - jekyll-redirect-from
diff --git a/rendered/draft-nuttycom-lockbox-streams.html b/rendered/draft-nuttycom-lockbox-streams.html
new file mode 100644
index 00000000..bdcb74e5
--- /dev/null
+++ b/rendered/draft-nuttycom-lockbox-streams.html
@@ -0,0 +1,3 @@
+---
+redirect_to: "https://zips.z.cash/zip-2001"
+---