From 6d4ddda9a39563a4f635020e5d51648735ed9856 Mon Sep 17 00:00:00 2001 From: Andy Oknen Date: Tue, 21 Jun 2022 11:10:36 +0300 Subject: [PATCH] Set fork changes height to 1757000 --- src/pocketdb/consensus/Base.h | 15 +++++++-------- src/pocketdb/consensus/Reputation.h | 4 +--- src/pocketdb/consensus/social/BoostContent.hpp | 2 +- src/pocketdb/consensus/social/Post.hpp | 2 +- src/pocketdb/consensus/social/ScoreComment.hpp | 2 +- src/pocketdb/consensus/social/ScoreContent.hpp | 2 +- src/pocketdb/consensus/social/Subscribe.hpp | 2 +- .../consensus/social/SubscribePrivate.hpp | 2 +- 8 files changed, 14 insertions(+), 17 deletions(-) diff --git a/src/pocketdb/consensus/Base.h b/src/pocketdb/consensus/Base.h index df7aa13c3..aa4e522d5 100644 --- a/src/pocketdb/consensus/Base.h +++ b/src/pocketdb/consensus/Base.h @@ -403,20 +403,20 @@ namespace PocketConsensus { NetworkTest, { {0, 6} } } } }, { ConsensusLimit_trial_comment, { - { NetworkMain, { {0, 150}, {9999999, 50} } }, + { NetworkMain, { {0, 150}, {1757000, 50} } }, { NetworkTest, { {0, 150} } } } }, { ConsensusLimit_trial_comment_score, { - { NetworkMain, { {0, 300}, {9999999, 100} } }, + { NetworkMain, { {0, 300}, {1757000, 100} } }, { NetworkTest, { {0, 300} } } } }, { ConsensusLimit_full_post, { - { NetworkMain, { {0, 30}, {9999999, 10} } }, + { NetworkMain, { {0, 30}, {1757000, 10} } }, { NetworkTest, { {0, 30} } } } }, { ConsensusLimit_full_video, { - { NetworkMain, { {0, 30}, {9999999, 10} } }, + { NetworkMain, { {0, 30}, {1757000, 10} } }, { NetworkTest, { {0, 30} } } } }, { ConsensusLimit_full_article, { @@ -424,7 +424,7 @@ namespace PocketConsensus { NetworkTest, { {0, 30} } } } }, { ConsensusLimit_full_score, { - { NetworkMain, { {0, 90}, {175600, 200}, {9999999, 60} } }, + { NetworkMain, { {0, 90}, {175600, 200}, {1757000, 60} } }, { NetworkTest, { {0, 200} } } } }, { ConsensusLimit_full_complain, { @@ -432,11 +432,11 @@ namespace PocketConsensus { NetworkTest, { {0, 12} } } } }, { ConsensusLimit_full_comment, { - { NetworkMain, { {0, 300}, {9999999, 100} } }, + { NetworkMain, { {0, 300}, {1757000, 100} } }, { NetworkTest, { {0, 300} } } } }, { ConsensusLimit_full_comment_score, { - { NetworkMain, { {0, 600}, {9999999, 200} } }, + { NetworkMain, { {0, 600}, {1757000, 200} } }, { NetworkTest, { {0, 600} } } } }, @@ -445,7 +445,6 @@ namespace PocketConsensus { NetworkTest, { {0, 100} } } } }, - // TODO (brangr): implement height fork { ConsensusLimit_moderation_flag_count, { { NetworkMain, { {0, 30} }}, { NetworkTest, { {0, 100} }} diff --git a/src/pocketdb/consensus/Reputation.h b/src/pocketdb/consensus/Reputation.h index 883bfcd77..c22d825de 100644 --- a/src/pocketdb/consensus/Reputation.h +++ b/src/pocketdb/consensus/Reputation.h @@ -113,7 +113,6 @@ namespace PocketConsensus ratingValues[RatingType::ACCOUNT_LIKERS_COMMENT_ANSWER_LAST][scoreData->ContentAddressId] = 0; } - // TODO (brangr): implement new logic for only comments and dislikers virtual bool ValidateScoreValue(const ScoreDataDtoRef& scoreData) { // For scores to posts allowed only 4 and 5 values @@ -390,8 +389,7 @@ namespace PocketConsensus { 1180000, 0, [](int height) { return make_shared(height); }}, { 1324655, 65000, [](int height) { return make_shared(height); }}, { 1700000, 761000, [](int height) { return make_shared(height); }}, - // TODO (brangr): implement height - { 9999999, 947500, [](int height) { return make_shared(height); }}, + { 1757000, 947500, [](int height) { return make_shared(height); }}, }; public: shared_ptr Instance(int height) diff --git a/src/pocketdb/consensus/social/BoostContent.hpp b/src/pocketdb/consensus/social/BoostContent.hpp index e884985f6..ab490ec75 100644 --- a/src/pocketdb/consensus/social/BoostContent.hpp +++ b/src/pocketdb/consensus/social/BoostContent.hpp @@ -112,7 +112,7 @@ namespace PocketConsensus const vector> m_rules = { { 0, 0, [](int height) { return make_shared(height); }}, { 1586000, 528100, [](int height) { return make_shared(height); }}, - { 9999999, 953000, [](int height) { return make_shared(height); }}, + { 1757000, 953000, [](int height) { return make_shared(height); }}, }; public: shared_ptr Instance(int height) diff --git a/src/pocketdb/consensus/social/Post.hpp b/src/pocketdb/consensus/social/Post.hpp index f57d6718f..12ec0e0fe 100644 --- a/src/pocketdb/consensus/social/Post.hpp +++ b/src/pocketdb/consensus/social/Post.hpp @@ -340,7 +340,7 @@ namespace PocketConsensus { 0, -1, [](int height) { return make_shared(height); }}, { 1124000, -1, [](int height) { return make_shared(height); }}, { 1180000, -1, [](int height) { return make_shared(height); }}, - { 9999999, 953000, [](int height) { return make_shared(height); }}, + { 1757000, 953000, [](int height) { return make_shared(height); }}, }; public: shared_ptr Instance(int height) diff --git a/src/pocketdb/consensus/social/ScoreComment.hpp b/src/pocketdb/consensus/social/ScoreComment.hpp index d431ddd01..891cc4301 100644 --- a/src/pocketdb/consensus/social/ScoreComment.hpp +++ b/src/pocketdb/consensus/social/ScoreComment.hpp @@ -285,7 +285,7 @@ namespace PocketConsensus { 514184, -1, [](int height) { return make_shared(height); }}, { 1124000, -1, [](int height) { return make_shared(height); }}, { 1180000, 0, [](int height) { return make_shared(height); }}, - { 9999999, 953000, [](int height) { return make_shared(height); }}, + { 1757000, 953000, [](int height) { return make_shared(height); }}, }; public: shared_ptr Instance(int height) diff --git a/src/pocketdb/consensus/social/ScoreContent.hpp b/src/pocketdb/consensus/social/ScoreContent.hpp index 5cf61b0ea..f1e6cdab0 100644 --- a/src/pocketdb/consensus/social/ScoreContent.hpp +++ b/src/pocketdb/consensus/social/ScoreContent.hpp @@ -303,7 +303,7 @@ namespace PocketConsensus { 1124000, -1, [](int height) { return make_shared(height); }}, { 1180000, 0, [](int height) { return make_shared(height); }}, { 1324655, 65000, [](int height) { return make_shared(height); }}, - { 9999999, 953000, [](int height) { return make_shared(height); }}, + { 1757000, 953000, [](int height) { return make_shared(height); }}, }; public: shared_ptr Instance(int height) diff --git a/src/pocketdb/consensus/social/Subscribe.hpp b/src/pocketdb/consensus/social/Subscribe.hpp index 284a2d3eb..8178179c6 100644 --- a/src/pocketdb/consensus/social/Subscribe.hpp +++ b/src/pocketdb/consensus/social/Subscribe.hpp @@ -128,7 +128,7 @@ namespace PocketConsensus private: const vector> m_rules = { { 0, 0, [](int height) { return make_shared(height); }}, - { 9999999, 953000, [](int height) { return make_shared(height); }}, + { 1757000, 953000, [](int height) { return make_shared(height); }}, }; public: shared_ptr Instance(int height) diff --git a/src/pocketdb/consensus/social/SubscribePrivate.hpp b/src/pocketdb/consensus/social/SubscribePrivate.hpp index b811296c6..28c2148a1 100644 --- a/src/pocketdb/consensus/social/SubscribePrivate.hpp +++ b/src/pocketdb/consensus/social/SubscribePrivate.hpp @@ -128,7 +128,7 @@ namespace PocketConsensus private: const vector> m_rules = { { 0, 0, [](int height) { return make_shared(height); }}, - { 9999999, 953000, [](int height) { return make_shared(height); }}, + { 1757000, 953000, [](int height) { return make_shared(height); }}, }; public: shared_ptr Instance(int height)