From 5bb379f4934172bb55d20c87829d6ea2ea9e981f Mon Sep 17 00:00:00 2001 From: sunce86 Date: Mon, 14 Oct 2024 17:15:08 +0200 Subject: [PATCH 1/2] Remove Liquidity order type --- src/api/routes/solve/dto/auction.rs | 1 - src/domain/order.rs | 42 ----------------------------- src/domain/solver/dex/mod.rs | 7 +++-- 3 files changed, 3 insertions(+), 47 deletions(-) diff --git a/src/api/routes/solve/dto/auction.rs b/src/api/routes/solve/dto/auction.rs index 0f97ee5..2f91cc8 100644 --- a/src/api/routes/solve/dto/auction.rs +++ b/src/api/routes/solve/dto/auction.rs @@ -56,7 +56,6 @@ pub fn to_domain(auction: &Auction) -> Result { class: match order.class { Class::Market => order::Class::Market, Class::Limit => order::Class::Limit, - Class::Liquidity => order::Class::Liquidity, }, partially_fillable: order.partially_fillable, }) diff --git a/src/domain/order.rs b/src/domain/order.rs index 67be11f..63984e7 100644 --- a/src/domain/order.rs +++ b/src/domain/order.rs @@ -63,48 +63,6 @@ pub enum Side { pub enum Class { Market, Limit, - Liquidity, -} - -/// A user order, guaranteed to not be a liquidity order. -/// -/// Note that the concept of a user order is important enough to merit its own -/// type. The reason for this is that these orders and liquidity orders differ -/// in fundamental ways and we do not want to confuse them and accidentally use -/// a liquidity order where it shouldn't be used. Some of the notable -/// differences between the order types are: -/// -/// - Liquidity orders can't be settled directly against on-chain liquidity. -/// They are meant to only be used in CoWs to facilitate the trading of other -/// non-liquidity orders. -/// - Liquidity orders do not provide any solver rewards. -/// -/// As their name suggests, they are meant as a mechanism for providing -/// liquidity on CoW Protocol to other non-liquidity orders: they provide a -/// mechanism for turning one token into another. In this regard, a liquidity -/// order is conceptually similar to `liquidity::Liquidity`. One notable -/// difference between the two is in how they are executed. General liquidity -/// requires tokens up-front in order to exchange them for something else. On -/// the other hand, liquidity orders are CoW Protocol orders, meaning that they -/// first provide the tokens being swapped to and only get paid at the end of -/// the settlement. -#[derive(Clone, Copy, Debug)] -pub struct UserOrder<'a>(&'a Order); - -impl<'a> UserOrder<'a> { - /// Wraps an order as a user order, returns `None` if the specified order is - /// not a user order. - pub fn new(order: &'a Order) -> Option { - match order.class { - Class::Market | Class::Limit => Some(Self(order)), - Class::Liquidity => None, - } - } - - /// Returns a reference to the underlying CoW Protocol order. - pub fn get(&self) -> &'a Order { - self.0 - } } /// An arbitrary ethereum interaction that is required for the settlement diff --git a/src/domain/solver/dex/mod.rs b/src/domain/solver/dex/mod.rs index d686ffe..5836b98 100644 --- a/src/domain/solver/dex/mod.rs +++ b/src/domain/solver/dex/mod.rs @@ -103,10 +103,10 @@ impl Dex { &'a self, auction: &'a auction::Auction, ) -> impl stream::Stream + 'a { - stream::iter(auction.orders.iter().filter_map(order::UserOrder::new)) + stream::iter(auction.orders.iter()) .enumerate() .map(|(i, order)| { - let span = tracing::info_span!("solve", order = %order.get().uid); + let span = tracing::info_span!("solve", order = %order.uid); self.solve_order(order, &auction.tokens, auction.gas_price) .map(move |solution| solution.map(|s| s.with_id(solution::Id(i as u64)))) .instrument(span) @@ -181,11 +181,10 @@ impl Dex { async fn solve_order( &self, - order: order::UserOrder<'_>, + order: &order::Order, tokens: &auction::Tokens, gas_price: auction::GasPrice, ) -> Option { - let order = order.get(); let dex_order = self.fills.dex_order(order, tokens)?; let swap = self.try_solve(order, &dex_order, tokens).await?; let sell = tokens.reference_price(&order.sell.token); From 9656b22479b46c2d5bc1a8874c289c9aae4cebf7 Mon Sep 17 00:00:00 2001 From: sunce86 Date: Wed, 16 Oct 2024 15:25:27 +0200 Subject: [PATCH 2/2] update dto version --- Cargo.lock | 78 +++++++++++++++++++++++++++++++++++++++++++----------- Cargo.toml | 2 +- 2 files changed, 64 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e10b878..1dec3b0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -142,8 +142,23 @@ version = "0.1.0" source = "git+https://github.com/cowprotocol/services.git?tag=v2.280.0#9619dd299c0105ca0a1206d8cac3bae3ed7bbf30" dependencies = [ "anyhow", - "app-data-hash", - "bytes-hex", + "app-data-hash 0.1.0 (git+https://github.com/cowprotocol/services.git?tag=v2.280.0)", + "bytes-hex 0.1.0 (git+https://github.com/cowprotocol/services.git?tag=v2.280.0)", + "hex", + "primitive-types", + "serde", + "serde_json", + "serde_with", +] + +[[package]] +name = "app-data" +version = "0.1.0" +source = "git+https://github.com/cowprotocol/services.git?tag=v2.280.1#1c8c14fef21bef8753080ba6a74585d50ddd05ab" +dependencies = [ + "anyhow", + "app-data-hash 0.1.0 (git+https://github.com/cowprotocol/services.git?tag=v2.280.1)", + "bytes-hex 0.1.0 (git+https://github.com/cowprotocol/services.git?tag=v2.280.1)", "hex", "primitive-types", "serde", @@ -160,6 +175,15 @@ dependencies = [ "tiny-keccak", ] +[[package]] +name = "app-data-hash" +version = "0.1.0" +source = "git+https://github.com/cowprotocol/services.git?tag=v2.280.1#1c8c14fef21bef8753080ba6a74585d50ddd05ab" +dependencies = [ + "hex-literal", + "tiny-keccak", +] + [[package]] name = "arrayvec" version = "0.7.4" @@ -791,6 +815,17 @@ dependencies = [ "serde_with", ] +[[package]] +name = "bytes-hex" +version = "0.1.0" +source = "git+https://github.com/cowprotocol/services.git?tag=v2.280.1#1c8c14fef21bef8753080ba6a74585d50ddd05ab" +dependencies = [ + "hex", + "serde", + "serde_json", + "serde_with", +] + [[package]] name = "bytes-utils" version = "0.1.4" @@ -2438,17 +2473,17 @@ version = "0.1.0" source = "git+https://github.com/cowprotocol/services.git?tag=v2.280.0#9619dd299c0105ca0a1206d8cac3bae3ed7bbf30" dependencies = [ "anyhow", - "app-data", - "app-data-hash", + "app-data 0.1.0 (git+https://github.com/cowprotocol/services.git?tag=v2.280.0)", + "app-data-hash 0.1.0 (git+https://github.com/cowprotocol/services.git?tag=v2.280.0)", "bigdecimal", - "bytes-hex", + "bytes-hex 0.1.0 (git+https://github.com/cowprotocol/services.git?tag=v2.280.0)", "chrono", "derivative", "hex", "hex-literal", "lazy_static", "num", - "number", + "number 0.1.0 (git+https://github.com/cowprotocol/services.git?tag=v2.280.0)", "primitive-types", "secp256k1", "serde", @@ -2614,6 +2649,19 @@ dependencies = [ "serde_with", ] +[[package]] +name = "number" +version = "0.1.0" +source = "git+https://github.com/cowprotocol/services.git?tag=v2.280.1#1c8c14fef21bef8753080ba6a74585d50ddd05ab" +dependencies = [ + "anyhow", + "bigdecimal", + "num", + "primitive-types", + "serde", + "serde_with", +] + [[package]] name = "object" version = "0.36.0" @@ -3651,11 +3699,11 @@ version = "0.1.0" source = "git+https://github.com/cowprotocol/services.git?tag=v2.280.0#9619dd299c0105ca0a1206d8cac3bae3ed7bbf30" dependencies = [ "anyhow", - "app-data", - "app-data-hash", + "app-data 0.1.0 (git+https://github.com/cowprotocol/services.git?tag=v2.280.0)", + "app-data-hash 0.1.0 (git+https://github.com/cowprotocol/services.git?tag=v2.280.0)", "async-trait", "bigdecimal", - "bytes-hex", + "bytes-hex 0.1.0 (git+https://github.com/cowprotocol/services.git?tag=v2.280.0)", "cached", "chrono", "clap", @@ -3678,7 +3726,7 @@ dependencies = [ "mockall", "model", "num", - "number", + "number 0.1.0 (git+https://github.com/cowprotocol/services.git?tag=v2.280.0)", "observe", "order-validation", "primitive-types", @@ -3792,7 +3840,7 @@ dependencies = [ "itertools 0.11.0", "maplit", "num", - "number", + "number 0.1.0 (git+https://github.com/cowprotocol/services.git?tag=v2.280.0)", "observe", "prometheus", "prometheus-metric-storage", @@ -3816,14 +3864,14 @@ dependencies = [ [[package]] name = "solvers-dto" version = "0.1.0" -source = "git+https://github.com/cowprotocol/services.git?tag=v2.280.0#9619dd299c0105ca0a1206d8cac3bae3ed7bbf30" +source = "git+https://github.com/cowprotocol/services.git?tag=v2.280.1#1c8c14fef21bef8753080ba6a74585d50ddd05ab" dependencies = [ - "app-data", + "app-data 0.1.0 (git+https://github.com/cowprotocol/services.git?tag=v2.280.1)", "bigdecimal", - "bytes-hex", + "bytes-hex 0.1.0 (git+https://github.com/cowprotocol/services.git?tag=v2.280.1)", "chrono", "hex", - "number", + "number 0.1.0 (git+https://github.com/cowprotocol/services.git?tag=v2.280.1)", "serde", "serde_with", "web3", diff --git a/Cargo.toml b/Cargo.toml index 038197e..ecad72c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,7 +46,7 @@ contracts = { git = "https://github.com/cowprotocol/services.git", tag = "v2.280 ethrpc = { git = "https://github.com/cowprotocol/services.git", tag = "v2.280.0", package = "ethrpc" } observe = { git = "https://github.com/cowprotocol/services.git", tag = "v2.280.0", package = "observe" } shared = { git = "https://github.com/cowprotocol/services.git", tag = "v2.280.0", package = "shared" } -dto = { git = "https://github.com/cowprotocol/services.git", tag = "v2.280.0", package = "solvers-dto" } +dto = { git = "https://github.com/cowprotocol/services.git", tag = "v2.280.1", package = "solvers-dto" } rate-limit = { git = "https://github.com/cowprotocol/services.git", tag = "v2.280.0", package = "rate-limit" } number = { git = "https://github.com/cowprotocol/services.git", tag = "v2.280.0", package = "number" }