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

package/contracts/shared/ComponentService.sol

@@ -94,7 +94,6 @@ contract ComponentService is
     function registerComponent(address component)
         external
         virtual
-        restricted()
         onlyComponent(component)
         returns (NftId componentNftId)
     {
@@ -120,7 +119,6 @@ contract ComponentService is
     )
         external
         virtual
-        restricted()
     {
         // checks
         (NftId componentNftId, IInstance instance) = _getAndVerifyActiveComponent(COMPONENT());
@@ -135,7 +133,6 @@ contract ComponentService is
     function setWallet(address newWallet)
         external
         virtual
-        restricted()
     {
         // checks
         (NftId componentNftId, IInstance instance) = _getAndVerifyActiveComponent(COMPONENT());
@@ -147,24 +144,31 @@ contract ComponentService is
     }
 
     /// @inheritdoc IComponentService
-    function setLocked(bool locked) 
+    function setLockedFromInstance(address componentAddress, bool locked) 
         external 
         virtual
-        restricted()
+        onlyInstance()
     {
-        (, IInstance instance) = _getAndVerifyComponent(COMPONENT(), false);
+        address instanceAddress = msg.sender;
+        // NftId instanceNftId = getRegistry().getNftIdForAddress(msg.sender);
+        IInstance instance = IInstance(instanceAddress);
+        _setLocked(instance.getInstanceAdmin(), componentAddress, locked);
+    }
 
-        address component = msg.sender;
-        instance.getInstanceAdmin().setComponentLocked(
-            component, 
-            locked);
+    /// @inheritdoc IComponentService
+    function setLockedFromComponent(address componentAddress, bool locked) 
+        external
+        virtual
+        onlyComponent(msg.sender)
+    {
+        (, IInstance instance) = _getAndVerifyComponent(COMPONENT(), false);
+        _setLocked(instance.getInstanceAdmin(), componentAddress, locked);
     }
 
     /// @inheritdoc IComponentService
     function withdrawFees(Amount amount)
         external
         virtual
-        restricted()
         returns (Amount withdrawnAmount)
     {
         // checks
@@ -194,7 +198,6 @@ contract ComponentService is
             componentNftId, 
             withdrawnAmount);
         
-        // transfer amount to component owner
         address componentOwner = getRegistry().ownerOf(componentNftId);
         TokenHandler tokenHandler = instanceReader.getTokenHandler(componentNftId);
         emit LogComponentServiceComponentFeesWithdrawn(
@@ -216,7 +219,6 @@ contract ComponentService is
     function registerProduct(address productAddress)
         external
         virtual
-        restricted()
         nonReentrant()
         onlyComponent(productAddress)
         returns (NftId productNftId)
@@ -255,7 +257,6 @@ contract ComponentService is
     )
         external
         virtual
-        restricted()
         nonReentrant()
     {
         (NftId productNftId, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
@@ -321,7 +322,6 @@ contract ComponentService is
     )
         external
         virtual
-        restricted()
     {
         (NftId distributionNftId, IInstance instance) = _getAndVerifyActiveComponent(DISTRIBUTION());
         (NftId productNftId, IComponents.FeeInfo memory feeInfo) = _getLinkedFeeInfo(
@@ -422,7 +422,6 @@ contract ComponentService is
     )
         external
         virtual
-        restricted()
     {
         (NftId poolNftId, IInstance instance) = _getAndVerifyActiveComponent(POOL());
 
@@ -503,29 +502,26 @@ contract ComponentService is
         }
 
         // deploy and wire token handler
-        address token;
-        {
-            IComponents.ComponentInfo memory componentInfo = component.getInitialComponentInfo();
-            token = address(componentInfo.token);
-            componentInfo.tokenHandler = TokenHandlerDeployerLib.deployTokenHandler(
-                address(getRegistry()),
-                componentAddress, // initially, component is its own wallet
-                token, 
-                address(instanceAdmin.authority()));
-            
-            // register component with instance
-            instanceStore.createComponent(
-                componentNftId, 
-                componentInfo);
-        }
+        IComponents.ComponentInfo memory componentInfo = component.getInitialComponentInfo();
+        IERC20Metadata token = componentInfo.token;
+        componentInfo.tokenHandler = TokenHandlerDeployerLib.deployTokenHandler(
+            address(getRegistry()),
+            address(component), // initially, component is its own wallet
+            address(token), 
+            address(instanceAdmin.authority()));
+        
+        // register component with instance
+        instanceStore.createComponent(
+            componentNftId, 
+            componentInfo);
 
         // link component contract to nft id
         component.linkToRegisteredNftId();
 
         // authorize
-        instanceAdmin.initializeComponentAuthorization(componentAddress, requiredType);
+        instanceAdmin.initializeComponentAuthorization(component);
 
-        emit LogComponentServiceRegistered(instanceNftId, componentNftId, requiredType, componentAddress, token, initialOwner);
+        emit LogComponentServiceRegistered(instanceNftId, componentNftId, requiredType, address(component), address(token), initialOwner);
     }
 
 

package/contracts/shared/ContractLib.sol

@@ -3,7 +3,6 @@ pragma solidity ^0.8.20;
 
 import {ERC165Checker} from "@openzeppelin/contracts/utils/introspection/ERC165Checker.sol";
 import {IAccessManager} from "@openzeppelin/contracts/access/manager/IAccessManager.sol";
-import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
 
 // import {InstanceAdmin} from "../instance/InstanceAdmin.sol";
 import {IRegistry} from "../registry/IRegistry.sol";
@@ -171,33 +170,6 @@ library ContractLib {
     }
 
 
-    function isAccessManaged(address target)
-        public
-        view
-        returns (bool)
-    {
-        if (!isContract(target)) {
-            return false;
-        }
-
-        (bool success, ) = target.staticcall(
-            abi.encodeWithSelector(
-                IAccessManaged.authority.selector));
-
-        return success;
-    }
-
-
-    function isRegistered(address registry, address caller, ObjectType expectedType) public view returns (bool) {
-        NftId nftId = IRegistry(registry).getNftIdForAddress(caller);
-        if (nftId.eqz()) {
-            return false;
-        }
-
-        return IRegistry(registry).getObjectInfo(nftId).objectType == expectedType;
-    }
-
-
     function isRegistry(address registry) public view returns (bool) {
         if (!isContract(registry)) {
             return false;

package/contracts/shared/IComponentService.sol

@@ -67,12 +67,14 @@ interface IComponentService is
     /// Reverts if the component's token handler wallet is not the token handler itself.
     function approveTokenHandler(IERC20Metadata token, Amount amount) external;
 
-    /// @dev Sets the components associated wallet address.
-    /// To set the wallet to the token handler contract, use address(0) as the new wallet adress.
+    /// @dev Sets the components associated wallet address
     function setWallet(address newWallet) external;
 
-    /// @dev Locks/Unlocks the calling component.
-    function setLocked(bool locked) external;
+    /// @dev Locks/Unlocks the given component - call from instanceService
+    function setLockedFromInstance(address componentAddress, bool locked) external;
+
+    /// @dev Locks/Unlocks the given component - call from component
+    function setLockedFromComponent(address componentAddress, bool locked) external;
 
     /// @dev Withdraw fees from the distribution component. Only component owner is allowed to withdraw fees.
     /// @param withdrawAmount the amount to withdraw

package/contracts/shared/InitializableERC165.sol

@@ -11,21 +11,13 @@ contract InitializableERC165 is
     mapping(bytes4 => bool) private _isSupported;
 
     // @dev initializes with support for ERC165
-    function __ERC165_init() internal onlyInitializing() {
-        _initializeERC165();
-    }
-
-    function _initializeERC165() internal {
+    function _initializeERC165() internal onlyInitializing() {
         _isSupported[type(IERC165).interfaceId] = true;
     }
 
     // @dev register support for provided interfaceId
     // includes initialization for ERC165_ID if not yet done
     function _registerInterface(bytes4 interfaceId) internal onlyInitializing() {
-        _registerInterfaceNotInitializing(interfaceId);
-    }
-
-    function _registerInterfaceNotInitializing(bytes4 interfaceId) internal{
         _isSupported[interfaceId] = true;
     }
 

package/contracts/shared/NftOwnable.sol

@@ -41,7 +41,6 @@ contract NftOwnable is
     }
 
     function _checkNftType(NftId nftId, ObjectType expectedObjectType) internal view {
-        assert(expectedObjectType.gtz());
         if(!getRegistry().isObjectType(nftId, expectedObjectType)) {
             revert ErrorNftOwnableInvalidType(nftId, expectedObjectType);
         }
@@ -58,8 +57,8 @@ contract NftOwnable is
         virtual
         onlyInitializing()
     {
-        __ERC165_init();
         __RegistryLinked_init(registry);
+        _initializeERC165();
 
         if(initialOwner == address(0)) {
             revert ErrorNftOwnableInitialOwnerZero();

package/contracts/shared/Registerable.sol

@@ -26,6 +26,7 @@ abstract contract Registerable is
     struct RegisterableStorage {
         NftId _parentNftId;
         ObjectType _objectType;
+        VersionPart _release;
         bool _isInterceptor;
         bytes _data;
     }
@@ -60,6 +61,7 @@ abstract contract Registerable is
         RegisterableStorage storage $ = _getRegisterableStorage();
         $._parentNftId = parentNftId;
         $._objectType = objectType;
+        $._release = AccessManagerCloneable(authority).getRelease();
         $._isInterceptor = isInterceptor;
         $._data = data;
 
@@ -75,7 +77,8 @@ abstract contract Registerable is
 
     /// @inheritdoc IRelease
     function getRelease() public virtual view returns (VersionPart release) {
-        return AccessManagerCloneable(authority()).getRelease();
+        RegisterableStorage storage $ = _getRegisterableStorage();
+        return $._release;
     }
 
 

package/contracts/shared/TokenHandler.sol

@@ -270,12 +270,11 @@ contract TokenHandler is
         AccessManaged(authority)
     { }
 
-    /// @dev Sets the wallet address for the component.
-    /// Seeting the new wallet address to address(0) will set the wallet to the tokenHandler contract itself.
-    /// If the current wallet has tokens, these will be transferred.
-    /// If the new wallet address is externally owned, an approval from the 
+    /// @dev sets the wallet address for the component.
+    /// if the current wallet has tokens, these will be transferred.
+    /// if the new wallet address is externally owned, an approval from the 
     /// owner of the external wallet to the tokenhandler of the component that 
-    /// covers the current component balance must exist.
+    /// covers the current component balance must exist
     function setWallet(address newWallet)
         external
         restricted()

package/contracts/staking/IStaking.sol

@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
-
 import {Amount} from "../type/Amount.sol";
 import {IComponent} from "../shared/IComponent.sol";
 import {IVersionable} from "../upgradeability/IVersionable.sol";
@@ -24,7 +22,6 @@ interface IStaking is
     // target parameters
     event LogStakingLockingPeriodSet(NftId targetNftId, Seconds oldLockingPeriod, Seconds lockingPeriod);
     event LogStakingRewardRateSet(NftId targetNftId, UFixed oldRewardRate, UFixed rewardRate);
-    event LogStakingMaxStakedAmountSet(NftId targetNftId, Amount maxStakedAmount);
 
     // modifiers
     error ErrorStakingNotStake(NftId stakeNftId);
@@ -54,8 +51,8 @@ interface IStaking is
     error ErrorStakingRewardRateTooHigh(NftId targetNftId, UFixed maxRewardRate, UFixed rewardRate);
     error ErrorStakingTargetNotFound(NftId targetNftId);
     error ErrorStakingTargetTokenNotFound(NftId targetNftId, uint256 chainId, address token);
-    error ErrorStakingTargetMaxStakedAmountExceeded(NftId targetNftId, Amount maxStakedAmount, Amount stakedAmount);
 
+    error ErrorStakingTargetNotActive(NftId targetNftId);
     error ErrorStakingStakeAmountZero(NftId targetNftId);
 
     // info for individual stake
@@ -68,13 +65,10 @@ interface IStaking is
         uint256 chainId;
         Seconds lockingPeriod;
         UFixed rewardRate;
-        Amount maxStakedAmount;
     }
 
     function initializeTokenHandler() external;
 
-    function approveTokenHandler(IERC20Metadata token, Amount amount) external;
-
     // staking rate management 
 
     /// @dev sets the rate that converts 1 token of total value locked into the
@@ -101,10 +95,6 @@ interface IStaking is
     /// permissioned: only the staking service may call this function
     function setRewardRate(NftId targetNftId, UFixed rewardRate) external;
 
-    /// @dev set the maximum staked amount for the specified target.
-    /// permissioned: only the staking service may call this function
-    function setMaxStakedAmount(NftId targetNftId, Amount maxStakedAmount) external;
-
     /// @dev (re)fills the staking reward reserves for the specified target
     /// unpermissioned: anybody may fill up staking reward reserves
     function refillRewardReserves(NftId targetNftId, Amount dipAmount) external returns (Amount newBalance);
@@ -142,7 +132,7 @@ interface IStaking is
     /// @dev restakes the dips to a new target.
     /// the sum of the staked dips and the accumulated rewards will be restaked.
     /// permissioned: only staking service may call this function.
-    function restake(NftId stakeNftId, NftId newStakeNftId) external returns (Amount newStakeBalance);
+    function restake(NftId stakeNftId, NftId newTargetNftId) external returns (NftId newStakeNftId);
 
     /// @dev retuns the specified amount of dips to the holder of the specified stake nft.
     /// if dipAmount is set to Amount.max() all staked dips and all rewards are transferred to 

package/contracts/staking/IStakingService.sol

@@ -26,7 +26,6 @@ interface IStakingService is IService
     event LogStakingServiceStakeCreated(NftId stakeNftId, NftId targetNftId, address owner, Amount stakedAmount);
     event LogStakingServiceStakeIncreased(NftId stakeNftId, address owner, Amount stakedAmount, Amount stakeBalance);
     event LogStakingServiceUnstaked(NftId stakeNftId, address stakeOwner, Amount totalAmount);
-    event LogStakingServiceStakeRestaked(address stakeOwner, NftId indexed stakeNftId, NftId newStakeNftId, NftId indexed newTargetNftId, Amount indexed newStakeBalance);
 
     event LogStakingServiceRewardsUpdated(NftId stakeNftId);
     event LogStakingServiceRewardsClaimed(NftId stakeNftId, address stakeOwner, Amount rewardsClaimedAmount);
@@ -37,7 +36,6 @@ interface IStakingService is IService
     error ErrorStakingServiceNotSupportingIStaking(address stakingAddress);
 
     // create
-    error ErrorStakingServiceTargetUnknown(NftId targetNftId);
     error ErrorStakingServiceZeroTargetNftId();
     error ErrorStakingServiceNotTargetNftId(NftId targetNftId);
     error ErrorStakingServiceNotActiveTargetNftId(NftId targetNftId);
@@ -74,10 +72,6 @@ interface IStakingService is IService
     /// Permissioned: Only owner of the specified target.
     function setInstanceRewardRate(NftId instanceNftId, UFixed rewardRate) external;
 
-    /// @dev Set the instance max staked amount to the specified value.
-    /// Permissioned: Only owner of the specified target.
-    function setInstanceMaxStakedAmount(NftId instanceNftId, Amount maxStakingAmount) external;
-
     /// @dev (Re)fills the staking reward reserves for the specified target using the dips provided by the reward provider.
     /// unpermissioned: anybody may fill up staking reward reserves
     function refillInstanceRewardReserves(NftId instanceNftId, address rewardProvider, Amount dipAmount) external returns (Amount newBalance);
@@ -122,8 +116,7 @@ interface IStakingService is IService
     )
         external
         returns (
-            NftId newStakeNftId,
-            Amount newStakeBalance
+            NftId newStakeNftId
         );
 
 
@@ -160,16 +153,13 @@ interface IStakingService is IService
 
     function getDipToken()
         external
-        view
         returns (IERC20Metadata dip);
 
     function getTokenHandler()
         external
-        view
         returns (TokenHandler tokenHandler);
 
     function getStaking()
         external
-        view
         returns (IStaking staking);
 }

package/contracts/staking/{StakingLib.sol → StakeManagerLib.sol}

@@ -1,10 +1,16 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
+import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+
 import {Amount, AmountLib} from "../type/Amount.sol";
+import {Component} from "../shared/Component.sol";
 import {IRegistry} from "../registry/IRegistry.sol";
+import {IRegistryService} from "../registry/IRegistryService.sol";
 import {IStaking} from "./IStaking.sol";
+import {Key32} from "../type/Key32.sol";
 import {NftId} from "../type/NftId.sol";
+import {ObjectType, INSTANCE, PROTOCOL, TARGET} from "../type/ObjectType.sol";
 import {Seconds, SecondsLib} from "../type/Seconds.sol";
 import {StakingReader} from "./StakingReader.sol";
 import {StakingStore} from "./StakingStore.sol";
@@ -12,7 +18,7 @@ import {Timestamp, TimestampLib} from "../type/Timestamp.sol";
 import {UFixed, UFixedLib} from "../type/UFixed.sol";
 
 
-library StakingLib {
+library StakeManagerLib {
 
     function stake(
         IRegistry registry,
@@ -46,11 +52,6 @@ library StakingLib {
         // TODO check that additional dip, rewards and rewards increment 
         // are still ok with max target staking amount
         NftId targetNftId = registry.getParentNftId(stakeNftId);
-        Amount maxStakedAmount = stakingReader.getTargetMaxStakedAmount(targetNftId);
-
-        if (stakeBalance > maxStakedAmount) {
-            revert IStaking.ErrorStakingTargetMaxStakedAmountExceeded(targetNftId, maxStakedAmount, stakeBalance);
-        }
 
         stakingStore.restakeRewards(
             stakeNftId, 
@@ -71,55 +72,6 @@ library StakingLib {
 
     }
 
-    function restake(
-        StakingReader stakingReader,
-        StakingStore stakingStore,
-        NftId oldStakeNftId,
-        NftId newStakeNftId
-    )
-        external
-        returns (Amount newStakeBalance)
-    {
-        checkUnstakeParameters(stakingReader, oldStakeNftId);
-        (NftId oldTargetNftId, UFixed oldRewardRate) = stakingReader.getTargetRewardRate(oldStakeNftId);
-        
-        // calculate new rewards update and unstake full amount
-        (
-            Amount rewardIncrementAmount,
-        ) = calculateRewardIncrease(
-            stakingReader, 
-            oldStakeNftId,
-            oldRewardRate);
-        stakingStore.updateRewards(
-            oldStakeNftId, 
-            oldTargetNftId, 
-            rewardIncrementAmount);
-        (
-            Amount unstakedAmount, 
-            Amount rewardsAmount
-        ) = stakingStore.unstakeUpTo(
-            oldStakeNftId,
-            oldTargetNftId,
-            AmountLib.max(), // unstake all stakes
-            AmountLib.max()); // claim all rewards
-
-        // calculate full restake amount
-        newStakeBalance = unstakedAmount + rewardsAmount;
-        NftId newTargetNftId = stakingReader.getTargetNftId(newStakeNftId);
-        
-        // create new staking target and increase stake
-        Timestamp newLockedUntil = _checkCreateParameters(stakingReader, newTargetNftId, newStakeBalance);
-        stakingStore.create(
-            newStakeNftId, 
-            IStaking.StakeInfo({
-                    lockedUntil: newLockedUntil
-                }));
-        stakingStore.increaseStake(
-            newStakeNftId, 
-            newTargetNftId, 
-            newStakeBalance);
-    }
-
     function checkCreateParameters(
         StakingReader stakingReader,
         NftId targetNftId, 
@@ -130,19 +82,6 @@ library StakingLib {
         returns (
             Timestamp lockedUntil
         )
-    {
-        return _checkCreateParameters(stakingReader, targetNftId, dipAmount);
-    }
-
-    function _checkCreateParameters(
-        StakingReader stakingReader,
-        NftId targetNftId, 
-        Amount dipAmount
-    )
-        internal view
-        returns (
-            Timestamp lockedUntil
-        )
     {
         Seconds lockingPeriod = checkTarget(stakingReader, targetNftId);
         checkDipAmount(stakingReader, targetNftId, dipAmount);
@@ -165,11 +104,11 @@ library StakingLib {
     {
         NftId targetNftId = stakingReader.getTargetNftId(stakeNftId);
 
-        // target nft id must be registered
-        if (!stakingReader.isTarget(targetNftId)) {
-            revert IStaking.ErrorStakingNotTarget(targetNftId);
+        // only accept stakes for active targets
+        if (!stakingReader.isActive(targetNftId)) {
+            revert IStaking.ErrorStakingTargetNotActive(targetNftId);
         }
-        
+
         IStaking.TargetInfo memory info = stakingReader.getTargetInfo(targetNftId);
         rewardRate = info.rewardRate;
         lockingPeriod = info.lockingPeriod;
@@ -182,11 +121,12 @@ library StakingLib {
         public
         view
         returns (
+            UFixed rewardRate,
             Seconds lockingPeriod
         )
     {
         IStaking.StakeInfo memory stakeInfo = stakingReader.getStakeInfo(stakeNftId);
-        
+
         if (stakeInfo.lockedUntil > TimestampLib.blockTimestamp()) {
             revert IStaking.ErrorStakingStakeLocked(stakeNftId, stakeInfo.lockedUntil);
         }
@@ -206,6 +146,11 @@ library StakingLib {
             revert IStaking.ErrorStakingNotTarget(targetNftId);
         }
 
+        // only accept stakes for active targets
+        if (!stakingReader.isActive(targetNftId)) {
+            revert IStaking.ErrorStakingTargetNotActive(targetNftId);
+        }
+
         lockingPeriod = stakingReader.getTargetInfo(targetNftId).lockingPeriod;
     }
 
@@ -216,17 +161,14 @@ library StakingLib {
         Amount dipAmount
     )
         public 
-        view 
+        pure 
     {
         // check stake amount > 0
         if (dipAmount.eqz()) {
             revert IStaking.ErrorStakingStakeAmountZero(targetNftId);
         }
 
-        Amount maxStakedAmount = stakingReader.getTargetMaxStakedAmount(targetNftId);
-        if (dipAmount > maxStakedAmount) {
-            revert IStaking.ErrorStakingTargetMaxStakedAmountExceeded(targetNftId, maxStakedAmount, dipAmount);
-        }
+        // TODO add check for target specific max dip amount (min stake + tvl * stake rate + buffer)
     }
 
     function calculateRewardIncrease(
@@ -254,10 +196,11 @@ library StakingLib {
             rewardRate,
             duration,
             stakeAmount);
-        
+
         totalDipAmount = stakeAmount + rewardAmount + rewardIncreaseAmount;
     }
 
+
     function calculateRewardAmount(
         UFixed rewardRate,
         Seconds duration,