Create a wrap for eth::U256 in order to ensure correct serde

cowprotocol · Feb 26, 2024 · c2f4b0e · c2f4b0e
1 parent 60b7210
commit c2f4b0e
Show file tree

Hide file tree

Showing 97 changed files with 1,203 additions and 1,229 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/alerter/src/lib.rs b/crates/alerter/src/lib.rs
@@ -7,29 +7,24 @@ use {
     anyhow::{Context, Result},
     clap::Parser,
     model::order::{OrderClass, OrderKind, OrderStatus, OrderUid, BUY_ETH_ADDRESS},
-    number::serialization::HexOrDecimalU256,
-    primitive_types::{H160, U256},
+    primitive_types::H160,
     prometheus::IntGauge,
     reqwest::Client,
-    serde_with::serde_as,
     std::{
         collections::HashMap,
         time::{Duration, Instant},
     },
     url::Url,
 };
 
-#[serde_as]
 #[derive(Debug, serde::Deserialize, Eq, PartialEq)]
 #[serde(rename_all = "camelCase")]
 struct Order {
     kind: OrderKind,
     buy_token: H160,
-    #[serde_as(as = "HexOrDecimalU256")]
-    buy_amount: U256,
+    buy_amount: number::U256,
     sell_token: H160,
-    #[serde_as(as = "HexOrDecimalU256")]
-    sell_amount: U256,
+    sell_amount: number::U256,
     uid: OrderUid,
     partially_fillable: bool,
     #[serde(flatten)]
@@ -130,14 +125,11 @@ impl ZeroExApi {
             .append_pair("buyToken", &format!("{buy_token:#x}"))
             .append_pair(amount_name, &amount.to_string());
 
-        #[serde_as]
         #[derive(Debug, serde::Deserialize)]
         #[serde(rename_all = "camelCase")]
         pub struct Response {
-            #[serde_as(as = "HexOrDecimalU256")]
-            pub sell_amount: U256,
-            #[serde_as(as = "HexOrDecimalU256")]
-            pub buy_amount: U256,
+            pub sell_amount: number::U256,
+            pub buy_amount: number::U256,
         }
 
         let response: Response = self

diff --git a/crates/autopilot/src/boundary/order.rs b/crates/autopilot/src/boundary/order.rs
@@ -11,9 +11,9 @@ pub fn to_domain(
         uid: order.metadata.uid.into(),
         sell_token: order.data.sell_token,
         buy_token: order.data.buy_token,
-        sell_amount: order.data.sell_amount,
-        buy_amount: order.data.buy_amount,
-        user_fee: order.data.fee_amount,
+        sell_amount: *order.data.sell_amount,
+        buy_amount: *order.data.buy_amount,
+        user_fee: *order.data.fee_amount,
         protocol_fees,
         valid_to: order.data.valid_to,
         kind: order.data.kind.into(),