Skip to content

chore: sync from internal repo #23

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

Open
polybasebot wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: sync from internal repo #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
102 changes: 77 additions & 25 deletions beam-apps/apps/uniswap/src/api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use serde_json::{Value, json};
use serde_json::{Number, Value, json};

use crate::{Error, Result};

Expand Down Expand Up @@ -55,58 +55,82 @@ pub fn check_approval_payload(request: &QuoteRequest) -> Value {
pub fn quote_payload(request: &QuoteRequest) -> Value {
json!({
"amount": request.amount,
"permitAmount": "EXACT",
"protocols": ["V2", "V3", "V4"],
"recipient": request.recipient,
"slippageTolerance": request.slippage_bps,
"routingPreference": "BEST_PRICE",
"slippageTolerance": slippage_tolerance(request.slippage_bps),
"swapper": request.wallet,
"tokenIn": request.token_in,
"tokenInChainId": request.chain_id,
"tokenOut": request.token_out,
"tokenOutChainId": request.chain_id,
"type": "EXACT_INPUT",
"walletAddress": request.wallet,
"urgency": "normal",
})
}

pub fn swap_payload(quote: &QuoteResponse, wallet: &str) -> Value {
pub fn swap_payload(quote: &QuoteResponse, _wallet: &str) -> Value {
json!({
"quote": quote.quote,
"refreshGasPrice": true,
"simulateTransaction": true,
"walletAddress": wallet,
"urgency": "normal",
})
}

pub fn parse_quote(value: Value, request: &QuoteRequest) -> Result<QuoteResponse> {
let quote = value.get("quote").cloned().unwrap_or_else(|| value.clone());
validate_optional_field(
&value,
&quote,
&["tokenInChainId", "chainId"],
&[],
&request.chain_id.to_string(),
)?;
validate_optional_field(&value, &["tokenOutChainId"], &request.chain_id.to_string())?;
validate_optional_field(&value, &["tokenIn", "inputToken"], &request.token_in)?;
validate_optional_field(&value, &["tokenOut", "outputToken"], &request.token_out)?;
let amount_out =
first_string(&value, &["amountOut", "output", "quoteAmount"]).ok_or_else(|| {
Error::InvalidUniswapResponse {
reason: "quote missing output amount".to_string(),
}
})?;
let quote_id = first_string(&value, &["quoteId", "requestId", "routingId"])
validate_optional_field(
&quote,
&["tokenOutChainId"],
&[],
&request.chain_id.to_string(),
)?;
validate_optional_field(
&quote,
&["tokenIn", "inputToken"],
&[&["input", "token"]],
&request.token_in,
)?;
validate_optional_field(
&quote,
&["tokenOut", "outputToken"],
&[&["output", "token"]],
&request.token_out,
)?;
let amount_out = first_string_or_path(
&quote,
&["amountOut", "quoteAmount"],
&[&["output", "amount"]],
)
.ok_or_else(|| Error::InvalidUniswapResponse {
reason: "quote missing output amount".to_string(),
})?;
let quote_id = first_string(&quote, &["quoteId", "requestId", "routingId"])
.or_else(|| first_string(&value, &["quoteId", "requestId", "routingId"]))
.unwrap_or_else(|| "uniswap-quote".to_string());
let route = first_string(&value, &["routing", "routeString", "route"])
let route = first_string(&value, &["routing"])
.or_else(|| first_string(&quote, &["routing", "routeString", "route"]))
.unwrap_or_else(|| "classic".to_string());
if route.to_ascii_lowercase().contains("dutch")
|| route.to_ascii_lowercase().contains("uniswapx")
{
if is_order_route(&route) {
return Err(Error::UnsupportedUniswapRoute { route });
}

Ok(QuoteResponse {
amount_out,
minimum_amount_out: first_string(
&value,
minimum_amount_out: first_string_or_path(
&quote,
&["amountOutMinimum", "minimumAmountOut", "minAmountOut"],
&[&["output", "minAmount"]],
),
quote: value,
quote,
quote_id,
route,
valid_for_seconds: 180,
Expand Down Expand Up @@ -140,8 +164,13 @@ pub fn approval_spender(data: &str) -> Option<String> {
Some(format!("0x{}", &data[8 + 24..8 + 64]))
}

fn validate_optional_field(value: &Value, keys: &[&str], expected: &str) -> Result<()> {
let Some(actual) = first_string(value, keys) else {
fn validate_optional_field(
value: &Value,
keys: &[&str],
paths: &[&[&str]],
expected: &str,
) -> Result<()> {
let Some(actual) = first_string_or_path(value, keys, paths) else {
return Ok(());
};
if !actual.eq_ignore_ascii_case(expected) {
Expand All @@ -153,6 +182,16 @@ fn validate_optional_field(value: &Value, keys: &[&str], expected: &str) -> Resu
Ok(())
}

fn slippage_tolerance(slippage_bps: u32) -> Value {
let value = f64::from(slippage_bps) / 100.0;
Value::Number(Number::from_f64(value).unwrap_or_else(|| Number::from(0)))
}

fn is_order_route(route: &str) -> bool {
let route = route.to_ascii_lowercase();
route.contains("dutch") || route.contains("uniswapx") || route == "priority"
}

fn parse_transaction(value: &Value) -> Option<UniswapTransaction> {
Some(UniswapTransaction {
data: first_string(value, &["data", "calldata", "input"])?,
Expand All @@ -172,3 +211,16 @@ fn first_string(value: &Value, keys: &[&str]) -> Option<String> {
})
})
}

fn first_string_or_path(value: &Value, keys: &[&str], paths: &[&[&str]]) -> Option<String> {
first_string(value, keys).or_else(|| paths.iter().find_map(|path| path_string(value, path)))
}

fn path_string(value: &Value, path: &[&str]) -> Option<String> {
let value = path.iter().try_fold(value, |value, key| value.get(key))?;
match value {
Value::String(value) => Some(value.clone()),
Value::Number(value) => Some(value.to_string()),
_ => None,
}
}
27 changes: 26 additions & 1 deletion beam-apps/apps/uniswap/src/host.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use crate::{Error, Result, selector};

const HOST_API_VERSION: u32 = 1;
const HOST_RESPONSE_CAPACITY: usize = 2 * 1024 * 1024;
const MAX_ERROR_BODY_CHARS: usize = 500;

#[derive(Clone, Debug, Eq, PartialEq)]
pub struct PlanContext {
Expand Down Expand Up @@ -38,6 +39,8 @@ pub struct HostMetadata {
pub app_version: String,
pub chain: String,
pub chain_id: u64,
#[serde(default)]
pub debug: bool,
pub host_api_version: u32,
pub manifest_sha256: String,
pub now: u64,
Expand Down Expand Up @@ -230,10 +233,18 @@ pub fn http_json(method: &str, url: &str, value: &Value) -> Result<Value> {
name: "content-type".to_string(),
value: "application/json".to_string(),
},
HttpHeader {
name: "accept".to_string(),
value: "application/json".to_string(),
},
HttpHeader {
name: "x-api-key".to_string(),
value: crate::public_api_key().to_string(),
},
HttpHeader {
name: "x-permit2-disabled".to_string(),
value: "true".to_string(),
},
],
body,
}))?;
Expand All @@ -243,15 +254,29 @@ pub fn http_json(method: &str, url: &str, value: &Value) -> Result<Value> {
}
})?;
if !(200..300).contains(&response.status) {
let detail = error_body(&response.body)
.map(|body| format!(": {body}"))
.unwrap_or_default();
return Err(Error::HostCallFailed {
message: format!("{} returned status {}", response.url, response.status),
message: format!(
"{} returned status {}{}",
response.url, response.status, detail
),
});
}
serde_json::from_slice(&response.body).map_err(|err| Error::InvalidHostResponse {
reason: err.to_string(),
})
}

fn error_body(body: &[u8]) -> Option<String> {
let body = core::str::from_utf8(body).ok()?.trim();
if body.is_empty() {
return None;
}
Some(body.chars().take(MAX_ERROR_BODY_CHARS).collect())
}

pub fn resolve_address(value: Option<&str>) -> Result<String> {
let response = host_call(HostRequest::ResolveAddress {
value: value.map(str::to_string),
Expand Down
Loading
Loading