@etherisc/gif-next 0.0.2-d5522f6-712 → 0.0.2-d5b7b78-706

package/contracts/instance/InstanceReader.sol

@@ -17,6 +17,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";
@@ -30,40 +31,18 @@ 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
-    )
-    {
-        initialize(registry, instanceNftId);
-    }
-
-    function initialize(address registry, NftId instanceNftId) public {
+    function initialize(address instance) public {
         require(!_initialized, "ERROR:CRD-000:ALREADY_INITIALIZED");
 
         require(
-            address(registry) != address(0),
-            "ERROR:CRD-001:REGISTRY_ZERO");
-
-        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);
-
-        require(
-            instanceInfo.objectType == INSTANCE(), 
-            "ERROR:CRD-003:PARENT_NOT_INSTANCE");
-
-        _instance = IInstance(instanceInfo.objectAddress);
-        _store = IKeyValueStore(instanceInfo.objectAddress);
+        _instance = IInstance(instance);
+        _store = IKeyValueStore(instance);
 
         _initialized = true;
     }
@@ -169,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));
         }
     }
 
@@ -301,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);
     }