feat: first version of payment system (#449)

entropidelic · taturosati · uri-99 · web-flow · commit eb13beed99e3 · 2024-06-26T16:22:34.000-03:00
Co-authored-by: Santos Rosati &lt;rosatisantos@gmail.com&gt;
Co-authored-by: Urix &lt;43704209+uri-99@users.noreply.github.com&gt;
Co-authored-by: JuArce &lt;52429267+JuArce@users.noreply.github.com&gt;
Co-authored-by: Mauro Toscano &lt;12560266+MauroToscano@users.noreply.github.com&gt;
diff --git a/Makefile b/Makefile
@@ -3,6 +3,7 @@
 OS := $(shell uname -s)
 
 CONFIG_FILE?=config-files/config.yaml
+AGG_CONFIG_FILE?=config-files/config-aggregator.yaml
 
 OPERATOR_VERSION=v0.1.6
 
@@ -79,10 +80,9 @@ anvil_start_with_block_time:
 	@echo "Starting Anvil..."
 	anvil --load-state contracts/scripts/anvil/state/alignedlayer-deployed-anvil-state.json --block-time 3
 
-# TODO: Allow enviroment variables / different configuration files
 aggregator_start:
 	@echo "Starting Aggregator..."
-	@go run aggregator/cmd/main.go --config $(CONFIG_FILE) \
+	@go run aggregator/cmd/main.go --config $(AGG_CONFIG_FILE) \
 	2>&1 | zap-pretty
 
 aggregator_send_dummy_responses:
@@ -175,10 +175,13 @@ __BATCHER__:
 
 BURST_SIZE=5
 
+batcher_fund_service_manager_balance:
+	@. ./scripts/fund_batcher_balance_in_aligned_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_start: ./batcher/aligned-batcher/.env batcher_fund_service_manager_balance
 	@echo "Starting Batcher..."
 	@cargo +nightly-2024-04-17 run --manifest-path ./batcher/aligned-batcher/Cargo.toml --release -- --config ./config-files/config.yaml --env-file ./batcher/aligned-batcher/.env
 
diff --git a/config-files/anvil.aggregator.bls.key.json b/config-files/anvil.aggregator.bls.key.json
@@ -0,0 +1 @@
+{"pubKey":"E([2836088353050477845347925486470168020568465207212129112527815811278071168630,3160427639470623810295719163087493911148458124491004113623503371537041864385])","crypto":{"cipher":"aes-128-ctr","ciphertext":"208c421cf636f275a42ed905177703c5c33150a405dd9e1b2c7348976f85dcfe","cipherparams":{"iv":"ca35157d20418b2a5f3e08a6e36596fd"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":262144,"p":1,"r":8,"salt":"925af4285f14851f9d83eb7fc2c0ce7ca9f50aa77385519d994ee147f1410607"},"mac":"7e21f43562c4b4cd10b9fe5a149ce66ea17444167f788d6a02a67232d953c4e2"}}
diff --git a/config-files/anvil.aggregator.ecdsa.key.json b/config-files/anvil.aggregator.ecdsa.key.json
@@ -0,0 +1 @@
+{"address":"15d34aaf54267db7d7c367839aaf71a00a2c6a65","crypto":{"cipher":"aes-128-ctr","ciphertext":"c649f534580a3f0bf000b221afb0731052f7699298f618e79b2b99fd974c4b16","cipherparams":{"iv":"2fad203c48a2ae479673b17bf110a988"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":262144,"p":1,"r":8,"salt":"72b1c2700f1cccebc468dafecf8de51f19c969389caae7e414c74d699a21c8c4"},"mac":"f093f9d47d3b9aa19be03f2bb9ae96b8c6da7ad0a7c7c0165bdbf84c54c9e26f"},"id":"f2925fb0-b209-4210-af6d-10c44b0e4a84","version":3}
diff --git a/config-files/config-aggregator.yaml b/config-files/config-aggregator.yaml
@@ -0,0 +1,51 @@
+# Common variables for all the services
+# 'production' only prints info and above. 'development' also prints debug
+environment: "production"
+aligned_layer_deployment_config_file_path: "./contracts/script/output/devnet/alignedlayer_deployment_output.json"
+eigen_layer_deployment_config_file_path: "./contracts/script/output/devnet/eigenlayer_deployment_output.json"
+eth_rpc_url: "http://localhost:8545"
+eth_ws_url: "ws://localhost:8545"
+eigen_metrics_ip_port_address: "localhost:9090"
+
+## ECDSA Configurations
+ecdsa:
+  private_key_store_path: "config-files/anvil.aggregator.ecdsa.key.json"
+  private_key_store_password: ""
+
+## BLS Configurations
+bls:
+  private_key_store_path: "config-files/anvil.aggregator.bls.key.json"
+  private_key_store_password: ""
+
+# ## Batcher configurations # batcher:
+#   block_interval: 3
+#   batch_size_interval: 10
+#   max_proof_size: 67108864 # 64 MiB
+#   max_batch_size: 268435456 # 256 MiB
+#   eth_ws_reconnects: 99999999999999
+#   pre_verification_is_enabled: true
+
+## Aggregator Configurations
+aggregator:
+  server_ip_port_address: localhost:8090
+  bls_public_key_compendium_address: 0x322813Fd9A801c5507c9de605d63CEA4f2CE6c44
+  avs_service_manager_address: 0xc3e53F4d16Ae77Db1c982e75a937B9f60FE63690
+  enable_metrics: true
+  metrics_ip_port_address: localhost:9091
+## Operator Configurations
+# operator:
+#   aggregator_rpc_server_ip_port_address: localhost:8090
+#   address: 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
+#   earnings_receiver_address: 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
+#   delegation_approver_address: "0x0000000000000000000000000000000000000000"
+#   staker_opt_out_window_blocks: 0
+#   metadata_url: "https://yetanotherco.github.io/operator_metadata/metadata.json"
+#   enable_metrics: true
+#   metrics_ip_port_address: localhost:9092
+#   max_batch_size: 268435456 # 256 MiB
+# # Operators variables needed for register it in EigenLayer
+# el_delegation_manager_address: "0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9"
+# private_key_store_path: config-files/anvil.ecdsa.key.json
+# bls_private_key_store_path: config-files/anvil.bls.key.json
+# signer_type: local_keystore
+# chain_id: 31337
diff --git a/contracts/script/deploy/AlignedLayerDeployer.s.sol b/contracts/script/deploy/AlignedLayerDeployer.s.sol
@@ -108,7 +108,7 @@ contract AlignedLayerDeployer is ExistingDeploymentParser {
          * not yet deployed, we give these proxies an empty contract as the initial implementation, to act as if they have no code.
          */
         alignedLayerServiceManager = AlignedLayerServiceManager(
-            address(
+            payable(
                 new TransparentUpgradeableProxy(
                     address(emptyContract),
                     address(alignedLayerProxyAdmin),
@@ -333,7 +333,7 @@ contract AlignedLayerDeployer is ExistingDeploymentParser {
          * not yet deployed, we give these proxies an empty contract as the initial implementation, to act as if they have no code.
          */
         alignedLayerServiceManager = AlignedLayerServiceManager(
-            address(
+            payable(
                 new TransparentUpgradeableProxy(
                     address(emptyContract),
                     address(alignedLayerProxyAdmin),
@@ -696,7 +696,10 @@ contract AlignedLayerDeployer is ExistingDeploymentParser {
         );
     }
 
-    function _writeOutput(string memory config_data, string memory outputPath) internal {
+    function _writeOutput(
+        string memory config_data,
+        string memory outputPath
+    ) internal {
         string memory parent_object = "parent object";
 
         string memory deployed_addresses = "addresses";
diff --git a/contracts/script/upgrade/AlignedLayerUpgrader.s.sol b/contracts/script/upgrade/AlignedLayerUpgrader.s.sol
@@ -72,9 +72,11 @@ contract AlignedLayerUpgrader is Script {
 
         // alignedLayerServiceManager is the proxy
         AlignedLayerServiceManager alignedLayerServiceManager = AlignedLayerServiceManager(
-                stdJson.readAddress(
-                    aligned_deployment_file,
-                    ".addresses.alignedLayerServiceManager"
+                payable(
+                    stdJson.readAddress(
+                        aligned_deployment_file,
+                        ".addresses.alignedLayerServiceManager"
+                    )
                 )
             );
 
diff --git a/contracts/script/upgrade/RegistryCoordinatorUpgrader.s.sol b/contracts/script/upgrade/RegistryCoordinatorUpgrader.s.sol
@@ -25,7 +25,7 @@ contract RegistryCoordinatorUpgrader is Script {
         string memory aligned_deployment_file = vm.readFile(
             alignedLayerDeploymentFilePath
         );
-        
+
         // Load proxy admin
         ProxyAdmin alignedLayerProxyAdmin = ProxyAdmin(
             stdJson.readAddress(
@@ -36,19 +36,23 @@ contract RegistryCoordinatorUpgrader is Script {
 
         // Load RegistryCoordinator Proxy
         TransparentUpgradeableProxy registryCoordinator = TransparentUpgradeableProxy(
-            payable(stdJson.readAddress(
-                aligned_deployment_file,
-                ".addresses.registryCoordinator"
-            ))
-        );
+                payable(
+                    stdJson.readAddress(
+                        aligned_deployment_file,
+                        ".addresses.registryCoordinator"
+                    )
+                )
+            );
 
         // Load RegistryCoordinator dependencies
         AlignedLayerServiceManager alignedLayerServiceManager = AlignedLayerServiceManager(
-            stdJson.readAddress(
-                aligned_deployment_file,
-                ".addresses.alignedLayerServiceManager"
-            )
-        );
+                payable(
+                    stdJson.readAddress(
+                        aligned_deployment_file,
+                        ".addresses.alignedLayerServiceManager"
+                    )
+                )
+            );
         StakeRegistry stakeRegistry = StakeRegistry(
             stdJson.readAddress(
                 aligned_deployment_file,
@@ -71,20 +75,20 @@ contract RegistryCoordinatorUpgrader is Script {
         // Create a new instance of the RegistryCoordinatorImplementation
         vm.startBroadcast();
         RegistryCoordinator registryCoordinatorImplementation = new RegistryCoordinator(
-            IServiceManager(address(alignedLayerServiceManager)),
-            stakeRegistry,
-            apkRegistry,
-            indexRegistry
-        );
+                IServiceManager(address(alignedLayerServiceManager)),
+                stakeRegistry,
+                apkRegistry,
+                indexRegistry
+            );
         vm.stopBroadcast();
 
         vm.startBroadcast();
         alignedLayerProxyAdmin.upgrade(
             registryCoordinator,
             address(registryCoordinatorImplementation)
-        ); 
+        );
         vm.stopBroadcast();
-        
+
         return (
             address(registryCoordinator),
             address(registryCoordinatorImplementation)
diff --git a/contracts/scripts/anvil/state/alignedlayer-deployed-anvil-state.json b/contracts/scripts/anvil/state/alignedlayer-deployed-anvil-state.json
diff --git a/contracts/scripts/anvil/state/eigenlayer-deployed-anvil-state.json b/contracts/scripts/anvil/state/eigenlayer-deployed-anvil-state.json
@@ -288,10 +288,10 @@
     },
     "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266": {
       "nonce": 33,
-      "balance": "0x21e19b29e7e1ee6dc06",
+      "balance": "0x21e19ba73388f8f654b",
       "code": "0x",
       "storage": {}
     }
   },
-  "best_block_number": "0x13"
+  "best_block_number": "0x1a"
 }
diff --git a/contracts/src/core/AlignedLayerServiceManager.sol b/contracts/src/core/AlignedLayerServiceManager.sol
@@ -62,10 +62,17 @@ contract AlignedLayerServiceManager is
             "Batch was already submitted"
         );
 
+        if (msg.value > 0) {
+            batchersBalances[msg.sender] += msg.value;
+        }
+
+        require(batchersBalances[msg.sender] > 0, "Batcher balance is empty");
+
         BatchState memory batchState;
 
         batchState.taskCreatedBlock = uint32(block.number);
         batchState.responded = false;
+        batchState.batcherAddress = msg.sender;
 
         batchesState[batchMerkleRoot] = batchState;
 
@@ -77,6 +84,8 @@ contract AlignedLayerServiceManager is
         bytes32 batchMerkleRoot,
         NonSignerStakesAndSignature memory nonSignerStakesAndSignature
     ) external {
+        uint256 initialGasLeft = gasleft();
+
         /* CHECKING SIGNATURES & WHETHER THRESHOLD IS MET OR NOT */
 
         // Note: This is a hacky solidity way to see that the element exists
@@ -91,6 +100,12 @@ contract AlignedLayerServiceManager is
             batchesState[batchMerkleRoot].responded == false,
             "Batch already responded"
         );
+
+        require(
+            batchersBalances[batchesState[batchMerkleRoot].batcherAddress] > 0,
+            "Batcher has no balance"
+        );
+
         batchesState[batchMerkleRoot].responded = true;
 
         /* CHECKING SIGNATURES & WHETHER THRESHOLD IS MET OR NOT */
@@ -113,6 +128,24 @@ contract AlignedLayerServiceManager is
         );
 
         emit BatchVerified(batchMerkleRoot);
+
+        // Calculate estimation of gas used, check that batcher has sufficient funds
+        // 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;
+
+        require(
+            batchersBalances[batchesState[batchMerkleRoot].batcherAddress] >=
+                txCost,
+            "Batcher has not sufficient funds for paying this transaction"
+        );
+
+        batchersBalances[
+            batchesState[batchMerkleRoot].batcherAddress
+        ] -= txCost;
+        payable(msg.sender).transfer(txCost);
     }
 
     function verifyBatchInclusion(
@@ -149,4 +182,12 @@ contract AlignedLayerServiceManager is
                 verificationDataBatchIndex
             );
     }
+
+    function balanceOf(address account) public view returns (uint256) {
+        return batchersBalances[account];
+    }
+
+    receive() external payable {
+        batchersBalances[msg.sender] += msg.value;
+    }
 }
diff --git a/contracts/src/core/AlignedLayerServiceManagerStorage.sol b/contracts/src/core/AlignedLayerServiceManagerStorage.sol
@@ -1,14 +1,20 @@
+pragma solidity ^0.8.12;
+
 import "eigenlayer-middleware/interfaces/IServiceManager.sol";
 
 contract AlignedLayerServiceManagerStorage {
     struct BatchState {
         uint32 taskCreatedBlock;
         bool responded;
+        address batcherAddress;
     }
 
     /* STORAGE */
     mapping(bytes32 => BatchState) public batchesState;
 
+    // Storage for batchers balances. Used by aggregator to pay for respondToTask
+    mapping(address => uint256) internal batchersBalances;
+
     // storage gap for upgradeability
-    uint256[49] private __GAP;
-}
+    uint256[48] private __GAP;
+}
diff --git a/contracts/test/AlignedLayerServiceManager.t.sol b/contracts/test/AlignedLayerServiceManager.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.12;
 
 import "forge-std/Test.sol";
-import {stdStorage, StdStorage} from "forge-std/Test.sol"; 
+import {stdStorage, StdStorage} from "forge-std/Test.sol";
 import "../src/core/AlignedLayerServiceManager.sol";
 import {IStakeRegistry} from "eigenlayer-middleware/interfaces/IStakeRegistry.sol";
 import {IRegistryCoordinator} from "eigenlayer-middleware/interfaces/IRegistryCoordinator.sol";
@@ -24,7 +24,7 @@ contract AlignedLayerServiceManagerTest is BLSMockAVSDeployer {
 
     event BatchVerified(bytes32 batchMerkleRoot);
 
-    function setUp() virtual public {
+    function setUp() public virtual {
         _setUpBLSMockAVSDeployer();
 
         alignedLayerServiceManager = new AlignedLayerServiceManager(
@@ -42,17 +42,33 @@ contract AlignedLayerServiceManagerTest is BLSMockAVSDeployer {
     //     assertEq(alignedLayerServiceManager.isAggregator(aggregator), true);
     // }
 
-    function testCreateNewTask(string memory root, string memory batchDataPointer) public {
+    function testCreateNewTask(
+        string memory root,
+        string memory batchDataPointer
+    ) public {
         vm.assume(bytes(batchDataPointer).length > 50);
         bytes32 batchMerkleRoot = keccak256(abi.encodePacked(root));
-        // string memory batchDataPointer = "ipfs://batch1";
+
+        address batcher = address(0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266);
+        hoax(batcher, 1 ether);
+
+        // transfer to serviceManager
+        address(alignedLayerServiceManager).call{value: 0.1 ether}("");
 
         vm.expectEmit(true, true, true, true);
         emit NewBatch(batchMerkleRoot, uint32(block.number), batchDataPointer);
 
-        alignedLayerServiceManager.createNewTask{value: 0}(batchMerkleRoot, batchDataPointer);
+        vm.prank(batcher);
+        alignedLayerServiceManager.createNewTask(
+            batchMerkleRoot,
+            batchDataPointer
+        );
 
-        (uint32 taskCreatedBlock, bool responded) = alignedLayerServiceManager.batchesState(batchMerkleRoot);
+        (
+            uint32 taskCreatedBlock,
+            bool responded,
+            address batcherAddress
+        ) = alignedLayerServiceManager.batchesState(batchMerkleRoot);
 
         assertEq(taskCreatedBlock, uint32(block.number));
         assertEq(responded, false);
diff --git a/scripts/fund_batcher_balance_in_aligned_devnet.sh b/scripts/fund_batcher_balance_in_aligned_devnet.sh

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+{"pubKey":"E([2836088353050477845347925486470168020568465207212129112527815811278071168630,3160427639470623810295719163087493911148458124491004113623503371537041864385])","crypto":{"cipher":"aes-128-ctr","ciphertext":"208c421cf636f275a42ed905177703c5c33150a405dd9e1b2c7348976f85dcfe","cipherparams":{"iv":"ca35157d20418b2a5f3e08a6e36596fd"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":262144,"p":1,"r":8,"salt":"925af4285f14851f9d83eb7fc2c0ce7ca9f50aa77385519d994ee147f1410607"},"mac":"7e21f43562c4b4cd10b9fe5a149ce66ea17444167f788d6a02a67232d953c4e2"}}
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+{"address":"15d34aaf54267db7d7c367839aaf71a00a2c6a65","crypto":{"cipher":"aes-128-ctr","ciphertext":"c649f534580a3f0bf000b221afb0731052f7699298f618e79b2b99fd974c4b16","cipherparams":{"iv":"2fad203c48a2ae479673b17bf110a988"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":262144,"p":1,"r":8,"salt":"72b1c2700f1cccebc468dafecf8de51f19c969389caae7e414c74d699a21c8c4"},"mac":"f093f9d47d3b9aa19be03f2bb9ae96b8c6da7ad0a7c7c0165bdbf84c54c9e26f"},"id":"f2925fb0-b209-4210-af6d-10c44b0e4a84","version":3}`
Original file line number	Diff line number	Diff line change
`@@ -288,10 +288,10 @@`
`288`	`288`	`},`
`289`	`289`	`"0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266": {`
`290`	`290`	`"nonce": 33,`
`291`		`- "balance": "0x21e19b29e7e1ee6dc06",`
	`291`	`+ "balance": "0x21e19ba73388f8f654b",`
`292`	`292`	`"code": "0x",`
`293`	`293`	`"storage": {}`
`294`	`294`	`}`
`295`	`295`	`},`
`296`		`- "best_block_number": "0x13"`
	`296`	`+ "best_block_number": "0x1a"`
`297`	`297`	`}`