@etherisc/gif-next 3.0.0-ce9c327-981 → 3.0.0-cf20ffd-765

package/contracts/authorization/AccessAdmin.sol

@@ -279,10 +279,11 @@ contract AccessAdmin is
     {
         Selector selector = SelectorSetLib.at(_targetFunctions[target], idx);
         func = _functionInfo[target][selector];
-        roleId = RoleIdLib.toRoleId(
-            _authority.getTargetFunctionRole(
-                target, 
-                selector.toBytes4()));
+        roleId = AccessAdminLib.getFunctionRoleId(_authority, target, selector);
+        // roleId = RoleIdLib.toRoleId(
+        //     _authority.getTargetFunctionRole(
+        //         target, 
+        //         selector.toBytes4()));
     }
 
 
@@ -318,7 +319,7 @@ contract AccessAdmin is
             (RoleId roleId, bool exists) = getRoleForName(roleInfo.name.toString());
 
             if (!exists) {
-                if (!AccessAdminLib.isDynamicRoleId(authzRoleId)) {
+                if (!AccessAdminLib.isDynamicRoleId(authzRoleId) || roleInfo.targetType == TargetType.Custom) {
                     roleId = authzRoleId;
                 }
 
@@ -366,7 +367,7 @@ contract AccessAdmin is
         // add role to list of roles
         _roleIds.push(roleId);
 
-        emit LogAccessAdminRoleCreated(_adminName, roleId, info.targetType, info.adminRoleId, info.name.toString());
+        emit LogAccessAdminRoleCreated(roleId, info.adminRoleId, info.targetType, info.name.toString(), _adminName);
     }
 
 
@@ -386,7 +387,7 @@ contract AccessAdmin is
         Blocknumber lastUpdateIn = _roleInfo[roleId].lastUpdateIn;
         _roleInfo[roleId].lastUpdateIn = BlocknumberLib.current();
 
-        emit LogAccessAdminRoleActivatedSet(_adminName, roleId, active, lastUpdateIn);
+        emit LogAccessAdminRoleActivatedSet(roleId, active, _adminName, lastUpdateIn);
     }
 
 
@@ -417,9 +418,9 @@ contract AccessAdmin is
             0);
         
         emit LogAccessAdminRoleGranted(
-            _adminName, 
             account, 
-            AccessAdminLib.getRoleName(this, roleId));
+            AccessAdminLib.getRoleName(this, roleId),
+            _adminName);
     }
 
 
@@ -440,7 +441,7 @@ contract AccessAdmin is
             RoleId.unwrap(roleId), 
             account);
 
-        emit LogAccessAdminRoleRevoked(_adminName, account, _roleInfo[roleId].name.toString());
+        emit LogAccessAdminRoleRevoked(account, _roleInfo[roleId].name.toString(), _adminName);
     }
 
 
@@ -556,7 +557,7 @@ contract AccessAdmin is
         // grant contract role to target
         _grantRoleToAccount(targetRoleId, target);
 
-        emit LogAccessAdminTargetCreated(_adminName, targetName, managed, target, targetRoleId);
+        emit LogAccessAdminTargetCreated(target, targetRoleId, managed, targetName, _adminName);
     }
 
 
@@ -570,7 +571,7 @@ contract AccessAdmin is
         Blocknumber lastUpdateIn = _targetInfo[target].lastUpdateIn;
         _targetInfo[target].lastUpdateIn = BlocknumberLib.current();
 
-        emit LogAccessAdminTargetLockedSet(_adminName, target, locked, lastUpdateIn);
+        emit LogAccessAdminTargetLockedSet(target, locked, _adminName, lastUpdateIn);
     }
 
 
@@ -651,29 +652,11 @@ contract AccessAdmin is
 
         // logging
         emit LogAccessAdminFunctionGranted(
-            _adminName, 
             target, 
+            selector,
+            roleId,
             AccessAdminLib.toFunctionGrantingString(this, func.name, roleId),
+            _adminName, 
             lastUpdateIn);
     }
-
-
-    function _checkAuthorization( 
-        address authorization,
-        ObjectType expectedDomain, 
-        VersionPart expectedRelease,
-        bool expectServiceAuthorization,
-        bool checkAlreadyInitialized
-    )
-        internal
-        view
-    {
-        AccessAdminLib.checkAuthorization(
-            address(_authorization), 
-            authorization, 
-            expectedDomain, 
-            expectedRelease, 
-            expectServiceAuthorization,
-            checkAlreadyInitialized);
-    }
 }

package/contracts/authorization/AccessAdminLib.sol

@@ -7,16 +7,17 @@ import {IAccess} from "./IAccess.sol";
 import {IAccessAdmin} from "./IAccessAdmin.sol";
 import {IAuthorization} from "./IAuthorization.sol";
 import {IComponent} from "../shared/IComponent.sol";
-import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
+import {IAuthorizedComponent} from "../shared/IAuthorizedComponent.sol";
 import {IRegistry} from "../registry/IRegistry.sol";
 import {IService} from "../shared/IService.sol";
 import {IServiceAuthorization} from "./IServiceAuthorization.sol";
 
+import {AccessManagerCloneable} from "./AccessManagerCloneable.sol";
 import {BlocknumberLib} from "../type/Blocknumber.sol";
 import {ContractLib} from "../shared/ContractLib.sol";
 import {ObjectType} from "../type/ObjectType.sol";
 import {RoleId, RoleIdLib, ADMIN_ROLE, PUBLIC_ROLE} from "../type/RoleId.sol";
-import {SelectorLib} from "../type/Selector.sol";
+import {Selector, SelectorLib} from "../type/Selector.sol";
 import {Str, StrLib} from "../type/String.sol";
 import {TimestampLib} from "../type/Timestamp.sol";
 import {VersionPart, VersionPartLib} from "../type/Version.sol";
@@ -338,7 +339,7 @@ library AccessAdminLib { // ACCESS_ADMIN_LIB
         checkIsRegistered(address(accessAdmin.getRegistry()), componentAddress, expectedType);
 
         VersionPart expecteRelease = accessAdmin.getRelease();
-        IInstanceLinkedComponent component = IInstanceLinkedComponent(componentAddress);
+        IAuthorizedComponent component = IAuthorizedComponent(componentAddress);
         componentAuthorization = component.getAuthorization();
 
         checkAuthorization(
@@ -481,6 +482,22 @@ library AccessAdminLib { // ACCESS_ADMIN_LIB
     }
 
 
+    function getFunctionRoleId(
+        AccessManagerCloneable authority,
+        address target,
+        Selector selector
+    )
+        public
+        view
+        returns (RoleId functionRoleId)
+    {
+        return RoleIdLib.toRoleId(
+            authority.getTargetFunctionRole(
+                target, 
+                selector.toBytes4()));
+    }
+
+
     function getServiceRoleId(
         address serviceAddress,
         IAccess.TargetType serviceTargetType

package/contracts/authorization/AccessManagerCloneable.sol

@@ -24,6 +24,8 @@ contract AccessManagerCloneable is
     error ErrorAccessManagerTargetAdminLocked(address target);
     error ErrorAccessManagerCallerAdminLocked(address caller);
 
+    event LogAccessManagerLocked(address indexed accessManager, bool indexed locked);
+
     VersionPart private _release;
     bool private _isLocked;
 
@@ -39,6 +41,7 @@ contract AccessManagerCloneable is
 
     function initialize(address admin)
         public
+        override
         initializer()
     {
         __ERC165_init();
@@ -94,6 +97,7 @@ contract AccessManagerCloneable is
         onlyAdminRole() 
     {
         _isLocked = locked;
+        emit LogAccessManagerLocked(address(this), locked);
     }
 
 

package/contracts/authorization/IAccessAdmin.sol

@@ -12,6 +12,7 @@ import {Blocknumber} from "../type/Blocknumber.sol";
 import {NftId} from "../type/NftId.sol";
 import {ObjectType} from "../type/ObjectType.sol";
 import {RoleId} from "../type/RoleId.sol";
+import {Selector} from "../type/Selector.sol";
 import {Str} from "../type/String.sol";
 import {VersionPart} from "../type/Version.sol";
 
@@ -24,14 +25,14 @@ interface IAccessAdmin is
 {
 
     // roles, targets and functions
-    event LogAccessAdminRoleCreated(string admin, RoleId roleId, TargetType targetType, RoleId roleAdminId, string name);
-    event LogAccessAdminTargetCreated(string admin, string name, bool managed, address target, RoleId roleId);
-
-    event LogAccessAdminRoleActivatedSet(string admin, RoleId roleId, bool active, Blocknumber lastUpdateIn);
-    event LogAccessAdminRoleGranted(string admin, address account, string roleName);
-    event LogAccessAdminRoleRevoked(string admin, address account, string roleName);
-    event LogAccessAdminTargetLockedSet(string admin, address target, bool locked, Blocknumber lastUpdateIn);
-    event LogAccessAdminFunctionGranted(string admin, address target, string func, Blocknumber lastUpdateIn);
+    event LogAccessAdminRoleCreated(RoleId indexed roleId, RoleId indexed roleAdminId, TargetType indexed targetType, string name, string admin);
+    event LogAccessAdminTargetCreated(address indexed target, RoleId indexed roleId, bool indexed managed, string name, string admin);
+
+    event LogAccessAdminRoleActivatedSet(RoleId indexed roleId, bool indexed active, string admin, Blocknumber indexed lastUpdateIn);
+    event LogAccessAdminRoleGranted(address indexed account, string roleName, string admin);
+    event LogAccessAdminRoleRevoked(address indexed account, string roleName, string admin);
+    event LogAccessAdminTargetLockedSet(address indexed target, bool indexed locked, string admin, Blocknumber indexed lastUpdateIn);
+    event LogAccessAdminFunctionGranted(address indexed target, Selector indexed selector, RoleId indexed roleId, string func, string admin, Blocknumber lastUpdateIn);
 
     // only deployer modifier
     error ErrorAccessAdminNotDeployer();

package/contracts/distribution/DistributionService.sol

@@ -98,21 +98,24 @@ contract DistributionService is
         }
 
         distributorType = DistributorTypeLib.toDistributorType(distributionNftId, name);
-        IDistribution.DistributorTypeInfo memory info = IDistribution.DistributorTypeInfo({
-            name: name,
-            distributionNftId: distributionNftId,
-            minDiscountPercentage: minDiscountPercentage,
-            maxDiscountPercentage: maxDiscountPercentage,
-            commissionPercentage: commissionPercentage,
-            maxReferralCount: maxReferralCount,
-            maxReferralLifetime: maxReferralLifetime,
-            allowSelfReferrals: allowSelfReferrals,
-            allowRenewals: allowRenewals,
-            data: data});
-
-        instance.getInstanceStore().createDistributorType(distributorType, info);
+        
+        {
+            IDistribution.DistributorTypeInfo memory info = IDistribution.DistributorTypeInfo({
+                name: name,
+                distributionNftId: distributionNftId,
+                minDiscountPercentage: minDiscountPercentage,
+                maxDiscountPercentage: maxDiscountPercentage,
+                commissionPercentage: commissionPercentage,
+                maxReferralCount: maxReferralCount,
+                maxReferralLifetime: maxReferralLifetime,
+                allowSelfReferrals: allowSelfReferrals,
+                allowRenewals: allowRenewals,
+                data: data});
+
+            instance.getInstanceStore().createDistributorType(distributorType, info);
+        }
 
-        emit LogDistributionServiceDistributorTypeCreated(distributionNftId, name);
+        emit LogDistributionServiceDistributorTypeCreated(distributionNftId, distributorType, name, commissionPercentage);
     }
 
 
@@ -148,7 +151,7 @@ contract DistributionService is
 
         instance.getInstanceStore().createDistributor(distributorNftId, info);
 
-        emit LogDistributionServiceDistributorCreated(distributionNftId, distributorNftId, distributorType, distributor);
+        emit LogDistributionServiceDistributorCreated(distributionNftId, distributorNftId, distributor, distributorType);
     }
 
     function changeDistributorType(
@@ -236,7 +239,7 @@ contract DistributionService is
 
             instance.getInstanceStore().createReferral(referralId, info);
 
-            emit LogDistributionServiceReferralCreated(distributionNftId, distributorNftId, referralId, code);
+            emit LogDistributionServiceReferralCreated(distributorNftId, referralId, code, discountPercentage, maxReferrals, expiryAt);
         }
     }
 
@@ -258,7 +261,7 @@ contract DistributionService is
             referralInfo.usedReferrals += 1;
             instance.getInstanceStore().updateReferral(referralId, referralInfo, KEEP_STATE());
 
-            emit LogDistributionServiceReferralProcessed(distributionNftId, referralInfo.distributorNftId, referralId, referralInfo.usedReferrals);
+            emit LogDistributionServiceReferralProcessed(referralInfo.distributorNftId, referralId, referralInfo.usedReferrals);
         }
     }
 
@@ -295,12 +298,14 @@ contract DistributionService is
             IDistribution.DistributorInfo memory distributorInfo = reader.getDistributorInfo(referralInfo.distributorNftId);
             distributorInfo.numPoliciesSold += 1;
             store.updateDistributor(referralInfo.distributorNftId, distributorInfo, KEEP_STATE());
+            emit LogDistributionServiceSaleProcessedWithReferral(distributionNftId, referralInfo.distributorNftId, referralId, distributorInfo.numPoliciesSold, premium.premiumAmount, distributionOwnerFee, commissionAmount);
         } else {
             // increase distribution balance by distribution owner fee
             _accountingService.increaseDistributionBalance(store, distributionNftId, AmountLib.zero(), distributionOwnerFee);
+            emit LogDistributionServiceSaleProcessed(distributionNftId, premium.premiumAmount, distributionOwnerFee);
         }
 
-        emit LogDistributionServiceSaleProcessed(distributionNftId, referralId);
+        
     }
 
     /// @inheritdoc IDistributionService
@@ -341,7 +346,7 @@ contract DistributionService is
         // transfer amount to distributor
         {
             address distributor = getRegistry().ownerOf(distributorNftId);
-            emit LogDistributionServiceCommissionWithdrawn(distributorNftId, distributor, address(distributionInfo.tokenHandler.TOKEN()), withdrawnAmount);
+            emit LogDistributionServiceCommissionWithdrawn(distributorNftId, distributor, withdrawnAmount, address(distributionInfo.tokenHandler.TOKEN()));
             distributionInfo.tokenHandler.pushToken(distributor, withdrawnAmount);
         }
     }

package/contracts/distribution/IDistributionComponent.sol

@@ -11,8 +11,6 @@ import {UFixed} from "../type/UFixed.sol";
 
 interface IDistributionComponent is IInstanceLinkedComponent {
 
-    event LogDistributorUpdated(address to, address operator);
-
     function getDiscountPercentage(
         string memory referralCode
     ) external view returns (UFixed discountPercentage, ReferralStatus status);

package/contracts/distribution/IDistributionService.sol

@@ -39,13 +39,14 @@ interface IDistributionService is IService {
     error ErrorDistributionServiceInvalidFeeTransferred(Amount transferredDistributionFeeAmount, Amount expectedDistributionFeeAmount);
     error ErrorDistributionServiceReferralDistributionMismatch(ReferralId referralId, NftId referralDistributionNft, NftId distributionNftId);
 
-    event LogDistributionServiceCommissionWithdrawn(NftId distributorNftId, address recipient, address tokenAddress, Amount amount);
-    event LogDistributionServiceDistributorTypeCreated(NftId distributionNftId, string name);
-    event LogDistributionServiceDistributorCreated(NftId distributionNftId, NftId distributorNftId, DistributorType distributorType, address distributor);
-    event LogDistributionServiceDistributorTypeChanged(NftId distributorNftId, DistributorType oldDistributorType, DistributorType newDistributorType);
-    event LogDistributionServiceReferralCreated(NftId distributionNftId, NftId distributorNftId, ReferralId referralId, string code);
-    event LogDistributionServiceReferralProcessed(NftId distributionNftId, NftId distributorNftId, ReferralId referralId, uint32 usedReferrals);
-    event LogDistributionServiceSaleProcessed(NftId distributionNftId, ReferralId referralId);
+    event LogDistributionServiceCommissionWithdrawn(NftId indexed distributorNftId, address indexed recipient, Amount amount, address indexed tokenAddress);
+    event LogDistributionServiceDistributorTypeCreated(NftId indexed distributionNftId, DistributorType indexed distributorType, string name, UFixed commissionPercentage);
+    event LogDistributionServiceDistributorCreated(NftId indexed distributionNftId, NftId indexed distributorNftId, address indexed distributor, DistributorType distributorType);
+    event LogDistributionServiceDistributorTypeChanged(NftId indexed distributorNftId, DistributorType indexed oldDistributorType, DistributorType indexed newDistributorType);
+    event LogDistributionServiceReferralCreated(NftId indexed distributorNftId, ReferralId indexed referralId, string code, UFixed discountPercentage, uint32 maxReferrals, Timestamp expiryAt);
+    event LogDistributionServiceReferralProcessed(NftId indexed distributorNftId, ReferralId indexed referralId, uint32 usedReferrals);
+    event LogDistributionServiceSaleProcessed(NftId indexed distributionNftId, Amount premium, Amount distributionOwnerFee);
+    event LogDistributionServiceSaleProcessedWithReferral(NftId indexed distributionNftId, NftId indexed distributorNftId, ReferralId indexed referralId, uint32 numPoliciesSold, Amount premium, Amount distributionOwnerFee, Amount commissionAmount);
 
     function createDistributorType(
         string memory name,