@etherisc/gif-next 0.0.2-9e6b423-414 → 0.0.2-9f1b659-471

package/contracts/distribution/Distribution.sol

@@ -57,6 +57,7 @@ abstract contract Distribution is
 
     function getDiscountPercentage(string memory referralCode)
         external
+        virtual
         view
         returns (
             UFixed discountPercentage, 
@@ -72,6 +73,7 @@ abstract contract Distribution is
         string memory referralCode
     )
         public
+        virtual
         view 
         returns (ReferralId referralId)
     {
@@ -96,12 +98,12 @@ abstract contract Distribution is
 
 
     /// @dev Returns true iff the component needs to be called when selling/renewing policis
-    function isVerifying() external pure returns (bool verifying) {
+    function isVerifying() external virtual pure returns (bool verifying) {
         return true;
     }
 
 
-    function _initializeDistribution(
+    function __Distribution_init(
         address registry,
         NftId productNftId,
         IAuthorization authorization, 
@@ -114,7 +116,7 @@ abstract contract Distribution is
         virtual
         onlyInitializing()
     {
-        _initializeInstanceLinkedComponent(
+        __InstanceLinkedComponent_init(
             registry, 
             productNftId, 
             name, 

package/contracts/distribution/DistributionService.sol

@@ -13,6 +13,7 @@ import {IComponents} from "../instance/module/IComponents.sol";
 import {IPolicy} from "../instance/module/IPolicy.sol";
 
 import {Amount, AmountLib} from "../type/Amount.sol";
+import {ContractLib} from "../shared/ContractLib.sol";
 import {DistributorType, DistributorTypeLib} from "../type/DistributorType.sol";
 import {NftId, NftIdLib} from "../type/NftId.sol";
 import {KEEP_STATE} from "../type/StateId.sol";
@@ -73,10 +74,10 @@ contract DistributionService is
         bytes memory data
     )
         external
+        virtual
         restricted()
         returns (DistributorType distributorType)
     {
-        // _getAndVerifyActiveDistribution
         (NftId distributionNftId, IInstance instance) = _getAndVerifyActiveDistribution();
 
         {
@@ -110,6 +111,8 @@ contract DistributionService is
             data: data});
 
         instance.getInstanceStore().createDistributorType(distributorType, info);
+
+        emit LogDistributionServiceDistributorTypeCreated(distributionNftId, name);
     }
 
 
@@ -144,6 +147,8 @@ contract DistributionService is
             data: data});
 
         instance.getInstanceStore().createDistributor(distributorNftId, info);
+
+        emit LogDistributionServiceDistributorCreated(distributionNftId, distributorNftId, distributorType, distributor);
     }
 
     function changeDistributorType(
@@ -160,9 +165,12 @@ contract DistributionService is
         _checkDistributionType(instance.getInstanceReader(), newDistributorType, distributionNftId);
         
         IDistribution.DistributorInfo memory distributorInfo = instance.getInstanceReader().getDistributorInfo(distributorNftId);
+        DistributorType oldDistributorType = distributorInfo.distributorType;
         distributorInfo.distributorType = newDistributorType;
         distributorInfo.data = data;
         instance.getInstanceStore().updateDistributor(distributorNftId, distributorInfo, KEEP_STATE());
+
+        emit LogDistributionServiceDistributorTypeChanged(distributorNftId, oldDistributorType, newDistributorType);
     }
 
 
@@ -183,9 +191,9 @@ contract DistributionService is
         (NftId distributionNftId, IInstance instance) = _getAndVerifyActiveDistribution();
 
         if (bytes(code).length == 0) {
-            revert ErrorDistributionServiceInvalidReferral(code);
+            revert ErrorDistributionServiceInvalidReferral();
         }
-        if (expiryAt.eqz() || expiryAt.lte(TimestampLib.blockTimestamp())) {
+        if (expiryAt.eqz() || expiryAt < TimestampLib.current()) {
             revert ErrorDistributionServiceExpirationInvalid(expiryAt);
         }
 
@@ -200,15 +208,15 @@ contract DistributionService is
             IDistribution.DistributorTypeInfo memory distributorTypeData = instanceReader.getDistributorTypeInfo(distributorType);
 
             if (distributorTypeData.maxReferralCount < maxReferrals) {
-                revert ErrorDistributionServiceMaxReferralsExceeded(distributorTypeData.maxReferralCount);
+                revert ErrorDistributionServiceMaxReferralsExceeded(distributorTypeData.maxReferralCount, maxReferrals);
             }
             if (distributorTypeData.minDiscountPercentage > discountPercentage) {
-                revert ErrorDistributionServiceDiscountTooLow(distributorTypeData.minDiscountPercentage.toInt(), discountPercentage.toInt());
+                revert ErrorDistributionServiceDiscountTooLow(distributorTypeData.minDiscountPercentage, discountPercentage);
             }
             if (distributorTypeData.maxDiscountPercentage < discountPercentage) {
-                revert ErrorDistributionServiceDiscountTooHigh(distributorTypeData.maxDiscountPercentage.toInt(), discountPercentage.toInt());
+                revert ErrorDistributionServiceDiscountTooHigh(distributorTypeData.maxDiscountPercentage, discountPercentage);
             }
-            if (expiryAt.toInt() - TimestampLib.blockTimestamp().toInt() > distributorTypeData.maxReferralLifetime.toInt()) {
+            if (expiryAt.toInt() - TimestampLib.current().toInt() > distributorTypeData.maxReferralLifetime.toInt()) {
                 revert ErrorDistributionServiceExpiryTooLong(distributorTypeData.maxReferralLifetime, expiryAt);
             }
         }
@@ -227,6 +235,8 @@ contract DistributionService is
             });
 
             instance.getInstanceStore().createReferral(referralId, info);
+
+            emit LogDistributionServiceReferralCreated(distributionNftId, distributorNftId, referralId, code);
         }
     }
 
@@ -241,12 +251,14 @@ contract DistributionService is
         onlyNftOfType(distributionNftId, DISTRIBUTION())
     {
         if (referralIsValid(distributionNftId, referralId)) {
-            IInstance instance = _getInstanceForDistribution(getRegistry(), distributionNftId);
+            IInstance instance = IInstance(ContractLib.getInstanceForComponent(getRegistry(), distributionNftId));
 
             // update book keeping for referral info
             IDistribution.ReferralInfo memory referralInfo = instance.getInstanceReader().getReferralInfo(referralId);
             referralInfo.usedReferrals += 1;
             instance.getInstanceStore().updateReferral(referralId, referralInfo, KEEP_STATE());
+
+            emit LogDistributionServiceReferralProcessed(distributionNftId, referralInfo.distributorNftId, referralId, referralInfo.usedReferrals);
         }
     }
 
@@ -260,7 +272,7 @@ contract DistributionService is
         restricted()
         onlyNftOfType(distributionNftId, DISTRIBUTION())
     {
-        IInstance instance = _getInstanceForDistribution(getRegistry(), distributionNftId);
+        IInstance instance = IInstance(ContractLib.getInstanceForComponent(getRegistry(), distributionNftId));
         InstanceReader reader = instance.getInstanceReader();
         InstanceStore store = instance.getInstanceStore();
 
@@ -287,6 +299,8 @@ contract DistributionService is
             // increase distribution balance by distribution owner fee
             _accountingService.increaseDistributionBalance(store, distributionNftId, AmountLib.zero(), distributionOwnerFee);
         }
+
+        emit LogDistributionServiceSaleProcessed(distributionNftId, referralId);
     }
 
     /// @inheritdoc IDistributionService
@@ -334,6 +348,7 @@ contract DistributionService is
 
     function referralIsValid(NftId distributionNftId, ReferralId referralId) 
         public 
+        virtual
         view 
         onlyNftOfType(distributionNftId, DISTRIBUTION())
         returns (bool isValid) 
@@ -342,7 +357,7 @@ contract DistributionService is
             return false;
         }
 
-        IInstance instance = _getInstanceForDistribution(getRegistry(), distributionNftId);
+        IInstance instance = IInstance(ContractLib.getInstanceForComponent(getRegistry(), distributionNftId));
         IDistribution.ReferralInfo memory info = instance.getInstanceReader().getReferralInfo(referralId);
 
         if (info.distributorNftId.eqz()) {
@@ -354,7 +369,7 @@ contract DistributionService is
             revert ErrorDistributionServiceReferralDistributionMismatch(referralId, info.distributionNftId, distributionNftId);
         }
 
-        isValid = info.expiryAt.eqz() || (info.expiryAt.gtz() && TimestampLib.blockTimestamp() <= info.expiryAt);
+        isValid = info.expiryAt.eqz() || (info.expiryAt.gtz() && TimestampLib.current() <= info.expiryAt);
         isValid = isValid && info.usedReferrals < info.maxReferrals;
     }
 
@@ -380,7 +395,7 @@ contract DistributionService is
                 REFERRAL_ERROR_UNKNOWN());
         }
 
-        if (info.expiryAt < TimestampLib.blockTimestamp()) {
+        if (info.expiryAt < TimestampLib.current()) {
             return (
                 UFixedLib.zero(),
                 REFERRAL_ERROR_EXPIRED());
@@ -413,15 +428,6 @@ contract DistributionService is
     }
 
 
-    function _getInstanceForDistribution(IRegistry registry, NftId distributionNftId)
-        internal
-        view
-        returns(IInstance instance)
-    {
-        // TODO refactor to ComponentLib or similar
-        return PoolLib.getInstanceForComponent(registry, distributionNftId);
-    }
-
 
     function _getAndVerifyActiveDistribution()
         internal

package/contracts/distribution/IDistributionService.sol

@@ -19,11 +19,11 @@ interface IDistributionService is IService {
     error ErrorDistributionServiceParentNftIdNotInstance(NftId nftId, NftId parentNftId);
     error ErrorDistributionServiceCallerNotDistributor(address caller);
     error ErrorDistributionServiceInvalidReferralId(ReferralId referralId);
-    error ErrorDistributionServiceMaxReferralsExceeded(uint256 maxReferrals);
-    error ErrorDistributionServiceDiscountTooLow(uint256 minDiscountPercentage, uint256 discountPercentage);
-    error ErrorDistributionServiceDiscountTooHigh(uint256 maxDiscountPercentage, uint256 discountPercentage);
+    error ErrorDistributionServiceMaxReferralsExceeded(uint256 limit, uint256 maxReferrals);
+    error ErrorDistributionServiceDiscountTooLow(UFixed minDiscountPercentage, UFixed discountPercentage);
+    error ErrorDistributionServiceDiscountTooHigh(UFixed maxDiscountPercentage, UFixed discountPercentage);
     error ErrorDistributionServiceExpiryTooLong(Seconds maxReferralLifetime, Timestamp expiryAt);
-    error ErrorDistributionServiceInvalidReferral(string code);
+    error ErrorDistributionServiceInvalidReferral();
     error ErrorDistributionServiceExpirationInvalid(Timestamp expiryAt);
     error ErrorDistributionServiceCommissionTooHigh(uint256 commissionPercentage, uint256 maxCommissionPercentage);
     error ErrorDistributionServiceMinFeeTooHigh(uint256 minFee, uint256 limit);
@@ -40,6 +40,12 @@ interface IDistributionService is IService {
     error ErrorDistributionServiceReferralDistributionMismatch(ReferralId referralId, NftId referralDistributionNft, NftId distributionNftId);
 
     event LogDistributionServiceCommissionWithdrawn(NftId distributorNftId, address recipient, address tokenAddress, Amount amount);
+    event LogDistributionServiceDistributorTypeCreated(NftId distributionNftId, string name);
+    event LogDistributionServiceDistributorCreated(NftId distributionNftId, NftId distributorNftId, DistributorType distributorType, address distributor);
+    event LogDistributionServiceDistributorTypeChanged(NftId distributorNftId, DistributorType oldDistributorType, DistributorType newDistributorType);
+    event LogDistributionServiceReferralCreated(NftId distributionNftId, NftId distributorNftId, ReferralId referralId, string code);
+    event LogDistributionServiceReferralProcessed(NftId distributionNftId, NftId distributorNftId, ReferralId referralId, uint32 usedReferrals);
+    event LogDistributionServiceSaleProcessed(NftId distributionNftId, ReferralId referralId);
 
     function createDistributorType(
         string memory name,

package/contracts/examples/fire/FireProduct.sol

@@ -140,9 +140,9 @@ contract FireProduct is
             revert ErrorFireProductCityUnknown(cityName);
         }
 
-        _updateRiskState(
+        _setRiskLocked(
             _riskMapping[cityName],
-            PAUSED()
+            true
         );
     }
 
@@ -156,9 +156,9 @@ contract FireProduct is
             revert ErrorFireProductCityUnknown(cityName);
         }
 
-        _updateRiskState(
+        _setRiskLocked(
             _riskMapping[cityName],
-            ACTIVE()
+            false
         );
     }
 
@@ -263,7 +263,7 @@ contract FireProduct is
         onlyOwner()
         onlyNftOfType(policyNftId, POLICY())
     {
-        _createPolicy(policyNftId, activateAt);
+        _createPolicy(policyNftId, activateAt, AmountLib.max());
         _collectPremium(policyNftId, activateAt);
     }
 
@@ -316,7 +316,7 @@ contract FireProduct is
             revert ErrorFireProductCityUnknown(cityName);
         }
 
-        if (reportedAt > TimestampLib.blockTimestamp()) {
+        if (reportedAt > TimestampLib.current()) {
             revert ErrorFireProductTimestampInFuture();
         }
 

package/contracts/examples/unpermissioned/SimpleProduct.sol

@@ -100,16 +100,22 @@ contract SimpleProduct is
         );
     }
 
-    function updateRiskState(
+    function setRiskLocked(
         RiskId id,
-        StateId state
+        bool locked
     ) public {
-        _updateRiskState(
+        _setRiskLocked(
             id,
-            state
+            locked
         );
     }
 
+    function closeRisk(
+        RiskId id
+    ) public {
+        _closeRisk(id);
+    }
+
     function createApplication(
         address applicationOwner,
         RiskId riskId,
@@ -143,12 +149,55 @@ contract SimpleProduct is
         );
     }
 
+    function createApplication2(
+        address applicationOwner,
+        RiskId riskId,
+        Amount sumInsuredAmount,
+        Amount premiumAmount,
+        Seconds lifetime,
+        bytes memory applicationData,
+        NftId bundleNftId,
+        ReferralId referralId
+    )
+        public
+        returns (NftId nftId)
+    {
+        return _createApplication(
+            applicationOwner,
+            riskId,
+            sumInsuredAmount,
+            premiumAmount,
+            lifetime,
+            bundleNftId,
+            referralId,
+            applicationData
+        );
+    }
+    
+    function revoke(
+        NftId applicationNftId
+    ) public {
+        _revoke(applicationNftId);
+    }
+
     function createPolicy(
         NftId applicationNftId,
         bool requirePremiumPayment,
         Timestamp activateAt
     ) public {
-        _createPolicy(applicationNftId, activateAt);
+        _createPolicy(applicationNftId, activateAt, AmountLib.max());
+        if (requirePremiumPayment == true) {
+            _collectPremium(applicationNftId, activateAt);
+        }
+    }
+
+    function createPolicy2(
+        NftId applicationNftId,
+        bool requirePremiumPayment,
+        Timestamp activateAt,
+        Amount maxPremiumAmount
+    ) public {
+        _createPolicy(applicationNftId, activateAt, maxPremiumAmount);
         if (requirePremiumPayment == true) {
             _collectPremium(applicationNftId, activateAt);
         }
@@ -229,11 +278,11 @@ contract SimpleProduct is
         _declineClaim(policyNftId, claimId, processData);
     }
 
-    function closeClaim(
+    function cancelConfirmedClaim(
         NftId policyNftId,
         ClaimId claimId
     ) public {
-        _closeClaim(policyNftId, claimId);
+        _cancelConfirmedClaim(policyNftId, claimId);
     }
 
     function createPayout(
@@ -266,8 +315,8 @@ contract SimpleProduct is
     function processPayout(
         NftId policyNftId,
         PayoutId payoutId
-    ) public {
-        _processPayout(policyNftId, payoutId);
+    ) public returns (Amount netPayoutAmount, Amount processingFeeAmount) {
+        (netPayoutAmount, processingFeeAmount) = _processPayout(policyNftId, payoutId);
     }
 
     function createOracleRequest(
@@ -299,6 +348,28 @@ contract SimpleProduct is
         }
     }
 
+    function createOracleRequest2(
+        NftId oracleNftId,
+        string memory requestText,
+        Timestamp expiryAt,
+        bool synchronous,
+        string memory callbackMethod
+    )
+        public
+        // restricted()
+        returns (RequestId)
+    {
+        bytes memory requestData = abi.encode(SimpleOracle.SimpleRequest(
+            synchronous,
+            requestText));
+
+        return _oracleService.request(
+            oracleNftId, 
+            requestData, 
+            expiryAt, 
+            callbackMethod);
+    }
+
     function cancelOracleRequest(
         RequestId requestId
     )
@@ -329,7 +400,7 @@ contract SimpleProduct is
         SimpleOracle.SimpleResponse memory response = abi.decode(
             responseData, (SimpleOracle.SimpleResponse));
 
-        if (response.revertInCall && response.revertUntil >= TimestampLib.blockTimestamp()) {
+        if (response.revertInCall && response.revertUntil >= TimestampLib.current()) {
             revert ErrorSimpleProductRevertedWhileProcessingResponse(requestId);
         }
 
@@ -347,21 +418,14 @@ contract SimpleProduct is
     }
 
 
-    function doSomethingSpecial() 
+    function doSomethingOnlyWhenActive() 
         public 
-        restricted()
+        onlyActive()
         returns (bool) 
     {
         return true;
     }
 
-    function doWhenNotLocked() 
-        public 
-        restricted()
-        returns (bool) 
-    {
-        return true;
-    }
 
     function getOracleService() public view returns (IOracleService) {
         return _oracleService;

package/contracts/instance/IInstance.sol

@@ -79,7 +79,7 @@ interface IInstance is
     function setStakingMaxAmount(Amount maxStakedAmount) external;
 
     /// @dev Refills the staking reward reserves for the specified target.
-    function refillStakingRewardReserves(Amount dipAmount) external;
+    function refillStakingRewardReserves(Amount dipAmount) external returns (Amount newBalance);
 
     /// @dev Defunds the staking reward reserves for the specified target.
     function withdrawStakingRewardReserves(Amount dipAmount) external returns (Amount newBalance);

package/contracts/instance/IInstanceService.sol

@@ -54,7 +54,10 @@ interface IInstanceService is IService {
     error ErrorInstanceServiceInstanceComponentMismatch(NftId instanceNftId, NftId componentNftId);
     error ErrorInstanceServiceInvalidComponentType(address componentAddress, ObjectType expectedType, ObjectType componentType);
     
-    event LogInstanceCloned(NftId instanceNftId, address instance);
+    event LogInstanceServiceInstanceLocked(NftId instanceNftId, bool locked);
+    event LogInstanceServiceInstanceCreated(NftId instanceNftId, address instance);
+    event LogInstanceServiceMasterInstanceReaderUpgraded(NftId instanceNfId, address newInstanceReader);
+    event LogInstanceServiceInstanceReaderUpgraded(NftId instanceNfId, address newInstanceReader);
 
     /// @dev Creates a new custom role for the calling instance.
     function createRole(string memory roleName, RoleId adminRoleId, uint32 maxMemberCount) external returns (RoleId roleId);
@@ -106,8 +109,9 @@ interface IInstanceService is IService {
     function setStakingLockingPeriod(Seconds stakeLockingPeriod) external;
     function setStakingRewardRate(UFixed rewardRate) external;
     function setStakingMaxAmount(Amount maxStakedAmount) external;
-    function refillStakingRewardReserves(address rewardProvider, Amount dipAmount) external;
+
+    function refillInstanceRewardReserves(address rewardProvider, Amount dipAmount) external returns (Amount newBalance);
 
     /// @dev Defunds the staking reward reserves for the specified target.
-    function withdrawStakingRewardReserves(Amount dipAmount) external returns (Amount newBalance);
+    function withdrawInstanceRewardReserves(Amount dipAmount) external returns (Amount newBalance);
 }

package/contracts/instance/Instance.sol

@@ -64,7 +64,7 @@ contract Instance is
         IRegistry registry, 
         VersionPart release,
         address initialOwner,
-        bool tokenRegistryDisabled
+        bool tokenRegistryDisabled // only disable for testing
     ) 
         external 
         initializer()
@@ -163,6 +163,7 @@ contract Instance is
 
     function setStakingMaxAmount(Amount maxStakedAmount)
         external
+        restricted()
         onlyOwner()
     {
         _instanceService.setStakingMaxAmount(maxStakedAmount);
@@ -172,18 +173,19 @@ contract Instance is
         external
         restricted()
         onlyOwner()
+        returns (Amount newRewardReserveBalance)
     {
         address instanceOwner = msg.sender;
-        _instanceService.refillStakingRewardReserves(instanceOwner, dipAmount);
+        return _instanceService.refillInstanceRewardReserves(instanceOwner, dipAmount);
     }
 
     function withdrawStakingRewardReserves(Amount dipAmount)
         external
         restricted()
         onlyOwner()
-        returns (Amount newBalance)
+        returns (Amount newRewardReserveBalance)
     {
-        return _instanceService.withdrawStakingRewardReserves(dipAmount);
+        return _instanceService.withdrawInstanceRewardReserves(dipAmount);
     }
 
     //--- Roles ------------------------------------------------------------//

package/contracts/instance/InstanceAuthorizationV3.sol

@@ -115,7 +115,7 @@ contract InstanceAuthorizationV3
           // authorize risk service role
           functions = _authorizeForTarget(RISK_SET_TARGET_NAME, getServiceRole(RISK()));
           _authorize(functions, RiskSet.add.selector, "add");
-          _authorize(functions, RiskSet.pause.selector, "pause");
+          _authorize(functions, RiskSet.deactivate.selector, "deactivate");
           _authorize(functions, RiskSet.activate.selector, "activate");
 
           // authorize policy service role
@@ -138,6 +138,7 @@ contract InstanceAuthorizationV3
           // staking
           _authorize(functions, IInstance.setStakingLockingPeriod.selector, "setStakingLockingPeriod");
           _authorize(functions, IInstance.setStakingRewardRate.selector, "setStakingRewardRate");
+          _authorize(functions, IInstance.setStakingMaxAmount.selector, "setStakingMaxAmount");
           _authorize(functions, IInstance.refillStakingRewardReserves.selector, "refillStakingRewardReserves");
           _authorize(functions, IInstance.withdrawStakingRewardReserves.selector, "withdrawStakingRewardReserves");
 

package/contracts/instance/InstanceService.sol

@@ -171,6 +171,10 @@ contract InstanceService is
     {
         address instanceAddress = msg.sender;
         IInstance(instanceAddress).getInstanceAdmin().setInstanceLocked(locked);
+
+        emit LogInstanceServiceInstanceLocked(
+            getRegistry().getNftIdForAddress(instanceAddress),
+            locked);
     }
 
 
@@ -213,7 +217,7 @@ contract InstanceService is
             TargetManagerLib.getDefaultLockingPeriod(),
             TargetManagerLib.getDefaultRewardRate());
 
-        emit LogInstanceCloned(
+        emit LogInstanceServiceInstanceCreated(
             instanceNftId,
             address(instance));
     }
@@ -257,21 +261,22 @@ contract InstanceService is
     }    
 
 
-    function refillStakingRewardReserves(address rewardProvider, Amount dipAmount)
+    function refillInstanceRewardReserves(address rewardProvider, Amount dipAmount)
         external
         virtual
         restricted()
         onlyInstance()
+        returns (Amount newBalance)
     {
         NftId instanceNftId = getRegistry().getNftIdForAddress(msg.sender);
-        _stakingService.refillInstanceRewardReserves(
+        newBalance = _stakingService.refillInstanceRewardReserves(
             instanceNftId,
             rewardProvider,
             dipAmount);
     }
 
 
-    function withdrawStakingRewardReserves(Amount dipAmount)
+    function withdrawInstanceRewardReserves(Amount dipAmount)
         external
         virtual
         restricted()
@@ -287,6 +292,7 @@ contract InstanceService is
 
     function upgradeInstanceReader() 
         external 
+        virtual
         restricted()
         onlyInstance()
     {
@@ -298,11 +304,16 @@ contract InstanceService is
 
         upgradedInstanceReaderClone.initializeWithInstance(instanceAddress);
         instance.setInstanceReader(upgradedInstanceReaderClone);
+
+        emit LogInstanceServiceInstanceReaderUpgraded(
+            getRegistry().getNftIdForAddress(instanceAddress),
+            address(upgradedInstanceReaderClone));
     }
 
 
     function setAndRegisterMasterInstance(address instanceAddress)
         external 
+        virtual
         onlyOwner()
         returns(NftId masterInstanceNftId)
     {
@@ -356,6 +367,7 @@ contract InstanceService is
 
     function upgradeMasterInstanceReader(address instanceReaderAddress)
         external
+        virtual
         onlyOwner
     {
         if(_masterInstanceReader == address(0)) { revert ErrorInstanceServiceMasterInstanceReaderNotSet(); }
@@ -366,11 +378,13 @@ contract InstanceService is
         if(instanceReader.getInstance() != IInstance(_masterInstance)) { revert ErrorInstanceServiceInstanceReaderInstanceMismatch(); }
 
         _masterInstanceReader = instanceReaderAddress;
-    }
 
-    //--- view functions ------------------------------------------------------------//
+        emit LogInstanceServiceMasterInstanceReaderUpgraded(
+            getRegistry().getNftIdForAddress(_masterInstance),
+            instanceReaderAddress);
+    }
 
-    function getMasterInstanceReader() external view returns (address) {
+    function getMasterInstanceReader() external virtual view returns (address) {
         return _masterInstanceReader;
     }
 
@@ -450,31 +464,6 @@ contract InstanceService is
     }
 
 
-    function _validateInstanceAndComponent(NftId instanceNftId, address componentAddress) 
-        internal
-        view
-        returns (IInstance instance, NftId componentNftId)
-    {
-        IRegistry registry = getRegistry();
-        IRegistry.ObjectInfo memory instanceInfo = registry.getObjectInfo(instanceNftId);
-        if(instanceInfo.objectType != INSTANCE()) {
-            revert ErrorInstanceServiceNotInstanceNftId(instanceNftId);
-        }
-
-        if (registry.getNftIdForAddress(componentAddress).gtz()) {
-            IRegistry.ObjectInfo memory componentInfo = registry.getObjectInfo(componentAddress);
-
-            if(componentInfo.parentNftId != instanceNftId) {
-                revert ErrorInstanceServiceInstanceComponentMismatch(instanceNftId, componentInfo.nftId);
-            }
-
-            componentNftId = componentInfo.nftId;
-        }
-
-        instance = Instance(instanceInfo.objectAddress);        
-    }
-
-
     function _checkInstance(
         address instanceAddress,
         VersionPart expectedRelease