@etherisc/gif-next 0.0.2-e37834a-021 → 0.0.2-e38b7e6-931

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 (402) hide show
  1. package/README.md +171 -2
  2. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +1 -1
  3. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +282 -2
  4. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
  5. package/artifacts/contracts/components/Distribution.sol/Distribution.json +313 -72
  6. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +1 -1
  7. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +234 -3
  8. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  9. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +0 -25
  10. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  11. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +24 -57
  12. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  13. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +5 -55
  14. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  15. package/artifacts/contracts/components/Pool.sol/Pool.json +378 -127
  16. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  17. package/artifacts/contracts/components/Product.sol/Product.json +391 -107
  18. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.dbg.json +4 -0
  19. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.json +66 -0
  20. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.dbg.json +4 -0
  21. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.json +24 -0
  22. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.dbg.json +4 -0
  23. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.json +42 -0
  24. package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +1 -1
  25. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +1 -1
  26. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +1 -1
  27. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +1 -1
  28. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +1 -1
  29. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +1 -1
  30. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +1 -1
  31. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +1 -1
  32. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +1 -1
  33. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +1 -1
  34. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +1 -1
  35. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +2 -2
  36. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +1 -1
  37. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +1 -1
  38. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +1 -1
  39. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +2 -2
  40. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +1 -1
  41. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +2 -2
  42. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
  43. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
  44. package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +4 -0
  45. package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.json +1206 -0
  46. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +4 -0
  47. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +788 -0
  48. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +4 -0
  49. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.json +185 -0
  50. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  51. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +813 -1184
  52. package/artifacts/contracts/instance/IInstanceBase.sol/IInstanceBase.dbg.json +4 -0
  53. package/artifacts/contracts/instance/IInstanceBase.sol/IInstanceBase.json +448 -0
  54. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +4 -0
  55. package/artifacts/contracts/instance/{base/IService.sol/IService.json → IInstanceService.sol/IInstanceService.json} +244 -18
  56. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  57. package/artifacts/contracts/instance/Instance.sol/Instance.json +1762 -1332
  58. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +4 -0
  59. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +1047 -0
  60. package/artifacts/contracts/instance/InstanceBase.sol/InstanceBase.dbg.json +4 -0
  61. package/artifacts/contracts/instance/InstanceBase.sol/InstanceBase.json +763 -0
  62. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +4 -0
  63. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +1422 -0
  64. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +4 -0
  65. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +963 -0
  66. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +4 -0
  67. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +460 -0
  68. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +4 -0
  69. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +285 -0
  70. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +1 -1
  71. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.json +240 -11
  72. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +1 -1
  73. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +0 -13
  74. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  75. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.json +27 -158
  76. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  77. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  78. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +37 -245
  79. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  80. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +2 -2
  81. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +4 -0
  82. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +254 -0
  83. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +4 -0
  84. package/artifacts/contracts/instance/module/{bundle/IBundle.sol → IBundle.sol}/IBundle.json +1 -1
  85. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +4 -0
  86. package/artifacts/contracts/instance/module/{distribution/IDistribution.sol → IDistribution.sol}/IDistribution.json +1 -1
  87. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +4 -0
  88. package/artifacts/contracts/instance/module/{policy/IPolicy.sol → IPolicy.sol}/IPolicy.json +1 -1
  89. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +4 -0
  90. package/artifacts/contracts/instance/module/{risk/IRisk.sol → IRisk.sol}/IRisk.json +1 -1
  91. package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +4 -0
  92. package/artifacts/contracts/instance/{base/ModuleBase.sol/ModuleBase.json → module/ISetup.sol/ISetup.json} +2 -2
  93. package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +4 -0
  94. package/artifacts/contracts/instance/module/{treasury/ITreasury.sol → ITreasury.sol}/ITreasury.json +1 -1
  95. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +4 -0
  96. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +1121 -0
  97. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +4 -0
  98. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +436 -0
  99. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
  100. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +304 -39
  101. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +4 -0
  102. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +424 -0
  103. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +4 -0
  104. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +720 -0
  105. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  106. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +93 -16
  107. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +4 -0
  108. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +771 -0
  109. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
  110. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +95 -80
  111. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
  112. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +89 -227
  113. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +4 -0
  114. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +1246 -0
  115. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +4 -0
  116. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +492 -0
  117. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
  118. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +287 -111
  119. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +4 -0
  120. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +424 -0
  121. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
  122. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +258 -347
  123. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +4 -0
  124. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +424 -0
  125. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  126. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +47 -2
  127. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  128. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +157 -71
  129. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  130. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +339 -31
  131. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  132. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  133. package/artifacts/contracts/registry/Registry.sol/Registry.json +131 -212
  134. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +4 -0
  135. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +285 -0
  136. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  137. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +382 -72
  138. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  139. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +68 -77
  140. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +4 -0
  141. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +530 -0
  142. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +4 -0
  143. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +397 -0
  144. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +1 -1
  145. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  146. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +2 -2
  147. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +4 -0
  148. package/artifacts/contracts/{instance/module/component/ComponentModule.sol/ComponentModule.json → shared/INftOwnable.sol/INftOwnable.json} +67 -57
  149. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  150. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +80 -3
  151. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +4 -0
  152. package/artifacts/contracts/{instance/service/IComponentOwnerService.sol/IComponentOwnerService.json → shared/IService.sol/IService.json} +90 -58
  153. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  154. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  155. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +32 -6
  156. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  157. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +21 -16
  158. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  159. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +120 -6
  160. package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.dbg.json +4 -0
  161. package/artifacts/contracts/{instance/base/ServiceBase.sol/ServiceBase.json → shared/RegisterableUpgradable.sol/RegisterableUpgradable.json} +92 -30
  162. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +4 -0
  163. package/artifacts/contracts/{instance/base/InstanceBase.sol/InstanceBase.json → shared/Service.sol/Service.json} +100 -88
  164. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +4 -0
  165. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +96 -0
  166. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  167. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +2 -2
  168. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  169. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
  170. package/artifacts/contracts/test/TestFee.sol/TestFee.json +4 -4
  171. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
  172. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +120 -6
  173. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
  174. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +14 -14
  175. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
  176. package/artifacts/contracts/test/TestService.sol/TestService.json +155 -27
  177. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
  178. package/artifacts/contracts/test/TestToken.sol/TestUsdc.json +91 -53
  179. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
  180. package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +2 -2
  181. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
  182. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +18 -2
  183. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
  184. package/artifacts/contracts/test/Usdc.sol/USDC.json +91 -53
  185. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  186. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  187. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  188. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +4 -0
  189. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.json +104 -0
  190. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
  191. package/artifacts/contracts/types/Fee.sol/FeeLib.json +4 -4
  192. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
  193. package/artifacts/contracts/types/Key32.sol/Key32Lib.json +31 -17
  194. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  195. package/artifacts/contracts/types/NftId.sol/NftIdLib.json +2 -2
  196. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  197. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +26 -3
  198. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +4 -0
  199. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.json +100 -0
  200. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  201. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +2 -2
  202. package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +4 -0
  203. package/artifacts/contracts/types/Referral.sol/ReferralLib.json +123 -0
  204. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +1 -1
  205. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +2 -2
  206. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
  207. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +134 -8
  208. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
  209. package/artifacts/contracts/types/StateId.sol/StateIdLib.json +2 -2
  210. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
  211. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +15 -2
  212. package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +4 -0
  213. package/artifacts/contracts/types/UFixed.sol/MathLib.json +10 -0
  214. package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +4 -0
  215. package/artifacts/contracts/types/UFixed.sol/{UFixedMathLib.json → UFixedLib.json} +3 -3
  216. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
  217. package/artifacts/contracts/types/Version.sol/VersionLib.json +2 -2
  218. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
  219. package/artifacts/contracts/types/Version.sol/VersionPartLib.json +22 -3
  220. package/contracts/components/BaseComponent.sol +107 -18
  221. package/contracts/components/Distribution.sol +24 -25
  222. package/contracts/components/IBaseComponent.sol +20 -4
  223. package/contracts/components/IDistributionComponent.sol +2 -4
  224. package/contracts/components/IPoolComponent.sol +5 -3
  225. package/contracts/components/IProductComponent.sol +4 -6
  226. package/contracts/components/Pool.sol +58 -46
  227. package/contracts/components/Product.sol +71 -75
  228. package/contracts/experiment/cloning/Cloner.sol +47 -0
  229. package/contracts/instance/AccessManagerUpgradeableInitializeable.sol +23 -0
  230. package/contracts/instance/BundleManager.sol +129 -0
  231. package/contracts/instance/Cloneable.sol +46 -0
  232. package/contracts/instance/IInstance.sol +54 -48
  233. package/contracts/instance/IInstanceBase.sol +25 -0
  234. package/contracts/instance/IInstanceService.sol +40 -0
  235. package/contracts/instance/Instance.sol +245 -68
  236. package/contracts/instance/InstanceAccessManager.sol +303 -0
  237. package/contracts/instance/InstanceBase.sol +39 -0
  238. package/contracts/instance/InstanceReader.sol +315 -0
  239. package/contracts/instance/InstanceService.sol +345 -0
  240. package/contracts/instance/InstanceServiceManager.sol +54 -0
  241. package/contracts/instance/ObjectManager.sol +101 -0
  242. package/contracts/instance/base/ComponentServiceBase.sol +109 -20
  243. package/contracts/instance/base/IInstanceBase.sol +0 -2
  244. package/contracts/instance/base/IKeyValueStore.sol +13 -14
  245. package/contracts/instance/base/ILifecycle.sol +3 -3
  246. package/contracts/instance/base/KeyValueStore.sol +49 -38
  247. package/contracts/instance/base/Lifecycle.sol +1 -1
  248. package/contracts/instance/module/IAccess.sol +48 -0
  249. package/contracts/instance/module/IBundle.sol +20 -0
  250. package/contracts/instance/module/IDistribution.sol +39 -0
  251. package/contracts/instance/module/IPolicy.sol +45 -0
  252. package/contracts/instance/module/IRisk.sol +11 -0
  253. package/contracts/instance/module/ISetup.sol +46 -0
  254. package/contracts/instance/module/ITreasury.sol +23 -0
  255. package/contracts/instance/service/BundleService.sol +294 -0
  256. package/contracts/instance/service/BundleServiceManager.sol +51 -0
  257. package/contracts/instance/service/DistributionService.sol +79 -18
  258. package/contracts/instance/service/DistributionServiceManager.sol +51 -0
  259. package/contracts/instance/service/IBundleService.sol +44 -0
  260. package/contracts/instance/service/IDistributionService.sol +1 -1
  261. package/contracts/instance/service/IPolicyService.sol +94 -0
  262. package/contracts/instance/service/IPoolService.sol +7 -24
  263. package/contracts/instance/service/IProductService.sol +9 -76
  264. package/contracts/instance/service/PolicyService.sol +539 -0
  265. package/contracts/instance/service/PolicyServiceManager.sol +54 -0
  266. package/contracts/instance/service/PoolService.sol +101 -108
  267. package/contracts/instance/service/PoolServiceManager.sol +51 -0
  268. package/contracts/instance/service/ProductService.sol +130 -431
  269. package/contracts/instance/service/ProductServiceManager.sol +54 -0
  270. package/contracts/registry/ChainNft.sol +41 -26
  271. package/contracts/registry/IRegistry.sol +48 -30
  272. package/contracts/registry/IRegistryService.sol +53 -24
  273. package/contracts/registry/Registry.sol +212 -306
  274. package/contracts/registry/RegistryAccessManager.sol +210 -0
  275. package/contracts/registry/RegistryService.sol +151 -206
  276. package/contracts/registry/RegistryServiceManager.sol +26 -16
  277. package/contracts/registry/ReleaseManager.sol +342 -0
  278. package/contracts/registry/TokenRegistry.sol +110 -0
  279. package/contracts/shared/ERC165.sol +7 -3
  280. package/contracts/shared/INftOwnable.sol +22 -0
  281. package/contracts/shared/IRegisterable.sol +3 -10
  282. package/contracts/shared/IService.sol +16 -0
  283. package/contracts/shared/NftOwnable.sol +85 -38
  284. package/contracts/shared/ProxyManager.sol +4 -13
  285. package/contracts/shared/Registerable.sol +15 -42
  286. package/contracts/shared/RegisterableUpgradable.sol +16 -0
  287. package/contracts/shared/Service.sol +58 -0
  288. package/contracts/shared/TokenHandler.sol +27 -0
  289. package/contracts/shared/UpgradableProxyWithAdmin.sol +2 -2
  290. package/contracts/shared/Versionable.sol +3 -3
  291. package/contracts/test/TestFee.sol +2 -2
  292. package/contracts/test/TestRoleId.sol +1 -1
  293. package/contracts/test/TestService.sol +6 -7
  294. package/contracts/types/DistributorType.sol +55 -0
  295. package/contracts/types/Fee.sol +3 -3
  296. package/contracts/types/Key32.sol +8 -3
  297. package/contracts/types/NftIdSet.sol +26 -24
  298. package/contracts/types/NumberId.sol +52 -0
  299. package/contracts/types/ObjectType.sol +35 -14
  300. package/contracts/types/Referral.sol +85 -0
  301. package/contracts/types/RoleId.sol +61 -9
  302. package/contracts/types/StateId.sol +5 -1
  303. package/contracts/types/Timestamp.sol +7 -3
  304. package/contracts/types/UFixed.sol +128 -12
  305. package/contracts/types/Version.sol +4 -1
  306. package/package.json +4 -3
  307. package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.dbg.json +0 -4
  308. package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.json +0 -24
  309. package/artifacts/contracts/instance/base/IService.sol/IService.dbg.json +0 -4
  310. package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.dbg.json +0 -4
  311. package/artifacts/contracts/instance/base/ModuleBase.sol/ModuleBase.dbg.json +0 -4
  312. package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.dbg.json +0 -4
  313. package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.dbg.json +0 -4
  314. package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.json +0 -333
  315. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccess.dbg.json +0 -4
  316. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccess.json +0 -10
  317. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.dbg.json +0 -4
  318. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.json +0 -333
  319. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.dbg.json +0 -4
  320. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.json +0 -297
  321. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundle.dbg.json +0 -4
  322. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.dbg.json +0 -4
  323. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.json +0 -297
  324. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.dbg.json +0 -4
  325. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.dbg.json +0 -4
  326. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.json +0 -10
  327. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.dbg.json +0 -4
  328. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.json +0 -117
  329. package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.dbg.json +0 -4
  330. package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.json +0 -10
  331. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistribution.dbg.json +0 -4
  332. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistributionModule.dbg.json +0 -4
  333. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistributionModule.json +0 -10
  334. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicy.dbg.json +0 -4
  335. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.dbg.json +0 -4
  336. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.json +0 -284
  337. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.dbg.json +0 -4
  338. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.json +0 -284
  339. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.dbg.json +0 -4
  340. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.json +0 -10
  341. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.dbg.json +0 -4
  342. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.json +0 -164
  343. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.dbg.json +0 -4
  344. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.json +0 -164
  345. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRisk.dbg.json +0 -4
  346. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.dbg.json +0 -4
  347. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.json +0 -113
  348. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.dbg.json +0 -4
  349. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.json +0 -131
  350. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasury.dbg.json +0 -4
  351. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.dbg.json +0 -4
  352. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.json +0 -638
  353. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.dbg.json +0 -4
  354. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.json +0 -76
  355. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +0 -4
  356. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.json +0 -638
  357. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +0 -4
  358. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +0 -690
  359. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +0 -4
  360. package/artifacts/contracts/registry/IChainNft.sol/IChainNft.dbg.json +0 -4
  361. package/artifacts/contracts/registry/IChainNft.sol/IChainNft.json +0 -457
  362. package/artifacts/contracts/shared/IOwnable.sol/IOwnable.dbg.json +0 -4
  363. package/artifacts/contracts/shared/IOwnable.sol/IOwnable.json +0 -24
  364. package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.dbg.json +0 -4
  365. package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.json +0 -445
  366. package/artifacts/contracts/test/TestPool.sol/TestPool.dbg.json +0 -4
  367. package/artifacts/contracts/test/TestPool.sol/TestPool.json +0 -602
  368. package/artifacts/contracts/test/TestProduct.sol/TestProduct.dbg.json +0 -4
  369. package/artifacts/contracts/test/TestProduct.sol/TestProduct.json +0 -632
  370. package/artifacts/contracts/types/ReferralId.sol/ReferralIdLib.dbg.json +0 -4
  371. package/artifacts/contracts/types/ReferralId.sol/ReferralIdLib.json +0 -99
  372. package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.dbg.json +0 -4
  373. package/contracts/instance/IInstanceLinked.sol +0 -8
  374. package/contracts/instance/base/IService.sol +0 -15
  375. package/contracts/instance/base/InstanceBase.sol +0 -89
  376. package/contracts/instance/base/ModuleBase.sol +0 -57
  377. package/contracts/instance/base/ServiceBase.sol +0 -43
  378. package/contracts/instance/module/access/Access.sol +0 -149
  379. package/contracts/instance/module/access/IAccess.sol +0 -53
  380. package/contracts/instance/module/bundle/BundleModule.sol +0 -134
  381. package/contracts/instance/module/bundle/IBundle.sol +0 -53
  382. package/contracts/instance/module/component/ComponentModule.sol +0 -71
  383. package/contracts/instance/module/component/IComponent.sol +0 -28
  384. package/contracts/instance/module/distribution/DistributionModule.sol +0 -17
  385. package/contracts/instance/module/distribution/IDistribution.sol +0 -10
  386. package/contracts/instance/module/policy/IPolicy.sol +0 -63
  387. package/contracts/instance/module/policy/PolicyModule.sol +0 -91
  388. package/contracts/instance/module/pool/IPoolModule.sol +0 -41
  389. package/contracts/instance/module/pool/PoolModule.sol +0 -95
  390. package/contracts/instance/module/risk/IRisk.sol +0 -26
  391. package/contracts/instance/module/risk/RiskModule.sol +0 -62
  392. package/contracts/instance/module/treasury/ITreasury.sol +0 -84
  393. package/contracts/instance/module/treasury/TokenHandler.sol +0 -48
  394. package/contracts/instance/module/treasury/TreasuryModule.sol +0 -131
  395. package/contracts/instance/service/ComponentOwnerService.sol +0 -272
  396. package/contracts/instance/service/IComponentOwnerService.sol +0 -20
  397. package/contracts/registry/IChainNft.sol +0 -22
  398. package/contracts/shared/IOwnable.sol +0 -6
  399. package/contracts/test/TestDistribution.sol +0 -22
  400. package/contracts/test/TestPool.sol +0 -27
  401. package/contracts/test/TestProduct.sol +0 -74
  402. package/contracts/types/ReferralId.sol +0 -48
@@ -1,31 +1,20 @@
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
- address owner = getOwner();
25
-
26
- // owner == address(0) is eg uninitialized upgradable contract
27
- if (owner != address(0) && msg.sender != owner) {
28
- revert ErrorNftOwnableUnauthorized(msg.sender);
16
+ if (msg.sender != getOwner()) {
17
+ revert ErrorNotOwner(msg.sender);
29
18
  }
30
19
  _;
31
20
  }
@@ -34,54 +23,112 @@ contract NftOwnable is
34
23
  _initialOwner = msg.sender;
35
24
  }
36
25
 
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
- {
26
+ /// @dev links this contract to nft after registration
27
+ // needs to be done once per registered contract and
28
+ // reduces registry calls to check ownership
29
+ // does not need any protection as function can only do the "right thing"
30
+ function linkToRegisteredNftId() public {
46
31
  if (_nftId.gtz()) {
47
- revert ErrorAlreadyInitialized(address(_registry), _nftId);
32
+ revert ErrorAlreadyLinked(address(_registry), _nftId);
48
33
  }
49
34
 
50
- if (address(_registry) != address(0)) {
51
- revert ErrorRegistryAlreadyInitialized(address(_registry));
35
+ if (address(_registry) == address(0)) {
36
+ revert ErrorRegistryNotInitialized();
52
37
  }
53
38
 
54
- if (registryAddress == address(0)) {
55
- revert ErrorRegistryAddressZero();
56
- }
57
-
58
- _registry = IRegistry(registryAddress);
39
+ address contractAddress = address(this);
59
40
 
60
41
  if (!_registry.isRegistered(contractAddress)) {
61
42
  revert ErrorContractNotRegistered(contractAddress);
62
43
  }
63
44
 
64
45
  _nftId = _registry.getNftId(contractAddress);
65
-
66
- return _nftId;
67
46
  }
68
47
 
69
48
 
70
- function getRegistry() external view returns (IRegistry) {
49
+ function getRegistry() public view virtual override returns (IRegistry) {
71
50
  return _registry;
72
51
  }
73
52
 
74
53
 
75
- function getNftId() external view returns (NftId) {
54
+ function getNftId() public view virtual override returns (NftId) {
76
55
  return _nftId;
77
56
  }
78
57
 
79
58
 
80
- function getOwner() public view returns (address) {
59
+ function getOwner() public view virtual override returns (address) {
81
60
  if (_nftId.gtz()) {
82
61
  return _registry.ownerOf(_nftId);
83
62
  }
84
63
 
85
64
  return _initialOwner;
86
65
  }
66
+
67
+
68
+ /// @dev initialization for upgradable contracts
69
+ // used in _initializeRegisterable
70
+ function _initializeNftOwnable(
71
+ address initialOwner,
72
+ address registryAddress
73
+ )
74
+ internal
75
+ virtual
76
+ {
77
+ require(initialOwner > address(0), "NftOwnable: initial owner is 0");
78
+ _initialOwner = initialOwner;
79
+ _setRegistry(registryAddress);
80
+ }
81
+
82
+
83
+ /// @dev used in constructor of registry service manager
84
+ // links ownership of registry service manager ot nft owner of registry service
85
+ function _linkToNftOwnable(
86
+ address registryAddress,
87
+ address nftOwnableAddress
88
+ )
89
+ internal
90
+ onlyOwner()
91
+ returns (NftId)
92
+ {
93
+ if (_nftId.gtz()) {
94
+ revert ErrorAlreadyLinked(address(_registry), _nftId);
95
+ }
96
+
97
+ _setRegistry(registryAddress);
98
+
99
+ if (!_registry.isRegistered(nftOwnableAddress)) {
100
+ revert ErrorContractNotRegistered(nftOwnableAddress);
101
+ }
102
+
103
+ _nftId = _registry.getNftId(nftOwnableAddress);
104
+
105
+ return _nftId;
106
+ }
107
+
108
+
109
+ function _setRegistry(address registryAddress)
110
+ private
111
+ {
112
+ if (address(_registry) != address(0)) {
113
+ revert ErrorRegistryAlreadyInitialized(address(_registry));
114
+ }
115
+
116
+ if (registryAddress == address(0)) {
117
+ revert ErrorRegistryAddressZero();
118
+ }
119
+
120
+ if (registryAddress.code.length == 0) {
121
+ revert ErrorNotRegistry(registryAddress);
122
+ }
123
+
124
+ _registry = IRegistry(registryAddress);
125
+
126
+ try _registry.supportsInterface(type(IRegistry).interfaceId) returns (bool isRegistry) {
127
+ if (!isRegistry) {
128
+ revert ErrorNotRegistry(registryAddress);
129
+ }
130
+ } catch {
131
+ revert ErrorNotRegistry(registryAddress);
132
+ }
133
+ }
87
134
  }
@@ -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";
@@ -38,6 +38,7 @@ contract ProxyManager is
38
38
  returns (IVersionable versionable)
39
39
  {
40
40
  if (_isDeployed) { revert ErrorAlreadyDeployed(); }
41
+ _isDeployed = true;
41
42
 
42
43
  address currentProxyOwner = getOwner(); // used by implementation
43
44
  address initialProxyAdminOwner = address(this); // used by proxy
@@ -49,21 +50,11 @@ contract ProxyManager is
49
50
  data
50
51
  );
51
52
 
52
- _isDeployed = true;
53
53
  versionable = IVersionable(address(_proxy));
54
54
 
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,23 @@ 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
+ _initializeERC165();
53
+ _initializeNftOwnable(
54
+ initialOwner,
55
+ registryAddress);
62
56
 
63
57
  // TODO check parentNftId -> registry.isRegistered(parentNftId)
64
58
  // TODO check object-parent type pair -> registry.isValidTypeCombo() or something...verify with registry that setup will be able to register...
65
59
 
66
- IRegistry registry = IRegistry(registryAddress);
67
- require(
68
- registry.supportsInterface(type(IRegistry).interfaceId),
69
- "ERROR:RGB-011:NOT_REGISTRY"
70
- );
71
-
72
60
  RegisterableStorage storage $ = _getRegisterableStorage();
73
- $._registry = registry;
74
61
  $._parentNftId = parentNftId;
75
62
  $._objectType = objectType;
76
63
  $._isInterceptor = isInterceptor;
77
- $._initialOwner = initialOwner;// not msg.sender because called in proxy constructor where msg.sender is proxy deployer
78
64
  $._data = data;
79
65
 
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));
66
+ _registerInterface(type(IRegisterable).interfaceId);
86
67
  }
87
68
 
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
69
 
97
70
  function getInitialInfo()
98
71
  public
@@ -103,12 +76,12 @@ abstract contract Registerable is
103
76
  RegisterableStorage storage $ = _getRegisterableStorage();
104
77
  return (
105
78
  IRegistry.ObjectInfo(
106
- zeroNftId(),
79
+ getNftId(),
107
80
  $._parentNftId,
108
81
  $._objectType,
109
82
  $._isInterceptor,
110
83
  address(this),
111
- $._initialOwner,
84
+ getOwner(),
112
85
  $._data
113
86
  ),
114
87
  bytes("")
@@ -0,0 +1,16 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.19;
3
+
4
+ import {Registerable} from "./Registerable.sol";
5
+ import {Versionable} from "./Versionable.sol";
6
+
7
+ /// @dev base contract for upgradable objects like services and upgradable components
8
+ /// deriving contracs need to call _initializeRegisterable
9
+ /// TODO internalizes versionable here, a non-registerable versionalbe might itself have some value but is outside the scope of the gif
10
+ /// after this merge versionable will no longer exist on its own in gif
11
+ /// only registerable and upgradable (which is a registerable too) will remain
12
+ abstract contract RegisterableUpgradable is
13
+ Registerable,
14
+ Versionable
15
+ {
16
+ }
@@ -0,0 +1,58 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.19;
3
+
4
+ import {ObjectType, SERVICE} from "../types/ObjectType.sol";
5
+ import {NftId, zeroNftId} from "../types/NftId.sol";
6
+ import {Version, VersionPart, VersionLib} from "../types/Version.sol";
7
+
8
+ import {Versionable} from "./Versionable.sol";
9
+ import {IService} from "./IService.sol";
10
+ import {IVersionable} from "./IVersionable.sol";
11
+ import {RegisterableUpgradable} from "./RegisterableUpgradable.sol";
12
+
13
+ import {IRegistry} from "../registry/IRegistry.sol";
14
+
15
+
16
+ /// @dev service base contract
17
+ abstract contract Service is
18
+ RegisterableUpgradable,
19
+ IService
20
+ {
21
+ function getDomain() public pure virtual override returns(ObjectType);
22
+
23
+ function getMajorVersion() public view virtual override returns(VersionPart majorVersion) {
24
+ return getVersion().toMajorPart();
25
+ }
26
+
27
+ // from Versionable
28
+ function getVersion()
29
+ public
30
+ pure
31
+ virtual override (IVersionable, Versionable)
32
+ returns(Version)
33
+ {
34
+ return VersionLib.toVersion(3,0,0);
35
+ }
36
+
37
+ function _initializeService(
38
+ address registry,
39
+ address initialOwner
40
+ )
41
+ internal
42
+ virtual
43
+ //onlyInitializing //TODO uncomment when "fully" upgradeable
44
+ {
45
+ // service must provide its name and version upon registration
46
+ bytes memory data = abi.encode(getDomain(), getMajorVersion());
47
+ NftId registryNftId = _getRegistryNftId(registry);
48
+ bool isInterceptor = false;
49
+
50
+ _initializeRegisterable(registry, registryNftId, SERVICE(), isInterceptor, initialOwner, data);
51
+ _registerInterface(type(IService).interfaceId);
52
+ }
53
+
54
+ // this is just a conveniene function, actual validation will be done upon registration
55
+ function _getRegistryNftId(address registryAddress) internal view returns (NftId) {
56
+ return IRegistry(registryAddress).getNftId(registryAddress);
57
+ }
58
+ }
@@ -0,0 +1,27 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.20;
3
+
4
+ import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
5
+ import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
6
+
7
+ contract TokenHandler {
8
+ IERC20Metadata private _token;
9
+
10
+ constructor(address token) {
11
+ _token = IERC20Metadata(token);
12
+ }
13
+
14
+ // TODO add logging
15
+ function transfer(
16
+ address from,
17
+ address to,
18
+ uint256 amount // TODO add authz (only treasury/instance/product/pool/ service)
19
+ ) external {
20
+ SafeERC20.safeTransferFrom(_token, from, to, amount);
21
+ // _token.transferFrom(from, to, amount);
22
+ }
23
+
24
+ function getToken() external view returns (IERC20Metadata) {
25
+ return _token;
26
+ }
27
+ }
@@ -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) {
@@ -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(); }
@@ -1,26 +1,25 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.19;
3
3
 
4
+ import {ObjectType, PRODUCT} from "../../contracts/types/ObjectType.sol";
4
5
  import {NftId} from "../../contracts/types/NftId.sol";
5
6
  import {Version, VersionLib} from "../../contracts/types/Version.sol";
6
- import {ServiceBase} from "../../contracts/instance/base/ServiceBase.sol";
7
+ import {Service} from "../../contracts/shared/Service.sol";
7
8
 
8
9
  import {IVersionable} from "../../contracts/shared/IVersionable.sol";
9
10
  import {Versionable} from "../../contracts/shared/Versionable.sol";
10
11
 
11
- //import {IService} from "../../contracts/instance/base/IService.sol";
12
-
13
- contract TestService is ServiceBase {
12
+ contract TestService is Service {
14
13
 
15
14
  string public constant NAME = "TestService";
16
15
 
17
16
  constructor(address registry, NftId registryNftId, address initialOwner)
18
17
  // solhint-disable-next-line no-empty-blocks
19
18
  {
20
- _initializeServiceBase(registry, registryNftId, initialOwner);
19
+ _initializeService(registry, initialOwner);
21
20
  }
22
21
 
23
- function getName() public pure override returns(string memory name) {
24
- return NAME;
22
+ function getDomain() public pure override returns(ObjectType) {
23
+ return PRODUCT();
25
24
  }
26
25
  }
@@ -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
  }