@etherisc/gif-next 0.0.2-b1fff40-773 → 0.0.2-b2070b1-995

package/contracts/staking/StakingService.sol

@@ -3,22 +3,17 @@ pragma solidity ^0.8.20;
 
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 
-import {Amount} from "../type/Amount.sol";
-import {ChainNft} from "../registry/ChainNft.sol";
-import {IPoolService} from "../pool/IPoolService.sol";
 import {IRegisterable} from "../shared/IRegisterable.sol";
 import {IRegistry} from "../registry/IRegistry.sol";
-import {RegistryService} from "../registry/RegistryService.sol";
 import {IStaking} from "./IStaking.sol";
 import {IStakingService} from "./IStakingService.sol";
+
+import {Amount} from "../type/Amount.sol";
+import {RegistryService} from "../registry/RegistryService.sol";
 import {NftId, NftIdLib} from "../type/NftId.sol";
-import {ObjectType, INSTANCE, PROTOCOL, REGISTRY, STAKE, STAKING} from "../type/ObjectType.sol";
+import {ObjectType, INSTANCE, REGISTRY, STAKE, STAKING} from "../type/ObjectType.sol";
 import {Seconds} from "../type/Seconds.sol";
 import {Service} from "../shared/Service.sol";
-import {StakeManagerLib} from "./StakeManagerLib.sol";
-import {StakingReader} from "./StakingReader.sol";
-import {TargetManagerLib} from "./TargetManagerLib.sol";
-import {Timestamp} from "../type/Timestamp.sol";
 import {TokenHandler} from "../shared/TokenHandler.sol";
 import {UFixed} from "../type/UFixed.sol";
 
@@ -38,14 +33,16 @@ contract StakingService is
         TokenHandler _tokenHandler;
     }
 
-    modifier onlyNftOwner(NftId nftId) {
-        if(msg.sender != getRegistry().ownerOf(nftId)) {
-            revert ErrorStakingServiceNotNftOwner(nftId, getRegistry().ownerOf(nftId), msg.sender);
+
+    modifier onlyStaking() {
+        if (msg.sender != address(_getStakingServiceStorage()._staking)) {
+            revert ErrorStakingServiceNotStaking(msg.sender);
         }
         _;
     }
 
 
+    /// @inheritdoc IStakingService
     function createInstanceTarget(
         NftId targetNftId,
         Seconds initialLockingPeriod,
@@ -59,7 +56,6 @@ contract StakingService is
         _getStakingServiceStorage()._staking.registerTarget(
             targetNftId,
             INSTANCE(),
-            chainId,
             initialLockingPeriod,
             initialRewardRate);
 
@@ -67,88 +63,93 @@ contract StakingService is
     }
 
 
+    /// @inheritdoc IStakingService
     function setInstanceLockingPeriod(NftId instanceNftId, Seconds lockingPeriod)
         external
         virtual
         restricted()
     {
+        _checkNftType(instanceNftId, INSTANCE());
         _getStakingServiceStorage()._staking.setLockingPeriod(
             instanceNftId, 
             lockingPeriod);
     }
 
 
+    /// @inheritdoc IStakingService
     function setInstanceRewardRate(NftId instanceNftId, UFixed rewardRate)
         external
         virtual
         restricted()
     {
+        _checkNftType(instanceNftId, INSTANCE());
         _getStakingServiceStorage()._staking.setRewardRate(
             instanceNftId, 
             rewardRate);
     }
 
 
-    function refillInstanceRewardReserves(NftId instanceNftId, address rewardProvider, Amount dipAmount)
+    /// @inheritdoc IStakingService
+    function setInstanceMaxStakedAmount(NftId instanceNftId, Amount maxStakingAmount)
         external
         virtual
         restricted()
-        returns (Amount newBalance)
     {
-        return _refillRewardReserves(instanceNftId, rewardProvider, dipAmount);
+        _checkNftType(instanceNftId, INSTANCE());
+        _getStakingServiceStorage()._staking.setMaxStakedAmount(
+            instanceNftId, 
+            maxStakingAmount);
     }
 
 
-    function refillRewardReservesBySender(NftId targetNftId, Amount dipAmount)
+    /// @inheritdoc IStakingService
+    function refillInstanceRewardReserves(NftId instanceNftId, address rewardProvider, Amount dipAmount)
         external
         virtual
         restricted()
         returns (Amount newBalance)
     {
-        address rewardProvider = msg.sender;
-        return _refillRewardReserves(targetNftId, rewardProvider, dipAmount);
+        // 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);
     }
 
 
+    /// @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();
-        newBalance = $._staking.withdrawRewardReserves(instanceNftId, dipAmount);
-
-        // transfer withdrawal amount to target owner
         address instanceOwner = getRegistry().ownerOf(instanceNftId);
-        $._staking.transferDipAmount(
-            instanceOwner,
-            dipAmount);
+        newBalance = $._staking.withdrawRewardReservesByService(instanceNftId, dipAmount, instanceOwner);
 
         emit LogStakingServiceRewardReservesDecreased(instanceNftId, instanceOwner, dipAmount, newBalance);
     }
 
 
-    /// @dev creates a new stake to the specified target nft id with the provided dip amount
-    /// the target nft id must have been registered as an active staking target prior to this call
-    /// the sender of this transaction becomes the stake owner via the minted nft.
-    /// to create the new stake balance and allowance of the staker need to cover the dip amount
-    /// the allowance needs to be on the token handler of the staking contract (getTokenHandler())
-    /// this is a permissionless function.
-    function create(
+    /// @inheritdoc IStakingService
+    function createStakeObject(
         NftId targetNftId,
-        Amount dipAmount
+        address stakeOwner
     )
         external
         virtual
         restricted()
-        returns (
-            NftId stakeNftId
-        )
+        onlyStaking()
+        returns (NftId stakeNftId)
     {
         StakingServiceStorage storage $ = _getStakingServiceStorage();
-        address stakeOwner = msg.sender;
 
         // target nft id checks are performed in $._staking.createStake() below
         // register new stake object with registry
@@ -163,118 +164,42 @@ contract StakingService is
                 data: ""
             }));
 
-        // create stake info with staking
-        $._staking.createStake(
-            stakeNftId, 
-            targetNftId,
-            dipAmount);
-
-        // collect staked dip by staking
-        $._staking.collectDipAmount(
-            stakeOwner,
-            dipAmount);
-
-        emit LogStakingServiceStakeCreated(stakeNftId, targetNftId, stakeOwner, dipAmount);
-    }
-
-
-    function stake(
-        NftId stakeNftId,
-        Amount dipAmount
-    )
-        external
-        virtual
-        restricted()
-        onlyNftOwner(stakeNftId)
-    {
-        StakingServiceStorage storage $ = _getStakingServiceStorage();
-        address stakeOwner = msg.sender;
-
-        // add additional staked dips by staking 
-        Amount stakeBalance = $._staking.stake(
-            stakeNftId, 
-            dipAmount);
-
-        // collect staked dip by staking
-        if (dipAmount.gtz()) {
-            $._staking.collectDipAmount(
-                stakeOwner,
-                dipAmount);
-        }
-
-        emit LogStakingServiceStakeIncreased(stakeNftId, stakeOwner, dipAmount, stakeBalance);
+        emit LogStakingServiceStakeObjectCreated(stakeNftId, targetNftId, stakeOwner);
     }
 
 
-    function restakeToNewTarget(
-        NftId stakeNftId,
-        NftId newTargetNftId
-    )
-        external
-        virtual
-        restricted()
-        onlyNftOwner(stakeNftId)
-        returns (
-            NftId newStakeNftId
-        )
-    {
-        StakingServiceStorage storage $ = _getStakingServiceStorage();
-        // TODO implement
-    } 
-
-
-    function updateRewards(
-        NftId stakeNftId
-    )
+    /// @inheritdoc IStakingService
+    function pullDipToken(Amount dipAmount, address stakeOwner)
         external
         virtual
         restricted()
+        onlyStaking()
     {
-        StakingServiceStorage storage $ = _getStakingServiceStorage();
-        $._staking.updateRewards(stakeNftId);
-
-        emit LogStakingServiceRewardsUpdated(stakeNftId);
+        _getStakingServiceStorage()._tokenHandler.pullToken(stakeOwner, dipAmount);
     }
 
 
-    function claimRewards(NftId stakeNftId)
+    /// @inheritdoc IStakingService
+    function pushDipToken(Amount dipAmount, address stakeOwner)
         external
         virtual
         restricted()
-        onlyNftOwner(stakeNftId)
+        onlyStaking()
     {
-        StakingServiceStorage storage $ = _getStakingServiceStorage();
-        address stakeOwner = msg.sender;
-
-        Amount rewardsClaimedAmount = $._staking.claimRewards(stakeNftId);
-        $._staking.transferDipAmount(
-            stakeOwner,
-            rewardsClaimedAmount);
-
-        emit LogStakingServiceRewardsClaimed(stakeNftId, stakeOwner, rewardsClaimedAmount);
+        _getStakingServiceStorage()._tokenHandler.pushToken(stakeOwner, dipAmount);
     }
 
 
-    function unstake(NftId stakeNftId)
+    /// @inheritdoc IStakingService
+    function approveTokenHandler(
+        IERC20Metadata token,
+        Amount amount
+    )
         external
         virtual
-        restricted()
-        onlyNftOwner(stakeNftId)
+        onlyStaking()
     {
-        StakingServiceStorage storage $ = _getStakingServiceStorage();
-        address stakeOwner = msg.sender;
-
-        (
-            Amount unstakedAmount,
-            Amount rewardsClaimedAmount
-        ) = $._staking.unstake(stakeNftId);
-
-        Amount totalAmount = unstakedAmount + rewardsClaimedAmount;
-        $._staking.transferDipAmount(
-            stakeOwner,
-            totalAmount);
-
-        emit LogStakingServiceUnstaked(stakeNftId, stakeOwner, totalAmount);
+        _getStakingServiceStorage()._tokenHandler.approve(token, amount);
     }
 
 
@@ -295,6 +220,7 @@ contract StakingService is
 
     function getDipToken()
         external
+        view
         virtual
         returns (IERC20Metadata dip)
     {
@@ -304,6 +230,7 @@ contract StakingService is
 
     function getTokenHandler()
         external
+        view
         virtual
         returns (TokenHandler tokenHandler)
     {
@@ -313,6 +240,7 @@ contract StakingService is
 
     function getStaking()
         external
+        view
         virtual
         returns (IStaking staking)
     {
@@ -331,19 +259,19 @@ contract StakingService is
     {
         (
             address authority,
-            address registryAddress,
-            address stakingAddress
+            address registry,
+            address staking
         ) = abi.decode(data, (address, address, address));
 
-        initializeService(registryAddress, authority, owner);
+        __Service_init(authority, registry, owner);
 
         StakingServiceStorage storage $ = _getStakingServiceStorage();
         $._registryService = RegistryService(_getServiceAddress(REGISTRY()));
-        $._staking = _registerStaking(stakingAddress);
+        $._staking = _registerStaking(staking);
         $._dip = $._staking.getToken();
         $._tokenHandler = $._staking.getTokenHandler();
 
-        registerInterface(type(IStakingService).interfaceId);
+        _registerInterface(type(IStakingService).interfaceId);
     }
 
 
@@ -380,24 +308,6 @@ contract StakingService is
     }
 
 
-    function _refillRewardReserves(NftId targetNftId, address rewardProvider, Amount dipAmount)
-        internal
-        virtual
-        returns (Amount newBalance)
-    {
-        // update reward reserve book keeping
-        StakingServiceStorage storage $ = _getStakingServiceStorage();
-        newBalance = $._staking.refillRewardReserves(targetNftId, dipAmount);
-
-        // collect reward dip from provider
-        $._staking.collectDipAmount(
-            rewardProvider,
-            dipAmount);
-
-        emit LogStakingServiceRewardReservesIncreased(targetNftId, rewardProvider, dipAmount, newBalance);
-    }
-
-
     function _getStakingServiceStorage() private pure returns (StakingServiceStorage storage $) {
         assembly {
             $.slot := STAKING_SERVICE_LOCATION_V1

package/contracts/staking/StakingServiceManager.sol

@@ -3,6 +3,7 @@ pragma solidity ^0.8.20;
 
 import {IRegistry} from "../registry/IRegistry.sol";
 import {IVersionable} from "../upgradeability/IVersionable.sol";
+
 import {ProxyManager} from "../upgradeability/ProxyManager.sol";
 import {StakingService} from "./StakingService.sol";
 
@@ -15,17 +16,18 @@ contract StakingServiceManager is
     /// @dev initializes proxy manager with service implementation 
     constructor(
         address authority,
-        address registryAddress,
+        address registry,
         bytes32 salt
     )
-        ProxyManager(registryAddress)
     {
         StakingService svc = new StakingService();
         bytes memory data = abi.encode(
             authority, 
-            registryAddress, 
-            IRegistry(registryAddress).getStakingAddress());
-        IVersionable versionable = deployDetermenistic(
+            registry, 
+            IRegistry(registry).getStakingAddress());
+
+        IVersionable versionable = initialize(
+            registry,
             address(svc), 
             data,
             salt);