Skip to content

Commit

Permalink
Merge pull request #30 from tontechio/upstream
Browse files Browse the repository at this point in the history
bump ton/master
  • Loading branch information
tontechio authored Nov 7, 2021
2 parents d0c5a76 + 292ae26 commit 81ca0b8
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 0 deletions.
3 changes: 3 additions & 0 deletions crypto/block/transaction.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,7 @@ bool Account::init_new(ton::UnixTime now) {
}
state_hash = addr_orig;
status = orig_status = acc_nonexist;
split_depth_set_ = false;
created = true;
return true;
}
Expand Down Expand Up @@ -2243,6 +2244,8 @@ Ref<vm::Cell> Transaction::commit(Account& acc) {
acc.tock = new_tock;
} else {
acc.tick = acc.tock = false;
acc.split_depth_set_ = false;
acc.created = true;
}
end_lt = 0;
acc.push_transaction(root, start_lt);
Expand Down
8 changes: 8 additions & 0 deletions validator/impl/collator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2298,6 +2298,10 @@ Ref<vm::Cell> Collator::create_ordinary_transaction(Ref<vm::Cell> msg_root) {
}
register_new_msgs(*trans);
update_max_lt(acc->last_trans_end_lt_);
// temporary patch to stop producing dangerous block
if (acc->status == block::Account::acc_nonexist) {
block_full_ = true;
}
return trans_root;
}

Expand Down Expand Up @@ -2447,6 +2451,10 @@ int Collator::process_one_new_message(block::NewOutMsg msg, bool enqueue_only, R
if (!insert_out_msg(cb.finalize())) {
return -1;
}
// 6.5. check for temporary patch can be left here
if (block_full_) {
return 3;
}
// 7. check whether the block is full now
if (!block_limit_status_->fits(block::ParamLimits::cl_normal)) {
block_full_ = true;
Expand Down

0 comments on commit 81ca0b8

Please sign in to comment.