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

[emulator] Fix emulating on account_none and set account block_lt (#815)

Browse source 
* fix acc_deleted emulation case

* set account.block_lt
This commit is contained in:
Marat 2024-01-16 10:18:54 +01:00 • committed by GitHub
parent 4303e49c93
commit be94982348
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
emulator/emulator-extern.cpp
View file

@ -103,6 +103,7 @@ const char *transaction_emulator_emulate_transaction(void *transaction_emulator,
td::Ref<vm::CellSlice> addr_slice; td::Ref<vm::CellSlice> addr_slice;
auto account_slice = vm::load_cell_slice(shard_account.account); auto account_slice = vm::load_cell_slice(shard_account.account);
bool account_exists = block::gen::t_Account.get_tag(account_slice) == block::gen::Account::account;
if (block::gen::t_Account.get_tag(account_slice) == block::gen::Account::account_none) { if (block::gen::t_Account.get_tag(account_slice) == block::gen::Account::account_none) {
if (msg_tag == block::gen::CommonMsgInfo::ext_in_msg_info) { if (msg_tag == block::gen::CommonMsgInfo::ext_in_msg_info) {
block::gen::CommonMsgInfo::Record_ext_in_msg_info info; block::gen::CommonMsgInfo::Record_ext_in_msg_info info;
@ -120,12 +121,14 @@ const char *transaction_emulator_emulate_transaction(void *transaction_emulator,
} else { } else {
ERROR_RESPONSE(PSTRING() << "Only ext in and int message are supported"); ERROR_RESPONSE(PSTRING() << "Only ext in and int message are supported");
} }
} else { } else if (block::gen::t_Account.get_tag(account_slice) == block::gen::Account::account) {
block::gen::Account::Record_account account_record; block::gen::Account::Record_account account_record;
if (!tlb::unpack(account_slice, account_record)) { if (!tlb::unpack(account_slice, account_record)) {
ERROR_RESPONSE(PSTRING() << "Can't unpack account cell"); ERROR_RESPONSE(PSTRING() << "Can't unpack account cell");
} }
addr_slice = std::move(account_record.addr); addr_slice = std::move(account_record.addr);
} else {
ERROR_RESPONSE(PSTRING() << "Can't parse account cell");
} }
ton::WorkchainId wc; ton::WorkchainId wc;
ton::StdSmcAddress addr; ton::StdSmcAddress addr;
@ -139,8 +142,16 @@ const char *transaction_emulator_emulate_transaction(void *transaction_emulator,
now = (unsigned)std::time(nullptr); now = (unsigned)std::time(nullptr);
} }
bool is_special = wc == ton::masterchainId && emulator->get_config().is_special_smartcontract(addr); bool is_special = wc == ton::masterchainId && emulator->get_config().is_special_smartcontract(addr);
if (!account.unpack(vm::load_cell_slice_ref(shard_account_cell.move_as_ok()), now, is_special)) { if (account_exists) {
ERROR_RESPONSE(PSTRING() << "Can't unpack shard account"); if (!account.unpack(vm::load_cell_slice_ref(shard_account_cell.move_as_ok()), now, is_special)) {
ERROR_RESPONSE(PSTRING() << "Can't unpack shard account");
}
} else {
if (!account.init_new(now)) {
ERROR_RESPONSE(PSTRING() << "Can't init new account");
}
account.last_trans_lt_ = shard_account.last_trans_lt;
account.last_trans_hash_ = shard_account.last_trans_hash;
} }
auto result = emulator->emulate_transaction(std::move(account), message_cell, now, 0, block::transaction::Transaction::tr_ord); auto result = emulator->emulate_transaction(std::move(account), message_cell, now, 0, block::transaction::Transaction::tr_ord);

1
emulator/transaction-emulator.cpp
View file

@ -42,6 +42,7 @@ td::Result<std::unique_ptr<TransactionEmulator::EmulationResult>> TransactionEmu
if (!lt) { if (!lt) {
lt = (account.last_trans_lt_ / block::ConfigInfo::get_lt_align() + 1) * block::ConfigInfo::get_lt_align(); // next block after account_.last_trans_lt_ lt = (account.last_trans_lt_ / block::ConfigInfo::get_lt_align() + 1) * block::ConfigInfo::get_lt_align(); // next block after account_.last_trans_lt_
} }
account.block_lt = lt - lt % block::ConfigInfo::get_lt_align();
compute_phase_cfg.libraries = std::make_unique<vm::Dictionary>(libraries_); compute_phase_cfg.libraries = std::make_unique<vm::Dictionary>(libraries_);
compute_phase_cfg.ignore_chksig = ignore_chksig_; compute_phase_cfg.ignore_chksig = ignore_chksig_;