Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 60 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ sui-types = { package = "sui-sdk-types", version = "0.2.2", features = [
"serde",
] }
k256 = { version = "0.13.4", features = ["ecdsa", "sha256"] }
bitcoin = { version = "0.32", default-features = false, features = ["std"] }

uniffi = { version = "0.31.0" }
regex = { version = "1.12.3" }
Expand Down
2 changes: 1 addition & 1 deletion crates/gem_aptos/src/signer/chain_signer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ fn gas_unit_price(input: &TransactionLoadInput) -> Result<u64, SignerError> {

fn resolve_max_gas_amount(input: &TransactionLoadInput) -> u64 {
if let TransactionInputType::Swap(_, _, swap_data) = &input.input_type
&& let Some(limit) = &swap_data.data.gas_limit
&& let Some(limit) = &swap_data.data.limit
&& let Ok(parsed) = limit.parse::<u64>()
{
return parsed;
Expand Down
3 changes: 2 additions & 1 deletion crates/gem_bitcoin/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ publish = false
[features]
default = []
rpc = ["dep:chain_traits", "dep:gem_client"]
signer = ["dep:signer", "dep:gem_hash", "dep:hex"]
signer = ["dep:signer", "dep:gem_hash", "dep:hex", "dep:bitcoin"]
reqwest = ["gem_client/reqwest"]
chain_integration_tests = ["rpc", "reqwest", "settings/testkit"]

Expand All @@ -28,6 +28,7 @@ serde_serializers = { path = "../serde_serializers", features = ["bigint"] }
signer = { path = "../signer", optional = true }
gem_hash = { path = "../gem_hash", optional = true }
hex = { workspace = true, optional = true }
bitcoin = { workspace = true, optional = true }

[dev-dependencies]
tokio = { workspace = true, features = ["macros", "rt"] }
Expand Down
26 changes: 21 additions & 5 deletions crates/gem_bitcoin/src/provider/preload.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ use std::error::Error;

use gem_client::Client;
use primitives::{
BitcoinChain, FeePriority, FeeRate, GasPriceType, TransactionInputType, TransactionLoadData, TransactionLoadInput, TransactionLoadMetadata, TransactionPreloadInput, UTXO,
BitcoinChain, FeePriority, FeeRate, GasPriceType, SwapProvider, TransactionFee, TransactionInputType, TransactionLoadData, TransactionLoadInput, TransactionLoadMetadata,
TransactionPreloadInput, UTXO,
swap::SwapQuoteDataType,
};

use crate::models::Address;
Expand All @@ -32,10 +34,11 @@ impl<C: Client> ChainTransactionLoad for BitcoinClient<C> {
}

async fn get_transaction_load(&self, input: TransactionLoadInput) -> Result<TransactionLoadData, Box<dyn Error + Sync + Send>> {
Ok(TransactionLoadData {
fee: input.default_fee(),
metadata: input.metadata,
})
let fee = match swap_provider_fee(&input) {
Some(result) => result?,
None => input.default_fee(),
};
Ok(TransactionLoadData { fee, metadata: input.metadata })
}

async fn get_transaction_fee_rates(&self, _input_type: TransactionInputType) -> Result<Vec<FeeRate>, Box<dyn Error + Sync + Send>> {
Expand Down Expand Up @@ -64,6 +67,19 @@ impl<C: Client> BitcoinClient<C> {
}
}

fn swap_provider_fee(input: &TransactionLoadInput) -> Option<Result<TransactionFee, &'static str>> {
let swap_data = input.input_type.get_swap_data().ok()?;
if swap_data.data.data_type != SwapQuoteDataType::Contract {
return None;
}
let provider = swap_data.quote.provider_data.provider;
if !matches!(provider, SwapProvider::Relay) {
return None;
}
let limit = swap_data.data.limit.as_deref()?;
Some(limit.parse::<BigInt>().map(TransactionFee::new_from_fee).map_err(|_| "invalid swap fee"))
}
Comment on lines +70 to +81
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The function swap_provider_fee can be refactored for better readability and to be more idiomatic. Using if let to destructure input.input_type directly avoids the get_swap_data() call and contains the logic for Relay swaps within a single block, improving maintainability.

fn swap_provider_fee(input: &TransactionLoadInput) -> Option<Result<TransactionFee, &'static str>> {
    if let TransactionInputType::Swap(_, _, swap_data) = &input.input_type {
        if swap_data.data.data_type == SwapQuoteDataType::Contract
            && matches!(swap_data.quote.provider_data.provider, SwapProvider::Relay)
        {
            return swap_data.data.limit.as_deref().map(|limit| {
                limit
                    .parse::<BigInt>()
                    .map(TransactionFee::new_from_fee)
                    .map_err(|_| "invalid swap fee")
            });
        }
    }
    None
}


fn calculate_fee_rate(fee_sat_per_kb: &str, minimum_byte_fee: u32) -> Result<BigInt, Box<dyn Error + Sync + Send>> {
let rate = BigNumberFormatter::value_from_amount(fee_sat_per_kb, 8)?.parse::<f64>()? / 1000.0;
let minimum_byte_fee = minimum_byte_fee as f64;
Expand Down
Loading
Loading