Merge branch 'testnet' into accelerator

Author: SpyCheese

crypto/block/transaction.cpp

@@ -2682,6 +2682,9 @@ int Transaction::try_action_send_msg(const vm::CellSlice& cs0, ActionPhase& ap,
       fwd_fee = block::tlb::t_Grams.as_integer(info.fwd_fee);
       ihr_fee = block::tlb::t_Grams.as_integer(info.ihr_fee);
     }
+    if (cfg.disable_ihr_flag) {
+      info.ihr_disabled = true;
+    }
   }
   // set created_at and created_lt to correct values
   info.created_at = now;
@@ -4177,6 +4180,7 @@ td::Status FetchConfigParams::fetch_config_params(
     action_phase_cfg->mc_blackhole_addr = config.get_burning_config().blackhole_addr;
     action_phase_cfg->extra_currency_v2 = config.get_global_version() >= 10;
     action_phase_cfg->disable_anycast = config.get_global_version() >= 10;
+    action_phase_cfg->disable_ihr_flag = config.get_global_version() >= 11;
   }
   {
     serialize_cfg->extra_currency_v2 = config.get_global_version() >= 10;

crypto/block/transaction.h

@@ -174,6 +174,7 @@ struct ActionPhaseConfig {
   bool disable_custom_fess{false};
   bool reserve_extra_enabled{false};
   bool extra_currency_v2{false};
+  bool disable_ihr_flag{false};
   td::optional<td::Bits256> mc_blackhole_addr;
   bool disable_anycast{false};
   const MsgPrices& fetch_msg_prices(bool is_masterchain) const {

crypto/vm/tonops.cpp

@@ -1834,7 +1834,7 @@ int exec_send_message(VmState* st) {
     if (!tlb::csr_unpack(msg.info, info)) {
       throw VmError{Excno::unknown, "invalid message"};
     }
-    ihr_disabled = info.ihr_disabled;
+    ihr_disabled = info.ihr_disabled || st->get_global_version() >= 11;
     dest = std::move(info.dest);
     Ref<vm::Cell> extra;
     if (!block::tlb::t_CurrencyCollection.unpack_special(info.value.write(), value, extra)) {

doc/GlobalVersions.md

@@ -223,5 +223,6 @@ Along with the storage stat (cells and bits count), each account now stores the
 **Storage dict** is the dictionary that stores refcnt for each cell in the account state.
 This is required to help computing storage stats in the future, after collator-validator separation.
 
-### Other TVM changes
-- Fix returning `null` as `c4` and `c5` (when VM state is not committed) in `RUNVM`.
+### Other changes
+- Fix returning `null` as `c4` and `c5` (when VM state is not committed) in `RUNVM`.
+- In new internal messages `ihr_disabled` is automatically set to `1`, `ihr_fee` is always zero.

validator/impl/validate-query.cpp

@@ -1041,6 +1041,7 @@ bool ValidateQuery::fetch_config_params() {
     action_phase_cfg_.mc_blackhole_addr = config_->get_burning_config().blackhole_addr;
     action_phase_cfg_.extra_currency_v2 = config_->get_global_version() >= 10;
     action_phase_cfg_.disable_anycast = config_->get_global_version() >= 10;
+    action_phase_cfg_.disable_ihr_flag = config_->get_global_version() >= 11;
   }
   {
     serialize_cfg_.extra_currency_v2 = config_->get_global_version() >= 10;