From c0a19854bfddba4a556a8a6597b69b587e96cd26 Mon Sep 17 00:00:00 2001 From: "ewillbefull@gmail.com" Date: Wed, 15 Jul 2020 20:09:39 -0600 Subject: [PATCH 1/5] Add dev fund addresses for testnet NU4 activation. --- src/chainparams.cpp | 66 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 60 insertions(+), 6 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 39e2b0a65..ec4ad228e 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -379,24 +379,78 @@ public: keyConstants.bech32HRPs[SAPLING_EXTENDED_SPEND_KEY] = "secret-extended-key-test"; keyConstants.bech32HRPs[SAPLING_EXTENDED_FVK] = "zxviewtestsapling"; - // TODO: This `if` can be removed once canopy activation height is set. - if (consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight != Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT) { - std::vector addresses(48, ""); + // Testnet funding streams + { + std::vector ecc_addresses = { + "t26ovBdKAJLtrvBsE2QGF4nqBkEuptuPFZz", + "t2NNHrgPpE388atmWSF4DxAb3xAoW5Yp45M", + "t2VMN28itPyMeMHBEd9Z1hm6YLkQcGA1Wwe", + "t2CHa1TtdfUV8UYhNm7oxbzRyfr8616BYh2", + "t2F77xtr28U96Z2bC53ZEdTnQSUAyDuoa67", + "t2ARrzhbgcpoVBDPivUuj6PzXzDkTBPqfcT", + "t278aQ8XbvFR15mecRguiJDQQVRNnkU8kJw", + "t2Dp1BGnZsrTXZoEWLyjHmg3EPvmwBnPDGB", + "t2KzeqXgf4ju33hiSqCuKDb8iHjPCjMq9iL", + "t2Nyxqv1BiWY1eUSiuxVw36oveawYuo18tr", + "t2DKFk5JRsVoiuinK8Ti6eM4Yp7v8BbfTyH", + "t2CUaBca4k1x36SC4q8Nc8eBoqkMpF3CaLg", + "t296SiKL7L5wvFmEdMxVLz1oYgd6fTfcbZj", + "t29fBCFbhgsjL3XYEZ1yk1TUh7eTusB6dPg", + "t2FGofLJXa419A76Gpf5ncxQB4gQXiQMXjK", + "t2ExfrnRVnRiXDvxerQ8nZbcUQvNvAJA6Qu", + "t28JUffLp47eKPRHKvwSPzX27i9ow8LSXHx", + "t2JXWPtrtyL861rFWMZVtm3yfgxAf4H7uPA", + "t2QdgbJoWfYHgyvEDEZBjHmgkr9yNJff3Hi", + "t2QW43nkco8r32ZGRN6iw6eSzyDjkMwCV3n", + "t2DgYDXMJTYLwNcxighQ9RCgPxMVATRcUdC", + "t2Bop7dg33HGZx3wunnQzi2R2ntfpjuti3M", + "t2HVeEwovcLq9RstAbYkqngXNEsCe2vjJh9", + "t2HxbP5keQSx7p592zWQ5bJ5GrMmGDsV2Xa", + "t2TJzUg2matao3mztBRJoWnJY6ekUau6tPD", + "t29pMzxmo6wod25YhswcjKv3AFRNiBZHuhj", + "t2QBQMRiJKYjshJpE6RhbF7GLo51yE6d4wZ", + "t2F5RqnqguzZeiLtYHFx4yYfy6pDnut7tw5", + "t2CHvyZANE7XCtg8AhZnrcHCC7Ys1jJhK13", + "t2BRzpMdrGWZJ2upsaNQv6fSbkbTy7EitLo", + "t2BFixHGQMAWDY67LyTN514xRAB94iEjXp3", + "t2Uvz1iVPzBEWfQBH1p7NZJsFhD74tKaG8V", + "t2CmFDj5q6rJSRZeHf1SdrowinyMNcj438n", + "t2ErNvWEReTfPDBaNizjMPVssz66aVZh1hZ", + "t2GeJQ8wBUiHKDVzVM5ZtKfY5reCg7CnASs", + "t2L2eFtkKv1G6j55kLytKXTGuir4raAy3yr", + "t2EK2b87dpPazb7VvmEGc8iR6SJ289RywGL", + "t2DJ7RKeZJxdA4nZn8hRGXE8NUyTzjujph9", + "t2K1pXo4eByuWpKLkssyMLe8QKUbxnfFC3H", + "t2TB4mbSpuAcCWkH94Leb27FnRxo16AEHDg", + "t2Phx4gVL4YRnNsH3jM1M7jE4Fo329E66Na", + "t2VQZGmeNomN8c3USefeLL9nmU6M8x8CVzC", + "t2RicCvTVTY5y9JkreSRv3Xs8q2K67YxHLi", + "t2JrSLxTGc8wtPDe9hwbaeUjCrCfc4iZnDD", + "t2Uh9Au1PDDSw117sAbGivKREkmMxVC5tZo", + "t2FDwoJKLeEBMTy3oP7RLQ1Fihhvz49a3Bv", + "t2FY18mrgtb7QLeHA8ShnxLXuW8cNQ2n1v8", + "t2L15TkDYum7dnQRBqfvWdRe8Yw3jVy9z7g", + }; + + // ZF and MG use the same address for each funding period + std::vector zf_addresses(48, "t27eWDgjFYJGVXmzrXeVjnb5J3uXDM9xH9v"); + std::vector mg_addresses(48, "t2Gvxv2uNM7hbbACjNox4H6DjByoKZ2Fa3P"); + consensus.AddZIP207FundingStream( keyConstants, Consensus::FS_ZIP214_ECC, consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight, 2726400, - addresses); + ecc_addresses); consensus.AddZIP207FundingStream( keyConstants, Consensus::FS_ZIP214_ZF, consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight, 2726400, - addresses); + zf_addresses); consensus.AddZIP207FundingStream( keyConstants, Consensus::FS_ZIP214_MG, consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight, 2726400, - addresses); + mg_addresses); } // On testnet we activate this rule 6 blocks after Blossom activation. From block 299188 and From 8a4c51508acfa1765f168ebc6233fd68edff49bb Mon Sep 17 00:00:00 2001 From: therealyingtong Date: Fri, 17 Jul 2020 23:29:12 +0800 Subject: [PATCH 2/5] Set Canopy testnet activation height to 1020500 --- doc/release-notes.md | 2 +- src/chainparams.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/release-notes.md b/doc/release-notes.md index e9198c402..3e956b0f7 100644 --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -15,7 +15,7 @@ The code preparations for the Canopy network upgrade are finished and included i - [ZIP 214: Consensus rules for a Zcash Development Fund](https://zips.z.cash/zip-0214) - [ZIP 215: Explicitly Defining and Modifying Ed25519 Validation Rules](https://zips.z.cash/zip-0215) -Canopy will activate on testnet at height TODO, and can also be activated at a specific height in regtest mode by setting the config option `-nuparams=0xe9ff75a6:HEIGHT`. +Canopy will activate on testnet at height 1020500, and can also be activated at a specific height in regtest mode by setting the config option `-nuparams=0xe9ff75a6:HEIGHT`. Canopy will activate on mainnet at height 1046400. diff --git a/src/chainparams.cpp b/src/chainparams.cpp index ec4ad228e..eaf9628f1 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -353,7 +353,7 @@ public: uint256S("05688d8a0e9ff7c04f6f05e6d695dc5ab43b9c4803342d77ae360b2b27d2468e"); consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nProtocolVersion = 170012; consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight = - Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT; + Consensus::NetworkUpgrade::1020500; consensus.nFundingPeriodLength = consensus.nPostBlossomSubsidyHalvingInterval / 48; From ab4d2ede400f1e9fff8d8f4cad811870fa4ff579 Mon Sep 17 00:00:00 2001 From: therealyingtong Date: Fri, 17 Jul 2020 23:29:52 +0800 Subject: [PATCH 3/5] Set PROTOCOL_VERSION to 170012 --- src/version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.h b/src/version.h index 971be1140..60807beee 100644 --- a/src/version.h +++ b/src/version.h @@ -9,7 +9,7 @@ * network protocol versioning */ -static const int PROTOCOL_VERSION = 170011; +static const int PROTOCOL_VERSION = 170012; //! initial proto version, to be increased after version/verack negotiation static const int INIT_PROTO_VERSION = 209; From 62c3613816f82603a4529403454fcb2a16e69b12 Mon Sep 17 00:00:00 2001 From: therealyingtong Date: Fri, 24 Jul 2020 06:45:28 +0800 Subject: [PATCH 4/5] Delay testnet activation height by one week --- doc/release-notes.md | 2 +- src/chainparams.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/doc/release-notes.md b/doc/release-notes.md index 3e956b0f7..8eae9e9d7 100644 --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -15,7 +15,7 @@ The code preparations for the Canopy network upgrade are finished and included i - [ZIP 214: Consensus rules for a Zcash Development Fund](https://zips.z.cash/zip-0214) - [ZIP 215: Explicitly Defining and Modifying Ed25519 Validation Rules](https://zips.z.cash/zip-0215) -Canopy will activate on testnet at height 1020500, and can also be activated at a specific height in regtest mode by setting the config option `-nuparams=0xe9ff75a6:HEIGHT`. +Canopy will activate on testnet at height 1028500, and can also be activated at a specific height in regtest mode by setting the config option `-nuparams=0xe9ff75a6:HEIGHT`. Canopy will activate on mainnet at height 1046400. diff --git a/src/chainparams.cpp b/src/chainparams.cpp index eaf9628f1..846593e42 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -352,8 +352,7 @@ public: consensus.vUpgrades[Consensus::UPGRADE_HEARTWOOD].hashActivationBlock = uint256S("05688d8a0e9ff7c04f6f05e6d695dc5ab43b9c4803342d77ae360b2b27d2468e"); consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nProtocolVersion = 170012; - consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight = - Consensus::NetworkUpgrade::1020500; + consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight = 1028500; consensus.nFundingPeriodLength = consensus.nPostBlossomSubsidyHalvingInterval / 48; From 283287ab5b41956ccdad0708875d5b0df95293d8 Mon Sep 17 00:00:00 2001 From: therealyingtong Date: Sat, 25 Jul 2020 04:44:08 +0800 Subject: [PATCH 5/5] Use 51 Testnet Dev Fund addresses, and adjust the end heights. Co-authored-by: Ying Tong Lai Signed-off-by: Daira Hopwood --- src/chainparams.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 846593e42..c436d872c 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -381,6 +381,9 @@ public: // Testnet funding streams { std::vector ecc_addresses = { + "t26ovBdKAJLtrvBsE2QGF4nqBkEuptuPFZz", + "t26ovBdKAJLtrvBsE2QGF4nqBkEuptuPFZz", + "t26ovBdKAJLtrvBsE2QGF4nqBkEuptuPFZz", "t26ovBdKAJLtrvBsE2QGF4nqBkEuptuPFZz", "t2NNHrgPpE388atmWSF4DxAb3xAoW5Yp45M", "t2VMN28itPyMeMHBEd9Z1hm6YLkQcGA1Wwe", @@ -432,23 +435,23 @@ public: }; // ZF and MG use the same address for each funding period - std::vector zf_addresses(48, "t27eWDgjFYJGVXmzrXeVjnb5J3uXDM9xH9v"); - std::vector mg_addresses(48, "t2Gvxv2uNM7hbbACjNox4H6DjByoKZ2Fa3P"); + std::vector zf_addresses(51, "t27eWDgjFYJGVXmzrXeVjnb5J3uXDM9xH9v"); + std::vector mg_addresses(51, "t2Gvxv2uNM7hbbACjNox4H6DjByoKZ2Fa3P"); consensus.AddZIP207FundingStream( keyConstants, Consensus::FS_ZIP214_ECC, - consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight, 2726400, + consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight, 2796000, ecc_addresses); consensus.AddZIP207FundingStream( keyConstants, Consensus::FS_ZIP214_ZF, - consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight, 2726400, + consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight, 2796000, zf_addresses); consensus.AddZIP207FundingStream( keyConstants, Consensus::FS_ZIP214_MG, - consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight, 2726400, + consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight, 2796000, mg_addresses); }