@etherisc/gif-next 0.0.2-ff282a4-523 → 0.0.2-ff3a8a0-504

package/contracts/staking/StakingService.sol

@@ -1,17 +1,21 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.20;
+
+import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 
-import {Amount} from "../type/Amount.sol";
-import {IPoolService} from "../pool/IPoolService.sol";
 import {IRegisterable} from "../shared/IRegisterable.sol";
 import {IRegistry} from "../registry/IRegistry.sol";
-import {IRegistryService} from "../registry/IRegistryService.sol";
 import {IStaking} from "./IStaking.sol";
 import {IStakingService} from "./IStakingService.sol";
-import {NftId} from "../type/NftId.sol";
-import {ObjectType, POOL, REGISTRY, STAKE, STAKING} from "../type/ObjectType.sol";
+
+import {Amount} from "../type/Amount.sol";
+import {RegistryService} from "../registry/RegistryService.sol";
+import {NftId, NftIdLib} from "../type/NftId.sol";
+import {ObjectType, INSTANCE, REGISTRY, STAKE, STAKING} from "../type/ObjectType.sol";
+import {Seconds} from "../type/Seconds.sol";
 import {Service} from "../shared/Service.sol";
-import {Timestamp} from "../type/Timestamp.sol";
+import {TokenHandler} from "../shared/TokenHandler.sol";
+import {UFixed} from "../type/UFixed.sol";
 
 
 contract StakingService is 
@@ -23,96 +27,179 @@ contract StakingService is
     bytes32 public constant STAKING_SERVICE_LOCATION_V1 = 0x6548005c3f4340f82f348c576c0ff69f7f529cadd5ad41f96aae61abceeaa300;
 
     struct StakingServiceStorage {
+        RegistryService _registryService;
         IStaking _staking;
+        IERC20Metadata _dip;
+        TokenHandler _tokenHandler;
     }
 
-    function getDomain() public pure override returns(ObjectType) {
-        return STAKING();
+
+    modifier onlyStaking() {
+        if (msg.sender != address(_getStakingServiceStorage()._staking)) {
+            revert ErrorStakingServiceNotStaking(msg.sender);
+        }
+        _;
     }
 
 
-    function create(
+    /// @inheritdoc IStakingService
+    function createInstanceTarget(
         NftId targetNftId,
-        Amount amount
+        Seconds initialLockingPeriod,
+        UFixed initialRewardRate
     )
         external
         virtual
-        returns (
-            NftId stakeNftId
-        )
+        restricted()
     {
+        uint256 chainId = block.chainid;
+        _getStakingServiceStorage()._staking.registerTarget(
+            targetNftId,
+            INSTANCE(),
+            initialLockingPeriod,
+            initialRewardRate);
+
+        emit LogStakingServiceInstanceTargetRegistered(targetNftId, chainId);
+    }
+
 
+    /// @inheritdoc IStakingService
+    function setInstanceLockingPeriod(NftId instanceNftId, Seconds lockingPeriod)
+        external
+        virtual
+        restricted()
+    {
+        _checkNftType(instanceNftId, INSTANCE());
+        _getStakingServiceStorage()._staking.setLockingPeriod(
+            instanceNftId, 
+            lockingPeriod);
     }
 
 
-    function stake(
-        NftId stakeNftId,
-        Amount amount
-    )
+    /// @inheritdoc IStakingService
+    function setInstanceRewardRate(NftId instanceNftId, UFixed rewardRate)
         external
         virtual
+        restricted()
     {
+        _checkNftType(instanceNftId, INSTANCE());
+        _getStakingServiceStorage()._staking.setRewardRate(
+            instanceNftId, 
+            rewardRate);
+    }
 
+
+    /// @inheritdoc IStakingService
+    function setInstanceMaxStakedAmount(NftId instanceNftId, Amount maxStakingAmount)
+        external
+        virtual
+        restricted()
+    {
+        _checkNftType(instanceNftId, INSTANCE());
+        _getStakingServiceStorage()._staking.setMaxStakedAmount(
+            instanceNftId, 
+            maxStakingAmount);
     }
 
 
-    function unstake(
-        NftId stakeNftId,
-        Amount amount
-    )
+    /// @inheritdoc IStakingService
+    function refillInstanceRewardReserves(NftId instanceNftId, address rewardProvider, Amount dipAmount)
         external
         virtual
+        restricted()
+        returns (Amount newBalance)
     {
+        // checks
+        _checkNftType(instanceNftId, INSTANCE());
+
+        // update reward reserve book keeping
+        StakingServiceStorage storage $ = _getStakingServiceStorage();
+        address instanceOwner = getRegistry().ownerOf(instanceNftId);
+        newBalance = $._staking.refillRewardReservesByService(instanceNftId, dipAmount, instanceOwner);
 
+        emit LogStakingServiceRewardReservesIncreased(instanceNftId, rewardProvider, dipAmount, newBalance);
     }
 
-    function close(
-        NftId stakeNftId
-    )
+
+    /// @inheritdoc IStakingService
+    function withdrawInstanceRewardReserves(NftId instanceNftId, Amount dipAmount)
         external
         virtual
+        restricted()
+        returns (Amount newBalance)
     {
+        _checkNftType(instanceNftId, INSTANCE());
+        // update reward reserve book keeping
+        StakingServiceStorage storage $ = _getStakingServiceStorage();
+        address instanceOwner = getRegistry().ownerOf(instanceNftId);
+        newBalance = $._staking.withdrawRewardReservesByService(instanceNftId, dipAmount, instanceOwner);
 
+        emit LogStakingServiceRewardReservesDecreased(instanceNftId, instanceOwner, dipAmount, newBalance);
     }
 
-    function reStake(
-        NftId stakeNftId,
-        NftId newTargetNftId
+
+    /// @inheritdoc IStakingService
+    function createStakeObject(
+        NftId targetNftId,
+        address stakeOwner
     )
         external
         virtual
-        returns (
-            NftId newStakeNftId,
-            Timestamp unlockedAt
-        )
+        restricted()
+        onlyStaking()
+        returns (NftId stakeNftId)
     {
+        StakingServiceStorage storage $ = _getStakingServiceStorage();
 
+        // target nft id checks are performed in $._staking.createStake() below
+        // register new stake object with registry
+        stakeNftId = $._registryService.registerStake(
+            IRegistry.ObjectInfo({
+                nftId: NftIdLib.zero(),
+                parentNftId: targetNftId,
+                objectType: STAKE(),
+                isInterceptor: false,
+                objectAddress: address(0),
+                initialOwner: stakeOwner,
+                data: ""
+            }));
+
+        emit LogStakingServiceStakeObjectCreated(stakeNftId, targetNftId, stakeOwner);
     }
 
 
-    function increaseTotalValueLocked(
-        NftId targetNftId,
-        address token,
-        Amount amount
-    )
+    /// @inheritdoc IStakingService
+    function pullDipToken(Amount dipAmount, address stakeOwner)
         external
         virtual
-        returns (Amount totalValueLocked)
+        restricted()
+        onlyStaking()
     {
+        _getStakingServiceStorage()._tokenHandler.pullToken(stakeOwner, dipAmount);
+    }
 
+
+    /// @inheritdoc IStakingService
+    function pushDipToken(Amount dipAmount, address stakeOwner)
+        external
+        virtual
+        restricted()
+        onlyStaking()
+    {
+        _getStakingServiceStorage()._tokenHandler.pushToken(stakeOwner, dipAmount);
     }
 
 
-    function decreaseTotalValueLocked(
-        NftId targetNftId,
-        address token,
+    /// @inheritdoc IStakingService
+    function approveTokenHandler(
+        IERC20Metadata token,
         Amount amount
     )
         external
         virtual
-        returns (Amount totalValueLocked)
+        onlyStaking()
     {
-
+        _getStakingServiceStorage()._tokenHandler.approve(token, amount);
     }
 
 
@@ -123,18 +210,44 @@ contract StakingService is
     )
         external
         virtual
+        restricted()
     {
+        // TODO implement
 
     }
 
+    //--- view functions ----------------------------------------------------//
+
+    function getDipToken()
+        external
+        view
+        virtual
+        returns (IERC20Metadata dip)
+    {
+        return _getStakingServiceStorage()._dip;
+    }
+
+
+    function getTokenHandler()
+        external
+        view
+        virtual
+        returns (TokenHandler tokenHandler)
+    {
+        return _getStakingServiceStorage()._tokenHandler;
+    }
+
+
     function getStaking()
         external
+        view
         virtual
         returns (IStaking staking)
     {
         return _getStakingServiceStorage()._staking;
     }
 
+    //--- internal functions ------------------------------------------------//
 
     function _initialize(
         address owner, 
@@ -145,16 +258,20 @@ contract StakingService is
         initializer()
     {
         (
-            address registryAddress,
-            address stakingAddress
-        ) = abi.decode(data, (address, address));
+            address authority,
+            address registry,
+            address staking
+        ) = abi.decode(data, (address, address, address));
 
-        initializeService(registryAddress, address(0), owner);
+        __Service_init(authority, registry, owner);
 
         StakingServiceStorage storage $ = _getStakingServiceStorage();
-        $._staking = _registerStaking(stakingAddress);
+        $._registryService = RegistryService(_getServiceAddress(REGISTRY()));
+        $._staking = _registerStaking(staking);
+        $._dip = $._staking.getToken();
+        $._tokenHandler = $._staking.getTokenHandler();
 
-        registerInterface(type(IStakingService).interfaceId);
+        _registerInterface(type(IStakingService).interfaceId);
     }
 
 
@@ -165,6 +282,7 @@ contract StakingService is
         returns (IStaking staking)
     {
         // check if provided staking contract is already registred
+        // staking contract may have been already registered by a previous major relase
         IRegistry.ObjectInfo memory stakingInfo = getRegistry().getObjectInfo(stakingAddress);
         if (stakingInfo.nftId.gtz()) {
             // registered object but wrong type
@@ -182,23 +300,22 @@ contract StakingService is
         }
 
         address owner = msg.sender;
-        IRegistryService(
-            _getServiceAddress(REGISTRY())).registerStaking(
-                IRegisterable(stakingAddress),
-                owner);
+        _getStakingServiceStorage()._registryService.registerStaking(
+            IRegisterable(stakingAddress),
+            owner);
 
         return IStaking(stakingAddress);
     }
 
 
-    function _getServiceAddress(ObjectType domain) internal view returns (address) {
-        return getRegistry().getServiceAddress(domain, getVersion().toMajorPart());
-    }
-
-
     function _getStakingServiceStorage() private pure returns (StakingServiceStorage storage $) {
         assembly {
             $.slot := STAKING_SERVICE_LOCATION_V1
         }
     }
+
+
+    function _getDomain() internal pure override returns(ObjectType) {
+        return STAKING();
+    }
 }

package/contracts/staking/StakingServiceManager.sol

@@ -2,8 +2,9 @@
 pragma solidity ^0.8.20;
 
 import {IRegistry} from "../registry/IRegistry.sol";
-import {IVersionable} from "../shared/IVersionable.sol";
-import {ProxyManager} from "../shared/ProxyManager.sol";
+import {IVersionable} from "../upgradeability/IVersionable.sol";
+
+import {ProxyManager} from "../upgradeability/ProxyManager.sol";
 import {StakingService} from "./StakingService.sol";
 
 contract StakingServiceManager is
@@ -14,18 +15,22 @@ contract StakingServiceManager is
 
     /// @dev initializes proxy manager with service implementation 
     constructor(
-        address registryAddress
+        address authority,
+        address registry,
+        bytes32 salt
     )
-        ProxyManager(registryAddress)
     {
         StakingService svc = new StakingService();
         bytes memory data = abi.encode(
-            registryAddress, 
-            IRegistry(registryAddress).getStakingAddress());
+            authority, 
+            registry, 
+            IRegistry(registry).getStakingAddress());
 
-        IVersionable versionable = deploy(
+        IVersionable versionable = initialize(
+            registry,
             address(svc), 
-            data);
+            data,
+            salt);
 
         _stakingService = StakingService(address(versionable));
     }