From ff8d70ae6f66c88ee103f823d1b7aee6c2018964 Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Tue, 27 Oct 2020 13:30:48 +0000 Subject: [PATCH] ZIP 214: ensure consistent naming of funding streams. Signed-off-by: Daira Hopwood --- zip-0214.html | 21 +++++++++++---------- zip-0214.rst | 28 ++++++++++++++++------------ 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/zip-0214.html b/zip-0214.html index ec03fa3e..ac40c80d 100644 --- a/zip-0214.html +++ b/zip-0214.html @@ -128,8 +128,8 @@ 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 on behalf of BP; 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.

Funds sent to each Mainnet funding stream SHALL be governed by all requirements on the corresponding slice specified in ZIP 1014 12.

@@ -141,7 +141,7 @@ Discussions-To: <

Mainnet Recipient Addresses

- 
FS_BP_Addresses[0..47] = [
+                
FS_ZIP214_BP.AddressList[0..47] = [
   "t3LmX1cxWPPPqL4TZHx42HU3U5ghbFjRiif",
   "t3Toxk1vJQ6UjWQ42tUJz2rV2feUWkpbTDs",
   "t3ZBdBe4iokmsjdhMuwkxEdqMCFN16YxKe6",
@@ -192,12 +192,13 @@ Discussions-To: <
+FS_ZIP214_MG.AddressList[0..47] = ["t3XyYW8yBFRuMnfvm5KLGFbEVz25kckZXym"] * 48

+                
(i.e. FS_ZIP214_ZF.AddressList and FS_ZIP214_MG.AddressList for Mainnet each consist of 48 repetitions of the same address).

             
             
Testnet Recipient Addresses 

-                
FS_BP_Addresses[0..50] = [
+                
FS_ZIP214_BP.AddressList[0..50] = [
   "t26ovBdKAJLtrvBsE2QGF4nqBkEuptuPFZz",
   "t26ovBdKAJLtrvBsE2QGF4nqBkEuptuPFZz",
   "t26ovBdKAJLtrvBsE2QGF4nqBkEuptuPFZz",
@@ -251,14 +252,14 @@ FS_MG_Addresses[0..47] = ["t3XyYW8yBFRuMnfvm5KLGFbEVz25kckZXym"] * 48

   "t2L15TkDYum7dnQRBqfvWdRe8Yw3jVy9z7g"
 ]
 
-FS_ZF_Addresses[0..50] = ["t27eWDgjFYJGVXmzrXeVjnb5J3uXDM9xH9v"] * 51
+FS_ZIP214_ZF.AddressList[0..50] = ["t27eWDgjFYJGVXmzrXeVjnb5J3uXDM9xH9v"] * 51
 
-FS_MG_Addresses[0..50] = ["t2Gvxv2uNM7hbbACjNox4H6DjByoKZ2Fa3P"] * 51

-                
(i.e. FS_ZF_Addresses and FS_MG_Addresses each consist of 51 repetitions of the same address).

+FS_ZIP214_MG.AddressList[0..50] = ["t2Gvxv2uNM7hbbACjNox4H6DjByoKZ2Fa3P"] * 51
+

(i.e. FS_ZIP214_ZF.AddressList and FS_ZIP214_MG.AddressList for Testnet each consist of 51 repetitions of the same address).

Rationale

-

The rationale for ZF generating the addresses for the ZF_MG funding stream is that ZF is the financial recipient of the MG slice as specified in ZIP 1014. 12

+

The rationale for ZF generating the addresses for the FS_ZIP214_MG funding stream is that ZF is the financial recipient of the MG slice as specified in ZIP 1014. 12

Generation of recipient addresses for Testnet is specified to be done by the same parties as on Mainnet, in order to allow practicing each party's security procedures.

It was judged to be unnecessary to have a mechanism to update funding stream definitions (in case of security breach or changes to direct grant recipients) other than at network upgrades.

diff --git a/zip-0214.rst b/zip-0214.rst index 3540d28f..81e037a2 100644 --- a/zip-0214.rst +++ b/zip-0214.rst @@ -147,10 +147,11 @@ with the activation height set for that network, each of the parties (ECC on beh of BP; 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_BP`` funding stream, which on +* ECC SHALL generate the addresses for the ``FS_ZIP214_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. +* ZF SHALL generate the addresses for the ``FS_ZIP214_ZF`` and ``FS_ZIP214_MG`` + funding streams, which on Mainnet correspond to the **ZF slice** and **MG slice** + respectively. Within each stream, the addresses MAY be independent, or MAY be repeated between funding periods. Each party SHOULD take account of operational security issues @@ -184,7 +185,7 @@ Mainnet Recipient Addresses :: - FS_BP_Addresses[0..47] = [ + FS_ZIP214_BP.AddressList[0..47] = [ "t3LmX1cxWPPPqL4TZHx42HU3U5ghbFjRiif", "t3Toxk1vJQ6UjWQ42tUJz2rV2feUWkpbTDs", "t3ZBdBe4iokmsjdhMuwkxEdqMCFN16YxKe6", @@ -235,9 +236,12 @@ Mainnet Recipient Addresses "t3XHAGxRP2FNfhAjxGjxbrQPYtQQjc3RCQD" ] - FS_ZF_Addresses[0..47] = ["t3dvVE3SQEi7kqNzwrfNePxZ1d4hUyztBA1"] * 48 + FS_ZIP214_ZF.AddressList[0..47] = ["t3dvVE3SQEi7kqNzwrfNePxZ1d4hUyztBA1"] * 48 - FS_MG_Addresses[0..47] = ["t3XyYW8yBFRuMnfvm5KLGFbEVz25kckZXym"] * 48 + FS_ZIP214_MG.AddressList[0..47] = ["t3XyYW8yBFRuMnfvm5KLGFbEVz25kckZXym"] * 48 + +(i.e. ``FS_ZIP214_ZF.AddressList`` and ``FS_ZIP214_MG.AddressList`` for Mainnet each +consist of 48 repetitions of the same address). Testnet Recipient Addresses @@ -245,7 +249,7 @@ Testnet Recipient Addresses :: - FS_BP_Addresses[0..50] = [ + FS_ZIP214_BP.AddressList[0..50] = [ "t26ovBdKAJLtrvBsE2QGF4nqBkEuptuPFZz", "t26ovBdKAJLtrvBsE2QGF4nqBkEuptuPFZz", "t26ovBdKAJLtrvBsE2QGF4nqBkEuptuPFZz", @@ -299,18 +303,18 @@ Testnet Recipient Addresses "t2L15TkDYum7dnQRBqfvWdRe8Yw3jVy9z7g" ] - FS_ZF_Addresses[0..50] = ["t27eWDgjFYJGVXmzrXeVjnb5J3uXDM9xH9v"] * 51 + FS_ZIP214_ZF.AddressList[0..50] = ["t27eWDgjFYJGVXmzrXeVjnb5J3uXDM9xH9v"] * 51 - FS_MG_Addresses[0..50] = ["t2Gvxv2uNM7hbbACjNox4H6DjByoKZ2Fa3P"] * 51 + FS_ZIP214_MG.AddressList[0..50] = ["t2Gvxv2uNM7hbbACjNox4H6DjByoKZ2Fa3P"] * 51 -(i.e. ``FS_ZF_Addresses`` and ``FS_MG_Addresses`` each consist of 51 repetitions -of the same address). +(i.e. ``FS_ZIP214_ZF.AddressList`` and ``FS_ZIP214_MG.AddressList`` for Testnet each +consist of 51 repetitions of the same address). Rationale ========= -The rationale for ZF generating the addresses for the ``ZF_MG`` funding +The rationale for ZF generating the addresses for the ``FS_ZIP214_MG`` funding stream is that ZF is the financial recipient of the **MG slice** as specified in ZIP 1014. [#zip-1014]_