feat: agg mode payment service contract + deployment

Author: MarcosNicolau

contracts/broadcast/AlignedProofAggregationServiceDeployer.s.sol/560048/run-latest.json

@@ -0,0 +1,34 @@
+pragma solidity ^0.8.12;
+
+import {AggregationModePaymentService} from "../../src/core/AggregationModePaymentService.sol";
+import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
+
+import "forge-std/Script.sol";
+import "forge-std/StdJson.sol";
+
+contract AggregationModePaymentServiceDeployer is Script {
+    function run(string memory configPath, string memory outputPath) external returns (address, address) {
+        string memory configData = vm.readFile(configPath);
+
+        address owner = stdJson.readAddress(configData, ".permissions.paymentServiceOwner");
+
+        vm.startBroadcast();
+
+        AggregationModePaymentService implementation = new AggregationModePaymentService();
+        ERC1967Proxy proxy =
+            new ERC1967Proxy(address(implementation), abi.encodeWithSignature("initialize(address)", owner));
+
+        vm.stopBroadcast();
+
+        string memory addresses = "addresses";
+        vm.serializeAddress(addresses, "aggregationModePaymentService", address(proxy));
+        string memory addressesStr =
+            vm.serializeAddress(addresses, "aggregationModePaymentServiceImplementation", address(implementation));
+
+        string memory parentObject = "parent";
+        string memory finalJson = vm.serializeString(parentObject, "addresses", addressesStr);
+        vm.writeJson(finalJson, outputPath);
+
+        return (address(proxy), address(implementation));
+    }
+}

contracts/script/deploy/AggregationModePaymentService.s.sol

@@ -10,6 +10,7 @@
     "risc0AggregationProgramImageId": "0xd8cfdd5410c70395c0a1af1842a0148428cc46e353355faccfba694dd4862dbf"
   },
   "permissions": {
-    "owner": "0x14dC79964da2C08b23698B3D3cc7Ca32193d9955"
+    "owner": "0x14dC79964da2C08b23698B3D3cc7Ca32193d9955",
+    "paymentServiceOwner": "0x14dC79964da2C08b23698B3D3cc7Ca32193d9955"
   }
 }

contracts/script/deploy/config/devnet/proof-aggregator-service.devnet.config.json

@@ -1,6 +1,8 @@
 {
   "addresses": {
     "alignedProofAggregationService": "0xcbEAF3BDe82155F56486Fb5a1072cb8baAf547cc",
-    "alignedProofAggregationServiceImplementation": "0xFD471836031dc5108809D173A067e8486B9047A3"
+    "alignedProofAggregationServiceImplementation": "0xFD471836031dc5108809D173A067e8486B9047A3",
+    "aggregationModePaymentService": "0x922D6956C99E12DFeB3224DEA977D0939758A1Fe",
+    "aggregationModePaymentServiceImplementation": "0x162A433068F51e18b7d13932F27e66a3f99E6890"
   }
-}
+}

contracts/script/output/devnet/proof_aggregation_service_deployment_output.json

@@ -80,10 +80,11 @@ jq '.programs_id.risc0AggregationProgramImageId = $input[0].risc0_chunk_aggregat
 
 cd contracts
 
-# Deploy proof aggregation service contract with SP1 Verifier
+# Deploy proof aggregation service contract with SP1|Risc0 Verifier
+proof_aggregation_service_output=./script/output/devnet/proof_aggregation_service_deployment_output.json
 forge script script/deploy/AlignedProofAggregationServiceDeployer.s.sol \
     ./script/deploy/config/devnet/proof-aggregator-service.devnet.config.json \
-    ./script/output/devnet/proof_aggregation_service_deployment_output.json \
+    $proof_aggregation_service_output \
     --rpc-url "http://localhost:8545" \
     --private-key "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80" \
     --broadcast \
@@ -100,5 +101,32 @@ forge script script/deploy/AlignedProofAggregationServiceDeployer.s.sol \
     --sig "run(string configPath, string outputPath)" \
     --via-ir
 
+# Deploy Aggregation mode payment service
+aggregation_mode_payment_service_output=./script/output/devnet/aggregation_mode_payment_service_deployment_output.json
+proof_aggregation_service_temp1=$proof_aggregation_service_output.temp1.json
+proof_aggregation_service_temp2=$proof_aggregation_service_output.temp2.json
+
+forge script script/deploy/AggregationModePaymentService.s.sol \
+    ./script/deploy/config/devnet/proof-aggregator-service.devnet.config.json \
+    $aggregation_mode_payment_service_output \
+    --rpc-url "http://localhost:8545" \
+    --private-key "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80" \
+    --broadcast \
+    --sig "run(string configPath, string outputPath)"
+
+aggregation_mode_payment_service_proxy=$(jq -r '.addresses.aggregationModePaymentService' $aggregation_mode_payment_service_output)
+aggregation_mode_payment_service_implementation=$(jq -r '.addresses.aggregationModePaymentServiceImplementation' $aggregation_mode_payment_service_output)
+
+jq --arg aggregation_mode_payment_service "$aggregation_mode_payment_service_proxy" \
+  '.addresses.aggregationModePaymentService = $aggregation_mode_payment_service' \
+  "$proof_aggregation_service_output" > "$proof_aggregation_service_temp1"
+
+jq --arg aggregation_mode_payment_service_implementation "$aggregation_mode_payment_service_implementation" \
+  '.addresses.aggregationModePaymentServiceImplementation = $aggregation_mode_payment_service_implementation' \
+  "$proof_aggregation_service_temp1" > "$proof_aggregation_service_temp2"
+
+mv "$proof_aggregation_service_temp2" "$proof_aggregation_service_output"
+rm -f "$aggregation_mode_payment_service_output" "$proof_aggregation_service_temp1" "$proof_aggregation_service_temp2"
+
 # Kill the anvil process to save state
 pkill anvil

contracts/scripts/anvil/deploy_aligned_contracts.sh

@@ -0,0 +1,41 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.12;
+
+import {Initializable} from "@openzeppelin-upgrades/contracts/proxy/utils/Initializable.sol";
+import {OwnableUpgradeable} from "@openzeppelin-upgrades/contracts/access/OwnableUpgradeable.sol";
+import {UUPSUpgradeable} from "@openzeppelin-upgrades/contracts/proxy/utils/UUPSUpgradeable.sol";
+
+contract AggregationModePaymentService is Initializable, OwnableUpgradeable, UUPSUpgradeable {
+    // 24hs
+    uint256 constant paymentValidUntilSeconds = 86400;
+
+    event UserPayment(address user, uint256 amount, uint256 from, uint256 until);
+
+    error InvalidDepositAmount(uint256 amount);
+
+    constructor() {
+        _disableInitializers();
+    }
+
+    function initialize(address _owner) public initializer {
+        __Ownable_init();
+        __UUPSUpgradeable_init();
+        _transferOwnership(_owner);
+    }
+
+    function _authorizeUpgrade(address newImplementation)
+        internal
+        override
+        onlyOwner // solhint-disable-next-line no-empty-blocks
+    {}
+
+    receive() external payable {
+        uint256 amount = msg.value;
+
+        if (amount < 1) {
+            revert InvalidDepositAmount(amount);
+        }
+
+        emit UserPayment(msg.sender, amount, block.timestamp, block.timestamp + paymentValidUntilSeconds * amount);
+    }
+}