feat: synced with latest omni-types

Cargo.toml

@@ -43,7 +43,7 @@ tracing-subscriber = "0.3"
 base64 = "0.22"
 near-token = "0.3"
 near-contract-standards = "5.5"
-omni-types = { git = "https://github.com/near-one/omni-bridge", package = "omni-types", rev = "303ca7bc7cdb39c4a356b65b10221259a632ac54" }
+omni-types = { git = "https://github.com/near-one/omni-bridge", package = "omni-types", rev = "11ffdb63706ceba175f7581585bd837aad9f1559" }
 solana-sdk = "2.0.13"
 solana-client = "2.0.13"
 spl-token = "7.0.0"

bridge-cli/src/omni_connector_command.rs

@@ -68,11 +68,13 @@ pub enum OmniConnectorSubCommand {
     },
     NearFinTransfer {
         #[clap(short, long)]
-        token: String,
+        token_id: String,
         #[clap(short, long)]
-        source_chain_id: u8,
+        account_id: String,
         #[clap(short, long)]
-        receiver: String,
+        storage_deposit_amount: Option<u128>,
+        #[clap(short, long)]
+        source_chain_id: u8,
         #[clap(short, long)]
         vaa: String,
         #[command(flatten)]
@@ -227,9 +229,10 @@ pub async fn match_subcommand(cmd: OmniConnectorSubCommand, network: Network) {
                 .unwrap();
         }
         OmniConnectorSubCommand::NearFinTransfer {
-            token,
+            token_id,
+            account_id,
+            storage_deposit_amount,
             source_chain_id,
-            receiver,
             vaa,
             config_cli,
         } => {
@@ -242,10 +245,11 @@ pub async fn match_subcommand(cmd: OmniConnectorSubCommand, network: Network) {
                 .unwrap()
                 .fin_transfer(FinTransferArgs {
                     chain_kind: ChainKind::try_from(source_chain_id).unwrap(),
-                    storage_deposit_args: omni_types::locker_args::StorageDepositArgs {
-                        token: AccountId::from_str(&token).unwrap(),
-                        accounts: vec![(AccountId::from_str(&receiver).unwrap(), true)],
-                    },
+                    storage_deposit_actions: vec![omni_types::locker_args::StorageDepositAction {
+                        token_id: AccountId::from_str(&token_id).unwrap(),
+                        account_id: AccountId::from_str(&account_id).unwrap(),
+                        storage_deposit_amount,
+                    }],
                     prover_args: near_primitives::borsh::to_vec(&args).unwrap(),
                 })
                 .await

bridge-sdk/connectors/omni-connector/src/omni_connector.rs

@@ -4,7 +4,7 @@ use ethers::prelude::*;
 use near_primitives::hash::CryptoHash;
 use near_primitives::types::AccountId;
 use near_primitives::views::FinalExecutionOutcomeView;
-use omni_types::locker_args::{ClaimFeeArgs, StorageDepositArgs};
+use omni_types::locker_args::{ClaimFeeArgs, StorageDepositAction};
 use omni_types::prover_args::EvmVerifyProofArgs;
 use omni_types::prover_result::ProofKind;
 use omni_types::{locker_args::BindTokenArgs, near_events::Nep141LockerEvent, ChainKind};
@@ -45,7 +45,7 @@ pub enum InitTransferArgs {
 pub enum FinTransferArgs {
     NearFinTransfer {
         chain_kind: ChainKind,
-        storage_deposit_args: StorageDepositArgs,
+        storage_deposit_actions: Vec<StorageDepositAction>,
         prover_args: Vec<u8>,
     },
     EvmFinTransfer {
@@ -190,14 +190,14 @@ impl OmniConnector {
         match fin_transfer_args {
             FinTransferArgs::NearFinTransfer {
                 chain_kind,
-                storage_deposit_args,
+                storage_deposit_actions,
                 prover_args,
             } => self
                 .near_bridge_client()
                 .map_err(|_| BridgeSdkError::UnknownError)?
                 .fin_transfer(omni_types::locker_args::FinTransferArgs {
                     chain_kind,
-                    storage_deposit_args,
+                    storage_deposit_actions,
                     prover_args,
                 })
                 .await