Enable new reserve behavior in version 9

ton-blockchain · Dec 13, 2024 · 3a540a7 · 3a540a7
1 parent c818008
commit 3a540a7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/crypto/block/transaction.cpp b/crypto/block/transaction.cpp
@@ -2761,9 +2761,13 @@ int Transaction::try_action_reserve_currency(vm::CellSlice& cs, ActionPhase& ap,
     return -1;
   }
   if (mode & 2) {
-    if (!reserve.clamp(ap.remaining_balance)) {
-      LOG(DEBUG) << "failed to clamp reserve amount" << mode;
-      return -1;
+    if (cfg.reserve_extra_enabled) {
+      if (!reserve.clamp(ap.remaining_balance)) {
+        LOG(DEBUG) << "failed to clamp reserve amount" << mode;
+        return -1;
+      }
+    } else {
+      reserve.grams = std::min(reserve.grams, ap.remaining_balance.grams);
     }
   }
   if (reserve.grams > ap.remaining_balance.grams) {
@@ -3777,6 +3781,7 @@ td::Status FetchConfigParams::fetch_config_params(
     action_phase_cfg->bounce_on_fail_enabled = config.get_global_version() >= 4;
     action_phase_cfg->message_skip_enabled = config.get_global_version() >= 8;
     action_phase_cfg->disable_custom_fess = config.get_global_version() >= 8;
+    action_phase_cfg->reserve_extra_enabled = config.get_global_version() >= 9;
     action_phase_cfg->mc_blackhole_addr = config.get_burning_config().blackhole_addr;
   }
   {

diff --git a/crypto/block/transaction.h b/crypto/block/transaction.h
@@ -169,6 +169,7 @@ struct ActionPhaseConfig {
   bool bounce_on_fail_enabled{false};
   bool message_skip_enabled{false};
   bool disable_custom_fess{false};
+  bool reserve_extra_enabled{false};
   td::optional<td::Bits256> mc_blackhole_addr;
   const MsgPrices& fetch_msg_prices(bool is_masterchain) const {
     return is_masterchain ? fwd_mc : fwd_std;

diff --git a/doc/GlobalVersions.md b/doc/GlobalVersions.md
@@ -122,4 +122,5 @@ Operations for working with Merkle proofs, where cells can have non-zero level a
 ### Other changes
 - Fix `RAWRESERVE` action with flag `4` (use original balance of the account) by explicitly setting `original_balance` to `balance - msg_balance_remaining`.
   - Previously it did not work if storage fee was greater than the original balance.
-- Jumps to nested continuations of depth more than 8 consume 1 gas for eact subsequent continuation (this does not affect most of TVM code).
+- Jumps to nested continuations of depth more than 8 consume 1 gas for eact subsequent continuation (this does not affect most of TVM code).
+- Support extra currencies in reserve action with `+2` mode.
diff --git a/validator/impl/validate-query.cpp b/validator/impl/validate-query.cpp
@@ -997,6 +997,7 @@ bool ValidateQuery::fetch_config_params() {
     action_phase_cfg_.bounce_on_fail_enabled = config_->get_global_version() >= 4;
     action_phase_cfg_.message_skip_enabled = config_->get_global_version() >= 8;
     action_phase_cfg_.disable_custom_fess = config_->get_global_version() >= 8;
+    action_phase_cfg_.reserve_extra_enabled = config_->get_global_version() >= 9;
     action_phase_cfg_.mc_blackhole_addr = config_->get_burning_config().blackhole_addr;
   }
   {