@etherisc/gif-next 0.0.2-d086e6d-456 → 0.0.2-d0b1ffb-653

package/contracts/{components → distribution}/Distribution.sol

@@ -1,86 +1,177 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.20;
 
-import {DISTRIBUTION} from "../types/ObjectType.sol";
-import {IDistributionService} from "../instance/service/IDistributionService.sol";
-import {IProductService} from "../instance/service/IProductService.sol";
-import {NftId, zeroNftId, NftIdLib, toNftId} from "../types/NftId.sol";
-import {ReferralId, ReferralStatus, ReferralLib} from "../types/Referral.sol";
-import {Fee, FeeLib} from "../types/Fee.sol";
-import {Component} from "./Component.sol";
-import {IDistribution} from "../instance/module/IDistribution.sol";
+import {Amount} from "../type/Amount.sol";
+import {COMPONENT, DISTRIBUTION, DISTRIBUTOR} from "../type/ObjectType.sol";
+import {IAuthorization} from "../authorization/IAuthorization.sol";
+import {IDistributionService} from "./IDistributionService.sol";
+import {NftId, NftIdLib} from "../type/NftId.sol";
+import {ReferralId, ReferralStatus, ReferralLib} from "../type/Referral.sol";
+import {Fee} from "../type/Fee.sol";
+import {InstanceLinkedComponent} from "../shared/InstanceLinkedComponent.sol";
+import {IComponentService} from "../shared/IComponentService.sol";
 import {IDistributionComponent} from "./IDistributionComponent.sol";
-import {IRegistry} from "../registry/IRegistry.sol";
-import {IRegisterable} from "../shared/IRegisterable.sol";
-import {ISetup} from "../instance/module/ISetup.sol";
-import {Registerable} from "../shared/Registerable.sol";
-import {TokenHandler} from "../shared/TokenHandler.sol";
-import {InstanceReader} from "../instance/InstanceReader.sol";
-import {UFixed} from "../types/UFixed.sol";
-import {DistributorType} from "../types/DistributorType.sol";
-import {Timestamp, TimestampLib} from "../types/Timestamp.sol";
-import {ITransferInterceptor} from "../registry/ITransferInterceptor.sol";
+import {UFixed} from "../type/UFixed.sol";
+import {DistributorType} from "../type/DistributorType.sol";
+import {Timestamp} from "../type/Timestamp.sol";
 
 
 abstract contract Distribution is
-    Component,
+    InstanceLinkedComponent,
     IDistributionComponent
 {
     // keccak256(abi.encode(uint256(keccak256("etherisc.storage.Distribution")) - 1)) & ~bytes32(uint256(0xff));
     bytes32 public constant DISTRIBUTION_STORAGE_LOCATION_V1 = 0xaab7c5ea03d290056d6c060e0833d3ebcbe647f7694616a2ec52738a64b2f900;
 
     struct DistributionStorage {
-        Fee _minDistributionOwnerFee;
-        Fee _distributionFee;
-        TokenHandler _tokenHandler;
+        IComponentService _componentService;
         IDistributionService _distributionService;
         mapping(address distributor => NftId distributorNftId) _distributorNftId;
     }
 
-    function initializeDistribution(
-        address registry,
-        NftId instanceNftId,
-        string memory name,
-        address token,
-        Fee memory minDistributionOwnerFee,
-        Fee memory distributionFee,
-        address initialOwner,
-        bytes memory registryData // writeonly data that will saved in the object info record of the registry
-    )
+    modifier onlyDistributor() {
+        if (!isDistributor(msg.sender)) {
+            revert ErrorDistributionNotDistributor(msg.sender);
+        }
+        _;
+    }
+
+
+    function isDistributor(address candidate)
         public
-        virtual
-        onlyInitializing()
+        view
+        returns (bool)
     {
-        initializeComponent(registry, instanceNftId, name, token, DISTRIBUTION(), true, initialOwner, registryData);
+        DistributionStorage storage $ = _getDistributionStorage();
+        return $._distributorNftId[candidate].gtz();
+    }
 
+
+    function getDistributorNftId(address distributor)
+        public
+        view
+        returns (NftId distributorNftId)
+    {
         DistributionStorage storage $ = _getDistributionStorage();
-        // TODO add validation
-        $._minDistributionOwnerFee = minDistributionOwnerFee;
-        $._distributionFee = distributionFee;
-        $._tokenHandler = new TokenHandler(token);
-        $._distributionService = getInstance().getDistributionService();
+        return $._distributorNftId[distributor];
+    }
+
 
-        registerInterface(type(IDistributionComponent).interfaceId);
+    function getDiscountPercentage(string memory referralCode)
+        external
+        view
+        returns (
+            UFixed discountPercentage, 
+            ReferralStatus status
+        )
+    {
+        ReferralId referralId = getReferralId(referralCode);
+        return _getInstanceReader().getDiscountPercentage(referralId);
     }
 
-    function setFees(
-        Fee memory minDistributionOwnerFee,
-        Fee memory distributionFee
+
+    function getReferralId(
+        string memory referralCode
+    )
+        public
+        view 
+        returns (ReferralId referralId)
+    {
+        return ReferralLib.toReferralId(
+            getNftId(), 
+            referralCode);      
+    }
+
+
+    function calculateRenewalFeeAmount(
+        ReferralId referralId,
+        uint256 netPremiumAmount
     )
         external
-        override
-        onlyOwner
+        view
+        virtual override
+        returns (uint256 feeAmount)
+    {
+        // default is no fees
+        return 0 * netPremiumAmount;
+    }
+
+
+    function processRenewal(
+        ReferralId referralId,
+        uint256 feeAmount
+    )
+        external
+        virtual
+        restricted()
+    {
+        // default is no action
+    }
+
+    /// @dev Returns true iff the component needs to be called when selling/renewing policis
+    function isVerifying() external pure returns (bool verifying) {
+        return true;
+    }
+
+    /// @inheritdoc IDistributionComponent
+    function withdrawCommission(NftId distributorNftId, Amount amount) 
+        external 
+        virtual
         restricted()
+        onlyDistributor()
+        onlyNftOfType(distributorNftId, DISTRIBUTOR())
+        onlyNftOwner(distributorNftId)
+        returns (Amount withdrawnAmount) 
     {
-        _getDistributionStorage()._distributionService.setFees(minDistributionOwnerFee, distributionFee);
+        return _withdrawCommission(distributorNftId, amount);
     }
+        
+    function _initializeDistribution(
+        address registry,
+        NftId productNftId,
+        IAuthorization authorization, 
+        address initialOwner,
+        string memory name,
+        address token,
+        bytes memory componentData // component specifidc data 
+    )
+        internal
+        virtual
+        onlyInitializing()
+    {
+        _initializeInstanceLinkedComponent(
+            registry, 
+            productNftId, 
+            name, 
+            token, 
+            DISTRIBUTION(), 
+            authorization,
+            true, 
+            initialOwner, 
+            componentData);
 
-    function getDistributionFee() external view returns (Fee memory distributionFee) {
         DistributionStorage storage $ = _getDistributionStorage();
-        return $._distributionFee;
+        $._distributionService = IDistributionService(_getServiceAddress(DISTRIBUTION())); 
+        $._componentService = IComponentService(_getServiceAddress(COMPONENT())); 
+
+        _registerInterface(type(IDistributionComponent).interfaceId);
     }
 
-    function createDistributorType(
+    /// @dev Sets the distribution fees to the provided values.
+    function _setFees(
+        Fee memory distributionFee,
+        Fee memory minDistributionOwnerFee
+    )
+        internal
+        virtual
+    {
+        _getDistributionStorage()._componentService.setDistributionFees(
+            distributionFee, 
+            minDistributionOwnerFee);
+    }
+
+    /// @dev Creates a new distributor type using the provided parameters.
+    function _createDistributorType(
         string memory name,
         UFixed minDiscountPercentage,
         UFixed maxDiscountPercentage,
@@ -91,7 +182,8 @@ abstract contract Distribution is
         bool allowRenewals,
         bytes memory data
     )
-        public
+        internal
+        virtual
         returns (DistributorType distributorType)
     {
         DistributionStorage storage $ = _getDistributionStorage();
@@ -107,16 +199,20 @@ abstract contract Distribution is
             data);
     }
 
-    function createDistributor(
+    /// @dev Turns the provided account into a new distributor of the specified type.
+    function _createDistributor(
         address distributor,
         DistributorType distributorType,
         bytes memory data
     )
-        public
+        internal
+        virtual
         returns(NftId distributorNftId)
     {
         DistributionStorage storage $ = _getDistributionStorage();
-        require($._distributorNftId[distributor].eqz(), "ERROR:DST-030:ALREADY_DISTRIBUTOR");
+        if($._distributorNftId[distributor].gtz()) {
+            revert ErrorDistributionAlreadyDistributor(distributor, $._distributorNftId[distributor]);
+        }
 
         distributorNftId = $._distributionService.createDistributor(
             distributor,
@@ -126,26 +222,24 @@ abstract contract Distribution is
         $._distributorNftId[distributor] = distributorNftId;
     }
 
-    function updateDistributorType(
+    /// @dev Uptates the distributor type for the specified distributor.
+    function _updateDistributorType(
         NftId distributorNftId,
         DistributorType distributorType,
         bytes memory data
     )
-        public
-        // TODO figure out what we need for authz
-        // and add it
+        internal
+        virtual
     {
         DistributionStorage storage $ = _getDistributionStorage();
-        $._distributionService.updateDistributorType(
-            distributorNftId,
-            distributorType,
-            data);
+        // TODO re-enable once implemented
+        // $._distributionService.updateDistributorType(
+        //     distributorNftId,
+        //     distributorType,
+        //     data);
     }
 
-    /**
-     * @dev lets distributors create referral codes.
-     * referral codes need to be unique
-     */
+    /// @dev Create a new referral code for the provided distributor.
     function _createReferral(
         NftId distributorNftId,
         string memory code,
@@ -155,6 +249,7 @@ abstract contract Distribution is
         bytes memory data
     )
         internal
+        virtual
         returns (ReferralId referralId)
     {
         DistributionStorage storage $ = _getDistributionStorage();
@@ -167,109 +262,19 @@ abstract contract Distribution is
             data);
     }
 
-    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
-        returns (
-            UFixed discountPercentage, 
-            ReferralStatus status
-        )
-    {
-        ReferralId referralId = getReferralId(referralCode);
-        return _getInstanceReader().getDiscountPercentage(referralId);
-    }
-
-
-    function getReferralId(
-        string memory referralCode
-    )
-        public
-        view 
-        returns (ReferralId referralId)
-    {
-        return ReferralLib.toReferralId(
-            getNftId(), 
-            referralCode);      
-    }
-
-    function calculateRenewalFeeAmount(
-        ReferralId referralId,
-        uint256 netPremiumAmount
-    )
-        external
-        view
-        virtual override
-        returns (uint256 feeAmount)
-    {
-        // default is no fees
-        return 0 * netPremiumAmount;
-    }
-
-    function processRenewal(
-        ReferralId referralId,
-        uint256 feeAmount
-    )
-        external
-        onlyOwner
-        restricted()
-        virtual override
+    function _withdrawCommission(NftId distributorNftId, Amount amount) 
+        internal
+        returns (Amount withdrawnAmount) 
     {
-        // default is no action
+        return _getDistributionStorage()._distributionService.withdrawCommission(distributorNftId, amount);
     }
 
-    function getSetupInfo() public view returns (ISetup.DistributionSetupInfo memory setupInfo) {
-        InstanceReader reader = getInstance().getInstanceReader();
-        setupInfo = reader.getDistributionSetupInfo(getNftId());
-
-        // fallback to initial setup info (wallet is always != address(0))
-        if(setupInfo.wallet == address(0)) {
-            setupInfo = _getInitialSetupInfo();
-        }
-    }
-
-    function _getInitialSetupInfo() internal view returns (ISetup.DistributionSetupInfo memory setupInfo) {
-        DistributionStorage storage $ = _getDistributionStorage();
-        return ISetup.DistributionSetupInfo(
-            zeroNftId(),
-            $._tokenHandler,
-            $._minDistributionOwnerFee,
-            $._distributionFee,
-            address(this),
-            0
-        );
-    }
-
-
-    function _nftTransferFrom(address from, address to, uint256 tokenId) internal virtual override {
+    function _nftTransferFrom(address from, address to, uint256 tokenId, address operator) internal virtual override {
         // keep track of distributor nft owner
-        emit LogDistributorUpdated(to, msg.sender);
+        emit LogDistributorUpdated(to, operator);
         DistributionStorage storage $ = _getDistributionStorage();
-        $._distributorNftId[from] = zeroNftId();
-        $._distributorNftId[to] = toNftId(tokenId);
-    }
-    
-
-    /// @dev returns true iff the component needs to be called when selling/renewing policis
-    function isVerifying() external view returns (bool verifying) {
-        return true;
+        $._distributorNftId[from] = NftIdLib.zero();
+        $._distributorNftId[to] = NftIdLib.toNftId(tokenId);
     }
 
     function _getDistributionStorage() private pure returns (DistributionStorage storage $) {