@etherisc/gif-next 0.0.2-aa8d0c4-506 → 0.0.2-ab4c2da-820

package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/ab8580dfbd8c3e5b71893cf209d613dc.json"
+  "buildInfo": "../../../build-info/f203e6dd83e076e9dc4e149bc606ca33.json"
 }

package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/ab8580dfbd8c3e5b71893cf209d613dc.json"
+  "buildInfo": "../../../build-info/f203e6dd83e076e9dc4e149bc606ca33.json"
 }

package/contracts/components/BaseComponent.sol

@@ -1,18 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
+import {IBaseComponent} from "./IBaseComponent.sol";
+import {IComponentOwnerService} from "../instance/service/IComponentOwnerService.sol";
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
-
-import {Registerable} from "../shared/Registerable.sol";
-
-import {IRegistry} from "../registry/IRegistry.sol";
-import {IInstance} from "../instance/IInstance.sol";
-
 import {IInstance} from "../instance/IInstance.sol";
-import {IComponentOwnerService} from "../instance/service/IComponentOwnerService.sol";
-import {IBaseComponent} from "./IBaseComponent.sol";
+import {IRegistry} from "../registry/IRegistry.sol";
 import {NftId, zeroNftId, NftIdLib} from "../types/NftId.sol";
 import {ObjectType} from "../types/ObjectType.sol";
+import {Registerable} from "../shared/Registerable.sol";
+import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
 abstract contract BaseComponent is
     Registerable,
@@ -55,10 +52,12 @@ abstract contract BaseComponent is
     }
 
     // from component contract
+    // TODO consider to remove/replace with access manager contract locking
     function lock() external onlyOwner override {
         _componentOwnerService.lock(this);
     }
 
+    // TODO consider to remove/replace with access manager contract locking
     function unlock() external onlyOwner override {
         _componentOwnerService.unlock(this);
     }
@@ -72,6 +71,48 @@ abstract contract BaseComponent is
         return _wallet;
     }
 
+    /// @dev Sets the wallet address for the component. 
+    /// if the current wallet has tokens, these will be transferred. 
+    /// if the new wallet address is externally owned, an approval from the 
+    /// owner of the external wallet for the component to move all tokens must exist. 
+    function setWallet(address newWallet) external override onlyOwner {
+        address currentWallet = _wallet;
+        uint256 currentBalance = _token.balanceOf(currentWallet);
+
+        // checks
+        if (newWallet == currentWallet) {
+            revert ErrorBaseComponentWalletAddressIsSameAsCurrent(newWallet);
+        }
+
+        if (currentBalance > 0) {
+            if (currentWallet == address(this)) {
+                // move tokens from component smart contract to external wallet
+            } else {
+                // move tokens from external wallet to component smart contract or another external wallet
+                uint256 allowance = _token.allowance(currentWallet, address(this));
+                if (allowance < currentBalance) {
+                    revert ErrorBaseComponentWalletAllowanceTooSmall(currentWallet, newWallet, allowance, currentBalance);
+                }
+            }
+        }
+
+        // effects
+        _wallet = newWallet;
+        emit LogBaseComponentWalletAddressChanged(newWallet);
+
+        // interactions
+        if (currentBalance > 0) {
+            // transfer tokens from current wallet to new wallet
+            if (currentWallet == address(this)) {
+                // transferFrom requires self allowance too
+                _token.approve(address(this), currentBalance);
+            }
+            
+            SafeERC20.safeTransferFrom(_token, currentWallet, newWallet, currentBalance);
+            emit LogBaseComponentWalletTokensTransferred(currentWallet, newWallet, currentBalance);
+        }
+    }
+
     function getToken() public view override returns (IERC20Metadata token) {
         return _token;
     }

package/contracts/components/Distribution.sol

@@ -25,6 +25,8 @@ contract Distribution is
     Fee internal _initialDistributionFee;
     bool internal _isVerifying;
 
+    TokenHandler internal _tokenHandler;
+
     IDistributionService private _distributionService;
     IProductService private _productService;
 
@@ -49,9 +51,10 @@ contract Distribution is
         _isVerifying = verifying;
         _initialDistributionFee = distributionFee;
 
+        _tokenHandler = TokenHandler(token);
+
         _distributionService = _instance.getDistributionService();
-        // TODO: reactivate when services are available again
-        // _productService = _instance.getProductService();
+        _productService = _instance.getProductService();
 
         _registerInterface(type(IDistributionComponent).interfaceId);
     }
@@ -121,16 +124,6 @@ contract Distribution is
         return false;
     }
 
-    function getInitialSetupInfo() public view returns (ISetup.DistributionSetupInfo memory setupInfo) {
-        return ISetup.DistributionSetupInfo(
-            _productNftId,
-            TokenHandler(address(_token)),
-            _initialDistributionFee,
-            _isVerifying,
-            address(this)
-        );
-    }
-
     function getSetupInfo() public view returns (ISetup.DistributionSetupInfo memory setupInfo) {
         InstanceReader reader = _instance.getInstanceReader();
         return reader.getDistributionSetupInfo(getNftId());
@@ -152,14 +145,18 @@ contract Distribution is
     {
         (
             IRegistry.ObjectInfo memory info, 
-            bytes memory data
         ) = super.getInitialInfo();
 
         return (
             info,
             abi.encode(
-                _initialDistributionFee,
-                _isVerifying
+                ISetup.DistributionSetupInfo(
+                    _productNftId,
+                    _tokenHandler,
+                    _initialDistributionFee,
+                    _isVerifying,
+                    address(this)
+                )
             )
         );
     }

package/contracts/components/IBaseComponent.sol

@@ -8,6 +8,11 @@ import {IInstance} from "../instance/IInstance.sol";
 import {NftId} from "../types/NftId.sol";
 
 interface IBaseComponent is IRegisterable {
+    error ErrorBaseComponentWalletAddressIsSameAsCurrent(address newWallet);
+    error ErrorBaseComponentWalletAllowanceTooSmall(address oldWallet, address newWallet, uint256 allowance, uint256 balance);
+
+    event LogBaseComponentWalletAddressChanged(address newWallet);
+    event LogBaseComponentWalletTokensTransferred(address from, address to, uint256 amount);
 
     function lock() external;
 
@@ -15,6 +20,7 @@ interface IBaseComponent is IRegisterable {
 
     function getToken() external view returns (IERC20Metadata token);
 
+    function setWallet(address walletAddress) external;
     function getWallet() external view returns (address walletAddress);
 
     function getInstance() external view returns (IInstance instance);

package/contracts/components/IDistributionComponent.sol

@@ -8,8 +8,6 @@ import {ISetup} from "../instance/module/ISetup.sol";
 
 interface IDistributionComponent {
 
-    function getInitialSetupInfo() external view returns (ISetup.DistributionSetupInfo memory setupInfo);
-
     function setFees(
         Fee memory distributionFee
     ) external;

package/contracts/components/IPoolComponent.sol

@@ -43,6 +43,10 @@ interface IPoolComponent {
         uint256 collateralizationAmount
     ) external;
 
+    function lockBundle(NftId bundleNftId) external;
+
+    function unlockBundle(NftId bundleNftId) external;
+
     /**
      * @dev returns true iff the policy application data in policyData matches
      * with the bundle filter criteria encoded in bundleFilter. 
@@ -55,7 +59,7 @@ interface IPoolComponent {
         view
         returns (bool isMatching);
 
-    function isVerifying() external view returns (bool verifying);
+    function isConfirmingApplication() external view returns (bool isConfirmingApplication);
 
     function getCollateralizationLevel() external view returns (UFixed collateralizationLevel);
 

package/contracts/components/Pool.sol

@@ -4,6 +4,7 @@ pragma solidity ^0.8.20;
 import {ObjectType, POOL} from "../types/ObjectType.sol";
 import {IProductService} from "../instance/service/IProductService.sol";
 import {IPoolService} from "../instance/service/IPoolService.sol";
+import {IBundleService} from "../instance/service/IBundleService.sol";
 import {NftId, zeroNftId, NftIdLib} from "../types/NftId.sol";
 import {Fee} from "../types/Fee.sol";
 import {UFixed} from "../types/UFixed.sol";
@@ -25,19 +26,23 @@ import {Registerable} from "../shared/Registerable.sol";
 contract Pool is BaseComponent, IPoolComponent {
     using NftIdLib for NftId;
 
-    bool internal _isVerifying;
+    bool internal _isConfirmingApplication;
     UFixed internal _collateralizationLevel;
 
     Fee internal _initialPoolFee;
     Fee internal _initialStakingFee;
     Fee internal _initialPerformanceFee;
 
+    TokenHandler internal _tokenHandler;
+
     // may be used to interact with instance by derived contracts
     IPoolService internal _poolService;
 
     // only relevant to protect callback functions for "active" pools
     IProductService private _productService;
 
+    IBundleService private _bundleService;
+
     modifier onlyPoolService() {
         require(
             msg.sender == address(_poolService), 
@@ -58,7 +63,7 @@ contract Pool is BaseComponent, IPoolComponent {
         // TODO refactor into tokenNftId
         address token,
         bool isInterceptor,
-        bool verifying,
+        bool isConfirmingApplication,
         UFixed collateralizationLevel,
         Fee memory poolFee,
         Fee memory stakingFee,
@@ -67,16 +72,18 @@ contract Pool is BaseComponent, IPoolComponent {
     )
         BaseComponent(registry, instanceNftId, token, POOL(), isInterceptor, initialOwner)
     {
-        _isVerifying = verifying;
+        _isConfirmingApplication = isConfirmingApplication;
         // TODO add validation
         _collateralizationLevel = collateralizationLevel;
         _initialPoolFee = poolFee;
         _initialStakingFee = stakingFee;
         _initialPerformanceFee = performanceFee;
 
+        _tokenHandler = new TokenHandler(token);
+
         _poolService = _instance.getPoolService();
-        // TODO: reactivate when services are available again
-        // _productService = _instance.getProductService();
+        _productService = _instance.getProductService();
+        _bundleService = _instance.getBundleService();
 
         _registerInterface(type(IPoolComponent).interfaceId);
     }
@@ -92,7 +99,7 @@ contract Pool is BaseComponent, IPoolComponent {
         returns(NftId bundleNftId)
     {
         address owner = msg.sender;
-        bundleNftId = _poolService.createBundle(
+        bundleNftId = _bundleService.createBundle(
             owner,
             fee,
             initialAmount,
@@ -137,8 +144,8 @@ contract Pool is BaseComponent, IPoolComponent {
     }
 
 
-    function isVerifying() external view override returns (bool verifying) {
-        return _isVerifying;
+    function isConfirmingApplication() external view override returns (bool isConfirmingApplication) {
+        return _isConfirmingApplication;
     }
 
     function getCollateralizationLevel() external view override returns (UFixed collateralizationLevel) {
@@ -165,21 +172,29 @@ contract Pool is BaseComponent, IPoolComponent {
         override
         // TODO add onlyBundleOwner
     {
-        _poolService.setBundleFee(bundleNftId, fee);
-    }
-
-    function getInitialSetupInfo() public view returns (ISetup.PoolSetupInfo memory setupInfo) {
-        return ISetup.PoolSetupInfo(
-            _productNftId,
-            TokenHandler(address(_token)),
-            _collateralizationLevel,
-            _initialPoolFee,
-            _initialStakingFee,
-            _initialPerformanceFee,
-            _isVerifying,
-            _wallet
-        );
+        _bundleService.setBundleFee(bundleNftId, fee);
     }
+
+    function lockBundle(
+        NftId bundleNftId
+    )
+        external
+        override
+        // TODO add onlyBundleOwner
+    {
+        _bundleService.lockBundle(bundleNftId);
+    }
+
+    function unlockBundle(
+        NftId bundleNftId
+    )
+        external
+        override
+        // TODO add onlyBundleOwner
+    {
+        _bundleService.unlockBundle(bundleNftId);
+    }
+
     function getSetupInfo() public view returns (ISetup.PoolSetupInfo memory setupInfo) {
         InstanceReader reader = _instance.getInstanceReader();
         return reader.getPoolSetupInfo(getNftId());
@@ -197,13 +212,22 @@ contract Pool is BaseComponent, IPoolComponent {
     {
         (
             IRegistry.ObjectInfo memory info, 
-            bytes memory data
         ) = super.getInitialInfo();
 
         return (
             info,
             abi.encode(
-                getInitialSetupInfo()
+                ISetup.PoolSetupInfo(
+                    _productNftId,
+                    _tokenHandler,
+                    _collateralizationLevel,
+                    _initialPoolFee,
+                    _initialStakingFee,
+                    _initialPerformanceFee,
+                    false,
+                    _isConfirmingApplication,
+                    _wallet
+                )
             )
         );
     }
@@ -236,7 +260,7 @@ contract Pool is BaseComponent, IPoolComponent {
         internal
         returns(NftId bundleNftId)
     {
-        bundleNftId = _poolService.createBundle(
+        bundleNftId = _bundleService.createBundle(
             bundleOwner,
             fee,
             amount,

package/contracts/components/Product.sol

@@ -6,6 +6,7 @@ import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IER
 import {IRisk} from "../instance/module/IRisk.sol";
 import {ITreasury} from "../instance/module/ITreasury.sol";
 import {IProductService} from "../instance/service/IProductService.sol";
+import {IPolicyService} from "../instance/service/IPolicyService.sol";
 import {IProductComponent} from "./IProductComponent.sol";
 import {NftId, zeroNftId, NftIdLib} from "../types/NftId.sol";
 import {ObjectType, PRODUCT} from "../types/ObjectType.sol";
@@ -24,6 +25,7 @@ import {TokenHandler} from "../shared/TokenHandler.sol";
 import {InstanceReader} from "../instance/InstanceReader.sol";
 import {ISetup} from "../instance/module/ISetup.sol";
 import {Pool} from "../components/Pool.sol";
+import {Distribution} from "../components/Distribution.sol";
 
 import {zeroNftId} from "../types/NftId.sol";
 
@@ -31,10 +33,12 @@ contract Product is BaseComponent, IProductComponent {
     using NftIdLib for NftId;
 
     IProductService internal _productService;
+    IPolicyService internal _policyService;
     Pool internal _pool;
-    address internal _distribution;
+    Distribution internal _distribution;
     Fee internal _initialProductFee;
     Fee internal _initialProcessingFee;
+    TokenHandler internal _tokenHandler;
 
     NftId internal _poolNftId;
     NftId internal _distributionNftId;
@@ -51,15 +55,17 @@ contract Product is BaseComponent, IProductComponent {
         address initialOwner
     ) BaseComponent(registry, instanceNftid, token, PRODUCT(), isInterceptor, initialOwner) {
         // TODO add validation
-        // TODO: reactivate when services are available again
-        // _productService = _instance.getProductService();
+        _productService = _instance.getProductService();
+        _policyService = _instance.getPolicyService(); 
         _pool = Pool(pool);
-        _distribution = distribution;
+        _distribution = Distribution(distribution);
         _initialProductFee = productFee;
         _initialProcessingFee = processingFee;  
 
+        _tokenHandler = new TokenHandler(token);
+
         _poolNftId = getRegistry().getNftId(address(_pool));
-        _distributionNftId = getRegistry().getNftId(_distribution);
+        _distributionNftId = getRegistry().getNftId(address(_distribution));
 
         _registerInterface(type(IProductComponent).interfaceId);  
     }
@@ -78,7 +84,7 @@ contract Product is BaseComponent, IProductComponent {
         override 
         returns (uint256 premiumAmount)
     {
-        (premiumAmount,,,,) = _productService.calculatePremium(
+        (premiumAmount,,,,) = _policyService.calculatePremium(
             riskId,
             sumInsuredAmount,
             lifetime,
@@ -118,13 +124,13 @@ contract Product is BaseComponent, IProductComponent {
         );
     }
 
-    function _setRiskInfo(
+    function _updateRisk(
         RiskId id,
-        IRisk.RiskInfo memory info
+        bytes memory data
     ) internal {
-        _productService.setRiskInfo(
+        _productService.updateRisk(
             id,
-            info
+            data
         );
     }
 
@@ -151,7 +157,7 @@ contract Product is BaseComponent, IProductComponent {
         NftId bundleNftId,
         ReferralId referralId
     ) internal returns (NftId nftId) {
-        nftId = _productService.createApplication(
+        nftId = _policyService.createApplication(
             applicationOwner,
             riskId,
             sumInsuredAmount,
@@ -169,7 +175,7 @@ contract Product is BaseComponent, IProductComponent {
     )
         internal
     {
-        _productService.underwrite(
+        _policyService.underwrite(
             policyNftId, 
             requirePremiumPayment, 
             activateAt);
@@ -181,7 +187,7 @@ contract Product is BaseComponent, IProductComponent {
     )
         internal
     {
-        _productService.collectPremium(
+        _policyService.collectPremium(
             policyNftId, 
             activateAt);
     }
@@ -192,7 +198,7 @@ contract Product is BaseComponent, IProductComponent {
     )
         internal
     {
-        _productService.activate(
+        _policyService.activate(
             policyNftId, 
             activateAt);
     }
@@ -202,7 +208,7 @@ contract Product is BaseComponent, IProductComponent {
     }
 
     function getDistributionNftId() external view override returns (NftId distributionNftId) {
-        return getRegistry().getNftId(_distribution);
+        return getRegistry().getNftId(address(_distribution));
     }
 
     // from product component
@@ -218,28 +224,12 @@ contract Product is BaseComponent, IProductComponent {
     }
 
     function getSetupInfo() public view returns (ISetup.ProductSetupInfo memory setupInfo) {
-        if (getNftId().eq(zeroNftId())) {
-            return ISetup.ProductSetupInfo(
-                _token,
-                TokenHandler(address(0)),
-                _distributionNftId,
-                _poolNftId,
-                FeeLib.zeroFee(), //_instance.getDistributionFee(_distributionNftId)
-                _initialProductFee,
-                _initialProcessingFee,
-                FeeLib.zeroFee(), //_instance.getPoolFee(_poolNftId)
-                FeeLib.zeroFee(), //_instance.getStakingFee(_poolNftId)
-                FeeLib.zeroFee() //_instance.getPerformanceFee(_poolNftId)
-            );
-        } 
-
         InstanceReader reader = _instance.getInstanceReader();
         return reader.getProductSetupInfo(getNftId());
     }
 
     // from IRegisterable
 
-    // TODO used only once, occupies space
     function getInitialInfo() 
         public
         view 
@@ -251,7 +241,7 @@ contract Product is BaseComponent, IProductComponent {
             IRegistry.ObjectInfo memory productInfo, 
             bytes memory data
         ) = super.getInitialInfo();
- 
+        
         // TODO read pool & distribution fees
         // 1) from pool -> the only option -> pool must be registered first?
         // 2) from instance -> all fees are set into instance at product registration which is ongoing here
@@ -261,35 +251,40 @@ contract Product is BaseComponent, IProductComponent {
         
         // from PoolComponent
         (
-            IRegistry.ObjectInfo memory poolInfo, 
+            , 
             bytes memory poolData
         ) = _pool.getInitialInfo();
+        
+        (
+            ISetup.PoolSetupInfo memory poolSetupInfo
+        )  = abi.decode(poolData, (ISetup.PoolSetupInfo));
 
+        // from DistributionComponent
         (
-            /*IPool.PoolInfo memory info*/,
-            /*address wallet*/,
-            /*IERC20Metadata token*/,
-            Fee memory initialPoolFee,
-            Fee memory initialStakingFee,
-            Fee memory initialPerformanceFee
-        )  = abi.decode(poolData, (ISetup.PoolSetupInfo, address, IERC20Metadata, Fee, Fee, Fee));
+            , 
+            bytes memory distributionData
+        ) = _distribution.getInitialInfo();
 
-        // TODO from DistributionComponent
+        (
+            ISetup.DistributionSetupInfo memory distributionSetupInfo
+        )  = abi.decode(distributionData, (ISetup.DistributionSetupInfo));
 
         return (
             productInfo,
             abi.encode(
                 ISetup.ProductSetupInfo(
                     _token,
-                    TokenHandler(address(0)),
+                    _tokenHandler,
                     _distributionNftId,
                     _poolNftId,
-                    FeeLib.zeroFee(), //_instance.getDistributionFee(_distributionNftId)
+                    distributionSetupInfo.distributionFee, 
                     _initialProductFee,
                     _initialProcessingFee,
-                    initialPoolFee,
-                    initialStakingFee,
-                    initialPerformanceFee
+                    poolSetupInfo.poolFee, 
+                    poolSetupInfo.stakingFee, 
+                    poolSetupInfo.performanceFee,
+                    false,
+                    _wallet
                 )
             )
         );

package/contracts/instance/AccessManagerUpgradeableInitializeable.sol

@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.20;
+
+import {AccessManagerUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagerUpgradeable.sol";
+
+
+contract AccessManagerUpgradeableInitializeable is AccessManagerUpgradeable {
+
+    bool private _initialized;
+
+    function __AccessManagerUpgradeableInitializeable_init(address initialAdmin) public {
+        require(!_initialized, "AccessManager: already initialized");
+        
+        if (initialAdmin == address(0)) {
+            revert AccessManagerInvalidInitialAdmin(address(0));
+        }
+
+        // admin is active immediately and without any execution delay.
+        _grantRole(ADMIN_ROLE, initialAdmin, 0, 0);
+        _initialized = true;
+    }
+
+}