refactor: move calculation of priceperproof to batcher (#530)

Co-authored-by: Mauro Toscano <12560266+MauroToscano@users.noreply.github.com>

Author: uri-99

batcher/aligned-batcher/src/eth/abi/BatcherPaymentService.json

@@ -66,13 +66,15 @@ pub async fn create_new_task(
     batch_merkle_root: [u8; 32],
     batch_data_pointer: String,
     proof_submitters: Vec<Address>,
-    respond_to_task_cost: U256,
+    gas_for_aggregator: U256,
+    gas_per_proof: U256,
 ) -> Result<TransactionReceipt, anyhow::Error> {
     let call = payment_service.create_new_task(
         batch_merkle_root,
         batch_data_pointer,
         proof_submitters,
-        respond_to_task_cost,
+        gas_for_aggregator,
+        gas_per_proof,
     );
     let pending_tx = call.send().await?;
 

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

@@ -451,7 +451,8 @@ impl Batcher {
             *batch_merkle_root,
             batch_data_pointer,
             submitter_addresses,
-            U256::from(400000000000000u64),
+            U256::from(350000u64), // FIXME(uri): This value should be read from /Users/urix/aligned_layer/contracts/script/deploy/config/devnet/batcher-payment-service.devnet.config.json
+            U256::from(21000u64), //FIXME(uri): This value should be read from /Users/urix/aligned_layer/contracts/script/deploy/config/devnet/batcher-payment-service.devnet.config.json
         )
         .await
         {

batcher/aligned-batcher/src/lib.rs

@@ -28,21 +28,6 @@ contract BatcherPaymentServiceDeployer is Script {
             ".permissions.owner"
         );
 
-        uint256 paymentServiceCreateTaskGasCost = stdJson.readUint(
-            config_data,
-            ".amounts.paymentServiceCreateTaskGasCost"
-        );
-
-        uint256 serviceManagerCreateTaskGasCost = stdJson.readUint(
-            config_data,
-            ".amounts.serviceManagerCreateTaskGasCost"
-        );
-
-        uint256 extraUserTxGasCost = stdJson.readUint(
-            config_data,
-            ".amounts.extraUserTxGasCost"
-        );
-
         vm.startBroadcast();
 
         BatcherPaymentService batcherPaymentService = new BatcherPaymentService();
@@ -53,10 +38,7 @@ contract BatcherPaymentServiceDeployer is Script {
         BatcherPaymentService(payable(address(proxy))).initialize(
             alignedLayerServiceManager,
             batcherPaymentServiceOwner,
-            batcherWallet,
-            paymentServiceCreateTaskGasCost,
-            serviceManagerCreateTaskGasCost,
-            extraUserTxGasCost
+            batcherWallet
         );
 
         vm.stopBroadcast();

contracts/script/deploy/BatcherPaymentServiceDeployer.s.sol

@@ -5,9 +5,8 @@
     "alignedLayerServiceManager": "0x1613beB3B2C4f22Ee086B2b38C1476A3cE7f78E8"
   },
   "amounts": {
-    "paymentServiceCreateTaskGasCost": 42000,
-    "serviceManagerCreateTaskGasCost": 60000,
-    "extraUserTxGasCost": 6500
+    "gasForAggregator": "300000",
+    "gasPerProof": "21000"
   },
   "permissions": {
     "owner": "0x14dC79964da2C08b23698B3D3cc7Ca32193d9955"

contracts/script/deploy/config/devnet/batcher-payment-service.devnet.config.json

@@ -4,9 +4,8 @@
     "alignedLayerServiceManager": "<aligned_layer_service_manager_address>"
   },
   "amounts": {
-    "paymentServiceCreateTaskGasCost": 42000,
-    "serviceManagerCreateTaskGasCost": 60000,
-    "extraUserTxGasCost": 6500
+    "gasForAggregator": "300000",
+    "gasPerProof": "21000"
   },
   "permissions": {
     "owner": "<owner_address>"

contracts/script/deploy/config/holesky/batcher-payment-service.holesky.config.json

@@ -133,8 +133,8 @@ contract AlignedLayerServiceManager is
         // and send transaction cost to aggregator.
         uint256 finalGasLeft = gasleft();
 
-        // FIXME: should we add 21000 gas from the transfer + some additional for the other steps (~40k gas)?
-        uint256 txCost = (initialGasLeft - finalGasLeft + 21000) * tx.gasprice;
+        // 70k was measured by trial and error until the aggregator got paid a bit over what it needed
+        uint256 txCost = (initialGasLeft - finalGasLeft + 70000) * tx.gasprice;
 
         require(
             batchersBalances[batchesState[batchMerkleRoot].batcherAddress] >=

contracts/scripts/anvil/state/alignedlayer-deployed-anvil-state.json

@@ -21,10 +21,6 @@ contract BatcherPaymentService is
 
     mapping(address => uint256) public UserBalances;
 
-    uint256 public PAYMENT_SERVICE_CREATE_TASK_GAS_COST; // Base gas cost of executing createNewTask of this contract
-    uint256 public SERVICE_MANAGER_CREATE_TASK_GAS_COST; // Gas cost of calling createNewTask in AlignedLayerServiceManager
-    uint256 public EXTRA_USER_TX_GAS_COST; // As we must iterate over the proofSubmitters, there is an extra gas cost per extra user
-
     // storage gap for upgradeability
     uint256[25] private __GAP;
 
@@ -36,20 +32,14 @@ contract BatcherPaymentService is
     function initialize(
         address _AlignedLayerServiceManager,
         address _BatcherPaymentServiceOwner,
-        address _BatcherWallet,
-        uint256 _PaymentServiceCreateTaskGasCost,
-        uint256 _ServiceManagerCreateTaskGasCost,
-        uint256 _ExtraUserTxGasCost
+        address _BatcherWallet
     ) public initializer {
         __Ownable_init(); // default is msg.sender
         __UUPSUpgradeable_init();
         _transferOwnership(_BatcherPaymentServiceOwner);
 
         AlignedLayerServiceManager = _AlignedLayerServiceManager;
         BatcherWallet = _BatcherWallet;
-        PAYMENT_SERVICE_CREATE_TASK_GAS_COST = _PaymentServiceCreateTaskGasCost;
-        SERVICE_MANAGER_CREATE_TASK_GAS_COST = _ServiceManagerCreateTaskGasCost;
-        EXTRA_USER_TX_GAS_COST = _ExtraUserTxGasCost;
     }
 
     // PAYABLE FUNCTIONS
@@ -63,38 +53,33 @@ contract BatcherPaymentService is
         bytes32 batchMerkleRoot,
         string calldata batchDataPointer,
         address[] calldata proofSubmitters, // one address for each payer proof, 1 user has 2 proofs? send twice that address
-        uint256 costOfRespondToTask // TODO hardcode gas cost? It is variable because of signature sdk. could have upper bound and multiply by current gas cost + x%.
+        uint256 gasForAggregator,
+        uint256 gasPerProof
     ) external onlyBatcher whenNotPaused {
+        uint256 feeForAggregator = gasForAggregator * tx.gasprice;
+        uint256 feePerProof = gasPerProof * tx.gasprice;
+
         uint256 amountOfSubmitters = proofSubmitters.length;
-        require(amountOfSubmitters > 0, "No proof submitters");
 
-        // each user must pay its fraction of the gas cost of this transaction back to the batcher
-        // + 10% for increments in gas price
-        uint256 currentTxCost = ((PAYMENT_SERVICE_CREATE_TASK_GAS_COST +
-            SERVICE_MANAGER_CREATE_TASK_GAS_COST +
-            (EXTRA_USER_TX_GAS_COST * amountOfSubmitters)) *
-            tx.gasprice *
-            11) / 10;
+        require(amountOfSubmitters > 0, "No proof submitters");
 
-        // divide the price by the amount of submitters
-        uint256 totalCostPerProof = (costOfRespondToTask + currentTxCost) /
-            amountOfSubmitters;
+        require(feePerProof * amountOfSubmitters > feeForAggregator, "Not enough gas to pay the batcher");
 
         // discount from each payer
         // will revert if one of them has insufficient balance
         for (uint256 i = 0; i < amountOfSubmitters; i++) {
             address payer = proofSubmitters[i];
             require(
-                UserBalances[payer] >= totalCostPerProof,
+                UserBalances[payer] >= feePerProof,
                 "Payer has insufficient balance"
             );
-            UserBalances[payer] -= totalCostPerProof;
+            UserBalances[payer] -= feePerProof;
         }
 
         // call alignedLayerServiceManager
         // with value to fund the task's response
         (bool success, ) = AlignedLayerServiceManager.call{
-            value: costOfRespondToTask
+            value: feeForAggregator
         }(
             abi.encodeWithSignature(
                 "createNewTask(bytes32,string)",
@@ -105,7 +90,9 @@ contract BatcherPaymentService is
 
         require(success, "createNewTask call failed");
 
-        payable(BatcherWallet).transfer(currentTxCost);
+        uint256 feeForBatcher = (feePerProof * amountOfSubmitters) - feeForAggregator;
+
+        payable(BatcherWallet).transfer(feeForBatcher);
     }
 
     function withdraw(uint256 amount) external whenNotPaused {
@@ -118,24 +105,6 @@ contract BatcherPaymentService is
         emit FundsWithdrawn(msg.sender, amount);
     }
 
-    function setPaymentServiceCreateTaskGasCost(
-        uint256 amount
-    ) external onlyOwner whenNotPaused {
-        PAYMENT_SERVICE_CREATE_TASK_GAS_COST = amount;
-    }
-
-    function setServiceManagerCreateTaskGasCost(
-        uint256 amount
-    ) external onlyOwner whenNotPaused {
-        SERVICE_MANAGER_CREATE_TASK_GAS_COST = amount;
-    }
-
-    function setExtraUserTxGasCost(
-        uint256 amount
-    ) external onlyOwner whenNotPaused {
-        EXTRA_USER_TX_GAS_COST = amount;
-    }
-
     function pause() public onlyOwner {
         _pause();
     }