Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master #1232

Merged
merged 3 commits into from
Oct 1, 2024
Merged

Merge master #1232

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c21ce2
Merge pull request #1139 from ton-blockchain/stable_testnet
EmelyanenkoK Aug 30, 2024
1bef6df
Merge pull request #1156 from ton-blockchain/safe_features
EmelyanenkoK Sep 9, 2024
921aa29
create complaints for master vals only for masterchain blocks (#1231)
yungwine Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions lite-client/lite-client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3657,7 +3657,7 @@ void TestNode::continue_check_validator_load3(std::unique_ptr<TestNode::Validato
std::unique_ptr<TestNode::ValidatorLoadInfo> info2, int mode,
std::string file_pfx) {
LOG(INFO) << "continue_check_validator_load3 for blocks " << info1->blk_id.to_str() << " and "
<< info1->blk_id.to_str() << " with mode=" << mode << " and file prefix `" << file_pfx
<< info2->blk_id.to_str() << " with mode=" << mode << " and file prefix `" << file_pfx
<< "`: comparing block creators data";
if (info1->created_total.first <= 0 || info2->created_total.first <= 0) {
LOG(ERROR) << "no total created blocks statistics";
Expand Down Expand Up @@ -3718,13 +3718,14 @@ void TestNode::continue_check_validator_load3(std::unique_ptr<TestNode::Validato
block::MtCarloComputeShare shard_share(shard_count, info2->vset->export_scaled_validator_weights());
for (int i = 0; i < count; i++) {
int x1 = d[i].first, y1 = d[i].second;
double xe = (i < main_count ? (double)xs / main_count : 0);
bool is_masterchain_validator = i < main_count;
double xe = (is_masterchain_validator ? (double)xs / main_count : 0);
double ye = shard_share[i] * (double)ys / shard_count;
td::Bits256 pk = info2->vset->list[i].pubkey.as_bits256();
double p1 = create_prob(x1, .9 * xe), p2 = shard_create_prob(y1, .9 * ye, chunk_size);
td::TerminalIO::out() << "val #" << i << ": pubkey " << pk.to_hex() << ", blocks created (" << x1 << "," << y1
<< "), expected (" << xe << "," << ye << "), probabilities " << p1 << " and " << p2 << "\n";
if (std::min(p1, p2) < .00001) {
if ((is_masterchain_validator ? p1 : p2) < .00001) {
LOG(ERROR) << "validator #" << i << " with pubkey " << pk.to_hex()
<< " : serious misbehavior detected: created less than 90% of the expected amount of blocks with "
"probability 99.999% : created ("
Expand All @@ -3737,7 +3738,7 @@ void TestNode::continue_check_validator_load3(std::unique_ptr<TestNode::Validato
cnt_ok++;
}
}
} else if (std::min(p1, p2) < .005) {
} else if ((is_masterchain_validator ? p1 : p2) < .005) {
LOG(ERROR) << "validator #" << i << " with pubkey " << pk.to_hex()
<< " : moderate misbehavior detected: created less than 90% of the expected amount of blocks with "
"probability 99.5% : created ("
Expand Down
Loading