@etherisc/gif-next 0.0.2-f2b0fa2-473 → 0.0.2-f4f484a-692

package/contracts/instance/InstanceReader.sol

@@ -7,14 +7,17 @@ import {DistributorType} from "../types/DistributorType.sol";
 import {Fee, FeeLib} from "../types/Fee.sol";
 import {Key32} from "../types/Key32.sol";
 import {NftId} from "../types/NftId.sol";
-import {ObjectType, DISTRIBUTOR, DISTRIBUTION, INSTANCE, PRODUCT, POLICY, POOL, TREASURY} from "../types/ObjectType.sol";
+import {ObjectType, DISTRIBUTOR, DISTRIBUTION, INSTANCE, PRODUCT, POLICY, POOL, TREASURY, BUNDLE} from "../types/ObjectType.sol";
 import {ReferralId, ReferralStatus, ReferralLib, REFERRAL_OK, REFERRAL_ERROR_UNKNOWN, REFERRAL_ERROR_EXPIRED, REFERRAL_ERROR_EXHAUSTED} from "../types/Referral.sol";
 import {Registerable} from "../shared/Registerable.sol";
 import {RiskId} from "../types/RiskId.sol";
 import {UFixed, MathLib, UFixedLib} from "../types/UFixed.sol";
 import {Version} from "../types/Version.sol";
+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";
@@ -26,37 +29,25 @@ import {TimestampLib} from "../types/Timestamp.sol";
 
 
 contract InstanceReader {
+    bool private _initialized;
 
-    IRegistry internal _registry;
-    NftId internal _instanceNftId;
     IInstance internal _instance;
     IKeyValueStore internal _store;
 
-    constructor(
-        address registry, 
-        NftId instanceNftId
-    )
-    {
-        require(
-            address(registry) != address(0),
-            "ERROR:CRD-001:REGISTRY_ZERO");
+    function initialize(address instance) public {
+        require(!_initialized, "ERROR:CRD-000:ALREADY_INITIALIZED");
 
         require(
-            instanceNftId.gtz(),
-            "ERROR:CRD-002:NFT_ID_ZERO");
+            address(instance) != address(0),
+            "ERROR:CRD-001:INSTANCE_ZERO");
 
-        _registry = IRegistry(registry);
-        _instanceNftId = instanceNftId;
-        IRegistry.ObjectInfo memory instanceInfo = _registry.getObjectInfo(_instanceNftId);
+        _instance = IInstance(instance);
+        _store = IKeyValueStore(instance);
 
-        require(
-            instanceInfo.objectType == INSTANCE(), 
-            "ERROR:CRD-003:PARENT_NOT_INSTANCE");
-
-        _instance = IInstance(instanceInfo.objectAddress);
-        _store = IKeyValueStore(instanceInfo.objectAddress);
+        _initialized = true;
     }
 
+
     // module specific functions
 
     function getPolicyInfo(NftId policyNftId)
@@ -70,6 +61,14 @@ contract InstanceReader {
         }
     }
 
+    function getPolicyState(NftId policyNftId)
+        public
+        view
+        returns (StateId state)
+    {
+        return _instance.getState(toPolicyKey(policyNftId));
+    }
+
     function getRiskInfo(RiskId riskId)
         public 
         view 
@@ -104,6 +103,17 @@ contract InstanceReader {
             return abi.decode(data, (ITreasury.TreasuryInfo));
         }
     }
+    
+    function getBundleInfo(NftId bundleNftId)
+        public 
+        view 
+        returns (IBundle.BundleInfo memory info)
+    {
+        bytes memory data = _store.getData(toBundleKey(bundleNftId));
+        if (data.length > 0) {
+            return abi.decode(data, (IBundle.BundleInfo));
+        }
+    }
 
     function getDistributorTypeInfo(DistributorType distributorType)
         public 
@@ -138,14 +148,14 @@ contract InstanceReader {
         }
     }
 
-    function getPoolSetupInfo(NftId poolNftId)
+    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));
         }
     }
 
@@ -249,6 +259,10 @@ contract InstanceReader {
         return distributionNftId.toKey32(DISTRIBUTION());
     }
 
+    function toBundleKey(NftId poolNftId) public pure returns (Key32) { 
+        return poolNftId.toKey32(BUNDLE());
+    }
+
     function toPoolKey(NftId poolNftId) public pure returns (Key32) { 
         return poolNftId.toKey32(POOL());
     }
@@ -266,10 +280,6 @@ contract InstanceReader {
         return _store;
     }
 
-    function getInstanceNftId() external view returns (NftId nftId) {
-        return _instanceNftId;
-    }
-
     function toUFixed(uint256 value, int8 exp) public pure returns (UFixed) {
         return UFixedLib.toUFixed(value, exp);
     }