@etherisc/gif-next 0.0.2-fd4931b-974 → 0.0.2-fd5f17a-625

package/contracts/staking/StakingManager.sol

@@ -1,47 +1,45 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IVersionable} from "../shared/IVersionable.sol";
-import {NftIdSetManager} from "../shared/NftIdSetManager.sol";
-import {ProxyManager} from "../shared/ProxyManager.sol";
+import {IVersionable} from "../upgradeability/IVersionable.sol";
+import {ProxyManager} from "../upgradeability/ProxyManager.sol";
 import {Staking} from "./Staking.sol";
-import {StakingReader} from "./StakingReader.sol";
+
 
 contract StakingManager is
     ProxyManager
 {
-
     Staking private _staking;
+    address private _initialImplementation;
+    bytes private _initializationData;
 
     /// @dev initializes proxy manager with service implementation 
     constructor(
-        address initialAuthority,
-        address registryAddress
+        address registry,
+        address tokenRegistry,
+        address stakingStore,
+        address initialOwner
     )
-        ProxyManager(registryAddress)
+        ProxyManager(registry)
     {
-        Staking stk = new Staking();
-        address stakingImplemenataion = address(stk);
-
-        NftIdSetManager targetManager = new NftIdSetManager();
-        StakingReader stakingReader = new StakingReader();
-        address initialOwner = msg.sender;
-
-        bytes memory data = abi.encode(
-            initialAuthority, 
-            registryAddress, 
-            address(targetManager),
-            address(stakingReader),
+        Staking stakingImplementation = new Staking();
+
+        _initialImplementation = address(stakingImplementation);
+        _initializationData = abi.encode(
+            registry,
+            tokenRegistry,
+            stakingStore,
             initialOwner);
 
         IVersionable versionable = deploy(
-            stakingImplemenataion, 
-            data);
+            _initialImplementation, 
+            _initializationData);
 
         _staking = Staking(address(versionable));
     }
 
     //--- view functions ----------------------------------------------------//
+
     function getStaking()
         external
         view
@@ -49,4 +47,4 @@ contract StakingManager is
     {
         return _staking;
     }
-}
+}

package/contracts/staking/StakingReader.sol

@@ -1,70 +1,97 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
+import {IRegistry} from "../registry/IRegistry.sol";
+import {IRegistryLinked} from "../shared/IRegistryLinked.sol";
+import {IStaking} from "../staking/IStaking.sol";
+
 import {Amount} from "../type/Amount.sol";
-import {IKeyValueStore} from "../shared/IKeyValueStore.sol";
-import {IComponent} from "../shared/IComponent.sol";
-import {IVersionable} from "../shared/IVersionable.sol";
+import {Blocknumber}  from "../type/Blocknumber.sol";
+import {InitializableCustom} from "../shared/InitializableCustom.sol";
 import {NftId} from "../type/NftId.sol";
-import {ObjectType, STAKE, TARGET} from "../type/ObjectType.sol";
-import {Seconds} from "../type/Seconds.sol";
-import {IStaking} from "../staking/IStaking.sol";
+import {STAKE, TARGET} from "../type/ObjectType.sol";
+import {StakingStore} from "./StakingStore.sol";
 import {Timestamp} from "../type/Timestamp.sol";
 import {UFixed} from "../type/UFixed.sol";
 
-contract StakingReader {
+contract StakingReader is
+    IRegistryLinked,
+    InitializableCustom
+{
 
-    error ErrorStakingReaderStakingAlreadySet(address staking);
+    error ErrorStakingReaderDependenciesAlreadySet();
 
+    IRegistry private _registry;
     IStaking private _staking;
+    StakingStore private _store;
 
-    function setStaking(address stakingAddress) external {
-        if (address(_staking) != address(0)) {
-            revert ErrorStakingReaderStakingAlreadySet(address(_staking));
-        }
+    constructor(IRegistry registry) InitializableCustom() {
+        _registry = registry;
+    }
 
+    function initialize(
+        address stakingAddress,
+        address stakingStoreAddress
+    )
+        external
+        initializer
+    {
         _staking = IStaking(stakingAddress);
+        _store = StakingStore(stakingStoreAddress);
     }
 
-    // view and pure functions (staking reader?)
+    // view and pure functions 
+
+    function getRegistry() external view returns (IRegistry registry) {
+        return _registry;
+    }
 
     function getStaking() external view returns (IStaking staking) {
         return _staking;
     }
 
+    function getStakingRate(uint256 chainId, address token) external view returns (UFixed stakingRate) { 
+        return _store.getStakingRate(chainId, token); 
+    }
+
 
     function isTarget(NftId targetNftId) external view returns (bool) {
-        return _staking.getTargetManager().exists(targetNftId);
+        return _store.getTargetNftIdSet().exists(targetNftId);
     }
 
 
     function targets() external view returns (uint256) {
-        return _staking.getTargetManager().nftIds();
+        return _store.getTargetNftIdSet().nftIds();
     }
 
 
     function getTargetNftId(uint256 idx) external view returns (NftId) {
-        return _staking.getTargetManager().getNftId(idx);
+        return _store.getTargetNftIdSet().getNftId(idx);
     }
 
 
     function isActive(NftId targetNftId) external view returns (bool) {
-        return _staking.getTargetManager().isActive(targetNftId);
+        return _store.getTargetNftIdSet().isActive(targetNftId);
     }
 
 
     function activeTargets() external view returns (uint256) {
-        return _staking.getTargetManager().activeNftIds();
+        return _store.getTargetNftIdSet().activeNftIds();
     }
 
 
     function getActiveTargetNftId(uint256 idx) external view returns (NftId) {
-        return _staking.getTargetManager().getActiveNftId(idx);
+        return _store.getTargetNftIdSet().getActiveNftId(idx);
+    }
+
+
+    function getTargetNftId(NftId stakeNftId) public view returns (NftId targetNftId) {
+        return _registry.getObjectInfo(stakeNftId).parentNftId;
     }
 
 
     function getTargetInfo(NftId targetNftId) public view returns (IStaking.TargetInfo memory info) {
-        bytes memory data = _staking.getData(targetNftId.toKey32(TARGET()));
+        bytes memory data = _store.getData(targetNftId.toKey32(TARGET()));
         if (data.length > 0) {
             return abi.decode(data, (IStaking.TargetInfo));
         }
@@ -72,21 +99,85 @@ contract StakingReader {
 
 
     function getStakeInfo(NftId stakeNftId) external view returns (IStaking.StakeInfo memory stakeInfo) {
-        bytes memory data = _staking.getData(stakeNftId.toKey32(STAKE()));
+        bytes memory data = _store.getData(stakeNftId.toKey32(STAKE()));
         if (data.length > 0) {
             return abi.decode(data, (IStaking.StakeInfo));
         }
     }
 
 
-    // function getTvlAmount(NftId targetNftId, address token) external view returns (Amount tvlAmount);
-    // function getStakedAmount(NftId targetNftId) external view returns (Amount stakeAmount);
+    /// @dev get the reward rate that applies to the specified stake nft id.
+    function getTargetRewardRate(NftId stakeNftId) external view returns (NftId targetNftId, UFixed rewardRate) {
+        targetNftId = getTargetNftId(stakeNftId);
+        rewardRate = getTargetInfo(targetNftId).rewardRate;
+    }
+
 
-    // function getStakingRate(uint256 chainId, address token) external view returns (UFixed stakingRate);
+    /// @dev get the reward rate for the specified target nft id.
+    function getRewardRate(NftId targetNftId) external view returns (UFixed rewardRate) {
+        return getTargetInfo(targetNftId).rewardRate;
+    }
 
-    // function calculateRewardIncrementAmount(
-    //     NftId targetNftId,
-    //     Timestamp rewardsLastUpdatedAt
-    // ) external view returns (Amount rewardIncrementAmount);
+    /// @dev returns the current reward reserve balance for the specified target.
+    function getReserveBalance(NftId targetNftId) external view returns (Amount rewardReserveBalance) {
+        return _store.getReserveBalance(targetNftId); 
+    }
 
+    function getStakeBalance(NftId nftId) external view returns (Amount balanceAmount) { 
+        return _store.getStakeBalance(nftId); 
+    }
+
+    function getRewardBalance(NftId nftId) external view returns (Amount rewardAmount) {
+        return _store.getRewardBalance(nftId); 
+    }
+
+    function getBalanceUpdatedAt(NftId nftId) external view returns (Timestamp updatedAt) {
+        return _store.getBalanceUpdatedAt(nftId); 
+    }
+
+    function getBalanceUpdatedIn(NftId nftId) external view returns (Blocknumber blocknumber) {
+        return _store.getBalanceUpdatedIn(nftId); 
+    }
+
+    function getTotalValueLocked(NftId nftId, address token) external view returns (Amount totalValueLocked) {
+        return _store.getTotalValueLocked(nftId, token); 
+    }
+
+    function getRequiredStakeBalance(NftId nftId) external view returns (Amount requiredStakedAmount) {
+        return _store.getRequiredStakeBalance(nftId); 
+    }
+
+    function getTargetBalances(NftId stakeNftId) 
+        public
+        view
+        returns (
+            Amount balanceAmount,
+            Amount stakeAmount,
+            Amount rewardAmount,
+            Blocknumber lastUpdatedIn
+        )
+    {
+        (
+            balanceAmount,
+            stakeAmount,
+            rewardAmount,
+            lastUpdatedIn
+        ) = _store.getTargetBalances(stakeNftId);
+    }
+
+    function getStakeBalances(NftId stakeNftId) 
+        external
+        view
+        returns (
+            Amount stakeAmount,
+            Amount rewardAmount,
+            Timestamp lastUpdatedAt
+        )
+    {
+        (
+            stakeAmount,
+            rewardAmount,
+            lastUpdatedAt
+        ) = _store.getStakeBalances(stakeNftId);
+    }
 }