Merge branch 'staging' into 1082-add-a-bitmap-in-ethereum-to-disable-verifiers

Author: IAvecilla

Makefile

@@ -85,10 +85,6 @@ anvil_upgrade_add_aggregator:
 	@echo "Adding Aggregator to Aligned Contracts..."
 	. contracts/scripts/anvil/upgrade_add_aggregator_to_service_manager.sh
 
-anvil_add_type_hash_to_batcher_payment_service:
-	@echo "Adding Type Hash to Batcher Payment Service..."
-	. contracts/scripts/anvil/upgrade_add_type_hash_to_batcher_payment_service.sh
-
 lint_contracts:
 	@cd contracts && npm run lint:sol
 
@@ -449,10 +445,6 @@ upgrade_add_aggregator: ## Add Aggregator to Aligned Contracts
 	@echo "Adding Aggregator to Aligned Contracts..."
 	@. contracts/scripts/.env && . contracts/scripts/upgrade_add_aggregator_to_service_manager.sh
 
-upgrade_batcher_payments_add_type_hash: ## Add Type Hash to Batcher Payment Service
-	@echo "Adding Type Hash to Batcher Payment Service..."
-	@. contracts/scripts/.env && . contracts/scripts/upgrade_add_type_hash_to_batcher_payment_service.sh
-
 deploy_verify_batch_inclusion_caller:
 	@echo "Deploying VerifyBatchInclusionCaller contract..."
 	@. examples/verify/.env && . examples/verify/scripts/deploy_verify_batch_inclusion_caller.sh

batcher/aligned-batcher/src/eth/payment_service.rs

@@ -1,7 +1,7 @@
 use std::str::FromStr;
 use std::sync::Arc;
 
-use aligned_sdk::eth::batcher_payment_service::{BatcherPaymentServiceContract, SignatureData};
+use aligned_sdk::eth::batcher_payment_service::{BatcherPaymentServiceContract};
 use ethers::prelude::k256::ecdsa::SigningKey;
 use ethers::prelude::*;
 use gas_escalator::{Frequency, GeometricGasPrice};
@@ -74,17 +74,15 @@ pub async fn get_batcher_payment_service(
 pub async fn try_create_new_task(
     batch_merkle_root: [u8; 32],
     batch_data_pointer: String,
-    padded_leaves: Vec<[u8; 32]>,
-    signatures: Vec<SignatureData>,
+    proofs_submitters: Vec<Address>,
     fee_params: CreateNewTaskFeeParams,
     payment_service: &BatcherPaymentService,
 ) -> Result<TransactionReceipt, BatcherSendError> {
     let call = payment_service
         .create_new_task(
             batch_merkle_root,
             batch_data_pointer,
-            padded_leaves,
-            signatures,
+            proofs_submitters,
             fee_params.fee_for_aggregator,
             fee_params.fee_per_proof,
             fee_params.respond_to_task_fee_limit,

batcher/aligned-batcher/src/lib.rs

@@ -1,7 +1,4 @@
-extern crate core;
-
 use aligned_sdk::communication::serialization::{cbor_deserialize, cbor_serialize};
-use aligned_sdk::eth::batcher_payment_service::SignatureData;
 use config::NonPayingConfig;
 use connection::{send_message, WsMessageSink};
 use dotenvy::dotenv;
@@ -13,7 +10,6 @@ use types::user_state::UserState;
 
 use std::collections::HashMap;
 use std::env;
-use std::iter::repeat;
 use std::net::SocketAddr;
 use std::sync::Arc;
 
@@ -1041,22 +1037,6 @@ impl Batcher {
         finalized_batch: &[BatchQueueEntry],
         gas_price: U256,
     ) -> Result<(), BatcherError> {
-        let signatures: Vec<_> = finalized_batch
-            .iter()
-            .map(|entry| &entry.signature)
-            .cloned()
-            .collect();
-
-        let nonces: Vec<_> = finalized_batch
-            .iter()
-            .map(|entry| entry.nonced_verification_data.nonce)
-            .collect();
-
-        let max_fees: Vec<_> = finalized_batch
-            .iter()
-            .map(|entry| entry.nonced_verification_data.max_fee)
-            .collect();
-
         let s3_client = self.s3_client.clone();
         let batch_merkle_root_hex = hex::encode(batch_merkle_root);
         info!("Batch merkle root: 0x{}", batch_merkle_root_hex);
@@ -1098,18 +1078,13 @@ impl Batcher {
             respond_to_task_fee_limit,
         );
 
-        let signatures = signatures
-            .iter()
-            .enumerate()
-            .map(|(i, signature)| SignatureData::new(signature, nonces[i], max_fees[i]))
-            .collect();
+        let proof_submitters = finalized_batch.iter().map(|entry| entry.sender).collect();
 
         match self
             .create_new_task(
                 *batch_merkle_root,
                 batch_data_pointer,
-                leaves,
-                signatures,
+                proof_submitters,
                 fee_params,
             )
             .await
@@ -1133,20 +1108,15 @@ impl Batcher {
         &self,
         batch_merkle_root: [u8; 32],
         batch_data_pointer: String,
-        leaves: Vec<[u8; 32]>,
-        signatures: Vec<SignatureData>,
+        proof_submitters: Vec<Address>,
         fee_params: CreateNewTaskFeeParams,
     ) -> Result<TransactionReceipt, BatcherError> {
-        // pad leaves to next power of 2
-        let padded_leaves = Self::pad_leaves(leaves);
-
         info!("Creating task for: 0x{}", hex::encode(batch_merkle_root));
 
         match try_create_new_task(
             batch_merkle_root,
             batch_data_pointer.clone(),
-            padded_leaves.clone(),
-            signatures.clone(),
+            proof_submitters.clone(),
             fee_params.clone(),
             &self.payment_service,
         )
@@ -1163,8 +1133,7 @@ impl Batcher {
                 let receipt = try_create_new_task(
                     batch_merkle_root,
                     batch_data_pointer,
-                    padded_leaves,
-                    signatures,
+                    proof_submitters,
                     fee_params,
                     &self.payment_service_fallback,
                 )
@@ -1175,15 +1144,6 @@ impl Batcher {
         }
     }
 
-    fn pad_leaves(leaves: Vec<[u8; 32]>) -> Vec<[u8; 32]> {
-        let leaves_len = leaves.len();
-        let last_leaf = leaves[leaves_len - 1];
-        leaves
-            .into_iter()
-            .chain(repeat(last_leaf).take(leaves_len.next_power_of_two() - leaves_len))
-            .collect()
-    }
-
     /// Only relevant for testing and for users to easily use Aligned
     fn is_nonpaying(&self, addr: &Address) -> bool {
         self.non_paying_config
@@ -1256,14 +1216,13 @@ impl Batcher {
         .await;
 
         let signature = client_msg.signature;
-        let nonpaying_addr = non_paying_config.address;
         if let Err(e) = self
             .add_to_batch(
                 batch_state_lock,
                 nonced_verification_data,
                 ws_sink.clone(),
                 signature,
-                nonpaying_addr,
+                replacement_addr,
             )
             .await
         {

batcher/aligned-sdk/abi/BatcherPaymentService.json

@@ -28,23 +28,3 @@ pub async fn batcher_payment_service(
 
     Ok(BatcherPaymentService::new(contract_address, client))
 }
-
-impl SignatureData {
-    pub fn new(signature: &Signature, nonce: U256, max_fee: U256) -> Self {
-        let mut signature_bytes = [0u8; 65];
-
-        signature.r.to_big_endian(&mut signature_bytes[0..32]);
-
-        signature.s.to_big_endian(&mut signature_bytes[32..64]);
-
-        signature_bytes[64] = signature.v as u8;
-
-        let signature_bytes = Bytes::from(signature_bytes);
-
-        SignatureData {
-            signature: signature_bytes,
-            nonce,
-            max_fee,
-        }
-    }
-}

batcher/aligned-sdk/src/eth/batcher_payment_service.rs

@@ -29,23 +29,17 @@ contract BatcherPaymentServiceDeployer is Script {
             ".permissions.owner"
         );
 
-        bytes32 noncedVerificationDataTypeHash = stdJson.readBytes32(
-            config_data,
-            ".eip712.noncedVerificationDataTypeHash"
-        );
-
         vm.startBroadcast();
 
         BatcherPaymentService batcherPaymentService = new BatcherPaymentService();
 
         ERC1967Proxy proxy = new ERC1967Proxy(
             address(batcherPaymentService),
             abi.encodeWithSignature(
-                "initialize(address,address,address,bytes32)",
+                "initialize(address,address,address)",
                 IAlignedLayerServiceManager(alignedLayerServiceManager),
                 batcherPaymentServiceOwner,
-                batcherWallet,
-                noncedVerificationDataTypeHash
+                batcherWallet
             )
         );
 

contracts/bindings/AlignedLayerServiceManager/binding.go

@@ -10,8 +10,5 @@
   },
   "permissions": {
     "owner": "0x14dC79964da2C08b23698B3D3cc7Ca32193d9955"
-  },
-  "eip712": {
-    "noncedVerificationDataTypeHash": "41817b5c5b0c3dcda70ccb43ba175fdcd7e586f9e0484422a2c6bba678fdf4a3"
   }
 }

contracts/script/deploy/BatcherPaymentServiceDeployer.s.sol

@@ -9,8 +9,5 @@
   },
   "permissions": {
     "owner": "<owner_address>"
-  },
-  "eip712": {
-    "noncedVerificationDataTypeHash": "41817b5c5b0c3dcda70ccb43ba175fdcd7e586f9e0484422a2c6bba678fdf4a3"
   }
 }