Fix setting original_balance in transaction.cpp

ton-blockchain · Sep 20, 2024 · e04965c · e04965c
1 parent b5734d2
commit e04965c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/common/global-version.h b/common/global-version.h
@@ -19,6 +19,6 @@
 namespace ton {
 
 // See doc/GlobalVersions.md
-const int SUPPORTED_VERSION = 8;
+const int SUPPORTED_VERSION = 9;
 
 }
diff --git a/crypto/block/transaction.cpp b/crypto/block/transaction.cpp
@@ -1555,7 +1555,14 @@ bool Transaction::prepare_compute_phase(const ComputePhaseConfig& cfg) {
   // ...
   compute_phase = std::make_unique<ComputePhase>();
   ComputePhase& cp = *(compute_phase.get());
-  original_balance -= total_fees;
+  if (cfg.global_version >= 9) {
+    original_balance = balance;
+    if (msg_balance_remaining.is_valid()) {
+      original_balance -= msg_balance_remaining;
+    }
+  } else {
+    original_balance -= total_fees;
+  }
   if (td::sgn(balance.grams) <= 0) {
     // no gas
     cp.skip_reason = ComputePhase::sk_no_gas;

diff --git a/doc/GlobalVersions.md b/doc/GlobalVersions.md
@@ -109,4 +109,9 @@ Operations for working with Merkle proofs, where cells can have non-zero level a
 - Slightly change random seed generation to fix mix of `addr_rewrite` and `addr`.
 - Fill in `skipped_actions` for both invalid and valid messages with `IGNORE_ERROR` mode that can't be sent.
 - Allow unfreeze through external messages.
-- Don't use user-provided `fwd_fee` and `ihr_fee` for internal messages.
+- Don't use user-provided `fwd_fee` and `ihr_fee` for internal messages.
+
+## Version 9
+
+- 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.