@etherisc/gif-next 0.0.2-a307d03-692 → 0.0.2-a33f6f4-689

package/contracts/staking/StakingService.sol

@@ -98,6 +98,17 @@ 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
@@ -227,13 +238,36 @@ contract StakingService is
         restricted()
         onlyNftOwner(stakeNftId)
         returns (
-            NftId newStakeNftId
+            NftId newStakeNftId,
+            Amount newStakeBalance
         )
     {
         _checkNftType(stakeNftId, STAKE());
 
         StakingServiceStorage storage $ = _getStakingServiceStorage();
-        // TODO implement
+        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);
     } 
 
 

package/contracts/staking/StakingStore.sol

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

package/contracts/type/ObjectType.sol

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

package/contracts/type/RiskId.sol

@@ -2,6 +2,7 @@
 pragma solidity ^0.8.20;
 
 import {Key32, KeyId, Key32Lib} from "./Key32.sol";
+import {NftId} from "./NftId.sol";
 import {RISK} from "./ObjectType.sol";
 
 type RiskId is bytes8;
@@ -40,9 +41,9 @@ library RiskIdLib {
         return uint64(RiskId.unwrap(riskId));
     }
 
-    // @dev Converts a risk id string into a risk id.
-    function toRiskId(string memory risk) public pure returns (RiskId) {
-        return RiskId.wrap(bytes8(keccak256(abi.encode(risk))));
+    // @dev Converts a risk id string with a product NftId into a risk id.
+    function toRiskId(NftId productNftId, bytes32 risk) public pure returns (RiskId) {
+        return RiskId.wrap(bytes8(keccak256(abi.encode(productNftId, risk))));
     }
 
     /// @dev Returns the key32 value for the specified risk id.

package/contracts/type/Version.sol

@@ -8,7 +8,9 @@ using {
     versionPartEq as ==,
     versionPartNe as !=,
     VersionPartLib.eqz,
+    VersionPartLib.gtz,
     VersionPartLib.toInt,
+    VersionPartLib.toString,
     VersionPartLib.isValidRelease
 }
     for VersionPart global;
@@ -18,6 +20,9 @@ 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); }
 
@@ -26,7 +31,41 @@ 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-a307d03-692",
+  "version": "0.0.2-a33f6f4-689",
   "description": "This is the repository for the next version of the Generic Insurance Framework (GIF) smart contracts. ",
   "main": "index.js",
   "scripts": {
@@ -36,7 +36,7 @@
     "@typescript-eslint/parser": "^8.1.0",
     "antlr4ng-cli": "^2.0.0",
     "dotenv": "^16.3.1",
-    "eslint": "^8.50.0",
+    "eslint": "^9.9.1",
     "hardhat": "^2.17.2",
     "prettier": "^3.0.3",
     "prettier-plugin-solidity": "^1.1.3",

package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.dbg.json

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