@etherisc/gif-next 0.0.2-e1f23dc-329 → 0.0.2-e3f4f82-063

package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json

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

package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json

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

package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json

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

package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json

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

package/artifacts/contracts/test/TestService.sol/TestService.dbg.json

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

package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json

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

package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json

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

package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json

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

package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json

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

package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json

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

package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json

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

package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json

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

package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json

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

package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json

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

package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json

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

package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json

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

package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json

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

package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json

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

package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json

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

package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json

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

package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json

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

package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json

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

package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json

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

package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json

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

package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json

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

package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json

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

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

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

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

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

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,6 +51,8 @@ contract Distribution is
         _isVerifying = verifying;
         _initialDistributionFee = distributionFee;
 
+        _tokenHandler = TokenHandler(token);
+
         _distributionService = _instance.getDistributionService();
         _productService = _instance.getProductService();
 
@@ -148,7 +152,7 @@ contract Distribution is
             abi.encode(
                 ISetup.DistributionSetupInfo(
                     _productNftId,
-                    TokenHandler(address(_token)),
+                    _tokenHandler,
                     _initialDistributionFee,
                     _isVerifying,
                     address(this)

package/contracts/components/IPoolComponent.sol

@@ -55,7 +55,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

@@ -25,13 +25,15 @@ 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;
 
@@ -58,7 +60,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,13 +69,15 @@ 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();
         _productService = _instance.getProductService();
 
@@ -136,8 +140,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) {
@@ -191,12 +195,13 @@ contract Pool is BaseComponent, IPoolComponent {
             abi.encode(
                 ISetup.PoolSetupInfo(
                     _productNftId,
-                    TokenHandler(address(_token)),
+                    _tokenHandler,
                     _collateralizationLevel,
                     _initialPoolFee,
                     _initialStakingFee,
                     _initialPerformanceFee,
-                    _isVerifying,
+                    false,
+                    _isConfirmingApplication,
                     _wallet
                 )
             )

package/contracts/components/Product.sol

@@ -36,6 +36,7 @@ contract Product is BaseComponent, IProductComponent {
     Distribution internal _distribution;
     Fee internal _initialProductFee;
     Fee internal _initialProcessingFee;
+    TokenHandler internal _tokenHandler;
 
     NftId internal _poolNftId;
     NftId internal _distributionNftId;
@@ -58,6 +59,8 @@ contract Product is BaseComponent, IProductComponent {
         _initialProductFee = productFee;
         _initialProcessingFee = processingFee;  
 
+        _tokenHandler = new TokenHandler(token);
+
         _poolNftId = getRegistry().getNftId(address(_pool));
         _distributionNftId = getRegistry().getNftId(address(_distribution));
 
@@ -268,7 +271,7 @@ contract Product is BaseComponent, IProductComponent {
             abi.encode(
                 ISetup.ProductSetupInfo(
                     _token,
-                    TokenHandler(address(_token)),
+                    _tokenHandler,
                     _distributionNftId,
                     _poolNftId,
                     distributionSetupInfo.distributionFee, 
@@ -276,7 +279,9 @@ contract Product is BaseComponent, IProductComponent {
                     _initialProcessingFee,
                     poolSetupInfo.poolFee, 
                     poolSetupInfo.stakingFee, 
-                    poolSetupInfo.performanceFee 
+                    poolSetupInfo.performanceFee,
+                    false,
+                    _wallet
                 )
             )
         );

package/contracts/instance/module/ISetup.sol

@@ -21,6 +21,8 @@ interface ISetup {
         Fee poolFee; // pool fee on net premium
         Fee stakingFee; // pool fee on staked capital from investor
         Fee performanceFee; // pool fee on profits from capital investors
+        bool isIntercepting; // intercepts nft transfers (for products)
+        address wallet;
     }
 
     struct DistributionSetupInfo {
@@ -39,6 +41,7 @@ interface ISetup {
         Fee stakingFee; // pool fee on staked capital from investor
         Fee performanceFee; // pool fee on profits from capital investors
         bool isIntercepting; // intercepts nft transfers (for bundles)
+        bool isConfirmingApplication; // confirms applications before they are underwritten
         address wallet;
     }
 }

package/contracts/instance/service/IPoolService.sol

@@ -8,6 +8,8 @@ import {IService} from "../../shared/IService.sol";
 import {IBundle} from "../module/IBundle.sol";
 
 interface IPoolService is IService {
+    error ErrorIPoolServiceInsufficientAllowance(address bundleOwner, address tokenHandlerAddress, uint256 amount);
+
     function setFees(
         Fee memory poolFee,
         Fee memory stakingFee,

package/contracts/instance/service/IProductService.sol

@@ -13,6 +13,9 @@ import {UFixed} from "../../types/UFixed.sol";
 import {Fee} from "../../types/Fee.sol";
 
 interface IProductService is IService {
+
+    error ErrorIProductServiceInsufficientAllowance(address customer, address tokenHandlerAddress, uint256 amount);
+    
     function setFees(
         Fee memory productFee,
         Fee memory processingFee

package/contracts/instance/service/PoolService.sol

@@ -28,7 +28,6 @@ import {IRegistryService} from "../../registry/IRegistryService.sol";
 import {InstanceService} from "../InstanceService.sol";
 import {InstanceReader} from "../InstanceReader.sol";
 
-
 string constant POOL_SERVICE_NAME = "PoolService";
 
 contract PoolService is 
@@ -136,13 +135,11 @@ contract PoolService is
 
         // TODO add bundle to pool in instance
         
-        // TODO collect capital
-        // _processStakingByTreasury(
-        //     instanceReader,
-        //     zeroNftId(),
-        //     poolNftId,
-        //     bundleNftId,
-        //     stakingAmount);
+        _processStakingByTreasury(
+            instanceReader,
+            poolNftId,
+            bundleNftId,
+            stakingAmount);
 
         // TODO add logging
     }
@@ -178,7 +175,6 @@ contract PoolService is
 
     function _processStakingByTreasury(
         InstanceReader instanceReader,
-        NftId productNftId,
         NftId poolNftId,
         NftId bundleNftId,
         uint256 stakingAmount
@@ -187,15 +183,22 @@ contract PoolService is
     {
         // process token transfer(s)
         if(stakingAmount > 0) {
-            TokenHandler tokenHandler = TokenHandler(instanceReader.getTokenHandler(productNftId));
-            address bundleOwner = getRegistry().ownerOf(bundleNftId);
             ISetup.PoolSetupInfo memory poolInfo = instanceReader.getPoolSetupInfo(poolNftId);
-            
+            TokenHandler tokenHandler = poolInfo.tokenHandler;
+            address bundleOwner = getRegistry().ownerOf(bundleNftId);
+            Fee memory stakingFee = poolInfo.stakingFee;
+
             tokenHandler.transfer(
                 bundleOwner,
                 poolInfo.wallet,
                 stakingAmount
             );
+
+
+            if (! FeeLib.feeIsZero(stakingFee)) {
+                (uint256 stakingFeeAmount, uint256 netAmount) = FeeLib.calculateFee(stakingFee, stakingAmount);
+                // TODO: track staking fees in pool's state (issue #177)
+            }
         }
     }
 }