external/ton
1
0
Fork 0
mirror of https://github.com/ton-blockchain/ton synced 2025-03-09 15:40:10 +00:00
Code Issues Releases Wiki Activity

vm bugfixes

Browse source
This commit is contained in:
ton 2020-02-28 18:59:47 +04:00
parent e27fb1e09c
commit dd4ac0f440
9 changed files with 107 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

3
validator/db/package.cpp
View file

@ -95,7 +95,8 @@ td::Result<std::pair<std::string, td::BufferSlice>> Package::read(td::uint64 off
return td::Status::Error(ErrorCode::notready, "too short read");
}
if ((header[0] & 0xffff) != entry_header_magic()) {
return td::Status::Error(ErrorCode::notready, "bad entry magic");
return td::Status::Error(ErrorCode::notready,
PSTRING() << "bad entry magic " << (header[0] & 0xffff) << " offset=" << offset);
}
offset += 8;
auto fname_size = header[0] >> 16;

12
validator/impl/collator.cpp
View file

@ -1628,7 +1628,7 @@ bool Collator::do_collate() {
return fatal_error("cannot compute the value to be created / minted / recovered");
}
// 2. tick transactions
LOG(DEBUG) << "create tick transactions";
LOG(INFO) << "create tick transactions";
if (!create_ticktock_transactions(2)) {
return fatal_error("cannot generate tick transactions");
}
@ -1642,18 +1642,18 @@ bool Collator::do_collate() {
// ...
}
// 4. import inbound internal messages, process or transit
LOG(DEBUG) << "process inbound internal messages";
LOG(INFO) << "process inbound internal messages";
if (!process_inbound_internal_messages()) {
return fatal_error("cannot process inbound internal messages");
}
// 5. import inbound external messages (if space&gas left)
LOG(DEBUG) << "process inbound external messages";
LOG(INFO) << "process inbound external messages";
if (!process_inbound_external_messages()) {
return fatal_error("cannot process inbound external messages");
}
// 6. process newly-generated messages (if space&gas left)
// (if we were unable to process all inbound messages, all new messages must be queued)
LOG(DEBUG) << "process newly-generated messages";
LOG(INFO) << "process newly-generated messages";
if (!process_new_messages(!inbound_queues_empty_)) {
return fatal_error("cannot process newly-generated outbound messages");
}
@ -1664,12 +1664,12 @@ bool Collator::do_collate() {
// ...
}
// 8. tock transactions
LOG(DEBUG) << "create tock transactions";
LOG(INFO) << "create tock transactions";
if (!create_ticktock_transactions(1)) {
return fatal_error("cannot generate tock transactions");
}
// 9. process newly-generated messages (only by including them into output queue)
LOG(DEBUG) << "enqueue newly-generated messages";
LOG(INFO) << "enqueue newly-generated messages";
if (!process_new_messages(true)) {
return fatal_error("cannot process newly-generated outbound messages");
}