Merge pull request #69 from etherisc/feature/fixed-policy-flow

Fixed assignment of policyFlow to product on approval
etherisc · Sep 15, 2022 · cc9a08e · cc9a08e
2 parents 02a43bd + 62cdd45
commit cc9a08e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -10,6 +10,7 @@
         "@chainlink/=/home/vscode/.brownie/packages/smartcontractkit/chainlink@1.6.0",
         "@etherisc/gif-interface/=/home/vscode/.brownie/packages/etherisc/gif-interface@3f16cfe",
     ],
+    "solidity.compileUsingRemoteVersion": "v0.8.2+commit.661d1103",
     "peacock.remoteColor": "1D3C43",
     "workbench.colorCustomizations": {
         "activityBar.activeBackground": "#2c5c67",

diff --git a/contracts/modules/ComponentController.sol b/contracts/modules/ComponentController.sol
@@ -26,6 +26,8 @@ contract ComponentController is
     EnumerableSet.UintSet private _riskpools;
     uint256 private _componentCount;
 
+    mapping(uint256 /* product id */ => address /* policy flow address */) private _policyFlowByProductId;
+
     modifier onlyComponentOwnerService() {
         require(
             _msgSender() == _getContractAddress("ComponentOwnerService"),
@@ -95,10 +97,15 @@ contract ComponentController is
         onlyInstanceOperatorService 
     {
         _changeState(id, IComponent.ComponentState.Active);
+        IComponent component = getComponent(id);
+
+        if (isProduct(id)) {
+            _policyFlowByProductId[id] = IProduct(address(component)).getPolicyFlow();
+        }
+
         emit LogComponentApproved(id);
 
         // inform component about successful approval
-        IComponent component = getComponent(id);
         component.approvalCallback();
     }
 
@@ -244,6 +251,11 @@ contract ComponentController is
 
     function isRiskpool(uint256 id) public view returns (bool) { return EnumerableSet.contains(_riskpools, id); }
 
+    function getPolicyFlow(uint256 productId) public view returns (address _policyFlow) {
+        require(isProduct(productId), "ERROR:CCR-011:UNKNOWN_PRODUCT_ID");
+        _policyFlow = _policyFlowByProductId[productId];
+    }
+
     function _changeState(uint256 componentId, IComponent.ComponentState newState) internal {
         IComponent.ComponentState oldState = _componentState[componentId];
 

diff --git a/contracts/modules/LicenseController.sol b/contracts/modules/LicenseController.sol
@@ -28,7 +28,7 @@ contract LicenseController is
     {
         productId = _component.getComponentId(productAddress);
         isAuthorized = _isValidCall(productId);
-        policyFlow = _getProduct(productId).getPolicyFlow();
+        policyFlow = _component.getPolicyFlow(productId);
     }
 
     function _isValidCall(uint256 productId) internal view returns (bool) {