Skip to content

Remove gas_limit from Route struct #995

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gemcoder21 merged 2 commits into from
Mar 9, 2026
Merged

Remove gas_limit from Route struct #995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d04d220
Remove gas_limit from Route struct
0xh3rman Mar 8, 2026
adcfad3
Update Swapper+Ext.swift
0xh3rman Mar 9, 2026
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
3 changes: 1 addition & 2 deletions crates/swapper/src/across/provider.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,6 @@ impl Swapper for Across {
input: input_asset.clone(),
output: output_asset.clone(),
route_data,
gas_limit: Some(DEFAULT_DEPOSIT_GAS_LIMIT.to_string()),
}],
},
request: request.clone(),
Expand Down Expand Up @@ -551,7 +550,7 @@ impl Swapper for Across {
};

let to: String = deployment.spoke_pool.into();
let mut gas_limit = if approval.is_some() { route.gas_limit.clone() } else { None };
let mut gas_limit = if approval.is_some() { Some(DEFAULT_DEPOSIT_GAS_LIMIT.to_string()) } else { None };

if matches!(data, FetchQuoteData::EstimateGas) {
let hex_value = format!("{:#x}", U256::from_str(value).unwrap());
Expand Down
1 change: 0 additions & 1 deletion crates/swapper/src/chainflip/provider.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,6 @@ where
input: request.from_asset.asset_id(),
output: request.to_asset.asset_id(),
route_data: serde_json::to_string(&route_data).unwrap(),
gas_limit: None,
}],
},
eta_in_seconds: Some(eta_in_seconds),
Expand Down
1 change: 0 additions & 1 deletion crates/swapper/src/hyperliquid/provider/bridge.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ impl Swapper for HyperCoreBridge {
input: request.from_asset.asset_id(),
output: request.to_asset.asset_id(),
route_data: "".to_string(),
gas_limit: None,
}],
},
request: request.clone(),
Expand Down
1 change: 0 additions & 1 deletion crates/swapper/src/hyperliquid/provider/spot/provider.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,6 @@ impl Swapper for HyperCoreSpot {
}),
))
.map_err(|err| SwapperError::ComputeQuoteError(err.to_string()))?,
gas_limit: None,
}],
},
request: request.clone(),
Expand Down
1 change: 0 additions & 1 deletion crates/swapper/src/jupiter/provider.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@ where
input: AssetId::from(Chain::Solana, Some(input_mint)),
output: AssetId::from(Chain::Solana, Some(output_mint)),
route_data: serde_json::to_string(&swap_quote).unwrap_or_default(),
gas_limit: None,
}],
slippage_bps: swap_quote.slippage_bps,
},
Expand Down
1 change: 0 additions & 1 deletion crates/swapper/src/models.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ pub struct Route {
pub input: AssetId,
pub output: AssetId,
pub route_data: String,
pub gas_limit: Option<String>,
}

#[derive(Debug, Clone, PartialEq)]
Expand Down
1 change: 0 additions & 1 deletion crates/swapper/src/near_intents/provider.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,6 @@ where
input: request.from_asset.asset_id(),
output: request.to_asset.asset_id(),
route_data,
gas_limit: None,
}],
},
request: request.clone(),
Expand Down
1 change: 0 additions & 1 deletion crates/swapper/src/proxy/provider.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,6 @@ where
input: request.from_asset.asset_id(),
output: request.to_asset.asset_id(),
route_data: serde_json::to_string(&quote).map_err(|e| SwapperError::ComputeQuoteError(e.to_string()))?,
gas_limit: None,
}],
slippage_bps: request.options.slippage.bps,
},
Expand Down
1 change: 0 additions & 1 deletion crates/swapper/src/relay/provider.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ where
input: from_asset_id,
output: to_asset_id,
route_data: serde_json::to_string(&response).map_err(|e| SwapperError::ComputeQuoteError(e.to_string()))?,
gas_limit: None,
}],
slippage_bps: response.details.slippage_bps().unwrap_or(request.options.slippage.bps),
},
Expand Down
1 change: 0 additions & 1 deletion crates/swapper/src/thorchain/provider.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@ where
input: request.from_asset.asset_id(),
output: request.to_asset.asset_id(),
route_data: serde_json::to_string(&route_data).unwrap_or_default(),
gas_limit: None,
}],
slippage_bps: request.options.slippage.bps,
},
Expand Down
2 changes: 0 additions & 2 deletions crates/swapper/src/uniswap/quote_result.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ pub struct QuoteResult {
pub amount_out: U256,
pub fee_tier_idx: usize,
pub batch_idx: usize,
pub gas_estimate: Option<String>,
}

pub fn get_best_quote<F>(batch_results: &[Result<JsonRpcResults<String>, JsonRpcError>], decoder: F) -> Result<QuoteResult, SwapperError>
Expand All @@ -28,7 +27,6 @@ where
amount_out: quoter_tuple.0,
fee_tier_idx: fee_idx,
batch_idx,
gas_estimate: Some(quoter_tuple.1.to_string()),
}),
_ => None,
})
Expand Down
5 changes: 1 addition & 4 deletions crates/swapper/src/uniswap/swap_route.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,29 +23,26 @@ pub fn get_intermediaries_by_array(token_in: &Address, token_out: &Address, arra
.collect()
}

pub fn build_swap_route(token_in: &AssetId, intermediary: Option<&AssetId>, token_out: &AssetId, route_data: &RouteData, gas_estimate: Option<String>) -> Vec<Route> {
pub fn build_swap_route(token_in: &AssetId, intermediary: Option<&AssetId>, token_out: &AssetId, route_data: &RouteData) -> Vec<Route> {
let data = serde_json::to_string(route_data).unwrap();
if let Some(intermediary) = intermediary {
vec![
Route {
input: token_in.clone(),
output: intermediary.clone(),
route_data: data.clone(),
gas_limit: gas_estimate.clone(),
},
Route {
input: intermediary.clone(),
output: token_out.clone(),
route_data: data,
gas_limit: None,
},
]
} else {
vec![Route {
input: token_in.clone(),
output: token_out.clone(),
route_data: data,
gas_limit: gas_estimate.clone(),
}]
}
}
3 changes: 1 addition & 2 deletions crates/swapper/src/uniswap/v3/provider.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ impl Swapper for UniswapV3 {

let fee_tier_idx = quote_result.fee_tier_idx;
let batch_idx = quote_result.batch_idx;
let gas_estimate = quote_result.gas_estimate;

let fee_tier: u32 = fee_tiers[fee_tier_idx % fee_tiers.len()] as u32;
let asset_id_in = AssetId::from(from_chain, Some(token_in.to_checksum(None)));
Expand All @@ -176,7 +175,7 @@ impl Swapper for UniswapV3 {
fee_tier: fee_tier.to_string(),
min_amount_out: to_min_value.to_string(),
};
let routes = build_swap_route(&asset_id_in, asset_id_intermediary.as_ref(), &asset_id_out, &route_data, gas_estimate);
let routes = build_swap_route(&asset_id_in, asset_id_intermediary.as_ref(), &asset_id_out, &route_data);

Ok(Quote {
from_value: request.value.clone(),
Expand Down
3 changes: 1 addition & 2 deletions crates/swapper/src/uniswap/v4/provider.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@ impl Swapper for UniswapV4 {

let fee_tier_idx = quote_result.fee_tier_idx;
let batch_idx = quote_result.batch_idx;
let gas_estimate = quote_result.gas_estimate;

let to_value = if fee_preference.is_input_token {
quote_result.amount_out
Expand All @@ -171,7 +170,7 @@ impl Swapper for UniswapV4 {
fee_tier: fee_tier.to_string(),
min_amount_out: to_min_value.to_string(),
};
let routes = build_swap_route(&asset_id_in, asset_id_intermediary.as_ref(), &asset_id_out, &route_data, gas_estimate);
let routes = build_swap_route(&asset_id_in, asset_id_intermediary.as_ref(), &asset_id_out, &route_data);

Ok(Quote {
from_value: request.value.clone(),
Expand Down
1 change: 0 additions & 1 deletion gemstone/src/gem_swapper/remote_types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ pub struct SwapperRoute {
pub input: AssetId,
pub output: AssetId,
pub route_data: String,
pub gas_limit: Option<String>,
}

#[uniffi::remote(Record)]
Expand Down
2 changes: 0 additions & 2 deletions gemstone/tests/ios/GemTest/GemTest/Extension/Swapper+Ext.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ extension SwapperQuote: @retroactive CustomStringConvertible {
"input": route.input,
"output": route.output,
"routeData": route.routeData,
"gasLimit": route.gasLimit ?? "",
]
}
let json: [String: Any] = [
Expand All @@ -51,7 +50,6 @@ extension GemSwapQuoteData: @retroactive CustomStringConvertible {
"data": data,
"memo": memo ?? NSNull(),
"approval": NSNull(),
"gasLimit": gasLimit ?? NSNull(),
]
if let approvalData = approval {
json["approval"] = [
Expand Down
Loading