diff --git a/Cargo.lock b/Cargo.lock index e84de325..6095842b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1772,7 +1772,7 @@ dependencies = [ [[package]] name = "bridge-cli" -version = "0.3.37" +version = "0.3.38" dependencies = [ "alloy", "clap", @@ -4791,7 +4791,7 @@ dependencies = [ [[package]] name = "near-bridge-client" -version = "0.2.14" +version = "0.2.15" dependencies = [ "base64 0.21.7", "bitcoin", diff --git a/bridge-cli/Cargo.toml b/bridge-cli/Cargo.toml index f6f9b4db..13203694 100644 --- a/bridge-cli/Cargo.toml +++ b/bridge-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bridge-cli" -version = "0.3.38" +version = "0.3.39" edition = "2021" repository = "https://github.com/Near-One/bridge-sdk-rs" rust-version = "1.88.0" diff --git a/bridge-sdk/connectors/omni-connector/Cargo.toml b/bridge-sdk/connectors/omni-connector/Cargo.toml index 653cae0b..18ad1836 100644 --- a/bridge-sdk/connectors/omni-connector/Cargo.toml +++ b/bridge-sdk/connectors/omni-connector/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "omni-connector" -version = "0.3.5" +version = "0.3.6" edition = "2021" rust-version = "1.88.0" diff --git a/bridge-sdk/connectors/omni-connector/src/omni_connector.rs b/bridge-sdk/connectors/omni-connector/src/omni_connector.rs index 404a910d..d5b12019 100644 --- a/bridge-sdk/connectors/omni-connector/src/omni_connector.rs +++ b/bridge-sdk/connectors/omni-connector/src/omni_connector.rs @@ -670,7 +670,7 @@ impl OmniConnector { amount: u128, transaction_options: TransactionOptions, ) -> Result { - let enable_orchard = self.get_orchard_mode(&target_btc_address)?; + let enable_orchard = self.get_orchard_mode(&target_btc_address, chain)?; let utxo_bridge_client = self.utxo_bridge_client(chain)?; let fee_rate = utxo_bridge_client.get_fee_rate().await?; @@ -762,7 +762,7 @@ impl OmniConnector { transaction_options: TransactionOptions, max_gas_fee: Option, ) -> Result { - let enable_orchard = self.get_orchard_mode(&recipient)?; + let enable_orchard = self.get_orchard_mode(&recipient, chain)?; let near_bridge_client = self.near_bridge_client()?; let fee = near_bridge_client.get_withdraw_fee(chain).await?; let (out_points, tx_outs, chain_specific_data, gas_fee) = self @@ -2007,7 +2007,11 @@ impl OmniConnector { wormhole_bridge_client.get_vaa_by_tx_hash(tx_hash).await } - pub fn get_orchard_mode(&self, target_btc_address: &str) -> Result { + pub fn get_orchard_mode(&self, target_btc_address: &str, chain: ChainKind) -> Result { + if chain != ChainKind::Zcash { + return Ok(false); + } + let has_orchard = utxo_utils::contains_orchard_address(target_btc_address) .map_err(|err| BridgeSdkError::InvalidArgument(format!("Invalid address: {err}")))?; diff --git a/rust-toolchain b/rust-toolchain index 15ad8b05..fb5449af 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1,3 +1,3 @@ [toolchain] -channel = "1.88.0" -components = ["clippy", "rustfmt"] \ No newline at end of file +channel = "1.93.0" +components = ["clippy", "rustfmt"]