@etherisc/gif-next 3.0.0-d6cf78d-199 → 3.0.0-f90c901-018

package/contracts/distribution/DistributionService.sol

@@ -20,8 +20,6 @@ import {KEEP_STATE} from "../type/StateId.sol";
 import {ObjectType, ACCOUNTING, COMPONENT, DISTRIBUTION, INSTANCE, DISTRIBUTION, DISTRIBUTOR, REGISTRY} from "../type/ObjectType.sol";
 import {InstanceReader} from "../instance/InstanceReader.sol";
 import {InstanceStore} from "../instance/InstanceStore.sol";
-// TODO PoolLib feels wrong, should likely go in a component type independent lib
-import {PoolLib} from "../pool/PoolLib.sol";
 import {ReferralId, ReferralStatus, ReferralLib, REFERRAL_OK, REFERRAL_ERROR_UNKNOWN, REFERRAL_ERROR_EXPIRED, REFERRAL_ERROR_EXHAUSTED} from "../type/Referral.sol";
 import {Seconds} from "../type/Seconds.sol";
 import {Service} from "../shared/Service.sol";
@@ -44,14 +42,13 @@ contract DistributionService is
     )
         internal
         virtual override
-        initializer()
+        onlyInitializing()
     {
         (
-            address authority,
-            address registry
-        ) = abi.decode(data, (address, address));
+            address authority
+        ) = abi.decode(data, (address));
 
-        __Service_init(authority, registry, owner);
+        __Service_init(authority, owner);
 
         _accountingService = IAccountingService(_getServiceAddress(ACCOUNTING()));
         _componentService = IComponentService(_getServiceAddress(COMPONENT()));
@@ -81,7 +78,7 @@ contract DistributionService is
         (NftId distributionNftId, IInstance instance) = _getAndVerifyActiveDistribution();
 
         {
-            NftId productNftId = getRegistry().getParentNftId(distributionNftId);
+            NftId productNftId = _getRegistry().getParentNftId(distributionNftId);
             IComponents.FeeInfo memory feeInfo = instance.getInstanceReader().getFeeInfo(productNftId);
 
             UFixed variableDistributionFees = feeInfo.distributionFee.fractionalFee;
@@ -134,11 +131,12 @@ contract DistributionService is
                 NftIdLib.zero(), 
                 distributionNftId,
                 DISTRIBUTOR(),
+                getRelease(),
                 true, // intercepting property for bundles is defined on pool
-                address(0),
-                distributor,
-                ""
-            ));
+                address(0)),
+            distributor,
+            ""
+        );
 
         IDistribution.DistributorInfo memory info = IDistribution.DistributorInfo({
             distributorType: distributorType,
@@ -197,9 +195,11 @@ contract DistributionService is
             revert ErrorDistributionServiceExpirationInvalid(expiryAt);
         }
 
-        NftId distributorDistributionNftId = getRegistry().getParentNftId(distributorNftId);
-        if (distributorDistributionNftId != distributionNftId) {
-            revert ErrorDistributionServiceDistributorDistributionMismatch(distributorNftId, distributorDistributionNftId, distributionNftId);
+        {
+            NftId distributorDistributionNftId = _getRegistry().getParentNftId(distributorNftId);
+            if (distributorDistributionNftId != distributionNftId) {
+                revert ErrorDistributionServiceDistributorDistributionMismatch(distributorNftId, distributorDistributionNftId, distributionNftId);
+            }
         }
 
         {
@@ -251,7 +251,7 @@ contract DistributionService is
         onlyNftOfType(distributionNftId, DISTRIBUTION())
     {
         if (referralIsValid(distributionNftId, referralId)) {
-            IInstance instance = IInstance(ContractLib.getInstanceForComponent(getRegistry(), distributionNftId));
+            IInstance instance = IInstance(ContractLib.getInstanceForComponent(distributionNftId));
 
             // update book keeping for referral info
             IDistribution.ReferralInfo memory referralInfo = instance.getInstanceReader().getReferralInfo(referralId);
@@ -272,7 +272,7 @@ contract DistributionService is
         restricted()
         onlyNftOfType(distributionNftId, DISTRIBUTION())
     {
-        IInstance instance = IInstance(ContractLib.getInstanceForComponent(getRegistry(), distributionNftId));
+        IInstance instance = IInstance(ContractLib.getInstanceForComponent(distributionNftId));
         InstanceReader reader = instance.getInstanceReader();
         InstanceStore store = instance.getInstanceStore();
 
@@ -340,7 +340,7 @@ contract DistributionService is
 
         // transfer amount to distributor
         {
-            address distributor = getRegistry().ownerOf(distributorNftId);
+            address distributor = _getRegistry().ownerOf(distributorNftId);
             emit LogDistributionServiceCommissionWithdrawn(distributorNftId, distributor, address(distributionInfo.tokenHandler.TOKEN()), withdrawnAmount);
             distributionInfo.tokenHandler.pushToken(distributor, withdrawnAmount);
         }
@@ -357,7 +357,7 @@ contract DistributionService is
             return false;
         }
 
-        IInstance instance = IInstance(ContractLib.getInstanceForComponent(getRegistry(), distributionNftId));
+        IInstance instance = IInstance(ContractLib.getInstanceForComponent(distributionNftId));
         IDistribution.ReferralInfo memory info = instance.getInstanceReader().getReferralInfo(referralId);
 
         if (info.distributorNftId.eqz()) {
@@ -438,7 +438,11 @@ contract DistributionService is
             IInstance instance
         )
     {
-        return PoolLib.getAndVerifyActiveComponent(getRegistry(), msg.sender, DISTRIBUTION());
+        (poolNftId, instance) = ContractLib.getAndVerifyComponent(
+            msg.sender, 
+            DISTRIBUTION(), 
+            getRelease(), 
+            true);
     }
 
 

package/contracts/distribution/DistributionServiceManager.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IVersionable} from "../upgradeability/IVersionable.sol";
+import {IUpgradeable} from "../upgradeability/IUpgradeable.sol";
 import {ProxyManager} from "../upgradeability/ProxyManager.sol";
 import {DistributionService} from "./DistributionService.sol";
 
@@ -12,19 +12,17 @@ contract DistributionServiceManager is ProxyManager {
     /// @dev initializes proxy manager with distribution service implementation and deploys instance
     constructor(
         address authority, 
-        address registry,
         bytes32 salt
     ) 
     {
         DistributionService svc = new DistributionService{salt: salt}();
-        bytes memory data = abi.encode(authority, registry);
-        IVersionable versionable = initialize(
-            registry,
+        bytes memory data = abi.encode(authority);
+        IUpgradeable upgradeable = initialize(
             address(svc), 
             data,
             salt);
 
-        _distributionService = DistributionService(address(versionable));
+        _distributionService = DistributionService(address(upgradeable));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/examples/fire/FirePool.sol

@@ -16,7 +16,6 @@ contract FirePool is
     BasicPool
 {   
     constructor(
-        address registry,
         NftId fireProductNftId,
         string memory componentName,
         IAuthorization authorization
@@ -24,7 +23,6 @@ contract FirePool is
     {
         address initialOwner = msg.sender;
         _intialize(
-            registry,
             fireProductNftId,
             componentName,
             IComponents.PoolInfo({
@@ -41,7 +39,6 @@ contract FirePool is
     }
 
     function _intialize(
-        address registry,
         NftId fireProductNftId,
         string memory componentName,
         IComponents.PoolInfo memory poolInfo,
@@ -52,7 +49,6 @@ contract FirePool is
         initializer
     {
         _initializeBasicPool(
-            registry,
             fireProductNftId,
             componentName,
             poolInfo,

package/contracts/examples/fire/FireProduct.sol

@@ -65,7 +65,6 @@ contract FireProduct is
     mapping(uint256 fireId => mapping (NftId policyId => bool claimed)) private _claimed;
 
     constructor(
-        address registry,
         NftId instanceNftid,
         string memory componentName,
         IAuthorization authorization
@@ -74,7 +73,6 @@ contract FireProduct is
         address initialOwner = msg.sender;
 
         _initialize(
-            registry,
             instanceNftid,
             componentName,
             authorization,
@@ -82,7 +80,6 @@ contract FireProduct is
     }
 
     function _initialize(
-        address registry,
         NftId instanceNftId,
         string memory componentName,
         IAuthorization authorization,
@@ -92,7 +89,6 @@ contract FireProduct is
         initializer
     {
         _initializeBasicProduct(
-            registry,
             instanceNftId,
             componentName,
             IComponents.ProductInfo({

package/contracts/examples/unpermissioned/SimpleDistribution.sol

@@ -17,14 +17,12 @@ contract SimpleDistribution is
 {
     
     constructor(
-        address registry,
         NftId productNftId,
         IAuthorization authorization,
         address initialOwner
     ) 
     {
         initialize(
-            registry,
             productNftId,
             authorization,
             initialOwner,
@@ -32,7 +30,6 @@ contract SimpleDistribution is
     }
 
     function initialize(
-        address registry,
         NftId productNftId,
         IAuthorization authorization,
         address initialOwner,
@@ -43,7 +40,6 @@ contract SimpleDistribution is
         initializer()
     {
         _initializeBasicDistribution(
-            registry,
             productNftId,
             authorization,
             initialOwner,

package/contracts/examples/unpermissioned/SimpleOracle.sol

@@ -31,14 +31,12 @@ contract SimpleOracle is
     event LogSimpleOracleSyncResponseSent(RequestId requestId, string responseText);
 
     constructor(
-        address registry,
         NftId productNftId,
         IAuthorization authorization,
         address initialOwner
     ) 
     {
         initialize(
-            registry,
             productNftId,
             authorization,
             initialOwner,
@@ -47,7 +45,6 @@ contract SimpleOracle is
     }
 
     function initialize(
-        address registry,
         NftId productNftId,
         IAuthorization authorization,
         address initialOwner,
@@ -58,7 +55,6 @@ contract SimpleOracle is
         initializer()
     {
         _initializeBasicOracle(
-            registry,
             productNftId,
             authorization,
             initialOwner,

package/contracts/examples/unpermissioned/SimplePool.sol

@@ -17,7 +17,6 @@ contract SimplePool is
 {
     
     constructor(
-        address registry,
         NftId productNftId,
         IComponents.PoolInfo memory poolInfo,
         IAuthorization authorization,
@@ -25,7 +24,6 @@ contract SimplePool is
     ) 
     {
         initialize(
-            registry,
             productNftId,
             poolInfo,
             authorization,
@@ -35,7 +33,6 @@ contract SimplePool is
 
 
     function initialize(
-        address registry,
         NftId productNftId,
         IComponents.PoolInfo memory poolInfo,
         IAuthorization authorization,
@@ -46,7 +43,6 @@ contract SimplePool is
         initializer()
     {
         _initializeBasicPool(
-            registry,
             productNftId,
             "SimplePool",
             poolInfo,

package/contracts/examples/unpermissioned/SimpleProduct.sol

@@ -34,7 +34,6 @@ contract SimpleProduct is
     IOracleService private _oracleService;
 
     constructor(
-        address registry,
         NftId instanceNftId,
         string memory name,
         IComponents.ProductInfo memory productInfo,
@@ -44,7 +43,6 @@ contract SimpleProduct is
     )
     {
         initialize(
-            registry,
             instanceNftId,
             name,
             productInfo,
@@ -55,7 +53,6 @@ contract SimpleProduct is
 
 
     function initialize(
-        address registry,
         NftId instanceNftid,
         string memory name,
         IComponents.ProductInfo memory productInfo,
@@ -68,7 +65,6 @@ contract SimpleProduct is
         initializer()
     {
         _initializeBasicProduct(
-            registry,
             instanceNftid,
             name,
             productInfo,

package/contracts/instance/Instance.sol

@@ -26,8 +26,6 @@ contract Instance is
     IInstance,
     Registerable
 {
-    bool private _initialized;
-
     IComponentService internal _componentService;
     IInstanceService internal _instanceService;
 
@@ -59,8 +57,6 @@ contract Instance is
 
     function initialize(
         InstanceContracts memory instanceContracts,
-        IRegistry registry, 
-        VersionPart release,
         address initialOwner,
         bool tokenRegistryDisabled // only disable for testing
     ) 
@@ -74,9 +70,9 @@ contract Instance is
         _instanceAdmin = instanceContracts.instanceAdmin;
 
         // setup instance object info
+        IRegistry registry = _getRegistry();
         __Registerable_init({
             authority: instanceContracts.instanceAdmin.authority(),
-            registry: address(registry), 
             parentNftId: registry.getNftId(), 
             objectType: INSTANCE(), 
             isInterceptor: false, 
@@ -93,19 +89,19 @@ contract Instance is
         // initialize instance supporting contracts
         _instanceStore.initialize();
         _productStore.initialize();
-        _bundleSet.initialize(instanceContracts.instanceAdmin.authority(), address(registry));
-        _riskSet.initialize(instanceContracts.instanceAdmin.authority(), address(registry));
+        _bundleSet.initialize(instanceContracts.instanceAdmin.authority());
+        _riskSet.initialize(instanceContracts.instanceAdmin.authority());
         _instanceReader.initialize();
 
         _componentService = IComponentService(
-            getRegistry().getServiceAddress(
+            registry.getServiceAddress(
                 COMPONENT(), 
-                release));
+                getRelease()));
 
         _instanceService = IInstanceService(
-            getRegistry().getServiceAddress(
+            registry.getServiceAddress(
                 INSTANCE(), 
-                release));
+                getRelease()));
 
         _tokenRegistryDisabled = tokenRegistryDisabled;
 

package/contracts/instance/InstanceAdmin.sol

@@ -11,9 +11,10 @@ import {AccessAdminLib} from "../authorization/AccessAdminLib.sol";
 import {AccessManagerCloneable} from "../authorization/AccessManagerCloneable.sol";
 import {ObjectType, INSTANCE} from "../type/ObjectType.sol";
 import {RoleId, ADMIN_ROLE} from "../type/RoleId.sol";
+import {GIF_INITIAL_RELEASE} from "../registry/Registry.sol";
 import {Str} from "../type/String.sol";
-import {VersionPart} from "../type/Version.sol";
 import {INSTANCE_TARGET_NAME, INSTANCE_ADMIN_TARGET_NAME, INSTANCE_STORE_TARGET_NAME, PRODUCT_STORE_TARGET_NAME, BUNDLE_SET_TARGET_NAME, RISK_SET_TARGET_NAME} from "./TargetNames.sol";
+import {VersionPart} from "../type/Version.sol";
 
 
 contract InstanceAdmin is
@@ -26,13 +27,12 @@ contract InstanceAdmin is
     error ErrorInstanceAdminNotComponentOrCustomTarget(address target);
 
     IInstance internal _instance;
-    IRegistry internal _registry;
 
     uint64 internal _customRoleIdNext;
 
 
     modifier onlyInstanceService() {
-        if (msg.sender != _registry.getServiceAddress(INSTANCE(), getRelease())) {
+        if (msg.sender != _getRegistry().getServiceAddress(INSTANCE(), getRelease())) {
             revert ErrorInstanceAdminNotInstanceService(msg.sender);
         }
         _;
@@ -43,7 +43,8 @@ contract InstanceAdmin is
     constructor(address accessManager) {
         initialize(
             accessManager,
-            "MasterInstanceAdmin");
+            "MasterInstanceAdmin",
+            GIF_INITIAL_RELEASE());
     }
 
 
@@ -51,32 +52,23 @@ contract InstanceAdmin is
     /// Important: Initialization of instance admin is only complete after calling this function. 
     /// Important: The instance MUST be registered and all instance supporting contracts must be wired to this instance.
     function completeSetup(
-        address registry,
         address authorization,
-        VersionPart release,
         address instance
     )
         external
-        reinitializer(uint64(release.toInt()))
     {
         // checks
-        AccessAdminLib.checkIsRegistered(registry, instance, INSTANCE());
+        AccessAdminLib.checkIsRegistered(instance, INSTANCE(), getRelease());
 
         // effects
-        AccessManagerCloneable(
-            authority()).completeSetup(
-                registry, 
-                release); 
-
         AccessAdminLib.checkAuthorization(
             address(_authorization), 
             authorization, 
             INSTANCE(), // expectedDomain
-            release, // expectedRelease
+            getRelease(), // expectedRelease
             false, // expectServiceAuthorization
             true); // checkAlreadyInitialized
 
-        _registry = IRegistry(registry);
         _instance = IInstance(instance);
         _authorization = IAuthorization(authorization);
         _customRoleIdNext = 0;
@@ -105,7 +97,7 @@ contract InstanceAdmin is
         for(uint256 i = 0; i < serviceDomains.length; i++) {
             ObjectType serviceDomain = serviceDomains[i];
             RoleId serviceRoleId = authorization.getServiceRole(serviceDomain);
-            address service = _registry.getServiceAddress(serviceDomain, getRelease());
+            address service = _getRegistry().getServiceAddress(serviceDomain, getRelease());
 
             _grantRoleToAccount(
                 serviceRoleId,
@@ -135,7 +127,8 @@ contract InstanceAdmin is
     /// Important: The component MUST be registered.
     function initializeComponentAuthorization(
         address componentAddress,
-        ObjectType expectedType
+        ObjectType expectedType,
+        VersionPart expectedRelease
     )
         external
         restricted()

package/contracts/instance/InstanceAuthorizationV3.sol

@@ -13,7 +13,9 @@ import {InstanceStore} from "../instance/InstanceStore.sol";
 import {INSTANCE_TARGET_NAME, INSTANCE_ADMIN_TARGET_NAME, INSTANCE_STORE_TARGET_NAME, PRODUCT_STORE_TARGET_NAME, BUNDLE_SET_TARGET_NAME, RISK_SET_TARGET_NAME} from "./TargetNames.sol";
 import {ProductStore} from "../instance/ProductStore.sol";
 import {ADMIN_ROLE, INSTANCE_OWNER_ROLE, PUBLIC_ROLE} from "../type/RoleId.sol";
-import {RiskSet} from "../instance/RiskSet.sol"; 
+import {GIF_INITIAL_RELEASE} from "../registry/Registry.sol";
+import {RiskSet} from "../instance/RiskSet.sol";
+import {VersionPartLib} from "../type/Version.sol";
 
 
 contract InstanceAuthorizationV3
@@ -27,7 +29,7 @@ contract InstanceAuthorizationV3
           Authorization(
                INSTANCE_TARGET_NAME, 
                INSTANCE(), 
-               3, 
+               GIF_INITIAL_RELEASE(), 
                COMMIT_HASH,
                TargetType.Instance, 
                false)

package/contracts/instance/InstanceReader.sol

@@ -28,6 +28,7 @@ import {NftId} from "../type/NftId.sol";
 import {PayoutId, PayoutIdLib} from "../type/PayoutId.sol";
 import {PolicyServiceLib} from "../product/PolicyServiceLib.sol";
 import {ProductStore} from "./ProductStore.sol";
+import {RegistryLinked} from "../shared/RegistryLinked.sol";
 import {ReferralId, ReferralStatus, ReferralLib} from "../type/Referral.sol";
 import {RequestId} from "../type/RequestId.sol";
 import {RiskId} from "../type/RiskId.sol";
@@ -40,14 +41,19 @@ import {UFixed, UFixedLib} from "../type/UFixed.sol";
 
 /// @dev Central reader contract for a specific instance.
 /// Provides reading functions for all instance data and related component data.
-contract InstanceReader {
+contract InstanceReader is
+    RegistryLinked
+{
 
     error ErrorInstanceReaderAlreadyInitialized();
     error ErrorInstanceReaderInstanceAddressZero();
-
+    // TODO make state immutable:
+    // 1. instance receives reader through setInstanceReader()
+    // 2. this way instance initialization is not depends on reader
+    // 3. and reader is simple contract with constructor
+    // 4. no _initialized in storage, the rest is immutable
     bool private _initialized = false;
 
-    IRegistry internal _registry;
     IInstance internal _instance;
     InstanceAdmin internal _instanceAdmin;
 
@@ -78,27 +84,24 @@ contract InstanceReader {
         _initialized = true;
         _instance = IInstance(instanceAddress);
         _instanceAdmin = _instance.getInstanceAdmin();
-        _registry = _instance.getRegistry();
 
         _store = _instance.getInstanceStore();
         _productStore = _instance.getProductStore();
         _bundleSet = _instance.getBundleSet();
         _riskSet = _instance.getRiskSet();
-        _distributionService = IDistributionService(_registry.getServiceAddress(DISTRIBUTION(), _instance.getRelease()));
+
+        _distributionService = IDistributionService(
+            _getRegistry().getServiceAddress(DISTRIBUTION(), _instance.getRelease()));
     }
 
 
     //--- instance functions ---------------------------------------------------------//
 
-    /// @dev Returns the registry this instance is registered in.
-    function getRegistry() public view returns (IRegistry registry) {
-        return _registry;
-    }
 
 
     /// @dev Returns the instance NFT ID.
     function getInstanceNftId() public view returns (NftId instanceNftid) {
-        return _registry.getNftIdForAddress(address(_instance));
+        return _getRegistry().getNftIdForAddress(address(_instance));
     }
 
 
@@ -413,7 +416,7 @@ contract InstanceReader {
         return _store.getReferralInfo(referralId);
     }
 
-
+    // TODO reader dependce on service os wrong?
     function getDiscountPercentage(ReferralId referralId)
         public
         view
@@ -422,10 +425,7 @@ contract InstanceReader {
             ReferralStatus status
         )
     {
-        return IDistributionService(
-            _registry.getServiceAddress(
-                DISTRIBUTION(),
-                _instance.getRelease())).getDiscountPercentage(
+        return _distributionService.getDiscountPercentage(
                     this, // instance reader
                     referralId);
     }