feat: add limit on aggregator spending (#910)

Co-authored-by: Santos Rosati <[email protected]>
Co-authored-by: taturosati <“[email protected]”>
Co-authored-by: Gian <[email protected]>
Co-authored-by: taturosati <[email protected]>
Co-authored-by: Tatu <[email protected]>
Co-authored-by: Julian Arce <[email protected]>

Author: 5 people

.github/workflows/build-rust.yml

@@ -12,7 +12,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: aligned-runner
 
     steps:
       - uses: actions/checkout@v4

aggregator/internal/pkg/aggregator.go

@@ -42,7 +42,7 @@ type BatchData struct {
 
 type Aggregator struct {
 	AggregatorConfig      *config.AggregatorConfig
-	NewBatchChan          chan *servicemanager.ContractAlignedLayerServiceManagerNewBatchV2
+	NewBatchChan          chan *servicemanager.ContractAlignedLayerServiceManagerNewBatchV3
 	avsReader             *chainio.AvsReader
 	avsSubscriber         *chainio.AvsSubscriber
 	avsWriter             *chainio.AvsWriter
@@ -91,7 +91,7 @@ type Aggregator struct {
 }
 
 func NewAggregator(aggregatorConfig config.AggregatorConfig) (*Aggregator, error) {
-	newBatchChan := make(chan *servicemanager.ContractAlignedLayerServiceManagerNewBatchV2)
+	newBatchChan := make(chan *servicemanager.ContractAlignedLayerServiceManagerNewBatchV3)
 
 	avsReader, err := chainio.NewAvsReaderFromConfig(aggregatorConfig.BaseConfig, aggregatorConfig.EcdsaConfig)
 	if err != nil {

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

@@ -29,14 +29,21 @@ pub struct CreateNewTaskFeeParams {
     pub fee_for_aggregator: U256,
     pub fee_per_proof: U256,
     pub gas_price: U256,
+    pub respond_to_task_fee_limit: U256,
 }
 
 impl CreateNewTaskFeeParams {
-    pub fn new(fee_for_aggregator: U256, fee_per_proof: U256, gas_price: U256) -> Self {
+    pub fn new(
+        fee_for_aggregator: U256,
+        fee_per_proof: U256,
+        gas_price: U256,
+        respond_to_task_fee_limit: U256,
+    ) -> Self {
         CreateNewTaskFeeParams {
             fee_for_aggregator,
             fee_per_proof,
             gas_price,
+            respond_to_task_fee_limit,
         }
     }
 }
@@ -97,6 +104,7 @@ pub async fn try_create_new_task(
             signatures,
             fee_params.fee_for_aggregator,
             fee_params.fee_per_proof,
+            fee_params.respond_to_task_fee_limit,
         )
         .gas_price(fee_params.gas_price);
 

batcher/aligned-batcher/src/lib.rs

@@ -51,11 +51,17 @@ pub mod types;
 mod zk_utils;
 
 const AGGREGATOR_GAS_COST: u128 = 400_000;
-const BATCHER_SUBMISSION_BASE_GAS_COST: u128 = 100_000;
+const BATCHER_SUBMISSION_BASE_GAS_COST: u128 = 125_000;
 const ADDITIONAL_SUBMISSION_GAS_COST_PER_PROOF: u128 = 13_000;
-const CONSTANT_GAS_COST: u128 = AGGREGATOR_GAS_COST + BATCHER_SUBMISSION_BASE_GAS_COST;
+const CONSTANT_GAS_COST: u128 = ((AGGREGATOR_GAS_COST * DEFAULT_AGGREGATOR_FEE_MULTIPLIER)
+    / DEFAULT_AGGREGATOR_FEE_DIVIDER)
+    + BATCHER_SUBMISSION_BASE_GAS_COST;
 const DEFAULT_MAX_FEE_PER_PROOF: u128 = ADDITIONAL_SUBMISSION_GAS_COST_PER_PROOF * 100_000_000_000; // gas_price = 100 Gwei = 0.0000001 ether (high gas price)
 const MIN_FEE_PER_PROOF: u128 = ADDITIONAL_SUBMISSION_GAS_COST_PER_PROOF * 100_000_000; // gas_price = 0.1 Gwei = 0.0000000001 ether (low gas price)
+const RESPOND_TO_TASK_FEE_LIMIT_MULTIPLIER: u128 = 5; // to set the respondToTaskFeeLimit variable higher than fee_for_aggregator
+const RESPOND_TO_TASK_FEE_LIMIT_DIVIDER: u128 = 2;
+const DEFAULT_AGGREGATOR_FEE_MULTIPLIER: u128 = 3; // to set the feeForAggregator variable higher than what was calculated
+const DEFAULT_AGGREGATOR_FEE_DIVIDER: u128 = 2;
 
 struct BatchState {
     batch_queue: BatchQueue,
@@ -1085,9 +1091,19 @@ impl Batcher {
             / num_proofs_in_batch as u128;
 
         let fee_per_proof = U256::from(gas_per_proof) * gas_price;
-        let fee_for_aggregator = U256::from(AGGREGATOR_GAS_COST) * gas_price;
-
-        let fee_params = CreateNewTaskFeeParams::new(fee_for_aggregator, fee_per_proof, gas_price);
+        let fee_for_aggregator = (U256::from(AGGREGATOR_GAS_COST)
+            * gas_price
+            * U256::from(DEFAULT_AGGREGATOR_FEE_MULTIPLIER))
+            / U256::from(DEFAULT_AGGREGATOR_FEE_DIVIDER);
+        let respond_to_task_fee_limit = (fee_for_aggregator
+            * U256::from(RESPOND_TO_TASK_FEE_LIMIT_MULTIPLIER))
+            / U256::from(RESPOND_TO_TASK_FEE_LIMIT_DIVIDER);
+        let fee_params = CreateNewTaskFeeParams::new(
+            fee_for_aggregator,
+            fee_per_proof,
+            gas_price,
+            respond_to_task_fee_limit,
+        );
 
         let signatures = signatures
             .iter()

batcher/aligned-sdk/abi/AlignedLayerServiceManager.json

@@ -7,7 +7,11 @@ use crate::core::errors::VerificationError;
 
 abigen!(
     AlignedLayerServiceManagerContract,
-    "abi/AlignedLayerServiceManager.json"
+    "abi/AlignedLayerServiceManager.json",
+    methods {
+        verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256) as verify_batch_inclusion_legacy;
+        verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256,address) as verify_batch_inclusion;
+    },
 );
 
 type AlignedLayerServiceManager = AlignedLayerServiceManagerContract<Provider<Http>>;

batcher/aligned-sdk/abi/BatcherPaymentService.json

@@ -48,6 +48,9 @@ forge_output=$(forge script script/deploy/BatcherPaymentServiceDeployer.s.sol \
 batcher_payment_service_proxy=$(echo "$forge_output" | awk '/0: address/ {print $3}')
 batcher_payment_service_implementation=$(echo "$forge_output" | awk '/1: address/ {print $3}')
 
+# Give initial funds to ServiceManager for the Batcher
+cast send $ALIGNED_LAYER_SERVICE_MANAGER_ADDRESS "depositToBatcher(address)()" $batcher_payment_service_proxy --value 1ether --private-key "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80" --rpc-url "http://localhost:8545"
+
 # Use the extracted value to replace the  batcher payment service values in alignedlayer_deployment_output.json and save it to a temporary file
 jq --arg batcher_payment_service_proxy "$batcher_payment_service_proxy" '.addresses.batcherPaymentService = $batcher_payment_service_proxy' "script/output/devnet/alignedlayer_deployment_output.json" > "script/output/devnet/alignedlayer_deployment_output.temp1.json"
 jq --arg batcher_payment_service_implementation "$batcher_payment_service_implementation" '.addresses.batcherPaymentServiceImplementation = $batcher_payment_service_implementation' "script/output/devnet/alignedlayer_deployment_output.temp1.json" > "script/output/devnet/alignedlayer_deployment_output.temp2.json"