@etherisc/gif-next 0.0.2-f13fd28-503 → 0.0.2-f15b559-661

package/contracts/product/Product.sol

@@ -3,21 +3,18 @@ pragma solidity ^0.8.20;
 
 import {Amount, AmountLib} from "../type/Amount.sol";
 import {ClaimId} from "../type/ClaimId.sol";
-import {IComponent} from "../shared/IComponent.sol";
-import {Fee, FeeLib} from "../type/Fee.sol";
-import {IRisk} from "../instance/module/IRisk.sol";
+import {Fee} from "../type/Fee.sol";
 import {IApplicationService} from "./IApplicationService.sol";
 import {IAuthorization} from "../authorization/IAuthorization.sol";
 import {IComponentService} from "../shared/IComponentService.sol";
 import {InstanceLinkedComponent} from "../shared/InstanceLinkedComponent.sol";
-import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
 import {IPolicyService} from "./IPolicyService.sol";
 import {IRiskService} from "./IRiskService.sol";
 import {IClaimService} from "./IClaimService.sol";
 import {IPricingService} from "./IPricingService.sol";
 import {IProductComponent} from "./IProductComponent.sol";
-import {NftId, NftIdLib} from "../type/NftId.sol";
-import {ObjectType, COMPONENT, DISTRIBUTION, ORACLE, POOL, PRODUCT, BUNDLE, APPLICATION, POLICY, CLAIM, PRICE } from "../type/ObjectType.sol";
+import {NftId} from "../type/NftId.sol";
+import {COMPONENT, PRODUCT, BUNDLE, APPLICATION, POLICY, CLAIM, PRICE } from "../type/ObjectType.sol";
 import {PayoutId} from "../type/PayoutId.sol";
 import {COMPONENT, PRODUCT, APPLICATION, POLICY, CLAIM, PRICE, BUNDLE, RISK } from "../type/ObjectType.sol";
 import {ReferralId} from "../type/Referral.sol";
@@ -28,9 +25,6 @@ import {Timestamp} from "../type/Timestamp.sol";
 
 import {IPolicy} from "../instance/module/IPolicy.sol";
 import {IComponents} from "../instance/module/IComponents.sol";
-import {IDistributionComponent} from "../distribution/IDistributionComponent.sol";
-import {IOracleComponent} from "../oracle/IOracleComponent.sol";
-import {IPoolComponent} from "../pool/IPoolComponent.sol";
 
 abstract contract Product is
     InstanceLinkedComponent, 
@@ -189,13 +183,14 @@ abstract contract Product is
 
 
     function _createRisk(
-        RiskId id,
+        bytes32 id,
         bytes memory data
     )
         internal
         virtual
+        returns (RiskId riskId)
     {
-        _getProductStorage()._riskService.createRisk(
+        return _getProductStorage()._riskService.createRisk(
             id,
             data
         );
@@ -466,10 +461,6 @@ abstract contract Product is
             payoutId);
     }
 
-    function _toRiskId(string memory riskName) internal virtual pure returns (RiskId riskId) {
-        return RiskIdLib.toRiskId(riskName);
-    }
-
     function _getProductStorage() internal virtual pure returns (ProductStorage storage $) {
         assembly {
             $.slot := PRODUCT_STORAGE_LOCATION_V1

package/contracts/product/RiskService.sol

@@ -2,19 +2,16 @@
 pragma solidity ^0.8.20;
 
 import {IInstance} from "../instance/IInstance.sol";
-import {IInstanceService} from "../instance/IInstanceService.sol";
-import {IPoolService} from "../pool/PoolService.sol";
 import {IRegistry} from "../registry/IRegistry.sol";
-import {IRegistryService} from "../registry/IRegistryService.sol";
 import {IRisk} from "../instance/module/IRisk.sol";
 import {IRiskService} from "./IRiskService.sol";
 
 import {ContractLib} from "../shared/ContractLib.sol";
 import {InstanceReader} from "../instance/InstanceReader.sol";
-import {ObjectType, COMPONENT, INSTANCE, PRODUCT, POOL, POLICY, REGISTRY, RISK} from "../type/ObjectType.sol";
+import {ObjectType, COMPONENT, PRODUCT, RISK} from "../type/ObjectType.sol";
 import {ACTIVE, PAUSED, KEEP_STATE} from "../type/StateId.sol";
 import {NftId} from "../type/NftId.sol";
-import {RiskId} from "../type/RiskId.sol";
+import {RiskId, RiskIdLib} from "../type/RiskId.sol";
 import {StateId} from "../type/StateId.sol";
 import {RiskSet} from "../instance/RiskSet.sol";
 import {Service} from "../shared/Service.sol";
@@ -42,18 +39,20 @@ contract RiskService is
         _registerInterface(type(IRiskService).interfaceId);
     }
 
-
+    /// @inheritdoc IRiskService
     function createRisk(
-        RiskId riskId,
+        bytes32 id,
         bytes memory data
     )
         external 
         restricted()
+        returns (RiskId riskId)
     {
         // checks
         (NftId productNftId, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
 
         // effects
+        riskId = RiskIdLib.toRiskId(productNftId, id);
         IRisk.RiskInfo memory riskInfo = IRisk.RiskInfo({
             productNftId: productNftId, 
             createdAt: TimestampLib.blockTimestamp(),

package/contracts/staking/IStaking.sol

@@ -132,7 +132,7 @@ interface IStaking is
     /// @dev restakes the dips to a new target.
     /// the sum of the staked dips and the accumulated rewards will be restaked.
     /// permissioned: only staking service may call this function.
-    function restake(NftId stakeNftId, NftId newStakeNftId) external returns (Amount newStakeBalance);
+    function restake(NftId stakeNftId, NftId newTargetNftId) external returns (NftId newStakeNftId);
 
     /// @dev retuns the specified amount of dips to the holder of the specified stake nft.
     /// if dipAmount is set to Amount.max() all staked dips and all rewards are transferred to 

package/contracts/staking/IStakingService.sol

@@ -26,7 +26,6 @@ interface IStakingService is IService
     event LogStakingServiceStakeCreated(NftId stakeNftId, NftId targetNftId, address owner, Amount stakedAmount);
     event LogStakingServiceStakeIncreased(NftId stakeNftId, address owner, Amount stakedAmount, Amount stakeBalance);
     event LogStakingServiceUnstaked(NftId stakeNftId, address stakeOwner, Amount totalAmount);
-    event LogStakingServiceStakeRestaked(address stakeOwner, NftId indexed stakeNftId, NftId newStakeNftId, NftId indexed newTargetNftId, Amount indexed newStakeBalance);
 
     event LogStakingServiceRewardsUpdated(NftId stakeNftId);
     event LogStakingServiceRewardsClaimed(NftId stakeNftId, address stakeOwner, Amount rewardsClaimedAmount);
@@ -117,8 +116,7 @@ interface IStakingService is IService
     )
         external
         returns (
-            NftId newStakeNftId,
-            Amount newStakeBalance
+            NftId newStakeNftId
         );
 
 

package/contracts/staking/StakeManagerLib.sol

@@ -1,10 +1,16 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
+import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+
 import {Amount, AmountLib} from "../type/Amount.sol";
+import {Component} from "../shared/Component.sol";
 import {IRegistry} from "../registry/IRegistry.sol";
+import {IRegistryService} from "../registry/IRegistryService.sol";
 import {IStaking} from "./IStaking.sol";
+import {Key32} from "../type/Key32.sol";
 import {NftId} from "../type/NftId.sol";
+import {ObjectType, INSTANCE, PROTOCOL, TARGET} from "../type/ObjectType.sol";
 import {Seconds, SecondsLib} from "../type/Seconds.sol";
 import {StakingReader} from "./StakingReader.sol";
 import {StakingStore} from "./StakingStore.sol";
@@ -66,55 +72,6 @@ library StakeManagerLib {
 
     }
 
-    function restake(
-        StakingReader stakingReader,
-        StakingStore stakingStore,
-        NftId oldStakeNftId,
-        NftId newStakeNftId
-    )
-        external
-        returns (Amount newStakeBalance)
-    {
-        NftId oldTargetNftId = stakingReader.getTargetNftId(oldStakeNftId);
-        (UFixed oldRewardRate,) = checkUnstakeParameters(stakingReader, oldStakeNftId);
-        
-        // calculate new rewards update and unstake full amount
-        (
-            Amount rewardIncrementAmount,
-        ) = calculateRewardIncrease(
-            stakingReader, 
-            oldStakeNftId,
-            oldRewardRate);
-        stakingStore.updateRewards(
-            oldStakeNftId, 
-            oldTargetNftId, 
-            rewardIncrementAmount);
-        (
-            Amount unstakedAmount, 
-            Amount rewardsAmount
-        ) = stakingStore.unstakeUpTo(
-            oldStakeNftId,
-            oldTargetNftId,
-            AmountLib.max(), // unstake all stakes
-            AmountLib.max()); // claim all rewards
-
-        // calculate full restake amount
-        newStakeBalance = unstakedAmount + rewardsAmount;
-        NftId newTargetNftId = stakingReader.getTargetNftId(newStakeNftId);
-        
-        // create new staking target and increase stake
-        Timestamp newLockedUntil = _checkCreateParameters(stakingReader, newTargetNftId, newStakeBalance);
-        stakingStore.create(
-            newStakeNftId, 
-            IStaking.StakeInfo({
-                    lockedUntil: newLockedUntil
-                }));
-        stakingStore.increaseStake(
-            newStakeNftId, 
-            newTargetNftId, 
-            newStakeBalance);
-    }
-
     function checkCreateParameters(
         StakingReader stakingReader,
         NftId targetNftId, 
@@ -125,19 +82,6 @@ library StakeManagerLib {
         returns (
             Timestamp lockedUntil
         )
-    {
-        return _checkCreateParameters(stakingReader, targetNftId, dipAmount);
-    }
-
-    function _checkCreateParameters(
-        StakingReader stakingReader,
-        NftId targetNftId, 
-        Amount dipAmount
-    )
-        internal view
-        returns (
-            Timestamp lockedUntil
-        )
     {
         Seconds lockingPeriod = checkTarget(stakingReader, targetNftId);
         checkDipAmount(stakingReader, targetNftId, dipAmount);

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,7 +14,7 @@ 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 {StakeManagerLib} from "./StakeManagerLib.sol";
@@ -316,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 = StakeManagerLib.restake(
-            $._reader,
-            $._store,
-            stakeNftId,
-            newStakeNftId);    
+
+        // TODO implement
     }
 
+
     function updateRewards(NftId stakeNftId)
         external
         virtual

package/contracts/staking/StakingService.sol

@@ -227,32 +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;
-
-        // 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
     } 
 
 

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/package.json

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