fix(vft-manager): Fix possible funds lock (#275)

gear-tech · Feb 13, 2025 · f0877ea · f0877ea
1 parent 0a9279b
commit f0877ea
Showing 1 changed file with 33 additions and 10 deletions.
diff --git a/gear-programs/vft-manager/app/src/services/request_bridging/mod.rs b/gear-programs/vft-manager/app/src/services/request_bridging/mod.rs
@@ -81,6 +81,10 @@ pub async fn request_bridging<T: ExecContext>(
     let nonce = match bridge_builtin_reply {
         Ok(nonce) => nonce,
         Err(e) => {
+            // Set critical section ensuring the message status is `SendingMessageToReturnTokens`
+            // regardless of the result of the next code execution.
+            set_critical_hook(msg_id);
+
             msg_tracker_mut()
                 .update_message_status(msg_id, MessageStatus::SendingMessageToReturnTokens);
 
@@ -151,20 +155,39 @@ pub async fn handle_interrupted_transfer<T: ExecContext>(
         | MessageStatus::TokensReturnComplete(false) => {
             msg_tracker_mut()
                 .update_message_status(msg_id, MessageStatus::SendingMessageToReturnTokens);
+        }
 
-            match token_supply {
-                TokenSupply::Ethereum => {
-                    token_operations::mint(vara_token_id, sender, amount, config, msg_id).await?;
-                }
-                TokenSupply::Gear => {
-                    token_operations::unlock(vara_token_id, sender, amount, config, msg_id).await?;
-                }
-            }
+        MessageStatus::SendingMessageToReturnTokens => (),
 
-            Ok(())
-        }
         _ => {
             panic!("Unexpected status or transaction completed.")
         }
     }
+
+    match token_supply {
+        TokenSupply::Ethereum => {
+            token_operations::mint(vara_token_id, sender, amount, config, msg_id).await?;
+        }
+        TokenSupply::Gear => {
+            token_operations::unlock(vara_token_id, sender, amount, config, msg_id).await?;
+        }
+    }
+
+    Ok(())
+}
+
+/// Helper function to change message status to `SendingMessageToReturnTokens` in the rare case
+/// when the reply hook of `send_message_to_bridge_builtin` does not get executed (because of
+/// the timeout for example).
+fn set_critical_hook(msg_id: MessageId) {
+    gstd::critical::set_hook(move || {
+        let msg_tracker = msg_tracker_mut();
+        let msg_info = msg_tracker
+            .get_message_info(&msg_id)
+            .expect("Unexpected: msg info does not exist");
+
+        if let MessageStatus::SendingMessageToBridgeBuiltin = msg_info.status {
+            msg_tracker.update_message_status(msg_id, MessageStatus::SendingMessageToReturnTokens);
+        }
+    });
 }