diff --git a/zip-0214.html b/zip-0214.html index 4d1f44b8..e4d0f3ee 100644 --- a/zip-0214.html +++ b/zip-0214.html @@ -20,7 +20,7 @@ Discussions-To: <8 and the Zcash Trademark Donation and License Agreement (6 or successor agreement).

The term "block subsidy" in this document is to be interpreted as described in section 3.9 of the Zcash Protocol Specification 4.

The term "halving" in this document are to be interpreted as described in sections 7.7 of the Zcash Protocol Specification 5.

-

The terms "Electric Coin Company" (or "ECC"), "Zcash Foundation" (or "ZF"), "Major Grants", "ECC slice", "ZF slice", and "MG slice" in this document are to be interpreted as described in ZIP 1014 12.

+

The terms "Bootstrap Project" (or "BP"), "Electric Coin Company" (or "ECC"), "Zcash Foundation" (or "ZF"), "Major Grants", "BP slice", "ZF slice", and "MG slice" in this document are to be interpreted as described in ZIP 1014 12.

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

"Canopy" is the code-name for the fifth Zcash network upgrade, also known as Network Upgrade 4.

@@ -59,7 +59,7 @@ Discussions-To: < - FS_ZIP214_ECC + FS_ZIP214_BP 7 100 1028500 @@ -128,7 +128,7 @@ Discussions-To: <

Dev Fund Recipient Addresses

For each of Testnet and Mainnet, before deploying this ZIP in a node implementation with the activation height set for that network, each of the parties (ECC and ZF) SHALL generate sequences of recipient addresses to be used for each stream in each funding period:

Within each stream, the addresses MAY be independent, or MAY be repeated between funding periods. Each party SHOULD take account of operational security issues associated with potential compromise of the associated spending keys.

@@ -141,14 +141,63 @@ Discussions-To: <

Mainnet Recipient Addresses

- 
FS_ECC_Addresses[0..47] = TODO
+                
FS_BP_Addresses[0..47] = [
+  "t3LmX1cxWPPPqL4TZHx42HU3U5ghbFjRiif",
+  "t3Toxk1vJQ6UjWQ42tUJz2rV2feUWkpbTDs",
+  "t3ZBdBe4iokmsjdhMuwkxEdqMCFN16YxKe6",
+  "t3ZuaJziLM8xZ32rjDUzVjVtyYdDSz8GLWB",
+  "t3bAtYWa4bi8VrtvqySxnbr5uqcG9czQGTZ",
+  "t3dktADfb5Rmxncpe1HS5BRS5Gcj7MZWYBi",
+  "t3hgskquvKKoCtvxw86yN7q8bzwRxNgUZmc",
+  "t3R1VrLzwcxAZzkX4mX3KGbWpNsgtYtMntj",
+  "t3ff6fhemqPMVujD3AQurxRxTdvS1pPSaa2",
+  "t3cEUQFG3KYnFG6qYhPxSNgGi3HDjUPwC3J",
+  "t3WR9F5U4QvUFqqx9zFmwT6xFqduqRRXnaa",
+  "t3PYc1LWngrdUrJJbHkYPCKvJuvJjcm85Ch",
+  "t3bgkjiUeatWNkhxY3cWyLbTxKksAfk561R",
+  "t3Z5rrR8zahxUpZ8itmCKhMSfxiKjUp5Dk5",
+  "t3PU1j7YW3fJ67jUbkGhSRto8qK2qXCUiW3",
+  "t3S3yaT7EwNLaFZCamfsxxKwamQW2aRGEkh",
+  "t3eutXKJ9tEaPSxZpmowhzKhPfJvmtwTEZK",
+  "t3gbTb7brxLdVVghSPSd3ycGxzHbUpukeDm",
+  "t3UCKW2LrHFqPMQFEbZn6FpjqnhAAbfpMYR",
+  "t3NyHsrnYbqaySoQqEQRyTWkjvM2PLkU7Uu",
+  "t3QEFL6acxuZwiXtW3YvV6njDVGjJ1qeaRo",
+  "t3PdBRr2S1XTDzrV8bnZkXF3SJcrzHWe1wj",
+  "t3ZWyRPpWRo23pKxTLtWsnfEKeq9T4XPxKM",
+  "t3he6QytKCTydhpztykFsSsb9PmBT5JBZLi",
+  "t3VWxWDsLb2TURNEP6tA1ZSeQzUmPKFNxRY",
+  "t3NmWLvZkbciNAipauzsFRMxoZGqmtJksbz",
+  "t3cKr4YxVPvPBG1mCvzaoTTdBNokohsRJ8n",
+  "t3T3smGZn6BoSFXWWXa1RaoQdcyaFjMfuYK",
+  "t3gkDUe9Gm4GGpjMk86TiJZqhztBVMiUSSA",
+  "t3eretuBeBXFHe5jAqeSpUS1cpxVh51fAeb",
+  "t3dN8g9zi2UGJdixGe9txeSxeofLS9t3yFQ",
+  "t3S799pq9sYBFwccRecoTJ3SvQXRHPrHqvx",
+  "t3fhYnv1S5dXwau7GED3c1XErzt4n4vDxmf",
+  "t3cmE3vsBc5xfDJKXXZdpydCPSdZqt6AcNi",
+  "t3h5fPdjJVHaH4HwynYDM5BB3J7uQaoUwKi",
+  "t3Ma35c68BgRX8sdLDJ6WR1PCrKiWHG4Da9",
+  "t3LokMKPL1J8rkJZvVpfuH7dLu6oUWqZKQK",
+  "t3WFFGbEbhJWnASZxVLw2iTJBZfJGGX73mM",
+  "t3L8GLEsUn4QHNaRYcX3EGyXmQ8kjpT1zTa",
+  "t3PgfByBhaBSkH8uq4nYJ9ZBX4NhGCJBVYm",
+  "t3WecsqKDhWXD4JAgBVcnaCC2itzyNZhJrv",
+  "t3ZG9cSfopnsMQupKW5v9sTotjcP5P6RTbn",
+  "t3hC1Ywb5zDwUYYV8LwhvF5rZ6m49jxXSG5",
+  "t3VgMqDL15ZcyQDeqBsBW3W6rzfftrWP2yB",
+  "t3LC94Y6BwLoDtBoK2NuewaEbnko1zvR9rm",
+  "t3cWCUZJR3GtALaTcatrrpNJ3MGbMFVLRwQ",
+  "t3YYF4rPLVxDcF9hHFsXyc5Yq1TFfbojCY6",
+  "t3XHAGxRP2FNfhAjxGjxbrQPYtQQjc3RCQD"
+]
 
-FS_ZF_Addresses[0..47] = TODO
+FS_ZF_Addresses[0..47] = ["t3dvVE3SQEi7kqNzwrfNePxZ1d4hUyztBA1"] * 48
 
-FS_MG_Addresses[0..47] = TODO

+FS_MG_Addresses[0..47] = ["t3XyYW8yBFRuMnfvm5KLGFbEVz25kckZXym"] * 48

Testnet Recipient Addresses

- 
FS_ECC_Addresses[0..50] = [
+                
FS_BP_Addresses[0..50] = [
   "t26ovBdKAJLtrvBsE2QGF4nqBkEuptuPFZz",
   "t26ovBdKAJLtrvBsE2QGF4nqBkEuptuPFZz",
   "t26ovBdKAJLtrvBsE2QGF4nqBkEuptuPFZz",
diff --git a/zip-0214.rst b/zip-0214.rst
index 82e2d36b..ad7c069b 100644
--- a/zip-0214.rst
+++ b/zip-0214.rst
@@ -30,9 +30,10 @@ section 3.9 of the Zcash Protocol Specification [#protocol-subsidyconcepts]_.
 The term "halving" in this document are to be interpreted as described in
 sections 7.7 of the Zcash Protocol Specification [#protocol-subsidies]_.
 
-The terms "Electric Coin Company" (or "ECC"), "Zcash Foundation" (or "ZF"),
-"Major Grants", "ECC slice", "ZF slice", and "MG slice" in this document are to
-be interpreted as described in ZIP 1014 [#zip-1014]_.
+The terms "Bootstrap Project" (or "BP"), "Electric Coin Company" (or "ECC"),
+"Zcash Foundation" (or "ZF"), "Major Grants", "BP slice", "ZF slice", and
+"MG slice" in this document are to be interpreted as described in ZIP 1014
+[#zip-1014]_.
 
 The terms "Testnet" and "Mainnet" are to be interpreted as described in
 section 3.11 of the Zcash Protocol Specification [#protocol-networks]_.
@@ -105,7 +106,7 @@ The following funding streams are defined for Mainnet:
   ================= =========== ============= ============== ============
         Stream       Numerator   Denominator   Start height   End height
   ================= =========== ============= ============== ============
-  ``FS_ZIP214_ECC``      7           100          1046400       2726400
+  ``FS_ZIP214_BP``       7           100          1046400       2726400
   ``FS_ZIP214_ZF``       5           100          1046400       2726400
   ``FS_ZIP214_MG``       8           100          1046400       2726400
   ================= =========== ============= ============== ============
@@ -119,7 +120,7 @@ The following funding streams are defined for Testnet:
   ================= =========== ============= ============== ============
         Stream       Numerator   Denominator   Start height   End height
   ================= =========== ============= ============== ============
-  ``FS_ZIP214_ECC``      7           100          1028500       2796000
+  ``FS_ZIP214_BP``       7           100          1028500       2796000
   ``FS_ZIP214_ZF``       5           100          1028500       2796000
   ``FS_ZIP214_MG``       8           100          1028500       2796000
   ================= =========== ============= ============== ============
@@ -146,8 +147,8 @@ with the activation height set for that network, each of the parties (ECC and ZF
 SHALL generate sequences of recipient addresses to be used for each stream in each
 funding period:
 
-* ECC SHALL generate the addresses for the ``FS_ECC`` funding stream, which on
-  Mainnet corresponds to the **ECC slice**;
+* ECC SHALL generate the addresses for the ``FS_BP`` funding stream, which on
+  Mainnet corresponds to the **BP slice**;
 * ZF SHALL generate the addresses for the ``FS_ZF`` and ``FS_MG`` funding streams,
   which on Mainnet correspond to the **ZF slice** and **MG slice** respectively.
 
@@ -183,11 +184,60 @@ Mainnet Recipient Addresses
 
 ::
 
-  FS_ECC_Addresses[0..47] = TODO
+  FS_BP_Addresses[0..47] = [
+    "t3LmX1cxWPPPqL4TZHx42HU3U5ghbFjRiif",
+    "t3Toxk1vJQ6UjWQ42tUJz2rV2feUWkpbTDs",
+    "t3ZBdBe4iokmsjdhMuwkxEdqMCFN16YxKe6",
+    "t3ZuaJziLM8xZ32rjDUzVjVtyYdDSz8GLWB",
+    "t3bAtYWa4bi8VrtvqySxnbr5uqcG9czQGTZ",
+    "t3dktADfb5Rmxncpe1HS5BRS5Gcj7MZWYBi",
+    "t3hgskquvKKoCtvxw86yN7q8bzwRxNgUZmc",
+    "t3R1VrLzwcxAZzkX4mX3KGbWpNsgtYtMntj",
+    "t3ff6fhemqPMVujD3AQurxRxTdvS1pPSaa2",
+    "t3cEUQFG3KYnFG6qYhPxSNgGi3HDjUPwC3J",
+    "t3WR9F5U4QvUFqqx9zFmwT6xFqduqRRXnaa",
+    "t3PYc1LWngrdUrJJbHkYPCKvJuvJjcm85Ch",
+    "t3bgkjiUeatWNkhxY3cWyLbTxKksAfk561R",
+    "t3Z5rrR8zahxUpZ8itmCKhMSfxiKjUp5Dk5",
+    "t3PU1j7YW3fJ67jUbkGhSRto8qK2qXCUiW3",
+    "t3S3yaT7EwNLaFZCamfsxxKwamQW2aRGEkh",
+    "t3eutXKJ9tEaPSxZpmowhzKhPfJvmtwTEZK",
+    "t3gbTb7brxLdVVghSPSd3ycGxzHbUpukeDm",
+    "t3UCKW2LrHFqPMQFEbZn6FpjqnhAAbfpMYR",
+    "t3NyHsrnYbqaySoQqEQRyTWkjvM2PLkU7Uu",
+    "t3QEFL6acxuZwiXtW3YvV6njDVGjJ1qeaRo",
+    "t3PdBRr2S1XTDzrV8bnZkXF3SJcrzHWe1wj",
+    "t3ZWyRPpWRo23pKxTLtWsnfEKeq9T4XPxKM",
+    "t3he6QytKCTydhpztykFsSsb9PmBT5JBZLi",
+    "t3VWxWDsLb2TURNEP6tA1ZSeQzUmPKFNxRY",
+    "t3NmWLvZkbciNAipauzsFRMxoZGqmtJksbz",
+    "t3cKr4YxVPvPBG1mCvzaoTTdBNokohsRJ8n",
+    "t3T3smGZn6BoSFXWWXa1RaoQdcyaFjMfuYK",
+    "t3gkDUe9Gm4GGpjMk86TiJZqhztBVMiUSSA",
+    "t3eretuBeBXFHe5jAqeSpUS1cpxVh51fAeb",
+    "t3dN8g9zi2UGJdixGe9txeSxeofLS9t3yFQ",
+    "t3S799pq9sYBFwccRecoTJ3SvQXRHPrHqvx",
+    "t3fhYnv1S5dXwau7GED3c1XErzt4n4vDxmf",
+    "t3cmE3vsBc5xfDJKXXZdpydCPSdZqt6AcNi",
+    "t3h5fPdjJVHaH4HwynYDM5BB3J7uQaoUwKi",
+    "t3Ma35c68BgRX8sdLDJ6WR1PCrKiWHG4Da9",
+    "t3LokMKPL1J8rkJZvVpfuH7dLu6oUWqZKQK",
+    "t3WFFGbEbhJWnASZxVLw2iTJBZfJGGX73mM",
+    "t3L8GLEsUn4QHNaRYcX3EGyXmQ8kjpT1zTa",
+    "t3PgfByBhaBSkH8uq4nYJ9ZBX4NhGCJBVYm",
+    "t3WecsqKDhWXD4JAgBVcnaCC2itzyNZhJrv",
+    "t3ZG9cSfopnsMQupKW5v9sTotjcP5P6RTbn",
+    "t3hC1Ywb5zDwUYYV8LwhvF5rZ6m49jxXSG5",
+    "t3VgMqDL15ZcyQDeqBsBW3W6rzfftrWP2yB",
+    "t3LC94Y6BwLoDtBoK2NuewaEbnko1zvR9rm",
+    "t3cWCUZJR3GtALaTcatrrpNJ3MGbMFVLRwQ",
+    "t3YYF4rPLVxDcF9hHFsXyc5Yq1TFfbojCY6",
+    "t3XHAGxRP2FNfhAjxGjxbrQPYtQQjc3RCQD"
+  ]
 
-  FS_ZF_Addresses[0..47] = TODO
+  FS_ZF_Addresses[0..47] = ["t3dvVE3SQEi7kqNzwrfNePxZ1d4hUyztBA1"] * 48
 
-  FS_MG_Addresses[0..47] = TODO
+  FS_MG_Addresses[0..47] = ["t3XyYW8yBFRuMnfvm5KLGFbEVz25kckZXym"] * 48
 
 
 Testnet Recipient Addresses
@@ -195,7 +245,7 @@ Testnet Recipient Addresses
 
 ::
 
-  FS_ECC_Addresses[0..50] = [
+  FS_BP_Addresses[0..50] = [
     "t26ovBdKAJLtrvBsE2QGF4nqBkEuptuPFZz",
     "t26ovBdKAJLtrvBsE2QGF4nqBkEuptuPFZz",
     "t26ovBdKAJLtrvBsE2QGF4nqBkEuptuPFZz",