feat: added storage deposit for safe_verify_deposit (#211)

* feat: added storage deposit for `safe_verify_deposit`

* chore: bumped versions

* fix: increase nonce if storage deposit is made

* fix: clippy issue

* fix: corrected recipient for storage deposit

* fix: clippy issue

Author: frolvanya

Cargo.lock

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

bridge-cli/Cargo.toml

@@ -91,9 +91,11 @@ pub enum OmniConnectorSubCommand {
     #[clap(about = "Deposit storage for a token on NEAR")]
     NearStorageDeposit {
         #[clap(short, long, help = "Token to deposit storage for")]
-        token: String,
+        token: AccountId,
         #[clap(short, long, help = "Amount to deposit")]
         amount: u128,
+        #[clap(short, long, help = "Account to deposit storage for")]
+        account_id: AccountId,
         #[command(flatten)]
         config_cli: CliConfig,
     },
@@ -529,10 +531,16 @@ pub async fn match_subcommand(cmd: OmniConnectorSubCommand, network: Network) {
         OmniConnectorSubCommand::NearStorageDeposit {
             token,
             amount,
+            account_id,
             config_cli,
         } => {
             omni_connector(network, config_cli)
-                .near_storage_deposit_for_token(token, amount, TransactionOptions::default())
+                .near_storage_deposit_for_token(
+                    token,
+                    amount,
+                    account_id,
+                    TransactionOptions::default(),
+                )
                 .await
                 .unwrap();
         }
@@ -868,10 +876,7 @@ pub async fn match_subcommand(cmd: OmniConnectorSubCommand, network: Network) {
                     chain.into(),
                     btc_tx_hash,
                     vout,
-                    BtcDepositArgs::OmniDepositArgs {
-                        recipient_id,
-                        fee,
-                    },
+                    BtcDepositArgs::OmniDepositArgs { recipient_id, fee },
                     TransactionOptions::default(),
                 )
                 .await
@@ -1002,26 +1007,42 @@ fn omni_connector(network: Network, cli_config: CliConfig) -> OmniConnector {
         (
             ChainKind::Zcash,
             UTXOChainAccounts {
-                utxo_chain_connector: combined_config.zcash_connector,
-                utxo_chain_token: combined_config.zcash,
+                utxo_chain_connector: combined_config
+                    .zcash_connector
+                    .map(|account| account.parse().unwrap()),
+                utxo_chain_token: combined_config
+                    .zcash
+                    .map(|account| account.parse().unwrap()),
                 satoshi_relayer: None,
             },
         ),
         (
             ChainKind::Btc,
             UTXOChainAccounts {
-                utxo_chain_connector: combined_config.btc_connector,
-                utxo_chain_token: combined_config.btc,
-                satoshi_relayer: combined_config.satoshi_relayer,
+                utxo_chain_connector: combined_config
+                    .btc_connector
+                    .map(|account| account.parse().unwrap()),
+                utxo_chain_token: combined_config.btc.map(|account| account.parse().unwrap()),
+                satoshi_relayer: combined_config
+                    .satoshi_relayer
+                    .map(|account| account.parse().unwrap()),
             },
         ),
     ]);
 
     let near_bridge_client = NearBridgeClientBuilder::default()
         .endpoint(combined_config.near_rpc.clone())
         .private_key(combined_config.near_private_key)
-        .signer(combined_config.near_signer)
-        .omni_bridge_id(combined_config.near_token_locker_id)
+        .signer(
+            combined_config
+                .near_signer
+                .map(|account| account.parse().unwrap()),
+        )
+        .omni_bridge_id(
+            combined_config
+                .near_token_locker_id
+                .map(|account| account.parse().unwrap()),
+        )
         .utxo_bridges(utxo_bridges)
         .build()
         .unwrap();

bridge-cli/src/omni_connector_command.rs

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

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

@@ -363,17 +363,38 @@ impl NearBridgeClient {
         Ok(tx_hash)
     }
 
-    /// Finalizes a BTC transfer by calling `verify_deposit` on the BTC connector contract.
+    /// Finalizes a BTC transfer by calling `verify_deposit` or `verify_safe_deposit` on the BTC connector contract.
     #[tracing::instrument(skip_all, name = "NEAR FIN BTC TRANSFER")]
     pub async fn fin_btc_transfer(
         &self,
         chain: ChainKind,
         args: FinBtcTransferArgs,
-        transaction_options: TransactionOptions,
+        mut transaction_options: TransactionOptions,
     ) -> 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() {
+            match self
+                .get_required_storage_deposit(
+                    self.utxo_chain_token(chain)?,
+                    args.deposit_msg.recipient_id.clone(),
+                )
+                .await?
+            {
+                amount if amount > 0 => {
+                    self.storage_deposit_for_token(
+                        self.utxo_chain_token(chain)?,
+                        args.deposit_msg.recipient_id.clone(),
+                        amount,
+                        transaction_options.clone(),
+                    )
+                    .await?;
+
+                    transaction_options.nonce = transaction_options.nonce.map(|nonce| nonce + 1);
+                }
+                _ => {}
+            }
+
             (
                 "safe_verify_deposit".to_string(),
                 BTC_SAFE_VERIFY_DEPOSIT_DEPOSIT,
@@ -922,11 +943,11 @@ impl NearBridgeClient {
             .as_ref()
             .ok_or(BridgeSdkError::ConfigError(
                 "BTC Connector account id is not set".to_string(),
-            ))?
-            .parse::<AccountId>()
+            ))
             .map_err(|_| {
                 BridgeSdkError::ConfigError("Invalid btc connector account id".to_string())
             })
+            .cloned()
     }
 
     pub fn utxo_chain_token(&self, chain: ChainKind) -> Result<AccountId> {
@@ -939,9 +960,9 @@ impl NearBridgeClient {
             .as_ref()
             .ok_or(BridgeSdkError::ConfigError(
                 "Bitcoin account id is not set".to_string(),
-            ))?
-            .parse::<AccountId>()
+            ))
             .map_err(|_| BridgeSdkError::ConfigError("Invalid bitcoin account id".to_string()))
+            .cloned()
     }
 
     pub fn satoshi_relayer(&self, chain: ChainKind) -> Result<AccountId> {
@@ -954,10 +975,10 @@ impl NearBridgeClient {
             .as_ref()
             .ok_or(BridgeSdkError::ConfigError(
                 "Satoshi Relayer account id is not set".to_string(),
-            ))?
-            .parse::<AccountId>()
+            ))
             .map_err(|_| {
                 BridgeSdkError::ConfigError("Invalid Satoshi Relayer account id".to_string())
             })
+            .cloned()
     }
 }

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

@@ -82,11 +82,11 @@ pub struct FastFinTransferArgs {
 #[derive(Default, Clone)]
 pub struct UTXOChainAccounts {
     #[doc = r"UTXO Chain Connector account id on Near"]
-    pub utxo_chain_connector: Option<String>,
+    pub utxo_chain_connector: Option<AccountId>,
     #[doc = r"UTXO Chain Token account id on Near"]
-    pub utxo_chain_token: Option<String>,
+    pub utxo_chain_token: Option<AccountId>,
     #[doc = r"Satoshi Relayer Account Id which sign transaction in UTXO Chain Bridge"]
-    pub satoshi_relayer: Option<String>,
+    pub satoshi_relayer: Option<AccountId>,
 }
 
 /// Bridging NEAR-originated NEP-141 tokens
@@ -97,9 +97,9 @@ pub struct NearBridgeClient {
     #[doc = r"NEAR private key"]
     private_key: Option<String>,
     #[doc = r"NEAR account id of the transaction signer"]
-    signer: Option<String>,
+    signer: Option<AccountId>,
     #[doc = r"`OmniBridge` account id on Near"]
-    omni_bridge_id: Option<String>,
+    omni_bridge_id: Option<AccountId>,
     #[doc = r"Accounts Id for UTXO chains Bridges"]
     utxo_bridges: HashMap<ChainKind, UTXOChainAccounts>,
 }
@@ -333,24 +333,22 @@ impl NearBridgeClient {
     #[tracing::instrument(skip_all, name = "STORAGE DEPOSIT")]
     pub async fn storage_deposit_for_token(
         &self,
-        token_id: String,
+        token_id: AccountId,
+        account_id: AccountId,
         amount: u128,
         transaction_options: TransactionOptions,
     ) -> Result<CryptoHash> {
         let endpoint = self.endpoint()?;
-        let omni_bridge_id = self.omni_bridge_id()?;
 
         let tx_hash = near_rpc_client::change_and_wait(
             endpoint,
             ChangeRequest {
                 signer: self.signer()?,
                 nonce: transaction_options.nonce,
-                receiver_id: token_id.parse().map_err(|err| {
-                    BridgeSdkError::ConfigError(format!("Failed to parse token_id: {err}"))
-                })?,
+                receiver_id: token_id,
                 method_name: "storage_deposit".to_string(),
                 args: serde_json::json!({
-                    "account_id": omni_bridge_id
+                    "account_id": account_id
                 })
                 .to_string()
                 .into_bytes(),
@@ -613,7 +611,9 @@ 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
@@ -940,9 +940,9 @@ impl NearBridgeClient {
             .as_ref()
             .ok_or(BridgeSdkError::ConfigError(
                 "Near signer account id is not set".to_string(),
-            ))?
-            .parse::<AccountId>()
+            ))
             .map_err(|_| BridgeSdkError::ConfigError("Invalid near signer account id".to_string()))
+            .cloned()
     }
 
     pub fn signer(&self) -> Result<near_crypto::InMemorySigner> {
@@ -972,8 +972,8 @@ impl NearBridgeClient {
             .as_ref()
             .ok_or(BridgeSdkError::ConfigError(
                 "OmniBridge account id is not set".to_string(),
-            ))?
-            .parse::<AccountId>()
+            ))
             .map_err(|_| BridgeSdkError::ConfigError("Invalid omni bridge account id".to_string()))
+            .cloned()
     }
 }

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

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

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

@@ -346,13 +346,14 @@ impl OmniConnector {
 
     pub async fn near_storage_deposit_for_token(
         &self,
-        token_id: String,
+        token_id: AccountId,
         amount: u128,
+        account_id: AccountId,
         transaction_options: TransactionOptions,
     ) -> Result<CryptoHash> {
         let near_bridge_client = self.near_bridge_client()?;
         near_bridge_client
-            .storage_deposit_for_token(token_id, amount, transaction_options)
+            .storage_deposit_for_token(token_id, account_id, amount, transaction_options)
             .await
     }
 
@@ -484,10 +485,9 @@ impl OmniConnector {
         let near_bridge_client = self.near_bridge_client()?;
         let deposit_msg = match deposit_args {
             BtcDepositArgs::DepositMsg { msg } => msg,
-            BtcDepositArgs::OmniDepositArgs {
-                recipient_id,
-                fee,
-            } => near_bridge_client.get_deposit_msg_for_omni_bridge(recipient_id, fee)?,
+            BtcDepositArgs::OmniDepositArgs { recipient_id, fee } => {
+                near_bridge_client.get_deposit_msg_for_omni_bridge(recipient_id, fee)?
+            }
         };
 
         let args = FinBtcTransferArgs {
@@ -1718,10 +1718,7 @@ impl OmniConnector {
                     ChainKind::Btc,
                     btc_tx_hash,
                     vout,
-                    BtcDepositArgs::OmniDepositArgs {
-                        recipient_id,
-                        fee,
-                    },
+                    BtcDepositArgs::OmniDepositArgs { recipient_id, fee },
                     transaction_options,
                 )
                 .await