feat: integrate batcher with payment system (#519)

Co-authored-by: Santos Rosati <rosatisantos@gmail.com>
Co-authored-by: Urix <43704209+uri-99@users.noreply.github.com>
Co-authored-by: JuArce <52429267+JuArce@users.noreply.github.com>
Co-authored-by: MauroFab <maurotoscano2@gmail.com>
Co-authored-by: Mauro Toscano <12560266+MauroToscano@users.noreply.github.com>
Co-authored-by: Tatu <65305492+srosati@users.noreply.github.com>

Author: 5 people

Makefile

@@ -175,13 +175,13 @@ __BATCHER__:
 
 BURST_SIZE=5
 
-batcher_fund_service_manager_balance:
-	@. ./scripts/fund_batcher_balance_in_aligned_devnet.sh
+user_fund_payment_service:
+	@. ./scripts/user_fund_payment_service_devnet.sh
 
 ./batcher/aligned-batcher/.env:
 	@echo "To start the Batcher ./batcher/aligned-batcher/.env needs to be manually set"; false;
 
-batcher_start: ./batcher/aligned-batcher/.env batcher_fund_service_manager_balance
+batcher_start: ./batcher/aligned-batcher/.env user_fund_payment_service 
 	@echo "Starting Batcher..."
 	@cargo +nightly-2024-04-17 run --manifest-path ./batcher/aligned-batcher/Cargo.toml --release -- --config ./config-files/config-batcher.yaml --env-file ./batcher/aligned-batcher/.env
 

batcher/Cargo.lock

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-ethers = { version = "2.0", features = ["ws", "rustls"] }
+ethers = { tag = "v2.0.15-fix-reconnections", features = ["ws", "rustls"], git = "https://github.com/yetanotherco/ethers-rs.git" }
 anyhow = "1.0.83"
 log = { version = "0.4.21"}
 serde = { version = "1.0.201", features = ["derive"] }

batcher/aligned-batcher-lib/Cargo.toml

@@ -158,8 +158,12 @@ impl ClientMessage {
     pub fn verify_signature(&self) -> Result<Address, SignatureError> {
         let hashed_leaf =
             VerificationCommitmentBatch::hash_data(&self.verification_data.clone().into());
-        let recovered = self.signature.recover(hashed_leaf)?;
-        self.signature.verify(hashed_leaf, recovered)?;
+
+        // IMPORTANT: If the `.to_vec()` conversion is not made for `hashed_leaf`, the recovered
+        // address from the signature will not be the same as the one who signed. This is a bug in
+        // the ethers-rs library
+        let recovered = self.signature.recover(hashed_leaf.to_vec())?;
+        self.signature.verify(hashed_leaf.to_vec(), recovered)?;
         Ok(recovered)
     }
 }

batcher/aligned-batcher-lib/src/types/mod.rs

@@ -1,6 +1,6 @@
 use serde::Deserialize;
 
-#[derive(Debug, Deserialize)]
+#[derive(Clone, Debug, Deserialize)]
 pub struct ECDSAConfig {
     pub private_key_store_path: String,
     pub private_key_store_password: String,
@@ -36,6 +36,8 @@ impl ConfigFromYaml {
 pub struct Addresses {
     #[serde(rename = "alignedLayerServiceManager")]
     pub aligned_layer_service_manager: String,
+    #[serde(rename = "batcherPaymentService")]
+    pub batcher_payment_service: String,
 }
 
 #[derive(Debug, Deserialize)]