migrate DistributionService from ComponentVerifyingService to Service (…

…#654)
etherisc · Sep 3, 2024 · 2f1157b · 2f1157b
1 parent bc7a257
commit 2f1157b
Showing 1 changed file with 30 additions and 19 deletions.
diff --git a/contracts/distribution/DistributionService.sol b/contracts/distribution/DistributionService.sol
@@ -13,7 +13,8 @@ import {IComponents} from "../instance/module/IComponents.sol";
 import {IPolicy} from "../instance/module/IPolicy.sol";
 
 import {Amount, AmountLib} from "../type/Amount.sol";
-import {ComponentVerifyingService} from "../shared/ComponentVerifyingService.sol";
+import {ContractLib} from "../shared/ContractLib.sol";
+import {Service} from "../shared/Service.sol";
 import {DistributorType, DistributorTypeLib} from "../type/DistributorType.sol";
 import {NftId, NftIdLib} from "../type/NftId.sol";
 import {KEEP_STATE} from "../type/StateId.sol";
@@ -27,7 +28,7 @@ import {UFixed} from "../type/UFixed.sol";
 
 
 contract DistributionService is
-    ComponentVerifyingService,
+    Service,
     IDistributionService
 {
     IAccountingService private _accountingService;
@@ -74,10 +75,10 @@ contract DistributionService is
         restricted()
         returns (DistributorType distributorType)
     {
-        (NftId distributionNftId,, IInstance instance) = _getAndVerifyActiveComponent(DISTRIBUTION());
+        (NftId distributionNftId, IInstance instance) = _getAndVerifyActiveDistribution(getRegistry());
 
         {
-            NftId productNftId = _getProductNftId(distributionNftId);
+            NftId productNftId = getRegistry().getParentNftId(distributionNftId);
             IComponents.FeeInfo memory feeInfo = instance.getInstanceReader().getFeeInfo(productNftId);
 
             UFixed variableDistributionFees = feeInfo.distributionFee.fractionalFee;
@@ -120,7 +121,7 @@ contract DistributionService is
         restricted()
         returns (NftId distributorNftId)
     {
-        (NftId distributionNftId,, IInstance instance) = _getAndVerifyActiveComponent(DISTRIBUTION());
+        (NftId distributionNftId, IInstance instance) = _getAndVerifyActiveDistribution(getRegistry());
         _checkDistributionType(instance.getInstanceReader(), distributorType, distributionNftId);
 
         distributorNftId = _registryService.registerDistributor(
@@ -153,7 +154,7 @@ contract DistributionService is
         restricted()
     {
         _checkNftType(distributorNftId, DISTRIBUTOR());
-        (NftId distributionNftId,, IInstance instance) = _getAndVerifyActiveComponent(DISTRIBUTION());
+        (NftId distributionNftId, IInstance instance) = _getAndVerifyActiveDistribution(getRegistry());
         _checkDistributionType(instance.getInstanceReader(), newDistributorType, distributionNftId);
 
         IDistribution.DistributorInfo memory distributorInfo = instance.getInstanceReader().getDistributorInfo(distributorNftId);
@@ -177,7 +178,7 @@ contract DistributionService is
         onlyNftOfType(distributorNftId, DISTRIBUTOR())
         returns (ReferralId referralId)
     {
-        (NftId distributionNftId,, IInstance instance) = _getAndVerifyActiveComponent(DISTRIBUTION());
+        (NftId distributionNftId, IInstance instance) = _getAndVerifyActiveDistribution(getRegistry());
 
         if (bytes(code).length == 0) {
             revert ErrorDistributionServiceInvalidReferral(code);
@@ -239,8 +240,7 @@ contract DistributionService is
     {
         if (referralIsValid(distributionNftId, referralId)) {
             IRegistry registry = getRegistry();
-            IRegistry.ObjectInfo memory distributionInfo = registry.getObjectInfo(distributionNftId);
-            IInstance instance = _getInstanceForComponent(registry, distributionInfo.parentNftId);
+            IInstance instance = IInstance(ContractLib.getInstanceForComponent(getRegistry(), distributionNftId));
 
             // update book keeping for referral info
             IDistribution.ReferralInfo memory referralInfo = instance.getInstanceReader().getReferralInfo(referralId);
@@ -260,8 +260,7 @@ contract DistributionService is
         onlyNftOfType(distributionNftId, DISTRIBUTION())
     {
         IRegistry registry = getRegistry();
-        IRegistry.ObjectInfo memory distributionInfo = registry.getObjectInfo(distributionNftId);
-        IInstance instance = _getInstanceForComponent(registry, distributionInfo.parentNftId);
+        IInstance instance = IInstance(ContractLib.getInstanceForComponent(registry, distributionNftId));
         InstanceReader reader = instance.getInstanceReader();
         InstanceStore store = instance.getInstanceStore();
 
@@ -298,7 +297,7 @@ contract DistributionService is
         onlyNftOfType(distributorNftId, DISTRIBUTOR())
         returns (Amount withdrawnAmount) 
     {
-        (NftId distributionNftId,, IInstance instance) = _getAndVerifyActiveComponent(DISTRIBUTION());
+        (NftId distributionNftId, IInstance instance) = _getAndVerifyActiveDistribution(getRegistry());
         InstanceReader reader = instance.getInstanceReader();
 
         IComponents.ComponentInfo memory distributionInfo = reader.getComponentInfo(distributionNftId);
@@ -344,8 +343,7 @@ contract DistributionService is
         }
 
         IRegistry registry = getRegistry();
-        IRegistry.ObjectInfo memory distributionInfo = registry.getObjectInfo(distributionNftId);
-        IInstance instance = _getInstanceForComponent(registry, distributionInfo.parentNftId);
+        IInstance instance = IInstance(ContractLib.getInstanceForComponent(registry, distributionNftId));
         IDistribution.ReferralInfo memory info = instance.getInstanceReader().getReferralInfo(referralId);
 
         if (info.distributorNftId.eqz()) {
@@ -373,14 +371,27 @@ contract DistributionService is
         }
     }
 
-    function _getInstanceForDistribution(NftId distributionNftId)
+    function _getAndVerifyActiveDistribution(
+        IRegistry registry
+    )
         internal
         view
-        returns(IInstance instance)
+        returns (
+            NftId didstributionNftId,
+            IInstance instance
+        )
     {
-        NftId instanceNftId = getRegistry().getParentNftId(distributionNftId);
-        address instanceAddress = getRegistry().getObjectAddress(instanceNftId);
-        return IInstance(instanceAddress);
+        (
+            IRegistry.ObjectInfo memory info, 
+            address instanceAddress
+        ) = ContractLib.getAndVerifyComponent(
+            registry, 
+            msg.sender,
+            DISTRIBUTION(),
+            true); // only active pools
+
+        didstributionNftId = info.nftId;
+        instance = IInstance(instanceAddress);
     }
 
     function _getDomain() internal pure override returns(ObjectType) {