diff --git a/README.rst b/README.rst index 55eb2845..5c6e5eeb 100644 --- a/README.rst +++ b/README.rst @@ -94,6 +94,7 @@ Released ZIPs 401 Addressing Mempool Denial-of-Service Active 1014 Establishing a Dev Fund for ECC, ZF, and Major Grants Active 1015 Block Reward Allocation for Non-Direct Development Funding Proposed + 2001 Lockbox Funding Streams Proposed Draft ZIPs @@ -151,7 +152,6 @@ 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 @@ -304,7 +304,7 @@ Index of ZIPs 1013 Keep It Simple, Zcashers: 10% to ECC, 10% to ZF Obsolete 1014 Establishing a Dev Fund for ECC, ZF, and Major Grants Active 1015 Block Reward Allocation for Non-Direct Development Funding Proposed - 2001 Lockbox Funding Streams Draft + 2001 Lockbox Funding Streams Proposed guide-markdown {Something Short and To the Point} Draft guide {Something Short and To the Point} Draft diff --git a/rendered/index.html b/rendered/index.html index 8caa79fc..4c20da6c 100644 --- a/rendered/index.html +++ b/rendered/index.html @@ -69,6 +69,7 @@ 401 Addressing Mempool Denial-of-Service Active 1014 Establishing a Dev Fund for ECC, ZF, and Major Grants Active 1015 Block Reward Allocation for Non-Direct Development Funding Proposed + 2001 Lockbox Funding Streams Proposed

Draft ZIPs

These are works-in-progress that have been assigned ZIP numbers. These will eventually become either Proposed (and thus Released), or one of Withdrawn, Rejected, or Obsolete.

@@ -116,7 +117,6 @@ 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
@@ -250,7 +250,7 @@ 1013 Keep It Simple, Zcashers: 10% to ECC, 10% to ZF Obsolete 1014 Establishing a Dev Fund for ECC, ZF, and Major Grants Active 1015 Block Reward Allocation for Non-Direct Development Funding Proposed - 2001 Lockbox Funding Streams Draft + 2001 Lockbox Funding Streams Proposed guide-markdown {Something Short and To the Point} Draft guide {Something Short and To the Point} Draft diff --git a/rendered/zip-0214.html b/rendered/zip-0214.html index 7251427c..be8647c7 100644 --- a/rendered/zip-0214.html +++ b/rendered/zip-0214.html @@ -35,7 +35,7 @@ Discussions-To: <

Motivation

-

Motivation for the Zcash Development Fund itself is considered in ZIPs 1014 13, and 1015 14 which give a high-level descriptions of the intended structure of the funds.

+

Motivation for the Zcash Development Fund itself is considered in ZIPs 1014 13 and 1015 14, which give high-level descriptions of the intended structure of the funds.

An important motivation for describing the consensus rules in a separate ZIP is to avoid making unintended changes to ZIPs 1014 and 1015, which have already been agreed between ECC, ZF, and the Zcash community. This facilitates critically assessing whether the consensus rule changes accurately reflect the intent of ZIPs 1014 and 1015.

Requirements

@@ -58,7 +58,7 @@ Discussions-To: <10, as a consequence of reducing the block target spacing from 150 seconds to 75 seconds.

Since ZIP 1014 specifies that the Zcash Development Fund starts at the first halving, the activation height of Canopy on Mainnet therefore SHALL be 1046400.

Revision 0 of ZIP 207 9 SHALL be activated in Canopy.

-

Since ZIP 1015 specifies that the specified funding streams start at the second halving, the the activation height of NU6 on Mainnet therefore SHALL be 2726400.

+

Since ZIP 1015 specifies that the specified funding streams start at the second halving, the activation height of NU6 on Mainnet therefore SHALL be 2726400.

Revision 1 of ZIP 207 9 SHALL be activated in NU6.

As specified in 9, a funding stream is active for a span of blocks that includes the block at its start height, but excludes the block at its end height.

diff --git a/rendered/zip-1015.html b/rendered/zip-1015.html index 31f329b2..2381a2b4 100644 --- a/rendered/zip-1015.html +++ b/rendered/zip-1015.html @@ -27,7 +27,7 @@ Pull-Request: <https://githu

"Financial Privacy Foundation", also called "FPF", refers to the Cayman Islands-incorporated non-profit foundation company limited by guarantee of that name.

Abstract

-

This ZIP proposes the allocation of a percentage of the Zcash block subsidy, post-November 2024 halving, split between Zcash Community Grants (ZCG) an in-protocol "lockbox." The "lockbox" is 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.

+

This ZIP proposes the allocation of a percentage of the Zcash block subsidy, post-November 2024 halving, split between Zcash Community Grants (ZCG) and an in-protocol "lockbox." The "lockbox" is 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

diff --git a/rendered/zip-2001.html b/rendered/zip-2001.html index abd6514e..bc2f3d31 100644 --- a/rendered/zip-2001.html +++ b/rendered/zip-2001.html @@ -12,7 +12,7 @@ Title: Lockbox Funding Streams Owners: Kris Nuttycombe <kris@nutty.land> Credits: Daira-Emma Hopwood <daira-emma@electriccoin.co> Jack Grigg <jack@electriccoin.co> -Status: Draft +Status: Proposed Category: Consensus Created: 2024-07-02 License: MIT diff --git a/zips/zip-0214.rst b/zips/zip-0214.rst index 436bb32c..2f153919 100644 --- a/zips/zip-0214.rst +++ b/zips/zip-0214.rst @@ -76,7 +76,7 @@ Motivation ========== Motivation for the Zcash Development Fund itself is considered in ZIPs 1014 -[#zip-1014]_, and 1015 [#zip-1015]_ which give a high-level descriptions of the +[#zip-1014]_ and 1015 [#zip-1015]_, which give high-level descriptions of the intended structure of the funds. An important motivation for describing the consensus rules in a separate ZIP is @@ -134,7 +134,7 @@ the activation height of Canopy on Mainnet therefore SHALL be 1046400. `Revision 0`_ of ZIP 207 [#zip-0207]_ SHALL be activated in Canopy. Since ZIP 1015 specifies that the specified funding streams start at the second -halving, the the activation height of NU6 on Mainnet therefore SHALL be 2726400. +halving, the activation height of NU6 on Mainnet therefore SHALL be 2726400. `Revision 1`_ of ZIP 207 [#zip-0207]_ SHALL be activated in NU6. diff --git a/zips/zip-1015.rst b/zips/zip-1015.rst index 6252797f..62f41484 100644 --- a/zips/zip-1015.rst +++ b/zips/zip-1015.rst @@ -39,7 +39,7 @@ Abstract ======== This ZIP proposes the allocation of a percentage of the Zcash block subsidy, -post-November 2024 halving, split between Zcash Community Grants (ZCG) an +post-November 2024 halving, split between Zcash Community Grants (ZCG) and an in-protocol "lockbox." The "lockbox" is a separate pool of issued funds tracked by the protocol, as described in ZIP 2001: Lockbox Funding Streams [#zip-2001]_. No disbursement mechanism is currently defined for this "lockbox"; the Zcash @@ -380,4 +380,4 @@ References .. [#osd] `The Open Source Definition `_ .. [#zip-1014] `ZIP 1014: Dev Fund Proposal and Governance `_ .. [#zip-2001] `ZIP 2001: Lockbox Funding Streams `_ -.. [#zcap] `Zcash Community Advisory Panel `_ \ No newline at end of file +.. [#zcap] `Zcash Community Advisory Panel `_ diff --git a/zips/zip-2001.rst b/zips/zip-2001.rst index 2d7e0c2f..93b22728 100644 --- a/zips/zip-2001.rst +++ b/zips/zip-2001.rst @@ -5,7 +5,7 @@ Owners: Kris Nuttycombe Credits: Daira-Emma Hopwood Jack Grigg - Status: Draft + Status: Proposed Category: Consensus Created: 2024-07-02 License: MIT