diff --git a/Cargo.lock b/Cargo.lock index 6a9406e..ae310f1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1770,7 +1770,7 @@ dependencies = [ [[package]] name = "bridge-cli" -version = "0.3.44" +version = "0.3.45" dependencies = [ "alloy", "clap", @@ -3242,7 +3242,7 @@ dependencies = [ [[package]] name = "evm-bridge-client" -version = "0.3.4" +version = "0.3.5" dependencies = [ "alloy", "borsh 1.6.1", @@ -5634,7 +5634,7 @@ dependencies = [ [[package]] name = "omni-connector" -version = "0.3.8" +version = "0.3.9" dependencies = [ "alloy", "bip0039", diff --git a/bridge-cli/Cargo.toml b/bridge-cli/Cargo.toml index 32d3492..cf4dd1e 100644 --- a/bridge-cli/Cargo.toml +++ b/bridge-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bridge-cli" -version = "0.3.44" +version = "0.3.45" edition = "2021" repository = "https://github.com/Near-One/bridge-sdk-rs" rust-version = "1.88.0" diff --git a/bridge-cli/src/omni_connector_command.rs b/bridge-cli/src/omni_connector_command.rs index be68b69..e0065df 100644 --- a/bridge-cli/src/omni_connector_command.rs +++ b/bridge-cli/src/omni_connector_command.rs @@ -109,10 +109,7 @@ async fn fetch_indexer_fees( .await .map_err(|e| format!("Failed to fetch transfer fee: {e}"))?; - let transferred_fee = fee - .transferred_token_fee - .ok_or("Missing transferred_token_fee in response")? - .0; + let transferred_fee = fee.transferred_token_fee.map(|v| v.0).unwrap_or_default(); Ok(( transferred_fee, diff --git a/bridge-sdk/bridge-clients/evm-bridge-client/Cargo.toml b/bridge-sdk/bridge-clients/evm-bridge-client/Cargo.toml index 8ba488b..14686e0 100644 --- a/bridge-sdk/bridge-clients/evm-bridge-client/Cargo.toml +++ b/bridge-sdk/bridge-clients/evm-bridge-client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "evm-bridge-client" -version = "0.3.4" +version = "0.3.5" edition = "2021" rust-version = "1.88.0" diff --git a/bridge-sdk/bridge-clients/evm-bridge-client/src/evm_bridge_client.rs b/bridge-sdk/bridge-clients/evm-bridge-client/src/evm_bridge_client.rs index fa036d5..fe1f55b 100644 --- a/bridge-sdk/bridge-clients/evm-bridge-client/src/evm_bridge_client.rs +++ b/bridge-sdk/bridge-clients/evm-bridge-client/src/evm_bridge_client.rs @@ -336,12 +336,13 @@ impl EvmBridgeClient { Some(FIN_TRANSFER_GAS), ); - let receipt = call_builder.send().await?.get_receipt().await?; + let pending = call_builder.send().await?; + let tx_hash = *pending.tx_hash(); tracing::info!( - tx_hash = format!("{:?}", receipt.transaction_hash), + tx_hash = format!("{tx_hash:?}"), "Sent finalize transfer transaction" ); - Ok(receipt.transaction_hash) + Ok(tx_hash) } ChainKind::Eth | ChainKind::Base | ChainKind::Arb | ChainKind::Bnb | ChainKind::Pol => { let bridge_deposit = OmniBridge::TransferMessagePayloadWithoutMessage { @@ -363,12 +364,13 @@ impl EvmBridgeClient { Some(FIN_TRANSFER_GAS), ); - let receipt = call_builder.send().await?.get_receipt().await?; + let pending = call_builder.send().await?; + let tx_hash = *pending.tx_hash(); tracing::info!( - tx_hash = format!("{:?}", receipt.transaction_hash), + tx_hash = format!("{tx_hash:?}"), "Sent finalize transfer transaction" ); - Ok(receipt.transaction_hash) + Ok(tx_hash) } ChainKind::Near | ChainKind::Sol diff --git a/bridge-sdk/connectors/omni-connector/Cargo.toml b/bridge-sdk/connectors/omni-connector/Cargo.toml index 70eb5a3..7ba78ba 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.8" +version = "0.3.9" edition = "2021" rust-version = "1.88.0"