@etherisc/gif-next 0.0.2-e46206a-486 → 0.0.2-e4b632c-016

package/contracts/components/Pool.sol

@@ -4,20 +4,26 @@ pragma solidity ^0.8.20;
 import {ObjectType, POOL} from "../types/ObjectType.sol";
 import {IProductService} from "../instance/service/IProductService.sol";
 import {IPoolService} from "../instance/service/IPoolService.sol";
-import {NftId} from "../types/NftId.sol";
+import {NftId, zeroNftId, NftIdLib} from "../types/NftId.sol";
 import {Fee} from "../types/Fee.sol";
 import {UFixed} from "../types/UFixed.sol";
 import {IPoolComponent} from "./IPoolComponent.sol";
 import {BaseComponent} from "./BaseComponent.sol";
+import {TokenHandler} from "../shared/TokenHandler.sol";
+import {ISetup} from "../instance/module/ISetup.sol";
 
 import {IRegistry} from "../registry/IRegistry.sol";
-import {IPool} from "../instance/module/pool/IPoolModule.sol";
-import {ITreasury} from "../instance/module/treasury/ITreasury.sol";
+
+// import {IPool} from "../instance/module/pool/IPoolModule.sol";
+import {ITreasury} from "../instance/module/ITreasury.sol";
+import {ISetup} from "../instance/module/ISetup.sol";
+import {InstanceReader} from "../instance/InstanceReader.sol";
 
 import {IRegisterable} from "../shared/IRegisterable.sol";
 import {Registerable} from "../shared/Registerable.sol";
 
 contract Pool is BaseComponent, IPoolComponent {
+    using NftIdLib for NftId;
 
     bool internal _isVerifying;
     UFixed internal _collateralizationLevel;
@@ -49,6 +55,7 @@ contract Pool is BaseComponent, IPoolComponent {
     constructor(
         address registry,
         NftId instanceNftId,
+        NftId productNftId,
         // TODO refactor into tokenNftId
         address token,
         bool isInterceptor,
@@ -59,7 +66,7 @@ contract Pool is BaseComponent, IPoolComponent {
         Fee memory performanceFee,
         address initialOwner
     )
-        BaseComponent(registry, instanceNftId, token, POOL(), isInterceptor, initialOwner)
+        BaseComponent(registry, instanceNftId, productNftId, token, POOL(), isInterceptor, initialOwner)
     {
         _isVerifying = verifying;
         // TODO add validation
@@ -68,8 +75,9 @@ contract Pool is BaseComponent, IPoolComponent {
         _initialStakingFee = stakingFee;
         _initialPerformanceFee = performanceFee;
 
-        _poolService = _instance.getPoolService();
-        _productService = _instance.getProductService();
+        // TODO: reactivate when services are available again
+        // _poolService = _instance.getPoolService();
+        // _productService = _instance.getProductService();
 
         _registerInterface(type(IPoolComponent).interfaceId);
     }
@@ -160,20 +168,24 @@ contract Pool is BaseComponent, IPoolComponent {
     {
         _poolService.setBundleFee(bundleNftId, fee);
     }
-    // TODO delete, call instance instead
-    function getFees()
-        external
-        view
-        override
-        returns (Fee memory, Fee memory, Fee memory)
-    {
-        NftId productNftId = _instance.getProductNftId(getNftId());
-        //if (_instance.hasTreasuryInfo(productNftId)) {
-            ITreasury.TreasuryInfo memory info = _instance.getTreasuryInfo(productNftId);
-            return (info.poolFee, info.stakingFee, info.performanceFee);
-        //} else {
-        //    return (_initialPoolFee, _initialStakingFee, _initialPerformanceFee);
-        //}
+
+    function getSetupInfo() public view returns (ISetup.PoolSetupInfo memory setupInfo) {
+        // TODO fix this
+        if (getNftId().eq(zeroNftId())) {
+            return ISetup.PoolSetupInfo(
+                _productNftId,
+                TokenHandler(address(0)),
+                _collateralizationLevel,
+                _initialPoolFee,
+                _initialStakingFee,
+                _initialPerformanceFee,
+                _isVerifying,
+                _wallet
+            );
+        } 
+
+        InstanceReader reader = _instance.getInstanceReader();
+        return reader.getPoolSetupInfo(getNftId());
     }
 
     // from IRegisterable
@@ -194,15 +206,16 @@ contract Pool is BaseComponent, IPoolComponent {
         return (
             info,
             abi.encode(
-                IPool.PoolInfo(
+                ISetup.PoolSetupInfo(
+                    getProductNftId(),
+                    TokenHandler(address(0)),
+                    _collateralizationLevel,
+                    _initialPoolFee,
+                    _initialStakingFee,
+                    _initialPerformanceFee,
                     _isVerifying,
-                    _collateralizationLevel
-                ),
-                _wallet,
-                _token,
-                _initialPoolFee,
-                _initialStakingFee,
-                _initialPerformanceFee
+                    _wallet
+                )
             )
         );
     }

package/contracts/components/Product.sol

@@ -3,11 +3,11 @@ pragma solidity ^0.8.19;
 
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 
-import {IRisk} from "../instance/module/risk/IRisk.sol";
-import {ITreasury} from "../instance/module/treasury/ITreasury.sol";
+import {IRisk} from "../instance/module/IRisk.sol";
+import {ITreasury} from "../instance/module/ITreasury.sol";
 import {IProductService} from "../instance/service/IProductService.sol";
 import {IProductComponent} from "./IProductComponent.sol";
-import {NftId, zeroNftId} from "../types/NftId.sol";
+import {NftId, zeroNftId, NftIdLib} from "../types/NftId.sol";
 import {ObjectType, PRODUCT} from "../types/ObjectType.sol";
 import {ReferralId} from "../types/Referral.sol";
 import {RiskId, RiskIdLib} from "../types/RiskId.sol";
@@ -19,11 +19,17 @@ import {BaseComponent} from "./BaseComponent.sol";
 import {IRegistry} from "../registry/IRegistry.sol";
 import {IRegisterable} from "../shared/IRegisterable.sol";
 import {Registerable} from "../shared/Registerable.sol";
+import {TokenHandler} from "../shared/TokenHandler.sol";
 
-import {IPool} from "../instance/module/pool/IPoolModule.sol";
+import {InstanceReader} from "../instance/InstanceReader.sol";
+import {ISetup} from "../instance/module/ISetup.sol";
 import {Pool} from "../components/Pool.sol";
 
+import {zeroNftId} from "../types/NftId.sol";
+
 contract Product is BaseComponent, IProductComponent {
+    using NftIdLib for NftId;
+
     IProductService internal _productService;
     Pool internal _pool;
     address internal _distribution;
@@ -43,9 +49,10 @@ contract Product is BaseComponent, IProductComponent {
         Fee memory productFee,
         Fee memory processingFee,
         address initialOwner
-    ) BaseComponent(registry, instanceNftid, token, PRODUCT(), isInterceptor, initialOwner) {
+    ) BaseComponent(registry, instanceNftid, zeroNftId(), token, PRODUCT(), isInterceptor, initialOwner) {
         // TODO add validation
-        _productService = _instance.getProductService();
+        // TODO: reactivate when services are available again
+        // _productService = _instance.getProductService();
         _pool = Pool(pool);
         _distribution = distribution;
         _initialProductFee = productFee;
@@ -132,7 +139,7 @@ contract Product is BaseComponent, IProductComponent {
     }
 
     function _getRiskInfo(RiskId id) internal view returns (IRisk.RiskInfo memory info) {
-        return _instance.getRiskInfo(id);
+        return _instance.getInstanceReader().getRiskInfo(id);
     }
 
     function _createApplication(
@@ -210,33 +217,24 @@ contract Product is BaseComponent, IProductComponent {
         _productService.setFees(productFee, processingFee);
     }
 
-    // TODO delete, call instance intead
-    function getProductFee()
-        external
-        view
-        override
-        returns (Fee memory productFee)
-    {
-        NftId productNftId = getNftId();
-        if (_instance.hasTreasuryInfo(productNftId)) {
-            return _instance.getTreasuryInfo(productNftId).productFee;
-        } else {
-            return _initialProductFee;
-        }
-    }
-
-    function getProcessingFee()
-        external
-        view
-        override
-        returns (Fee memory processingFee)
-    {
-        NftId productNftId = getNftId();
-        if (_instance.hasTreasuryInfo(productNftId)) {
-            return _instance.getTreasuryInfo(productNftId).processingFee;
-        } else {
-            return _initialProcessingFee;
-        }
+    function getSetupInfo() public view returns (ISetup.ProductSetupInfo memory setupInfo) {
+        if (getNftId().eq(zeroNftId())) {
+            return ISetup.ProductSetupInfo(
+                _token,
+                TokenHandler(address(0)),
+                _distributionNftId,
+                _poolNftId,
+                FeeLib.zeroFee(), //_instance.getDistributionFee(_distributionNftId)
+                _initialProductFee,
+                _initialProcessingFee,
+                FeeLib.zeroFee(), //_instance.getPoolFee(_poolNftId)
+                FeeLib.zeroFee(), //_instance.getStakingFee(_poolNftId)
+                FeeLib.zeroFee() //_instance.getPerformanceFee(_poolNftId)
+            );
+        } 
+
+        InstanceReader reader = _instance.getInstanceReader();
+        return reader.getProductSetupInfo(getNftId());
     }
 
     // from IRegisterable
@@ -274,25 +272,25 @@ contract Product is BaseComponent, IProductComponent {
             Fee memory initialPoolFee,
             Fee memory initialStakingFee,
             Fee memory initialPerformanceFee
-        )  = abi.decode(poolData, (IPool.PoolInfo, address, IERC20Metadata, Fee, Fee, Fee));
+        )  = abi.decode(poolData, (ISetup.PoolSetupInfo, address, IERC20Metadata, Fee, Fee, Fee));
 
         // TODO from DistributionComponent
 
         return (
             productInfo,
             abi.encode(
-                ITreasury.TreasuryInfo(
-                    _poolNftId,
-                    _distributionNftId,
+                ISetup.ProductSetupInfo(
                     _token,
+                    TokenHandler(address(0)),
+                    _distributionNftId,
+                    _poolNftId,
+                    FeeLib.zeroFee(), //_instance.getDistributionFee(_distributionNftId)
                     _initialProductFee,
                     _initialProcessingFee,
                     initialPoolFee,
                     initialStakingFee,
-                    initialPerformanceFee,
-                    FeeLib.zeroFee()//_instance.getDistributionFee(_distributionNftId)
-                ),
-                _wallet
+                    initialPerformanceFee
+                )
             )
         );
     }

package/contracts/instance/AccessManagedSimple.sol

@@ -0,0 +1,122 @@
+// SPDX-License-Identifier: MIT
+// OpenZeppelin Contracts (last updated v5.0.0) (access/manager/AccessManaged.sol)
+
+pragma solidity ^0.8.20;
+
+import {AuthorityUtils} from "@openzeppelin/contracts/access/manager/AuthorityUtils.sol";
+import {Context} from "@openzeppelin/contracts/utils/Context.sol";
+import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
+import {IAuthority} from "@openzeppelin/contracts/access/manager/IAuthority.sol";
+
+import {IAccessManagerSimple} from "./IAccessManagerSimple.sol";
+
+/**
+ * @dev This contract module makes available a {restricted} modifier. Functions decorated with this modifier will be
+ * permissioned according to an "authority": a contract like {AccessManager} that follows the {IAuthority} interface,
+ * implementing a policy that allows certain callers to access certain functions.
+ *
+ * IMPORTANT: The `restricted` modifier should never be used on `internal` functions, judiciously used in `public`
+ * functions, and ideally only used in `external` functions. See {restricted}.
+ */
+abstract contract AccessManagedSimple is Context, IAccessManaged {
+    bool private _initialized;
+    address private _authority;
+
+    bool private _consumingSchedule;
+
+    /**
+     * @dev Initializes the contract connected to an initial authority.
+     */
+    constructor(address initialAuthority) {
+        initialize(initialAuthority);
+    }
+
+    function initialize(address initialAuthority) public {
+        require(!_initialized, "AccessManaged: already initialized");
+        _setAuthority(initialAuthority);
+        _initialized = true;
+    }
+
+
+    /**
+     * @dev Restricts access to a function as defined by the connected Authority for this contract and the
+     * caller and selector of the function that entered the contract.
+     *
+     * [IMPORTANT]
+     * ====
+     * In general, this modifier should only be used on `external` functions. It is okay to use it on `public`
+     * functions that are used as external entry points and are not called internally. Unless you know what you're
+     * doing, it should never be used on `internal` functions. Failure to follow these rules can have critical security
+     * implications! This is because the permissions are determined by the function that entered the contract, i.e. the
+     * function at the bottom of the call stack, and not the function where the modifier is visible in the source code.
+     * ====
+     *
+     * [WARNING]
+     * ====
+     * Avoid adding this modifier to the https://docs.soliditylang.org/en/v0.8.20/contracts.html#receive-ether-function[`receive()`]
+     * function or the https://docs.soliditylang.org/en/v0.8.20/contracts.html#fallback-function[`fallback()`]. These
+     * functions are the only execution paths where a function selector cannot be unambiguosly determined from the calldata
+     * since the selector defaults to `0x00000000` in the `receive()` function and similarly in the `fallback()` function
+     * if no calldata is provided. (See {_checkCanCall}).
+     *
+     * The `receive()` function will always panic whereas the `fallback()` may panic depending on the calldata length.
+     * ====
+     */
+    modifier restricted() {
+        _checkCanCall(_msgSender(), _msgData());
+        _;
+    }
+
+    /// @inheritdoc IAccessManaged
+    function authority() public view virtual returns (address) {
+        return _authority;
+    }
+
+    /// @inheritdoc IAccessManaged
+    function setAuthority(address newAuthority) public virtual {
+        address caller = _msgSender();
+        if (caller != authority()) {
+            revert AccessManagedUnauthorized(caller);
+        }
+        if (newAuthority.code.length == 0) {
+            revert AccessManagedInvalidAuthority(newAuthority);
+        }
+        _setAuthority(newAuthority);
+    }
+
+    /// @inheritdoc IAccessManaged
+    function isConsumingScheduledOp() public view returns (bytes4) {
+        return _consumingSchedule ? this.isConsumingScheduledOp.selector : bytes4(0);
+    }
+
+    /**
+     * @dev Transfers control to a new authority. Internal function with no access restriction. Allows bypassing the
+     * permissions set by the current authority.
+     */
+    function _setAuthority(address newAuthority) internal virtual {
+        _authority = newAuthority;
+        emit AuthorityUpdated(newAuthority);
+    }
+
+    /**
+     * @dev Reverts if the caller is not allowed to call the function identified by a selector. Panics if the calldata
+     * is less than 4 bytes long.
+     */
+    function _checkCanCall(address caller, bytes calldata data) internal virtual {
+        (bool immediate, uint32 delay) = AuthorityUtils.canCallWithDelay(
+            authority(),
+            caller,
+            address(this),
+            bytes4(data[0:4])
+        );
+        if (!immediate) {
+            if (delay > 0) {
+                _consumingSchedule = true;
+                IAccessManagerSimple(authority()).consumeScheduledOp(caller, data);
+                _consumingSchedule = false;
+            } else {
+                revert AccessManagedUnauthorized(caller);
+            }
+        }
+    }
+}