@etherisc/gif-next 0.0.2-9e6b423-414 → 0.0.2-9f51324-299

package/contracts/instance/InstanceService.sol

@@ -3,7 +3,6 @@ pragma solidity ^0.8.20;
 
 import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol";
 
-import {IAccess} from "../authorization/IAccess.sol";
 import {IAuthorization} from "../authorization/IAuthorization.sol";
 import {IComponentService} from "../shared/IComponentService.sol";
 import {IInstance} from "./IInstance.sol";
@@ -57,123 +56,45 @@ contract InstanceService is
     }
 
 
-    /// @inheritdoc IInstanceService
-    function createRole(
-        string memory roleName, 
-        RoleId adminRoleId,
-        uint32 maxMemberCount
-    )
-        external
-        restricted()
-        onlyInstance()
-        returns (RoleId roleId)
-    {
-        IInstance instance = IInstance(msg.sender);
-        roleId = instance.getInstanceAdmin().createRole(
-            roleName, 
-            adminRoleId, 
-            maxMemberCount);
-    }
-
-
-    /// @inheritdoc IInstanceService
-    function setRoleActive(RoleId roleId, bool active)
-        external
-        restricted()
-        onlyInstance()
-    {
-        IInstance instance = IInstance(msg.sender);
-        instance.getInstanceAdmin().setRoleActive(roleId, active);
-    }
-
-
-    /// @inheritdoc IInstanceService
-    function grantRole(RoleId roleId, address account)
-        external
-        restricted()
-        onlyInstance()
-    {
-        IInstance instance = IInstance(msg.sender);
-        instance.getInstanceAdmin().grantRole(roleId, account);
-    }
-
-
-    /// @inheritdoc IInstanceService
-    function revokeRole(RoleId roleId, address account) 
-        external 
-        restricted()
-        onlyInstance()
-    {
-        IInstance instance = IInstance(msg.sender);
-        instance.getInstanceAdmin().revokeRole(roleId, account);
-    }
-
-
-    /// @inheritdoc IInstanceService
-    function createTarget(address target, string memory name)
-        external
-        restricted()
-        onlyInstance()
-        returns (RoleId contractRoleId)
-    {
-        IInstance instance = IInstance(msg.sender);
-        return instance.getInstanceAdmin().createTarget(target, name);
-    }
-
-
-    /// @inheritdoc IInstanceService
-    function authorizeFunctions(
-        address target, 
-        RoleId roleId, 
-        IAccess.FunctionInfo[] memory functions
-    )
-        external 
-        restricted()
-        onlyInstance()
-    {
-        IInstance instance = IInstance(msg.sender);
-        return instance.getInstanceAdmin().authorizeFunctions(target, roleId, functions);
+    modifier onlyInstanceOwner(NftId instanceNftId) {        
+        if(msg.sender != getRegistry().ownerOf(instanceNftId)) {
+            revert ErrorInstanceServiceRequestUnauhorized(msg.sender);
+        }
+        _;
     }
 
 
-    /// @inheritdoc IInstanceService
-    function unauthorizeFunctions(
-        address target, 
-        IAccess.FunctionInfo[] memory functions
-    )
-        external
-        restricted()
-        onlyInstance()
-    {
-        IInstance instance = IInstance(msg.sender);
-        return instance.getInstanceAdmin().unauthorizeFunctions(target, functions);
+    // TODO check component - service - instance version match
+    modifier onlyComponent() {
+        if (! getRegistry().isRegisteredComponent(msg.sender)) {
+            revert ErrorInstanceServiceRequestUnauhorized(msg.sender);
+        }
+        _;
     }
 
-
     /// @inheritdoc IInstanceService
-    function setTargetLocked(address target, bool locked)
+    function setInstanceLocked(bool locked)
         external
         virtual
         restricted()
         onlyInstance()
     {
         address instanceAddress = msg.sender;
-        IInstance(instanceAddress).getInstanceAdmin().setTargetLocked(target, locked);
+        IInstance(instanceAddress).getInstanceAdmin().setInstanceLocked(locked);
     }
 
 
-    /// @inheritdoc IInstanceService
-    function setInstanceLocked(bool locked)
+    /// @dev Locks/unlocks the specified target constrolled by the corresponding instance admin.
+    function setTargetLocked(address target, bool locked)
         external
         virtual
         restricted()
         onlyInstance()
     {
         address instanceAddress = msg.sender;
-        IInstance(instanceAddress).getInstanceAdmin().setInstanceLocked(locked);
+        IInstance(instanceAddress).getInstanceAdmin().setTargetLocked(target, locked);
     }
 
-
     /// @inheritdoc IInstanceService
     function createInstance(bool allowAnyToken)
         external 
@@ -199,9 +120,9 @@ contract InstanceService is
         IAuthorization instanceAuthorization = InstanceAdmin(_masterInstanceAdmin).getInstanceAuthorization();
         instanceAdmin.completeSetup(
             address(getRegistry()),
+            address(instance),
             address(instanceAuthorization),
-            getRelease(),
-            address(instance));
+            getRelease());
 
         // hard checks for newly cloned instance
         assert(address(instance.getRegistry()) == address(getRegistry()));
@@ -279,7 +200,7 @@ contract InstanceService is
         returns (Amount newBalance)
     {
         NftId instanceNftId = getRegistry().getNftIdForAddress(msg.sender);
-        newBalance = _stakingService.withdrawInstanceRewardReserves(
+        _stakingService.withdrawInstanceRewardReserves(
             instanceNftId,
             dipAmount);
     }
@@ -353,7 +274,6 @@ contract InstanceService is
         masterInstanceNftId = info.nftId;
     }
 
-
     function upgradeMasterInstanceReader(address instanceReaderAddress)
         external
         onlyOwner
@@ -368,14 +288,10 @@ contract InstanceService is
         _masterInstanceReader = instanceReaderAddress;
     }
 
-    //--- view functions ------------------------------------------------------------//
-
     function getMasterInstanceReader() external view returns (address) {
         return _masterInstanceReader;
     }
 
-    //--- internal functions --------------------------------------------------------//
-
     /// @dev create new cloned instance admin
     /// function used to setup a new instance
     function _cloneNewInstanceAdmin()
@@ -426,7 +342,36 @@ contract InstanceService is
     }
 
 
-    /// @dev top level initializer (upgradable contract)
+    /// all gif targets MUST be children of instanceNftId
+    function _createGifTarget(
+        NftId instanceNftId,
+        address targetAddress,
+        string memory targetName,
+        RoleId[] memory roles,
+        bytes4[][] memory selectors
+    )
+        internal
+        virtual
+    {
+        // TODO instanceAdmin will check target instance match anyway
+        (
+            IInstance instance, // or instanceInfo
+            // or targetInfo
+        ) = _validateInstanceAndComponent(instanceNftId, targetAddress);
+
+        InstanceAdmin instanceAdmin = instance.getInstanceAdmin();
+
+        // TODO refactor/implement
+        // instanceAdmin.createGifTarget(targetAddress, targetName);
+
+        // set proposed target config
+        for(uint roleIdx = 0; roleIdx < roles.length; roleIdx++) {
+            // TODO refactor/implement
+            // instanceAdmin.setTargetFunctionRoleByService(targetName, selectors[roleIdx], roles[roleIdx]);
+        }
+    }
+    
+    /// @dev top level initializer
     function _initialize(
         address owner, 
         bytes memory data
@@ -469,9 +414,12 @@ contract InstanceService is
             }
 
             componentNftId = componentInfo.nftId;
+        } else {
+
         }
 
-        instance = Instance(instanceInfo.objectAddress);        
+        instance = Instance(instanceInfo.objectAddress);
+        
     }
 
 

package/contracts/oracle/BasicOracleAuthorization.sol

@@ -14,26 +14,10 @@ contract BasicOracleAuthorization
      is Authorization
 {
 
-     constructor(
-          string memory componentName,
-          string memory commitHash
-     )
-          Authorization(
-               componentName, 
-               ORACLE(), 
-               3, 
-               commitHash, 
-               true, 
-               false)
+     constructor(string memory componentName)
+          Authorization(componentName, ORACLE(), true, false)
      {}
 
-     function _setupServiceTargets()
-          internal
-          virtual override
-     {
-          _authorizeServiceDomain(ORACLE(), address(15));
-     }
-
      function _setupTargetAuthorizations()
           internal
           virtual override

package/contracts/pool/BasicPoolAuthorization.sol

@@ -18,21 +18,15 @@ contract BasicPoolAuthorization
 {
 
      constructor(string memory poolName)
-          Authorization(
-               poolName, 
-               POOL(), 
-               3,
-               COMMIT_HASH,
-               true, 
-               true)
+          Authorization(poolName, POOL(), true, true)
      {}
 
      function _setupServiceTargets()
           internal
           virtual override
      {
-          _authorizeServiceDomain(COMPONENT(), address(11));
-          _authorizeServiceDomain(POOL(), address(12));
+          _addServiceTargetWithRole(COMPONENT());
+          _addServiceTargetWithRole(POOL());
      }
 
      function _setupTokenHandlerAuthorizations() internal virtual override {

package/contracts/pool/BundleService.sol

@@ -13,19 +13,20 @@ import {InstanceStore} from "../instance/InstanceStore.sol";
 
 import {Amount, AmountLib} from "../type/Amount.sol";
 import {BundleSet} from "../instance/BundleSet.sol";
-import {ComponentVerifyingService} from "../shared/ComponentVerifyingService.sol";
 import {Fee} from "../type/Fee.sol";
 import {InstanceReader} from "../instance/InstanceReader.sol";
 import {NftId, NftIdLib} from "../type/NftId.sol";
 import {ObjectType, ACCOUNTING, COMPONENT, POOL, BUNDLE, POLICY, REGISTRY} from "../type/ObjectType.sol";
-import {StateId, ACTIVE, PAUSED, CLOSED, KEEP_STATE} from "../type/StateId.sol";
+import {PoolLib} from "./PoolLib.sol";
 import {Seconds} from "../type/Seconds.sol";
+import {Service} from "../shared/Service.sol";
+import {StateId, ACTIVE, PAUSED, CLOSED, KEEP_STATE} from "../type/StateId.sol";
 import {Timestamp, TimestampLib, zeroTimestamp} from "../type/Timestamp.sol";
 
 string constant BUNDLE_SERVICE_NAME = "BundleService";
 
 contract BundleService is 
-    ComponentVerifyingService, 
+    Service, 
     IBundleService 
 {
     
@@ -69,7 +70,7 @@ contract BundleService is
     {
         _checkNftType(bundleNftId, BUNDLE());
 
-        (NftId poolNftId,, IInstance instance) = _getAndVerifyActiveComponent(POOL());
+        (NftId poolNftId, IInstance instance) = PoolLib.getAndVerifyActivePool(getRegistry(), msg.sender);
         InstanceReader instanceReader = instance.getInstanceReader();
         IBundle.BundleInfo memory bundleInfo = instanceReader.getBundleInfo(bundleNftId);
         if(bundleInfo.poolNftId.eqz()) {
@@ -96,7 +97,7 @@ contract BundleService is
         restricted()
         returns(NftId bundleNftId)
     {
-        (NftId poolNftId,, IInstance instance) = _getAndVerifyActiveComponent(POOL());
+        (NftId poolNftId, IInstance instance) = PoolLib.getAndVerifyActivePool(getRegistry(), msg.sender);
 
         // register bundle with registry
         bundleNftId = _registryService.registerBundle(
@@ -190,7 +191,7 @@ contract BundleService is
         // checks
         _checkNftType(bundleNftId, BUNDLE());
 
-        (,, IInstance instance) = _getAndVerifyActiveComponent(POOL());
+        (, IInstance instance) = PoolLib.getAndVerifyActivePool(getRegistry(), msg.sender);
 
         // udpate bundle state
         instance.getInstanceStore().updateBundleState(bundleNftId, PAUSED());
@@ -212,7 +213,7 @@ contract BundleService is
         // checks
         _checkNftType(bundleNftId, BUNDLE());
 
-        (,, IInstance instance) = _getAndVerifyActiveComponent(POOL());
+        (, IInstance instance) = PoolLib.getAndVerifyActivePool(getRegistry(), msg.sender);
 
         // effects
         // udpate bundle state
@@ -344,7 +345,7 @@ contract BundleService is
         // checks
         _checkNftType(bundleNftId, BUNDLE());
 
-        (NftId poolNftId,, IInstance instance) = _getAndVerifyActiveComponent(POOL());
+        (NftId poolNftId, IInstance instance) = PoolLib.getAndVerifyActivePool(getRegistry(), msg.sender);
         IBundle.BundleInfo memory bundleInfo = instance.getInstanceReader().getBundleInfo(bundleNftId);
         StateId bundleState = instance.getInstanceReader().getBundleState(bundleNftId);
 

package/contracts/pool/PoolLib.sol

@@ -206,50 +206,6 @@ library PoolLib {
         instance = IInstance(instanceAddress);
     }
 
-
-    function getAndVerifyActiveComponent(
-        IRegistry registry,
-        address sender,
-        ObjectType expectedComponentType
-    )
-        public
-        view
-        returns (
-            NftId componentNftId,
-            IInstance instance
-        )
-    {
-        (
-            IRegistry.ObjectInfo memory info, 
-            address instanceAddress
-        ) = ContractLib.getAndVerifyComponent(
-            registry, 
-            sender,
-            expectedComponentType,
-            true); // only active components
-
-        componentNftId = info.nftId;
-        instance = IInstance(instanceAddress);
-    }
-
-
-    function getInstanceForComponent(
-        IRegistry registry,
-        NftId componentNftId
-    )
-        public
-        view
-        returns (
-            IInstance instance
-        )
-    {
-        NftId productNftId = registry.getParentNftId(componentNftId);
-        NftId instanceNftId = registry.getParentNftId(productNftId);
-        address instanceAddress = registry.getObjectAddress(instanceNftId);
-        return IInstance(instanceAddress);
-    }
-
-
     function checkNftType(
         IRegistry registry, 
         NftId nftId, 

package/contracts/product/ApplicationService.sol

@@ -11,6 +11,7 @@ import {IPricingService} from "./IPricingService.sol";
 import {IRegistryService} from "../registry/IRegistryService.sol";
 
 import {AmountLib} from "../type/Amount.sol";
+import {ContractLib} from "../shared/ContractLib.sol";
 import {Seconds} from "../type/Seconds.sol";
 import {zeroTimestamp} from "../type/Timestamp.sol";
 import {ObjectType, BUNDLE, DISTRIBUTION, PRODUCT, REGISTRY, APPLICATION, POLICY, PRICE} from "../type/ObjectType.sol";
@@ -19,13 +20,13 @@ import {NftId, NftIdLib} from "../type/NftId.sol";
 import {ReferralId} from "../type/Referral.sol";
 import {RiskId} from "../type/RiskId.sol";
 import {Amount, AmountLib} from "../type/Amount.sol";
-import {ComponentVerifyingService} from "../shared/ComponentVerifyingService.sol";
+import {Service} from "../shared/Service.sol";
 import {InstanceReader} from "../instance/InstanceReader.sol";
 
 
 
 contract ApplicationService is 
-    ComponentVerifyingService, 
+    Service, 
     IApplicationService
 {
     IDistributionService private _distributionService;
@@ -155,7 +156,7 @@ contract ApplicationService is
     {
         _checkNftType(bundleNftId, BUNDLE());
 
-        (NftId productNftId,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
+        (NftId productNftId, IInstance instance) = _getAndVerifyActiveProduct();
 
         // check if provided references are valid and linked to calling product contract
         InstanceReader instanceReader = instance.getInstanceReader();
@@ -265,12 +266,33 @@ contract ApplicationService is
     {
         _checkNftType(applicationNftId, POLICY());
 
-        (,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
+        (, IInstance instance) = _getAndVerifyActiveProduct();
         instance.getInstanceStore().updateApplicationState(applicationNftId, REVOKED());
     }
 
     // internal functions
 
+    function _getAndVerifyActiveProduct()
+        internal
+        view
+        returns (
+            NftId productNftId,
+            IInstance instance
+        )
+    {
+        (
+            IRegistry.ObjectInfo memory info, 
+            address instanceAddress
+        ) = ContractLib.getAndVerifyComponent(
+            getRegistry(), 
+            msg.sender,
+            PRODUCT(),
+            true); // only active pools
+
+        productNftId = info.nftId;
+        instance = IInstance(instanceAddress);
+    }
+
 
     function _getDomain() internal pure override returns(ObjectType) {
         return APPLICATION();

package/contracts/product/BasicProductAuthorization.sol

@@ -14,22 +14,17 @@ import {TokenHandler} from "../shared/TokenHandler.sol";
 contract BasicProductAuthorization
      is Authorization
 {
+
      constructor(string memory componentName)
-          Authorization(
-               componentName, 
-               PRODUCT(), 
-               3,
-               COMMIT_HASH,
-               true, 
-               true)
+          Authorization(componentName, PRODUCT(), true, true)
      {}
 
      function _setupServiceTargets()
           internal
           virtual override
      {
-          _authorizeServiceDomain(COMPONENT(), address(10));
-          _authorizeServiceDomain(POLICY(), address(11));
+          _addServiceTargetWithRole(COMPONENT());
+          _addServiceTargetWithRole(POLICY());
      }
 
      function _setupTokenHandlerAuthorizations() internal virtual override {

package/contracts/product/ClaimService.sol

@@ -2,6 +2,7 @@
 pragma solidity ^0.8.20;
 
 import {IClaimService} from "./IClaimService.sol";
+import {IComponents} from "../instance/module/IComponents.sol";
 import {IInstance} from "../instance/IInstance.sol";
 import {IPolicy} from "../instance/module/IPolicy.sol";
 import {IPolicyHolder} from "../shared/IPolicyHolder.sol";
@@ -13,10 +14,11 @@ import {IRegistry} from "../registry/IRegistry.sol";
 import {Amount, AmountLib} from "../type/Amount.sol";
 import {ClaimId, ClaimIdLib} from "../type/ClaimId.sol";
 import {ContractLib} from "../shared/ContractLib.sol";
+import {FeeLib} from "../type/Fee.sol";
 import {InstanceReader} from "../instance/InstanceReader.sol";
 import {InstanceStore} from "../instance/InstanceStore.sol";
 import {NftId} from "../type/NftId.sol";
-import {ObjectType, CLAIM, POLICY, POOL, PRODUCT} from "../type/ObjectType.sol";
+import {ObjectType, COMPONENT, CLAIM, POLICY, POOL, PRODUCT} from "../type/ObjectType.sol";
 import {PayoutId, PayoutIdLib} from "../type/PayoutId.sol";
 import {Service} from "../shared/Service.sol";
 import {StateId} from "../type/StateId.sol";
@@ -66,7 +68,8 @@ contract ClaimService is
     {
         // checks
         (
-            ,,,
+            ,
+            IInstance instance,,
             InstanceStore instanceStore,
             IPolicy.PolicyInfo memory policyInfo
         ) = _verifyCallerWithPolicy(policyNftId);
@@ -167,7 +170,8 @@ contract ClaimService is
         _checkNftType(policyNftId, POLICY());
 
         (
-            ,,
+            ,
+            IInstance instance,
             InstanceReader instanceReader,
             InstanceStore instanceStore,
             IPolicy.PolicyInfo memory policyInfo
@@ -197,7 +201,8 @@ contract ClaimService is
         // nonReentrant() // prevents creating a reinsurance claim in a single tx
     {        
         (
-            ,,
+            ,
+            IInstance instance,
             InstanceReader instanceReader,
             InstanceStore instanceStore,
             IPolicy.PolicyInfo memory policyInfo
@@ -228,9 +233,11 @@ contract ClaimService is
         _checkNftType(policyNftId, POLICY());
         
         (
-            ,,
+            ,
+            IInstance instance,
             InstanceReader instanceReader,
             InstanceStore instanceStore,
+            IPolicy.PolicyInfo memory policyInfo
         ) = _verifyCallerWithPolicy(policyNftId);
 
         // check/update claim info
@@ -318,7 +325,8 @@ contract ClaimService is
     {
         // checks
         (
-            ,,
+            NftId productNftId,,
+            // IInstance instance,
             InstanceReader instanceReader,
             InstanceStore instanceStore,
             IPolicy.PolicyInfo memory policyInfo
@@ -350,8 +358,7 @@ contract ClaimService is
         Amount payoutAmount = payoutInfo.amount;
         {
             ClaimId claimId = payoutId.toClaimId();
-            // TODO cleanup
-            // IPolicy.ClaimInfo memory claimInfo = instanceReader.getClaimInfo(policyNftId, claimId);
+            IPolicy.ClaimInfo memory claimInfo = instanceReader.getClaimInfo(policyNftId, claimId);
             claimInfo.paidAmount = claimInfo.paidAmount.add(payoutAmount);
             claimInfo.openPayoutsCount -= 1;
 
@@ -396,9 +403,11 @@ contract ClaimService is
     {
         // checks
         (
-            ,,
+            ,
+            IInstance instance,
             InstanceReader instanceReader,
             InstanceStore instanceStore,
+            IPolicy.PolicyInfo memory policyInfo
         ) = _verifyCallerWithPolicy(policyNftId);
 
         StateId payoutState = instanceReader.getPayoutState(policyNftId, payoutId);
@@ -521,7 +530,7 @@ contract ClaimService is
             IPolicy.PolicyInfo memory policyInfo
         )
     {
-        (productNftId, instance) = _getAndVerifyActiveProduct();
+        (productNftId, instance) = _getAndVerifyActiveComponent(PRODUCT());
         instanceReader = instance.getInstanceReader();
         instanceStore = instance.getInstanceStore();
 
@@ -535,7 +544,7 @@ contract ClaimService is
     }
 
 
-    function _getAndVerifyActiveProduct() 
+    function _getAndVerifyActiveComponent(ObjectType expectedType) 
         internal 
         view 
         returns (

package/contracts/product/PolicyService.sol

@@ -205,7 +205,7 @@ contract PolicyService is
         }
 
         // check if premium has already been collected
-        if (instanceReader.getPremiumState(policyNftId) == PAID()) {
+        if (instanceReader.getPremiumInfoState(policyNftId) == PAID()) {
             revert ErrorPolicyServicePremiumAlreadyPaid(policyNftId);
         }
 
@@ -395,7 +395,7 @@ contract PolicyService is
         RiskId riskId = policyInfo.riskId;
         NftId bundleNftId = policyInfo.bundleNftId;
 
-        if (instanceReader.getPremiumState(policyNftId) != PAID()) {
+        if (instanceReader.getPremiumInfoState(policyNftId) != PAID()) {
             revert ErrorPolicyServicePremiumNotPaid(policyNftId, policyInfo.premiumAmount);
         }
 

package/contracts/product/PolicyServiceLib.sol

@@ -10,26 +10,6 @@ import {Timestamp, TimestampLib} from "../type/Timestamp.sol";
 
 library PolicyServiceLib {
 
-    function policyIsActive(InstanceReader instanceReader, NftId policyNftId)
-        external 
-        view
-        returns (bool isActive)
-    {
-        // policy not collateralized
-        if (instanceReader.getPolicyState(policyNftId) != COLLATERALIZED()) {
-            return false;
-        }
-
-        IPolicy.PolicyInfo memory info = instanceReader.getPolicyInfo(policyNftId);
-
-        if (info.productNftId.eqz()) { return false; } // not closeable: policy does not exist (or does not belong to this instance)
-        if (info.activatedAt.eqz()) { return false; } // not closeable: not yet activated
-        if (info.activatedAt > TimestampLib.blockTimestamp()) { return false; } // not yet active
-        if (info.expiredAt <= TimestampLib.blockTimestamp()) { return false; } // already expired
-
-        return true;
-    }
-
     function activate(
         NftId policyNftId, 
         IPolicy.PolicyInfo memory policyInfo,