Merge branch 'main' into jmgd/alloy/model_fee_trade

Author: jmg-duarte

Cargo.lock

@@ -3,8 +3,8 @@ resolver = "3"
 members = ["crates/*"]
 
 [workspace.dependencies]
-alloy = { version = "1.0.41", default-features = false }
-anyhow = "=1.0.76"
+alloy = { version = "1.1.0", default-features = false }
+anyhow = "1.0.100"
 async-trait = "0.1.80"
 axum = "0.6"
 bigdecimal = "0.3"

Cargo.toml

@@ -376,9 +376,8 @@ pub fn liquidity_interaction(
 }
 
 pub fn approve(allowance: &Allowance) -> eth::Interaction {
-    let mut amount = [0u8; 32];
     let selector = hex_literal::hex!("095ea7b3");
-    allowance.amount.to_big_endian(&mut amount);
+    let amount: [_; 32] = allowance.amount.to_be_bytes();
     eth::Interaction {
         target: allowance.token.0.into(),
         value: eth::U256::zero().into(),
@@ -520,7 +519,7 @@ mod test {
             token: eth::H160::from_slice(&hex!("C02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2")).into(),
             spender: eth::H160::from_slice(&hex!("000000000022D473030F116dDEE9F6B43aC78BA3"))
                 .into(),
-            amount: eth::U256::max_value(),
+            amount: alloy::primitives::U256::MAX,
         };
         let interaction = approve(&allowance);
         assert_eq!(

crates/driver/src/domain/competition/solution/encoding.rs

@@ -56,7 +56,7 @@ impl Interaction {
                     eth::Allowance {
                         token: interaction.input.token,
                         spender: address.into(),
-                        amount: eth::U256::max_value(),
+                        amount: alloy::primitives::U256::MAX,
                     }
                     .into(),
                 ]

crates/driver/src/domain/competition/solution/interaction.rs

@@ -16,7 +16,7 @@ use {
         },
     },
     chrono::Utc,
-    ethrpc::alloy::conversions::IntoLegacy,
+    ethrpc::alloy::conversions::{IntoAlloy, IntoLegacy},
     futures::future::try_join_all,
     itertools::Itertools,
     num::{BigRational, One},
@@ -426,15 +426,15 @@ impl Solution {
             let amount = normalized
                 .entry((allowance.0.token, allowance.0.spender))
                 .or_insert(eth::U256::zero());
-            *amount = amount.saturating_add(allowance.0.amount);
+            *amount = amount.saturating_add(allowance.0.amount.into_legacy());
         }
         normalized
             .into_iter()
             .map(|((token, spender), amount)| {
                 eth::Allowance {
                     token,
                     spender,
-                    amount,
+                    amount: amount.into_alloy(),
                 }
                 .into()
             })

crates/driver/src/domain/competition/solution/mod.rs

@@ -1,5 +1,6 @@
 use {
-    super::{Address, TokenAddress, U256},
+    super::{Address, TokenAddress},
+    alloy::primitives::U256,
     derive_more::{From, Into},
 };
 
@@ -47,15 +48,15 @@ impl Approval {
     /// [`U256::max_value`].
     pub fn max(self) -> Self {
         Self(Allowance {
-            amount: U256::max_value(),
+            amount: U256::MAX,
             ..self.0
         })
     }
 
     /// Revoke the approval, i.e. set the approved amount to [`U256::zero`].
     pub fn revoke(self) -> Self {
         Self(Allowance {
-            amount: U256::zero(),
+            amount: U256::ZERO,
             ..self.0
         })
     }

crates/driver/src/domain/eth/allowance.rs

@@ -46,7 +46,7 @@ impl Erc20 {
         Ok(eth::Allowance {
             token: self.token.address().into_legacy().into(),
             spender,
-            amount: amount.into_legacy(),
+            amount,
         }
         .into())
     }

crates/driver/src/infra/blockchain/token.rs

@@ -9,6 +9,7 @@ use {
         util::Bytes,
     },
     app_data::AppDataHash,
+    ethrpc::alloy::conversions::IntoAlloy,
     itertools::Itertools,
     model::{
         DomainSeparator,
@@ -147,7 +148,7 @@ impl Solutions {
                                                 eth::Allowance {
                                                     token: allowance.token.into(),
                                                     spender: allowance.spender.into(),
-                                                    amount: allowance.amount,
+                                                    amount: allowance.amount.into_alloy(),
                                                 }
                                                 .into()
                                             })

crates/driver/src/infra/solver/dto/solution.rs

@@ -12,7 +12,6 @@ async-trait = { workspace = true }
 clap = { workspace = true }
 contracts = { workspace = true }
 database = { workspace = true }
-ethcontract = { workspace = true }
 ethrpc = { workspace = true }
 futures = { workspace = true }
 gas-estimation = { workspace = true }

crates/refunder/Cargo.toml

@@ -4,9 +4,9 @@ pub mod submitter;
 
 use {
     crate::arguments::Arguments,
+    alloy::signers::local::PrivateKeySigner,
     clap::Parser,
     contracts::alloy::CoWSwapEthFlow,
-    ethcontract::PrivateKey,
     observe::metrics::LivenessChecking,
     refund_service::RefundService,
     shared::http_client::HttpClientFactory,
@@ -69,13 +69,10 @@ pub async fn run(args: arguments::Arguments) {
         .iter()
         .map(|contract| CoWSwapEthFlow::Instance::new(*contract, web3.alloy.clone()))
         .collect();
-    let refunder_pk = args
-        .refunder_pk
-        .parse::<PrivateKey>()
-        .expect("couldn't parse refunder private key");
     let refunder_account = Box::new(
-        alloy::signers::local::PrivateKeySigner::from_slice(&refunder_pk.secret_bytes())
-            .expect("invalid refunder private key bytes"),
+        args.refunder_pk
+            .parse::<PrivateKeySigner>()
+            .expect("couldn't parse refunder private key"),
     );
     let mut refunder = RefundService::new(
         pg_pool,