@etherisc/gif-next 0.0.2-bb3faee-097 → 0.0.2-bb9ecaf-723

package/contracts/shared/Component.sol

@@ -25,7 +25,6 @@ abstract contract Component is
     struct ComponentStorage {
         string _name; // unique (per instance) component name
         bool _isInterceptor;
-        bytes _data;
         IComponentService _componentService;
     }
 
@@ -54,8 +53,7 @@ abstract contract Component is
         ObjectType componentType,
         bool isInterceptor,
         address initialOwner,
-        bytes memory registryData, // writeonly data that will saved in the object info record of the registry
-        bytes memory componentData // other component specific data
+        bytes memory registryData // writeonly data that will saved in the object info record of the registry
     )
         internal
         virtual
@@ -78,7 +76,6 @@ abstract contract Component is
         ComponentStorage storage $ = _getComponentStorage();
         $._name = name;
         $._isInterceptor = isInterceptor;
-        $._data = componentData;
         $._componentService = IComponentService(_getServiceAddress(COMPONENT()));
 
         _registerInterface(type(IAccessManaged).interfaceId);
@@ -201,8 +198,7 @@ abstract contract Component is
         
         return IComponents.ComponentInfo({
             name: $._name,
-            tokenHandler: TokenHandler(address(0)),
-            data: $._data // user specific component data
+            tokenHandler: TokenHandler(address(0))
         });
     }
 

package/contracts/shared/ComponentService.sol

@@ -26,6 +26,7 @@ import {Fee, FeeLib} from "../type/Fee.sol";
 import {KEEP_STATE} from "../type/StateId.sol";
 import {NftId, NftIdLib} from "../type/NftId.sol";
 import {ObjectType, ACCOUNTING, REGISTRY, COMPONENT, DISTRIBUTION, INSTANCE, ORACLE, POOL, PRODUCT, STAKING} from "../type/ObjectType.sol";
+import {ProductStore} from "../instance/ProductStore.sol";
 import {Service} from "../shared/Service.sol";
 import {TokenHandler} from "../shared/TokenHandler.sol";
 import {TokenHandlerDeployerLib} from "../shared/TokenHandlerDeployerLib.sol";
@@ -141,7 +142,7 @@ contract ComponentService is
         (, IInstance instance) = _getAndVerifyComponent(COMPONENT(), false);
 
         address component = msg.sender;
-        instance.getInstanceAdmin().setComponentLocked(
+        instance.getInstanceAdmin().setContractLocked(
             component, 
             locked);
         emit LogComponentServiceComponentLocked(component, locked);
@@ -283,14 +284,14 @@ contract ComponentService is
         }
         
         if(feesChanged) {
-            instance.getInstanceStore().updateFee(productNftId, feeInfo);
+            instance.getProductStore().updateFee(productNftId, feeInfo);
             emit LogComponentServiceProductFeesUpdated(productNftId);
         }
     }
 
 
     function _createProduct(
-        InstanceStore instanceStore,
+        ProductStore productStore,
         NftId productNftId,
         address productAddress
     )
@@ -307,11 +308,11 @@ contract ComponentService is
         initialProductInfo.oracleNftId = new NftId[](initialProductInfo.expectedNumberOfOracles);
 
         // create info
-        instanceStore.createProduct(
+        productStore.createProduct(
             productNftId, 
             initialProductInfo);
 
-        instanceStore.createFee(
+        productStore.createFee(
             productNftId, 
             product.getInitialFeeInfo());
     }
@@ -320,7 +321,7 @@ contract ComponentService is
 
     /// @dev registers the sending component as a distribution component
     function _createDistribution(
-        InstanceStore instanceStore,
+        ProductStore productStore,
         NftId productNftId,
         NftId distributionNftId,
         IComponents.ProductInfo memory productInfo
@@ -339,7 +340,7 @@ contract ComponentService is
 
         // set distribution in product info
         productInfo.distributionNftId = distributionNftId;
-        instanceStore.updateProduct(productNftId, productInfo, KEEP_STATE());
+        productStore.updateProduct(productNftId, productInfo, KEEP_STATE());
     }
 
 
@@ -371,7 +372,7 @@ contract ComponentService is
         }
         
         if(feesChanged) {
-            instance.getInstanceStore().updateFee(productNftId, feeInfo);
+            instance.getProductStore().updateFee(productNftId, feeInfo);
             emit LogComponentServiceDistributionFeesUpdated(distributionNftId);
         }
     }
@@ -379,7 +380,7 @@ contract ComponentService is
     //-------- oracle -------------------------------------------------------//
 
     function _createOracle(
-        InstanceStore instanceStore,
+        ProductStore productStore,
         NftId productNftId,
         NftId oracleNftId,
         IComponents.ProductInfo memory productInfo
@@ -398,13 +399,14 @@ contract ComponentService is
         // update/add oracle to product info
         productInfo.oracleNftId[productInfo.numberOfOracles] = oracleNftId;
         productInfo.numberOfOracles++;
-        instanceStore.updateProduct(productNftId, productInfo, KEEP_STATE());
+        productStore.updateProduct(productNftId, productInfo, KEEP_STATE());
     }
 
     //-------- pool ---------------------------------------------------------//
 
     function _createPool(
         InstanceStore instanceStore,
+        ProductStore productStore,
         NftId productNftId,
         NftId poolNftId,
         address componentAddress,
@@ -427,7 +429,7 @@ contract ComponentService is
 
         // update pool in product info
         productInfo.poolNftId = poolNftId;
-        instanceStore.updateProduct(productNftId, productInfo, KEEP_STATE());
+        productStore.updateProduct(productNftId, productInfo, KEEP_STATE());
     }
 
 
@@ -468,7 +470,7 @@ contract ComponentService is
         }
         
         if(feesChanged) {
-            instance.getInstanceStore().updateFee(productNftId, feeInfo);
+            instance.getProductStore().updateFee(productNftId, feeInfo);
             emit LogComponentServicePoolFeesUpdated(poolNftId);
         }
     }
@@ -493,9 +495,7 @@ contract ComponentService is
             componentAddress,
             parentNftId);
 
-        InstanceAdmin instanceAdmin = instance.getInstanceAdmin();
         InstanceStore instanceStore = instance.getInstanceStore();
-        InstanceReader instanceReader = instance.getInstanceReader();
         ObjectType componentType = objectInfo.objectType;
 
         if(componentType == PRODUCT()) {
@@ -505,7 +505,7 @@ contract ComponentService is
                 objectInfo.initialOwner).nftId;
 
             // create product info in instance store
-            _createProduct(instanceStore, componentNftId, componentAddress);
+            _createProduct(instance.getProductStore(), componentNftId, componentAddress);
         } else {
             // register non product component with registry
             componentNftId = _registryService.registerProductLinkedComponent(
@@ -513,15 +513,17 @@ contract ComponentService is
                 objectInfo.objectType, 
                 objectInfo.initialOwner).nftId;
 
+            InstanceReader instanceReader = instance.getInstanceReader();
+
             // create non product component info in instance store
             NftId productNftId = parentNftId;
             IComponents.ProductInfo memory productInfo = instanceReader.getProductInfo(productNftId);
             if(componentType == POOL()) {
-                _createPool(instanceStore, productNftId, componentNftId, componentAddress, productInfo);
+                _createPool(instanceStore, instance.getProductStore(), productNftId, componentNftId, componentAddress, productInfo);
             } else if(componentType == DISTRIBUTION()) {
-                _createDistribution(instanceStore, productNftId, componentNftId, productInfo);
+                _createDistribution(instance.getProductStore(), productNftId, componentNftId, productInfo);
             } else if(componentType == ORACLE()) {
-                _createOracle(instanceStore, productNftId, componentNftId, productInfo);
+                _createOracle(instance.getProductStore(), productNftId, componentNftId, productInfo);
             } else {
                 revert ErrorComponentServiceComponentTypeNotSupported(componentAddress, componentType);
             }
@@ -532,6 +534,8 @@ contract ComponentService is
 
         _checkToken(instance, token);
 
+        InstanceAdmin instanceAdmin = instance.getInstanceAdmin();
+        
         // deploy and wire token handler
         IComponents.ComponentInfo memory componentInfo = component.getInitialComponentInfo();
         componentInfo.tokenHandler = TokenHandlerDeployerLib.deployTokenHandler(

package/contracts/shared/InstanceLinkedComponent.sol

@@ -74,8 +74,7 @@ abstract contract InstanceLinkedComponent is
         ObjectType componentType,
         IAuthorization authorization,
         bool isInterceptor,
-        address initialOwner,
-        bytes memory componentData // data that will saved with the component info in the instance store
+        address initialOwner
     )
         internal
         virtual
@@ -101,8 +100,7 @@ abstract contract InstanceLinkedComponent is
             componentType, 
             isInterceptor, 
             initialOwner, 
-            "", // registry data
-            componentData);
+            ""); // registry data
 
         // set instance linked specific parameters
         $._instanceReader = $._instance.getInstanceReader();

package/contracts/staking/IStaking.sol

@@ -62,7 +62,6 @@ interface IStaking is
     // target parameters
     event LogStakingTargetLockingPeriodSet(NftId targetNftId, Seconds oldLockingPeriod, Seconds lockingPeriod, Blocknumber lastUpdateIn);
     event LogStakingTargetRewardRateSet(NftId targetNftId, UFixed rewardRate, UFixed oldRewardRate, Blocknumber lastUpdateIn);
-    // TODO cleanup LogStakingTargetMaxStakedAmountSet
     event LogStakingTargetMaxStakedAmountSet(NftId targetNftId, Amount stakeLimitAmount, Blocknumber lastUpdateIn);
     event LogStakingTargetLimitsSet(NftId targetNftId, Amount stakeLimitAmount, Amount marginAmount, Amount limitAmount);
 

package/contracts/staking/Staking.sol

@@ -413,7 +413,10 @@ contract Staking is
     {
         StakingStorage storage $ = _getStakingStorage();
         ChainId chainId = ChainIdLib.fromNftId(targetNftId);
-        _addToken($, chainId, token);
+
+        if (! $._store.hasTokenInfo(chainId, token)) {
+            _addToken($, chainId, token);
+        }
         
         $._store.addTargetToken(targetNftId, token);
 
@@ -711,9 +714,7 @@ contract Staking is
         internal
         virtual
     {
-        if ($._store.getTokenInfo(chainId, token).lastUpdateIn.eqz()) {
-            $._store.addToken(chainId, token);
-        }
+        $._store.addToken(chainId, token);
     }
 
 
@@ -752,8 +753,7 @@ contract Staking is
             STAKING(), 
             false, // is interceptor
             owner, 
-            "", // registry data
-            ""); // component data
+            ""); // registry data
 
         // Protocol target is created in the StakingStore constructor.
         // This allows setting up the protocol target before the full 

package/contracts/staking/StakingStore.sol

@@ -683,6 +683,8 @@ contract StakingStore is
 
         // process stake amount
         _stake(stakeNftId, stakeInfo, targetInfo, targetInfo.lockingPeriod, stakeAmount);
+
+        return stakeInfo.lockedUntil;
     }
 
 
@@ -890,6 +892,10 @@ contract StakingStore is
         return _tokenInfo[chainId][token];
     }
 
+    function hasTokenInfo(ChainId chainId, address token) external view returns (bool) {
+        return _tokenInfo[chainId][token].lastUpdateIn.gtz();
+    }
+
 
     function getTargetSet() external view returns (NftIdSet targetNftIdSet) { 
         return _targetNftIdSet;

package/contracts/type/Blocknumber.sol

@@ -53,15 +53,6 @@ function neBlocknumber(Blocknumber a, Blocknumber b) pure returns (bool) {
     return Blocknumber.unwrap(a) != Blocknumber.unwrap(b);
 }
 
-/// @dev Converts the uint256 to a Blocknumber.
-function toBlocknumber(uint256 blocknum) pure returns (Blocknumber) {
-    return Blocknumber.wrap(uint32(blocknum));
-}
-
-/// @dev Return the current block number
-function blockNumber() view returns (Blocknumber) {
-    return toBlocknumber(block.number);
-}
 
 library BlocknumberLib {
 
@@ -77,6 +68,10 @@ library BlocknumberLib {
         return Blocknumber.wrap(uint40(block.number));
     }
 
+    function toBlocknumber(uint256 blocknum) public pure returns (Blocknumber) {
+        return Blocknumber.wrap(uint32(blocknum));
+    }
+
     /// @dev return true iff blocknumber is 0
     function eqz(Blocknumber blocknumber) public pure returns (bool) {
         return Blocknumber.unwrap(blocknumber) == 0;

package/contracts/upgradeability/ProxyManager.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.20;
 import {ProxyAdmin} from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
 import {ITransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
 
-import {Blocknumber, blockNumber} from "../type/Blocknumber.sol";
+import {Blocknumber, BlocknumberLib} from "../type/Blocknumber.sol";
 import {IVersionable} from "./IVersionable.sol";
 import {NftId} from "../type/NftId.sol";
 import {NftOwnable} from "../shared/NftOwnable.sol";
@@ -240,7 +240,7 @@ contract ProxyManager is
             implementation: implementation,
             activatedBy: activatedBy,
             activatedAt: TimestampLib.current(),
-            activatedIn: blockNumber()
+            activatedIn: BlocknumberLib.current()
         });
     }
 }

package/package.json

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

package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json

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

package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json

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