Add a withdrawal method to send the funds to a recipient

Author: maximopalopoli

contracts/script/deploy/AggregationModePaymentServiceDeployer.s.sol

@@ -11,12 +11,13 @@ contract AggregationModePaymentServiceDeployer is Script {
         string memory configData = vm.readFile(configPath);
 
         address owner = stdJson.readAddress(configData, ".permissions.paymentServiceOwner");
+        address recipient = stdJson.readAddress(configData, ".permissions.recipient");
 
         vm.startBroadcast();
 
         AggregationModePaymentService implementation = new AggregationModePaymentService();
         ERC1967Proxy proxy =
-            new ERC1967Proxy(address(implementation), abi.encodeWithSignature("initialize(address)", owner));
+            new ERC1967Proxy(address(implementation), abi.encodeWithSignature("initialize(address,address)", owner, recipient));
 
         vm.stopBroadcast();
 

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

@@ -11,6 +11,7 @@
   },
   "permissions": {
     "owner": "0x14dC79964da2C08b23698B3D3cc7Ca32193d9955",
-    "paymentServiceOwner": "0x14dC79964da2C08b23698B3D3cc7Ca32193d9955"
+    "paymentServiceOwner": "0x14dC79964da2C08b23698B3D3cc7Ca32193d9955",
+    "recipient": "0x23618e81E3f5cdF7f54C3d65f7FBc0aBf5B21E8f"
   }
 }

contracts/src/core/AggregationModePaymentService.sol

@@ -20,6 +20,9 @@ contract AggregationModePaymentService is Initializable, OwnableUpgradeable, UUP
     /// @notice The amount to pay for a subscription in wei.
     uint256 public amountToPayInWei;
 
+    /// @notice The address where the payment funds will be sent.
+    address public paymentFundsRecipient;
+
     /**
      * @notice Emitted when a user deposits funds to purchase service time.
      * @param user Address that sent the payment.
@@ -33,10 +36,19 @@ contract AggregationModePaymentService is Initializable, OwnableUpgradeable, UUP
     /// @param newExpirationTime the new expiration time in seconds
     event PaymentExpirationTimeUpdated(uint256 indexed newExpirationTime);
 
-    /// @notice Event emitted when the payment expiration time is updated
+    /// @notice Event emitted when the amount to pay for subscription is updated
     /// @param newAmountToPay the new amount to pay for a subscription in wei.
     event AmountToPayUpdated(uint256 indexed newAmountToPay);
 
+    /// @notice Event emitted when the funds recipient is updated
+    /// @param newFundsRecipient the new address for receiving the funds on withdrawal.
+    event FundsRecipientUpdated(address indexed newFundsRecipient);
+
+    /// @notice Event emitted when the balance is withdrawn to the recipient address
+    /// @param recipient the address where the funds will be sent
+    /// @param amount the amont send to the recipient address
+    event FundsWithdrawn(address indexed recipient, uint256 amount);
+
     error InvalidDepositAmount(uint256 amountReceived, uint256 amountRequired);
 
     /**
@@ -50,13 +62,14 @@ contract AggregationModePaymentService is Initializable, OwnableUpgradeable, UUP
      * @notice Initializes the contract and transfers ownership to the provided address.
      * @param _owner Address that becomes the contract owner.
      */
-    function initialize(address _owner) public initializer {
+    function initialize(address _owner, address _paymentFundsRecipient) public initializer {
         __Ownable_init();
         __UUPSUpgradeable_init();
         _transferOwnership(_owner);
 
         paymentExpirationTimeSeconds = PAYMENT_VALID_UNTIL_SECONDS;
         amountToPayInWei = 1000000000000000000; // 1 ETH
+        paymentFundsRecipient = _paymentFundsRecipient;
     }
 
     /**
@@ -70,7 +83,7 @@ contract AggregationModePaymentService is Initializable, OwnableUpgradeable, UUP
     {}
 
     /**
-     * @notice Ensures only the owner can authorize upgrades.
+     * @notice Sets the new expiration time. Only callable by the owner
      * @param newExpirationTimeInSeconds The new expiration time for the users payments in seconds.
      */
     function setPaymentExpirationTimeSeconds(uint256 newExpirationTimeInSeconds) public onlyOwner() {
@@ -80,7 +93,17 @@ contract AggregationModePaymentService is Initializable, OwnableUpgradeable, UUP
     }
 
     /**
-     * @notice Ensures only the owner can authorize upgrades.
+     * @notice Sets the new amount to pay. Only callable by the owner
+     * @param newRecipient The new address for receiving the funds on withdrawal.
+     */
+    function setFundsRecipientAddress(address newRecipient) public onlyOwner() {
+        paymentFundsRecipient = newRecipient;
+
+        emit FundsRecipientUpdated(newRecipient);
+    }
+
+    /**
+     * @notice Sets the new amount to pay. Only callable by the owner
      * @param newAmountToPay The new amount to pay for subscription in wei.
      */
     function setAmountToPay(uint256 newAmountToPay) public onlyOwner() {
@@ -101,4 +124,13 @@ contract AggregationModePaymentService is Initializable, OwnableUpgradeable, UUP
 
         emit UserPayment(msg.sender, amount, block.timestamp, block.timestamp + paymentExpirationTimeSeconds);
     }
+
+    /**
+     * @notice Withdraws the contract balance to the recipient address.
+     */
+    function withdraw() external onlyOwner {
+        uint256 balance = address(this).balance;
+        payable(paymentFundsRecipient).transfer(balance);
+        emit FundsWithdrawn(paymentFundsRecipient, balance);
+    }
 }