feat: remove manual parsing
This commit is contained in:
@@ -1,7 +1,9 @@
|
||||
use num_bigint::BigUint;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use tycho_core::{dto::ProtocolComponent, Bytes};
|
||||
|
||||
#[derive(Clone, Default, Debug)]
|
||||
#[derive(Clone, Default, Debug, Deserialize, Serialize)]
|
||||
#[serde(rename_all = "snake_case")]
|
||||
pub struct Solution {
|
||||
/// Address of the sender.
|
||||
pub sender: Bytes,
|
||||
@@ -10,18 +12,22 @@ pub struct Solution {
|
||||
/// The token being sold (exact in) or bought (exact out).
|
||||
pub given_token: Bytes,
|
||||
/// Amount of the given token.
|
||||
#[serde(with = "biguint_string")]
|
||||
pub given_amount: BigUint,
|
||||
/// The token being bought (exact in) or sold (exact out).
|
||||
pub checked_token: Bytes,
|
||||
/// False if the solution is an exact input solution. Currently only exact input solutions are
|
||||
/// supported.
|
||||
#[serde(default)]
|
||||
pub exact_out: bool,
|
||||
// If set, it will be applied to expected_amount
|
||||
pub slippage: Option<f64>,
|
||||
/// Expected amount of the bought token (exact in) or sold token (exact out).
|
||||
#[serde(with = "biguint_string_option")]
|
||||
pub expected_amount: Option<BigUint>,
|
||||
/// Minimum amount to be checked for the solution to be valid.
|
||||
/// If not set, the check will not be performed.
|
||||
#[serde(with = "biguint_string_option")]
|
||||
pub check_amount: Option<BigUint>,
|
||||
/// List of swaps to fulfill the solution.
|
||||
pub swaps: Vec<Swap>,
|
||||
@@ -32,16 +38,18 @@ pub struct Solution {
|
||||
/// If set to true, the solution will be encoded to be sent directly to the Executor and
|
||||
/// skip the router. The user is responsible for managing necessary approvals and token
|
||||
/// transfers.
|
||||
#[serde(default)]
|
||||
pub direct_execution: bool,
|
||||
}
|
||||
|
||||
#[derive(Clone, PartialEq, Debug)]
|
||||
#[derive(Clone, PartialEq, Debug, Deserialize, Serialize)]
|
||||
#[serde(rename_all = "snake_case")]
|
||||
pub enum NativeAction {
|
||||
Wrap,
|
||||
Unwrap,
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
#[derive(Clone, Debug, Deserialize, Serialize)]
|
||||
pub struct Swap {
|
||||
/// Protocol component from tycho indexer
|
||||
pub component: ProtocolComponent,
|
||||
@@ -50,6 +58,7 @@ pub struct Swap {
|
||||
/// Token being output from the pool.
|
||||
pub token_out: Bytes,
|
||||
/// Percentage of the amount to be swapped in this operation (for example, 0.5 means 50%)
|
||||
#[serde(default)]
|
||||
pub split: f64,
|
||||
}
|
||||
|
||||
@@ -68,3 +77,57 @@ pub struct EncodingContext {
|
||||
pub exact_out: bool,
|
||||
pub router_address: Bytes,
|
||||
}
|
||||
|
||||
// Custom serialization for BigUint as string
|
||||
mod biguint_string {
|
||||
use std::str::FromStr;
|
||||
|
||||
use num_bigint::BigUint;
|
||||
use serde::{self, Deserialize, Deserializer, Serializer};
|
||||
|
||||
pub fn serialize<S>(value: &BigUint, serializer: S) -> Result<S::Ok, S::Error>
|
||||
where
|
||||
S: Serializer,
|
||||
{
|
||||
serializer.serialize_str(&value.to_string())
|
||||
}
|
||||
|
||||
pub fn deserialize<'de, D>(deserializer: D) -> Result<BigUint, D::Error>
|
||||
where
|
||||
D: Deserializer<'de>,
|
||||
{
|
||||
let s = String::deserialize(deserializer)?;
|
||||
BigUint::from_str(&s).map_err(serde::de::Error::custom)
|
||||
}
|
||||
}
|
||||
|
||||
// Custom serialization for Option<BigUint> as string
|
||||
mod biguint_string_option {
|
||||
use std::str::FromStr;
|
||||
|
||||
use num_bigint::BigUint;
|
||||
use serde::{self, Deserialize, Deserializer, Serializer};
|
||||
|
||||
pub fn serialize<S>(value: &Option<BigUint>, serializer: S) -> Result<S::Ok, S::Error>
|
||||
where
|
||||
S: Serializer,
|
||||
{
|
||||
match value {
|
||||
Some(v) => serializer.serialize_str(&v.to_string()),
|
||||
None => serializer.serialize_none(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn deserialize<'de, D>(deserializer: D) -> Result<Option<BigUint>, D::Error>
|
||||
where
|
||||
D: Deserializer<'de>,
|
||||
{
|
||||
let opt = Option::<String>::deserialize(deserializer)?;
|
||||
match opt {
|
||||
Some(s) => BigUint::from_str(&s)
|
||||
.map(Some)
|
||||
.map_err(serde::de::Error::custom),
|
||||
None => Ok(None),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user