From 01f6b2b6a3173b6e6acf5a84d1cdb0d9070d2191 Mon Sep 17 00:00:00 2001 From: SpyCheese Date: Fri, 24 Jan 2025 17:44:22 +0300 Subject: [PATCH] Enable VmState::jump_to bugfix in version 9 --- crypto/block/transaction.cpp | 2 +- crypto/vm/vm.h | 3 +-- doc/GlobalVersions.md | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crypto/block/transaction.cpp b/crypto/block/transaction.cpp index 92e20fb0b..63e9065b6 100644 --- a/crypto/block/transaction.cpp +++ b/crypto/block/transaction.cpp @@ -1156,7 +1156,7 @@ namespace transaction { * It is activated by setting global version to 5 in ConfigParam 8. * This config change also activates new behavior for special accounts in masterchain. * - * In Augost 2024 it was decided to unlock other old highload wallets that got into the same situation. + * In August 2024 it was decided to unlock other old highload wallets that got into the same situation. * See https://t.me/tondev_news/129 * It is activated by setting global version to 9. * diff --git a/crypto/vm/vm.h b/crypto/vm/vm.h index 7aaf1e911..a171ef27e 100644 --- a/crypto/vm/vm.h +++ b/crypto/vm/vm.h @@ -375,8 +375,7 @@ class VmState final : public VmStateInterface { if (cnt > free_nested_cont_jump && global_version >= 9) { consume_gas(1); } - - if (cont.not_null()) { + if (cont.not_null() && global_version >= 9) { const ControlData* cont_data = cont->get_cdata(); if (cont_data && (cont_data->stack.not_null() || cont_data->nargs >= 0)) { // if cont has non-empty stack or expects fixed number of arguments, jump is not simple diff --git a/doc/GlobalVersions.md b/doc/GlobalVersions.md index 3849072f4..f4156ca07 100644 --- a/doc/GlobalVersions.md +++ b/doc/GlobalVersions.md @@ -133,4 +133,5 @@ Example: if the last masterchain block seqno is `19071` then the list contains b - Fix exception code in some TVM instructions: now `stk_und` has priority over other error codes. - `PFXDICTADD`, `PFXDICTSET`, `PFXDICTREPLACE`, `PFXDICTDEL`, `GETGASFEE`, `GETSTORAGEFEE`, `GETFORWARDFEE`, `GETORIGINALFWDFEE`, `GETGASFEESIMPLE`, `GETFORWARDFEESIMPLE`, `HASHEXT` - Now setting the contract code to a library cell does not consume additional gas on execution of the code. -- Temporary increase gas limit for some accounts (see [this post](https://t.me/tondev_news/129) for details, `override_gas_limit` in `transaction.cpp` for the list of accounts). \ No newline at end of file +- Temporary increase gas limit for some accounts (see [this post](https://t.me/tondev_news/129) for details, `override_gas_limit` in `transaction.cpp` for the list of accounts). +- Fix recursive jump to continuations with non-null control data. \ No newline at end of file