@etherisc/gif-next 0.0.2-a307d03-692 → 0.0.2-a33f6f4-689

package/contracts/authorization/IAuthorization.sol

@@ -1,6 +1,8 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
+
 import {IAccess} from "../authorization/IAccess.sol";
 import {ObjectType} from "../type/ObjectType.sol";
 import {RoleId} from "../type/RoleId.sol";
@@ -8,12 +10,16 @@ import {Str} from "../type/String.sol";
 import {VersionPart} from "../type/Version.sol";
 
 interface IAuthorization is 
+     IERC165,
      IAccess 
 {
 
      error ErrorAuthorizationMainTargetNameEmpty();
      error ErrorAuthorizationTargetDomainZero();
 
+     /// @dev Returns the main domain of the authorization.
+     function getDomain() external view returns(ObjectType targetDomain);
+
      /// @dev Returns the list of service targets.
      function getServiceDomains() external view returns(ObjectType[] memory serviceDomains);
 

package/contracts/distribution/BasicDistribution.sol

@@ -7,7 +7,7 @@ import {Distribution} from "./Distribution.sol";
 import {DistributorType} from "../type/DistributorType.sol";
 import {DISTRIBUTOR} from "../type/ObjectType.sol";
 import {Fee} from "../type/Fee.sol";
-import {NftId} from "../type/NftId.sol";
+import {NftId, NftIdLib} from "../type/NftId.sol";
 import {ReferralId} from "../type/Referral.sol";
 import {Seconds} from "../type/Seconds.sol";
 import {Timestamp} from "../type/Timestamp.sol";
@@ -95,6 +95,7 @@ contract BasicDistribution is
      * referral codes need to be unique
      */
     function createReferral(
+        NftId distributorNftId,
         string memory code,
         UFixed discountPercentage,
         uint32 maxReferrals,
@@ -104,10 +105,10 @@ contract BasicDistribution is
         external
         virtual
         restricted()
-        onlyDistributor()
+        onlyNftOwner(distributorNftId)
         returns (ReferralId referralId)
     {
-        NftId distributorNftId = getDistributorNftId(msg.sender);
+        _checkNftType(distributorNftId, DISTRIBUTOR());
         return _createReferral(
             distributorNftId,
             code,
@@ -122,8 +123,7 @@ contract BasicDistribution is
         NftId instanceNftId,
         IAuthorization authorization, 
         address initialOwner,
-        string memory name,
-        address token
+        string memory name
     )
         internal
         virtual
@@ -133,9 +133,9 @@ contract BasicDistribution is
             registry, 
             instanceNftId, 
             authorization,
+            false,
             initialOwner, 
             name, 
-            token, 
             ""); // component specifc data
     }
 }

package/contracts/distribution/BasicDistributionAuthorization.sol

@@ -17,7 +17,7 @@ contract BasicDistributionAuthorization
 {
 
      constructor(string memory distributionlName)
-          Authorization(distributionlName, DISTRIBUTION())
+          Authorization(distributionlName, DISTRIBUTION(), true, true)
      {}
 
      function _setupServiceTargets()

package/contracts/distribution/Distribution.sol

@@ -10,7 +10,7 @@ import {Amount} from "../type/Amount.sol";
 import {COMPONENT, DISTRIBUTION, DISTRIBUTOR} from "../type/ObjectType.sol";
 import {DistributorType} from "../type/DistributorType.sol";
 import {Fee} from "../type/Fee.sol";
-import {NftId, NftIdLib} from "../type/NftId.sol";
+import {NftId} from "../type/NftId.sol";
 import {ReferralId, ReferralStatus, ReferralLib} from "../type/Referral.sol";
 import {InstanceLinkedComponent} from "../shared/InstanceLinkedComponent.sol";
 import {Seconds} from "../type/Seconds.sol";
@@ -28,17 +28,8 @@ abstract contract Distribution is
     struct DistributionStorage {
         IComponentService _componentService;
         IDistributionService _distributionService;
-        mapping(address distributor => NftId distributorNftId) _distributorNftId;
     }
 
-    modifier onlyDistributor() {
-        if (!isDistributor(msg.sender)) {
-            revert ErrorDistributionNotDistributor(msg.sender);
-        }
-        _;
-    }
-
-
     function processRenewal(
         ReferralId referralId,
         uint256 feeAmount
@@ -56,7 +47,6 @@ abstract contract Distribution is
         external 
         virtual
         restricted()
-        onlyDistributor()
         onlyNftOfType(distributorNftId, DISTRIBUTOR())
         onlyNftOwner(distributorNftId)
         returns (Amount withdrawnAmount) 
@@ -64,27 +54,6 @@ abstract contract Distribution is
         return _withdrawCommission(distributorNftId, amount);
     }
 
-
-    function isDistributor(address candidate)
-        public
-        view
-        returns (bool)
-    {
-        DistributionStorage storage $ = _getDistributionStorage();
-        return $._distributorNftId[candidate].gtz();
-    }
-
-
-    function getDistributorNftId(address distributor)
-        public
-        view
-        returns (NftId distributorNftId)
-    {
-        DistributionStorage storage $ = _getDistributionStorage();
-        return $._distributorNftId[distributor];
-    }
-
-
     function getDiscountPercentage(string memory referralCode)
         external
         view
@@ -135,9 +104,9 @@ abstract contract Distribution is
         address registry,
         NftId productNftId,
         IAuthorization authorization, 
+        bool isInterceptor,
         address initialOwner,
         string memory name,
-        address token,
         bytes memory componentData // component specifidc data 
     )
         internal
@@ -148,10 +117,9 @@ abstract contract Distribution is
             registry, 
             productNftId, 
             name, 
-            token, 
             DISTRIBUTION(), 
             authorization,
-            true, 
+            isInterceptor,
             initialOwner, 
             componentData);
 
@@ -215,16 +183,11 @@ abstract contract Distribution is
         returns(NftId distributorNftId)
     {
         DistributionStorage storage $ = _getDistributionStorage();
-        if($._distributorNftId[distributor].gtz()) {
-            revert ErrorDistributionAlreadyDistributor(distributor, $._distributorNftId[distributor]);
-        }
 
         distributorNftId = $._distributionService.createDistributor(
             distributor,
             distributorType,
             data);
-
-        $._distributorNftId[distributor] = distributorNftId;
     }
 
     /// @dev Uptates the distributor type for the specified distributor.
@@ -273,14 +236,6 @@ abstract contract Distribution is
         return _getDistributionStorage()._distributionService.withdrawCommission(distributorNftId, amount);
     }
 
-    function _nftTransferFrom(address from, address to, uint256 tokenId, address operator) internal virtual override {
-        // keep track of distributor nft owner
-        emit LogDistributorUpdated(to, operator);
-        DistributionStorage storage $ = _getDistributionStorage();
-        $._distributorNftId[from] = NftIdLib.zero();
-        $._distributorNftId[to] = NftIdLib.toNftId(tokenId);
-    }
-
     function _getDistributionStorage() private pure returns (DistributionStorage storage $) {
         assembly {
             $.slot := DISTRIBUTION_STORAGE_LOCATION_V1

package/contracts/distribution/DistributionService.sol

@@ -74,7 +74,6 @@ contract DistributionService is
         returns (DistributorType distributorType)
     {
         (NftId distributionNftId,, IInstance instance) = _getAndVerifyActiveComponent(DISTRIBUTION());
-        // InstanceReader instanceReader = instance.getInstanceReader();
 
         {
             NftId productNftId = _getProductNftId(distributionNftId);
@@ -96,6 +95,7 @@ contract DistributionService is
         distributorType = DistributorTypeLib.toDistributorType(distributionNftId, name);
         IDistribution.DistributorTypeInfo memory info = IDistribution.DistributorTypeInfo(
             name,
+            distributionNftId,
             minDiscountPercentage,
             maxDiscountPercentage,
             commissionPercentage,
@@ -119,6 +119,7 @@ contract DistributionService is
         returns (NftId distributorNftId)
     {
         (NftId distributionNftId,, IInstance instance) = _getAndVerifyActiveComponent(DISTRIBUTION());
+        _checkDistributionType(instance.getInstanceReader(), distributorType, distributionNftId);
 
         distributorNftId = _registryService.registerDistributor(
             IRegistry.ObjectInfo(
@@ -142,15 +143,18 @@ contract DistributionService is
 
     function changeDistributorType(
         NftId distributorNftId,
-        DistributorType distributorType,
+        DistributorType newDistributorType,
         bytes memory data
     )
         external
         virtual
     {
-        (,, IInstance instance) = _getAndVerifyActiveComponent(DISTRIBUTION());
+        _checkNftType(distributorNftId, DISTRIBUTOR());
+        (NftId distributionNftId,, IInstance instance) = _getAndVerifyActiveComponent(DISTRIBUTION());
+        _checkDistributionType(instance.getInstanceReader(), newDistributorType, distributionNftId);
+        
         IDistribution.DistributorInfo memory distributorInfo = instance.getInstanceReader().getDistributorInfo(distributorNftId);
-        distributorInfo.distributorType = distributorType;
+        distributorInfo.distributorType = newDistributorType;
         distributorInfo.data = data;
         instance.getInstanceStore().updateDistributor(distributorNftId, distributorInfo, KEEP_STATE());
     }
@@ -178,6 +182,11 @@ contract DistributionService is
             revert ErrorDistributionServiceExpirationInvalid(expiryAt);
         }
 
+        NftId distributorDistributionNftId = getRegistry().getParentNftId(distributorNftId);
+        if (distributorDistributionNftId != distributionNftId) {
+            revert ErrorDistributionServiceDistributorDistributionMismatch(distributorNftId, distributorDistributionNftId, distributionNftId);
+        }
+
         {
             InstanceReader instanceReader = instance.getInstanceReader();
             DistributorType distributorType = instanceReader.getDistributorInfo(distributorNftId).distributorType;
@@ -200,6 +209,7 @@ contract DistributionService is
         {
             referralId = ReferralLib.toReferralId(distributionNftId, code);
             IDistribution.ReferralInfo memory info = IDistribution.ReferralInfo(
+                distributionNftId,
                 distributorNftId,
                 code,
                 discountPercentage,
@@ -314,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);
         }
     }
@@ -338,10 +348,27 @@ contract DistributionService is
             return false;
         }
 
+        // ensure the referral was created on the same distribution
+        if(info.distributionNftId != distributionNftId) {
+            revert ErrorDistributionServiceReferralDistributionMismatch(referralId, info.distributionNftId, distributionNftId);
+        }
+
         isValid = info.expiryAt.eqz() || (info.expiryAt.gtz() && TimestampLib.blockTimestamp() <= info.expiryAt);
         isValid = isValid && info.usedReferrals < info.maxReferrals;
     }
 
+    function _checkDistributionType(InstanceReader instanceReader, DistributorType distributorType, NftId expectedDistributionNftId) 
+        internal
+        view 
+    {
+        // enfore distributor type belongs to the calling distribution
+        NftId distributorTypeDistributionNftId = instanceReader.getDistributorTypeInfo(distributorType).distributionNftId;
+
+        if (distributorTypeDistributionNftId != expectedDistributionNftId) {
+            revert ErrorDistributionServiceDistributorTypeDistributionMismatch(distributorType, distributorTypeDistributionNftId, expectedDistributionNftId);
+        }
+    }
+
     function _getInstanceForDistribution(NftId distributionNftId)
         internal
         view

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/distribution/IDistributionService.sol

@@ -13,7 +13,6 @@ import {Timestamp} from "../type/Timestamp.sol";
 
 
 interface IDistributionService is IService {
-
     error ErrorDistributionServiceCallerNotRegistered(address caller);
     error ErrorDistributionServiceParentNftIdNotInstance(NftId nftId, NftId parentNftId);
     error ErrorDistributionServiceCallerNotDistributor(address caller);
@@ -26,6 +25,8 @@ interface IDistributionService is IService {
     error ErrorDistributionServiceExpirationInvalid(Timestamp expiryAt);
     error ErrorDistributionServiceCommissionTooHigh(uint256 commissionPercentage, uint256 maxCommissionPercentage);
     error ErrorDistributionServiceMinFeeTooHigh(uint256 minFee, uint256 limit);
+    error ErrorDistributionServiceDistributorTypeDistributionMismatch(DistributorType distributorType, NftId distributorTypeDistributionNftId, NftId distributionNftId);
+    error ErrorDistributionServiceDistributorDistributionMismatch(NftId distributorNftId, NftId distributorDistributionNftId, NftId distributionNftId);
 
     error ErrorDistributionServiceCommissionWithdrawAmountExceedsLimit(Amount amount, Amount limit);
     
@@ -34,6 +35,7 @@ interface IDistributionService is IService {
 
     error ErrorDistributionServiceReferralInvalid(NftId distributionNftId, ReferralId referralId);
     error ErrorDistributionServiceInvalidFeeTransferred(Amount transferredDistributionFeeAmount, Amount expectedDistributionFeeAmount);
+    error ErrorDistributionServiceReferralDistributionMismatch(ReferralId referralId, NftId referralDistributionNft, NftId distributionNftId);
 
     event LogDistributionServiceCommissionWithdrawn(NftId distributorNftId, address recipient, address tokenAddress, Amount amount);
 
@@ -59,7 +61,7 @@ interface IDistributionService is IService {
 
     function changeDistributorType(
         NftId distributorNftId,
-        DistributorType distributorType,
+        DistributorType newDistributorType,
         bytes memory data
     ) external;
 

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,
@@ -252,8 +248,7 @@ contract FireProduct is
             return _riskMapping[cityName];
         }
         _cities.push(cityName);
-        risk = RiskIdLib.toRiskId(cityName);
-        _createRisk(risk, "");
+        risk = _createRisk(bytes32(abi.encodePacked(cityName)), "");
         _riskMapping[cityName] = risk;
     }
 

package/contracts/examples/unpermissioned/SimpleDistribution.sol

@@ -7,6 +7,9 @@ import {Amount} from "../../type/Amount.sol";
 import {BasicDistribution} from "../../distribution/BasicDistribution.sol";
 import {IAuthorization} from "../../authorization/IAuthorization.sol";
 import {NftId} from "../../type/NftId.sol";
+import {ReferralId} from "../../type/Referral.sol";
+import {Timestamp, TimestampLib} from "../../type/Timestamp.sol";
+import {UFixed, UFixedLib} from "../../type/UFixed.sol";
 
 
 contract SimpleDistribution is
@@ -17,8 +20,7 @@ contract SimpleDistribution is
         address registry,
         NftId productNftId,
         IAuthorization authorization,
-        address initialOwner,
-        address token
+        address initialOwner
     ) 
     {
         initialize(
@@ -26,8 +28,7 @@ contract SimpleDistribution is
             productNftId,
             authorization,
             initialOwner,
-            "SimpleDistribution",
-            token);
+            "SimpleDistribution");
     }
 
     function initialize(
@@ -35,8 +36,7 @@ contract SimpleDistribution is
         NftId productNftId,
         IAuthorization authorization,
         address initialOwner,
-        string memory name,
-        address token
+        string memory name
     )
         public
         virtual
@@ -47,11 +47,35 @@ contract SimpleDistribution is
             productNftId,
             authorization,
             initialOwner,
-            name,
-            token);
+            name);
     }
 
     function approveTokenHandler(IERC20Metadata token, Amount amount) external restricted() onlyOwner() { _approveTokenHandler(token, amount); }
     function setLocked(bool locked) external onlyOwner() { _setLocked(locked); }
     function setWallet(address newWallet) external restricted() onlyOwner() { _setWallet(newWallet); }
+
+    /**
+     * @dev create referral codes. This is required for testing only to provide a distributor that is not the message sender. 
+     */
+    function createReferral2(
+        NftId distributorNftId,
+        string memory code,
+        UFixed discountPercentage,
+        uint32 maxReferrals,
+        Timestamp expiryAt,
+        bytes memory data
+    )
+        external
+        virtual
+        returns (ReferralId referralId)
+    {
+        return _createReferral(
+            distributorNftId,
+            code,
+            discountPercentage,
+            maxReferrals,
+            expiryAt,
+            data); // data
+    }
+
 }

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,
@@ -85,11 +81,11 @@ contract SimpleProduct is
 
 
     function createRisk(
-        RiskId id,
+        string memory id,
         bytes memory data
-    ) public {
-        _createRisk(
-            id,
+    ) public returns (RiskId) {
+        return _createRisk(
+            bytes32(abi.encodePacked(id)),
             data
         );
     }