feat: made mpc finalities configurable

Author: frolvanya

Cargo.lock

@@ -49,7 +49,7 @@ tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 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 = "5677f0db5e9799ba503ee85eeef8fd6f977f4d36", features = ["abi", "__abi-generate"] }
+omni-types = { git = "https://github.com/near-one/omni-bridge", package = "omni-types", rev = "9e02ab5bcff3901bc68492623f8915b798fc0fc0", features = ["abi", "__abi-generate"] }
 starknet = "0.17.0"
 serde_with = { version = "3.12.0", features = ["schemars_0_8"] }
 solana-sdk = "2.0.13"

Cargo.toml

@@ -29,3 +29,4 @@ utxo-bridge-client = { path = "../bridge-sdk/bridge-clients/utxo-bridge-client"
 starknet-bridge-client = { path = "../bridge-sdk/bridge-clients/starknet-bridge-client" }
 utxo-utils = { path = "../bridge-sdk/utxo-utils" }
 near-sdk.workspace = true
+mpc-contract-interface.workspace = true

bridge-cli/Cargo.toml

@@ -1,5 +1,7 @@
 use clap::Subcommand;
 use core::panic;
+use mpc_contract_interface::types::{EvmFinality, StarknetFinality};
+use omni_types::mpc_types::MpcFinality;
 use std::collections::HashMap;
 use std::{path::Path, str::FromStr};
 
@@ -1586,6 +1588,20 @@ fn omni_connector(network: Network, cli_config: CliConfig) -> OmniConnector {
         .build()
         .unwrap();
 
+    let mut mpc_finalities = HashMap::new();
+    match network {
+        Network::Mainnet => {
+            mpc_finalities.insert(ChainKind::Abs, MpcFinality::Evm(EvmFinality::Safe));
+        }
+        Network::Testnet | Network::Devnet => {
+            mpc_finalities.insert(ChainKind::Abs, MpcFinality::Evm(EvmFinality::Latest));
+        }
+    }
+    mpc_finalities.insert(
+        ChainKind::Strk,
+        MpcFinality::Starknet(StarknetFinality::AcceptedOnL2),
+    );
+
     OmniConnectorBuilder::default()
         .network(Some(network.into()))
         .near_bridge_client(Some(near_bridge_client))
@@ -1605,6 +1621,7 @@ fn omni_connector(network: Network, cli_config: CliConfig) -> OmniConnector {
         .btc_light_client(Some(btc_light_client))
         .zcash_light_client(Some(zcash_light_client))
         .enable_orchard(combined_config.enable_orchard)
+        .mpc_finalities(Some(mpc_finalities))
         .build()
         .unwrap()
 }

bridge-cli/src/omni_connector_command.rs

@@ -7,6 +7,7 @@ use derive_builder::Builder;
 use light_client::LightClient;
 use near_primitives::hash::CryptoHash;
 use near_primitives::types::AccountId;
+use omni_types::mpc_types::MpcFinality;
 use utxo_bridge_client::error::UtxoClientError;
 use utxo_utils::address::{Network, UTXOAddress};
 
@@ -34,6 +35,7 @@ use solana_bridge_client::{
 use solana_sdk::pubkey::Pubkey;
 use solana_sdk::signature::{Keypair, Signature};
 use starknet_bridge_client::{StarknetBridgeClient, StarknetInitTransferEvent};
+use std::collections::HashMap;
 use std::str::FromStr;
 use utxo_bridge_client::{
     types::{Bitcoin, Zcash},
@@ -64,6 +66,7 @@ pub struct OmniConnector {
     btc_light_client: Option<LightClient>,
     zcash_light_client: Option<LightClient>,
     enable_orchard: Option<bool>,
+    mpc_finalities: Option<HashMap<ChainKind, MpcFinality>>,
 }
 
 macro_rules! forward_common_utxo_method {
@@ -1124,9 +1127,8 @@ impl OmniConnector {
         proof_kind: ProofKind,
     ) -> Result<Vec<u8>> {
         use mpc_contract_interface::types::{
-            EvmExtractedValue, EvmExtractor, EvmFinality, EvmLog, EvmRpcRequest, EvmTxId,
-            ExtractedValue, ForeignChainRpcRequest, ForeignTxSignPayload, ForeignTxSignPayloadV1,
-            Hash160, Hash256,
+            EvmExtractedValue, EvmExtractor, EvmLog, EvmRpcRequest, EvmTxId, ExtractedValue,
+            ForeignChainRpcRequest, ForeignTxSignPayload, ForeignTxSignPayloadV1, Hash160, Hash256,
         };
 
         let evm_client = self.evm_bridge_client(ChainKind::Abs)?;
@@ -1177,9 +1179,11 @@ impl OmniConnector {
             topics: rpc_log.topics().iter().map(|t| Hash256(t.0)).collect(),
         };
 
-        let finality = match self.network()? {
-            Network::Mainnet => EvmFinality::Safe,
-            Network::Testnet => EvmFinality::Latest,
+        let mpc_finalities = self.get_mpc_finalities()?;
+        let Some(MpcFinality::Evm(finality)) = mpc_finalities.get(&ChainKind::Abs).cloned() else {
+            return Err(BridgeSdkError::ConfigError(
+                "No mpc finality provided for Abs".to_string(),
+            ));
         };
 
         let sign_payload = ForeignTxSignPayload::V1(ForeignTxSignPayloadV1 {
@@ -1210,7 +1214,7 @@ impl OmniConnector {
     ) -> Result<Vec<u8>> {
         use mpc_contract_interface::types::{
             ExtractedValue, ForeignChainRpcRequest, ForeignTxSignPayload, ForeignTxSignPayloadV1,
-            StarknetExtractedValue, StarknetExtractor, StarknetFelt, StarknetFinality, StarknetLog,
+            StarknetExtractedValue, StarknetExtractor, StarknetFelt, StarknetLog,
             StarknetRpcRequest, StarknetTxId,
         };
 
@@ -1242,10 +1246,18 @@ impl OmniConnector {
                 .collect(),
         };
 
+        let mpc_finalities = self.get_mpc_finalities()?;
+        let Some(MpcFinality::Starknet(finality)) = mpc_finalities.get(&ChainKind::Strk).cloned()
+        else {
+            return Err(BridgeSdkError::ConfigError(
+                "No mpc finality provided for Abs".to_string(),
+            ));
+        };
+
         let sign_payload = ForeignTxSignPayload::V1(ForeignTxSignPayloadV1 {
             request: ForeignChainRpcRequest::Starknet(StarknetRpcRequest {
                 tx_id: StarknetTxId(StarknetFelt(tx_hash.to_bytes_be())),
-                finality: StarknetFinality::AcceptedOnL2,
+                finality,
                 extractors: vec![StarknetExtractor::Log {
                     log_index: log.log_index,
                 }],
@@ -2492,6 +2504,12 @@ impl OmniConnector {
         Ok(enable_orchard)
     }
 
+    pub fn get_mpc_finalities(&self) -> Result<HashMap<ChainKind, MpcFinality>> {
+        self.mpc_finalities.clone().ok_or_else(|| {
+            BridgeSdkError::ConfigError("MPC finalities are not configured".to_string())
+        })
+    }
+
     pub fn denormalize_amount(&self, decimals: &Decimals, amount: u128) -> Result<u128> {
         amount
             .checked_mul(10_u128.pow((decimals.origin_decimals - decimals.decimals).into()))