@etherisc/gif-next 0.0.2-7c8d286-020 → 0.0.2-7d488b3-675

package/contracts/instance/InstanceService.sol

@@ -4,28 +4,31 @@ pragma solidity ^0.8.20;
 import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol";
 
 import {IAuthorization} from "../authorization/IAuthorization.sol";
-import {IComponentService} from "../shared/IComponentService.sol";
-import {IInstance} from "./IInstance.sol";
-import {IInstanceService} from "./IInstanceService.sol";
+import {AccessManagerCloneable} from "../authorization/AccessManagerCloneable.sol";
+import {Amount} from "../type/Amount.sol";
+import {BundleSet} from "./BundleSet.sol";
+import {RiskSet} from "./RiskSet.sol";
+import {ChainNft} from "../registry/ChainNft.sol";
+import {NftId} from "../type/NftId.sol";
+import {RoleId} from "../type/RoleId.sol";
+import {UFixed} from "../type/UFixed.sol";
+import {ObjectType, INSTANCE, COMPONENT, INSTANCE, REGISTRY, STAKING} from "../type/ObjectType.sol";
+
+import {Service} from "../shared/Service.sol";
+
 import {IRegistry} from "../registry/IRegistry.sol";
 import {IRegistryService} from "../registry/IRegistryService.sol";
 import {IStakingService} from "../staking/IStakingService.sol";
+import {TargetManagerLib} from "../staking/TargetManagerLib.sol";
 
-import {AccessManagerCloneable} from "../authorization/AccessManagerCloneable.sol";
-import {Amount} from "../type/Amount.sol";
-import {BundleSet} from "./BundleSet.sol";
+import {IComponentService} from "../shared/IComponentService.sol";
 import {Instance} from "./Instance.sol";
+import {IInstance} from "./IInstance.sol";
 import {InstanceAdmin} from "./InstanceAdmin.sol";
+import {IInstanceService} from "./IInstanceService.sol";
 import {InstanceReader} from "./InstanceReader.sol";
 import {InstanceStore} from "./InstanceStore.sol";
-import {NftId} from "../type/NftId.sol";
-import {ObjectType, INSTANCE, COMPONENT, INSTANCE, REGISTRY, STAKING} from "../type/ObjectType.sol";
-import {RiskSet} from "./RiskSet.sol";
-import {RoleId} from "../type/RoleId.sol";
 import {Seconds} from "../type/Seconds.sol";
-import {Service} from "../shared/Service.sol";
-import {TargetManagerLib} from "../staking/TargetManagerLib.sol";
-import {UFixed} from "../type/UFixed.sol";
 import {VersionPart} from "../type/Version.sol";
 
 
@@ -50,8 +53,23 @@ contract InstanceService is
     address internal _masterInstanceStore;
 
 
-    modifier onlyInstance() {
-        _checkInstance(msg.sender, getRelease());
+    modifier onlyInstance() {        
+        address instanceAddress = msg.sender;
+        NftId instanceNftId = getRegistry().getNftIdForAddress(msg.sender);
+        if (instanceNftId.eqz()) {
+            revert ErrorInstanceServiceNotRegistered(instanceAddress);
+        }
+
+        ObjectType objectType = getRegistry().getObjectInfo(instanceNftId).objectType;
+        if (objectType != INSTANCE()) {
+            revert ErrorInstanceServiceNotInstance(instanceAddress, objectType);
+        }
+
+        VersionPart instanceVersion = IInstance(instanceAddress).getRelease();
+        if (instanceVersion != getVersion().toMajorPart()) {
+            revert ErrorInstanceServiceInstanceVersionMismatch(instanceAddress, instanceVersion);
+        }
+
         _;
     }
 
@@ -72,33 +90,8 @@ contract InstanceService is
         _;
     }
 
-    /// @inheritdoc IInstanceService
-    function setInstanceLocked(bool locked)
-        external
-        virtual
-        restricted()
-        onlyInstance()
-    {
-        address instanceAddress = msg.sender;
-        IInstance(instanceAddress).getInstanceAdmin().setInstanceLocked(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().setTargetLocked(target, locked);
-    }
-
-
     function createInstance()
         external 
-        virtual
         restricted()
         returns (
             IInstance instance,
@@ -109,31 +102,26 @@ contract InstanceService is
         address instanceOwner = msg.sender;
 
         // create instance admin and instance
-        InstanceAdmin instanceAdmin = _cloneNewInstanceAdmin();
+        InstanceAdmin instanceAdmin = _createInstanceAdmin();
         instance = _createInstance(instanceAdmin, instanceOwner);
 
         // register cloned instance with registry
         instanceNftId = _registryService.registerInstance(
             instance, instanceOwner).nftId;
 
-        // MUST be set after instance is set up and registered
-        IAuthorization instanceAuthorization = InstanceAdmin(_masterInstanceAdmin).getInstanceAuthorization();
-        instanceAdmin.completeSetup(
-            address(getRegistry()),
-            address(instance),
-            address(instanceAuthorization),
-            getRelease());
-
-        // hard checks for newly cloned instance
-        assert(address(instance.getRegistry()) == address(getRegistry()));
-        assert(instance.getRelease() == getRelease());
-
         // register cloned instance as staking target
         _stakingService.createInstanceTarget(
             instanceNftId,
             TargetManagerLib.getDefaultLockingPeriod(),
             TargetManagerLib.getDefaultRewardRate());
 
+        // MUST be set after instance is set up and registered
+        IAuthorization instanceAuthorization = InstanceAdmin(_masterInstanceAdmin).getInstanceAuthorization();
+        VersionPart release = AccessManagerCloneable(authority()).getRelease();
+        instanceAdmin.completeSetup(
+            address(instance),
+            address(instanceAuthorization));
+
         emit LogInstanceCloned(
             instanceNftId,
             address(instance));
@@ -165,18 +153,6 @@ contract InstanceService is
             rewardRate);
     }
 
-    function setStakingMaxAmount(Amount maxStakedAmount)
-        external
-        virtual
-        restricted()
-        onlyInstance()
-    {
-        NftId instanceNftId = getRegistry().getNftIdForAddress(msg.sender);
-        _stakingService.setInstanceMaxStakedAmount(
-            instanceNftId,
-            maxStakedAmount);
-    }    
-
 
     function refillStakingRewardReserves(address rewardProvider, Amount dipAmount)
         external
@@ -205,23 +181,22 @@ contract InstanceService is
             dipAmount);
     }
 
-
-    function upgradeInstanceReader() 
+    function upgradeInstanceReader(NftId instanceNftId) 
         external 
+        nonReentrant()
         restricted()
-        onlyInstance()
+        onlyInstanceOwner(instanceNftId) 
+        onlyNftOfType(instanceNftId, INSTANCE())
     {
-        address instanceAddress = msg.sender;
-        IInstance instance = IInstance(msg.sender);
+        IRegistry registry = getRegistry();
+        IRegistry.ObjectInfo memory instanceInfo = registry.getObjectInfo(instanceNftId);
+        Instance instance = Instance(instanceInfo.objectAddress);
         
-        InstanceReader upgradedInstanceReaderClone = InstanceReader(
-            Clones.clone(address(_masterInstanceReader)));
-
-        upgradedInstanceReaderClone.initializeWithInstance(instanceAddress);
+        InstanceReader upgradedInstanceReaderClone = InstanceReader(Clones.clone(address(_masterInstanceReader)));
+        upgradedInstanceReaderClone.initializeWithInstance(address(instance));
         instance.setInstanceReader(upgradedInstanceReaderClone);
     }
 
-
     function setAndRegisterMasterInstance(address instanceAddress)
         external 
         onlyOwner()
@@ -294,23 +269,22 @@ contract InstanceService is
 
     /// @dev create new cloned instance admin
     /// function used to setup a new instance
-    function _cloneNewInstanceAdmin()
+    function _createInstanceAdmin()
         internal
         virtual
-        returns (InstanceAdmin clonedAdmin)
+        returns (InstanceAdmin clonedInstanceAdmin)
     {
-        // clone instance specific access manager
+        // start with setting up a new OZ access manager
+        // TODO consider _masterInstanceAdmin.authority() instead of _masterAccessManager
         AccessManagerCloneable clonedAccessManager = AccessManagerCloneable(
-            Clones.clone(
-                InstanceAdmin(_masterInstanceAdmin).authority()));
+            Clones.clone(_masterAccessManager));
         
         // set up the instance admin
-        clonedAdmin = InstanceAdmin(
-            Clones.clone(_masterInstanceAdmin));
-
-        clonedAdmin.initialize(
-            address(clonedAccessManager),
-            "InstanceAdmin");
+        clonedInstanceAdmin = InstanceAdmin(Clones.clone(_masterInstanceAdmin));
+        clonedInstanceAdmin.initialize(
+            clonedAccessManager,
+            getRegistry(),
+            getRelease());
     }
 
 
@@ -338,9 +312,7 @@ contract InstanceService is
             clonedRiskSet,
             clonedInstanceReader,
             getRegistry(),
-            getRelease(),
             instanceOwner);
-
         return clonedInstance;
     }
 
@@ -425,36 +397,6 @@ contract InstanceService is
         
     }
 
-
-    function _checkInstance(
-        address instanceAddress,
-        VersionPart expectedRelease
-    )
-        internal
-        virtual
-        view
-    {
-        IRegistry registry = getRegistry();
-
-        NftId instanceNftId = registry.getNftIdForAddress(instanceAddress);
-        if (instanceNftId.eqz()) {
-            revert ErrorInstanceServiceNotRegistered(instanceAddress);
-        }
-
-        ObjectType objectType = registry.getObjectInfo(instanceNftId).objectType;
-        if (objectType != INSTANCE()) {
-            revert ErrorInstanceServiceNotInstance(instanceAddress, objectType);
-        }
-
-        if (expectedRelease.gtz()) {
-            VersionPart instanceRelease = IInstance(instanceAddress).getRelease();
-            if (instanceRelease != expectedRelease) {
-                revert ErrorInstanceServiceInstanceVersionMismatch(instanceNftId, expectedRelease, instanceRelease);
-            }
-        }
-    }
-
-
     // From IService
     function _getDomain() internal pure override returns(ObjectType) {
         return INSTANCE();

package/contracts/oracle/BasicOracleAuthorization.sol

@@ -15,7 +15,7 @@ contract BasicOracleAuthorization
 {
 
      constructor(string memory componentName)
-          Authorization(componentName, ORACLE(), true, false)
+          Authorization(componentName, ORACLE())
      {}
 
      function _setupTargetAuthorizations()

package/contracts/oracle/OracleService.sol

@@ -48,7 +48,7 @@ contract OracleService is
     )
         external 
         virtual 
-        restricted()
+        // restricted() // add authz
         onlyNftOfType(oracleNftId, ORACLE())
         returns (RequestId requestId) 
     {
@@ -104,7 +104,7 @@ contract OracleService is
     )
         external
         virtual
-        restricted()
+        // restricted() // add authz
         returns (bool success)
     {
         (
@@ -153,7 +153,7 @@ contract OracleService is
     function resend(RequestId requestId)
         external 
         virtual 
-        restricted()
+        // restricted() // add authz
     {
         (
             IRegistry.ObjectInfo memory info, 
@@ -192,7 +192,7 @@ contract OracleService is
     function cancel(RequestId requestId)
         external 
         virtual 
-        restricted()
+        // restricted() // add authz
     {
         (
             IRegistry.ObjectInfo memory info, 

package/contracts/pool/BasicPoolAuthorization.sol

@@ -18,7 +18,7 @@ contract BasicPoolAuthorization
 {
 
      constructor(string memory poolName)
-          Authorization(poolName, POOL(), true, true)
+          Authorization(poolName, POOL())
      {}
 
      function _setupServiceTargets()

package/contracts/pool/PoolLib.sol

@@ -15,8 +15,6 @@ import {InstanceReader} from "../instance/InstanceReader.sol";
 import {InstanceStore} from "../instance/InstanceStore.sol";
 import {NftId} from "../type/NftId.sol";
 import {ObjectType, BUNDLE, POOL} from "../type/ObjectType.sol";
-import {PayoutId} from "../type/PayoutId.sol";
-import {TokenHandler} from "../shared/TokenHandler.sol";
 import {UFixed} from "../type/UFixed.sol";
 
 library PoolLib {
@@ -107,7 +105,7 @@ library PoolLib {
         Amount payoutAmount,
         address payoutBeneficiary
     )
-        public
+        external
         view
         returns (
             Amount netPayoutAmount,
@@ -215,95 +213,4 @@ library PoolLib {
             revert INftOwnable.ErrorNftOwnableInvalidType(nftId, expectedObjectType);
         }
     }
-
-    function transferTokenAndNotifyPolicyHolder(
-        IRegistry registry,
-        InstanceReader instanceReader,
-        TokenHandler poolTokenHandler,
-        NftId productNftId,
-        NftId policyNftId,
-        PayoutId payoutId,
-        Amount payoutAmount,
-        address payoutBeneficiary
-    )
-        external
-    {
-        (
-            Amount netPayoutAmount,
-            Amount processingFeeAmount,
-            address beneficiary
-        ) = calculatePayoutAmounts(
-            registry,
-            instanceReader,
-            productNftId, 
-            policyNftId,
-            payoutAmount,
-            payoutBeneficiary);
-
-        // 1st token tx to payout to beneficiary
-        poolTokenHandler.pushToken(
-            beneficiary, 
-            netPayoutAmount);
-
-        // 2nd token tx to transfer processing fees to product wallet
-        // if processingFeeAmount > 0
-        if (processingFeeAmount.gtz()) {
-            poolTokenHandler.pushToken(
-                instanceReader.getWallet(productNftId), 
-                processingFeeAmount);
-        }
-
-        // callback to policy holder if applicable
-        policyHolderPayoutExecuted(
-            registry,
-            policyNftId, 
-            payoutId, 
-            beneficiary, 
-            netPayoutAmount);
-    }
-
-    function policyHolderPayoutExecuted(
-        IRegistry registry,
-        NftId policyNftId, 
-        PayoutId payoutId,
-        address beneficiary,
-        Amount payoutAmount
-    )
-        private
-    {
-        IPolicyHolder policyHolder = getPolicyHolder(registry, policyNftId);
-        if(address(policyHolder) != address(0)) {
-            policyHolder.payoutExecuted(policyNftId, payoutId, payoutAmount, beneficiary);
-        }
-    }
-
-    /// @dev Transfers the specified amount from the "from account" to the pool's wallet
-    function pullStakingAmount(
-        InstanceReader reader,
-        NftId poolNftId,
-        address from,
-        Amount amount
-    )
-        external
-    {
-        IComponents.ComponentInfo memory info = reader.getComponentInfo(poolNftId);
-        info.tokenHandler.pullToken(
-            from,
-            amount);
-    }
-
-    /// @dev Transfers the specified amount from the pool's wallet to the "to account"
-    function pushUnstakingAmount(
-        InstanceReader reader,
-        NftId poolNftId,
-        address to,
-        Amount amount
-    )
-        external
-    {
-        IComponents.ComponentInfo memory info = reader.getComponentInfo(poolNftId);
-        info.tokenHandler.pushToken(
-            to, 
-            amount);
-    }
 }