@etherisc/gif-next 0.0.2-e922e07-736 → 0.0.2-e94f4c7-084

package/contracts/instance/InstanceReader.sol

@@ -3,6 +3,7 @@ pragma solidity ^0.8.20;
 
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 
+import {ClaimId} from "../types/ClaimId.sol";
 import {DistributorType} from "../types/DistributorType.sol";
 import {Fee, FeeLib} from "../types/Fee.sol";
 import {Key32} from "../types/Key32.sol";
@@ -17,6 +18,7 @@ import {StateId} from "../types/StateId.sol";
 
 import {IRegistry} from "../registry/IRegistry.sol";
 import {IBundle} from "../instance/module/IBundle.sol";
+import {IComponents} from "../instance/module/IComponents.sol";
 import {IDistribution} from "../instance/module/IDistribution.sol";
 import {IInstance} from "./IInstance.sol";
 import {IKeyValueStore} from "../instance/base/IKeyValueStore.sol";
@@ -28,21 +30,23 @@ import {TimestampLib} from "../types/Timestamp.sol";
 
 
 contract InstanceReader {
+
+    error ErrorInstanceReaderAlreadyInitialized();
+    error ErrorInstanceReaderInstanceAddressZero();
+
     bool private _initialized;
 
-    IRegistry internal _registry;
     IInstance internal _instance;
     IKeyValueStore internal _store;
 
-    function initialize(address registry, address instance) public {
-        require(!_initialized, "ERROR:CRD-000:ALREADY_INITIALIZED");
-
-        require(
-            address(registry) != address(0),
-            "ERROR:CRD-001:REGISTRY_ZERO");
-
+    function initialize(address instance) public {
+        if(_initialized) {
+            revert ErrorInstanceReaderAlreadyInitialized();
+        }
 
-        _registry = IRegistry(registry);
+        if(address(instance) == address(0)) {
+            revert ErrorInstanceReaderInstanceAddressZero();
+        }
 
         _instance = IInstance(instance);
         _store = IKeyValueStore(instance);
@@ -72,6 +76,25 @@ contract InstanceReader {
         return _instance.getState(toPolicyKey(policyNftId));
     }
 
+    function getClaimInfo(NftId policyNftId, ClaimId claimId)
+        public
+        view
+        returns (IPolicy.ClaimInfo memory info)
+    {
+        bytes memory data = _store.getData(claimId.toKey32(policyNftId));
+        if (data.length > 0) {
+            return abi.decode(data, (IPolicy.ClaimInfo));
+        }
+    }
+
+    function getClaimState(NftId policyNftId, ClaimId claimId)
+        public
+        view
+        returns (StateId state)
+    {
+        return _instance.getState(claimId.toKey32(policyNftId));
+    }
+
     function getRiskInfo(RiskId riskId)
         public 
         view 
@@ -151,14 +174,15 @@ contract InstanceReader {
         }
     }
 
-    function getPoolSetupInfo(NftId poolNftId)
+    // TODO consider to replace by component type specific getXyzInfo
+    function getComponentInfo(NftId poolNftId)
         public
         view
-        returns (ISetup.PoolSetupInfo memory info)
+        returns (IComponents.ComponentInfo memory info)
     {
         bytes memory data = _store.getData(toPoolKey(poolNftId));
         if (data.length > 0) {
-            return abi.decode(data, (ISetup.PoolSetupInfo));
+            return abi.decode(data, (IComponents.ComponentInfo));
         }
     }