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

package/contracts/staking/Staking.sol

@@ -4,6 +4,7 @@ pragma solidity ^0.8.20;
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 
 import {IRegistry} from "../registry/IRegistry.sol";
+import {IRegistryService} from "../registry/IRegistryService.sol";
 import {IRelease} from "../registry/IRelease.sol";
 import {IStaking} from "./IStaking.sol";
 import {IVersionable} from "../upgradeability/IVersionable.sol";
@@ -13,10 +14,10 @@ import {Component} from "../shared/Component.sol";
 import {IComponent} from "../shared/IComponent.sol";
 import {IComponentService} from "../shared/IComponentService.sol";
 import {NftId} from "../type/NftId.sol";
-import {ObjectType, STAKE, STAKING} from "../type/ObjectType.sol";
+import {ObjectType, COMPONENT, STAKING} from "../type/ObjectType.sol";
 import {Seconds} from "../type/Seconds.sol";
 import {Registerable} from "../shared/Registerable.sol";
-import {StakingLib} from "./StakingLib.sol";
+import {StakeManagerLib} from "./StakeManagerLib.sol";
 import {StakingReader} from "./StakingReader.sol";
 import {StakingStore} from "./StakingStore.sol";
 import {TargetManagerLib} from "./TargetManagerLib.sol";
@@ -146,8 +147,7 @@ contract Staking is
                 objectType: expectedObjectType,
                 chainId: chainId,
                 lockingPeriod: initialLockingPeriod,
-                rewardRate: initialRewardRate,
-                maxStakedAmount: AmountLib.max()}));
+                rewardRate: initialRewardRate}));
     }
 
 
@@ -195,21 +195,6 @@ contract Staking is
         emit LogStakingRewardRateSet(targetNftId, oldRewardRate, rewardRate);
     }
 
-    function setMaxStakedAmount(NftId targetNftId, Amount maxStakedAmount)
-        external
-        virtual
-        restricted()
-        onlyTarget(targetNftId)
-    {
-        IStaking.TargetInfo memory targetInfo = getStakingReader().getTargetInfo(targetNftId);
-
-        targetInfo.maxStakedAmount = maxStakedAmount;
-        
-        _getStakingStorage()._store.updateTarget(targetNftId, targetInfo);
-
-        emit LogStakingMaxStakedAmountSet(targetNftId, maxStakedAmount);
-    }
-
 
     function refillRewardReserves(NftId targetNftId, Amount dipAmount)
         external
@@ -291,7 +276,7 @@ contract Staking is
         restricted() // only staking service
     {
         StakingStorage storage $ = _getStakingStorage();
-        Timestamp lockedUntil = StakingLib.checkCreateParameters(
+        Timestamp lockedUntil = StakeManagerLib.checkCreateParameters(
             $._reader,
             targetNftId,
             stakeAmount);
@@ -321,7 +306,7 @@ contract Staking is
         returns (Amount stakeBalance)
     {
         StakingStorage storage $ = _getStakingStorage();
-        stakeBalance = StakingLib.stake(
+        stakeBalance = StakeManagerLib.stake(
             getRegistry(),
             $._reader,
             $._store,
@@ -332,26 +317,21 @@ contract Staking is
 
     function restake(
         NftId stakeNftId, 
-        NftId newStakeNftId
+        NftId newTargetNftId
     )
         external
         virtual
         restricted() // only staking service
         onlyStake(stakeNftId)
-        returns (Amount newStakeBalance)
+        returns (NftId newStakeNftId)
     {
-        _checkNftType(stakeNftId, STAKE());
-        _checkNftType(newStakeNftId, STAKE());
-
         // TODO add check that allows additional staking amount
         StakingStorage storage $ = _getStakingStorage();
-        newStakeBalance = StakingLib.restake(
-            $._reader,
-            $._store,
-            stakeNftId,
-            newStakeNftId);    
+
+        // TODO implement
     }
 
+
     function updateRewards(NftId stakeNftId)
         external
         virtual
@@ -400,7 +380,7 @@ contract Staking is
     {
         StakingStorage storage $ = _getStakingStorage();
         
-        StakingLib.checkUnstakeParameters($._reader, stakeNftId);
+        StakeManagerLib.checkUnstakeParameters($._reader, stakeNftId);
         
         // update rewards since last update
         NftId targetNftId = _updateRewards($._reader, $._store, stakeNftId);
@@ -472,7 +452,7 @@ contract Staking is
         UFixed rewardRate;
 
         (targetNftId, rewardRate) = reader.getTargetRewardRate(stakeNftId);
-        (Amount rewardIncrement, ) = StakingLib.calculateRewardIncrease(
+        (Amount rewardIncrement, ) = StakeManagerLib.calculateRewardIncrease(
             reader, 
             stakeNftId,
             rewardRate);

package/contracts/staking/StakingReader.sol

@@ -77,6 +77,21 @@ contract StakingReader is
     }
 
 
+    function isActive(NftId targetNftId) external view returns (bool) {
+        return _store.getTargetNftIdSet().isActive(targetNftId);
+    }
+
+
+    function activeTargets() external view returns (uint256) {
+        return _store.getTargetNftIdSet().activeNftIds();
+    }
+
+
+    function getActiveTargetNftId(uint256 idx) external view returns (NftId) {
+        return _store.getTargetNftIdSet().getActiveNftId(idx);
+    }
+
+
     function getTargetNftId(NftId stakeNftId) public view returns (NftId targetNftId) {
         return _registry.getParentNftId(stakeNftId);
     }
@@ -104,11 +119,6 @@ contract StakingReader is
         rewardRate = getTargetInfo(targetNftId).rewardRate;
     }
 
-    /// @dev get the max staked amount allowed for the specified target nft id.
-    function getTargetMaxStakedAmount(NftId targetNftId) external view returns (Amount maxStakedAmount) {
-        return getTargetInfo(targetNftId).maxStakedAmount;
-    }
-
 
     /// @dev get the reward rate for the specified target nft id.
     function getRewardRate(NftId targetNftId) external view returns (UFixed rewardRate) {

package/contracts/staking/StakingService.sol

@@ -98,17 +98,6 @@ contract StakingService is
             rewardRate);
     }
 
-    function setInstanceMaxStakedAmount(NftId instanceNftId, Amount maxStakingAmount)
-        external
-        virtual
-        restricted()
-    {
-        _checkNftType(instanceNftId, INSTANCE());
-        _getStakingServiceStorage()._staking.setMaxStakedAmount(
-            instanceNftId, 
-            maxStakingAmount);
-    }
-
 
     function refillInstanceRewardReserves(NftId instanceNftId, address rewardProvider, Amount dipAmount)
         external
@@ -238,36 +227,13 @@ contract StakingService is
         restricted()
         onlyNftOwner(stakeNftId)
         returns (
-            NftId newStakeNftId,
-            Amount newStakeBalance
+            NftId newStakeNftId
         )
     {
         _checkNftType(stakeNftId, STAKE());
 
         StakingServiceStorage storage $ = _getStakingServiceStorage();
-        address stakeOwner = msg.sender;
-
-        if (! getRegistry().isRegistered(newTargetNftId)) {
-            revert ErrorStakingServiceTargetUnknown(newTargetNftId);
-        }
-
-        // register new stake object with registry
-        newStakeNftId = $._registryService.registerStake(
-            IRegistry.ObjectInfo({
-                nftId: NftIdLib.zero(),
-                parentNftId: newTargetNftId,
-                objectType: STAKE(),
-                isInterceptor: false,
-                objectAddress: address(0),
-                initialOwner: stakeOwner,
-                data: ""
-            }));
-
-        newStakeBalance = $._staking.restake(
-            stakeNftId, 
-            newStakeNftId);
-
-        emit LogStakingServiceStakeRestaked(stakeOwner, stakeNftId, newStakeNftId, newTargetNftId, newStakeBalance);
+        // TODO implement
     } 
 
 
@@ -348,7 +314,6 @@ contract StakingService is
 
     function getDipToken()
         external
-        view
         virtual
         returns (IERC20Metadata dip)
     {
@@ -358,7 +323,6 @@ contract StakingService is
 
     function getTokenHandler()
         external
-        view
         virtual
         returns (TokenHandler tokenHandler)
     {
@@ -368,7 +332,6 @@ contract StakingService is
 
     function getStaking()
         external
-        view
         virtual
         returns (IStaking staking)
     {

package/contracts/staking/StakingStore.sol

@@ -91,8 +91,7 @@ contract StakingStore is
                 objectType: PROTOCOL(),
                 chainId: 1,
                 lockingPeriod: TargetManagerLib.getDefaultLockingPeriod(),
-                rewardRate: TargetManagerLib.getDefaultRewardRate(),
-                maxStakedAmount: AmountLib.max()}));
+                rewardRate: TargetManagerLib.getDefaultRewardRate()}));
     }
 
 

package/contracts/type/ObjectType.sol

@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {VersionPart} from "./Version.sol";
-
 type ObjectType is uint8;
 
 // type bindings
@@ -163,6 +161,8 @@ function neObjectType(ObjectType a, ObjectType b) pure returns (bool isSame) {
 // library functions that operate on user defined type
 library ObjectTypeLib {
 
+    error ErrorVersionTooBig(uint256 version);
+
     function zero() public pure returns (ObjectType) {
         return ObjectType.wrap(0);
     }
@@ -242,15 +242,19 @@ library ObjectTypeLib {
     function toVersionedName(
         string memory name, 
         string memory suffix, 
-        VersionPart release
+        uint256 version
     )
         external
         pure
         returns (string memory versionedName)
     {
+        if (version > maxNumReleases()) {
+            revert ErrorVersionTooBig(version);
+        }
+
         string memory versionName = "_v0";
 
-        if (release.toInt() >= 10) {
+        if (version >= 10) {
             versionName = "_v";
         }
 
@@ -259,7 +263,12 @@ library ObjectTypeLib {
                 name,
                 suffix,
                 versionName,
-                release.toString()));
+                toString(version)));
+    }
+
+    /// @dev returns the max number of releases (major versions) this gif setup can handle.
+    function maxNumReleases() public pure returns (uint8) {
+        return 99;
     }
 
     /// @dev returns the provied int as a string

package/contracts/type/Version.sol

@@ -8,9 +8,7 @@ using {
     versionPartEq as ==,
     versionPartNe as !=,
     VersionPartLib.eqz,
-    VersionPartLib.gtz,
     VersionPartLib.toInt,
-    VersionPartLib.toString,
     VersionPartLib.isValidRelease
 }
     for VersionPart global;
@@ -20,9 +18,6 @@ function versionPartEq(VersionPart a, VersionPart b) pure returns(bool isSame) {
 function versionPartNe(VersionPart a, VersionPart b) pure returns(bool isSame) { return VersionPart.unwrap(a) != VersionPart.unwrap(b); }
 
 library VersionPartLib {
-
-    error ErrorReleaseTooBig(VersionPart releaseMax, VersionPart release);
-
     function releaseMin() public pure returns (VersionPart) { return toVersionPart(3); }
     function releaseMax() public pure returns (VersionPart) { return toVersionPart(99); }
 
@@ -31,41 +26,7 @@ library VersionPartLib {
         return 3 <= releaseInt && releaseInt <= 99; 
     } 
 
-    function toString(VersionPart a) external pure returns (string memory) {
-        if (a > releaseMax()) {
-            revert ErrorReleaseTooBig(releaseMax(), a);
-        }
-
-        uint256 value = VersionPart.unwrap(a);
-        if (value == 0) {
-            return "0";
-        }
-
-        uint256 temp = value;
-        uint256 digits = 0;
-        while (temp != 0) {
-            digits++;
-            temp /= 10;
-        }
-
-        bytes memory buffer = new bytes(digits);
-        uint index = digits - 1;
-
-        temp = value;
-        while (temp != 0) {
-            buffer[index] = bytes1(uint8(48 + temp % 10));
-            temp /= 10;
-
-            if (index > 0) {
-                index--;
-            }
-        }
-
-        return string(buffer);
-    }
-
     function eqz(VersionPart a) external pure returns(bool) { return VersionPart.unwrap(a) == 0; }
-    function gtz(VersionPart a) external pure returns(bool) { return VersionPart.unwrap(a) > 0; }
     function toInt(VersionPart a) external pure returns(uint256) { return VersionPart.unwrap(a); }
     function toVersionPart(uint256 a) public pure returns(VersionPart) { return VersionPart.wrap(uint8(a)); }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etherisc/gif-next",
-  "version": "0.0.2-7c8d286-020",
+  "version": "0.0.2-7d488b3-675",
   "description": "This is the repository for the next version of the Generic Insurance Framework (GIF) smart contracts. ",
   "main": "index.js",
   "scripts": {

package/artifacts/contracts/authorization/AccessAdminLib.sol/AccessAdminLib.dbg.json

@@ -1,4 +0,0 @@
-{
-  "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/1e3740eb2b5e9b50af8ebcfd1caf4094.json"
-}