Remove user_fee (#9)

Related to cowprotocol/services#2586
gnosis · Apr 9, 2024 · b41c021 · b41c021
1 parent 57c8374
commit b41c021
Show file tree

Hide file tree

Showing 22 changed files with 7 additions and 56 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -44,7 +44,7 @@ contracts = { git = "https://github.com/cowprotocol/services.git", tag = "v2.237
 ethrpc = { git = "https://github.com/cowprotocol/services.git", tag = "v2.237.0", package = "ethrpc" }
 observe = { git = "https://github.com/cowprotocol/services.git", tag = "v2.237.0", package = "observe" }
 shared = { git = "https://github.com/cowprotocol/services.git", tag = "v2.237.0", package = "shared" }
-dto =  { git = "https://github.com/cowprotocol/services.git", tag = "v2.253.0", package = "solvers-dto" }
+dto =  { git = "https://github.com/cowprotocol/services.git", tag = "v2.253.1", package = "solvers-dto" }
 
 [dev-dependencies]
 glob = "0.3"

diff --git a/openapi.yml b/openapi.yml
@@ -196,7 +196,6 @@ components:
         - buyToken
         - sellAmount
         - buyAmount
-        - feeAmount
         - kind
         - partiallyFillable
         - class
@@ -211,8 +210,6 @@ components:
           $ref: "#/components/schemas/TokenAmount"
         buyAmount:
           $ref: "#/components/schemas/TokenAmount"
-        feeAmount:
-          $ref: "#/components/schemas/TokenAmount"
         kind:
           $ref: "#/components/schemas/OrderKind"
         partiallyFillable:
@@ -486,7 +483,6 @@ components:
         - buyAmount
         - validTo
         - appData
-        - feeAmount
         - kind
         - partiallyFillable
         - sellTokenBalance
@@ -508,8 +504,6 @@ components:
           type: integer
         appData:
           $ref: "#/components/schemas/AppData"
-        feeAmount:
-          $ref: "#/components/schemas/TokenAmount"
         kind:
           $ref: "#/components/schemas/OrderKind"
         partiallyFillable:

diff --git a/src/api/routes/solve/dto/auction.rs b/src/api/routes/solve/dto/auction.rs
@@ -58,7 +58,6 @@ pub fn to_domain(auction: &Auction) -> Result<auction::Auction, Error> {
                     Class::Limit => order::Class::Limit,
                     Class::Liquidity => order::Class::Liquidity,
                 },
-                fee: order::Fee(order.fee_amount),
                 partially_fillable: order.partially_fillable,
             })
             .collect(),

diff --git a/src/api/routes/solve/dto/solution.rs b/src/api/routes/solve/dto/solution.rs
@@ -48,7 +48,7 @@ pub fn from_domain(solutions: &[solution::Solution]) -> super::Solutions {
                                     receiver: trade.order.receiver,
                                     valid_to: trade.order.valid_to,
                                     app_data: trade.order.app_data.0,
-                                    fee_amount: trade.order.fee.0,
+                                    fee_amount: 0.into(),
                                     kind: match trade.order.side {
                                         crate::domain::order::Side::Buy => Kind::Buy,
                                         crate::domain::order::Side::Sell => Kind::Sell,

diff --git a/src/domain/dex/mod.rs b/src/domain/dex/mod.rs
@@ -145,8 +145,7 @@ impl Swap {
     }
 
     pub fn satisfies(&self, order: &domain::order::Order) -> bool {
-        self.output.amount * (order.sell.amount + order.fee.0)
-            >= self.input.amount * order.buy.amount
+        self.output.amount * order.sell.amount >= self.input.amount * order.buy.amount
     }
 }
 

diff --git a/src/domain/order.rs b/src/domain/order.rs
@@ -2,7 +2,7 @@
 
 use {
     crate::{domain::eth, util},
-    ethereum_types::{Address, H256, U256},
+    ethereum_types::{Address, H256},
     std::fmt::{self, Debug, Display, Formatter},
 };
 
@@ -12,7 +12,6 @@ pub struct Order {
     pub uid: Uid,
     pub sell: eth::Asset,
     pub buy: eth::Asset,
-    pub fee: Fee,
     pub side: Side,
     pub class: Class,
     pub partially_fillable: bool,
@@ -26,14 +25,6 @@ impl Order {
         bytes.into()
     }
 
-    /// Returns the order's fee amount as an asset.
-    pub fn fee(&self) -> eth::Asset {
-        eth::Asset {
-            token: self.sell.token,
-            amount: self.fee.0,
-        }
-    }
-
     /// Returns `true` if the order expects a solver-computed fee.
     pub fn solver_determines_fee(&self) -> bool {
         self.class == Class::Limit
@@ -58,10 +49,6 @@ impl Display for Uid {
     }
 }
 
-/// An order fee amount, denominated in its sell token.
-#[derive(Clone, Copy, Debug)]
-pub struct Fee(pub U256);
-
 /// The trading side of an order.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum Side {
@@ -138,7 +125,6 @@ pub struct JitOrder {
     pub signature: Signature,
     pub sell: eth::Asset,
     pub buy: eth::Asset,
-    pub fee: Fee,
     pub side: Side,
     pub class: Class,
     pub partially_fillable: bool,

diff --git a/src/tests/balancer/market_order.rs b/src/tests/balancer/market_order.rs
@@ -74,7 +74,6 @@ async fn sell() {
                     "buyToken": "0xba100000625a3754423978a60c9317c58a424e3D",
                     "sellAmount": "1000000000000000000",
                     "buyAmount": "200000000000000000000",
-                    "feeAmount": "1000000000000000",
                     "kind": "sell",
                     "partiallyFillable": false,
                     "class": "market",
@@ -229,7 +228,6 @@ async fn buy() {
                     "buyToken": "0xba100000625a3754423978a60c9317c58a424e3D",
                     "sellAmount": "1000000000000000000",
                     "buyAmount": "100000000000000000000",
-                    "feeAmount": "1000000000000000",
                     "kind": "buy",
                     "partiallyFillable": false,
                     "class": "market",

diff --git a/src/tests/balancer/not_found.rs b/src/tests/balancer/not_found.rs
@@ -48,7 +48,6 @@ async fn test() {
                     "buyToken": "0x2222222222222222222222222222222222222222",
                     "sellAmount": "1000000000000000000",
                     "buyAmount": "1000000000000000000",
-                    "feeAmount": "1000000000000000",
                     "kind": "sell",
                     "partiallyFillable": false,
                     "class": "market",

diff --git a/src/tests/balancer/out_of_price.rs b/src/tests/balancer/out_of_price.rs
@@ -78,7 +78,6 @@ async fn sell() {
                     "sellAmount": "1000000000000000000",
                     // Way too much...
                     "buyAmount": "1000000000000000000000000000000000000",
-                    "feeAmount": "1000000000000000",
                     "kind": "sell",
                     "partiallyFillable": false,
                     "class": "market",
@@ -167,7 +166,6 @@ async fn buy() {
                     // Way too little...
                     "sellAmount": "1",
                     "buyAmount": "100000000000000000000",
-                    "feeAmount": "1000000000000000",
                     "kind": "buy",
                     "partiallyFillable": false,
                     "class": "market",

diff --git a/src/tests/dex/partial_fill.rs b/src/tests/dex/partial_fill.rs
@@ -180,7 +180,6 @@ endpoint = 'http://{}/sor'
                 "buyToken": "0xba100000625a3754423978a60c9317c58a424e3D",
                 "sellAmount": "16000000000000000000",
                 "buyAmount": "3630944624685908136768",
-                "feeAmount": "0",
                 "kind": "sell",
                 "partiallyFillable": true,
                 "class": "limit",
@@ -373,8 +372,6 @@ async fn tested_amounts_wrap_around() {
                 "buyToken": "0xba100000625a3754423978a60c9317c58a424e3D",
                 "sellAmount": "60000000000000000",
                 "buyAmount": "16000000000000000000",
-                // Let's just assume 0 fee to not further complicate the math.
-                "feeAmount": "0",
                 "kind": "buy",
                 "partiallyFillable": true,
                 "class": "limit",
@@ -527,7 +524,6 @@ endpoint = 'http://{}/sor'
                 "buyToken": "0xba100000625a3754423978a60c9317c58a424e3D",
                 "sellAmount": "2000000000000000000",
                 "buyAmount": "1",
-                "feeAmount": "0",
                 "kind": "sell",
                 "partiallyFillable": true,
                 "class": "limit",
@@ -701,7 +697,6 @@ async fn insufficient_room_for_surplus_fee() {
                     "buyToken": "0xba100000625a3754423978a60c9317c58a424e3D",
                     "sellAmount": "1000000000000000000",
                     "buyAmount": "227598784442065388110",
-                    "feeAmount": "10000000000000000",
                     "kind": "sell",
                     "partiallyFillable": true,
                     "class": "limit",
@@ -802,7 +797,6 @@ async fn market() {
                     "buyToken": "0xba100000625a3754423978a60c9317c58a424e3D",
                     "sellAmount": "1000000000000000000",
                     "buyAmount": "227598784442065388110",
-                    "feeAmount": "10000000000000000",
                     "kind": "sell",
                     "partiallyFillable": true,
                     "class": "market",

diff --git a/src/tests/dex/wrong_execution.rs b/src/tests/dex/wrong_execution.rs
@@ -118,7 +118,6 @@ async fn test() {
                         "buyToken": "0xba100000625a3754423978a60c9317c58a424e3D",
                         "sellAmount": "1000000000000000000",
                         "buyAmount": "227598784442065388110",
-                        "feeAmount": "10000000000000000",
                         "kind": side,
                         "partiallyFillable": false,
                         "class": "market",

diff --git a/src/tests/oneinch/market_order.rs b/src/tests/oneinch/market_order.rs
@@ -149,7 +149,6 @@ async fn sell() {
                     "buyToken": "0xe41d2489571d322189246dafa5ebde1f4699f498",
                     "sellAmount": "1000000000000000000",
                     "buyAmount": "200000000000000000000",
-                    "feeAmount": "1000000000000000",
                     "kind": "sell",
                     "partiallyFillable": false,
                     "class": "market",
@@ -287,7 +286,6 @@ async fn buy_not_supported() {
                     "buyToken": "0xe41d2489571d322189246dafa5ebde1f4699f498",
                     "sellAmount": "1000000000000000000",
                     "buyAmount": "200000000000000000000",
-                    "feeAmount": "1000000000000000",
                     "kind": "buy",
                     "partiallyFillable": false,
                     "class": "market",

diff --git a/src/tests/oneinch/not_found.rs b/src/tests/oneinch/not_found.rs
@@ -74,7 +74,6 @@ async fn test() {
                     "buyToken": "0x2222222222222222222222222222222222222222",
                     "sellAmount": "1000000000000000000",
                     "buyAmount": "1000000000000000000",
-                    "feeAmount": "1000000000000000",
                     "kind": "sell",
                     "partiallyFillable": false,
                     "class": "market",

diff --git a/src/tests/oneinch/out_of_price.rs b/src/tests/oneinch/out_of_price.rs
@@ -153,7 +153,6 @@ async fn sell() {
                     "sellAmount": "1000000000000000000",
                     // Way too much...
                     "buyAmount": "1000000000000000000000000000000000000",
-                    "feeAmount": "1000000000000000",
                     "kind": "sell",
                     "partiallyFillable": false,
                     "class": "market",

diff --git a/src/tests/paraswap/market_order.rs b/src/tests/paraswap/market_order.rs
@@ -178,7 +178,6 @@ async fn sell() {
                     "buyToken": "0xe41d2489571d322189246dafa5ebde1f4699f498",
                     "sellAmount": "1000000000000000000",
                     "buyAmount": "200000000000000000000",
-                    "feeAmount": "1000000000000000",
                     "kind": "sell",
                     "partiallyFillable": false,
                     "class": "market",
@@ -430,7 +429,6 @@ async fn buy() {
                     "buyToken": "0xe41d2489571d322189246dafa5ebde1f4699f498",
                     "sellAmount": "200000000000000000",
                     "buyAmount": "1000000000000000000000",
-                    "feeAmount": "1000000000000000",
                     "kind": "buy",
                     "partiallyFillable": false,
                     "class": "market",

diff --git a/src/tests/paraswap/not_found.rs b/src/tests/paraswap/not_found.rs
@@ -46,7 +46,6 @@ async fn test() {
                     "buyToken": "0xe41d2489571d322189246dafa5ebde1f4699f498",
                     "sellAmount": "1000000000000000000",
                     "buyAmount": "200000000000000000000",
-                    "feeAmount": "1000000000000000",
                     "kind": "sell",
                     "partiallyFillable": false,
                     "class": "market",

diff --git a/src/tests/paraswap/out_of_price.rs b/src/tests/paraswap/out_of_price.rs
@@ -182,7 +182,6 @@ async fn sell() {
                     "sellAmount": "1000000000000000000",
                     // Way too much...
                     "buyAmount": "1000000000000000000000000000000000000",
-                    "feeAmount": "1000000000000000",
                     "kind": "sell",
                     "partiallyFillable": false,
                     "class": "market",
@@ -391,7 +390,6 @@ async fn buy() {
                     // Way too little...
                     "sellAmount": "1",
                     "buyAmount": "1000000000000000000000",
-                    "feeAmount": "1000000000000000",
                     "kind": "buy",
                     "partiallyFillable": false,
                     "class": "market",

diff --git a/src/tests/zeroex/market_order.rs b/src/tests/zeroex/market_order.rs
@@ -118,7 +118,6 @@ async fn sell() {
                     "buyToken": "0xe41d2489571d322189246dafa5ebde1f4699f498",
                     "sellAmount": "1000000000000000000",
                     "buyAmount": "200000000000000000000",
-                    "feeAmount": "1000000000000000",
                     "kind": "sell",
                     "partiallyFillable": false,
                     "class": "market",
@@ -297,7 +296,6 @@ async fn buy() {
                     "buyToken": "0xe41d2489571d322189246dafa5ebde1f4699f498",
                     "sellAmount": "200000000000000000",
                     "buyAmount": "1000000000000000000000",
-                    "feeAmount": "1000000000000000",
                     "kind": "buy",
                     "partiallyFillable": false,
                     "class": "market",

diff --git a/src/tests/zeroex/not_found.rs b/src/tests/zeroex/not_found.rs
@@ -41,7 +41,6 @@ async fn test() {
                     "buyToken": "0x2222222222222222222222222222222222222222",
                     "sellAmount": "1000000000000000000",
                     "buyAmount": "1000000000000000000",
-                    "feeAmount": "1000000000000000",
                     "kind": "sell",
                     "partiallyFillable": false,
                     "class": "market",

diff --git a/src/tests/zeroex/options.rs b/src/tests/zeroex/options.rs
@@ -224,7 +224,6 @@ enable-slippage-protection = true
                     "buyToken": "0xe41d2489571d322189246dafa5ebde1f4699f498",
                     "sellAmount": "1000000000000000000",
                     "buyAmount": "5000000000000000000000",
-                    "feeAmount": "1000000000000000",
                     "kind": "sell",
                     "partiallyFillable": false,
                     "class": "market",

diff --git a/src/tests/zeroex/out_of_price.rs b/src/tests/zeroex/out_of_price.rs
@@ -110,7 +110,6 @@ async fn sell() {
                     "sellAmount": "1000000000000000000",
                     // Way too much...
                     "buyAmount": "1000000000000000000000000000000000000",
-                    "feeAmount": "1000000000000000",
                     "kind": "sell",
                     "partiallyFillable": false,
                     "class": "market",
@@ -229,7 +228,6 @@ async fn buy() {
                     // Way too little...
                     "sellAmount": "1",
                     "buyAmount": "1000000000000000000000",
-                    "feeAmount": "1000000000000000",
                     "kind": "buy",
                     "partiallyFillable": false,
                     "class": "market",