@etherisc/gif-next 3.0.0-db9ffbc-172 → 3.0.0-e1241ec-031

package/contracts/pool/IPoolService.sol

@@ -19,7 +19,7 @@ interface IPoolService is IService {
     event LogPoolServiceWalletDefunded(NftId poolNftId, address poolOwner, Amount amount);
 
     event LogPoolServiceBundleCreated(NftId instanceNftId, NftId poolNftId, NftId bundleNftId);
-    event LogPoolServiceBundleClosed(NftId instanceNftId, NftId poolNftId, NftId bundleNftId);
+    event LogPoolServiceBundleClosed(NftId instanceNftId, NftId poolNftId, NftId bundleNftId, Amount balanceAmount, Amount feeAmount);
 
     event LogPoolServiceBundleStaked(NftId instanceNftId, NftId poolNftId, NftId bundleNftId, Amount amount, Amount netAmount);
     event LogPoolServiceBundleUnstaked(NftId instanceNftId, NftId poolNftId, NftId bundleNftId, Amount amount, Amount netAmount);

package/contracts/pool/PoolService.sol

@@ -98,7 +98,7 @@ contract PoolService is
             unstakedAmount +  feeAmount, 
             AmountLib.zero());
         
-        emit LogPoolServiceBundleClosed(instance.getNftId(), poolNftId, bundleNftId);
+        emit LogPoolServiceBundleClosed(instance.getNftId(), poolNftId, bundleNftId, unstakedAmount, feeAmount);
 
         if ((unstakedAmount + feeAmount).gtz()){
             IComponents.ComponentInfo memory poolComponentInfo = instance.getInstanceReader().getComponentInfo(poolNftId);

package/contracts/product/IPolicyService.sol

@@ -13,7 +13,7 @@ interface IPolicyService is IService {
 
     event LogPolicyServicePolicyCreated(NftId policyNftId, Amount premiumAmount, Timestamp activatedAt);
     event LogPolicyServicePolicyDeclined(NftId policyNftId);
-    event LogPolicyServicePolicyPremiumCollected(NftId policyNftId, Amount premiumAmount);
+    event LogPolicyServicePolicyPremiumCollected(NftId policyNftId, NftId productNftId, Amount premiumAmount, Timestamp activateAt);
     event LogPolicyServicePolicyActivated(NftId policyNftId, Timestamp activatedAt);
     event LogPolicyServicePolicyActivatedUpdated(NftId policyNftId, Timestamp activatedAt);
     event LogPolicyServicePolicyExpirationUpdated(NftId policyNftId, Timestamp expiredAt);

package/contracts/product/PolicyService.sol

@@ -247,7 +247,7 @@ contract PolicyService is
         instance.getProductStore().updatePremiumState(policyNftId, PAID());
 
         // log premium collection before interactions with token
-        emit LogPolicyServicePolicyPremiumCollected(policyNftId, premium.premiumAmount);
+        emit LogPolicyServicePolicyPremiumCollected(policyNftId, policyInfo.productNftId, premium.premiumAmount, activateAt);
 
         // interactions
         _transferPremiumAmounts(instanceReader, policyNftId, policyInfo.productNftId, premium);

package/contracts/registry/ChainNft.sol

@@ -11,7 +11,7 @@ contract ChainNft is ERC721Enumerable {
     event LogTokenInterceptorAddress(uint256 tokenId, address interceptor);
 
     // constants
-    string public constant NAME = "Dezentralized Insurance Protocol NFT";
+    string public constant NAME = "Decentralized Insurance Protocol NFT";
     string public constant SYMBOL = "DIPNFT";
 
     uint256 public constant PROTOCOL_NFT_ID = 1101;

package/contracts/registry/IRegistry.sol

@@ -20,7 +20,7 @@ interface IRegistry is
 {
 
     event LogRegistryObjectRegistered(NftId nftId, NftId parentNftId, ObjectType objectType, bool isInterceptor, address objectAddress, address initialOwner);
-    event LogRegistryServiceRegistered(VersionPart majorVersion, ObjectType domain);
+    event LogRegistryServiceRegistered(NftId nftId, VersionPart majorVersion, ObjectType domain);
     event LogRegistryChainRegistryRegistered(NftId nftId, uint256 chainId, address chainRegistryAddress);
 
     // initialize

package/contracts/registry/Registry.sol

@@ -231,7 +231,7 @@ contract Registry is
 
         _service[version][domain] = service;
 
-        emit LogRegistryServiceRegistered(version, domain);
+        emit LogRegistryServiceRegistered(info.nftId,version, domain);
 
         nftId = _register(info);
     }

package/contracts/shared/ComponentService.sol

@@ -312,9 +312,27 @@ contract ComponentService is
             productNftId, 
             initialProductInfo);
 
+        emit LogComponentServiceProductCreated(productNftId, productAddress, initialProductInfo.hasDistribution, initialProductInfo.expectedNumberOfOracles);
+
+        IComponents.FeeInfo memory initialFeeInfo = product.getInitialFeeInfo();
+        
         productStore.createFee(
             productNftId, 
-            product.getInitialFeeInfo());
+            initialFeeInfo);
+
+        emit LogComponentServiceProductInitialProductFeesSet(
+            productNftId, 
+            initialFeeInfo.productFee.fixedFee, initialFeeInfo.productFee.fractionalFee,
+            initialFeeInfo.processingFee.fixedFee, initialFeeInfo.processingFee.fractionalFee);
+        emit LogComponentServiceProductInitialDistributionFeesSet(
+            productNftId, 
+            initialFeeInfo.distributionFee.fixedFee, initialFeeInfo.distributionFee.fractionalFee,
+            initialFeeInfo.minDistributionOwnerFee.fixedFee, initialFeeInfo.minDistributionOwnerFee.fractionalFee);
+        emit LogComponentServiceProductInitialPoolFeesSet(
+            productNftId, 
+            initialFeeInfo.poolFee.fixedFee, initialFeeInfo.poolFee.fractionalFee,
+            initialFeeInfo.stakingFee.fixedFee, initialFeeInfo.stakingFee.fractionalFee,
+            initialFeeInfo.performanceFee.fixedFee, initialFeeInfo.performanceFee.fractionalFee);
     }
 
     //-------- distribution -------------------------------------------------//
@@ -341,6 +359,8 @@ contract ComponentService is
         // set distribution in product info
         productInfo.distributionNftId = distributionNftId;
         productStore.updateProduct(productNftId, productInfo, KEEP_STATE());
+
+        emit LogComponentServiceDistributionCreated(distributionNftId, productNftId);
     }
 
 
@@ -400,6 +420,8 @@ contract ComponentService is
         productInfo.oracleNftId[productInfo.numberOfOracles] = oracleNftId;
         productInfo.numberOfOracles++;
         productStore.updateProduct(productNftId, productInfo, KEEP_STATE());
+
+        emit LogComponentServiceOracleCreated(oracleNftId, productNftId);
     }
 
     //-------- pool ---------------------------------------------------------//
@@ -423,13 +445,20 @@ contract ComponentService is
 
         // create info
         IPoolComponent pool = IPoolComponent(componentAddress);
+        IComponents.PoolInfo memory initialPoolInfo = pool.getInitialPoolInfo();
         instanceStore.createPool(
             poolNftId, 
-            pool.getInitialPoolInfo());
+            initialPoolInfo);
 
         // update pool in product info
         productInfo.poolNftId = poolNftId;
         productStore.updateProduct(productNftId, productInfo, KEEP_STATE());
+
+        emit LogComponentServicePoolCreated(
+            poolNftId, productNftId, componentAddress, 
+            initialPoolInfo.maxBalanceAmount, initialPoolInfo.collateralizationLevel, 
+            initialPoolInfo.retentionLevel, initialPoolInfo.isExternallyManaged, 
+            initialPoolInfo.isVerifyingApplications);
     }
 
 
@@ -543,6 +572,11 @@ contract ComponentService is
             address(component), // initially, component is its own wallet
             token, 
             instanceAdmin.authority());
+
+        emit LogComponentServiceTokenHandlerDeployed(
+            componentNftId, 
+            address(componentInfo.tokenHandler), 
+            token);
         
         // register component with instance
         instanceStore.createComponent(

package/contracts/shared/IComponentService.sol

@@ -46,6 +46,7 @@ interface IComponentService is
     error ErrorComponentServiceWalletAllowanceTooSmall(address wallet, address spender, uint256 allowance, uint256 amount);
 
     event LogComponentServiceComponentLocked(address component, bool locked);
+    event LogComponentServiceTokenHandlerDeployed(NftId componentNftId, address tokenHandler, address token);
     event LogComponentServiceRegistered(NftId instanceNftId, NftId componentNftId, ObjectType componentType, address component, address token, address initialOwner); 
     event LogComponentServiceWalletAddressChanged(NftId componentNftId, address currentWallet, address newWallet);
     event LogComponentServiceWalletTokensTransferred(NftId componentNftId, address currentWallet, address newWallet, uint256 currentBalance);
@@ -61,6 +62,29 @@ interface IComponentService is
         UFixed newFractionalFee, 
         Amount newFixedFee
     );
+    event LogComponentServiceProductCreated(
+        NftId indexed productNftId, address indexed productAddress, bool indexed hasDistribution, uint8 expectedNumberOfOracles);
+    event LogComponentServiceProductInitialProductFeesSet(
+        NftId indexed productNftId, 
+        Amount indexed productFeeFixed, UFixed indexed productFeeFractional,
+        Amount processingFeeFixed, UFixed processingFeeFractional);
+    event LogComponentServiceProductInitialDistributionFeesSet(
+        NftId indexed productNftId, 
+        Amount indexed distributionFeeFixed, UFixed indexed distributionFeeFractional,
+        Amount minDistributionOwnerFeeFixed, UFixed minDistributionOwnerFeeFractional);
+    event LogComponentServiceProductInitialPoolFeesSet(
+        NftId indexed productNftId, 
+        Amount indexed poolFeeFixed, UFixed indexed poolFeeFractional,
+        Amount stakingFeeFixed, UFixed stakingFeeFractional,
+        Amount performanceFeeFixed, UFixed performanceFeeFractional);
+    event LogComponentServicePoolCreated(
+        NftId indexed poolNftId, NftId indexed productNftId, address indexed componentAddress, 
+        Amount maxBalanceAmount, UFixed collateralizationLevel, UFixed retentionLevel, 
+        bool isExternallyManaged, bool isVerifyingApplications);
+    event LogComponentServiceDistributionCreated(
+        NftId indexed distributionNftId, NftId indexed productNftId);
+    event LogComponentServiceOracleCreated(
+        NftId indexed oracleNftId, NftId indexed productNftId);
     
     //-------- component ----------------------------------------------------//
 

package/contracts/staking/IStaking.sol

@@ -25,6 +25,8 @@ interface IStaking is
     IVersionable
 {
 
+    event LogStakingTokenHandlerDeployed(NftId componentNftId, address tokenHandler, address token);
+    
     // owner functions
     event LogStakingStakingRateSet(ChainId chainId, address token, UFixed newStakingRate, UFixed oldStakingRate, Blocknumber lastUpdateIn);
     event LogStakingStakingServiceSet(address stakingService, VersionPart release, address oldStakingService);

package/contracts/staking/IStakingService.sol

@@ -17,7 +17,7 @@ interface IStakingService is IService
 {
 
     event LogStakingServiceProtocolTargetRegistered(NftId protocolNftId);
-    event LogStakingServiceInstanceTargetRegistered(NftId instanceNftId, uint256 chainId);
+    event LogStakingServiceInstanceTargetRegistered(NftId instanceNftId, uint256 chainId, Seconds initialLockingPeriod, UFixed initialRewardRate);
     event LogStakingServiceLockingPeriodSet(NftId targetNftId, Seconds oldLockingDuration, Seconds lockingDuration);
     event LogStakingServiceRewardRateSet(NftId targetNftId, UFixed oldRewardRate, UFixed rewardRate);
 

package/contracts/staking/Staking.sol

@@ -86,6 +86,7 @@ contract Staking is
             address(this),
             dipToken, 
             getRegistry().getAuthority());
+        emit LogStakingTokenHandlerDeployed(getNftId(), address($._tokenHandler), dipToken);
     }
 
 

package/contracts/staking/StakingService.sol

@@ -59,7 +59,7 @@ contract StakingService is
             initialLockingPeriod,
             initialRewardRate);
 
-        emit LogStakingServiceInstanceTargetRegistered(targetNftId, chainId);
+        emit LogStakingServiceInstanceTargetRegistered(targetNftId, chainId, initialLockingPeriod, initialRewardRate);
     }
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etherisc/gif-next",
-  "version": "3.0.0-db9ffbc-172",
+  "version": "3.0.0-e1241ec-031",
   "description": "This is the repository for the next version of the Generic Insurance Framework (GIF) smart contracts. ",
   "main": "index.js",
   "scripts": {
@@ -43,8 +43,8 @@
     "typescript": "^5"
   },
   "dependencies": {
-    "@openzeppelin/contracts": "5.0.2",
-    "@openzeppelin/contracts-upgradeable": "5.0.2",
+    "@openzeppelin/contracts": "5.1.0",
+    "@openzeppelin/contracts-upgradeable": "5.1.0",
     "@openzeppelin/upgrades-core": "^1.34.1",
     "abi-coder": "^5.0.0",
     "antlr4ng": "^3.0.4",