Change new bounce format: include full or partial original body

Author: SpyCheese

crypto/block/block.tlb

@@ -166,7 +166,7 @@ _ (Message Any) = MessageAny;
 _ value:CurrencyCollection created_lt:uint64 created_at:uint32 = NewBounceOriginalInfo;
 _ gas_used:uint32 vm_steps:uint32 = NewBounceComputePhaseInfo;
 new_bounce_body#fffffffe
-    original_body:(Maybe ^Cell)
+    original_body:^Cell
     original_info:^NewBounceOriginalInfo
     bounced_by_phase:uint8 exit_code:int32
     compute_phase:(Maybe NewBounceComputePhaseInfo)

crypto/block/transaction.cpp

@@ -877,7 +877,7 @@ bool Transaction::unpack_input_msg(bool ihr_delivered, const ActionPhaseConfig*
         ihr_fee = td::zero_refint();
         td::RefInt256 extra_flags = tlb::t_Grams.as_integer(in_msg_info.extra_flags);
         new_bounce_format = extra_flags->get_bit(0);
-        new_bounce_format_with_body = extra_flags->get_bit(1);
+        new_bounce_format_full_body = extra_flags->get_bit(1);
       } else {
         // Legacy: extra_flags was previously ihr_fee
         ihr_fee = tlb::t_Grams.as_integer(in_msg_info.extra_flags);
@@ -3276,11 +3276,10 @@ bool Transaction::prepare_bounce_phase(const ActionPhaseConfig& cfg) {
   vm::CellBuilder body;
   if (new_bounce_format) {
     body.store_long(0xfffffffeU, 32);   // new_bounce_body#fffffffe
-    if (new_bounce_format_with_body) {  // original_body:(Maybe ^Cell)
-      body.store_long(1, 1);
+    if (new_bounce_format_full_body) {  // original_body:^Cell
       body.store_ref(vm::CellBuilder().append_cellslice(in_msg_body).finalize_novm());
     } else {
-      body.store_long(0, 1);
+      body.store_ref(vm::CellBuilder().store_bits(in_msg_body->as_bitslice()).finalize_novm());
     }
     body.store_ref(vm::CellBuilder()
                        .append_cellslice(in_msg_info.value)     // value:CurrencyCollection

crypto/block/transaction.h

@@ -359,7 +359,7 @@ struct Transaction {
   bool in_msg_extern{false};
   gen::CommonMsgInfo::Record_int_msg_info in_msg_info;
   bool new_bounce_format{false};
-  bool new_bounce_format_with_body{false};
+  bool new_bounce_format_full_body{false};
   bool use_msg_state{false};
   bool is_first{false};
   bool orig_addr_rewrite_set{false};

doc/GlobalVersions.md

@@ -236,20 +236,20 @@ Field `ihr_fee:Grams` in internal message is now called `extra_flags:(VarUIntege
 This field does not represent fees. `ihr_fee` is always zero since version 11, so this field was essentially unused.
 
 `(extra_flags & 1) = 1` enables the new bounce format for the message. The bounced message contains information about the transaction.
-If `(extra_flags & 3) = 3`, the bounced message also contains the whole body of the original message.
+If `(extra_flags & 3) = 3`, the bounced message contains the whole body of the original message. Otherwise, only the bits from the root of the original body are returned.
 When the message with new bounce flag is bounced, the bounced message body has the following format (`new_bounce_body`):
 ```
 _ value:CurrencyCollection created_lt:uint64 created_at:uint32 = NewBounceOriginalInfo;
 _ gas_used:uint32 vm_steps:uint32 = NewBounceComputePhaseInfo;
 
 new_bounce_body#fffffffe
-    original_body:(Maybe ^Cell)
+    original_body:^Cell
     original_info:^NewBounceOriginalInfo
     bounced_by_phase:uint8 exit_code:int32
     compute_phase:(Maybe NewBounceComputePhaseInfo)
     = NewBounceBody;
 ```
-- `original_body` - cell that contains the body of the original message (if `extra_flags & 2`) or nothing (if not `extra_flags & 2`).
+- `original_body` - cell that contains the body of the original message. If `extra_flags & 2` then the whole body is returned, otherwise it is only the root without refs.
 - `original_info` - value, lt and unixtime of the original message.
 - `bounced_by_phase`:
   - `0` - compute phase was skipped. `exit_code` denotes the skip reason: