From fc4614fcbef953ab9ce8000df7352ac769133d1b Mon Sep 17 00:00:00 2001 From: HaoqiangZhang Date: Fri, 17 Jul 2020 16:07:14 +0800 Subject: [PATCH] update protocol.json (#625) * update protocol.json remove MaxValidatorsCount and MaxCommitteeMembersCount add ValidatorsCount * Update neo-cli.csproj * Update protocol.json * Apply https://github.com/neo-project/neo/pull/1770 * Update protocol.mainnet.json * Update protocol.testnet.json * Update last version * update to the latest * fix * update * fix * remove commiteemembercount Co-authored-by: Owen Zhang <38493437+superboyiii@users.noreply.github.com> Co-authored-by: Shargon Co-authored-by: superboyiii <573504781@qq.com> --- neo-cli/neo-cli.csproj | 2 +- neo-cli/protocol.json | 21 +++++++++++++++++---- neo-cli/protocol.mainnet.json | 21 +++++++++++++++++---- neo-cli/protocol.testnet.json | 5 ++--- 4 files changed, 37 insertions(+), 12 deletions(-) diff --git a/neo-cli/neo-cli.csproj b/neo-cli/neo-cli.csproj index 4063297f2..03eae04a5 100644 --- a/neo-cli/neo-cli.csproj +++ b/neo-cli/neo-cli.csproj @@ -28,7 +28,7 @@ - + diff --git a/neo-cli/protocol.json b/neo-cli/protocol.json index 4d61e6c3c..88e0e135d 100644 --- a/neo-cli/protocol.json +++ b/neo-cli/protocol.json @@ -2,16 +2,29 @@ "ProtocolConfiguration": { "Magic": 5195086, "MillisecondsPerBlock": 15000, - "MaxCommitteeMembersCount": 21, - "MaxValidatorsCount": 7, - "StandbyValidators": [ + "ValidatorsCount": 7, + "StandbyCommittee": [ "03b209fd4f53a7170ea4444e0cb0a6bb6a53c2bd016926989cf85f9b0fba17a70c", "02df48f60e8f3e01c48ff40b9b7f1310d7a8b2a193188befe1c2e3df740e895093", "03b8d9d5771d8f513aa0869b9cc8d50986403b78c6da36890638c3d46a5adce04a", "02ca0e27697b9c248f6f16e085fd0061e26f44da85b58ee835c110caa5ec3ba554", "024c7b7fb6c310fccf1ba33b082519d82964ea93868d676662d4a59ad548df0e7d", "02aaec38470f6aad0042c6e877cfd8087d2676b0f516fddd362801b9bd3936399e", - "02486fd15702c4490a26703112a5cc1d0923fd697a33406bd5a1c00e0013b09a70" + "02486fd15702c4490a26703112a5cc1d0923fd697a33406bd5a1c00e0013b09a70", + "023a36c72844610b4d34d1968662424011bf783ca9d984efa19a20babf5582f3fe", + "03708b860c1de5d87f5b151a12c2a99feebd2e8b315ee8e7cf8aa19692a9e18379", + "03c6aa6e12638b36e88adc1ccdceac4db9929575c3e03576c617c49cce7114a050", + "03204223f8c86b8cd5c89ef12e4f0dbb314172e9241e30c9ef2293790793537cf0", + "02a62c915cf19c7f19a50ec217e79fac2439bbaad658493de0c7d8ffa92ab0aa62", + "03409f31f0d66bdc2f70a9730b66fe186658f84a8018204db01c106edc36553cd0", + "0288342b141c30dc8ffcde0204929bb46aed5756b41ef4a56778d15ada8f0c6654", + "020f2887f41474cfeb11fd262e982051c1541418137c02a0f4961af911045de639", + "0222038884bbd1d8ff109ed3bdef3542e768eef76c1247aea8bc8171f532928c30", + "03d281b42002647f0113f36c7b8efb30db66078dfaaa9ab3ff76d043a98d512fde", + "02504acbc1f4b3bdad1d86d6e1a08603771db135a73e61c9d565ae06a1938cd2ad", + "0226933336f1b75baa42d42b71d9091508b638046d19abd67f4e119bf64a7cfb4d", + "03cdcea66032b82f5c30450e381e5295cae85c5e6943af716cc6b646352a6067dc", + "02cd5a5547119e24feaa7c2a0f37b8c9366216bab7054de0065c9be42084003c8a" ], "SeedList": [ "seed1.neo.org:10333", diff --git a/neo-cli/protocol.mainnet.json b/neo-cli/protocol.mainnet.json index 4d61e6c3c..88e0e135d 100644 --- a/neo-cli/protocol.mainnet.json +++ b/neo-cli/protocol.mainnet.json @@ -2,16 +2,29 @@ "ProtocolConfiguration": { "Magic": 5195086, "MillisecondsPerBlock": 15000, - "MaxCommitteeMembersCount": 21, - "MaxValidatorsCount": 7, - "StandbyValidators": [ + "ValidatorsCount": 7, + "StandbyCommittee": [ "03b209fd4f53a7170ea4444e0cb0a6bb6a53c2bd016926989cf85f9b0fba17a70c", "02df48f60e8f3e01c48ff40b9b7f1310d7a8b2a193188befe1c2e3df740e895093", "03b8d9d5771d8f513aa0869b9cc8d50986403b78c6da36890638c3d46a5adce04a", "02ca0e27697b9c248f6f16e085fd0061e26f44da85b58ee835c110caa5ec3ba554", "024c7b7fb6c310fccf1ba33b082519d82964ea93868d676662d4a59ad548df0e7d", "02aaec38470f6aad0042c6e877cfd8087d2676b0f516fddd362801b9bd3936399e", - "02486fd15702c4490a26703112a5cc1d0923fd697a33406bd5a1c00e0013b09a70" + "02486fd15702c4490a26703112a5cc1d0923fd697a33406bd5a1c00e0013b09a70", + "023a36c72844610b4d34d1968662424011bf783ca9d984efa19a20babf5582f3fe", + "03708b860c1de5d87f5b151a12c2a99feebd2e8b315ee8e7cf8aa19692a9e18379", + "03c6aa6e12638b36e88adc1ccdceac4db9929575c3e03576c617c49cce7114a050", + "03204223f8c86b8cd5c89ef12e4f0dbb314172e9241e30c9ef2293790793537cf0", + "02a62c915cf19c7f19a50ec217e79fac2439bbaad658493de0c7d8ffa92ab0aa62", + "03409f31f0d66bdc2f70a9730b66fe186658f84a8018204db01c106edc36553cd0", + "0288342b141c30dc8ffcde0204929bb46aed5756b41ef4a56778d15ada8f0c6654", + "020f2887f41474cfeb11fd262e982051c1541418137c02a0f4961af911045de639", + "0222038884bbd1d8ff109ed3bdef3542e768eef76c1247aea8bc8171f532928c30", + "03d281b42002647f0113f36c7b8efb30db66078dfaaa9ab3ff76d043a98d512fde", + "02504acbc1f4b3bdad1d86d6e1a08603771db135a73e61c9d565ae06a1938cd2ad", + "0226933336f1b75baa42d42b71d9091508b638046d19abd67f4e119bf64a7cfb4d", + "03cdcea66032b82f5c30450e381e5295cae85c5e6943af716cc6b646352a6067dc", + "02cd5a5547119e24feaa7c2a0f37b8c9366216bab7054de0065c9be42084003c8a" ], "SeedList": [ "seed1.neo.org:10333", diff --git a/neo-cli/protocol.testnet.json b/neo-cli/protocol.testnet.json index 4b975181f..ed3afe6d7 100644 --- a/neo-cli/protocol.testnet.json +++ b/neo-cli/protocol.testnet.json @@ -2,9 +2,8 @@ "ProtocolConfiguration": { "Magic": 1951352142, "MillisecondsPerBlock": 15000, - "MaxCommitteeMembersCount": 21, - "MaxValidatorsCount": 7, - "StandbyValidators": [ + "ValidatorsCount": 7, + "StandbyCommittee": [ "023e9b32ea89b94d066e649b124fd50e396ee91369e8e2a6ae1b11c170d022256d", "03009b7540e10f2562e5fd8fac9eaec25166a58b26e412348ff5a86927bfac22a2", "02ba2c70f5996f357a43198705859fae2cfea13e1172962800772b3d588a9d4abd",