Update CoW dependencies to v2.272.0 (#65)

Co-authored-by: Your Name <[email protected]> Co-authored-by: ilya <[email protected]>
gnosis · Aug 21, 2024 · 64efcaa · 64efcaa
1 parent 108e8cf
commit 64efcaa
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 35 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -42,13 +42,13 @@ tower-http = { version = "0.4", features = ["trace"] }
 tracing = "0.1"
 web3 = "0.19"
 
-contracts = { git = "https://github.com/cowprotocol/services.git", tag = "v2.271.0", package = "contracts" }
-ethrpc = { git = "https://github.com/cowprotocol/services.git", tag = "v2.271.0", package = "ethrpc" }
-observe = { git = "https://github.com/cowprotocol/services.git", tag = "v2.271.0", package = "observe" }
-shared = { git = "https://github.com/cowprotocol/services.git", tag = "v2.271.0", package = "shared" }
-dto =  { git = "https://github.com/cowprotocol/services.git", tag = "v2.271.0", package = "solvers-dto" }
-rate-limit =  { git = "https://github.com/cowprotocol/services.git", tag = "v2.271.0", package = "rate-limit" }
-number =  { git = "https://github.com/cowprotocol/services.git", tag = "v2.271.0", package = "number" }
+contracts = { git = "https://github.com/cowprotocol/services.git", tag = "v2.272.0", package = "contracts" }
+ethrpc = { git = "https://github.com/cowprotocol/services.git", tag = "v2.272.0", package = "ethrpc" }
+observe = { git = "https://github.com/cowprotocol/services.git", tag = "v2.272.0", package = "observe" }
+shared = { git = "https://github.com/cowprotocol/services.git", tag = "v2.272.0", package = "shared" }
+dto =  { git = "https://github.com/cowprotocol/services.git", tag = "v2.272.0", package = "solvers-dto" }
+rate-limit =  { git = "https://github.com/cowprotocol/services.git", tag = "v2.272.0", package = "rate-limit" }
+number =  { git = "https://github.com/cowprotocol/services.git", tag = "v2.272.0", package = "number" }
 
 [dev-dependencies]
 glob = "0.3"

diff --git a/src/infra/config/dex/file.rs b/src/infra/config/dex/file.rs
@@ -148,7 +148,7 @@ pub async fn load<T: DeserializeOwned>(path: &Path) -> (super::Config, T) {
 
     let block_stream = match config.current_block_poll_interval {
         Some(interval) => Some(
-            ethrpc::current_block::current_block_stream(config.node_url.clone(), interval)
+            ethrpc::block_stream::current_block_stream(config.node_url.clone(), interval)
                 .await
                 .unwrap(),
         ),

diff --git a/src/infra/config/dex/mod.rs b/src/infra/config/dex/mod.rs
@@ -6,7 +6,7 @@ pub mod zeroex;
 
 use {
     crate::domain::{dex::slippage, eth},
-    ethrpc::current_block::CurrentBlockStream,
+    ethrpc::block_stream::CurrentBlockWatcher,
     std::num::NonZeroUsize,
 };
 
@@ -25,6 +25,6 @@ pub struct Config {
     pub smallest_partial_fill: eth::Ether,
     pub rate_limiting_strategy: rate_limit::Strategy,
     pub gas_offset: eth::Gas,
-    pub block_stream: Option<CurrentBlockStream>,
+    pub block_stream: Option<CurrentBlockWatcher>,
     pub internalize_interactions: bool,
 }
diff --git a/src/infra/dex/balancer/mod.rs b/src/infra/dex/balancer/mod.rs
@@ -10,7 +10,7 @@ use {
     },
     contracts::ethcontract::I256,
     ethereum_types::U256,
-    ethrpc::current_block::CurrentBlockStream,
+    ethrpc::block_stream::CurrentBlockWatcher,
     num::ToPrimitive,
     std::{
         ops::Add,
@@ -35,7 +35,7 @@ pub struct Sor {
 
 pub struct Config {
     /// Stream that yields every new block.
-    pub block_stream: Option<CurrentBlockStream>,
+    pub block_stream: Option<CurrentBlockWatcher>,
 
     /// The URL for the Balancer SOR API.
     pub endpoint: reqwest::Url,

diff --git a/src/infra/dex/mod.rs b/src/infra/dex/mod.rs
@@ -1,6 +1,6 @@
 use {
     crate::domain::{auction, dex},
-    ethrpc::current_block::CurrentBlockStream,
+    ethrpc::block_stream::CurrentBlockWatcher,
     reqwest::RequestBuilder,
 };
 
@@ -64,11 +64,11 @@ struct Client {
     client: reqwest::Client,
 
     /// Block stream to read the current block.
-    block_stream: Option<CurrentBlockStream>,
+    block_stream: Option<CurrentBlockWatcher>,
 }
 
 impl Client {
-    pub fn new(client: reqwest::Client, block_stream: Option<CurrentBlockStream>) -> Self {
+    pub fn new(client: reqwest::Client, block_stream: Option<CurrentBlockWatcher>) -> Self {
         Self {
             client,
             block_stream,

diff --git a/src/infra/dex/oneinch/mod.rs b/src/infra/dex/oneinch/mod.rs
@@ -4,7 +4,7 @@ use {
         util,
     },
     ethereum_types::H160,
-    ethrpc::current_block::CurrentBlockStream,
+    ethrpc::block_stream::CurrentBlockWatcher,
     std::{
         sync::atomic::{self, AtomicU64},
         time::{Duration, Instant},
@@ -46,7 +46,7 @@ pub struct Config {
     pub complexity_level: Option<u32>,
 
     /// Stream that yields every new block.
-    pub block_stream: Option<CurrentBlockStream>,
+    pub block_stream: Option<CurrentBlockWatcher>,
 }
 
 #[derive(Debug, Clone)]

diff --git a/src/infra/dex/paraswap/mod.rs b/src/infra/dex/paraswap/mod.rs
@@ -4,7 +4,7 @@ use {
         util,
     },
     ethereum_types::Address,
-    ethrpc::current_block::CurrentBlockStream,
+    ethrpc::block_stream::CurrentBlockWatcher,
 };
 
 mod dto;
@@ -42,7 +42,7 @@ pub struct Config {
     pub chain_id: eth::ChainId,
 
     /// A stream that yields every new block.
-    pub block_stream: Option<CurrentBlockStream>,
+    pub block_stream: Option<CurrentBlockWatcher>,
 }
 
 impl ParaSwap {

diff --git a/src/infra/dex/zeroex/mod.rs b/src/infra/dex/zeroex/mod.rs
@@ -4,7 +4,7 @@ use {
         util,
     },
     ethereum_types::H160,
-    ethrpc::current_block::CurrentBlockStream,
+    ethrpc::block_stream::CurrentBlockWatcher,
     hyper::StatusCode,
     std::sync::atomic::{self, AtomicU64},
     tracing::Instrument,
@@ -46,7 +46,7 @@ pub struct Config {
     pub enable_slippage_protection: bool,
 
     /// The stream that yields every new block.
-    pub block_stream: Option<CurrentBlockStream>,
+    pub block_stream: Option<CurrentBlockWatcher>,
 }
 
 impl ZeroEx {