@etherisc/gif-next 3.0.0-c458de2-735 → 3.0.0-c517f31-287

package/artifacts/contracts/upgradeability/{Upgradeable.sol/Upgradeable.json → Versionable.sol/Versionable.json}

@@ -1,50 +1,13 @@
 {
   "_format": "hh-sol-artifact-1",
-  "contractName": "Upgradeable",
-  "sourceName": "contracts/upgradeability/Upgradeable.sol",
+  "contractName": "Versionable",
+  "sourceName": "contracts/upgradeability/Versionable.sol",
   "abi": [
     {
       "inputs": [],
       "name": "ErrorVersionableInitializeNotImplemented",
       "type": "error"
     },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "target",
-          "type": "address"
-        },
-        {
-          "internalType": "VersionPart",
-          "name": "invalidRelease",
-          "type": "uint8"
-        }
-      ],
-      "name": "ErrorVersionableReleaseInvalid",
-      "type": "error"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "target",
-          "type": "address"
-        },
-        {
-          "internalType": "VersionPart",
-          "name": "expected",
-          "type": "uint8"
-        },
-        {
-          "internalType": "VersionPart",
-          "name": "actual",
-          "type": "uint8"
-        }
-      ],
-      "name": "ErrorVersionableReleaseMismatch",
-      "type": "error"
-    },
     {
       "inputs": [],
       "name": "ErrorVersionableUpgradeNotImplemented",
@@ -73,19 +36,6 @@
       "name": "Initialized",
       "type": "event"
     },
-    {
-      "inputs": [],
-      "name": "getRelease",
-      "outputs": [
-        {
-          "internalType": "VersionPart",
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "stateMutability": "pure",
-      "type": "function"
-    },
     {
       "inputs": [],
       "name": "getVersion",
@@ -112,7 +62,7 @@
           "type": "bytes"
         }
       ],
-      "name": "initialize",
+      "name": "initializeVersionable",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
@@ -125,7 +75,7 @@
           "type": "bytes"
         }
       ],
-      "name": "upgrade",
+      "name": "upgradeVersionable",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"

package/contracts/accounting/AccountingService.sol

@@ -9,7 +9,7 @@ import {InstanceStore} from "../instance/InstanceStore.sol";
 import {Amount, AmountLib} from "../type/Amount.sol";
 import {Fee} from "../type/Fee.sol";
 import {NftId} from "../type/NftId.sol";
-import {ObjectType, ACCOUNTING, BUNDLE, DISTRIBUTION, DISTRIBUTOR, POOL, PRODUCT} from "../type/ObjectType.sol";
+import {ObjectType, ACCOUNTING, BUNDLE, COMPONENT, DISTRIBUTION, DISTRIBUTOR, POOL, PRODUCT} from "../type/ObjectType.sol";
 import {Service} from "../shared/Service.sol";
 
 
@@ -26,13 +26,14 @@ contract AccountingService is
     )
         internal
         virtual override
-        onlyInitializing()
+        initializer()
     {
         (
-            address authority
-        ) = abi.decode(data, (address));
+            address authority,
+            address registry
+        ) = abi.decode(data, (address, address));
 
-        __Service_init(authority, owner);
+        __Service_init(authority, registry, owner);
         _registerInterface(type(IAccountingService).interfaceId);
     }
 
@@ -45,7 +46,7 @@ contract AccountingService is
         virtual
         restricted()
     {
-        _changeTargetBalance(DECREASE, instanceStore, componentNftId, AmountLib.zero(), feeAmount);    
+        _changeTargetBalance(DECREASE, instanceStore, componentNftId, COMPONENT(), AmountLib.zero(), feeAmount);    
     }
 
 
@@ -59,7 +60,7 @@ contract AccountingService is
         restricted()
     {
         _checkNftType(productNftId, PRODUCT());
-        _changeTargetBalance(INCREASE, instanceStore, productNftId, AmountLib.zero(), feeAmount);
+        _changeTargetBalance(INCREASE, instanceStore, productNftId, PRODUCT(), AmountLib.zero(), feeAmount);
     }
 
     function increaseProductFeesForPool(
@@ -72,7 +73,7 @@ contract AccountingService is
         restricted()
     {
         _checkNftType(productNftId, PRODUCT());
-        _changeTargetBalance(INCREASE, instanceStore, productNftId, AmountLib.zero(), feeAmount);
+        _changeTargetBalance(INCREASE, instanceStore, productNftId, PRODUCT(), AmountLib.zero(), feeAmount);
     }
 
 
@@ -82,7 +83,7 @@ contract AccountingService is
         restricted()
     {
         _checkNftType(productNftId, PRODUCT());
-        _changeTargetBalance(DECREASE, instanceStore, productNftId, AmountLib.zero(), feeAmount);
+        _changeTargetBalance(DECREASE, instanceStore, productNftId, PRODUCT(), AmountLib.zero(), feeAmount);
     }
 
     function increaseDistributionBalance(
@@ -96,7 +97,7 @@ contract AccountingService is
         restricted()
     {
         _checkNftType(distributionNftId, DISTRIBUTION());
-        _changeTargetBalance(INCREASE, instanceStore, distributionNftId, amount, feeAmount);
+        _changeTargetBalance(INCREASE, instanceStore, distributionNftId, DISTRIBUTION(), amount, feeAmount);
     }
 
 
@@ -111,7 +112,7 @@ contract AccountingService is
         restricted()
     {
         _checkNftType(distributionNftId, DISTRIBUTION());
-        _changeTargetBalance(DECREASE, instanceStore, distributionNftId, amount, feeAmount);
+        _changeTargetBalance(DECREASE, instanceStore, distributionNftId, DISTRIBUTION(), amount, feeAmount);
     }
 
     function increaseDistributorBalance(
@@ -125,7 +126,7 @@ contract AccountingService is
         restricted()
     {
         _checkNftType(distributorNftId, DISTRIBUTOR());
-        _changeTargetBalance(INCREASE, instanceStore, distributorNftId, amount, feeAmount);
+        _changeTargetBalance(INCREASE, instanceStore, distributorNftId, DISTRIBUTOR(), amount, feeAmount);
     }
 
     function decreaseDistributorBalance(
@@ -139,7 +140,7 @@ contract AccountingService is
         restricted()
     {
         _checkNftType(distributorNftId, DISTRIBUTOR());
-        _changeTargetBalance(DECREASE, instanceStore, distributorNftId, amount, feeAmount);
+        _changeTargetBalance(DECREASE, instanceStore, distributorNftId, DISTRIBUTOR(), amount, feeAmount);
     }
 
     function increasePoolBalance(
@@ -153,7 +154,7 @@ contract AccountingService is
         restricted()
     {
         _checkNftType(poolNftId, POOL());
-        _changeTargetBalance(INCREASE, instanceStore, poolNftId, amount, feeAmount);
+        _changeTargetBalance(INCREASE, instanceStore, poolNftId, POOL(), amount, feeAmount);
     }
 
     function decreasePoolBalance(
@@ -167,7 +168,7 @@ contract AccountingService is
         restricted()
     {
         _checkNftType(poolNftId, POOL());
-        _changeTargetBalance(DECREASE, instanceStore, poolNftId, amount, feeAmount);
+        _changeTargetBalance(DECREASE, instanceStore, poolNftId, POOL(), amount, feeAmount);
     }
 
     function increaseBundleBalance(
@@ -181,7 +182,7 @@ contract AccountingService is
         restricted()
     {
         _checkNftType(bundleNftId, BUNDLE());
-        _changeTargetBalance(INCREASE, instanceStore, bundleNftId, amount, feeAmount);
+        _changeTargetBalance(INCREASE, instanceStore, bundleNftId, BUNDLE(), amount, feeAmount);
     }
 
     function decreaseBundleBalance(
@@ -195,7 +196,7 @@ contract AccountingService is
         restricted()
     {
         _checkNftType(bundleNftId, BUNDLE());
-        _changeTargetBalance(DECREASE, instanceStore, bundleNftId, amount, feeAmount);
+        _changeTargetBalance(DECREASE, instanceStore, bundleNftId, BUNDLE(), amount, feeAmount);
     }
 
     function increaseBundleBalanceForPool(
@@ -209,7 +210,7 @@ contract AccountingService is
         restricted()
     {
         _checkNftType(bundleNftId, BUNDLE());
-        _changeTargetBalance(INCREASE, instanceStore, bundleNftId, amount, feeAmount);
+        _changeTargetBalance(INCREASE, instanceStore, bundleNftId, BUNDLE(), amount, feeAmount);
     }
 
     function decreaseBundleBalanceForPool(
@@ -223,7 +224,7 @@ contract AccountingService is
         restricted()
     {
         _checkNftType(bundleNftId, BUNDLE());
-        _changeTargetBalance(DECREASE, instanceStore, bundleNftId, amount, feeAmount);
+        _changeTargetBalance(DECREASE, instanceStore, bundleNftId, BUNDLE(), amount, feeAmount);
     }
 
 
@@ -233,6 +234,7 @@ contract AccountingService is
         bool increase,
         InstanceStore instanceStore, 
         NftId targetNftId, 
+        ObjectType objectType,
         Amount amount, 
         Amount feeAmount
     )
@@ -248,21 +250,8 @@ contract AccountingService is
             if(totalAmount.gtz()) { instanceStore.decreaseBalance(targetNftId, totalAmount); }
             if(feeAmount.gtz()) { instanceStore.decreaseFees(targetNftId, feeAmount); }
         }
-    }
-
 
-    function _logUpdateFee(NftId productNftId, string memory name, Fee memory feeBefore, Fee memory feeAfter)
-        internal
-        virtual
-    {
-        emit LogAccountingServiceUpdateFee(
-            productNftId, 
-            name,
-            feeBefore.fractionalFee,
-            feeBefore.fixedFee,
-            feeAfter.fractionalFee,
-            feeAfter.fixedFee
-        );
+        emit LogAccountingServiceBalanceChanged(targetNftId, amount, feeAmount, increase, objectType);
     }
 
     function _getDomain() internal pure virtual override returns(ObjectType) {

package/contracts/accounting/AccountingServiceManager.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.20;
 
 import {AccountingService} from "./AccountingService.sol";
-import {IUpgradeable} from "../upgradeability/IUpgradeable.sol";
+import {IVersionable} from "../upgradeability/IVersionable.sol";
 import {ProxyManager} from "../upgradeability/ProxyManager.sol";
 
 contract AccountingServiceManager is ProxyManager {
@@ -12,17 +12,19 @@ contract AccountingServiceManager is ProxyManager {
     /// @dev initializes proxy manager with service implementation 
     constructor(
         address authority, 
+        address registry,
         bytes32 salt
     )
     {
         AccountingService svc = new AccountingService();
-        bytes memory data = abi.encode(authority);
-        IUpgradeable upgradeable = initialize(
+        bytes memory data = abi.encode(authority, registry);
+        IVersionable versionable = initialize(
+            registry,
             address(svc), 
             data,
             salt);
 
-        _accountingService = AccountingService(address(upgradeable));
+        _accountingService = AccountingService(address(versionable));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/accounting/IAccountingService.sol

@@ -6,20 +6,19 @@ import {Amount} from "../type/Amount.sol";
 import {InstanceStore} from "../instance/InstanceStore.sol";
 import {IService} from "../shared/IService.sol";
 import {NftId} from "../type/NftId.sol";
-import {UFixed} from "../type/UFixed.sol";
+import {ObjectType} from "../type/ObjectType.sol";
 
 /// @dev component base class
 /// component examples are staking, product, distribution, pool and oracle
 interface IAccountingService is 
     IService
 {
-    event LogAccountingServiceUpdateFee(
-        NftId nftId, 
-        string feeName, 
-        UFixed previousFractionalFee, 
-        Amount previousFixedFee,
-        UFixed newFractionalFee, 
-        Amount newFixedFee
+    event LogAccountingServiceBalanceChanged(
+        NftId indexed nftId,
+        Amount indexed amount,
+        Amount indexed feeAmount,
+        bool increase,
+        ObjectType objectType
     );
 
     function decreaseComponentFees(InstanceStore instanceStore, NftId componentNftId, Amount feeAmount) external;

package/contracts/authorization/AccessAdmin.sol

@@ -7,20 +7,20 @@ import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet
 import {IAccess} from "./IAccess.sol";
 import {IAccessAdmin} from "./IAccessAdmin.sol";
 import {IAuthorization} from "./IAuthorization.sol";
+import {IRegistry} from "../registry/IRegistry.sol";
 import {IServiceAuthorization} from "./IServiceAuthorization.sol";
 
 import {AccessAdminLib} from "./AccessAdminLib.sol";
 import {AccessManagerCloneable} from "./AccessManagerCloneable.sol";
 import {Blocknumber, BlocknumberLib} from "../type/Blocknumber.sol";
 import {ContractLib} from "../shared/ContractLib.sol";
-import {NftId} from "../type/NftId.sol";
+import {NftId, NftIdLib} from "../type/NftId.sol";
 import {ObjectType} from "../type/ObjectType.sol";
 import {RoleId, RoleIdLib, ADMIN_ROLE, PUBLIC_ROLE} from "../type/RoleId.sol";
-import {RegistryLinked} from "../shared/RegistryLinked.sol";
 import {Selector, SelectorSetLib} from "../type/Selector.sol";
 import {Str, StrLib} from "../type/String.sol";
 import {TimestampLib} from "../type/Timestamp.sol";
-import {VersionPartLib, VersionPart} from "../type/Version.sol";
+import {VersionPart} from "../type/Version.sol";
 
 
 /**
@@ -30,7 +30,6 @@ import {VersionPartLib, VersionPart} from "../type/Version.sol";
  */ 
 contract AccessAdmin is
     AccessManagedUpgradeable,
-    RegistryLinked,
     IAccessAdmin
 {
     using EnumerableSet for EnumerableSet.AddressSet;
@@ -92,16 +91,12 @@ contract AccessAdmin is
     /// Internally initializes access manager with this admin and creates basic role setup.
     function initialize(
         address authority,
-        string memory adminName,
-        VersionPart release 
+        string memory adminName 
     )
         public
+        initializer()
     {
-        if(_getInitializedVersion() != 0) {
-            revert InvalidInitialization();
-        }
-
-        __AccessAdmin_init(authority, adminName, release);
+        __AccessAdmin_init(authority, adminName);
     }
 
 
@@ -111,16 +106,14 @@ contract AccessAdmin is
     /// - this function as well as any completeSetup functions MUST be called in the same tx.
     function __AccessAdmin_init(
         address authority, 
-        string memory adminName,
-        VersionPart release
+        string memory adminName 
     )
         internal
-        reinitializer(release.toInt())
+        onlyInitializing()
     {
         AccessAdminLib.checkInitParameters(authority, adminName);
-
         _authority = AccessManagerCloneable(authority);
-        _authority.initialize(address(this), release);
+        _authority.initialize(address(this));
 
         // delayed additional check for authority after its initialization
         if (!ContractLib.isAuthority(authority)) {
@@ -128,7 +121,7 @@ contract AccessAdmin is
         }
 
         // effects
-        // set and initialize this contract as
+        // set and initialize this access manager contract as
         // the admin (ADMIN_ROLE) of the provided authority
         __AccessManaged_init(authority);
 
@@ -136,7 +129,7 @@ contract AccessAdmin is
         _adminName = adminName;
 
         // set initial linked NFT ID to zero
-        //_linkedNftId = NftIdLib.zero();
+        _linkedNftId = NftIdLib.zero();
 
         // setup admin role
         _createRoleUnchecked(
@@ -156,7 +149,12 @@ contract AccessAdmin is
     //--- view functions for access admin ---------------------------------------//
 
     function getRelease() public view virtual returns (VersionPart release) {
-        return VersionPartLib.toVersionPart(uint8(_getInitializedVersion()));
+        return _authority.getRelease();
+    }
+
+
+    function getRegistry() public view returns (IRegistry registry) {
+        return _authority.getRegistry();
     }
 
 
@@ -300,12 +298,11 @@ contract AccessAdmin is
     //--- internal/private functions -------------------------------------------------//
 
     function _linkToNftOwnable(address registerable) internal {
-        NftId nftId = _getRegistry().getNftIdForAddress(registerable);
-        if (nftId.eqz()) {
+        if (!getRegistry().isRegistered(registerable)) {
             revert ErrorAccessAdminNotRegistered(registerable);
         }
 
-        _linkedNftId = nftId;
+        _linkedNftId = getRegistry().getNftIdForAddress(registerable);
     }
 
 
@@ -370,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);
     }
 
 
@@ -390,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);
     }
 
 
@@ -421,9 +418,9 @@ contract AccessAdmin is
             0);
         
         emit LogAccessAdminRoleGranted(
-            _adminName, 
             account, 
-            AccessAdminLib.getRoleName(this, roleId));
+            AccessAdminLib.getRoleName(this, roleId),
+            _adminName);
     }
 
 
@@ -444,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);
     }
 
 
@@ -560,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);
     }
 
 
@@ -574,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);
     }
 
 
@@ -655,30 +652,11 @@ contract AccessAdmin is
 
         // logging
         emit LogAccessAdminFunctionGranted(
-            _adminName, 
             target, 
+            selector,
+            roleId,
             AccessAdminLib.toFunctionGrantingString(this, func.name, roleId),
+            _adminName, 
             lastUpdateIn);
     }
-
-
-    // TODO cleanup
-    // function _checkAuthorization( 
-    //     address authorization,
-    //     ObjectType expectedDomain, 
-    //     VersionPart expectedRelease,
-    //     bool expectServiceAuthorization,
-    //     bool checkAlreadyInitialized
-    // )
-    //     internal
-    //     view
-    // {
-    //     AccessAdminLib.checkAuthorization(
-    //         _authorization, 
-    //         authorization, 
-    //         expectedDomain, 
-    //         expectedRelease, 
-    //         expectServiceAuthorization,
-    //         checkAlreadyInitialized);
-    // }
 }

package/contracts/authorization/AccessAdminLib.sol

@@ -336,9 +336,9 @@ library AccessAdminLib { // ACCESS_ADMIN_LIB
         view
         returns (IAuthorization componentAuthorization)
     {
-        VersionPart expecteRelease = accessAdmin.getRelease();
-        checkIsRegistered(componentAddress, expectedType, expecteRelease);
+        checkIsRegistered(address(accessAdmin.getRegistry()), componentAddress, expectedType);
 
+        VersionPart expecteRelease = accessAdmin.getRelease();
         IAuthorizedComponent component = IAuthorizedComponent(componentAddress);
         componentAuthorization = component.getAuthorization();
 
@@ -436,25 +436,22 @@ library AccessAdminLib { // ACCESS_ADMIN_LIB
 
 
     function checkIsRegistered( 
+        address registry,
         address target,
-        ObjectType expectedType,
-        VersionPart expectedRelease
+        ObjectType expectedType
     )
         public
         view 
     {
-        IRegistry.ObjectInfo memory info = ContractLib.getRegistry().getObjectInfo(target);
+        checkRegistry(registry);
 
-        if (info.objectType.eqz()) {
+        ObjectType tagetType = IRegistry(registry).getObjectInfo(target).objectType;
+        if (tagetType.eqz()) {
             revert IAccessAdmin.ErrorAccessAdminNotRegistered(target);
         }
 
-        if (info.objectType != expectedType) {
-            revert IAccessAdmin.ErrorAccessAdminTargetTypeMismatch(target, expectedType, info.objectType);
-        }
-
-        if (info.release != expectedRelease) {
-            revert IAccessAdmin.ErrorAccessAdminTargetReleaseMismatch(target, expectedRelease, info.release);
+        if (tagetType != expectedType) {
+            revert IAccessAdmin.ErrorAccessAdminTargetTypeMismatch(target, expectedType, tagetType);
         }
     }