@etherisc/gif-next 0.0.2-9c44ae6-473 → 0.0.2-9d3eab3-323

package/contracts/components/BaseComponent.sol

@@ -1,18 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
+import {IBaseComponent} from "./IBaseComponent.sol";
+import {IComponentOwnerService} from "../instance/service/IComponentOwnerService.sol";
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
-
-import {Registerable} from "../shared/Registerable.sol";
-
-import {IRegistry} from "../registry/IRegistry.sol";
-import {IInstance} from "../instance/IInstance.sol";
-
 import {IInstance} from "../instance/IInstance.sol";
-import {IComponentOwnerService} from "../instance/service/IComponentOwnerService.sol";
-import {IBaseComponent} from "./IBaseComponent.sol";
+import {IRegistry} from "../registry/IRegistry.sol";
 import {NftId, zeroNftId, NftIdLib} from "../types/NftId.sol";
 import {ObjectType} from "../types/ObjectType.sol";
+import {Registerable} from "../shared/Registerable.sol";
+import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
 abstract contract BaseComponent is
     Registerable,
@@ -55,10 +52,12 @@ abstract contract BaseComponent is
     }
 
     // from component contract
+    // TODO consider to remove/replace with access manager contract locking
     function lock() external onlyOwner override {
         _componentOwnerService.lock(this);
     }
 
+    // TODO consider to remove/replace with access manager contract locking
     function unlock() external onlyOwner override {
         _componentOwnerService.unlock(this);
     }
@@ -72,6 +71,48 @@ abstract contract BaseComponent is
         return _wallet;
     }
 
+    /// @dev Sets the wallet address for the component. 
+    /// if the current wallet has tokens, these will be transferred. 
+    /// if the new wallet address is externally owned, an approval from the 
+    /// owner of the external wallet for the component to move all tokens must exist. 
+    function setWallet(address newWallet) external override onlyOwner {
+        address currentWallet = _wallet;
+        uint256 currentBalance = _token.balanceOf(currentWallet);
+
+        // checks
+        if (newWallet == currentWallet) {
+            revert ErrorBaseComponentWalletAddressIsSameAsCurrent(newWallet);
+        }
+
+        if (currentBalance > 0) {
+            if (currentWallet == address(this)) {
+                // move tokens from component smart contract to external wallet
+            } else {
+                // move tokens from external wallet to component smart contract or another external wallet
+                uint256 allowance = _token.allowance(currentWallet, address(this));
+                if (allowance < currentBalance) {
+                    revert ErrorBaseComponentWalletAllowanceTooSmall(currentWallet, newWallet, allowance, currentBalance);
+                }
+            }
+        }
+
+        // effects
+        _wallet = newWallet;
+        emit LogBaseComponentWalletAddressChanged(newWallet);
+
+        // interactions
+        if (currentBalance > 0) {
+            // transfer tokens from current wallet to new wallet
+            if (currentWallet == address(this)) {
+                // transferFrom requires self allowance too
+                _token.approve(address(this), currentBalance);
+            }
+            
+            SafeERC20.safeTransferFrom(_token, currentWallet, newWallet, currentBalance);
+            emit LogBaseComponentWalletTokensTransferred(currentWallet, newWallet, currentBalance);
+        }
+    }
+
     function getToken() public view override returns (IERC20Metadata token) {
         return _token;
     }

package/contracts/components/IBaseComponent.sol

@@ -8,6 +8,11 @@ import {IInstance} from "../instance/IInstance.sol";
 import {NftId} from "../types/NftId.sol";
 
 interface IBaseComponent is IRegisterable {
+    error ErrorBaseComponentWalletAddressIsSameAsCurrent(address newWallet);
+    error ErrorBaseComponentWalletAllowanceTooSmall(address oldWallet, address newWallet, uint256 allowance, uint256 balance);
+
+    event LogBaseComponentWalletAddressChanged(address newWallet);
+    event LogBaseComponentWalletTokensTransferred(address from, address to, uint256 amount);
 
     function lock() external;
 
@@ -15,6 +20,7 @@ interface IBaseComponent is IRegisterable {
 
     function getToken() external view returns (IERC20Metadata token);
 
+    function setWallet(address walletAddress) external;
     function getWallet() external view returns (address walletAddress);
 
     function getInstance() external view returns (IInstance instance);

package/contracts/components/IPoolComponent.sol

@@ -43,6 +43,10 @@ interface IPoolComponent {
         uint256 collateralizationAmount
     ) external;
 
+    function lockBundle(NftId bundleNftId) external;
+
+    function unlockBundle(NftId bundleNftId) external;
+
     /**
      * @dev returns true iff the policy application data in policyData matches
      * with the bundle filter criteria encoded in bundleFilter. 

package/contracts/components/Pool.sol

@@ -4,6 +4,7 @@ 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 {IBundleService} from "../instance/service/IBundleService.sol";
 import {NftId, zeroNftId, NftIdLib} from "../types/NftId.sol";
 import {Fee} from "../types/Fee.sol";
 import {UFixed} from "../types/UFixed.sol";
@@ -40,6 +41,8 @@ contract Pool is BaseComponent, IPoolComponent {
     // only relevant to protect callback functions for "active" pools
     IProductService private _productService;
 
+    IBundleService private _bundleService;
+
     modifier onlyPoolService() {
         require(
             msg.sender == address(_poolService), 
@@ -80,6 +83,7 @@ contract Pool is BaseComponent, IPoolComponent {
 
         _poolService = _instance.getPoolService();
         _productService = _instance.getProductService();
+        _bundleService = _instance.getBundleService();
 
         _registerInterface(type(IPoolComponent).interfaceId);
     }
@@ -95,7 +99,7 @@ contract Pool is BaseComponent, IPoolComponent {
         returns(NftId bundleNftId)
     {
         address owner = msg.sender;
-        bundleNftId = _poolService.createBundle(
+        bundleNftId = _bundleService.createBundle(
             owner,
             fee,
             initialAmount,
@@ -168,7 +172,27 @@ contract Pool is BaseComponent, IPoolComponent {
         override
         // TODO add onlyBundleOwner
     {
-        _poolService.setBundleFee(bundleNftId, fee);
+        _bundleService.setBundleFee(bundleNftId, fee);
+    }
+
+    function lockBundle(
+        NftId bundleNftId
+    )
+        external
+        override
+        // TODO add onlyBundleOwner
+    {
+        _bundleService.lockBundle(bundleNftId);
+    }
+
+    function unlockBundle(
+        NftId bundleNftId
+    )
+        external
+        override
+        // TODO add onlyBundleOwner
+    {
+        _bundleService.unlockBundle(bundleNftId);
     }
 
     function getSetupInfo() public view returns (ISetup.PoolSetupInfo memory setupInfo) {
@@ -236,7 +260,7 @@ contract Pool is BaseComponent, IPoolComponent {
         internal
         returns(NftId bundleNftId)
     {
-        bundleNftId = _poolService.createBundle(
+        bundleNftId = _bundleService.createBundle(
             bundleOwner,
             fee,
             amount,

package/contracts/components/Product.sol

@@ -6,6 +6,7 @@ import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IER
 import {IRisk} from "../instance/module/IRisk.sol";
 import {ITreasury} from "../instance/module/ITreasury.sol";
 import {IProductService} from "../instance/service/IProductService.sol";
+import {IPolicyService} from "../instance/service/IPolicyService.sol";
 import {IProductComponent} from "./IProductComponent.sol";
 import {NftId, zeroNftId, NftIdLib} from "../types/NftId.sol";
 import {ObjectType, PRODUCT} from "../types/ObjectType.sol";
@@ -32,6 +33,7 @@ contract Product is BaseComponent, IProductComponent {
     using NftIdLib for NftId;
 
     IProductService internal _productService;
+    IPolicyService internal _policyService;
     Pool internal _pool;
     Distribution internal _distribution;
     Fee internal _initialProductFee;
@@ -54,6 +56,7 @@ contract Product is BaseComponent, IProductComponent {
     ) BaseComponent(registry, instanceNftid, token, PRODUCT(), isInterceptor, initialOwner) {
         // TODO add validation
         _productService = _instance.getProductService();
+        _policyService = _instance.getPolicyService(); 
         _pool = Pool(pool);
         _distribution = Distribution(distribution);
         _initialProductFee = productFee;
@@ -81,7 +84,7 @@ contract Product is BaseComponent, IProductComponent {
         override 
         returns (uint256 premiumAmount)
     {
-        (premiumAmount,,,,) = _productService.calculatePremium(
+        (premiumAmount,,,,) = _policyService.calculatePremium(
             riskId,
             sumInsuredAmount,
             lifetime,
@@ -154,7 +157,7 @@ contract Product is BaseComponent, IProductComponent {
         NftId bundleNftId,
         ReferralId referralId
     ) internal returns (NftId nftId) {
-        nftId = _productService.createApplication(
+        nftId = _policyService.createApplication(
             applicationOwner,
             riskId,
             sumInsuredAmount,
@@ -172,7 +175,7 @@ contract Product is BaseComponent, IProductComponent {
     )
         internal
     {
-        _productService.underwrite(
+        _policyService.underwrite(
             policyNftId, 
             requirePremiumPayment, 
             activateAt);
@@ -184,7 +187,7 @@ contract Product is BaseComponent, IProductComponent {
     )
         internal
     {
-        _productService.collectPremium(
+        _policyService.collectPremium(
             policyNftId, 
             activateAt);
     }
@@ -195,7 +198,7 @@ contract Product is BaseComponent, IProductComponent {
     )
         internal
     {
-        _productService.activate(
+        _policyService.activate(
             policyNftId, 
             activateAt);
     }

package/contracts/instance/AccessManagerUpgradeableInitializeable.sol

@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.20;
+
+import {AccessManagerUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagerUpgradeable.sol";
+
+
+contract AccessManagerUpgradeableInitializeable is AccessManagerUpgradeable {
+
+    bool private _initialized;
+
+    function __AccessManagerUpgradeableInitializeable_init(address initialAdmin) public {
+        require(!_initialized, "AccessManager: already initialized");
+        
+        if (initialAdmin == address(0)) {
+            revert AccessManagerInvalidInitialAdmin(address(0));
+        }
+
+        // admin is active immediately and without any execution delay.
+        _grantRole(ADMIN_ROLE, initialAdmin, 0, 0);
+        _initialized = true;
+    }
+
+}

package/contracts/instance/BundleManager.sol

@@ -39,17 +39,8 @@ contract BundleManager is
     /// @dev links a policy with its bundle
     // to link a policy it MUST NOT yet have been activated
     // the bundle MUST be unlocked (active) for linking (underwriting) and registered with this instance
-    // TODO decide what is checked here (non upgradeable) and what is checked in the service (upgradeable)
     function linkPolicy(NftId policyNftId) external restricted() {
-        IPolicy.PolicyInfo memory policyInfo = _instanceReader.getPolicyInfo(policyNftId);
-
-        // ensure policy has not yet been activated
-        if (policyInfo.activatedAt.gtz()) {
-            revert ErrorBundleManagerErrorPolicyAlreadyActivated(policyNftId);
-        }
-
-        NftId bundleNftId = policyInfo.bundleNftId;
-        // TODO decide to use instance reader or registry
+        NftId bundleNftId = _instanceReader.getPolicyInfo(policyNftId).bundleNftId;
         // decision will likely depend on the decision what to check here and what in the service
         NftId poolNftId = _instanceReader.getBundleInfo(bundleNftId).poolNftId;
 
@@ -67,26 +58,10 @@ contract BundleManager is
     // to unlink a policy it must closable, ie. meet one of the following criterias
     // - the policy MUST be past its expiry period and it MUST NOT have any open claims
     // - the policy's payoutAmount MUST be equal to its sumInsuredAmount and MUST NOT have any open claims
-    // TODO decide what is checked here (non upgradeable) and what is checked in the service (upgradeable)
     function unlinkPolicy(NftId policyNftId) external restricted() {
         IPolicy.PolicyInfo memory policyInfo = _instanceReader.getPolicyInfo(policyNftId);
 
-        // ensure policy has no open claims
-        if (policyInfo.openClaimsCount > 0) {
-            revert ErrorBundleManagerPolicyWithOpenClaims(
-                policyNftId, 
-                policyInfo.openClaimsCount);
-        }
-
-        // ensure policy is closeable
-        if (policyInfo.expiredAt < TimestampLib.blockTimestamp()
-            || policyInfo.payoutAmount < policyInfo.sumInsuredAmount)
-        {
-            revert ErrorBundleManagerPolicyNotCloseable(policyNftId);
-        }
-
         NftId bundleNftId = policyInfo.bundleNftId;
-        // TODO decide to use instance reader or registry
         // decision will likely depend on the decision what to check here and what in the service
         NftId poolNftId = _instanceReader.getBundleInfo(bundleNftId).poolNftId;
 

package/contracts/instance/IInstance.sol

@@ -10,6 +10,8 @@ import {IComponentOwnerService} from "./service/IComponentOwnerService.sol";
 import {IDistributionService} from "./service/IDistributionService.sol";
 import {IPoolService} from "./service/IPoolService.sol";
 import {IProductService} from "./service/IProductService.sol";
+import {IPolicyService} from "./service/IPolicyService.sol";
+import {IBundleService} from "./service/IBundleService.sol";
 import {IBundle} from "./module/IBundle.sol";
 import {ISetup} from "./module/ISetup.sol";
 import {NftId} from "../types/NftId.sol";
@@ -26,6 +28,8 @@ interface IInstance is IERC165, IKeyValueStore {
     function getDistributionService() external view returns (IDistributionService);
     function getProductService() external view returns (IProductService);
     function getPoolService() external view returns (IPoolService);
+    function getPolicyService() external view returns (IPolicyService);
+    function getBundleService() external view returns (IBundleService);
 
     function createDistributionSetup(NftId distributionNftId, ISetup.DistributionSetupInfo memory setup) external;
     function updateDistributionSetup(NftId distributionNftId, ISetup.DistributionSetupInfo memory setup, StateId newState) external;

package/contracts/instance/IInstanceBase.sol

@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.20;
+
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
+
+import {BundleManager} from "./BundleManager.sol";
+import {InstanceReader} from "./InstanceReader.sol";
+
+import {IComponentOwnerService} from "./service/IComponentOwnerService.sol";
+import {IDistributionService} from "./service/IDistributionService.sol";
+import {IPoolService} from "./service/IPoolService.sol";
+import {IProductService} from "./service/IProductService.sol";
+import {IBundle} from "./module/IBundle.sol";
+import {ISetup} from "./module/ISetup.sol";
+import {NftId} from "../types/NftId.sol";
+import {StateId} from "../types/StateId.sol";
+import {RiskId} from "../types/RiskId.sol";
+import {IRisk} from "./module/IRisk.sol";
+import {IPolicy} from "./module/IPolicy.sol";
+import {IKeyValueStore} from "./base/IKeyValueStore.sol";
+
+
+interface IInstanceBase is IERC165, IKeyValueStore {
+
+
+}

package/contracts/instance/IInstanceService.sol

@@ -10,19 +10,21 @@ import {IRegistry} from "../registry/IRegistry.sol";
 import {IRegisterable} from "../shared/IRegisterable.sol";
 import {IBaseComponent} from "../components/IBaseComponent.sol";
 
-import {AccessManagerSimple} from "./AccessManagerSimple.sol";
+import {AccessManagerUpgradeableInitializeable} from "./AccessManagerUpgradeableInitializeable.sol";
 import {Instance} from "./Instance.sol";
 import {InstanceReader} from "./InstanceReader.sol";
 import {BundleManager} from "./BundleManager.sol";
 
 interface IInstanceService is IService {
 
+    error ErrorInstanceServiceRequestUnauhorized(address caller);
+
     event LogInstanceCloned(address clonedAccessManagerAddress, address clonedInstanceAddress, address clonedInstanceReaderAddress, NftId clonedInstanceNftId);
 
     function createInstanceClone()
         external 
         returns (
-            AccessManagerSimple clonedAccessManager, 
+            AccessManagerUpgradeableInitializeable clonedAccessManager, 
             Instance clonedInstance,
             NftId instanceNftId,
             InstanceReader clonedInstanceReader,

package/contracts/instance/Instance.sol

@@ -3,9 +3,10 @@ pragma solidity ^0.8.20;
 
 import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 import {ShortString, ShortStrings} from "@openzeppelin/contracts/utils/ShortStrings.sol";
+import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
+import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";
+import {AccessManagerUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagerUpgradeable.sol";
 
-import {AccessManagedSimple} from "./AccessManagedSimple.sol";
-import {AccessManagerSimple} from "./AccessManagerSimple.sol";
 import {IAccess} from "./module/IAccess.sol";
 import {IBundle} from "./module/IBundle.sol";
 import {IPolicy} from "./module/IPolicy.sol";
@@ -18,7 +19,7 @@ import {InstanceReader} from "./InstanceReader.sol";
 import {BundleManager} from "./BundleManager.sol";
 import {NftId} from "../types/NftId.sol";
 import {NumberId} from "../types/NumberId.sol";
-import {ObjectType, BUNDLE, DISTRIBUTION, INSTANCE, POLICY, POOL, ROLE, PRODUCT, TARGET} from "../types/ObjectType.sol";
+import {ObjectType, BUNDLE, DISTRIBUTION, INSTANCE, POLICY, POOL, ROLE, PRODUCT, TARGET, COMPONENT} from "../types/ObjectType.sol";
 import {RiskId, RiskIdLib} from "../types/RiskId.sol";
 import {RoleId, RoleIdLib} from "../types/RoleId.sol";
 import {StateId, ACTIVE} from "../types/StateId.sol";
@@ -29,14 +30,16 @@ import {IComponentOwnerService} from "./service/IComponentOwnerService.sol";
 import {IDistributionService} from "./service/IDistributionService.sol";
 import {IPoolService} from "./service/IPoolService.sol";
 import {IProductService} from "./service/IProductService.sol";
+import {IPolicyService} from "./service/IPolicyService.sol";
+import {IBundleService} from "./service/IBundleService.sol";
 import {VersionPart} from "../types/Version.sol";
+import {InstanceBase} from "./InstanceBase.sol";
 
 contract Instance is
-    AccessManagedSimple,
-    KeyValueStore,
+    AccessManagedUpgradeable,
     IInstance,
-    ERC165,
-    Registerable
+    // Initializable,
+    InstanceBase
 {
 
     uint64 public constant ADMIN_ROLE = type(uint64).min;
@@ -53,21 +56,19 @@ contract Instance is
 
     mapping(ShortString name => address target) internal _target;
 
-    AccessManagerSimple internal _accessManager;
+    AccessManagerUpgradeable internal _accessManager;
     InstanceReader internal _instanceReader;
     BundleManager internal _bundleManager;
 
-    constructor(address accessManagerAddress, address registryAddress, NftId registryNftId)
+    function initialize(address accessManagerAddress, address registryAddress, NftId registryNftId, address initialOwner) 
+        public 
+        initializer
     {
-        initialize(accessManagerAddress, registryAddress, registryNftId, msg.sender);
-    }
-
-    function initialize(address accessManagerAddress, address registryAddress, NftId registryNftId, address initialOwner) public {
         require(!_initialized, "Contract instance has already been initialized");
 
-        initializeAccessManagedSimple(accessManagerAddress);
+        __AccessManaged_init(accessManagerAddress);
                 
-        _accessManager = AccessManagerSimple(accessManagerAddress);
+        _accessManager = AccessManagerUpgradeable(accessManagerAddress);
         _createRole(RoleIdLib.toRoleId(ADMIN_ROLE), "AdminRole", false, false);
         _createRole(RoleIdLib.toRoleId(PUBLIC_ROLE), "PublicRole", false, false);
 
@@ -419,23 +420,31 @@ contract Instance is
     }
 
     function getComponentOwnerService() external view returns (IComponentOwnerService) {
-        return ComponentOwnerService(_registry.getServiceAddress("ComponentOwnerService", VersionPart.wrap(3)));
+        return ComponentOwnerService(_registry.getServiceAddress(COMPONENT(), VersionPart.wrap(3)));
     }
 
     function getDistributionService() external view returns (IDistributionService) {
-        return IDistributionService(_registry.getServiceAddress("DistributionService", VersionPart.wrap(3)));
+        return IDistributionService(_registry.getServiceAddress(DISTRIBUTION(), VersionPart.wrap(3)));
     }
 
     function getProductService() external view returns (IProductService) {
-        return IProductService(_registry.getServiceAddress("ProductService", VersionPart.wrap(3)));
+        return IProductService(_registry.getServiceAddress(PRODUCT(), VersionPart.wrap(3)));
     }
 
     function getPoolService() external view returns (IPoolService) {
-        return IPoolService(_registry.getServiceAddress("PoolService", VersionPart.wrap(3)));
+        return IPoolService(_registry.getServiceAddress(POOL(), VersionPart.wrap(3)));
+    }
+
+    function getPolicyService() external view returns (IPolicyService) {
+        return IPolicyService(_registry.getServiceAddress(POLICY(), VersionPart.wrap(3)));
+    }
+
+    function getBundleService() external view returns (IBundleService) {
+        return IBundleService(_registry.getServiceAddress(BUNDLE(), VersionPart.wrap(3)));
     }
 
     function setInstanceReader(InstanceReader instanceReader) external restricted() {
-        require(address(_instanceReader) == address(0), "InstanceReader is set");
+        require(instanceReader.getInstanceNftId() == getNftId(), "NFT ID of InstanceReader does not match");
         _instanceReader = instanceReader;
     }
 
@@ -445,6 +454,7 @@ contract Instance is
     
     function setBundleManager(BundleManager bundleManager) external restricted() {
         require(address(_bundleManager) == address(0), "BundleManager is set");
+        require(bundleManager.getInstanceNftId() == getNftId(), "NFT ID of BundleManager does not match");
         _bundleManager = bundleManager;
     }
 

package/contracts/instance/InstanceAccessManager.sol

@@ -3,9 +3,9 @@ pragma solidity ^0.8.20;
 
 import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 import {ShortString, ShortStrings} from "@openzeppelin/contracts/utils/ShortStrings.sol";
+import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";
+import {AccessManagerUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagerUpgradeable.sol";
 
-import {AccessManagedSimple} from "./AccessManagedSimple.sol";
-import {AccessManagerSimple} from "./AccessManagerSimple.sol";
 import {IBundle} from "./module/IBundle.sol";
 import {IPolicy} from "./module/IPolicy.sol";
 import {IRisk} from "./module/IRisk.sol";
@@ -21,7 +21,7 @@ import {StateId, ACTIVE} from "../types/StateId.sol";
 import {Timestamp, TimestampLib} from "../types/Timestamp.sol";
 
 contract InstanceAccessManager is
-    AccessManagedSimple
+    AccessManagedUpgradeable
 {
     string public constant ADMIN_ROLE_NAME = "AdminRole";
     string public constant PUBLIC_ROLE_NAME = "PublicRole";
@@ -76,12 +76,12 @@ contract InstanceAccessManager is
     mapping(ShortString name => address target) internal _targetForName;
     address [] internal _targets;
 
-    AccessManagerSimple internal _accessManager;
+    AccessManagerUpgradeable internal _accessManager;
 
     constructor(address accessManager)
     {
-        _accessManager = AccessManagerSimple(accessManager);
-        initializeAccessManagedSimple(accessManager);
+        _accessManager = AccessManagerUpgradeable(accessManager);
+        __AccessManaged_init(accessManager);
 
         _createRole(RoleIdLib.toRoleId(_accessManager.ADMIN_ROLE()), ADMIN_ROLE_NAME, false, false);
         _createRole(RoleIdLib.toRoleId(_accessManager.PUBLIC_ROLE()), PUBLIC_ROLE_NAME, false, false);

package/contracts/instance/InstanceBase.sol

@@ -0,0 +1,41 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.20;
+
+import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
+import {ShortString, ShortStrings} from "@openzeppelin/contracts/utils/ShortStrings.sol";
+
+import {IAccess} from "./module/IAccess.sol";
+import {IBundle} from "./module/IBundle.sol";
+import {IPolicy} from "./module/IPolicy.sol";
+import {IRisk} from "./module/IRisk.sol";
+import {ISetup} from "./module/ISetup.sol";
+import {Key32, KeyId, Key32Lib} from "../types/Key32.sol";
+import {KeyValueStore} from "./base/KeyValueStore.sol";
+import {IInstance} from "./IInstance.sol";
+import {InstanceReader} from "./InstanceReader.sol";
+import {BundleManager} from "./BundleManager.sol";
+import {NftId} from "../types/NftId.sol";
+import {NumberId} from "../types/NumberId.sol";
+import {ObjectType, BUNDLE, DISTRIBUTION, INSTANCE, POLICY, POOL, ROLE, PRODUCT, TARGET} from "../types/ObjectType.sol";
+import {RiskId, RiskIdLib} from "../types/RiskId.sol";
+import {RoleId, RoleIdLib} from "../types/RoleId.sol";
+import {StateId, ACTIVE} from "../types/StateId.sol";
+import {ERC165} from "../shared/ERC165.sol";
+import {Registerable} from "../shared/Registerable.sol";
+import {ComponentOwnerService} from "./service/ComponentOwnerService.sol";
+import {IComponentOwnerService} from "./service/IComponentOwnerService.sol";
+import {IDistributionService} from "./service/IDistributionService.sol";
+import {IPoolService} from "./service/IPoolService.sol";
+import {IProductService} from "./service/IProductService.sol";
+import {VersionPart} from "../types/Version.sol";
+import {IInstanceBase} from "./IInstanceBase.sol";
+
+contract InstanceBase is
+    IInstanceBase,
+    KeyValueStore,
+    ERC165,
+    Registerable
+{
+
+
+}