Skip to content

Commit

Permalink
Set fork changes height to 1757000
Browse files Browse the repository at this point in the history
  • Loading branch information
andyoknen committed Jun 21, 2022
1 parent f257edc commit 6d4ddda
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 17 deletions.
15 changes: 7 additions & 8 deletions src/pocketdb/consensus/Base.h
Original file line number Diff line number Diff line change
Expand Up @@ -403,40 +403,40 @@ 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, {
{ NetworkMain, { {0, 3} } },
{ 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, {
{ NetworkMain, { {0, 12} } },
{ 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} } }
} },

Expand All @@ -445,7 +445,6 @@ namespace PocketConsensus
{ NetworkTest, { {0, 100} } }
} },

// TODO (brangr): implement height fork
{ ConsensusLimit_moderation_flag_count, {
{ NetworkMain, { {0, 30} }},
{ NetworkTest, { {0, 100} }}
Expand Down
4 changes: 1 addition & 3 deletions src/pocketdb/consensus/Reputation.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -390,8 +389,7 @@ namespace PocketConsensus
{ 1180000, 0, [](int height) { return make_shared<ReputationConsensus_checkpoint_1180000>(height); }},
{ 1324655, 65000, [](int height) { return make_shared<ReputationConsensus_checkpoint_1324655>(height); }},
{ 1700000, 761000, [](int height) { return make_shared<ReputationConsensus_checkpoint_scores_content_author_reducing_impact>(height); }},
// TODO (brangr): implement height
{ 9999999, 947500, [](int height) { return make_shared<ReputationConsensus_checkpoint_badges>(height); }},
{ 1757000, 947500, [](int height) { return make_shared<ReputationConsensus_checkpoint_badges>(height); }},
};
public:
shared_ptr<ReputationConsensus> Instance(int height)
Expand Down
2 changes: 1 addition & 1 deletion src/pocketdb/consensus/social/BoostContent.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ namespace PocketConsensus
const vector<ConsensusCheckpoint<BoostContentConsensus>> m_rules = {
{ 0, 0, [](int height) { return make_shared<BoostContentConsensus>(height); }},
{ 1586000, 528100, [](int height) { return make_shared<BoostContentConsensus_checkpoint_accept>(height); }},
{ 9999999, 953000, [](int height) { return make_shared<BoostContentConsensus_checkpoint_disable_for_blocked>(height); }},
{ 1757000, 953000, [](int height) { return make_shared<BoostContentConsensus_checkpoint_disable_for_blocked>(height); }},
};
public:
shared_ptr<BoostContentConsensus> Instance(int height)
Expand Down
2 changes: 1 addition & 1 deletion src/pocketdb/consensus/social/Post.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ namespace PocketConsensus
{ 0, -1, [](int height) { return make_shared<PostConsensus>(height); }},
{ 1124000, -1, [](int height) { return make_shared<PostConsensus_checkpoint_1124000>(height); }},
{ 1180000, -1, [](int height) { return make_shared<PostConsensus_checkpoint_1180000>(height); }},
{ 9999999, 953000, [](int height) { return make_shared<PostConsensus_checkpoint_disable_for_blocked>(height); }},
{ 1757000, 953000, [](int height) { return make_shared<PostConsensus_checkpoint_disable_for_blocked>(height); }},
};
public:
shared_ptr<PostConsensus> Instance(int height)
Expand Down
2 changes: 1 addition & 1 deletion src/pocketdb/consensus/social/ScoreComment.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ namespace PocketConsensus
{ 514184, -1, [](int height) { return make_shared<ScoreCommentConsensus_checkpoint_514184>(height); }},
{ 1124000, -1, [](int height) { return make_shared<ScoreCommentConsensus_checkpoint_1124000>(height); }},
{ 1180000, 0, [](int height) { return make_shared<ScoreCommentConsensus_checkpoint_1180000>(height); }},
{ 9999999, 953000, [](int height) { return make_shared<ScoreCommentConsensus_checkpoint_disable_for_blocked>(height); }},
{ 1757000, 953000, [](int height) { return make_shared<ScoreCommentConsensus_checkpoint_disable_for_blocked>(height); }},
};
public:
shared_ptr<ScoreCommentConsensus> Instance(int height)
Expand Down
2 changes: 1 addition & 1 deletion src/pocketdb/consensus/social/ScoreContent.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ namespace PocketConsensus
{ 1124000, -1, [](int height) { return make_shared<ScoreContentConsensus_checkpoint_1124000>(height); }},
{ 1180000, 0, [](int height) { return make_shared<ScoreContentConsensus_checkpoint_1180000>(height); }},
{ 1324655, 65000, [](int height) { return make_shared<ScoreContentConsensus_checkpoint_1324655>(height); }},
{ 9999999, 953000, [](int height) { return make_shared<ScoreContentConsensus_checkpoint_disable_for_blocked>(height); }},
{ 1757000, 953000, [](int height) { return make_shared<ScoreContentConsensus_checkpoint_disable_for_blocked>(height); }},
};
public:
shared_ptr<ScoreContentConsensus> Instance(int height)
Expand Down
2 changes: 1 addition & 1 deletion src/pocketdb/consensus/social/Subscribe.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ namespace PocketConsensus
private:
const vector<ConsensusCheckpoint < SubscribeConsensus>> m_rules = {
{ 0, 0, [](int height) { return make_shared<SubscribeConsensus>(height); }},
{ 9999999, 953000, [](int height) { return make_shared<SubscribeConsensus_checkpoint_disable_for_blocked>(height); }},
{ 1757000, 953000, [](int height) { return make_shared<SubscribeConsensus_checkpoint_disable_for_blocked>(height); }},
};
public:
shared_ptr<SubscribeConsensus> Instance(int height)
Expand Down
2 changes: 1 addition & 1 deletion src/pocketdb/consensus/social/SubscribePrivate.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ namespace PocketConsensus
private:
const vector<ConsensusCheckpoint < SubscribePrivateConsensus>> m_rules = {
{ 0, 0, [](int height) { return make_shared<SubscribePrivateConsensus>(height); }},
{ 9999999, 953000, [](int height) { return make_shared<SubscribePrivateConsensus_checkpoint_disable_for_blocked>(height); }},
{ 1757000, 953000, [](int height) { return make_shared<SubscribePrivateConsensus_checkpoint_disable_for_blocked>(height); }},
};
public:
shared_ptr<SubscribePrivateConsensus> Instance(int height)
Expand Down

0 comments on commit 6d4ddda

Please sign in to comment.