@etherisc/gif-next 0.0.2-e37834a-021 → 0.0.2-e46206a-486

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (257) hide show
  1. package/README.md +104 -1
  2. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +1 -1
  3. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +90 -2
  4. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
  5. package/artifacts/contracts/components/Distribution.sol/Distribution.json +118 -6
  6. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +1 -1
  7. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +80 -3
  8. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  9. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  10. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  11. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  12. package/artifacts/contracts/components/Pool.sol/Pool.json +120 -6
  13. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  14. package/artifacts/contracts/components/Product.sol/Product.json +118 -6
  15. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.dbg.json +4 -0
  16. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.json +66 -0
  17. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.dbg.json +4 -0
  18. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.json +24 -0
  19. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.dbg.json +4 -0
  20. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.json +42 -0
  21. package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +1 -1
  22. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +1 -1
  23. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +1 -1
  24. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +1 -1
  25. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +1 -1
  26. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +1 -1
  27. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +1 -1
  28. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +1 -1
  29. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +1 -1
  30. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +1 -1
  31. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +1 -1
  32. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +2 -2
  33. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +1 -1
  34. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +1 -1
  35. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +1 -1
  36. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +2 -2
  37. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +1 -1
  38. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +2 -2
  39. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
  40. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
  41. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  42. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +54 -286
  43. package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.dbg.json +1 -1
  44. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  45. package/artifacts/contracts/instance/Instance.sol/Instance.json +171 -396
  46. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +1 -1
  47. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.json +90 -2
  48. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +1 -1
  49. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  50. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  51. package/artifacts/contracts/instance/base/IService.sol/IService.dbg.json +1 -1
  52. package/artifacts/contracts/instance/base/IService.sol/IService.json +80 -3
  53. package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.dbg.json +1 -1
  54. package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.json +90 -2
  55. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  56. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +22 -14
  57. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  58. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +2 -2
  59. package/artifacts/contracts/instance/base/ModuleBase.sol/ModuleBase.dbg.json +1 -1
  60. package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.dbg.json +1 -1
  61. package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.json +90 -2
  62. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.dbg.json +1 -1
  63. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundle.dbg.json +1 -1
  64. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.dbg.json +1 -1
  65. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.dbg.json +1 -1
  66. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.dbg.json +1 -1
  67. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.dbg.json +1 -1
  68. package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.dbg.json +1 -1
  69. package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.json +2 -2
  70. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistribution.dbg.json +1 -1
  71. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistributionModule.dbg.json +1 -1
  72. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicy.dbg.json +1 -1
  73. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.dbg.json +1 -1
  74. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.json +0 -13
  75. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.dbg.json +1 -1
  76. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.json +0 -13
  77. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.dbg.json +1 -1
  78. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.dbg.json +1 -1
  79. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.dbg.json +1 -1
  80. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRisk.dbg.json +1 -1
  81. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.dbg.json +1 -1
  82. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.dbg.json +1 -1
  83. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.json +2 -2
  84. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasury.dbg.json +1 -1
  85. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.dbg.json +1 -1
  86. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  87. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.json +2 -2
  88. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +1 -1
  89. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +1 -1
  90. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +194 -41
  91. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
  92. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +136 -16
  93. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +1 -1
  94. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.json +81 -4
  95. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  96. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +80 -3
  97. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
  98. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +80 -3
  99. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
  100. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +80 -3
  101. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
  102. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +138 -18
  103. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
  104. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +154 -42
  105. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  106. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +47 -2
  107. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  108. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +42 -156
  109. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  110. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +214 -10
  111. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  112. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  113. package/artifacts/contracts/registry/Registry.sol/Registry.json +62 -184
  114. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  115. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +410 -34
  116. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  117. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +86 -42
  118. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +1 -1
  119. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  120. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +2 -2
  121. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +4 -0
  122. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +127 -0
  123. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  124. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +80 -3
  125. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  126. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  127. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +32 -6
  128. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  129. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +21 -16
  130. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  131. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +120 -6
  132. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  133. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +2 -2
  134. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  135. package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.dbg.json +1 -1
  136. package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.json +118 -6
  137. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
  138. package/artifacts/contracts/test/TestFee.sol/TestFee.json +4 -4
  139. package/artifacts/contracts/test/TestPool.sol/TestPool.dbg.json +1 -1
  140. package/artifacts/contracts/test/TestPool.sol/TestPool.json +120 -6
  141. package/artifacts/contracts/test/TestProduct.sol/TestProduct.dbg.json +1 -1
  142. package/artifacts/contracts/test/TestProduct.sol/TestProduct.json +120 -8
  143. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
  144. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +120 -6
  145. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
  146. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +14 -14
  147. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
  148. package/artifacts/contracts/test/TestService.sol/TestService.json +142 -14
  149. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
  150. package/artifacts/contracts/test/TestToken.sol/TestUsdc.json +91 -53
  151. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
  152. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
  153. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +18 -2
  154. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
  155. package/artifacts/contracts/test/Usdc.sol/USDC.json +91 -53
  156. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  157. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  158. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  159. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +4 -0
  160. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.json +104 -0
  161. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
  162. package/artifacts/contracts/types/Fee.sol/FeeLib.json +4 -4
  163. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
  164. package/artifacts/contracts/types/Key32.sol/Key32Lib.json +31 -17
  165. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  166. package/artifacts/contracts/types/NftId.sol/NftIdLib.json +2 -2
  167. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  168. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +2 -2
  169. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +4 -0
  170. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.json +100 -0
  171. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  172. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +2 -2
  173. package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +4 -0
  174. package/artifacts/contracts/types/Referral.sol/ReferralLib.json +123 -0
  175. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +1 -1
  176. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +2 -2
  177. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
  178. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +134 -8
  179. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
  180. package/artifacts/contracts/types/StateId.sol/StateIdLib.json +2 -2
  181. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
  182. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +15 -2
  183. package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +4 -0
  184. package/artifacts/contracts/types/UFixed.sol/MathLib.json +10 -0
  185. package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +4 -0
  186. package/artifacts/contracts/types/UFixed.sol/{UFixedMathLib.json → UFixedLib.json} +3 -3
  187. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
  188. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
  189. package/contracts/components/BaseComponent.sol +1 -1
  190. package/contracts/components/Distribution.sol +1 -1
  191. package/contracts/components/IBaseComponent.sol +1 -1
  192. package/contracts/components/IDistributionComponent.sol +1 -1
  193. package/contracts/components/IProductComponent.sol +1 -1
  194. package/contracts/components/Product.sol +2 -2
  195. package/contracts/experiment/cloning/Cloner.sol +47 -0
  196. package/contracts/instance/IInstance.sol +4 -6
  197. package/contracts/instance/Instance.sol +4 -6
  198. package/contracts/instance/base/KeyValueStore.sol +3 -2
  199. package/contracts/instance/base/ModuleBase.sol +1 -1
  200. package/contracts/instance/base/ServiceBase.sol +1 -0
  201. package/contracts/instance/module/bundle/BundleModule.sol +2 -2
  202. package/contracts/instance/module/component/ComponentModule.sol +1 -1
  203. package/contracts/instance/module/component/IComponent.sol +1 -1
  204. package/contracts/instance/module/policy/IPolicy.sol +2 -2
  205. package/contracts/instance/module/policy/PolicyModule.sol +2 -2
  206. package/contracts/instance/module/treasury/ITreasury.sol +1 -1
  207. package/contracts/instance/module/treasury/TokenHandler.sol +1 -1
  208. package/contracts/instance/module/treasury/TreasuryModule.sol +4 -4
  209. package/contracts/instance/service/ComponentOwnerService.sol +73 -30
  210. package/contracts/instance/service/IProductService.sol +1 -1
  211. package/contracts/instance/service/ProductService.sol +3 -3
  212. package/contracts/registry/ChainNft.sol +40 -25
  213. package/contracts/registry/IRegistry.sol +9 -25
  214. package/contracts/registry/IRegistryService.sol +9 -3
  215. package/contracts/registry/Registry.sol +90 -157
  216. package/contracts/registry/RegistryService.sol +167 -101
  217. package/contracts/registry/RegistryServiceManager.sol +22 -10
  218. package/contracts/shared/ERC165.sol +1 -1
  219. package/contracts/shared/INftOwnable.sol +22 -0
  220. package/contracts/shared/IRegisterable.sol +3 -8
  221. package/contracts/shared/NftOwnable.sol +83 -34
  222. package/contracts/shared/ProxyManager.sol +3 -12
  223. package/contracts/shared/Registerable.sol +14 -42
  224. package/contracts/shared/UpgradableProxyWithAdmin.sol +2 -2
  225. package/contracts/shared/Versionable.sol +3 -3
  226. package/contracts/test/TestFee.sol +2 -2
  227. package/contracts/test/TestProduct.sol +2 -2
  228. package/contracts/test/TestRoleId.sol +1 -1
  229. package/contracts/types/DistributorType.sol +55 -0
  230. package/contracts/types/Fee.sol +3 -3
  231. package/contracts/types/Key32.sol +8 -3
  232. package/contracts/types/NumberId.sol +52 -0
  233. package/contracts/types/ObjectType.sol +35 -14
  234. package/contracts/types/Referral.sol +85 -0
  235. package/contracts/types/RoleId.sol +53 -9
  236. package/contracts/types/StateId.sol +1 -1
  237. package/contracts/types/Timestamp.sol +7 -3
  238. package/contracts/types/UFixed.sol +128 -12
  239. package/package.json +4 -3
  240. package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.dbg.json +0 -4
  241. package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.json +0 -333
  242. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccess.dbg.json +0 -4
  243. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccess.json +0 -10
  244. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.dbg.json +0 -4
  245. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.json +0 -333
  246. package/artifacts/contracts/registry/IChainNft.sol/IChainNft.dbg.json +0 -4
  247. package/artifacts/contracts/registry/IChainNft.sol/IChainNft.json +0 -457
  248. package/artifacts/contracts/shared/IOwnable.sol/IOwnable.dbg.json +0 -4
  249. package/artifacts/contracts/shared/IOwnable.sol/IOwnable.json +0 -24
  250. package/artifacts/contracts/types/ReferralId.sol/ReferralIdLib.dbg.json +0 -4
  251. package/artifacts/contracts/types/ReferralId.sol/ReferralIdLib.json +0 -99
  252. package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.dbg.json +0 -4
  253. package/contracts/instance/module/access/Access.sol +0 -149
  254. package/contracts/instance/module/access/IAccess.sol +0 -53
  255. package/contracts/registry/IChainNft.sol +0 -22
  256. package/contracts/shared/IOwnable.sol +0 -6
  257. package/contracts/types/ReferralId.sol +0 -48
@@ -1,31 +1,23 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- import {IOwnable} from "./IOwnable.sol";
4
+ import {INftOwnable} from "./INftOwnable.sol";
5
5
  import {IRegistry} from "../registry/IRegistry.sol";
6
6
  import {NftId, zeroNftId} from "../types/NftId.sol";
7
7
 
8
- contract NftOwnable is
9
- IOwnable
10
- {
11
- error ErrorNftOwnableUnauthorized(address account);
12
-
13
- error ErrorAlreadyInitialized(address registry, NftId nftId);
14
- error ErrorRegistryAlreadyInitialized(address registry);
15
- error ErrorRegistryNotInitialized();
16
- error ErrorRegistryAddressZero();
17
- error ErrorContractNotRegistered(address contractAddress);
8
+ contract NftOwnable is INftOwnable {
18
9
 
19
10
  IRegistry internal _registry;
20
11
  NftId private _nftId;
21
12
  address private _initialOwner;
22
13
 
14
+ /// @dev enforces msg.sender is owner of nft (or initial owner of nft ownable)
23
15
  modifier onlyOwner() {
24
16
  address owner = getOwner();
25
17
 
26
18
  // owner == address(0) is eg uninitialized upgradable contract
27
19
  if (owner != address(0) && msg.sender != owner) {
28
- revert ErrorNftOwnableUnauthorized(msg.sender);
20
+ revert ErrorNotOwner(msg.sender);
29
21
  }
30
22
  _;
31
23
  }
@@ -34,54 +26,111 @@ contract NftOwnable is
34
26
  _initialOwner = msg.sender;
35
27
  }
36
28
 
37
- // function only needed during bootstrapping on a new chain
38
- function linkToRegistry(
39
- address registryAddress,
40
- address contractAddress
41
- )
42
- internal
43
- onlyOwner()
44
- returns (NftId)
45
- {
29
+ /// @dev links this contract to nft after registration
30
+ // needs to be done once per registered contract and
31
+ // reduces registry calls to check ownership
32
+ // does not need any protection as function can only do the "right thing"
33
+ function linkToRegisteredNftId() public {
46
34
  if (_nftId.gtz()) {
47
- revert ErrorAlreadyInitialized(address(_registry), _nftId);
35
+ revert ErrorAlreadyLinked(address(_registry), _nftId);
48
36
  }
49
37
 
50
- if (address(_registry) != address(0)) {
51
- revert ErrorRegistryAlreadyInitialized(address(_registry));
38
+ if (address(_registry) == address(0)) {
39
+ revert ErrorRegistryNotInitialized();
52
40
  }
53
41
 
54
- if (registryAddress == address(0)) {
55
- revert ErrorRegistryAddressZero();
56
- }
57
-
58
- _registry = IRegistry(registryAddress);
42
+ address contractAddress = address(this);
59
43
 
60
44
  if (!_registry.isRegistered(contractAddress)) {
61
45
  revert ErrorContractNotRegistered(contractAddress);
62
46
  }
63
47
 
64
48
  _nftId = _registry.getNftId(contractAddress);
65
-
66
- return _nftId;
67
49
  }
68
50
 
69
51
 
70
- function getRegistry() external view returns (IRegistry) {
52
+ function getRegistry() public view virtual override returns (IRegistry) {
71
53
  return _registry;
72
54
  }
73
55
 
74
56
 
75
- function getNftId() external view returns (NftId) {
57
+ function getNftId() public view virtual override returns (NftId) {
76
58
  return _nftId;
77
59
  }
78
60
 
79
61
 
80
- function getOwner() public view returns (address) {
62
+ function getOwner() public view virtual override returns (address) {
81
63
  if (_nftId.gtz()) {
82
64
  return _registry.ownerOf(_nftId);
83
65
  }
84
66
 
85
67
  return _initialOwner;
86
68
  }
69
+
70
+
71
+ /// @dev initialization for upgradable contracts
72
+ // used in _initializeRegisterable
73
+ function _initializeNftOwnable(
74
+ address initialOwner,
75
+ address registryAddress
76
+ )
77
+ internal
78
+ virtual
79
+ {
80
+ _initialOwner = initialOwner;
81
+ _setRegistry(registryAddress);
82
+ }
83
+
84
+
85
+ /// @dev used in constructor of registry service manager
86
+ // links ownership of registry service manager ot nft owner of registry service
87
+ function _linkToNftOwnable(
88
+ address registryAddress,
89
+ address nftOwnableAddress
90
+ )
91
+ internal
92
+ onlyOwner()
93
+ returns (NftId)
94
+ {
95
+ if (_nftId.gtz()) {
96
+ revert ErrorAlreadyLinked(address(_registry), _nftId);
97
+ }
98
+
99
+ _setRegistry(registryAddress);
100
+
101
+ if (!_registry.isRegistered(nftOwnableAddress)) {
102
+ revert ErrorContractNotRegistered(nftOwnableAddress);
103
+ }
104
+
105
+ _nftId = _registry.getNftId(nftOwnableAddress);
106
+
107
+ return _nftId;
108
+ }
109
+
110
+
111
+ function _setRegistry(address registryAddress)
112
+ private
113
+ {
114
+ if (address(_registry) != address(0)) {
115
+ revert ErrorRegistryAlreadyInitialized(address(_registry));
116
+ }
117
+
118
+ if (registryAddress == address(0)) {
119
+ revert ErrorRegistryAddressZero();
120
+ }
121
+
122
+ if (registryAddress.code.length == 0) {
123
+ revert ErrorNotRegistry(registryAddress);
124
+ }
125
+
126
+ _registry = IRegistry(registryAddress);
127
+
128
+ try _registry.supportsInterface(type(IRegistry).interfaceId) returns (bool isRegistry) {
129
+ if (!isRegistry) {
130
+ revert ErrorNotRegistry(registryAddress);
131
+ }
132
+ } catch {
133
+ revert ErrorNotRegistry(registryAddress);
134
+ }
135
+ }
87
136
  }
@@ -1,9 +1,9 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- import {Ownable} from "@openzeppelin5/contracts/access/Ownable.sol";
5
- import {ProxyAdmin} from "@openzeppelin5/contracts/proxy/transparent/ProxyAdmin.sol";
6
- import {ITransparentUpgradeableProxy} from "@openzeppelin5/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
4
+ import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
5
+ import {ProxyAdmin} from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
6
+ import {ITransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
7
7
 
8
8
  import {IVersionable} from "./IVersionable.sol";
9
9
  import {NftOwnable} from "./NftOwnable.sol";
@@ -55,15 +55,6 @@ contract ProxyManager is
55
55
  emit LogProxyDeployed(address(_proxy), initialImplementation);
56
56
  }
57
57
 
58
- function linkToRegistry(address registryAddress)
59
- public
60
- virtual
61
- {
62
- // links ownership for this proxy manager to the owner of the underlying proxy nft
63
- // applies onlyOwner modifier internally
64
- linkToRegistry(registryAddress, address(_proxy));
65
- }
66
-
67
58
  /// @dev upgrade existing contract
68
59
  function upgrade(address newImplementation, bytes memory upgradeData)
69
60
  public
@@ -1,9 +1,10 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- import {Initializable} from "@openzeppelin5/contracts/proxy/utils/Initializable.sol";
4
+ import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
5
5
 
6
6
  import {NftId, zeroNftId} from "../types/NftId.sol";
7
+ import {NftOwnable} from "../shared/NftOwnable.sol";
7
8
  import {ObjectType} from "../types/ObjectType.sol";
8
9
 
9
10
  import {IRegistry} from "../registry/IRegistry.sol";
@@ -12,18 +13,19 @@ import {Versionable} from "./Versionable.sol";
12
13
 
13
14
  import {ERC165} from "./ERC165.sol";
14
15
 
15
- abstract contract Registerable is
16
+ contract Registerable is
16
17
  ERC165,
17
- IRegisterable,
18
- Initializable
18
+ Initializable,
19
+ NftOwnable,
20
+ IRegisterable
19
21
  {
20
22
  // keccak256(abi.encode(uint256(keccak256("gif-next.contracts.shared.Registerable.sol")) - 1)) & ~bytes32(uint256(0xff));
21
23
  bytes32 public constant REGISTERABLE_LOCATION_V1 = 0x6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa300;
22
24
 
25
+ error ErrorRegisterableNotRegistry(address registryAddress);
26
+
23
27
  struct RegisterableStorage {
24
- IRegistry _registry;
25
28
  NftId _parentNftId;
26
- address _initialOwner;
27
29
  ObjectType _objectType;
28
30
  bool _isInterceptor;
29
31
  bytes _data;
@@ -35,14 +37,6 @@ abstract contract Registerable is
35
37
  }
36
38
  }
37
39
 
38
- modifier onlyOwner() virtual {
39
- require(
40
- msg.sender == getOwner(),
41
- "ERROR:RGB-001:NOT_OWNER"
42
- );
43
- _;
44
- }
45
-
46
40
  function _initializeRegisterable(
47
41
  address registryAddress,
48
42
  NftId parentNftId,
@@ -55,44 +49,22 @@ abstract contract Registerable is
55
49
  //onlyInitializing//TODO uncomment when "fully" upgradeable
56
50
  virtual
57
51
  {
58
- require(
59
- registryAddress != address(0),
60
- "ERROR:RGB-010:REGISTRY_ZERO"
61
- );
52
+ _initializeNftOwnable(
53
+ initialOwner,
54
+ registryAddress);
62
55
 
63
56
  // TODO check parentNftId -> registry.isRegistered(parentNftId)
64
57
  // TODO check object-parent type pair -> registry.isValidTypeCombo() or something...verify with registry that setup will be able to register...
65
58
 
66
- IRegistry registry = IRegistry(registryAddress);
67
- require(
68
- registry.supportsInterface(type(IRegistry).interfaceId),
69
- "ERROR:RGB-011:NOT_REGISTRY"
70
- );
71
-
72
59
  RegisterableStorage storage $ = _getRegisterableStorage();
73
- $._registry = registry;
74
60
  $._parentNftId = parentNftId;
75
61
  $._objectType = objectType;
76
62
  $._isInterceptor = isInterceptor;
77
- $._initialOwner = initialOwner;// not msg.sender because called in proxy constructor where msg.sender is proxy deployer
78
63
  $._data = data;
79
64
 
80
- _registerInterface(type(Registerable).interfaceId);
81
- }
82
-
83
- // from IOwnable
84
- function getOwner() public view virtual returns (address) {
85
- return _getRegisterableStorage()._registry.ownerOf(address(this));
65
+ _registerInterface(type(IRegisterable).interfaceId);
86
66
  }
87
67
 
88
- // from IRegisterable
89
- function getRegistry() public view virtual returns (IRegistry registry) {
90
- return _getRegisterableStorage()._registry;
91
- }
92
-
93
- function getNftId() public view virtual returns (NftId nftId) {
94
- return _getRegisterableStorage()._registry.getNftId(address(this));
95
- }
96
68
 
97
69
  function getInitialInfo()
98
70
  public
@@ -103,12 +75,12 @@ abstract contract Registerable is
103
75
  RegisterableStorage storage $ = _getRegisterableStorage();
104
76
  return (
105
77
  IRegistry.ObjectInfo(
106
- zeroNftId(),
78
+ getNftId(),
107
79
  $._parentNftId,
108
80
  $._objectType,
109
81
  $._isInterceptor,
110
82
  address(this),
111
- $._initialOwner,
83
+ getOwner(),
112
84
  $._data
113
85
  ),
114
86
  bytes("")
@@ -1,8 +1,8 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- import {ProxyAdmin} from "@openzeppelin5/contracts/proxy/transparent/ProxyAdmin.sol";
5
- import {TransparentUpgradeableProxy, ITransparentUpgradeableProxy} from "@openzeppelin5/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
4
+ import {ProxyAdmin} from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
5
+ import {TransparentUpgradeableProxy, ITransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
6
6
 
7
7
  import {IVersionable} from "./IVersionable.sol";
8
8
 
@@ -1,10 +1,10 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- import {Initializable} from "@openzeppelin5/contracts/proxy/utils/Initializable.sol";
4
+ import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
5
5
 
6
6
  import {Blocknumber, blockNumber} from "../types/Blocknumber.sol";
7
- import {Timestamp, blockTimestamp} from "../types/Timestamp.sol";
7
+ import {Timestamp, TimestampLib} from "../types/Timestamp.sol";
8
8
  import {Version, VersionPart, VersionLib} from "../types/Version.sol";
9
9
 
10
10
  import {IVersionable} from "./IVersionable.sol";
@@ -138,7 +138,7 @@ abstract contract Versionable is
138
138
  thisVersion,
139
139
  implementation,
140
140
  activatedBy,
141
- blockTimestamp(),
141
+ TimestampLib.blockTimestamp(),
142
142
  blockNumber()
143
143
  );
144
144
 
@@ -1,7 +1,7 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.19;
3
3
 
4
- import {UFixed, UFixedMathLib} from "../types/UFixed.sol";
4
+ import {UFixed, UFixedLib} from "../types/UFixed.sol";
5
5
  import {Fee, FeeLib} from "../types/Fee.sol";
6
6
 
7
7
  contract TestFee {
@@ -15,7 +15,7 @@ contract TestFee {
15
15
  pure
16
16
  returns(Fee memory fee)
17
17
  {
18
- return FeeLib.toFee(UFixedMathLib.toUFixed(fractionalValue, exponent), fixedValue);
18
+ return FeeLib.toFee(UFixedLib.toUFixed(fractionalValue, exponent), fixedValue);
19
19
  }
20
20
 
21
21
  function getZeroFee() external pure returns(Fee memory fee) {
@@ -3,9 +3,9 @@ pragma solidity ^0.8.19;
3
3
 
4
4
  import {Product} from "../../contracts/components/Product.sol";
5
5
  import {NftId, toNftId} from "../../contracts/types/NftId.sol";
6
- import {ReferralId} from "../types/ReferralId.sol";
6
+ import {ReferralId} from "../types/Referral.sol";
7
7
  import {RiskId} from "../../contracts/types/RiskId.sol";
8
- import {Timestamp, blockTimestamp} from "../../contracts/types/Timestamp.sol";
8
+ import {Timestamp} from "../../contracts/types/Timestamp.sol";
9
9
  import {Fee} from "../../contracts/types/Fee.sol";
10
10
 
11
11
  contract TestProduct is Product {
@@ -4,7 +4,7 @@ pragma solidity ^0.8.19;
4
4
  import {RoleId, RoleIdLib, PRODUCT_OWNER_ROLE_NAME, PRODUCT_OWNER_ROLE, POOL_OWNER_ROLE_NAME, POOL_OWNER_ROLE} from "../../contracts/types/RoleId.sol";
5
5
 
6
6
  contract TestRoleId {
7
- function getRole(string memory roleName) external pure returns (RoleId) { return RoleIdLib.toRoleId(roleName); }
7
+ function getRole(uint256 roleNum) external pure returns (RoleId) { return RoleIdLib.toRoleId(roleNum); }
8
8
 
9
9
  function getProductOwnerRoleName() external pure returns (string memory) { return PRODUCT_OWNER_ROLE_NAME(); }
10
10
  function getProductOwnerRole() external pure returns (RoleId) { return PRODUCT_OWNER_ROLE(); }
@@ -0,0 +1,55 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.20;
3
+
4
+ import {Key32, KeyId, Key32Lib} from "./Key32.sol";
5
+ import {NftId} from "./NftId.sol";
6
+ import {DISTRIBUTION_TYPE} from "./ObjectType.sol";
7
+
8
+ type DistributorType is bytes8;
9
+
10
+ // type bindings
11
+ using {
12
+ eqDistributorType as ==,
13
+ neDistributorType as !=,
14
+ DistributorTypeLib.toKey32
15
+ } for DistributorType global;
16
+
17
+ // general pure free functions
18
+
19
+ // pure free functions for operators
20
+ function eqDistributorType(
21
+ DistributorType a,
22
+ DistributorType b
23
+ ) pure returns (bool isSame) {
24
+ return DistributorType.unwrap(a) == DistributorType.unwrap(b);
25
+ }
26
+
27
+ function neDistributorType(
28
+ DistributorType a,
29
+ DistributorType b
30
+ ) pure returns (bool isDifferent) {
31
+ return DistributorType.unwrap(a) != DistributorType.unwrap(b);
32
+ }
33
+
34
+ // library functions that operate on user defined type
35
+ library DistributorTypeLib {
36
+
37
+ function zero() public pure returns (DistributorType) {
38
+ return DistributorType.wrap(bytes8(0));
39
+ }
40
+
41
+ // @dev Converts a referral string into an id.
42
+ function toDistributorType(NftId distributionNftId, string memory name) public pure returns (DistributorType) {
43
+ return DistributorType.wrap(bytes8(keccak256(abi.encode(distributionNftId, name))));
44
+ }
45
+
46
+ /// @dev Returns the key32 value for the specified nft id and object type.
47
+ function toKey32(DistributorType id) public pure returns (Key32 key) {
48
+ return Key32Lib.toKey32(DISTRIBUTION_TYPE(), toKeyId(id));
49
+ }
50
+
51
+ /// @dev Returns the key id value for the specified nft id
52
+ function toKeyId(DistributorType id) public pure returns (KeyId keyId) {
53
+ return KeyId.wrap(bytes31(DistributorType.unwrap(id)));
54
+ }
55
+ }
@@ -1,7 +1,7 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.19;
3
3
 
4
- import {UFixed, UFixedMathLib} from "./UFixed.sol";
4
+ import {UFixed, UFixedLib} from "./UFixed.sol";
5
5
 
6
6
  struct Fee {
7
7
  UFixed fractionalFee;
@@ -21,7 +21,7 @@ library FeeLib {
21
21
  uint256 netAmount
22
22
  )
23
23
  {
24
- UFixed fractionalAmount = UFixedMathLib.toUFixed(amount) *
24
+ UFixed fractionalAmount = UFixedLib.toUFixed(amount) *
25
25
  fee.fractionalFee;
26
26
  feeAmount = fractionalAmount.toInt() + fee.fixedFee;
27
27
  netAmount = amount - feeAmount;
@@ -37,7 +37,7 @@ library FeeLib {
37
37
 
38
38
  /// @dev Return the percent fee struct (x%, 0)
39
39
  function percentageFee(uint8 percent) public pure returns (Fee memory fee) {
40
- return Fee(UFixedMathLib.toUFixed(percent, -2), 0);
40
+ return Fee(UFixedLib.toUFixed(percent, -2), 0);
41
41
  }
42
42
 
43
43
  /// @dev Return a zero fee struct (0, 0)
@@ -1,5 +1,5 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
- pragma solidity ^0.8.19;
2
+ pragma solidity ^0.8.20;
3
3
 
4
4
  import {ObjectType} from "./ObjectType.sol";
5
5
 
@@ -10,7 +10,8 @@ type KeyId is bytes31;
10
10
  using {
11
11
  eqKey32 as ==,
12
12
  neKey32 as !=,
13
- Key32Lib.toKey
13
+ Key32Lib.toKeyId,
14
+ Key32Lib.toObjectType
14
15
  } for Key32 global;
15
16
 
16
17
  // @dev Returns true iff keys are identical
@@ -37,9 +38,13 @@ library Key32Lib {
37
38
  return Key32.wrap(bytes32(uintKey));
38
39
  }
39
40
 
40
- function toKey(Key32 key) public pure returns (ObjectType objectType, KeyId id) {
41
+ function toObjectType(Key32 key) public pure returns (ObjectType objectType) {
41
42
  bytes32 key32 = Key32.unwrap(key);
42
43
  objectType = ObjectType.wrap(uint8(uint256(key32 & TYPE_MASK) >> TYPE_SHIFT));
44
+ }
45
+
46
+ function toKeyId(Key32 key) public pure returns (KeyId id) {
47
+ bytes32 key32 = Key32.unwrap(key);
43
48
  id = KeyId.wrap(bytes31((key32 & ID_MASK) << ID_SHIFT));
44
49
  }
45
50
  }
@@ -0,0 +1,52 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.20;
3
+
4
+ // uint32 allows for 4'294'967'296 individual items
5
+ type NumberId is uint32;
6
+
7
+ // type bindings
8
+ using {
9
+ eqNumberId as ==,
10
+ neNumberId as !=,
11
+ NumberIdLib.eqz,
12
+ NumberIdLib.gtz,
13
+ NumberIdLib.toInt
14
+ } for NumberId global;
15
+
16
+
17
+ // pure free functions for operators
18
+ function eqNumberId(NumberId a, NumberId b) pure returns (bool isSame) {
19
+ return NumberId.unwrap(a) == NumberId.unwrap(b);
20
+ }
21
+
22
+ function neNumberId(NumberId a, NumberId b) pure returns (bool isDifferent) {
23
+ return NumberId.unwrap(a) != NumberId.unwrap(b);
24
+ }
25
+
26
+ // library functions that operate on user defined type
27
+ library NumberIdLib {
28
+ /// @dev Converts the NumberId to a uint.
29
+ function zero() public pure returns (NumberId) {
30
+ return NumberId.wrap(0);
31
+ }
32
+
33
+ /// @dev Converts an uint into a NumberId.
34
+ function toNumberId(uint256 a) public pure returns (NumberId) {
35
+ return NumberId.wrap(uint32(a));
36
+ }
37
+
38
+ /// @dev Converts the NumberId to a uint.
39
+ function toInt(NumberId a) public pure returns (uint32) {
40
+ return uint32(NumberId.unwrap(a));
41
+ }
42
+
43
+ /// @dev Returns true if the value is non-zero (> 0).
44
+ function gtz(NumberId a) public pure returns (bool) {
45
+ return NumberId.unwrap(a) > 0;
46
+ }
47
+
48
+ /// @dev Returns true if the value is zero (== 0).
49
+ function eqz(NumberId a) public pure returns (bool) {
50
+ return NumberId.unwrap(a) == 0;
51
+ }
52
+ }
@@ -1,5 +1,5 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
- pragma solidity ^0.8.19;
2
+ pragma solidity ^0.8.20;
3
3
 
4
4
  type ObjectType is uint8;
5
5
 
@@ -17,34 +17,47 @@ function PROTOCOL() pure returns (ObjectType) {
17
17
  return toObjectType(10);
18
18
  }
19
19
 
20
- function REGISTRY() pure returns (ObjectType) {
20
+ function ROLE() pure returns (ObjectType) {
21
21
  return toObjectType(20);
22
22
  }
23
23
 
24
- function TOKEN() pure returns (ObjectType) {
24
+ function TARGET() pure returns (ObjectType) {
25
25
  return toObjectType(30);
26
26
  }
27
27
 
28
- function SERVICE() pure returns (ObjectType) {
28
+ function REGISTRY() pure returns (ObjectType) {
29
29
  return toObjectType(40);
30
30
  }
31
31
 
32
- function INSTANCE() pure returns (ObjectType) {
32
+ function TOKEN() pure returns (ObjectType) {
33
33
  return toObjectType(50);
34
34
  }
35
35
 
36
- function STAKE() pure returns (ObjectType) {
36
+ function SERVICE() pure returns (ObjectType) {
37
37
  return toObjectType(60);
38
38
  }
39
39
 
40
+ function INSTANCE() pure returns (ObjectType) {
41
+ return toObjectType(70);
42
+ }
43
+
44
+ function STAKE() pure returns (ObjectType) {
45
+ return toObjectType(80);
46
+ }
47
+
40
48
  function COMPONENT() pure returns (ObjectType) {
41
49
  return toObjectType(100);
42
50
  }
43
51
 
52
+ // TODO replace by PRODUCT_SETUP
44
53
  function TREASURY() pure returns (ObjectType) {
45
54
  return toObjectType(101);
46
55
  }
47
56
 
57
+ function PRODUCT_SETUP() pure returns (ObjectType) {
58
+ return toObjectType(101);
59
+ }
60
+
48
61
  function PRODUCT() pure returns (ObjectType) {
49
62
  return toObjectType(110);
50
63
  }
@@ -53,6 +66,18 @@ function DISTRIBUTION() pure returns (ObjectType) {
53
66
  return toObjectType(120);
54
67
  }
55
68
 
69
+ function DISTRIBUTION_TYPE() pure returns (ObjectType) {
70
+ return toObjectType(121);
71
+ }
72
+
73
+ function DISTRIBUTOR() pure returns (ObjectType) {
74
+ return toObjectType(122);
75
+ }
76
+
77
+ function REFERRAL() pure returns (ObjectType) {
78
+ return toObjectType(123);
79
+ }
80
+
56
81
  function ORACLE() pure returns (ObjectType) {
57
82
  return toObjectType(130);
58
83
  }
@@ -69,20 +94,16 @@ function POLICY() pure returns (ObjectType) {
69
94
  return toObjectType(210);
70
95
  }
71
96
 
72
- function REFERRAL() pure returns (ObjectType) {
73
- return toObjectType(212);
97
+ function BUNDLE() pure returns (ObjectType) {
98
+ return toObjectType(220);
74
99
  }
75
100
 
76
101
  function CLAIM() pure returns (ObjectType) {
77
- return toObjectType(214);
102
+ return toObjectType(211);
78
103
  }
79
104
 
80
105
  function PAYOUT() pure returns (ObjectType) {
81
- return toObjectType(216);
82
- }
83
-
84
- function BUNDLE() pure returns (ObjectType) {
85
- return toObjectType(220);
106
+ return toObjectType(212);
86
107
  }
87
108
 
88
109
  /// @dev Converts the uint8 to a ObjectType.