fix: check confirmations for utxo related methods (#213)

* fix: check confirmations for utxo related methods

* chore: bumped versions

* fix: set max confirmations for amount greater than max upper limit

* fix: block comparison

Author: frolvanya

Cargo.lock

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

bridge-cli/Cargo.toml

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

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

@@ -160,6 +160,8 @@ struct PartialConfig {
     max_active_utxo_management_output_number: u8,
     active_management_lower_limit: u32,
     active_management_upper_limit: u32,
+    confirmations_strategy: HashMap<String, u8>,
+    confirmations_delta: u8,
 }
 
 #[serde_as]
@@ -695,6 +697,23 @@ impl NearBridgeClient {
         Ok(config.min_deposit_amount)
     }
 
+    pub async fn get_total_confirmations(&self, chain: ChainKind, amount: u128) -> Result<u8> {
+        let config = self.get_config(chain).await?;
+
+        let mut total_confirmations = None;
+        let mut max_confirmations = 0;
+        for (upper_limit, confirmations) in config.confirmations_strategy {
+            if amount < upper_limit.parse::<u128>().unwrap_or_default() {
+                total_confirmations = Some(total_confirmations.unwrap_or(0).max(confirmations));
+            }
+            max_confirmations = max(max_confirmations, confirmations);
+        }
+
+        Ok(total_confirmations
+            .unwrap_or(max_confirmations)
+            .saturating_add(config.confirmations_delta))
+    }
+
     async fn get_config(&self, chain: ChainKind) -> Result<PartialConfig> {
         let endpoint = self.endpoint()?;
         let btc_connector = self.utxo_chain_connector(chain)?;

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

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

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

@@ -471,18 +471,27 @@ impl OmniConnector {
         transaction_options: TransactionOptions,
     ) -> Result<CryptoHash> {
         let utxo_bridge_client = self.utxo_bridge_client(chain)?;
+        let near_bridge_client = self.near_bridge_client()?;
+
         let proof_data = utxo_bridge_client.extract_btc_proof(&tx_hash).await?;
 
         let light_client = self.light_client(chain)?;
         let light_client_last_block = light_client.get_last_block_number().await?;
 
-        if proof_data.block_height > light_client_last_block {
+        let amount = near_bridge_client
+            .get_btc_pending_info(chain, tx_hash.clone())
+            .await?
+            .transfer_amount;
+        let confirmations = near_bridge_client
+            .get_total_confirmations(chain, amount)
+            .await?;
+
+        if proof_data.block_height + u64::from(confirmations) > light_client_last_block {
             return Err(BridgeSdkError::LightClientNotSynced(
                 light_client_last_block,
             ));
         }
 
-        let near_bridge_client = self.near_bridge_client()?;
         let deposit_msg = match deposit_args {
             BtcDepositArgs::DepositMsg { msg } => msg,
             BtcDepositArgs::OmniDepositArgs { recipient_id, fee } => {
@@ -511,18 +520,27 @@ impl OmniConnector {
         transaction_options: TransactionOptions,
     ) -> Result<CryptoHash> {
         let utxo_bridge_client = self.utxo_bridge_client(chain)?;
+        let near_bridge_client = self.near_bridge_client()?;
+
         let proof_data = utxo_bridge_client.extract_btc_proof(&tx_hash).await?;
 
         let light_client = self.light_client(chain)?;
         let light_client_last_block = light_client.get_last_block_number().await?;
 
-        if proof_data.block_height > light_client_last_block {
+        let amount = near_bridge_client
+            .get_btc_pending_info(chain, tx_hash.clone())
+            .await?
+            .transfer_amount;
+        let confirmations = near_bridge_client
+            .get_total_confirmations(chain, amount)
+            .await?;
+
+        if proof_data.block_height + u64::from(confirmations) > light_client_last_block {
             return Err(BridgeSdkError::LightClientNotSynced(
                 light_client_last_block,
             ));
         }
 
-        let near_bridge_client = self.near_bridge_client()?;
         let args = BtcVerifyWithdrawArgs {
             tx_id: tx_hash,
             tx_block_blockhash: proof_data.tx_block_blockhash,
@@ -555,18 +573,27 @@ impl OmniConnector {
         transaction_options: TransactionOptions,
     ) -> Result<CryptoHash> {
         let utxo_bridge_client = self.utxo_bridge_client(chain)?;
+        let near_bridge_client = self.near_bridge_client()?;
+
         let proof_data = utxo_bridge_client.extract_btc_proof(&tx_hash).await?;
 
         let light_client = self.light_client(chain)?;
         let light_client_last_block = light_client.get_last_block_number().await?;
 
-        if proof_data.block_height > light_client_last_block {
+        let amount = near_bridge_client
+            .get_btc_pending_info(chain, tx_hash.clone())
+            .await?
+            .transfer_amount;
+        let confirmations = near_bridge_client
+            .get_total_confirmations(chain, amount)
+            .await?;
+
+        if proof_data.block_height + u64::from(confirmations) > light_client_last_block {
             return Err(BridgeSdkError::LightClientNotSynced(
                 light_client_last_block,
             ));
         }
 
-        let near_bridge_client = self.near_bridge_client()?;
         let args = BtcVerifyWithdrawArgs {
             tx_id: tx_hash,
             tx_block_blockhash: proof_data.tx_block_blockhash,