Merge branch 'cowprotocol:main' into main

Author: xdecentralix

Cargo.lock

@@ -3,7 +3,7 @@ resolver = "3"
 members = ["crates/*"]
 
 [workspace.dependencies]
-alloy = { git = "https://github.com/alloy-rs/alloy", rev = "c15a4a3c04ce15bfa3796cc449f8407200b7599f", default-features = false }
+alloy = { version = "1.0.27", default-features = false }
 anyhow = "=1.0.76"
 async-trait = "0.1.80"
 axum = "0.6"
@@ -81,6 +81,7 @@ opentelemetry = { version = "0.30", features = ["tracing"] }
 opentelemetry-otlp = "0.30"
 opentelemetry_sdk = "0.30"
 orderbook = { path = "crates/orderbook" }
+paste = "1.0"
 pin-project-lite = "0.2.14"
 rate-limit = { path = "crates/rate-limit" }
 refunder = { path = "crates/refunder" }

Cargo.toml

@@ -15,6 +15,7 @@ name = "autopilot"
 path = "src/main.rs"
 
 [dependencies]
+alloy = { workspace = true }
 app-data = { workspace = true }
 bytes-hex = { workspace = true }
 anyhow = { workspace = true }

crates/autopilot/Cargo.toml

@@ -30,7 +30,7 @@ impl EventRetrieving for EthFlowRefundRetriever {
     type Event = contracts::cowswap_eth_flow::Event;
 
     fn get_events(&self) -> AllEventsBuilder<DynTransport, Self::Event> {
-        let mut events = AllEventsBuilder::new(self.web3.clone(), H160::default(), None);
+        let mut events = AllEventsBuilder::new(self.web3.legacy.clone(), H160::default(), None);
         // We want to observe multiple addresses for events.
         events.filter = events.filter.address(self.addresses.clone());
         // Filter out events that we don't want to listen for in the contract. `Self` is

crates/autopilot/src/database/ethflow_events/event_retriever.rs

@@ -40,7 +40,7 @@ impl EventRetrieving for CoWSwapOnchainOrdersContract {
     type Event = cowswap_onchain_orders::Event;
 
     fn get_events(&self) -> AllEventsBuilder<DynTransport, Self::Event> {
-        let mut events = AllEventsBuilder::new(self.web3.clone(), H160::default(), None);
+        let mut events = AllEventsBuilder::new(self.web3.legacy.clone(), H160::default(), None);
         // We want to observe multiple addresses for events.
         events.filter = events.filter.address(self.addresses.clone());
         // Filter out events that don't belong to the ABI of `OnchainOrdersContract`.

crates/autopilot/src/database/onchain_order_events/event_retriever.rs

@@ -793,6 +793,7 @@ mod test {
         contracts::cowswap_onchain_orders::event_data::OrderPlacement as ContractOrderPlacement,
         database::{byte_array::ByteArray, onchain_broadcasted_orders::OnchainOrderPlacement},
         ethcontract::{Bytes, EventMetadata, H160, U256},
+        ethrpc::Web3,
         model::{
             DomainSeparator,
             order::{BuyTokenDestination, OrderData, OrderKind, SellTokenSource},
@@ -806,7 +807,6 @@ mod test {
                 sell_token_source_into,
                 signing_scheme_into,
             },
-            ethrpc::create_env_test_transport,
             fee::FeeParameters,
             order_quoting::{MockOrderQuoting, Quote, QuoteData},
         },
@@ -1234,7 +1234,7 @@ mod test {
         custom_onchain_order_parser
             .expect_customized_event_data_for_event_index()
             .returning(|_, _, _, _| 1u8);
-        let web3 = Web3::new(create_env_test_transport());
+        let web3 = Web3::new_from_env();
         let onchain_order_parser = OnchainOrderParser {
             db: Postgres {
                 pool: PgPool::connect_lazy("postgresql://").unwrap(),

crates/autopilot/src/database/onchain_order_events/mod.rs

@@ -1,12 +1,18 @@
-use {crate::domain, chain::Chain, ethcontract::dyns::DynWeb3, primitive_types::H160};
+use {
+    crate::domain,
+    chain::Chain,
+    contracts::alloy::{ChainalysisOracle, InstanceExt},
+    ethrpc::Web3,
+    primitive_types::H160,
+};
 
 #[derive(Debug, Clone)]
 pub struct Contracts {
     settlement: contracts::GPv2Settlement,
     signatures: contracts::support::Signatures,
     weth: contracts::WETH9,
     balances: contracts::support::Balances,
-    chainalysis_oracle: Option<contracts::ChainalysisOracle>,
+    chainalysis_oracle: Option<ChainalysisOracle::Instance>,
     trampoline: contracts::HooksTrampoline,
 
     /// The authenticator contract that decides which solver is allowed to
@@ -26,7 +32,7 @@ pub struct Addresses {
 }
 
 impl Contracts {
-    pub async fn new(web3: &DynWeb3, chain: &Chain, addresses: Addresses) -> Self {
+    pub async fn new(web3: &Web3, chain: &Chain, addresses: Addresses) -> Self {
         let address_for = |contract: &ethcontract::Contract, address: Option<H160>| {
             address
                 .or_else(|| deployment_address(contract, chain))
@@ -70,7 +76,9 @@ impl Contracts {
             ),
         );
 
-        let chainalysis_oracle = contracts::ChainalysisOracle::deployed(web3).await.ok();
+        let chainalysis_oracle = ChainalysisOracle::Instance::deployed(&web3.alloy)
+            .await
+            .ok();
 
         let settlement_domain_separator = domain::eth::DomainSeparator(
             settlement
@@ -122,7 +130,7 @@ impl Contracts {
         &self.settlement_domain_separator
     }
 
-    pub fn chainalysis_oracle(&self) -> &Option<contracts::ChainalysisOracle> {
+    pub fn chainalysis_oracle(&self) -> &Option<ChainalysisOracle::Instance> {
         &self.chainalysis_oracle
     }
 

crates/autopilot/src/infra/blockchain/contracts.rs

@@ -2,8 +2,7 @@ use {
     self::contracts::Contracts,
     crate::{boundary, domain::eth},
     chain::Chain,
-    ethcontract::dyns::DynWeb3,
-    ethrpc::{block_stream::CurrentBlockWatcher, extensions::DebugNamespace},
+    ethrpc::{Web3, block_stream::CurrentBlockWatcher, extensions::DebugNamespace},
     primitive_types::U256,
     std::time::Duration,
     thiserror::Error,
@@ -14,7 +13,7 @@ pub mod contracts;
 
 /// An Ethereum RPC connection.
 pub struct Rpc {
-    web3: DynWeb3,
+    web3: Web3,
     chain: Chain,
     url: Url,
 }
@@ -43,7 +42,7 @@ impl Rpc {
     }
 
     /// Returns a reference to the underlying web3 client.
-    pub fn web3(&self) -> &DynWeb3 {
+    pub fn web3(&self) -> &Web3 {
         &self.web3
     }
 
@@ -56,8 +55,8 @@ impl Rpc {
 /// The Ethereum blockchain.
 #[derive(Clone)]
 pub struct Ethereum {
-    web3: DynWeb3,
-    unbuffered_web3: DynWeb3,
+    web3: Web3,
+    unbuffered_web3: Web3,
     chain: Chain,
     current_block: CurrentBlockWatcher,
     contracts: Contracts,
@@ -71,8 +70,8 @@ impl Ethereum {
     /// Since this type is essential for the program this method will panic on
     /// any initialization error.
     pub async fn new(
-        web3: DynWeb3,
-        unbuffered_web3: DynWeb3,
+        web3: Web3,
+        unbuffered_web3: Web3,
         chain: &Chain,
         url: Url,
         addresses: contracts::Addresses,

crates/autopilot/src/infra/blockchain/mod.rs

@@ -18,7 +18,6 @@ use {
             SellTokenSource as DbSellTokenSource,
             SigningScheme as DbSigningScheme,
         },
-        settlement_observations::Observation,
         solver_competition_v2::{Order, Solution},
     },
     domain::auction::order::{
@@ -690,19 +689,6 @@ impl Persistence {
             )
             .await?;
 
-            database::settlement_observations::upsert(
-                &mut ex,
-                Observation {
-                    block_number,
-                    log_index,
-                    gas_used: u256_to_big_decimal(&gas.0),
-                    effective_gas_price: u256_to_big_decimal(&gas_price.0.0),
-                    surplus: u256_to_big_decimal(&surplus.0),
-                    fee: u256_to_big_decimal(&fee.0),
-                },
-            )
-            .await?;
-
             store_order_events(
                 &mut ex,
                 fee_breakdown.keys().cloned().collect(),

crates/autopilot/src/infra/persistence/mod.rs

@@ -26,15 +26,9 @@ use {
     chain::Chain,
     clap::Parser,
     contracts::{BalancerV2Vault, IUniswapV3Factory},
-    ethcontract::{
-        BlockNumber,
-        H160,
-        common::DeploymentInformation,
-        dyns::DynWeb3,
-        errors::DeployError,
-    },
-    ethrpc::block_stream::block_number_to_block_number_hash,
-    futures::stream::StreamExt,
+    ethcontract::{BlockNumber, H160, common::DeploymentInformation, errors::DeployError},
+    ethrpc::{Web3, block_stream::block_number_to_block_number_hash},
+    futures::StreamExt,
     model::DomainSeparator,
     observe::metrics::LivenessChecking,
     shared::{
@@ -116,8 +110,8 @@ async fn unbuffered_ethrpc(url: &Url) -> infra::blockchain::Rpc {
 
 #[instrument(skip_all)]
 async fn ethereum(
-    web3: DynWeb3,
-    unbuffered_web3: DynWeb3,
+    web3: Web3,
+    unbuffered_web3: Web3,
     chain: &Chain,
     url: Url,
     contracts: infra::blockchain::contracts::Addresses,