Make HoldBound errors reachable

pallets/gear/src/internal.rs

@@ -307,7 +307,11 @@ where
 
         // Validating duration.
         if hold.expected_duration().is_zero() {
-            unreachable!("Failed to figure out correct wait hold bound");
+            // TODO: Replace with unreachable call after:
+            // - `HoldBound` safety usage stabilized;
+            // - Issue #1173 solved.
+            log::error!("Failed to figure out correct wait hold bound");
+            return;
         }
 
         // Querying origin message id. Fails in cases of `GasTree` invalidations.

pallets/gear/src/lib.rs

@@ -121,8 +121,14 @@ pub struct GasInfo {
     pub reserved: u64,
     /// Contains number of gas burned during message processing.
     pub burned: u64,
-    /// The value may be returned if a program happens to be executed the second or next time in a block.
+    /// The value may be returned if a program happens to be executed
+    /// the second or next time in a block.
     pub may_be_returned: u64,
+    /// Was the message placed into waitlist at the end of calculating.
+    ///
+    /// This flag shows, that `min_limit` makes sense and have some guarantees
+    /// only before insertion into waitlist.
+    pub waited: bool,
 }
 
 #[frame_support::pallet]
@@ -618,7 +624,9 @@ pub mod pallet {
             value: u128,
             allow_other_panics: bool,
         ) -> Result<GasInfo, String> {
-            let GasInfo { min_limit, .. } = Self::run_with_ext_copy(|| {
+            let GasInfo {
+                min_limit, waited, ..
+            } = Self::run_with_ext_copy(|| {
                 let initial_gas = BlockGasLimitOf::<T>::get();
                 Self::calculate_gas_info_impl(
                     source,
@@ -654,6 +662,7 @@ pub mod pallet {
                         reserved,
                         burned,
                         may_be_returned,
+                        waited,
                     },
                 )
                 .map_err(|e| {
@@ -914,11 +923,14 @@ pub mod pallet {
                 }
             }
 
+            let waited = WaitlistOf::<T>::contains(&main_program_id, &main_message_id);
+
             Ok(GasInfo {
                 min_limit,
                 reserved,
                 burned,
                 may_be_returned,
+                waited,
             })
         }
 

pallets/gear/src/tests.rs

@@ -3896,6 +3896,24 @@ fn test_reply_to_terminated_program() {
     })
 }
 
+#[test]
+fn calculate_gas_info_for_wait_dispatch_works() {
+    init_logger();
+    new_test_ext().execute_with(|| {
+        // Test should still be valid once #1173 solved.
+        let GasInfo { waited, .. } = Gear::calculate_gas_info(
+            USER_1.into_origin(),
+            HandleKind::Init(demo_init_wait::WASM_BINARY.to_vec()),
+            EMPTY_PAYLOAD.to_vec(),
+            0,
+            true,
+        )
+        .unwrap();
+
+        assert!(waited);
+    });
+}
+
 #[test]
 fn cascading_messages_with_value_do_not_overcharge() {
     init_logger();

runtime/src/lib.rs

@@ -125,7 +125,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     impl_name: create_runtime_str!("gear-node"),
     apis: RUNTIME_API_VERSIONS,
     authoring_version: 1,
-    spec_version: 1480,
+    spec_version: 1490,
     impl_version: 1,
     transaction_version: 1,
     state_version: 1,