Update bitcoin deposits to a safe version (#207)

* Update bitcoin deposits to a safe version

* fix safe deposit msg

* fix deposit method

* fix clippy

---------

Co-authored-by: Olga Kunyavskaya <olga.kunyavskaya@aurora.dev>

Author: kiseln

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "bridge-cli"
-version = "0.3.14"
+version = "0.3.15"
 edition = "2021"
 repository = "https://github.com/Near-One/bridge-sdk-rs"
 

bridge-cli/Cargo.toml

@@ -337,13 +337,6 @@ pub enum OmniConnectorSubCommand {
         vout: usize,
         #[clap(short, long, help = "The BTC recipient on NEAR")]
         recipient_id: OmniAddress,
-        #[clap(
-            short,
-            long,
-            help = "The amount to be transferred, in satoshis",
-            default_value = "0"
-        )]
-        amount: u128,
         #[clap(
             short,
             long,
@@ -867,7 +860,6 @@ pub async fn match_subcommand(cmd: OmniConnectorSubCommand, network: Network) {
             btc_tx_hash,
             vout,
             recipient_id,
-            amount,
             fee,
             config_cli,
         } => {
@@ -878,7 +870,6 @@ pub async fn match_subcommand(cmd: OmniConnectorSubCommand, network: Network) {
                     vout,
                     BtcDepositArgs::OmniDepositArgs {
                         recipient_id,
-                        amount,
                         fee,
                     },
                     TransactionOptions::default(),
@@ -963,7 +954,7 @@ pub async fn match_subcommand(cmd: OmniConnectorSubCommand, network: Network) {
         } => {
             let omni_connector = omni_connector(network, config_cli);
             let btc_address = omni_connector
-                .get_btc_address(chain.into(), recipient_id, amount, fee)
+                .get_btc_address(chain.into(), recipient_id, fee)
                 .await
                 .unwrap();
 

bridge-cli/src/omni_connector_command.rs

@@ -1,6 +1,6 @@
 [package]
 name = "near-bridge-client"
-version = "0.2.2"
+version = "0.2.3"
 edition = "2021"
 
 [dependencies]

bridge-sdk/bridge-clients/near-bridge-client/Cargo.toml

@@ -29,6 +29,7 @@ const SUBMIT_BTC_TRANSFER_GAS: u64 = 300_000_000_000_000;
 const INIT_BTC_TRANSFER_DEPOSIT: u128 = 1;
 const ACTIVE_UTXO_MANAGEMENT_DEPOSIT: u128 = 1;
 const SIGN_BTC_TRANSACTION_DEPOSIT: u128 = 250_000_000_000_000_000_000_000;
+const BTC_SAFE_VERIFY_DEPOSIT_DEPOSIT: u128 = 1_200_000_000_000_000_000_000;
 const BTC_VERIFY_DEPOSIT_DEPOSIT: u128 = 0;
 const BTC_VERIFY_WITHDRAW_DEPOSIT: u128 = 0;
 const BTC_CANCEL_WITHDRAW_DEPOSIT: u128 = 1;
@@ -75,13 +76,20 @@ pub struct PostAction {
     pub gas: Option<Gas>,
 }
 
+#[derive(Clone, serde::Serialize, serde::Deserialize)]
+pub struct SafeDepositMsg {
+    pub msg: String,
+}
+
 #[derive(Clone, serde::Serialize, serde::Deserialize)]
 pub struct DepositMsg {
     pub recipient_id: AccountId,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub post_actions: Option<Vec<PostAction>>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub extra_msg: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub safe_deposit: Option<SafeDepositMsg>,
 }
 
 #[derive(Clone, serde::Serialize, serde::Deserialize)]
@@ -365,16 +373,24 @@ impl NearBridgeClient {
     ) -> Result<CryptoHash> {
         let endpoint = self.endpoint()?;
         let btc_connector = self.utxo_chain_connector(chain)?;
+        let (method_name, deposit) = if args.deposit_msg.safe_deposit.is_some() {
+            (
+                "safe_verify_deposit".to_string(),
+                BTC_SAFE_VERIFY_DEPOSIT_DEPOSIT,
+            )
+        } else {
+            ("verify_deposit".to_string(), BTC_VERIFY_DEPOSIT_DEPOSIT)
+        };
         let tx_hash = near_rpc_client::change_and_wait(
             endpoint,
             ChangeRequest {
                 signer: self.signer()?,
                 nonce: transaction_options.nonce,
                 receiver_id: btc_connector,
-                method_name: "verify_deposit".to_string(),
+                method_name,
                 args: serde_json::json!(args).to_string().into_bytes(),
                 gas: BTC_VERIFY_DEPOSIT_GAS,
-                deposit: BTC_VERIFY_DEPOSIT_DEPOSIT,
+                deposit,
             },
             transaction_options.wait_until,
             transaction_options.wait_final_outcome_timeout_sec,
@@ -567,10 +583,9 @@ impl NearBridgeClient {
         &self,
         chain: ChainKind,
         recipient_id: OmniAddress,
-        amount: u128,
         fee: u128,
     ) -> Result<String> {
-        let deposit_msg = self.get_deposit_msg_for_omni_bridge(recipient_id, amount, fee)?;
+        let deposit_msg = self.get_deposit_msg_for_omni_bridge(recipient_id, fee)?;
         let endpoint = self.endpoint()?;
         let btc_connector = self.utxo_chain_connector(chain)?;
 
@@ -699,7 +714,6 @@ impl NearBridgeClient {
     pub fn get_deposit_msg_for_omni_bridge(
         &self,
         recipient_id: OmniAddress,
-        amount: u128,
         fee: u128,
     ) -> Result<DepositMsg> {
         if recipient_id.is_utxo_chain() {
@@ -713,25 +727,22 @@ impl NearBridgeClient {
                 recipient_id,
                 post_actions: None,
                 extra_msg: None,
+                safe_deposit: None,
             })
         } else {
             let omni_bridge_id = self.omni_bridge_id()?;
-            let account_id = self.account_id()?;
             Ok(DepositMsg {
-                recipient_id: account_id,
-                post_actions: Some(vec![PostAction {
-                    receiver_id: omni_bridge_id,
-                    amount,
-                    memo: None,
+                recipient_id: omni_bridge_id,
+                post_actions: None,
+                extra_msg: None,
+                safe_deposit: Some(SafeDepositMsg {
                     msg: json!({
                         "recipient": recipient_id.to_string(),
                         "fee": fee.to_string(),
                         "native_token_fee": "0",
                     })
                     .to_string(),
-                    gas: None,
-                }]),
-                extra_msg: None,
+                }),
             })
         }
     }

bridge-sdk/bridge-clients/near-bridge-client/src/btc.rs

@@ -613,7 +613,8 @@ impl NearBridgeClient {
         let endpoint = self.endpoint()?;
         let omni_bridge_id = self.omni_bridge_id()?;
 
-        let required_balance = self.get_required_balance_for_init_transfer().await?;
+        let required_balance = self.get_required_balance_for_init_transfer().await?
+            .saturating_add(native_fee);
 
         let nonce = if self
             .deposit_storage_if_required(required_balance, transaction_options.clone())

bridge-sdk/bridge-clients/near-bridge-client/src/near_bridge_client.rs

@@ -1,6 +1,6 @@
 [package]
 name = "omni-connector"
-version = "0.2.13"
+version = "0.2.14"
 edition = "2021"
 
 [dependencies]

bridge-sdk/connectors/omni-connector/Cargo.toml

@@ -190,7 +190,6 @@ pub enum FinTransferArgs {
         btc_tx_hash: String,
         vout: usize,
         recipient_id: OmniAddress,
-        amount: u128,
         fee: u128,
         transaction_options: TransactionOptions,
     },
@@ -223,7 +222,6 @@ pub enum FinTransferArgs {
 pub enum BtcDepositArgs {
     OmniDepositArgs {
         recipient_id: OmniAddress,
-        amount: u128,
         fee: u128,
     },
     DepositMsg {
@@ -488,9 +486,8 @@ impl OmniConnector {
             BtcDepositArgs::DepositMsg { msg } => msg,
             BtcDepositArgs::OmniDepositArgs {
                 recipient_id,
-                amount,
                 fee,
-            } => near_bridge_client.get_deposit_msg_for_omni_bridge(recipient_id, amount, fee)?,
+            } => near_bridge_client.get_deposit_msg_for_omni_bridge(recipient_id, fee)?,
         };
 
         let args = FinBtcTransferArgs {
@@ -586,12 +583,11 @@ impl OmniConnector {
         &self,
         chain: ChainKind,
         recipient_id: OmniAddress,
-        amount: u128,
         fee: u128,
     ) -> Result<String> {
         let near_bridge_client = self.near_bridge_client()?;
         near_bridge_client
-            .get_btc_address(chain, recipient_id, amount, fee)
+            .get_btc_address(chain, recipient_id, fee)
             .await
     }
 
@@ -1715,7 +1711,6 @@ impl OmniConnector {
                 btc_tx_hash,
                 vout,
                 recipient_id,
-                amount,
                 fee,
                 transaction_options,
             } => self
@@ -1725,7 +1720,6 @@ impl OmniConnector {
                     vout,
                     BtcDepositArgs::OmniDepositArgs {
                         recipient_id,
-                        amount,
                         fee,
                     },
                     transaction_options,