@etherisc/gif-next 3.0.0-f060b81-534 → 3.0.0-f142263-886

package/contracts/examples/crop/Location.sol

@@ -0,0 +1,50 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.20;
+
+type Location is uint64;
+
+using {
+    LocationLib.latitude,
+    LocationLib.longitude
+} for Location global;
+
+library LocationLib {
+
+    error ErrorLatitudeInvalid(int32 amount);
+    error ErrorLongitudeInvalid(int32 amount);
+
+    int32 public constant LATITUDE_MIN = -90000000;
+    int32 public constant LATITUDE_MAX = 90000000;
+    int32 public constant LONGITUDE_MIN = -180000000;
+    int32 public constant LONGITUDE_MAX = 180000000;
+
+    // Constants for bit manipulation
+    int64 public constant LATITUDE_MASK = int64(0x7FFFFFF);
+    int64 public constant LONGITUDE_MASK = int64(0xFFFFFFF);
+
+    function zero() public pure returns (Location) {
+        return Location.wrap(0);
+    }
+
+    function toLocation(int32 latitude, int32 longitude) public pure returns (Location) {
+        if (latitude < LATITUDE_MIN || latitude > LATITUDE_MAX) revert ErrorLatitudeInvalid(latitude);
+        if (longitude < LONGITUDE_MIN || longitude > LONGITUDE_MAX) revert ErrorLongitudeInvalid(longitude);
+        
+        uint32 latPacked = uint32(latitude);
+        uint32 longPacked = uint32(longitude);   
+        // uint64 packed = (uint64(latPacked) << 32) | uint64(longPacked);
+        return Location.wrap((uint64(latPacked) << 32) | uint64(longPacked));
+    }
+
+    function latitude(Location location) public pure returns (int32) {
+        return int32(uint32(Location.unwrap(location) >> 32));
+    }
+
+    function longitude(Location location) public pure returns (int32) {
+        return int32(uint32(Location.unwrap(location) & 0xFFFFFFFF));
+    }
+
+    function decimals() public pure returns (uint8) {
+        return uint8(6);
+    }
+}

package/contracts/examples/flight/FlightOracle.sol

@@ -3,11 +3,10 @@ pragma solidity ^0.8.20;
 
 import {IAuthorization} from "../../authorization/IAuthorization.sol";
 
-import {ACTIVE, FULFILLED, FAILED} from "../../type/StateId.sol";
+import {ACTIVE, FAILED} from "../../type/StateId.sol";
 import {NftId} from "../../type/NftId.sol";
 import {BasicOracle} from "../../oracle/BasicOracle.sol";
 import {RequestId} from "../../type/RequestId.sol";
-import {LibRequestIdSet} from "../../type/RequestIdSet.sol";
 import {RiskId} from "../../type/RiskId.sol";
 import {StateId} from "../../type/StateId.sol";
 import {Str} from "../../type/String.sol";
@@ -33,9 +32,6 @@ contract FlightOracle is
     event LogFlightOracleResponseSent(RequestId requestId, bytes1 status, int256 delay);
     event LogFlightOracleRequestCancelled(RequestId requestId);
 
-    // TODO decide if this variable should be moved to instance store
-    // if so it need to manage active requests by requestor nft id
-    LibRequestIdSet.Set internal _activeRequests;
 
 
     constructor(
@@ -99,52 +95,10 @@ contract FlightOracle is
 
         // effects + interaction (via framework to receiving component)
         _respond(requestId, responseData);
-
-        // TODO decide if the code below should be moved to GIF
-        _updateRequestState(requestId);
-    }
-
-
-    function updateRequestState(
-        RequestId requestId
-    )
-        external
-        restricted()
-    {
-        _updateRequestState(requestId);
     }
 
     //--- view functions ----------------------------------------------------//
 
-    // TODO decide if the code below should be moved to GIF
-    function activeRequests()
-        external
-        view
-        returns(uint256 numberOfRequests)
-    {
-        return LibRequestIdSet.size(_activeRequests);
-    }
-
-
-    // TODO decide if the code below should be moved to GIF
-    function getActiveRequest(uint256 idx)
-        external
-        view
-        returns(RequestId requestId)
-    {
-        return LibRequestIdSet.getElementAt(_activeRequests, idx);
-    }
-
-
-    function isActiveRequest(RequestId requestId)
-        external
-        view
-        returns(bool isActive)
-    {
-        return LibRequestIdSet.contains(_activeRequests, requestId);
-    }
-
-
     function getRequestState(RequestId requestId)
         external
         view
@@ -172,55 +126,4 @@ contract FlightOracle is
         return abi.decode(data, (FlightStatusRequest));
     }
 
-    //--- internal functions ------------------------------------------------//
-
-
-    // TODO decide if the code below should be moved to GIF
-    // check callback result
-    function _updateRequestState(
-        RequestId requestId
-    )
-        internal
-    {
-        bool requestFulfilled = _getInstanceReader().getRequestState(
-            requestId) == FULFILLED();
-
-        // remove from active requests when successful
-        if (requestFulfilled && LibRequestIdSet.contains(_activeRequests, requestId)) {
-            LibRequestIdSet.remove(_activeRequests, requestId);
-        } 
-    }
-
-
-    /// @dev use case specific handling of oracle requests
-    /// for now only log is emitted to verify that request has been received by oracle component 
-    function _request(
-        RequestId requestId,
-        NftId requesterId,
-        bytes calldata requestData,
-        Timestamp expiryAt
-    )
-        internal
-        virtual override
-    {
-        FlightStatusRequest memory request = abi.decode(requestData, (FlightStatusRequest));
-
-        // TODO decide if the line below should be moved to GIF
-        LibRequestIdSet.add(_activeRequests, requestId);
-        emit LogFlightOracleRequestReceived(requestId, requesterId);
-    }
-
-
-    /// @dev use case specific handling of oracle requests
-    /// for now only log is emitted to verify that cancelling has been received by oracle component 
-    function _cancel(
-        RequestId requestId
-    )
-        internal
-        virtual override
-    {
-        // TODO decide if the line below should be moved to GIF
-        LibRequestIdSet.remove(_activeRequests, requestId);
-        emit LogFlightOracleRequestCancelled(requestId);
-    }
 }

package/contracts/examples/flight/FlightOracleAuthorization.sol

@@ -49,9 +49,8 @@ contract FlightOracleAuthorization
         functions = _authorizeForTarget(getMainTargetName(), STATUS_PROVIDER_ROLE);
         _authorize(functions, FlightOracle.respondWithFlightStatus.selector, "respondWithFlightStatus");
 
-        // authorize public role (additional authz via onlyOwner)
-        functions = _authorizeForTarget(getMainTargetName(), PUBLIC_ROLE());
-        _authorize(functions, FlightOracle.updateRequestState.selector, "updateRequestState");
+        // // authorize public role (additional authz via onlyOwner)
+        // functions = _authorizeForTarget(getMainTargetName(), PUBLIC_ROLE());
     }
 }
 

package/contracts/instance/BundleSet.sol

@@ -14,13 +14,12 @@ contract BundleSet is
 {
     using LibNftIdSet for LibNftIdSet.Set;
 
-    event LogBundleSetPolicyLinked(NftId bundleNftId, NftId policyNftId);
-    event LogBundleSetPolicyUnlinked(NftId bundleNftId, NftId policyNftId);
+    event LogBundleSetPolicyLinked(NftId indexed bundleNftId, NftId indexed policyNftId);
+    event LogBundleSetPolicyUnlinked(NftId indexed bundleNftId, NftId indexed policyNftId);
 
-    event LogBundleSetBundleAdded(NftId poolNftId, NftId bundleNftId);
-    event LogBundleSetBundleUnlocked(NftId poolNftId, NftId bundleNftId);
-    event LogBundleSetBundleLocked(NftId poolNftId, NftId bundleNftId);
-    event LogBundleSetBundleClosed(NftId poolNftId, NftId bundleNftId);
+    event LogBundleSetBundleAdded(NftId indexed poolNftId, NftId indexed bundleNftId);
+    event LogBundleSetBundleLocked(NftId indexed poolNftId, NftId indexed bundleNftId, bool locked);
+    event LogBundleSetBundleClosed(NftId indexed poolNftId, NftId indexed bundleNftId);
 
     error ErrorBundleSetPolicyAlreadyActivated(NftId policyNftId);
     error ErrorBundleSetBundleLocked(NftId bundleNftId, NftId policyNftId);
@@ -76,14 +75,14 @@ contract BundleSet is
     function unlock(NftId bundleNftId) external restricted() {
         NftId poolNftId = ObjectSetHelperLib.getPoolNftId(_instanceAddress, bundleNftId);
         _activate(poolNftId, _toBundleKey32(bundleNftId));
-        emit LogBundleSetBundleUnlocked(poolNftId, bundleNftId);
+        emit LogBundleSetBundleLocked(poolNftId, bundleNftId, false);
     }
 
     /// @dev locked (deactivated) bundles may not collateralize any new policies
     function lock(NftId bundleNftId) external restricted() {
         NftId poolNftId = ObjectSetHelperLib.getPoolNftId(_instanceAddress, bundleNftId);
         _deactivate(poolNftId, _toBundleKey32(bundleNftId));
-        emit LogBundleSetBundleLocked(poolNftId, bundleNftId);
+        emit LogBundleSetBundleLocked(poolNftId, bundleNftId, true);
     }
 
 

package/contracts/instance/IInstance.sol

@@ -12,6 +12,7 @@ import {InstanceReader} from "./InstanceReader.sol";
 import {InstanceStore} from "./InstanceStore.sol";
 import {NftId} from "../type/NftId.sol";
 import {ProductStore} from "./ProductStore.sol";
+import {RequestSet} from "./RequestSet.sol";
 import {RoleId} from "../type/RoleId.sol";
 import {Seconds} from "../type/Seconds.sol";
 import {UFixed} from "../type/UFixed.sol";
@@ -21,15 +22,15 @@ interface IInstance is
     IRegisterable
 {
     // role handling
-    event LogInstanceCustomRoleCreated(RoleId roleId, string roleName, RoleId adminRoleId, uint32 maxMemberCount);
-    event LogInstanceCustomRoleActiveSet(RoleId roleId, bool active, address caller);
-    event LogInstanceCustomRoleGranted(RoleId roleId, address account, address caller);
-    event LogInstanceCustomRoleRevoked(RoleId roleId, address account, address caller);
+    event LogInstanceCustomRoleCreated(RoleId indexed roleId, string indexed roleName, RoleId indexed adminRoleId, uint32 maxMemberCount);
+    event LogInstanceCustomRoleActiveSet(RoleId indexed roleId, bool indexed active, address indexed caller);
+    event LogInstanceCustomRoleGranted(RoleId indexed roleId, address indexed account, address indexed caller);
+    event LogInstanceCustomRoleRevoked(RoleId indexed roleId, address indexed account, address indexed caller);
 
     // target handling
-    event LogInstanceCustomTargetCreated(address target, RoleId targetRoleId, string name);
-    event LogInstanceTargetLocked(address target, bool locked);
-    event LogInstanceCustomTargetFunctionRoleSet(address target, bytes4[] selectors, RoleId roleId);
+    event LogInstanceCustomTargetCreated(address indexed target, RoleId indexed targetRoleId, string indexed name);
+    event LogInstanceTargetLocked(address indexed target, bool indexed locked);
+    event LogInstanceCustomTargetFunctionRoleSet(address indexed target, bytes4[] selectors, RoleId indexed roleId);
 
     // modifier is onlyRoleAdmin
     error ErrorInstanceNotCustomRole(RoleId roleId);
@@ -58,6 +59,7 @@ interface IInstance is
         ProductStore productStore;
         BundleSet bundleSet;
         RiskSet riskSet;
+        RequestSet requestSet;
         InstanceReader instanceReader;
     }
 
@@ -149,6 +151,7 @@ interface IInstance is
     function getInstanceReader() external view returns (InstanceReader);
     function getBundleSet() external view returns (BundleSet);
     function getRiskSet() external view returns (RiskSet);
+    function getRequestSet() external view returns (RequestSet);
     function getInstanceAdmin() external view returns (InstanceAdmin);
     function getInstanceStore() external view returns (InstanceStore);
     function getProductStore() external view returns (ProductStore);

package/contracts/instance/IInstanceService.sol

@@ -26,6 +26,7 @@ interface IInstanceService is IService {
     error ErrorInstanceServiceMasterInstanceAdminAlreadySet();
     error ErrorInstanceServiceMasterBundleSetAlreadySet();
     error ErrorInstanceServiceMasterRiskSetAlreadySet();
+    error ErrorInstanceServiceMasterRequestSetAlreadySet();
     error ErrorInstanceServiceInstanceAddressZero();
 
     error ErrorInstanceServiceMasterInstanceReaderNotSet();
@@ -38,15 +39,18 @@ interface IInstanceService is IService {
     error ErrorInstanceServiceInstanceReaderZero();
     error ErrorInstanceServiceBundleSetZero();
     error ErrorInstanceServiceRiskSetZero();
+    error ErrorInstanceServiceRequestSetZero();
     error ErrorInstanceServiceInstanceStoreZero();
     error ErrorInstanceServiceProductStoreZero();
 
     error ErrorInstanceServiceInstanceAuthorityMismatch();
     error ErrorInstanceServiceBundleSetAuthorityMismatch();
     error ErrorInstanceServiceRiskSetAuthorityMismatch();
+    error ErrorInstanceServiceRequestSetAuthorityMismatch();
     error ErrorInstanceServiceInstanceReaderInstanceMismatch2();
     error ErrorInstanceServiceBundleSetInstanceMismatch();
     error ErrorInstanceServiceRiskSetInstanceMismatch();
+    error ErrorInstanceServiceRequestSetInstanceMismatch();
     error ErrorInstanceServiceInstanceStoreAuthorityMismatch();
     error ErrorInstanceServiceProductStoreAuthorityMismatch();
 
@@ -56,12 +60,13 @@ interface IInstanceService is IService {
     error ErrorInstanceServiceInstanceComponentMismatch(NftId instanceNftId, NftId componentNftId);
     error ErrorInstanceServiceInvalidComponentType(address componentAddress, ObjectType expectedType, ObjectType componentType);
     
-    event LogInstanceServiceInstanceLocked(NftId instanceNftId, bool locked);
-    event LogInstanceServiceInstanceCreated(NftId instanceNftId, address instance);
-    event LogInstanceServiceMasterInstanceRegistered(NftId masterInstanceNftId, address masterInstance, address masterInstanceAdmin, address masterAccessManager, 
-                address masterInstanceReader, address masterInstanceBundleSet, address masterInstanceRiskSet, address masterInstanceStore, address masterProductStore);
-    event LogInstanceServiceMasterInstanceReaderUpgraded(NftId instanceNfId, address newInstanceReader);
-    event LogInstanceServiceInstanceReaderUpgraded(NftId instanceNfId, address newInstanceReader);
+
+    event LogInstanceServiceInstanceLocked(NftId indexed instanceNftId, bool indexed locked);
+    event LogInstanceServiceInstanceCreated(NftId indexed instanceNftId, address indexed instance);
+    event LogInstanceServiceMasterInstanceRegistered(NftId indexed masterInstanceNftId, address indexed masterInstance, address indexed masterInstanceAdmin, address masterAccessManager, 
+                address masterInstanceReader, address masterInstanceBundleSet, address masterInstanceRiskSet, address masterInstanceRequestSet, address masterInstanceStore, address masterProductStore);
+    event LogInstanceServiceMasterInstanceReaderUpgraded(NftId indexed instanceNfId, address indexed oldInstanceReader, address indexed newInstanceReader);
+    event LogInstanceServiceInstanceReaderUpgraded(NftId indexed instanceNfId, address indexed oldInstanceReader, address indexed newInstanceReader);
 
     /// @dev Creates a new custom role for the calling instance.
     function createRole(string memory roleName, RoleId adminRoleId, uint32 maxMemberCount) external returns (RoleId roleId);

package/contracts/instance/Instance.sol

@@ -17,6 +17,7 @@ import {InstanceStore} from "./InstanceStore.sol";
 import {NftId} from "../type/NftId.sol";
 import {ProductStore} from "./ProductStore.sol";
 import {Registerable} from "../shared/Registerable.sol";
+import {RequestSet} from "./RequestSet.sol";
 import {RoleId} from "../type/RoleId.sol";
 import {Seconds} from "../type/Seconds.sol";
 import {UFixed} from "../type/UFixed.sol";
@@ -35,6 +36,7 @@ contract Instance is
     InstanceReader internal _instanceReader;
     BundleSet internal _bundleSet;
     RiskSet internal _riskSet;
+    RequestSet internal _requestSet;
     InstanceStore internal _instanceStore;
     ProductStore internal _productStore;
     NftId [] internal _products;
@@ -88,6 +90,7 @@ contract Instance is
         _productStore = instanceContracts.productStore;
         _bundleSet = instanceContracts.bundleSet;
         _riskSet = instanceContracts.riskSet;
+        _requestSet = instanceContracts.requestSet;
         _instanceReader = instanceContracts.instanceReader;
 
         // initialize instance supporting contracts
@@ -95,6 +98,7 @@ contract Instance is
         _productStore.initialize();
         _bundleSet.initialize(instanceContracts.instanceAdmin.authority(), address(registry));
         _riskSet.initialize(instanceContracts.instanceAdmin.authority(), address(registry));
+        _requestSet.initialize(instanceContracts.instanceAdmin.authority(), address(registry));
         _instanceReader.initialize();
 
         _componentService = IComponentService(
@@ -333,6 +337,10 @@ contract Instance is
         return _riskSet;
     }
 
+    function getRequestSet() external view returns (RequestSet) {
+        return _requestSet;
+    }
+
     function getInstanceAdmin() external view returns (InstanceAdmin) {
         return _instanceAdmin;
     }

package/contracts/instance/InstanceAdmin.sol

@@ -13,7 +13,7 @@ import {ObjectType, INSTANCE} from "../type/ObjectType.sol";
 import {RoleId, ADMIN_ROLE} from "../type/RoleId.sol";
 import {Str} from "../type/String.sol";
 import {VersionPart} from "../type/Version.sol";
-import {INSTANCE_TARGET_NAME, INSTANCE_ADMIN_TARGET_NAME, INSTANCE_STORE_TARGET_NAME, PRODUCT_STORE_TARGET_NAME, BUNDLE_SET_TARGET_NAME, RISK_SET_TARGET_NAME} from "./TargetNames.sol";
+import {INSTANCE_TARGET_NAME, INSTANCE_ADMIN_TARGET_NAME, INSTANCE_STORE_TARGET_NAME, PRODUCT_STORE_TARGET_NAME, BUNDLE_SET_TARGET_NAME, RISK_SET_TARGET_NAME, REQUEST_SET_TARGET_NAME} from "./TargetNames.sol";
 
 
 contract InstanceAdmin is
@@ -123,6 +123,7 @@ contract InstanceAdmin is
         _createInstanceTarget(address(_instance.getProductStore()), PRODUCT_STORE_TARGET_NAME); 
         _createInstanceTarget(address(_instance.getBundleSet()), BUNDLE_SET_TARGET_NAME); 
         _createInstanceTarget(address(_instance.getRiskSet()), RISK_SET_TARGET_NAME); 
+        _createInstanceTarget(address(_instance.getRequestSet()), REQUEST_SET_TARGET_NAME); 
     }
 
 

package/contracts/instance/InstanceAuthorizationV3.sol

@@ -10,9 +10,10 @@ import {ACCOUNTING, ORACLE, POOL, INSTANCE, COMPONENT, DISTRIBUTION, APPLICATION
 import {BundleSet} from "../instance/BundleSet.sol";
 import {InstanceAdmin} from "../instance/InstanceAdmin.sol";
 import {InstanceStore} from "../instance/InstanceStore.sol";
-import {INSTANCE_TARGET_NAME, INSTANCE_ADMIN_TARGET_NAME, INSTANCE_STORE_TARGET_NAME, PRODUCT_STORE_TARGET_NAME, BUNDLE_SET_TARGET_NAME, RISK_SET_TARGET_NAME} from "./TargetNames.sol";
+import {INSTANCE_TARGET_NAME, INSTANCE_ADMIN_TARGET_NAME, INSTANCE_STORE_TARGET_NAME, PRODUCT_STORE_TARGET_NAME, BUNDLE_SET_TARGET_NAME, RISK_SET_TARGET_NAME, REQUEST_SET_TARGET_NAME} from "./TargetNames.sol";
 import {ProductStore} from "../instance/ProductStore.sol";
 import {ADMIN_ROLE, INSTANCE_OWNER_ROLE, PUBLIC_ROLE} from "../type/RoleId.sol";
+import {RequestSet} from "../instance/RequestSet.sol";
 import {RiskSet} from "../instance/RiskSet.sol"; 
 
 
@@ -71,6 +72,7 @@ contract InstanceAuthorizationV3
           _addInstanceTarget(PRODUCT_STORE_TARGET_NAME);
           _addInstanceTarget(BUNDLE_SET_TARGET_NAME);
           _addInstanceTarget(RISK_SET_TARGET_NAME);
+          _addInstanceTarget(REQUEST_SET_TARGET_NAME);
      }
 
 
@@ -84,6 +86,18 @@ contract InstanceAuthorizationV3
           _setupProductStoreAuthorization();
           _setupBundleSetAuthorization();
           _setUpRiskSetAuthorization();
+          _setUpRequestIdSetAuthorization();
+     }
+
+     function _setUpRequestIdSetAuthorization()
+          internal
+     {
+          IAccess.FunctionInfo[] storage functions;
+
+          // authorize oracle service role
+          functions = _authorizeForTarget(REQUEST_SET_TARGET_NAME, getServiceRole(ORACLE()));
+          _authorize(functions, RequestSet.add.selector, "add");
+          _authorize(functions, RequestSet.remove.selector, "remove");
      }
 
 

package/contracts/instance/InstanceReader.sol

@@ -30,6 +30,7 @@ import {PolicyServiceLib} from "../product/PolicyServiceLib.sol";
 import {ProductStore} from "./ProductStore.sol";
 import {ReferralId, ReferralStatus, ReferralLib} from "../type/Referral.sol";
 import {RequestId} from "../type/RequestId.sol";
+import {RequestSet} from "./RequestSet.sol";
 import {RiskId} from "../type/RiskId.sol";
 import {RiskSet} from "./RiskSet.sol";
 import {RoleId, INSTANCE_OWNER_ROLE} from "../type/RoleId.sol";
@@ -56,6 +57,7 @@ contract InstanceReader {
     ProductStore internal _productStore;
     BundleSet internal _bundleSet;
     RiskSet internal _riskSet;
+    RequestSet internal _requestSet;
     IDistributionService internal _distributionService;
 
     /// @dev This initializer needs to be called from the instance itself.
@@ -85,6 +87,7 @@ contract InstanceReader {
         _productStore = _instance.getProductStore();
         _bundleSet = _instance.getBundleSet();
         _riskSet = _instance.getRiskSet();
+        _requestSet = _instance.getRequestSet();
         _distributionService = IDistributionService(_registry.getServiceAddress(DISTRIBUTION(), _instance.getRelease()));
     }
 
@@ -366,6 +369,18 @@ contract InstanceReader {
         return getState(requestId.toKey32());
     }
 
+    function getActiveRequests(NftId oracleNftId) external view returns(uint256 numberOfRequests) {
+        return _requestSet.activeRequests(oracleNftId);
+    }
+
+    function getActiveRequestAt(NftId oracleNftId, uint256 idx) external view returns(RequestId requestId) {
+        return _requestSet.activeRequestAt(oracleNftId, idx);
+    }
+
+    function isRequestActive(NftId oracleNftId, RequestId requestId) external view returns(bool isActive) {
+        return _requestSet.contains(oracleNftId, requestId);
+    }
+
     //--- pool functions -----------------------------------------------------------//
 
     /// @dev Returns the pool info for the given pool NFT ID.

package/contracts/instance/InstanceService.sol

@@ -22,6 +22,7 @@ import {InstanceStore} from "./InstanceStore.sol";
 import {NftId} from "../type/NftId.sol";
 import {ObjectType, INSTANCE, COMPONENT, INSTANCE, REGISTRY, STAKING} from "../type/ObjectType.sol";
 import {ProductStore} from "./ProductStore.sol";
+import {RequestSet} from "./RequestSet.sol";
 import {RiskSet} from "./RiskSet.sol";
 import {RoleId} from "../type/RoleId.sol";
 import {Seconds} from "../type/Seconds.sol";
@@ -49,6 +50,7 @@ contract InstanceService is
     address internal _masterInstanceReader;
     address internal _masterInstanceBundleSet;
     address internal _masterInstanceRiskSet;
+    address internal _masterInstanceRequestSet;
     address internal _masterInstanceStore;
     address internal _masterProductStore;
 
@@ -304,11 +306,13 @@ contract InstanceService is
         InstanceReader upgradedInstanceReaderClone = InstanceReader(
             Clones.clone(address(_masterInstanceReader)));
 
+        address oldInstanceReaderAddress = address(instance.getInstanceReader());
         upgradedInstanceReaderClone.initializeWithInstance(instanceAddress);
         instance.setInstanceReader(upgradedInstanceReaderClone);
 
         emit LogInstanceServiceInstanceReaderUpgraded(
             getRegistry().getNftIdForAddress(instanceAddress),
+            oldInstanceReaderAddress,
             address(upgradedInstanceReaderClone));
     }
 
@@ -323,49 +327,70 @@ contract InstanceService is
         if(_masterInstanceAdmin != address(0)) { revert ErrorInstanceServiceMasterInstanceAdminAlreadySet(); }
         if(_masterInstanceBundleSet != address(0)) { revert ErrorInstanceServiceMasterBundleSetAlreadySet(); }
         if(_masterInstanceRiskSet != address(0)) { revert ErrorInstanceServiceMasterRiskSetAlreadySet(); }
+        if(_masterInstanceRequestSet != address(0)) { revert ErrorInstanceServiceMasterRequestSetAlreadySet(); }
         if(instanceAddress == address(0)) { revert ErrorInstanceServiceInstanceAddressZero(); }
 
         {
             IInstance instance = IInstance(instanceAddress);
             address accessManagerAddress = instance.authority();
             InstanceAdmin instanceAdmin = instance.getInstanceAdmin();
-            address instanceAdminAddress = address(instanceAdmin);
-            InstanceReader instanceReader = instance.getInstanceReader();
-            address instanceReaderAddress = address(instanceReader);
-            BundleSet bundleSet = instance.getBundleSet();
-            address bundleSetAddress = address(bundleSet);
-            RiskSet riskSet = instance.getRiskSet();
-            address riskSetAddress = address(riskSet);
-            InstanceStore instanceStore = instance.getInstanceStore();
-            address instanceStoreAddress = address(instanceStore);
-            ProductStore productStore = instance.getProductStore();
-            address productStoreAddress = address(productStore);
-
-            if(accessManagerAddress == address(0)) { revert ErrorInstanceServiceAccessManagerZero(); }
-            if(instanceAdminAddress == address(0)) { revert ErrorInstanceServiceInstanceAdminZero(); }
-            if(instanceReaderAddress == address(0)) { revert ErrorInstanceServiceInstanceReaderZero(); }
-            if(bundleSetAddress == address(0)) { revert ErrorInstanceServiceBundleSetZero(); }
-            if(riskSetAddress == address(0)) { revert ErrorInstanceServiceRiskSetZero(); }
-            if(instanceStoreAddress == address(0)) { revert ErrorInstanceServiceInstanceStoreZero(); }
-            if(productStoreAddress == address(0)) { revert ErrorInstanceServiceProductStoreZero(); } // TODO: rename exception
             
-            if(instance.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceInstanceAuthorityMismatch(); }
-            if(bundleSet.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceBundleSetAuthorityMismatch(); }
-            if(riskSet.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceRiskSetAuthorityMismatch(); }
-            if(instanceStore.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceInstanceStoreAuthorityMismatch(); }
-            if(productStore.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceProductStoreAuthorityMismatch(); } 
-            if(bundleSet.getInstanceAddress() != address(instance)) { revert ErrorInstanceServiceBundleSetInstanceMismatch(); }
-            if(riskSet.getInstanceAddress() != address(instance)) { revert ErrorInstanceServiceRiskSetInstanceMismatch(); }
-            if(instanceReader.getInstance() != instance) { revert ErrorInstanceServiceInstanceReaderInstanceMismatch2(); }
-
-            _masterAccessManager = accessManagerAddress;
-            _masterInstanceAdmin = instanceAdminAddress;
-            _masterInstance = instanceAddress;
-            _masterInstanceReader = instanceReaderAddress;
-            _masterInstanceBundleSet = bundleSetAddress;
-            _masterInstanceRiskSet = riskSetAddress;
-            _masterInstanceStore = instanceStoreAddress;
-            _masterProductStore = productStoreAddress;
+            {
+                address instanceAdminAddress = address(instanceAdmin);
+                InstanceReader instanceReader = instance.getInstanceReader();
+                address instanceReaderAddress = address(instanceReader);
+
+                if(accessManagerAddress == address(0)) { revert ErrorInstanceServiceAccessManagerZero(); }
+                if(instanceAdminAddress == address(0)) { revert ErrorInstanceServiceInstanceAdminZero(); }
+                if(instanceReaderAddress == address(0)) { revert ErrorInstanceServiceInstanceReaderZero(); }
+
+                if(instance.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceInstanceAuthorityMismatch(); }
+                if(instanceReader.getInstance() != instance) { revert ErrorInstanceServiceInstanceReaderInstanceMismatch2(); }
+        
+                _masterAccessManager = accessManagerAddress;
+                _masterInstanceAdmin = instanceAdminAddress;
+                _masterInstance = instanceAddress;
+                _masterInstanceReader = instanceReaderAddress;
+            }
+
+            {
+                BundleSet bundleSet = instance.getBundleSet();
+                address bundleSetAddress = address(bundleSet);
+                RiskSet riskSet = instance.getRiskSet();
+                address riskSetAddress = address(riskSet);
+                RequestSet requestSet = instance.getRequestSet();
+                address requestSetAddress = address(requestSet);
+            
+                if(bundleSetAddress == address(0)) { revert ErrorInstanceServiceBundleSetZero(); }
+                if(riskSetAddress == address(0)) { revert ErrorInstanceServiceRiskSetZero(); }
+                if(requestSetAddress == address(0)) { revert ErrorInstanceServiceRequestSetZero(); }
+                if(bundleSet.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceBundleSetAuthorityMismatch(); }
+                if(riskSet.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceRiskSetAuthorityMismatch(); }
+                if(requestSet.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceRequestSetAuthorityMismatch(); }
+                if(bundleSet.getInstanceAddress() != address(instance)) { revert ErrorInstanceServiceBundleSetInstanceMismatch(); }
+                if(riskSet.getInstanceAddress() != address(instance)) { revert ErrorInstanceServiceRiskSetInstanceMismatch(); }
+                if(requestSet.getInstanceAddress() != address(instance)) { revert ErrorInstanceServiceRequestSetInstanceMismatch(); }
+
+                _masterInstanceBundleSet = bundleSetAddress;
+                _masterInstanceRiskSet = riskSetAddress;
+                _masterInstanceRequestSet = requestSetAddress;
+            }
+
+            {
+                InstanceStore instanceStore = instance.getInstanceStore();
+                address instanceStoreAddress = address(instanceStore);
+                ProductStore productStore = instance.getProductStore();
+                address productStoreAddress = address(productStore);
+
+                if(instanceStoreAddress == address(0)) { revert ErrorInstanceServiceInstanceStoreZero(); }
+                if(productStoreAddress == address(0)) { revert ErrorInstanceServiceProductStoreZero(); } // TODO: rename exception
+                
+                if(instanceStore.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceInstanceStoreAuthorityMismatch(); }
+                if(productStore.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceProductStoreAuthorityMismatch(); } 
+                
+                _masterInstanceStore = instanceStoreAddress;
+                _masterProductStore = productStoreAddress;
+            }
         }
         
         {
@@ -375,7 +400,7 @@ contract InstanceService is
             
             emit LogInstanceServiceMasterInstanceRegistered(
                 masterInstanceNftId, _masterInstance, _masterInstanceAdmin, _masterAccessManager, 
-                _masterInstanceReader, _masterInstanceBundleSet, _masterInstanceRiskSet, _masterInstanceStore, _masterProductStore);
+                _masterInstanceReader, _masterInstanceBundleSet, _masterInstanceRiskSet, _masterInstanceRequestSet, _masterInstanceStore, _masterProductStore);
         }
     }
 
@@ -392,10 +417,12 @@ contract InstanceService is
         InstanceReader instanceReader = InstanceReader(instanceReaderAddress);
         if(instanceReader.getInstance() != IInstance(_masterInstance)) { revert ErrorInstanceServiceInstanceReaderInstanceMismatch(); }
 
+        address oldMasterInstanceReaderAddress = _masterInstanceReader;
         _masterInstanceReader = instanceReaderAddress;
 
         emit LogInstanceServiceMasterInstanceReaderUpgraded(
             getRegistry().getNftIdForAddress(_masterInstance),
+            oldMasterInstanceReaderAddress,
             instanceReaderAddress);
     }
 
@@ -447,6 +474,7 @@ contract InstanceService is
                 productStore: ProductStore(Clones.clone(address(_masterProductStore))),
                 bundleSet: BundleSet(Clones.clone(_masterInstanceBundleSet)),
                 riskSet: RiskSet(Clones.clone(_masterInstanceRiskSet)),
+                requestSet: RequestSet(Clones.clone(address(_masterInstanceRequestSet))),
                 instanceReader: InstanceReader(Clones.clone(address(_masterInstanceReader)))
             }),
             getRegistry(),