Move the payment expiration time to the config files

Author: maximopalopoli

contracts/script/deploy/AggregationModePaymentServiceDeployer.s.sol

@@ -13,12 +13,21 @@ contract AggregationModePaymentServiceDeployer is Script {
         address owner = stdJson.readAddress(configData, ".permissions.paymentServiceOwner");
         address recipient = stdJson.readAddress(configData, ".permissions.recipient");
         uint256 amountToPay = stdJson.readUint(configData, ".amounts.amountToPayInWei");
+        uint256 paymentExpirationTimeSeconds = stdJson.readUint(configData, ".amounts.paymentExpirationTimeSeconds");
 
         vm.startBroadcast();
 
         AggregationModePaymentService implementation = new AggregationModePaymentService();
-        ERC1967Proxy proxy =
-            new ERC1967Proxy(address(implementation), abi.encodeWithSignature("initialize(address,address,uint256)", owner, recipient, amountToPay));
+        ERC1967Proxy proxy = new ERC1967Proxy(
+            address(implementation),
+            abi.encodeWithSignature(
+                "initialize(address,address,uint256,uint256)",
+                owner,
+                recipient,
+                amountToPay,
+                paymentExpirationTimeSeconds
+            )
+        );
 
         vm.stopBroadcast();
 

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

@@ -10,7 +10,8 @@
     "risc0AggregationProgramImageId": "0x8908f01022827e80a5de71908c16ee44f4a467236df20f62e7c994491629d74c"
   },
   "amounts": {
-    "amountToPayInWei": 1000000000000000000
+    "amountToPayInWei": 1000000000000000000,
+    "paymentExpirationTimeSeconds": 86400
   },
   "permissions": {
     "owner": "0x14dC79964da2C08b23698B3D3cc7Ca32193d9955",

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

@@ -11,9 +11,6 @@ import {UUPSUpgradeable} from "@openzeppelin-upgrades/contracts/proxy/utils/UUPS
  * @notice Handles deposits that grant time-limited access to aggregation services.
  */
 contract AggregationModePaymentService is Initializable, OwnableUpgradeable, UUPSUpgradeable {
-    /// @notice for how much time the payment is valid in seconds (86400s = 24hs)
-    uint256 public constant PAYMENT_VALID_UNTIL_SECONDS = 86400;
-
     /// @notice for how much time the payment is valid in seconds
     uint256 public paymentExpirationTimeSeconds;
 
@@ -62,12 +59,12 @@ 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, address _paymentFundsRecipient, uint256 _amountToPayInWei) public initializer {
+    function initialize(address _owner, address _paymentFundsRecipient, uint256 _amountToPayInWei, uint256 _paymentExpirationTimeSeconds) public initializer {
         __Ownable_init();
         __UUPSUpgradeable_init();
         _transferOwnership(_owner);
 
-        paymentExpirationTimeSeconds = PAYMENT_VALID_UNTIL_SECONDS;
+        paymentExpirationTimeSeconds = _paymentExpirationTimeSeconds;
         amountToPayInWei = _amountToPayInWei;
         paymentFundsRecipient = _paymentFundsRecipient;
     }