StandardSubscription

contracts/contracts/coordination/GlobalAllowList.sol

@@ -4,6 +4,7 @@ pragma solidity ^0.8.0;
 
 import "@openzeppelin/contracts/utils/cryptography/MessageHashUtils.sol";
 import "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
+import "@openzeppelin-upgradeable/contracts/proxy/utils/Initializable.sol";
 import "../lib/LookupKey.sol";
 import "./IEncryptionAuthorizer.sol";
 import "./Coordinator.sol";
@@ -12,7 +13,7 @@ import "./Coordinator.sol";
  * @title GlobalAllowList
  * @notice Manages a global allow list of addresses that are authorized to decrypt ciphertexts.
  */
-contract GlobalAllowList is IEncryptionAuthorizer {
+contract GlobalAllowList is IEncryptionAuthorizer, Initializable {
     using MessageHashUtils for bytes32;
     using ECDSA for bytes32;
 
@@ -45,6 +46,7 @@ contract GlobalAllowList is IEncryptionAuthorizer {
         require(address(_coordinator) != address(0), "Contracts cannot be zero addresses");
         require(_coordinator.numberOfRituals() >= 0, "Invalid coordinator");
         coordinator = _coordinator;
+        _disableInitializers();
     }
 
     /**

contracts/contracts/coordination/subscription/BqETHSubscription.sol → contracts/contracts/coordination/subscription/StandardSubscription.sol

@@ -10,10 +10,10 @@ import "./EncryptorSlotsSubscription.sol";
 import "../GlobalAllowList.sol";
 
 /**
- * @title BqETH Subscription
+ * @title StandardSubscription
  * @notice Manages the subscription information for rituals.
  */
-contract BqETHSubscription is EncryptorSlotsSubscription, Initializable, OwnableUpgradeable {
+contract StandardSubscription is EncryptorSlotsSubscription, Initializable, OwnableUpgradeable {
     using SafeERC20 for IERC20;
 
     struct Billing {

contracts/test/BqETHSubscriptionTestSet.sol → contracts/test/StandardSubscriptionTestSet.sol

@@ -6,7 +6,7 @@ import "../contracts/coordination/IEncryptionAuthorizer.sol";
 import "../contracts/coordination/Coordinator.sol";
 import "../contracts/coordination/IFeeModel.sol";
 
-contract CoordinatorForBqETHSubscriptionMock {
+contract CoordinatorForStandardSubscriptionMock {
     struct Ritual {
         uint32 endTimestamp;
         IEncryptionAuthorizer accessController;

deployment/artifacts/lynx.json

@@ -2550,7 +2550,7 @@
         }
     },
     "80002": {
-        "BqETHSubscription": {
+        "StandardSubscription": {
             "address": "0x3E851204c29742b713d5C243093E98691591e654",
             "abi": [
                 {