add IBundleToken, some minor renamings

etherisc · Jul 29, 2022 · 8b95581 · 8b95581
1 parent 8c56549
commit 8b95581
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 6 deletions.
diff --git a/contracts/components/Riskpool.sol b/contracts/components/Riskpool.sol
@@ -190,7 +190,7 @@ abstract contract Riskpool is
         external override
         onlyPool
     {
-        require(_balance > amount, "ERROR:RPL-005:RISKPOOL_BALANCE_TOO_LOW");
+        require(_balance >= amount, "ERROR:RPL-005:RISKPOOL_BALANCE_TOO_LOW");
 
         _decreaseBundleBalances(processId, amount);
         _balance -= amount;

diff --git a/contracts/modules/IPolicy.sol b/contracts/modules/IPolicy.sol
@@ -97,7 +97,7 @@ interface IPolicy {
     struct Payout {
         uint256 claimId;
         PayoutState state;
-        uint256 payoutAmount;
+        uint256 amount;
         bytes data;
         uint256 createdAt;
         uint256 updatedAt;

diff --git a/contracts/modules/ITreasury.sol b/contracts/modules/ITreasury.sol
@@ -13,12 +13,14 @@ interface ITreasury {
     event LogTreasuryCapitalFeesSet(uint256 riskpoolId, uint256 fixedFee, uint256 fractionalFee);
 
     event LogTreasuryPremiumTransferred(address from, address riskpoolWalletAddress, uint256 amount, bool success);
+    event LogTreasuryPayoutTransferred(address riskpoolWalletAddress, address to, uint256 amount, bool success);
     event LogTreasuryCapitalTransferred(address from, address riskpoolWalletAddress, uint256 amount, bool success);
     event LogTreasuryFeesTransferred(address from, address instanceWalletAddress, uint256 amount, bool success);
     event LogTreasuryWithdrawalTransferred(address riskpoolWalletAddress, address to, uint256 amount, bool success);
 
     event LogTreasuryFullPremiumProcessed(bytes32 processId, uint256 amount, bool success);
     event LogTreasuryPremiumProcessed(bytes32 processId, uint256 amount, bool success);
+    event LogTreasuryPayoutProcessed(uint256 riskpoolId, address to, uint256 amount, bool success);
     event LogTreasuryCapitalProcessed(uint256 riskpoolId, uint256 bundleId, uint256 amount, bool success);
     event LogTreasuryWithdrawalProcessed(uint256 riskpoolId, uint256 bundleId, uint256 amount, bool success);
 

diff --git a/contracts/services/IInstanceService.sol b/contracts/services/IInstanceService.sol
@@ -3,6 +3,7 @@ pragma solidity ^0.8.0;
 
 import "../modules/IBundle.sol";
 import "../modules/IPolicy.sol";
+import "../tokens/IBundleToken.sol";
 import "./IComponentOwnerService.sol";
 import "./IInstanceOperatorService.sol";
 import "./IOracleService.sol";
@@ -25,13 +26,13 @@ interface IInstanceService {
     function getRiskpoolService() external view returns(IRiskpoolService service);
 
     // access
-    function productOwnerRole() external view returns(bytes32 role);
-    function oracleProviderRole() external view returns(bytes32 role);
-    function riskpoolKeeperRole() external view returns(bytes32 role);
+    function getProductOwnerRole() external view returns(bytes32 role);
+    function getOracleProviderRole() external view returns(bytes32 role);
+    function getRiskpoolKeeperRole() external view returns(bytes32 role);
     function hasRole(bytes32 role, address principal) external view returns (bool roleIsAssigned);    
 
     // bundles
-    function getBundleToken() external view returns(IERC721 token);
+    function getBundleToken() external view returns(IBundleToken token);
     function bundles() external view returns(uint256 numberOfBundles);
     function getBundle(uint256 bundleId) external view returns(IBundle.Bundle memory bundle);
 

diff --git a/contracts/tokens/IBundleToken.sol b/contracts/tokens/IBundleToken.sol
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.0;
+
+import "@openzeppelin/contracts/token/ERC721/IERC721.sol";
+
+interface IBundleToken is
+    IERC721
+{
+    event LogBundleTokenMinted(uint256 bundleId, uint256 tokenId, address tokenOwner);
+    event LogBundleTokenBurned(uint256 bundleId, uint256 tokenId);   
+
+    function burned(uint tokenId) external view returns(bool isBurned);
+    function exists(uint256 tokenId) external view returns(bool doesExist);
+    function getBundleId(uint256 tokenId) external view returns(uint256 bundleId);
+    function tokens() external view returns(uint256 tokenCount);
+}