Migrate BalancerV2Authorizer to alloy (cowprotocol#3789)

Author: xdecentralix

crates/contracts/build.rs

@@ -31,9 +31,8 @@ fn main() {
     // - https://doc.rust-lang.org/cargo/reference/build-scripts.html#cargorerun-if-changedpath
     println!("cargo:rerun-if-changed=build.rs");
 
-    generate_contract_with_config("BalancerV2Authorizer", |builder| {
-        builder.contract_mod_override("balancer_v2_authorizer")
-    });
+    // Balancer addresses can be obtained from:
+    // <https://github.com/balancer/balancer-subgraph-v2/blob/master/networks.yaml>
     generate_contract_with_config("BalancerV2Vault", |builder| {
         builder
             .contract_mod_override("balancer_v2_vault")

crates/contracts/src/alloy.rs

@@ -46,6 +46,7 @@ crate::bindings!(GnosisSafeCompatibilityFallbackHandler);
 crate::bindings!(GnosisSafeProxy);
 crate::bindings!(GnosisSafeProxyFactory);
 
+crate::bindings!(BalancerV2Authorizer);
 crate::bindings!(BalancerV2BasePool);
 crate::bindings!(BalancerV2BasePoolFactory);
 crate::bindings!(BalancerV2WeightedPool);

crates/contracts/src/lib.rs

@@ -49,7 +49,6 @@ macro_rules! include_contracts {
 }
 
 include_contracts! {
-    BalancerV2Authorizer;
     BalancerV2Vault;
     BalancerV3Vault;
     BalancerV3WeightedPool;

crates/contracts/src/vault.rs

@@ -2,8 +2,9 @@
 //! contract.
 
 use {
-    crate::{BalancerV2Authorizer, BalancerV2Vault},
-    ethcontract::{Bytes, H160, common::FunctionExt as _, errors::MethodError, web3::signing},
+    crate::{BalancerV2Vault, alloy::BalancerV2Authorizer},
+    alloy::primitives::Address,
+    ethcontract::{Bytes, H160, common::FunctionExt as _, web3::signing},
 };
 
 fn role_id(target: H160, function_name: &str) -> Bytes<[u8; 32]> {
@@ -23,19 +24,21 @@ fn role_id(target: H160, function_name: &str) -> Bytes<[u8; 32]> {
 }
 
 pub async fn grant_required_roles(
-    authorizer: &BalancerV2Authorizer,
+    authorizer: &BalancerV2Authorizer::Instance,
     vault: H160,
     vault_relayer: H160,
-) -> Result<(), MethodError> {
+) -> Result<(), alloy::contract::Error> {
     authorizer
-        .grant_roles(
+        .grantRoles(
             vec![
-                role_id(vault, "manageUserBalance"),
-                role_id(vault, "batchSwap"),
+                role_id(vault, "manageUserBalance").0.into(),
+                role_id(vault, "batchSwap").0.into(),
             ],
-            vault_relayer,
+            Address::from(vault_relayer.0),
         )
         .send()
+        .await?
+        .watch()
         .await?;
     Ok(())
 }

crates/driver/src/tests/setup/blockchain.rs

@@ -272,19 +272,19 @@ impl Blockchain {
         .unwrap();
 
         // Set up the settlement contract and related contracts.
-        let vault_authorizer = wait_for(
-            &web3,
-            contracts::BalancerV2Authorizer::builder(&web3, main_trader_account.address())
-                .from(main_trader_account.clone())
-                .deploy(),
+        let vault_authorizer = contracts::alloy::BalancerV2Authorizer::Instance::deploy_builder(
+            web3.alloy.clone(),
+            main_trader_account.address().into_alloy(),
         )
+        .from(main_trader_account.address().into_alloy())
+        .deploy()
         .await
         .unwrap();
         let vault = wait_for(
             &web3,
             contracts::BalancerV2Vault::builder(
                 &web3,
-                vault_authorizer.address(),
+                vault_authorizer.into_legacy(),
                 weth.address(),
                 0.into(),
                 0.into(),

crates/e2e/src/setup/deploy.rs

@@ -1,13 +1,13 @@
 use {
     crate::deploy,
     contracts::{
-        BalancerV2Authorizer,
         BalancerV2Vault,
         CowAmmLegacyHelper,
         GPv2AllowListAuthentication,
         GPv2Settlement,
         WETH9,
         alloy::{
+            BalancerV2Authorizer,
             CoWSwapEthFlow,
             FlashLoanRouter,
             HooksTrampoline,
@@ -18,7 +18,7 @@ use {
         },
     },
     ethcontract::{Address, H256, U256, errors::DeployError},
-    ethrpc::alloy::conversions::IntoAlloy,
+    ethrpc::alloy::conversions::{IntoAlloy, IntoLegacy},
     model::DomainSeparator,
     shared::ethrpc::Web3,
 };
@@ -135,11 +135,14 @@ impl Contracts {
 
         let weth = deploy!(web3, WETH9());
 
-        let balancer_authorizer = deploy!(web3, BalancerV2Authorizer(admin));
+        let balancer_authorizer =
+            BalancerV2Authorizer::Instance::deploy(web3.alloy.clone(), admin.into_alloy())
+                .await
+                .unwrap();
         let balancer_vault = deploy!(
             web3,
             BalancerV2Vault(
-                balancer_authorizer.address(),
+                balancer_authorizer.address().into_legacy(),
                 weth.address(),
                 U256::from(0),
                 U256::from(0),

crates/liquidity-driver/src/tests/setup/blockchain.rs

@@ -272,19 +272,19 @@ impl Blockchain {
         .unwrap();
 
         // Set up the settlement contract and related contracts.
-        let vault_authorizer = wait_for(
-            &web3,
-            contracts::BalancerV2Authorizer::builder(&web3, main_trader_account.address())
-                .from(main_trader_account.clone())
-                .deploy(),
+        let vault_authorizer = contracts::alloy::BalancerV2Authorizer::Instance::deploy_builder(
+            web3.alloy.clone(),
+            main_trader_account.address().into_alloy(),
         )
+        .from(main_trader_account.address().into_alloy())
+        .deploy()
         .await
         .unwrap();
         let vault = wait_for(
             &web3,
             contracts::BalancerV2Vault::builder(
                 &web3,
-                vault_authorizer.address(),
+                vault_authorizer.into_legacy(),
                 weth.address(),
                 0.into(),
                 0.into(),