feat(evm): different transfer message types for finalization

Cargo.toml

@@ -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 = "50aa7ae521cdb300fff0eaedd77bacf681e0aa93", features = ["abi", "__abi-generate"] }
+omni-types = { git = "https://github.com/near-one/omni-bridge", package = "omni-types", rev = "ffbdc544c0d7f670942e8bf532c7e023c1c6bfec", features = ["abi", "__abi-generate"] }
 starknet = "0.17.0"
 serde_with = { version = "3.12.0", features = ["schemars_0_8"] }
 solana-sdk = "2.0.13"

bridge-cli/Cargo.toml

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

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

@@ -1,6 +1,6 @@
 [package]
 name = "evm-bridge-client"
-version = "0.3.3"
+version = "0.3.4"
 edition = "2021"
 rust-version = "1.88.0"
 

bridge-sdk/bridge-clients/evm-bridge-client/src/evm_bridge_client.rs

@@ -8,9 +8,9 @@ use alloy::{
 };
 use error::Result;
 use ethereum_types::H256 as EthH256;
-use omni_types::prover_args::EvmProof;
 use omni_types::prover_result::ProofKind;
 use omni_types::{near_events::OmniBridgeEvent, OmniAddress};
+use omni_types::{prover_args::EvmProof, ChainKind};
 use omni_types::{EvmAddress, Fee};
 use sha3::{Digest, Keccak256};
 
@@ -45,9 +45,19 @@ sol! {
             string feeRecipient;
             bytes message;
         }
+        struct TransferMessagePayloadWithoutMessage {
+            uint64 destinationNonce;
+            uint8 originChain;
+            uint64 originNonce;
+            address tokenAddress;
+            uint128 amount;
+            address recipient;
+            string feeRecipient;
+        }
 
         function deployToken(bytes signatureData, MetadataPayload metadata) external returns (address);
         function finTransfer(bytes, TransferMessagePayload) external;
+        function finTransfer(bytes, TransferMessagePayloadWithoutMessage) external;
         function initTransfer(address tokenAddress, uint128 amount, uint128 fee, uint128 nativeFee, string recipient, string message) external payable;
         function logMetadata(address tokenAddress) external payable;
         function completedTransfers(uint64) external view returns (bool);
@@ -288,6 +298,7 @@ impl EvmBridgeClient {
     #[tracing::instrument(skip_all, name = "EVM FIN TRANSFER")]
     pub async fn fin_transfer(
         &self,
+        chain_kind: ChainKind,
         transfer_log: OmniBridgeEvent,
         tx_nonce: Option<U256>,
     ) -> Result<TxHash> {
@@ -303,34 +314,70 @@ impl EvmBridgeClient {
             )));
         };
 
-        let bridge_deposit = OmniBridge::TransferMessagePayload {
-            destinationNonce: message_payload.destination_nonce,
-            originChain: message_payload.transfer_id.origin_chain.into(),
-            originNonce: message_payload.transfer_id.origin_nonce,
-            tokenAddress: Self::convert_omni_address(message_payload.token_address)?,
-            amount: message_payload.amount.into(),
-            recipient: Self::convert_omni_address(message_payload.recipient)?,
-            feeRecipient: message_payload
-                .fee_recipient
-                .map_or_else(String::new, |addr| addr.to_string()),
-            message: Bytes::from(message_payload.message),
-        };
-
-        let call_builder = self.prepare_tx_for_sending(
-            omni_bridge.finTransfer(Bytes::from(signature.to_bytes()), bridge_deposit),
-            tx_nonce,
-            self.get_wormhole_fee().await.ok(),
-            Some(FIN_TRANSFER_GAS),
-        );
-
-        let receipt = call_builder.send().await?.get_receipt().await?;
-
-        tracing::info!(
-            tx_hash = format!("{:?}", receipt.transaction_hash),
-            "Sent finalize transfer transaction"
-        );
-
-        Ok(receipt.transaction_hash)
+        match chain_kind {
+            ChainKind::HyperEvm | ChainKind::Abs => {
+                let bridge_deposit = OmniBridge::TransferMessagePayload {
+                    destinationNonce: message_payload.destination_nonce,
+                    originChain: message_payload.transfer_id.origin_chain.into(),
+                    originNonce: message_payload.transfer_id.origin_nonce,
+                    tokenAddress: Self::convert_omni_address(message_payload.token_address)?,
+                    amount: message_payload.amount.into(),
+                    recipient: Self::convert_omni_address(message_payload.recipient)?,
+                    feeRecipient: message_payload
+                        .fee_recipient
+                        .map_or_else(String::new, |addr| addr.to_string()),
+                    message: Bytes::from(message_payload.message),
+                };
+
+                let call_builder = self.prepare_tx_for_sending(
+                    omni_bridge.finTransfer_0(Bytes::from(signature.to_bytes()), bridge_deposit),
+                    tx_nonce,
+                    self.get_wormhole_fee().await.ok(),
+                    Some(FIN_TRANSFER_GAS),
+                );
+
+                let receipt = call_builder.send().await?.get_receipt().await?;
+                tracing::info!(
+                    tx_hash = format!("{:?}", receipt.transaction_hash),
+                    "Sent finalize transfer transaction"
+                );
+                Ok(receipt.transaction_hash)
+            }
+            ChainKind::Eth | ChainKind::Base | ChainKind::Arb | ChainKind::Bnb | ChainKind::Pol => {
+                let bridge_deposit = OmniBridge::TransferMessagePayloadWithoutMessage {
+                    destinationNonce: message_payload.destination_nonce,
+                    originChain: message_payload.transfer_id.origin_chain.into(),
+                    originNonce: message_payload.transfer_id.origin_nonce,
+                    tokenAddress: Self::convert_omni_address(message_payload.token_address)?,
+                    amount: message_payload.amount.into(),
+                    recipient: Self::convert_omni_address(message_payload.recipient)?,
+                    feeRecipient: message_payload
+                        .fee_recipient
+                        .map_or_else(String::new, |addr| addr.to_string()),
+                };
+
+                let call_builder = self.prepare_tx_for_sending(
+                    omni_bridge.finTransfer_1(Bytes::from(signature.to_bytes()), bridge_deposit),
+                    tx_nonce,
+                    self.get_wormhole_fee().await.ok(),
+                    Some(FIN_TRANSFER_GAS),
+                );
+
+                let receipt = call_builder.send().await?.get_receipt().await?;
+                tracing::info!(
+                    tx_hash = format!("{:?}", receipt.transaction_hash),
+                    "Sent finalize transfer transaction"
+                );
+                Ok(receipt.transaction_hash)
+            }
+            ChainKind::Near
+            | ChainKind::Sol
+            | ChainKind::Btc
+            | ChainKind::Zcash
+            | ChainKind::Strk => Err(EvmBridgeClientError::InvalidArgument(format!(
+                "Expected evm chain but got {chain_kind:?}"
+            ))),
+        }
     }
 
     pub async fn get_proof_for_event(

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

@@ -1,6 +1,6 @@
 [package]
 name = "omni-connector"
-version = "0.3.7"
+version = "0.3.8"
 edition = "2021"
 rust-version = "1.88.0"
 

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

@@ -1630,7 +1630,9 @@ impl OmniConnector {
         tx_nonce: Option<U256>,
     ) -> Result<TxHash> {
         let evm_bridge_client = self.evm_bridge_client(chain_kind)?;
-        let tx_hash = evm_bridge_client.fin_transfer(event, tx_nonce).await?;
+        let tx_hash = evm_bridge_client
+            .fin_transfer(chain_kind, event, tx_nonce)
+            .await?;
         Ok(tx_hash)
     }
 
@@ -1648,7 +1650,7 @@ impl OmniConnector {
             .await?;
 
         let tx_hash = evm_bridge_client
-            .fin_transfer(serde_json::from_str(&transfer_log)?, tx_nonce)
+            .fin_transfer(chain_kind, serde_json::from_str(&transfer_log)?, tx_nonce)
             .await?;
 
         Ok(tx_hash)