chore: improve UX of the fin transfer (#168)

* Improve UX of the fin transfer

* Bump version

* Use fastnear for testnet

* fix clippy

* docs: updated near-fin-transfer examples

---------

Co-authored-by: Ivan Frolov <frolvanya@gmail.com>

Author: karim-en

Cargo.lock

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

bridge-cli/Cargo.toml

@@ -105,10 +105,9 @@ bridge-cli testnet evm-init-transfer \
     --message ""
 
 # 2. Wait for the transaction to be confirmed, then finalize on NEAR
-bridge-cli testnet near-fin-transfer-with-evm-proof \
+bridge-cli testnet near-fin-transfer \
     --chain eth \
     --tx-hash 0xabc...def \
-    --storage-deposit-actions usdc.near:alice.near:0.1
 ```
 
 ### Example 3: Transfer token from NEAR to Solana
@@ -180,13 +179,12 @@ bridge-cli near-sign-transfer \
     --fee <FEE_AMOUNT> \
     --native-fee <NATIVE_FEE_AMOUNT>
 
-# Finalize a transfer on NEAR (using EVM proof)
-bridge-cli near-fin-transfer-with-evm-proof \
+# Finalize a transfer on NEAR (for transfers from EVM)
+bridge-cli near-fin-transfer \
     --chain <SOURCE_CHAIN> \
     --tx-hash <TX_HASH> \
-    --storage-deposit-actions <TOKEN1:ACCOUNT1:AMOUNT1,...>
 
-# Finalize a transfer on NEAR (using VAA)
+# Finalize a transfer on NEAR (using VAA, use this method only for transfers from Solana)
 bridge-cli near-fin-transfer-with-vaa \
     --chain <SOURCE_CHAIN> \
     --storage-deposit-actions <TOKEN1:ACCOUNT1:AMOUNT1,...> \

bridge-cli/README.md

@@ -1,5 +1,5 @@
 /// Mainnet
-pub const NEAR_RPC_MAINNET: &str = "https://archival-rpc.mainnet.near.org/";
+pub const NEAR_RPC_MAINNET: &str = "https://archival-rpc.mainnet.fastnear.com/";
 pub const NEAR_TOKEN_LOCKER_ID_MAINNET: &str = "omni.bridge.near";
 pub const ETH_LIGHT_CLIENT_ID_MAINNET: &str = "client-eth2.bridge.near";
 
@@ -29,7 +29,7 @@ pub const BTC_MAINNET: &str = "btc-client.bridge.near";
 pub const SATOSHI_RELAYER_MAINNET: &str = "satoshi_optwo.near";
 
 /// Testnet
-pub const NEAR_RPC_TESTNET: &str = "https://archival-rpc.testnet.near.org/";
+pub const NEAR_RPC_TESTNET: &str = "https://archival-rpc.testnet.fastnear.com/";
 pub const NEAR_TOKEN_LOCKER_ID_TESTNET: &str = "omni.n-bridge.testnet";
 pub const ETH_LIGHT_CLIENT_ID_TESTNET: &str = "client-eth2.sepolia.testnet";
 

bridge-cli/src/defaults.rs

@@ -101,8 +101,8 @@ pub enum OmniConnectorSubCommand {
         #[command(flatten)]
         config_cli: CliConfig,
     },
-    #[clap(about = "Finalize a transfer on NEAR using EVM proof")]
-    NearFinTransferWithEvmProof {
+    #[clap(about = "Finalize a transfer on NEAR")]
+    NearFinTransfer {
         #[clap(short, long, help = "Origin chain of the transfer to finalize")]
         chain: ChainKind,
         #[clap(
@@ -111,12 +111,6 @@ pub enum OmniConnectorSubCommand {
             help = "Transaction hash of the InitTransfer call on other chain"
         )]
         tx_hash: String,
-        #[clap(
-            short,
-            long,
-            help = "Storage deposit actions. Format: token_id1:account_id1:amount1,token_id2:account_id2:amount2,..."
-        )]
-        storage_deposit_actions: Vec<String>,
         #[command(flatten)]
         config_cli: CliConfig,
     },
@@ -506,32 +500,56 @@ pub async fn match_subcommand(cmd: OmniConnectorSubCommand, network: Network) {
                 .await
                 .unwrap();
         }
-        OmniConnectorSubCommand::NearFinTransferWithEvmProof {
+        OmniConnectorSubCommand::NearFinTransfer {
             chain,
             tx_hash,
-            storage_deposit_actions,
             config_cli,
-        } => {
-            omni_connector(network, config_cli)
-                .fin_transfer(FinTransferArgs::NearFinTransferWithEvmProof {
-                    chain_kind: chain,
-                    tx_hash: TxHash::from_str(&tx_hash).expect("Invalid tx_hash"),
-                    storage_deposit_actions: storage_deposit_actions
-                        .iter()
-                        .map(|action| {
-                            let parts: Vec<&str> = action.split(':').collect();
-                            omni_types::locker_args::StorageDepositAction {
-                                token_id: parts[0].parse().unwrap(),
-                                account_id: parts[1].parse().unwrap(),
-                                storage_deposit_amount: parts[2].parse().ok(),
-                            }
-                        })
-                        .collect(),
-                    transaction_options: TransactionOptions::default(),
-                })
-                .await
-                .unwrap();
-        }
+        } => match chain {
+            ChainKind::Eth => {
+                let connector = omni_connector(network, config_cli);
+                let storage_deposit_actions = connector
+                    .get_storage_deposit_actions_for_evm_tx(chain, tx_hash.parse().unwrap())
+                    .await
+                    .unwrap();
+
+                connector
+                    .fin_transfer(FinTransferArgs::NearFinTransferWithEvmProof {
+                        chain_kind: chain,
+                        tx_hash: TxHash::from_str(&tx_hash).expect("Invalid tx_hash"),
+                        storage_deposit_actions,
+                        transaction_options: TransactionOptions::default(),
+                    })
+                    .await
+                    .unwrap();
+            }
+            ChainKind::Arb | ChainKind::Base => {
+                let connector = omni_connector(network, config_cli);
+
+                let vaa = connector
+                    .wormhole_get_vaa_by_tx_hash(tx_hash.clone())
+                    .await
+                    .unwrap();
+
+                let storage_deposit_actions = connector
+                    .get_storage_deposit_actions_for_evm_tx(chain, tx_hash.parse().unwrap())
+                    .await
+                    .unwrap();
+
+                connector
+                    .fin_transfer(FinTransferArgs::NearFinTransferWithVaa {
+                        chain_kind: chain,
+                        storage_deposit_actions,
+                        vaa,
+                        transaction_options: TransactionOptions::default(),
+                    })
+                    .await
+                    .unwrap();
+            }
+            _ => {
+                // TODO: add support for Solana
+                panic!("Unsupported chain for NearFinTransfer: {chain:?}");
+            }
+        },
         OmniConnectorSubCommand::NearFinTransferWithVaa {
             chain,
             storage_deposit_actions,

bridge-cli/src/omni_connector_command.rs

@@ -1495,4 +1495,111 @@ impl OmniConnector {
             .get_proof_for_event(tx_hash, proof_kind)
             .await
     }
+
+    pub async fn get_storage_deposit_actions_for_evm_tx(
+        &self,
+        chain: ChainKind,
+        tx_hash: TxHash,
+    ) -> Result<Vec<StorageDepositAction>> {
+        // TODO: add fast transfer support
+        let transfer_event = self.evm_get_transfer_event(chain, tx_hash).await?;
+
+        let token_address =
+            OmniAddress::new_from_evm_address(chain, H160(transfer_event.token_address.0))
+                .map_err(|_| {
+                    BridgeSdkError::InvalidArgument(format!(
+                        "Failed to parse token address: {}",
+                        transfer_event.token_address
+                    ))
+                })?;
+
+        let recipient = OmniAddress::from_str(&transfer_event.recipient).map_err(|_| {
+            BridgeSdkError::InvalidArgument(format!(
+                "Failed to parse recipient: {}",
+                transfer_event.recipient
+            ))
+        })?;
+
+        let fee_recipient = self
+            .near_bridge_client()
+            .and_then(NearBridgeClient::account_id)
+            .map_err(|_| {
+                BridgeSdkError::ConfigError("NEAR bridge client not configured".to_string())
+            })?;
+
+        self.get_storage_deposit_actions(
+            chain,
+            &recipient,
+            &fee_recipient,
+            &token_address,
+            transfer_event.fee,
+            transfer_event.native_token_fee,
+        )
+        .await
+    }
+
+    pub async fn get_storage_deposit_actions(
+        &self,
+        chain: ChainKind,
+        recipient: &OmniAddress,
+        fee_recipient: &AccountId,
+        token_address: &OmniAddress,
+        fee: u128,
+        native_fee: u128,
+    ) -> Result<Vec<StorageDepositAction>> {
+        let mut storage_deposit_actions = Vec::new();
+        if let OmniAddress::Near(near_recipient) = recipient {
+            self.add_storage_deposit_action(
+                &mut storage_deposit_actions,
+                self.near_get_token_id(token_address.clone()).await?,
+                near_recipient.clone(),
+            )
+            .await?;
+        }
+
+        if fee > 0 {
+            self.add_storage_deposit_action(
+                &mut storage_deposit_actions,
+                self.near_get_token_id(token_address.clone()).await?,
+                fee_recipient.clone(),
+            )
+            .await?;
+        }
+
+        if native_fee > 0 {
+            let token_id = self.near_get_native_token_id(chain).await?;
+
+            self.add_storage_deposit_action(
+                &mut storage_deposit_actions,
+                token_id,
+                fee_recipient.clone(),
+            )
+            .await?;
+        }
+
+        Ok(storage_deposit_actions)
+    }
+
+    async fn add_storage_deposit_action(
+        &self,
+        storage_deposit_actions: &mut Vec<StorageDepositAction>,
+        token_id: AccountId,
+        account_id: AccountId,
+    ) -> Result<()> {
+        let storage_deposit_amount = match self
+            .near_get_required_storage_deposit(token_id.clone(), account_id.clone())
+            .await?
+        {
+            amount if amount > 0 => Some(amount),
+            _ => None,
+        };
+
+        storage_deposit_actions.push(StorageDepositAction {
+            token_id,
+            account_id,
+            storage_deposit_amount,
+        });
+
+        Ok(())
+    }
 }