@etherisc/gif-next 0.0.2-754ba48-078 → 0.0.2-7560591-936

package/contracts/distribution/DistributionService.sol

@@ -93,17 +93,17 @@ contract DistributionService is
         }
 
         distributorType = DistributorTypeLib.toDistributorType(distributionNftId, name);
-        IDistribution.DistributorTypeInfo memory info = IDistribution.DistributorTypeInfo(
-            name,
-            distributionNftId,
-            minDiscountPercentage,
-            maxDiscountPercentage,
-            commissionPercentage,
-            maxReferralCount,
-            maxReferralLifetime,
-            allowSelfReferrals,
-            allowRenewals,
-            data);
+        IDistribution.DistributorTypeInfo memory info = IDistribution.DistributorTypeInfo({
+            name: name,
+            distributionNftId: distributionNftId,
+            minDiscountPercentage: minDiscountPercentage,
+            maxDiscountPercentage: maxDiscountPercentage,
+            commissionPercentage: commissionPercentage,
+            maxReferralCount: maxReferralCount,
+            maxReferralLifetime: maxReferralLifetime,
+            allowSelfReferrals: allowSelfReferrals,
+            allowRenewals: allowRenewals,
+            data: data});
 
         instance.getInstanceStore().createDistributorType(distributorType, info);
     }
@@ -132,11 +132,11 @@ contract DistributionService is
                 ""
             ));
 
-        IDistribution.DistributorInfo memory info = IDistribution.DistributorInfo(
-            distributorType,
-            true, // active
-            data,
-            0);
+        IDistribution.DistributorInfo memory info = IDistribution.DistributorInfo({
+            distributorType: distributorType,
+            active: true, 
+            numPoliciesSold: 0,
+            data: data});
 
         instance.getInstanceStore().createDistributor(distributorNftId, info);
     }
@@ -208,16 +208,16 @@ contract DistributionService is
 
         {
             referralId = ReferralLib.toReferralId(distributionNftId, code);
-            IDistribution.ReferralInfo memory info = IDistribution.ReferralInfo(
-                distributionNftId,
-                distributorNftId,
-                code,
-                discountPercentage,
-                maxReferrals,
-                0, // used referrals
-                expiryAt,
-                data
-            );
+            IDistribution.ReferralInfo memory info = IDistribution.ReferralInfo({
+                distributionNftId: distributionNftId,
+                distributorNftId: distributorNftId,
+                referralCode: code,
+                discountPercentage: discountPercentage,
+                maxReferrals: maxReferrals,
+                usedReferrals: 0, 
+                expiryAt: expiryAt,
+                data: data
+            });
 
             instance.getInstanceStore().createReferral(referralId, info);
         }
@@ -298,7 +298,7 @@ contract DistributionService is
         InstanceReader reader = instance.getInstanceReader();
         
         IComponents.ComponentInfo memory distributionInfo = reader.getComponentInfo(distributionNftId);
-        address distributionWallet = distributionInfo.tokenHandler.getWallet();
+        // address distributionWallet = distributionInfo.tokenHandler.getWallet();
         
         Amount commissionAmount = reader.getFeeAmount(distributorNftId);
         
@@ -324,7 +324,7 @@ contract DistributionService is
         // transfer amount to distributor
         {
             address distributor = getRegistry().ownerOf(distributorNftId);
-            emit LogDistributionServiceCommissionWithdrawn(distributorNftId, distributor, address(distributionInfo.token), withdrawnAmount);
+            emit LogDistributionServiceCommissionWithdrawn(distributorNftId, distributor, address(distributionInfo.tokenHandler.TOKEN()), withdrawnAmount);
             distributionInfo.tokenHandler.pushToken(distributor, withdrawnAmount);
         }
     }

package/contracts/distribution/IDistributionComponent.sol

@@ -9,17 +9,8 @@ import {UFixed} from "../type/UFixed.sol";
 
 interface IDistributionComponent is IInstanceLinkedComponent {
 
-    error ErrorDistributionNotDistributor(address distributor);
-    error ErrorDistributionAlreadyDistributor(address distributor, NftId distributorNftId);
-
     event LogDistributorUpdated(address to, address operator);
 
-    /// @dev Returns true iff the provided address is registered as a distributor with this distribution component.
-    function isDistributor(address candidate) external view returns (bool);
-
-    /// @dev Returns the distributor Nft Id for the provided address
-    function getDistributorNftId(address distributor) external view returns (NftId distributorNftId);
-
     function getDiscountPercentage(
         string memory referralCode
     ) external view returns (UFixed discountPercentage, ReferralStatus status);

package/contracts/examples/fire/FirePool.sol

@@ -19,7 +19,6 @@ contract FirePool is
         address registry,
         NftId fireProductNftId,
         string memory componentName,
-        address token,
         IAuthorization authorization
     ) 
     {
@@ -28,7 +27,6 @@ contract FirePool is
             registry,
             fireProductNftId,
             componentName,
-            token,
             IComponents.PoolInfo({
                 maxBalanceAmount: AmountLib.max(),
                 isInterceptingBundleTransfers: false,
@@ -46,7 +44,6 @@ contract FirePool is
         address registry,
         NftId fireProductNftId,
         string memory componentName,
-        address token,
         IComponents.PoolInfo memory poolInfo,
         IAuthorization authorization,
         address initialOwner
@@ -58,7 +55,6 @@ contract FirePool is
             registry,
             fireProductNftId,
             componentName,
-            token,
             poolInfo,
             authorization,
             initialOwner);

package/contracts/examples/fire/FireProduct.sol

@@ -68,7 +68,6 @@ contract FireProduct is
         address registry,
         NftId instanceNftid,
         string memory componentName,
-        address token,
         IAuthorization authorization
     )
     {
@@ -78,7 +77,6 @@ contract FireProduct is
             registry,
             instanceNftid,
             componentName,
-            token,
             authorization,
             initialOwner);
     }
@@ -87,7 +85,6 @@ contract FireProduct is
         address registry,
         NftId instanceNftId,
         string memory componentName,
-        address token,
         IAuthorization authorization,
         address initialOwner
     )
@@ -98,7 +95,6 @@ contract FireProduct is
             registry,
             instanceNftId,
             componentName,
-            token,
             IComponents.ProductInfo({
                 isProcessingFundedClaims: false,
                 isInterceptingPolicyTransfers: false,

package/contracts/examples/unpermissioned/SimpleDistribution.sol

@@ -20,8 +20,7 @@ contract SimpleDistribution is
         address registry,
         NftId productNftId,
         IAuthorization authorization,
-        address initialOwner,
-        address token
+        address initialOwner
     ) 
     {
         initialize(
@@ -29,8 +28,7 @@ contract SimpleDistribution is
             productNftId,
             authorization,
             initialOwner,
-            "SimpleDistribution",
-            token);
+            "SimpleDistribution");
     }
 
     function initialize(
@@ -38,8 +36,7 @@ contract SimpleDistribution is
         NftId productNftId,
         IAuthorization authorization,
         address initialOwner,
-        string memory name,
-        address token
+        string memory name
     )
         public
         virtual
@@ -50,8 +47,7 @@ contract SimpleDistribution is
             productNftId,
             authorization,
             initialOwner,
-            name,
-            token);
+            name);
     }
 
     function approveTokenHandler(IERC20Metadata token, Amount amount) external restricted() onlyOwner() { _approveTokenHandler(token, amount); }

package/contracts/examples/unpermissioned/SimpleOracle.sol

@@ -34,8 +34,7 @@ contract SimpleOracle is
         address registry,
         NftId productNftId,
         IAuthorization authorization,
-        address initialOwner,
-        address token
+        address initialOwner
     ) 
     {
         initialize(
@@ -43,8 +42,7 @@ contract SimpleOracle is
             productNftId,
             authorization,
             initialOwner,
-            "SimpleOracle",
-            token
+            "SimpleOracle"
         );
     }
 
@@ -53,8 +51,7 @@ contract SimpleOracle is
         NftId productNftId,
         IAuthorization authorization,
         address initialOwner,
-        string memory name,
-        address token
+        string memory name
     )
         public
         virtual
@@ -65,8 +62,7 @@ contract SimpleOracle is
             productNftId,
             authorization,
             initialOwner,
-            name,
-            token);
+            name);
     }
 
     /// @dev use case specific handling of oracle requests

package/contracts/examples/unpermissioned/SimplePool.sol

@@ -19,7 +19,6 @@ contract SimplePool is
     constructor(
         address registry,
         NftId productNftId,
-        address token,
         IComponents.PoolInfo memory poolInfo,
         IAuthorization authorization,
         address initialOwner
@@ -28,7 +27,6 @@ contract SimplePool is
         initialize(
             registry,
             productNftId,
-            token,
             poolInfo,
             authorization,
             initialOwner
@@ -39,7 +37,6 @@ contract SimplePool is
     function initialize(
         address registry,
         NftId productNftId,
-        address token,
         IComponents.PoolInfo memory poolInfo,
         IAuthorization authorization,
         address initialOwner
@@ -52,7 +49,6 @@ contract SimplePool is
             registry,
             productNftId,
             "SimplePool",
-            token,
             poolInfo,
             authorization,
             initialOwner);

package/contracts/examples/unpermissioned/SimpleProduct.sol

@@ -37,7 +37,6 @@ contract SimpleProduct is
         address registry,
         NftId instanceNftId,
         string memory name,
-        address token,
         IComponents.ProductInfo memory productInfo,
         IComponents.FeeInfo memory feeInfo,
         IAuthorization authorization,
@@ -48,7 +47,6 @@ contract SimpleProduct is
             registry,
             instanceNftId,
             name,
-            token,
             productInfo,
             feeInfo,
             authorization,
@@ -60,7 +58,6 @@ contract SimpleProduct is
         address registry,
         NftId instanceNftid,
         string memory name,
-        address token,
         IComponents.ProductInfo memory productInfo,
         IComponents.FeeInfo memory feeInfo,
         IAuthorization authorization,
@@ -74,7 +71,6 @@ contract SimpleProduct is
             registry,
             instanceNftid,
             name,
-            token,
             productInfo,
             feeInfo,
             authorization,

package/contracts/instance/IInstance.sol

@@ -73,7 +73,7 @@ interface IInstance is
     function setTargetLocked(address target, bool locked) external;
 
     /// @dev Register a product with the instance.
-    function registerProduct(address product) external returns (NftId productNftId);
+    function registerProduct(address product, address token) external returns (NftId productNftId);
 
     ///--- authz ------------------------------------------------------------//
 
@@ -102,4 +102,5 @@ interface IInstance is
     function getRiskSet() external view returns (RiskSet);
     function getInstanceAdmin() external view returns (InstanceAdmin);
     function getInstanceStore() external view returns (InstanceStore);
+    function isTokenRegistryDisabled() external view returns (bool);
 }

package/contracts/instance/IInstanceService.sol

@@ -64,7 +64,11 @@ interface IInstanceService is IService {
     /// Creation of a new instance is achieved by this service through the creation and registration 
     /// of a new clone of the master instance and then setting up the initial wiring and authorization 
     /// of the necessary components.
-    function createInstance()
+    /// @param allowAnyToken specifies whether the new instance is allowed to use any token or 
+    /// only tokens that are registered in the `TokenRegistry`. Use of tokens **not** registered in the
+    /// `TokenRegistry` may result in problems with token handline and is therefor not recommended. The 
+    /// use of such instances **is not supported** by Etherisc. 
+    function createInstance(bool allowAnyToken)
         external 
         returns (
             IInstance instance,

package/contracts/instance/Instance.sol

@@ -35,6 +35,7 @@ contract Instance is
     RiskSet internal _riskSet;
     InstanceStore internal _instanceStore;
     NftId [] internal _products;
+    bool internal _tokenRegistryDisabled;
 
     modifier onlyChainNft() {
         if(msg.sender != getRegistry().getChainNftAddress()) {
@@ -51,7 +52,8 @@ contract Instance is
         InstanceReader instanceReader,
         IRegistry registry, 
         VersionPart release,
-        address initialOwner
+        address initialOwner,
+        bool tokenRegistryDisabled
     ) 
         external 
         initializer()
@@ -94,6 +96,8 @@ contract Instance is
                 INSTANCE(), 
                 release));
 
+        _tokenRegistryDisabled = tokenRegistryDisabled;
+
         _registerInterface(type(IInstance).interfaceId);    
     }
 
@@ -118,13 +122,13 @@ contract Instance is
 
     //--- ProductRegistration ----------------------------------------------//
 
-    function registerProduct(address product)
+    function registerProduct(address product, address token)
         external
         restricted()
         onlyOwner()
         returns (NftId productNftId)
     {
-        productNftId = _componentService.registerProduct(product);
+        productNftId = _componentService.registerProduct(product, token);
         _products.push(productNftId);
     }
 
@@ -292,5 +296,9 @@ contract Instance is
         return _instanceStore;
     }
 
+    function isTokenRegistryDisabled() external view returns (bool) {
+        return _tokenRegistryDisabled;
+    }
+
     //--- internal view/pure functions --------------------------------------//
 }

package/contracts/instance/InstanceService.sol

@@ -95,8 +95,8 @@ contract InstanceService is
         IInstance(instanceAddress).getInstanceAdmin().setTargetLocked(target, locked);
     }
 
-
-    function createInstance()
+    /// @inheritdoc IInstanceService
+    function createInstance(bool allowAnyToken)
         external 
         virtual
         restricted()
@@ -110,7 +110,7 @@ contract InstanceService is
 
         // create instance admin and instance
         InstanceAdmin instanceAdmin = _cloneNewInstanceAdmin();
-        instance = _createInstance(instanceAdmin, instanceOwner);
+        instance = _createInstance(instanceAdmin, instanceOwner, allowAnyToken);
 
         // register cloned instance with registry
         instanceNftId = _registryService.registerInstance(
@@ -318,28 +318,25 @@ contract InstanceService is
     /// function used to setup a new instance
     function _createInstance(
         InstanceAdmin instanceAdmin,
-        address instanceOwner
+        address instanceOwner,
+        bool allowAnyToken
     )
         internal
         virtual
         returns (IInstance)
     {
-        InstanceStore clonedInstanceStore = InstanceStore(Clones.clone(address(_masterInstanceStore)));
-        BundleSet clonedBundleSet = BundleSet(Clones.clone(_masterInstanceBundleSet));
-        RiskSet clonedRiskSet = RiskSet(Clones.clone(_masterInstanceRiskSet));
-        InstanceReader clonedInstanceReader = InstanceReader(Clones.clone(address(_masterInstanceReader)));
-
         // clone instance
         Instance clonedInstance = Instance(Clones.clone(_masterInstance));
         clonedInstance.initialize(
             instanceAdmin,
-            clonedInstanceStore,
-            clonedBundleSet,
-            clonedRiskSet,
-            clonedInstanceReader,
+            InstanceStore(Clones.clone(address(_masterInstanceStore))),
+            BundleSet(Clones.clone(_masterInstanceBundleSet)),
+            RiskSet(Clones.clone(_masterInstanceRiskSet)),
+            InstanceReader(Clones.clone(address(_masterInstanceReader))),
             getRegistry(),
             getRelease(),
-            instanceOwner);
+            instanceOwner,
+            allowAnyToken);
 
         return clonedInstance;
     }

package/contracts/instance/module/IBundle.sol

@@ -1,20 +1,21 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {Amount} from "../../type/Amount.sol";
 import {NftId} from "../../type/NftId.sol";
 import {Fee} from "../../type/Fee.sol";
-import {Seconds} from "../../type/Seconds.sol";
 import {Timestamp} from "../../type/Timestamp.sol";
 
 interface IBundle {
 
     struct BundleInfo {
-        NftId poolNftId;
-        Fee fee; // bundle fee on net premium amounts
-        bytes filter; // required conditions for applications to be considered for collateralization by this bundle
+        // slot 0
         Timestamp activatedAt; 
         Timestamp expiredAt; // no new policies starting with this timestamp
         Timestamp closedAt; // no open policies, locked amount = 0
+        NftId poolNftId;
+        // slot 1
+        Fee fee; // bundle fee on net premium amounts
+        // slot 2
+        bytes filter; // required conditions for applications to be considered for collateralization by this bundle
     }
 }

package/contracts/instance/module/IComponents.sol

@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
-
 import {Amount} from "../../type/Amount.sol";
 import {Fee} from "../../type/Fee.sol";
 import {NftId} from "../../type/NftId.sol";
@@ -12,13 +10,16 @@ import {UFixed} from "../../type/UFixed.sol";
 interface IComponents {
 
     struct ComponentInfo {
+        // slot 0
         string name; // component name (needs to be unique per instance)
-        IERC20Metadata token;
+        // slot 1
         TokenHandler tokenHandler;
+        // slot 2
         bytes data; // will hold component type specific additional info (eg encoded pool info)
     }
 
     struct ProductInfo {
+        // slot 0
         bool isProcessingFundedClaims; // custom logic to react to pool events for funded claims
         bool isInterceptingPolicyTransfers; // custom logic for policy nft transfers
         bool hasDistribution; // flag to indicate if distribution is enabled
@@ -26,26 +27,36 @@ interface IComponents {
         uint8 numberOfOracles; // actual number of oracles
         NftId poolNftId; // mandatory
         NftId distributionNftId; // 0..1 (optional)
+        // slot 1
         NftId [] oracleNftId; // 0..n (optional)
     }
 
     struct FeeInfo {
+        // slot 0
         Fee productFee; // product fee on net premium
+        // slot 1
         Fee processingFee; // product fee on payout amounts        
+        // slot 2
         Fee distributionFee; // distribution fee for sales that do not include commissions
+        // slot 3
         Fee minDistributionOwnerFee; // min fee required by distribution owner (not including commissions for distributors)
+        // slot 4
         Fee poolFee; // pool fee on net premium
+        // slot 5
         Fee stakingFee; // pool fee on staked capital from investor
+        // slot 6
         Fee performanceFee; // pool fee on profits from capital investors
     }
 
     struct PoolInfo {
+        // slot 0
         Amount maxBalanceAmount; // max balance amount allowed for pool
+        UFixed collateralizationLevel; // factor to calculate collateral for sum insurance (default 100%)
+        // slot 1
+        UFixed retentionLevel; // amount of collateral held in pool (default 100%)
         bool isInterceptingBundleTransfers; // custom logic for bundle nft transfers
         bool isProcessingConfirmedClaims; // custom logic for claims confirmation
         bool isExternallyManaged; // funding bundles is restricted to book keeping, actual funds may be provided as needed to support payouts
         bool isVerifyingApplications; // underwriting requires the pool component checks/confirms the applications 
-        UFixed collateralizationLevel; // factor to calculate collateral for sum insurance (default 100%)
-        UFixed retentionLevel; // amount of collateral held in pool (default 100%)
     }
 }

package/contracts/instance/module/IDistribution.sol

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {Amount} from "../../type/Amount.sol";
 import {DistributorType} from "../../type/DistributorType.sol";
 import {NftId} from "../../type/NftId.sol";
 import {Seconds} from "../../type/Seconds.sol";
@@ -11,33 +10,44 @@ import {UFixed} from "../../type/UFixed.sol";
 interface IDistribution {
 
     struct DistributorTypeInfo {
-        string name;
-        NftId distributionNftId;
+        // slot 0
         UFixed minDiscountPercentage;
+        NftId distributionNftId;
+        // slot 1
         UFixed maxDiscountPercentage;
-        UFixed commissionPercentage;
         uint32 maxReferralCount;
         Seconds maxReferralLifetime;
         bool allowSelfReferrals;
         bool allowRenewals;
+        // slot 2
+        UFixed commissionPercentage;
+        // slot 3
+        string name;                
+        // slot 4
         bytes data;
     }
 
     struct DistributorInfo {
+        // slot 0
         DistributorType distributorType;
         bool active;
-        bytes data;
         uint32 numPoliciesSold;
+        // slot 1
+        bytes data;
     }
 
     struct ReferralInfo {
+        // slot 0
         NftId distributionNftId;
         NftId distributorNftId;
-        string referralCode;
-        UFixed discountPercentage;
         uint32 maxReferrals;
         uint32 usedReferrals;
+        // slot 1
+        UFixed discountPercentage;
         Timestamp expiryAt;
+        // slot 2
+        string referralCode;
+        // slot 3
         bytes data;
     }