@etherisc/gif-next 0.0.2-f0d86c2-077 → 0.0.2-f29e479-370

Sign up to get free protection for your applications and to get access to all the features.
Files changed (462) hide show
  1. package/README.md +314 -11
  2. package/artifacts/contracts/components/Component.sol/Component.dbg.json +4 -0
  3. package/artifacts/contracts/components/Component.sol/Component.json +853 -0
  4. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +4 -0
  5. package/artifacts/contracts/components/Distribution.sol/Distribution.json +1346 -0
  6. package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +4 -0
  7. package/artifacts/contracts/{registry/IChainNft.sol/IChainNft.json → components/IComponent.sol/IComponent.json} +284 -223
  8. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +4 -0
  9. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +900 -0
  10. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  11. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +607 -76
  12. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  13. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +587 -60
  14. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  15. package/artifacts/contracts/components/Pool.sol/Pool.json +1092 -157
  16. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  17. package/artifacts/contracts/components/Product.sol/Product.json +1028 -87
  18. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +4 -0
  19. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +764 -0
  20. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +4 -0
  21. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.json +185 -0
  22. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  23. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +1713 -1095
  24. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +4 -0
  25. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +509 -0
  26. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  27. package/artifacts/contracts/instance/Instance.sol/Instance.json +2449 -1257
  28. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +4 -0
  29. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +984 -0
  30. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +4 -0
  31. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +1386 -0
  32. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +4 -0
  33. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +1046 -0
  34. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +4 -0
  35. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +693 -0
  36. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +4 -0
  37. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +261 -0
  38. package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json +4 -0
  39. package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.json +552 -0
  40. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  41. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.json +45 -127
  42. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  43. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  44. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +55 -245
  45. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  46. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +4 -4
  47. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +4 -0
  48. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +254 -0
  49. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +4 -0
  50. package/artifacts/contracts/instance/module/{bundle/IBundle.sol → IBundle.sol}/IBundle.json +1 -1
  51. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +4 -0
  52. package/artifacts/contracts/instance/module/{access/IAccess.sol/IAccess.json → IDistribution.sol/IDistribution.json} +2 -2
  53. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +4 -0
  54. package/artifacts/contracts/instance/module/{policy/IPolicy.sol → IPolicy.sol}/IPolicy.json +1 -1
  55. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +4 -0
  56. package/artifacts/contracts/instance/module/{risk/IRisk.sol → IRisk.sol}/IRisk.json +1 -1
  57. package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +4 -0
  58. package/artifacts/contracts/instance/{base/ModuleBase.sol/ModuleBase.json → module/ISetup.sol/ISetup.json} +2 -2
  59. package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +4 -0
  60. package/artifacts/contracts/instance/module/{treasury/ITreasury.sol → ITreasury.sol}/ITreasury.json +1 -1
  61. package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.dbg.json +4 -0
  62. package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.json +869 -0
  63. package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +4 -0
  64. package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.json +657 -0
  65. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +4 -0
  66. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +1096 -0
  67. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +4 -0
  68. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +661 -0
  69. package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.dbg.json +4 -0
  70. package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.json +754 -0
  71. package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +4 -0
  72. package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.json +637 -0
  73. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +4 -0
  74. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +1318 -0
  75. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +4 -0
  76. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +769 -0
  77. package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.dbg.json +4 -0
  78. package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.json +473 -0
  79. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +4 -0
  80. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +633 -0
  81. package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.dbg.json +4 -0
  82. package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.json +409 -0
  83. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +4 -0
  84. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +671 -0
  85. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +4 -0
  86. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +583 -0
  87. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
  88. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +136 -165
  89. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
  90. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +139 -232
  91. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +4 -0
  92. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +1120 -0
  93. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +4 -0
  94. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +717 -0
  95. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
  96. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +416 -160
  97. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +4 -0
  98. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +649 -0
  99. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
  100. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +401 -297
  101. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +4 -0
  102. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +649 -0
  103. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  104. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +186 -12
  105. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  106. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +466 -34
  107. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +4 -0
  108. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +890 -0
  109. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +4 -0
  110. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +34 -0
  111. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  112. package/artifacts/contracts/registry/Registry.sol/Registry.json +470 -103
  113. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +4 -0
  114. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +285 -0
  115. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +4 -0
  116. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +1177 -0
  117. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +4 -0
  118. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +670 -0
  119. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +4 -0
  120. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +547 -0
  121. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +4 -0
  122. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +498 -0
  123. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +4 -0
  124. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.json +107 -0
  125. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  126. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +41 -3
  127. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +4 -0
  128. package/artifacts/contracts/{components/IBaseComponent.sol/IBaseComponent.json → shared/INftOwnable.sol/INftOwnable.json} +38 -74
  129. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +4 -0
  130. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +129 -0
  131. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  132. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +100 -33
  133. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +4 -0
  134. package/artifacts/contracts/{experiment/inheritance/IB.sol/IB.json → shared/IRegistryLinked.sol/IRegistryLinked.json} +18 -20
  135. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +4 -0
  136. package/artifacts/contracts/{instance/base/ServiceBase.sol/ServiceBase.json → shared/IService.sol/IService.json} +121 -152
  137. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  138. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +16 -125
  139. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +4 -0
  140. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +251 -0
  141. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +4 -0
  142. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +248 -0
  143. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +4 -0
  144. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +582 -0
  145. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  146. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +256 -25
  147. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +4 -0
  148. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +84 -0
  149. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +4 -0
  150. package/artifacts/contracts/{instance/service/IComponentOwnerService.sol/IComponentOwnerService.json → shared/Service.sol/Service.json} +220 -159
  151. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +4 -0
  152. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +96 -0
  153. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +4 -0
  154. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +129 -0
  155. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  156. package/artifacts/contracts/shared/Versionable.sol/Versionable.json +29 -115
  157. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
  158. package/artifacts/contracts/test/TestFee.sol/TestFee.json +4 -4
  159. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
  160. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +272 -26
  161. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
  162. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +14 -14
  163. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
  164. package/artifacts/contracts/test/TestService.sol/TestService.json +281 -139
  165. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
  166. package/artifacts/contracts/test/TestToken.sol/TestUsdc.json +91 -53
  167. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
  168. package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +2 -2
  169. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
  170. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +38 -140
  171. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
  172. package/artifacts/contracts/test/Usdc.sol/USDC.json +91 -53
  173. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  174. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  175. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  176. package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.dbg.json +4 -0
  177. package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.json +100 -0
  178. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +4 -0
  179. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.json +104 -0
  180. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
  181. package/artifacts/contracts/types/Fee.sol/FeeLib.json +52 -13
  182. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
  183. package/artifacts/contracts/types/Key32.sol/Key32Lib.json +31 -17
  184. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  185. package/artifacts/contracts/types/NftId.sol/NftIdLib.json +2 -2
  186. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  187. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +26 -3
  188. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +4 -0
  189. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.json +100 -0
  190. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  191. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +2 -2
  192. package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.dbg.json +4 -0
  193. package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.json +100 -0
  194. package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +4 -0
  195. package/artifacts/contracts/types/Referral.sol/ReferralLib.json +123 -0
  196. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +4 -0
  197. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +86 -0
  198. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
  199. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +134 -8
  200. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
  201. package/artifacts/contracts/types/StateId.sol/StateIdLib.json +2 -2
  202. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
  203. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +15 -2
  204. package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +4 -0
  205. package/artifacts/contracts/{experiment/types/TypeB.sol/TypeBLib.json → types/UFixed.sol/MathLib.json} +4 -4
  206. package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +4 -0
  207. package/artifacts/contracts/types/UFixed.sol/{UFixedMathLib.json → UFixedLib.json} +3 -3
  208. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
  209. package/artifacts/contracts/types/Version.sol/VersionLib.json +40 -2
  210. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
  211. package/artifacts/contracts/types/Version.sol/VersionPartLib.json +22 -3
  212. package/contracts/components/Component.sol +241 -0
  213. package/contracts/components/Distribution.sol +287 -0
  214. package/contracts/components/IComponent.sol +54 -0
  215. package/contracts/components/IDistributionComponent.sol +92 -0
  216. package/contracts/components/IPoolComponent.sol +65 -35
  217. package/contracts/components/IProductComponent.sol +29 -9
  218. package/contracts/components/Pool.sol +180 -100
  219. package/contracts/components/Product.sol +210 -42
  220. package/contracts/instance/BundleManager.sol +125 -0
  221. package/contracts/instance/Cloneable.sol +46 -0
  222. package/contracts/instance/IInstance.sol +85 -45
  223. package/contracts/instance/IInstanceService.sol +59 -0
  224. package/contracts/instance/Instance.sol +276 -53
  225. package/contracts/instance/InstanceAccessManager.sol +297 -0
  226. package/contracts/instance/InstanceReader.sol +293 -0
  227. package/contracts/instance/InstanceService.sol +476 -0
  228. package/contracts/instance/InstanceServiceManager.sol +54 -0
  229. package/contracts/instance/ObjectManager.sol +84 -0
  230. package/contracts/instance/base/ComponentService.sol +134 -0
  231. package/contracts/instance/base/IKeyValueStore.sol +13 -13
  232. package/contracts/instance/base/ILifecycle.sol +3 -3
  233. package/contracts/instance/base/KeyValueStore.sol +53 -37
  234. package/contracts/instance/base/Lifecycle.sol +16 -11
  235. package/contracts/instance/module/IAccess.sol +47 -0
  236. package/contracts/instance/module/IBundle.sol +20 -0
  237. package/contracts/instance/module/IDistribution.sol +40 -0
  238. package/contracts/instance/module/IPolicy.sol +47 -0
  239. package/contracts/instance/module/IRisk.sol +11 -0
  240. package/contracts/instance/module/ISetup.sol +48 -0
  241. package/contracts/instance/module/ITreasury.sol +23 -0
  242. package/contracts/instance/service/ApplicationService.sol +268 -0
  243. package/contracts/instance/service/ApplicationServiceManager.sol +35 -0
  244. package/contracts/instance/service/BundleService.sol +298 -0
  245. package/contracts/instance/service/BundleServiceManager.sol +51 -0
  246. package/contracts/instance/service/ClaimService.sol +151 -0
  247. package/contracts/instance/service/ClaimServiceManager.sol +35 -0
  248. package/contracts/instance/service/DistributionService.sol +375 -0
  249. package/contracts/instance/service/DistributionServiceManager.sol +51 -0
  250. package/contracts/instance/service/IApplicationService.sol +82 -0
  251. package/contracts/instance/service/IBundleService.sol +54 -0
  252. package/contracts/instance/service/IClaimService.sol +61 -0
  253. package/contracts/instance/service/IDistributionService.sol +83 -0
  254. package/contracts/instance/service/IPolicyService.sol +89 -0
  255. package/contracts/instance/service/IPoolService.sol +8 -18
  256. package/contracts/instance/service/IProductService.sol +21 -39
  257. package/contracts/instance/service/PolicyService.sol +476 -0
  258. package/contracts/instance/service/PolicyServiceManager.sol +54 -0
  259. package/contracts/instance/service/PoolService.sol +78 -92
  260. package/contracts/instance/service/PoolServiceManager.sol +51 -0
  261. package/contracts/instance/service/ProductService.sol +168 -289
  262. package/contracts/instance/service/ProductServiceManager.sol +54 -0
  263. package/contracts/registry/ChainNft.sol +79 -36
  264. package/contracts/registry/IRegistry.sol +66 -24
  265. package/contracts/registry/IRegistryService.sol +67 -0
  266. package/contracts/registry/ITransferInterceptor.sol +6 -0
  267. package/contracts/registry/Registry.sol +366 -283
  268. package/contracts/registry/RegistryAccessManager.sol +216 -0
  269. package/contracts/registry/RegistryService.sol +283 -0
  270. package/contracts/registry/RegistryServiceManager.sol +62 -0
  271. package/contracts/registry/ReleaseManager.sol +322 -0
  272. package/contracts/registry/TokenRegistry.sol +116 -0
  273. package/contracts/shared/ContractDeployerLib.sol +72 -0
  274. package/contracts/shared/ERC165.sol +14 -8
  275. package/contracts/shared/INftOwnable.sol +23 -0
  276. package/contracts/shared/IPolicyHolder.sol +26 -0
  277. package/contracts/shared/IRegisterable.sol +10 -19
  278. package/contracts/shared/IRegistryLinked.sol +12 -0
  279. package/contracts/shared/IService.sol +18 -0
  280. package/contracts/shared/IVersionable.sol +38 -37
  281. package/contracts/shared/NftOwnable.sol +120 -0
  282. package/contracts/shared/PolicyHolder.sol +81 -0
  283. package/contracts/shared/ProxyManager.sol +169 -0
  284. package/contracts/shared/Registerable.sol +54 -66
  285. package/contracts/shared/RegistryLinked.sol +48 -0
  286. package/contracts/shared/Service.sol +58 -0
  287. package/contracts/shared/TokenHandler.sol +27 -0
  288. package/contracts/shared/UpgradableProxyWithAdmin.sol +16 -0
  289. package/contracts/shared/Versionable.sol +38 -68
  290. package/contracts/test/TestFee.sol +2 -2
  291. package/contracts/test/TestRegisterable.sol +5 -6
  292. package/contracts/test/TestRoleId.sol +1 -1
  293. package/contracts/test/TestService.sol +7 -14
  294. package/contracts/types/ClaimId.sol +52 -0
  295. package/contracts/types/DistributorType.sol +55 -0
  296. package/contracts/types/Fee.sol +10 -5
  297. package/contracts/types/Key32.sol +8 -3
  298. package/contracts/types/NftIdSet.sol +26 -24
  299. package/contracts/types/NumberId.sol +52 -0
  300. package/contracts/types/ObjectType.sol +55 -14
  301. package/contracts/types/PayoutId.sol +54 -0
  302. package/contracts/types/Referral.sol +85 -0
  303. package/contracts/types/RiskId.sol +43 -0
  304. package/contracts/types/RoleId.sol +62 -10
  305. package/contracts/types/StateId.sol +5 -1
  306. package/contracts/types/Timestamp.sol +7 -3
  307. package/contracts/types/UFixed.sol +128 -12
  308. package/contracts/types/Version.sol +13 -1
  309. package/package.json +6 -5
  310. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +0 -4
  311. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +0 -174
  312. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +0 -4
  313. package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +0 -4
  314. package/artifacts/contracts/experiment/errors/Require.sol/Require.json +0 -105
  315. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +0 -4
  316. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.json +0 -105
  317. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +0 -4
  318. package/artifacts/contracts/experiment/inheritance/A.sol/A.json +0 -128
  319. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +0 -4
  320. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.json +0 -42
  321. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +0 -4
  322. package/artifacts/contracts/experiment/inheritance/B.sol/B.json +0 -76
  323. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +0 -4
  324. package/artifacts/contracts/experiment/inheritance/C.sol/C.json +0 -89
  325. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +0 -4
  326. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.json +0 -128
  327. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +0 -4
  328. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.json +0 -37
  329. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +0 -4
  330. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +0 -4
  331. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.json +0 -63
  332. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +0 -4
  333. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +0 -59
  334. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +0 -4
  335. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.json +0 -124
  336. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +0 -4
  337. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.json +0 -74
  338. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +0 -4
  339. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +0 -124
  340. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +0 -4
  341. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +0 -207
  342. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +0 -4
  343. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.json +0 -10
  344. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +0 -4
  345. package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.dbg.json +0 -4
  346. package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.json +0 -24
  347. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +0 -4
  348. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.json +0 -300
  349. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +0 -4
  350. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +0 -63
  351. package/artifacts/contracts/instance/base/IService.sol/IService.dbg.json +0 -4
  352. package/artifacts/contracts/instance/base/IService.sol/IService.json +0 -300
  353. package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.dbg.json +0 -4
  354. package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.json +0 -326
  355. package/artifacts/contracts/instance/base/ModuleBase.sol/ModuleBase.dbg.json +0 -4
  356. package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.dbg.json +0 -4
  357. package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.dbg.json +0 -4
  358. package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.json +0 -333
  359. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccess.dbg.json +0 -4
  360. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.dbg.json +0 -4
  361. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.json +0 -333
  362. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.dbg.json +0 -4
  363. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.json +0 -296
  364. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundle.dbg.json +0 -4
  365. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.dbg.json +0 -4
  366. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.json +0 -296
  367. package/artifacts/contracts/instance/module/compensation/CompensationModule.sol/CompensationModule.dbg.json +0 -4
  368. package/artifacts/contracts/instance/module/compensation/CompensationModule.sol/CompensationModule.json +0 -10
  369. package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensation.dbg.json +0 -4
  370. package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensation.json +0 -10
  371. package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensationModule.dbg.json +0 -4
  372. package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensationModule.json +0 -10
  373. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.dbg.json +0 -4
  374. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.json +0 -188
  375. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.dbg.json +0 -4
  376. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.json +0 -10
  377. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.dbg.json +0 -4
  378. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.json +0 -188
  379. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicy.dbg.json +0 -4
  380. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.dbg.json +0 -4
  381. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.json +0 -261
  382. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.dbg.json +0 -4
  383. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.json +0 -261
  384. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.dbg.json +0 -4
  385. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.json +0 -10
  386. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.dbg.json +0 -4
  387. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.json +0 -149
  388. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.dbg.json +0 -4
  389. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.json +0 -149
  390. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRisk.dbg.json +0 -4
  391. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.dbg.json +0 -4
  392. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.json +0 -10
  393. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.dbg.json +0 -4
  394. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.json +0 -10
  395. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasury.dbg.json +0 -4
  396. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.dbg.json +0 -4
  397. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.json +0 -533
  398. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.dbg.json +0 -4
  399. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.json +0 -76
  400. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +0 -4
  401. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.json +0 -533
  402. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +0 -4
  403. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +0 -523
  404. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +0 -4
  405. package/artifacts/contracts/registry/IChainNft.sol/IChainNft.dbg.json +0 -4
  406. package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.dbg.json +0 -4
  407. package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.json +0 -24
  408. package/artifacts/contracts/shared/IOwnable.sol/IOwnable.dbg.json +0 -4
  409. package/artifacts/contracts/shared/IOwnable.sol/IOwnable.json +0 -24
  410. package/artifacts/contracts/test/TestPool.sol/TestPool.dbg.json +0 -4
  411. package/artifacts/contracts/test/TestPool.sol/TestPool.json +0 -387
  412. package/artifacts/contracts/test/TestProduct.sol/TestProduct.dbg.json +0 -4
  413. package/artifacts/contracts/test/TestProduct.sol/TestProduct.json +0 -393
  414. package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.dbg.json +0 -4
  415. package/contracts/components/BaseComponent.sol +0 -88
  416. package/contracts/components/IBaseComponent.sol +0 -19
  417. package/contracts/experiment/errors/Require.sol +0 -38
  418. package/contracts/experiment/errors/Revert.sol +0 -44
  419. package/contracts/experiment/inheritance/A.sol +0 -53
  420. package/contracts/experiment/inheritance/B.sol +0 -28
  421. package/contracts/experiment/inheritance/C.sol +0 -34
  422. package/contracts/experiment/inheritance/IA.sol +0 -13
  423. package/contracts/experiment/inheritance/IB.sol +0 -10
  424. package/contracts/experiment/inheritance/IC.sol +0 -12
  425. package/contracts/experiment/statemachine/Dummy.sol +0 -27
  426. package/contracts/experiment/statemachine/ISM.sol +0 -25
  427. package/contracts/experiment/statemachine/README.md +0 -112
  428. package/contracts/experiment/statemachine/SM.sol +0 -57
  429. package/contracts/experiment/statemachine/SimpleStateMachine.sol +0 -31
  430. package/contracts/experiment/types/TypeA.sol +0 -47
  431. package/contracts/experiment/types/TypeB.sol +0 -29
  432. package/contracts/instance/IInstanceLinked.sol +0 -8
  433. package/contracts/instance/base/ComponentServiceBase.sol +0 -42
  434. package/contracts/instance/base/IInstanceBase.sol +0 -14
  435. package/contracts/instance/base/IService.sol +0 -15
  436. package/contracts/instance/base/InstanceBase.sol +0 -80
  437. package/contracts/instance/base/ModuleBase.sol +0 -52
  438. package/contracts/instance/base/ServiceBase.sol +0 -37
  439. package/contracts/instance/module/access/Access.sol +0 -149
  440. package/contracts/instance/module/access/IAccess.sol +0 -53
  441. package/contracts/instance/module/bundle/BundleModule.sol +0 -136
  442. package/contracts/instance/module/bundle/IBundle.sol +0 -58
  443. package/contracts/instance/module/compensation/CompensationModule.sol +0 -8
  444. package/contracts/instance/module/compensation/ICompensation.sol +0 -10
  445. package/contracts/instance/module/component/ComponentModule.sol +0 -95
  446. package/contracts/instance/module/component/IComponent.sol +0 -53
  447. package/contracts/instance/module/policy/IPolicy.sol +0 -60
  448. package/contracts/instance/module/policy/PolicyModule.sol +0 -76
  449. package/contracts/instance/module/pool/IPoolModule.sol +0 -41
  450. package/contracts/instance/module/pool/PoolModule.sol +0 -87
  451. package/contracts/instance/module/risk/IRisk.sol +0 -10
  452. package/contracts/instance/module/risk/RiskModule.sol +0 -8
  453. package/contracts/instance/module/treasury/ITreasury.sol +0 -103
  454. package/contracts/instance/module/treasury/TokenHandler.sol +0 -48
  455. package/contracts/instance/module/treasury/TreasuryModule.sol +0 -152
  456. package/contracts/instance/service/ComponentOwnerService.sol +0 -170
  457. package/contracts/instance/service/IComponentOwnerService.sol +0 -22
  458. package/contracts/registry/IChainNft.sol +0 -21
  459. package/contracts/registry/IRegistryLinked.sol +0 -8
  460. package/contracts/shared/IOwnable.sol +0 -6
  461. package/contracts/test/TestPool.sol +0 -22
  462. package/contracts/test/TestProduct.sol +0 -44
@@ -1,52 +1,53 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
- pragma solidity ^0.8.19;
3
-
4
- import {Blocknumber, blockNumber} from "../types/Blocknumber.sol";
5
- import {Timestamp, blockTimestamp} from "../types/Timestamp.sol";
6
- import {Version, VersionPart} from "../types/Version.sol";
2
+ pragma solidity ^0.8.20;
3
+
4
+ import {Version} from "../types/Version.sol";
5
+
6
+ /// IMPORTANT
7
+ // Upgradeable contract MUST:
8
+ // 1) inherit from Versionable
9
+ // 2) implement version() function
10
+ // 3) implement internal _initialize() function with onlyInitializing modifier
11
+ // 4) implement internal _upgrade() function with onlyInitializing modifier (1st version MUST revert)
12
+ // 5) have onlyInitialising modifier for each function callable inside _initialize()/_upgrade() (MUST use different functions for initialization/upgrade and normal operations)
13
+ // 6) use default empty constructor -> _disableInitializer() is called from Versionable contructor
14
+ // 7) use namespace storage (should this be needed)
15
+ // 8) since now inheritance is used for upgradability, contract MUST BE inherited ONLY by the next version
16
+ // Upgradeable contract SHOULD:
17
+ // 9) define all non private methods as virtual (in order to be able to upgrade them latter)
18
+ // otherwise, it is still possible to upgrade contract, but everyone who is using it will have to switch to a new fucntions
19
+ // in some cases this ok but not in the others...
20
+ //
21
+ // IMPORTANT
22
+ // If introducting/amending storage related to Versionable version MUST:
23
+ // 1) define namespace storage struct if accessing storage
24
+ // - DO NOT use structs inside, except
25
+ // - CAN use structs ONLY inside mappings
26
+ // 2) ALWAYS define private getter if accessing storage
27
+ // - MUST use default implementation, CAN change ONLY return type
7
28
 
8
29
  interface IVersionable {
9
30
 
10
- struct VersionInfo {
11
- Version version;
12
- address implementation;
13
- address activatedBy;
14
- Timestamp activatedAt;
15
- Blocknumber activatedIn;
16
- }
17
-
18
- event LogVersionableActivated(Version version, address implementation, address activatedBy);
19
-
20
31
  /**
21
- * @dev IMPORTANT this function needs to be implemented by each new version
22
- * any such activate implementation needs to call internal function call _activate()
23
- * any new version needs to inherit from previous version
32
+ * @dev IMPORTANT
33
+ * implementation MUST be guarded by initializer modifier
34
+ * new version MUST inherit from previous version
24
35
  */
25
- function activate(address implementation, address activatedBy) external;
36
+ function initializeVersionable(address activatedBy, bytes memory activationData) external;
26
37
 
27
38
  /**
28
- * @dev returns true if the specified version has been activated for the current contract
39
+ * @dev
40
+ * implementation MUST be guarded by reinitializer(version().toUint64()) modifier
41
+ * new version MUST inherit from previous version
42
+ * the first verion MUST revert
29
43
  */
30
- function isActivated(Version version) external view returns(bool);
44
+ function upgradeVersionable(bytes memory upgradeData) external;
31
45
 
32
46
  /**
33
- * @dev returns currently active version of this contract
47
+ * @dev returns version of this contract
48
+ * each new implementation MUST implement this function
49
+ * version number MUST increase
34
50
  */
35
51
  function getVersion() external pure returns(Version);
36
52
 
37
- /**
38
- * @dev returns the number of all deployed versions of this contract
39
- */
40
- function getVersionCount() external view returns(uint256 numberOfVersions);
41
-
42
- /**
43
- * @dev returns the i-th (index) version of this contract
44
- */
45
- function getVersion(uint256 index) external view returns(Version version);
46
-
47
- /**
48
- * @dev returns the i-th (index) version info of this contract
49
- */
50
- function getVersionInfo(Version version) external view returns(VersionInfo memory versionInfo);
51
-
52
53
  }
@@ -0,0 +1,120 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.20;
3
+
4
+ // import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
5
+
6
+ import {ERC165} from "./ERC165.sol";
7
+ import {INftOwnable} from "./INftOwnable.sol";
8
+ import {NftId} from "../types/NftId.sol";
9
+ import {RegistryLinked} from "./RegistryLinked.sol";
10
+
11
+ contract NftOwnable is
12
+ ERC165,
13
+ RegistryLinked,
14
+ INftOwnable
15
+ {
16
+ // keccak256(abi.encode(uint256(keccak256("etherisc.storage.NftOwnable")) - 1)) & ~bytes32(uint256(0xff));
17
+ bytes32 public constant NFT_OWNABLE_STORAGE_LOCATION_V1 = 0x07ebcf49758b6ed3af50fa146bec0abe157c0218fe65dc0874c286e9d5da4f00;
18
+
19
+ struct NftOwnableStorage {
20
+ NftId _nftId;
21
+ address _initialOwner;
22
+ }
23
+
24
+ /// @dev enforces msg.sender is owner of nft (or initial owner of nft ownable)
25
+ modifier onlyOwner() {
26
+ if (msg.sender != getOwner()) {
27
+ revert ErrorNftOwnableNotOwner(msg.sender);
28
+ }
29
+ _;
30
+ }
31
+
32
+
33
+ /// @dev initialization for upgradable contracts
34
+ // used in _initializeRegisterable
35
+ function initializeNftOwnable(
36
+ address initialOwner,
37
+ address registryAddress
38
+ )
39
+ public
40
+ virtual
41
+ onlyInitializing()
42
+ {
43
+ initializeRegistryLinked(registryAddress);
44
+ initializeERC165();
45
+
46
+ if(initialOwner == address(0)) {
47
+ revert ErrorNftOwnableInitialOwnerZero();
48
+ }
49
+
50
+ _getNftOwnableStorage()._initialOwner = initialOwner;
51
+ }
52
+
53
+
54
+ /// @dev links this contract to nft after registration
55
+ // needs to be done once per registered contract and
56
+ // reduces registry calls to check ownership
57
+ // does not need any protection as function can only do the "right thing"
58
+ function linkToRegisteredNftId()
59
+ public
60
+ virtual
61
+ {
62
+ NftOwnableStorage storage $ = _getNftOwnableStorage();
63
+
64
+ if ($._nftId.gtz()) {
65
+ revert ErrorNftOwnableAlreadyLinked($._nftId);
66
+ }
67
+
68
+ address contractAddress = address(this);
69
+
70
+ if (!getRegistry().isRegistered(contractAddress)) {
71
+ revert ErrorNftOwnableContractNotRegistered(contractAddress);
72
+ }
73
+
74
+ $._nftId = getRegistry().getNftId(contractAddress);
75
+ }
76
+
77
+ function getNftId() public view virtual override returns (NftId) {
78
+ return _getNftOwnableStorage()._nftId;
79
+ }
80
+
81
+ function getOwner() public view virtual override returns (address) {
82
+ NftOwnableStorage storage $ = _getNftOwnableStorage();
83
+
84
+ if ($._nftId.gtz()) {
85
+ return getRegistry().ownerOf($._nftId);
86
+ }
87
+
88
+ return $._initialOwner;
89
+ }
90
+
91
+ /// @dev used in constructor of registry service manager
92
+ // links ownership of registry service manager ot nft owner of registry service
93
+ function _linkToNftOwnable(
94
+ address nftOwnableAddress
95
+ )
96
+ internal
97
+ returns (NftId)
98
+ {
99
+ NftOwnableStorage storage $ = _getNftOwnableStorage();
100
+
101
+ if ($._nftId.gtz()) {
102
+ revert ErrorNftOwnableAlreadyLinked($._nftId);
103
+ }
104
+
105
+ if (!getRegistry().isRegistered(nftOwnableAddress)) {
106
+ revert ErrorNftOwnableContractNotRegistered(nftOwnableAddress);
107
+ }
108
+
109
+ $._nftId = getRegistry().getNftId(nftOwnableAddress);
110
+
111
+ return $._nftId;
112
+ }
113
+
114
+
115
+ function _getNftOwnableStorage() private pure returns (NftOwnableStorage storage $) {
116
+ assembly {
117
+ $.slot := NFT_OWNABLE_STORAGE_LOCATION_V1
118
+ }
119
+ }
120
+ }
@@ -0,0 +1,81 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.20;
3
+
4
+ import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
5
+ import {IERC721Receiver} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
6
+ import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
7
+
8
+ import {ERC165} from "./ERC165.sol";
9
+ import {IPolicyHolder} from "./IPolicyHolder.sol";
10
+ import {IRegistry} from "../registry/IRegistry.sol";
11
+ import {NftId} from "../types/NftId.sol";
12
+ import {NumberId} from "../types/NumberId.sol";
13
+ import {RegistryLinked} from "./RegistryLinked.sol";
14
+
15
+ /// @dev template implementation for IPolicyHolder
16
+ contract PolicyHolder is
17
+ ERC165,
18
+ RegistryLinked,
19
+ IPolicyHolder
20
+ {
21
+ // keccak256(abi.encode(uint256(keccak256("etherisc.storage.PolicyHolder")) - 1)) & ~bytes32(uint256(0xff));
22
+ // TODO fix address
23
+ bytes32 public constant POLICY_HOLDER_STORAGE_LOCATION_V1 = 0x07ebcf49758b6ed3af50fa146bec0abe157c0218fe65dc0874c286e9d5da4f00;
24
+
25
+ // TODO uncomment/fix/refactor
26
+ struct PolicyHolderStorage {
27
+ // mapping(NftId policyId => mapping(NumberId claimId => address beneficiary)) private _claimBeneficiary;
28
+ // mapping(NftId policyId => address beneficiary) private _beneficiary;
29
+ bool dummy;
30
+ }
31
+
32
+ function initializePolicyHolder(
33
+ address registryAddress
34
+ )
35
+ public
36
+ virtual
37
+ onlyInitializing()
38
+ {
39
+ initializeRegistryLinked(registryAddress);
40
+ }
41
+
42
+ /// @dev empty default implementation
43
+ function policyCreatedCallback(NftId policyNftId) external virtual { }
44
+
45
+ /// @dev empty default implementation
46
+ function payoutExecutedCallback(NftId policyNftId, NumberId payoutId, address beneficiary, uint256 amount) external virtual { }
47
+
48
+ /// @dev determines beneficiary address that will be used in payouts targeting this contract
49
+ /// returned address will override GIF default where the policy nft holder is treated as beneficiary
50
+ function getBeneficiary(NftId policyId, NumberId claimId) external virtual view returns (address beneficiary) {
51
+ // TODO add implementation
52
+ }
53
+
54
+ //--- IERC165 functions ---------------//
55
+ function onERC721Received(
56
+ address, // operator
57
+ address, // from
58
+ uint256, // tokenId
59
+ bytes calldata // data
60
+ )
61
+ external
62
+ virtual
63
+ returns (bytes4)
64
+ {
65
+ return IERC721Receiver.onERC721Received.selector;
66
+ }
67
+
68
+ function _setBeneficiary(address beneficiary) internal {
69
+
70
+ }
71
+
72
+ function _setBeneficiary(NftId policyId, address beneficiary) internal {
73
+
74
+ }
75
+
76
+ function _getPolicyHolderStorage() private pure returns (PolicyHolderStorage storage $) {
77
+ assembly {
78
+ $.slot := POLICY_HOLDER_STORAGE_LOCATION_V1
79
+ }
80
+ }
81
+ }
@@ -0,0 +1,169 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.20;
3
+
4
+ import {ITransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
5
+
6
+ import {Blocknumber, blockNumber} from "../types/Blocknumber.sol";
7
+ import {IVersionable} from "./IVersionable.sol";
8
+ import {NftOwnable} from "./NftOwnable.sol";
9
+ import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
10
+ import {ProxyAdmin} from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
11
+ import {Timestamp, TimestampLib} from "../types/Timestamp.sol";
12
+ import {UpgradableProxyWithAdmin} from "./UpgradableProxyWithAdmin.sol";
13
+ import {Version, VersionLib} from "../types/Version.sol";
14
+
15
+ /// @dev manages proxy deployments for upgradable contracs of type IVersionable
16
+ contract ProxyManager is
17
+ NftOwnable
18
+ {
19
+
20
+ struct VersionInfo {
21
+ Version version;
22
+ address implementation;
23
+ address activatedBy;
24
+ Timestamp activatedAt;
25
+ Blocknumber activatedIn;
26
+ }
27
+
28
+ event LogProxyManagerVersionableDeployed(address indexed proxy, address initialImplementation);
29
+ event LogProxyManagerVersionableUpgraded(address indexed proxy, address upgradedImplementation);
30
+
31
+ error ErrorProxyManagerAlreadyDeployed();
32
+ error ErrorProxyManagerNotYetDeployed();
33
+
34
+ error ErrorProxyManagerZeroVersion();
35
+ error ErrorProxyManagerNextVersionNotIncreasing(Version nextVersion);
36
+
37
+ UpgradableProxyWithAdmin internal _proxy;
38
+
39
+ // state to keep version history
40
+ mapping(Version version => VersionInfo info) _versionHistory;
41
+ Version [] _versions;
42
+
43
+ /// @dev only used to capture proxy owner
44
+ constructor(address registry)
45
+ {
46
+ initializeProxyManager(registry);
47
+ }
48
+
49
+ function initializeProxyManager(address registry)
50
+ public
51
+ initializer()
52
+ {
53
+ initializeNftOwnable(msg.sender, registry);
54
+ }
55
+
56
+ /// @dev deploy initial contract
57
+ function deploy(address initialImplementation, bytes memory initializationData)
58
+ public
59
+ virtual
60
+ onlyOwner()
61
+ returns (IVersionable versionable)
62
+ {
63
+ if (_versions.length > 0) {
64
+ revert ErrorProxyManagerAlreadyDeployed();
65
+ }
66
+
67
+ address currentProxyOwner = getOwner(); // used by implementation
68
+ address initialProxyAdminOwner = address(this); // used by proxy
69
+
70
+ _proxy = new UpgradableProxyWithAdmin(
71
+ initialImplementation,
72
+ initialProxyAdminOwner,
73
+ getDeployData(currentProxyOwner, initializationData)
74
+ );
75
+
76
+ versionable = IVersionable(address(_proxy));
77
+ _updateVersionHistory(versionable.getVersion(), initialImplementation, currentProxyOwner);
78
+
79
+ emit LogProxyManagerVersionableDeployed(address(_proxy), initialImplementation);
80
+ }
81
+
82
+ /// @dev upgrade existing contract
83
+ function upgrade(address newImplementation, bytes memory upgradeData)
84
+ public
85
+ virtual
86
+ onlyOwner()
87
+ returns (IVersionable versionable)
88
+ {
89
+ if (_versions.length == 0) {
90
+ revert ErrorProxyManagerNotYetDeployed();
91
+ }
92
+
93
+ address currentProxyOwner = getOwner();
94
+ ProxyAdmin proxyAdmin = getProxy().getProxyAdmin();
95
+ ITransparentUpgradeableProxy proxy = ITransparentUpgradeableProxy(address(_proxy));
96
+
97
+ proxyAdmin.upgradeAndCall(
98
+ proxy,
99
+ newImplementation,
100
+ getUpgradeData(upgradeData));
101
+
102
+ versionable = IVersionable(address(_proxy));
103
+ _updateVersionHistory(versionable.getVersion(), newImplementation, currentProxyOwner);
104
+
105
+ emit LogProxyManagerVersionableUpgraded(address(_proxy), newImplementation);
106
+
107
+ }
108
+
109
+ function getDeployData(address proxyOwner, bytes memory deployData) public pure returns (bytes memory data) {
110
+ return abi.encodeWithSelector(
111
+ IVersionable.initializeVersionable.selector,
112
+ proxyOwner,
113
+ deployData);
114
+ }
115
+
116
+ function getUpgradeData(bytes memory upgradeData) public pure returns (bytes memory data) {
117
+ return abi.encodeWithSelector(
118
+ IVersionable.upgradeVersionable.selector,
119
+ upgradeData);
120
+ }
121
+
122
+ function getProxy() public returns (UpgradableProxyWithAdmin) {
123
+ return _proxy;
124
+ }
125
+
126
+ function getVersion() external view virtual returns(Version) {
127
+ return IVersionable(address(_proxy)).getVersion();
128
+ }
129
+
130
+ function getVersionCount() external view returns(uint256) {
131
+ return _versions.length;
132
+ }
133
+
134
+ function getVersion(uint256 idx) external view returns(Version) {
135
+ return _versions[idx];
136
+ }
137
+
138
+ function getVersionInfo(Version _version) external view returns(VersionInfo memory) {
139
+ return _versionHistory[_version];
140
+ }
141
+
142
+ function _updateVersionHistory(
143
+ Version newVersion,
144
+ address implementation,
145
+ address activatedBy
146
+ )
147
+ private
148
+ {
149
+ if(newVersion == VersionLib.zeroVersion()) {
150
+ revert ErrorProxyManagerZeroVersion();
151
+ }
152
+
153
+ if(_versions.length > 0) {
154
+ if(newVersion.toInt() <= _versions[_versions.length-1].toInt()) {
155
+ revert ErrorProxyManagerNextVersionNotIncreasing(newVersion);
156
+ }
157
+ }
158
+
159
+ // update version history
160
+ _versions.push(newVersion);
161
+ _versionHistory[newVersion] = VersionInfo(
162
+ newVersion,
163
+ implementation,
164
+ activatedBy,
165
+ TimestampLib.blockTimestamp(),
166
+ blockNumber()
167
+ );
168
+ }
169
+ }
@@ -1,86 +1,74 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
- pragma solidity ^0.8.19;
2
+ pragma solidity ^0.8.20;
3
+
4
+ import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
3
5
 
4
6
  import {NftId, zeroNftId} from "../types/NftId.sol";
7
+ import {NftOwnable} from "../shared/NftOwnable.sol";
5
8
  import {ObjectType} from "../types/ObjectType.sol";
6
9
 
7
10
  import {IRegistry} from "../registry/IRegistry.sol";
8
11
  import {IRegisterable} from "./IRegisterable.sol";
12
+ import {Versionable} from "./Versionable.sol";
9
13
 
10
- import {ERC165} from "./ERC165.sol";
11
-
12
- abstract contract Registerable is
13
- ERC165,
14
+ contract Registerable is
15
+ NftOwnable,
14
16
  IRegisterable
15
17
  {
16
- IRegistry internal immutable _registry;
17
- NftId internal immutable _parentNftId;
18
- address internal immutable _initialOwner;
18
+ // keccak256(abi.encode(uint256(keccak256("gif-next.contracts.shared.Registerable.sol")) - 1)) & ~bytes32(uint256(0xff));
19
+ bytes32 public constant REGISTERABLE_LOCATION_V1 = 0x6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa300;
20
+
21
+ struct RegisterableStorage {
22
+ NftId _parentNftId;
23
+ ObjectType _objectType;
24
+ bool _isInterceptor;
25
+ bytes _data;
26
+ }
19
27
 
20
- modifier onlyOwner() virtual {
21
- require(
22
- msg.sender == getOwner(),
23
- "ERROR:RGB-001:NOT_OWNER"
24
- );
25
- _;
28
+ function _getRegisterableStorage() private pure returns (RegisterableStorage storage $) {
29
+ assembly {
30
+ $.slot := REGISTERABLE_LOCATION_V1
31
+ }
26
32
  }
27
33
 
28
- constructor(
34
+ function initializeRegisterable(
29
35
  address registryAddress,
30
- NftId parentNftId
36
+ NftId parentNftId,
37
+ ObjectType objectType,
38
+ bool isInterceptor,
39
+ address initialOwner,
40
+ bytes memory data
31
41
  )
32
- ERC165()
42
+ public
43
+ virtual
44
+ onlyInitializing
33
45
  {
34
- require(
35
- address(registryAddress) != address(0),
36
- "ERROR:RGB-010:REGISTRY_ZERO"
37
- );
38
-
39
- _registry = IRegistry(registryAddress);
40
- require(
41
- _registry.supportsInterface(type(IRegistry).interfaceId),
42
- "ERROR:RGB-011:NOT_REGISTRY"
43
- );
44
-
45
- _parentNftId = parentNftId;
46
- require(
47
- _registry.isRegistered(_parentNftId),
48
- "ERROR:RGB-012:PARENT_NOT_REGISTERED"
49
- );
50
-
51
- _initialOwner = msg.sender;
52
-
53
- // register support for IRegisterable
54
- _registerInterface(type(IRegisterable).interfaceId);
55
- }
56
-
57
- // from IRegistryLinked
58
- function register() public onlyOwner virtual override returns (NftId nftId) {
59
- return _registry.register(address(this));
46
+ initializeNftOwnable(
47
+ initialOwner,
48
+ registryAddress);
49
+
50
+ RegisterableStorage storage $ = _getRegisterableStorage();
51
+ $._parentNftId = parentNftId;
52
+ $._objectType = objectType;
53
+ $._isInterceptor = isInterceptor;
54
+ $._data = data;
60
55
  }
61
56
 
62
- function getRegistry() public view virtual override returns (IRegistry registry) {
63
- return _registry;
64
- }
65
-
66
- function getOwner() public view virtual override returns (address owner) {
67
- NftId nftId = _registry.getNftId(address(this));
68
- if(nftId == zeroNftId()) {
69
- return _initialOwner;
70
- }
71
-
72
- return _registry.getOwner(nftId);
73
- }
74
57
 
75
- function getNftId() public view override returns (NftId nftId) {
76
- return _registry.getNftId(address(this));
77
- }
78
-
79
- function getParentNftId() public view override returns (NftId nftId) {
80
- return _parentNftId;
81
- }
82
-
83
- function getData() public view virtual override returns (bytes memory data) {
84
- return "";
58
+ function getInitialInfo()
59
+ public
60
+ view
61
+ virtual
62
+ returns (IRegistry.ObjectInfo memory info)
63
+ {
64
+ RegisterableStorage memory $ = _getRegisterableStorage();
65
+ info = IRegistry.ObjectInfo(
66
+ zeroNftId(),
67
+ $._parentNftId,
68
+ $._objectType,
69
+ $._isInterceptor,
70
+ address(this),
71
+ getOwner(),
72
+ $._data);
85
73
  }
86
- }
74
+ }
@@ -0,0 +1,48 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.20;
3
+
4
+ import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
5
+ import {IRegistry} from "../registry/IRegistry.sol";
6
+ import {IRegistryLinked} from "./IRegistryLinked.sol";
7
+
8
+ contract RegistryLinked is
9
+ Initializable,
10
+ IRegistryLinked
11
+ {
12
+
13
+ IRegistry private _registry;
14
+
15
+ /// @dev initialization for upgradable contracts
16
+ // used in _initializeRegisterable
17
+ function initializeRegistryLinked(
18
+ address registryAddress
19
+ )
20
+ public
21
+ virtual
22
+ onlyInitializing()
23
+ {
24
+ if (registryAddress.code.length == 0) {
25
+ revert ErrorNotRegistry(registryAddress);
26
+ }
27
+
28
+ _registry = IRegistry(registryAddress);
29
+
30
+ try _registry.supportsInterface(type(IRegistry).interfaceId) returns (bool isRegistry) {
31
+ if (!isRegistry) {
32
+ revert ErrorNotRegistry(registryAddress);
33
+ }
34
+ } catch {
35
+ revert ErrorNotRegistry(registryAddress);
36
+ }
37
+ }
38
+
39
+
40
+ function getRegistry() public view returns (IRegistry) {
41
+ return _registry;
42
+ }
43
+
44
+
45
+ function getRegistryAddress() public view returns (address) {
46
+ return address(_registry);
47
+ }
48
+ }