@etherisc/gif-next 0.0.2-e9a637d-547 → 0.0.2-eadf4ad-211

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 (417) hide show
  1. package/README.md +6 -12
  2. package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +4 -0
  3. package/artifacts/contracts/{components → distribution}/Distribution.sol/Distribution.json +61 -14
  4. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +4 -0
  5. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +1556 -0
  6. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +4 -0
  7. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +819 -0
  8. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +4 -0
  9. package/artifacts/contracts/{components → distribution}/IDistributionComponent.sol/IDistributionComponent.json +45 -14
  10. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +4 -0
  11. package/artifacts/contracts/{instance/service → distribution}/IDistributionService.sol/IDistributionService.json +24 -274
  12. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +1 -1
  13. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +6 -6
  14. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  15. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +93 -13
  16. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  17. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +5 -43
  18. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  19. package/artifacts/contracts/instance/Instance.sol/Instance.json +109 -29
  20. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
  21. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +6 -6
  22. package/artifacts/contracts/instance/InstanceAuthorizationsLib.sol/InstanceAuthorizationsLib.dbg.json +4 -0
  23. package/artifacts/contracts/instance/InstanceAuthorizationsLib.sol/InstanceAuthorizationsLib.json +124 -0
  24. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  25. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +349 -64
  26. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  27. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +49 -278
  28. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  29. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +83 -133
  30. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
  31. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +427 -257
  32. package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.dbg.json +4 -0
  33. package/artifacts/contracts/instance/{Cloneable.sol → base/Cloneable.sol}/Cloneable.json +1 -1
  34. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  35. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.json +49 -0
  36. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  37. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  38. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +61 -12
  39. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  40. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +8 -8
  41. package/artifacts/contracts/instance/base/ObjectManager.sol/ObjectManager.dbg.json +4 -0
  42. package/artifacts/contracts/instance/{ObjectManager.sol → base/ObjectManager.sol}/ObjectManager.json +3 -3
  43. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
  44. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  45. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
  46. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  47. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  48. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  49. package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +1 -1
  50. package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +1 -1
  51. package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +4 -0
  52. package/artifacts/contracts/pool/BundleService.sol/BundleService.json +1288 -0
  53. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +4 -0
  54. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +735 -0
  55. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +4 -0
  56. package/artifacts/contracts/{instance/service → pool}/IBundleService.sol/IBundleService.json +105 -29
  57. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +4 -0
  58. package/artifacts/contracts/{components → pool}/IPoolComponent.sol/IPoolComponent.json +56 -25
  59. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +4 -0
  60. package/artifacts/contracts/{instance/service → pool}/IPoolService.sol/IPoolService.json +272 -39
  61. package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +4 -0
  62. package/artifacts/contracts/{components → pool}/Pool.sol/Pool.json +56 -25
  63. package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +4 -0
  64. package/artifacts/contracts/pool/PoolService.sol/PoolService.json +1622 -0
  65. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +4 -0
  66. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +747 -0
  67. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +4 -0
  68. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +918 -0
  69. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +4 -0
  70. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +687 -0
  71. package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +4 -0
  72. package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +1386 -0
  73. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +4 -0
  74. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +787 -0
  75. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +4 -0
  76. package/artifacts/contracts/{instance/service/IClaimService.sol/IClaimService.json → product/IApplicationService.sol/IApplicationService.json} +119 -101
  77. package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +4 -0
  78. package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +753 -0
  79. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +4 -0
  80. package/artifacts/contracts/{instance/service → product}/IPolicyService.sol/IPolicyService.json +129 -84
  81. package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +4 -0
  82. package/artifacts/contracts/{instance/service/IApplicationService.sol/IApplicationService.json → product/IPricingService.sol/IPricingService.json} +63 -175
  83. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +4 -0
  84. package/artifacts/contracts/{components → product}/IProductComponent.sol/IProductComponent.json +53 -22
  85. package/artifacts/contracts/product/IProductService.sol/IProductService.dbg.json +4 -0
  86. package/artifacts/contracts/{instance/service → product}/IProductService.sol/IProductService.json +6 -14
  87. package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +4 -0
  88. package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +1281 -0
  89. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +4 -0
  90. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +779 -0
  91. package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +4 -0
  92. package/artifacts/contracts/product/PricingService.sol/PricingService.json +1004 -0
  93. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +4 -0
  94. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +727 -0
  95. package/artifacts/contracts/product/Product.sol/Product.dbg.json +4 -0
  96. package/artifacts/contracts/{components → product}/Product.sol/Product.json +53 -22
  97. package/artifacts/contracts/product/ProductService.sol/ProductService.dbg.json +4 -0
  98. package/artifacts/contracts/product/ProductService.sol/ProductService.json +864 -0
  99. package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.dbg.json +4 -0
  100. package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.json +679 -0
  101. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  102. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  103. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +73 -13
  104. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  105. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +154 -60
  106. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  107. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  108. package/artifacts/contracts/registry/Registry.sol/Registry.json +97 -29
  109. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +1 -1
  110. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +50 -97
  111. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  112. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +174 -80
  113. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  114. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +78 -47
  115. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +1 -1
  116. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +369 -82
  117. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  118. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +14 -27
  119. package/artifacts/contracts/shared/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +4 -0
  120. package/artifacts/contracts/{instance → shared}/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.json +3 -3
  121. package/artifacts/contracts/shared/Component.sol/Component.dbg.json +4 -0
  122. package/artifacts/contracts/{components → shared}/Component.sol/Component.json +38 -7
  123. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +4 -0
  124. package/artifacts/contracts/{instance/base → shared}/ComponentService.sol/ComponentService.json +38 -14
  125. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  126. package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +4 -0
  127. package/artifacts/contracts/{components → shared}/IComponent.sol/IComponent.json +38 -7
  128. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  129. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +0 -13
  130. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
  131. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +69 -9
  132. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  133. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +0 -13
  134. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  135. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.json +0 -13
  136. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  137. package/artifacts/contracts/shared/IService.sol/IService.json +5 -13
  138. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  139. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  140. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +8 -21
  141. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
  142. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +80 -26
  143. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  144. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +49 -33
  145. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  146. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +8 -21
  147. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
  148. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -15
  149. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  150. package/artifacts/contracts/shared/Service.sol/Service.json +5 -13
  151. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  152. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +24 -6
  153. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  154. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +2 -2
  155. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  156. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +4 -0
  157. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +523 -0
  158. package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +4 -0
  159. package/artifacts/contracts/staking/StakingService.sol/StakingService.json +767 -0
  160. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +4 -0
  161. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +667 -0
  162. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +4 -0
  163. package/artifacts/contracts/{types → type}/AddressSet.sol/LibAddressSet.json +3 -3
  164. package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +4 -0
  165. package/artifacts/contracts/type/Amount.sol/AmountLib.json +281 -0
  166. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +4 -0
  167. package/artifacts/contracts/{types → type}/Blocknumber.sol/BlocknumberLib.json +3 -3
  168. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +4 -0
  169. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +179 -0
  170. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +4 -0
  171. package/artifacts/contracts/{types → type}/DistributorType.sol/DistributorTypeLib.json +5 -5
  172. package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +4 -0
  173. package/artifacts/contracts/type/Fee.sol/FeeLib.json +312 -0
  174. package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +4 -0
  175. package/artifacts/contracts/{types → type}/Key32.sol/Key32Lib.json +3 -3
  176. package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +4 -0
  177. package/artifacts/contracts/{types → type}/NftId.sol/NftIdLib.json +5 -5
  178. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +4 -0
  179. package/artifacts/contracts/{types → type}/NftIdSet.sol/LibNftIdSet.json +3 -3
  180. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +4 -0
  181. package/artifacts/contracts/{types → type}/ObjectType.sol/ObjectTypeLib.json +3 -3
  182. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +4 -0
  183. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +209 -0
  184. package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +4 -0
  185. package/artifacts/contracts/{types → type}/Referral.sol/ReferralLib.json +5 -5
  186. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +4 -0
  187. package/artifacts/contracts/{types → type}/RiskId.sol/RiskIdLib.json +5 -5
  188. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +4 -0
  189. package/artifacts/contracts/{types → type}/RoleId.sol/RoleIdLib.json +5 -5
  190. package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +4 -0
  191. package/artifacts/contracts/{types → type}/Seconds.sol/SecondsLib.json +3 -3
  192. package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +4 -0
  193. package/artifacts/contracts/{types → type}/StateId.sol/StateIdLib.json +3 -3
  194. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +4 -0
  195. package/artifacts/contracts/{types → type}/Timestamp.sol/TimestampLib.json +20 -7
  196. package/artifacts/contracts/type/UFixed.sol/MathLib.dbg.json +4 -0
  197. package/artifacts/contracts/{types → type}/UFixed.sol/MathLib.json +3 -3
  198. package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +4 -0
  199. package/artifacts/contracts/{types → type}/UFixed.sol/UFixedLib.json +3 -3
  200. package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +4 -0
  201. package/artifacts/contracts/{types → type}/Version.sol/VersionLib.json +3 -3
  202. package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +4 -0
  203. package/artifacts/contracts/{types → type}/Version.sol/VersionPartLib.json +3 -3
  204. package/contracts/{components → distribution}/Distribution.sol +21 -16
  205. package/contracts/{instance/service → distribution}/DistributionService.sol +93 -179
  206. package/contracts/{instance/service → distribution}/DistributionServiceManager.sol +14 -11
  207. package/contracts/{components → distribution}/IDistributionComponent.sol +7 -7
  208. package/contracts/{instance/service → distribution}/IDistributionService.sol +18 -30
  209. package/contracts/instance/BundleManager.sol +8 -9
  210. package/contracts/instance/IInstance.sol +30 -13
  211. package/contracts/instance/IInstanceService.sol +6 -17
  212. package/contracts/instance/Instance.sol +76 -46
  213. package/contracts/instance/InstanceAccessManager.sol +8 -5
  214. package/contracts/instance/InstanceAuthorizationsLib.sol +308 -0
  215. package/contracts/instance/InstanceReader.sol +91 -16
  216. package/contracts/instance/InstanceService.sol +78 -307
  217. package/contracts/instance/InstanceServiceManager.sol +11 -21
  218. package/contracts/instance/InstanceStore.sol +57 -65
  219. package/contracts/instance/{Cloneable.sol → base/Cloneable.sol} +1 -1
  220. package/contracts/instance/base/IKeyValueStore.sol +14 -10
  221. package/contracts/instance/base/ILifecycle.sol +3 -3
  222. package/contracts/instance/base/KeyValueStore.sol +32 -43
  223. package/contracts/instance/base/Lifecycle.sol +17 -5
  224. package/contracts/instance/{ObjectManager.sol → base/ObjectManager.sol} +7 -7
  225. package/contracts/instance/module/IAccess.sol +2 -2
  226. package/contracts/instance/module/IBundle.sol +5 -5
  227. package/contracts/instance/module/IComponents.sol +8 -8
  228. package/contracts/instance/module/IDistribution.sol +7 -6
  229. package/contracts/instance/module/IPolicy.sol +22 -16
  230. package/contracts/instance/module/IRisk.sol +1 -1
  231. package/contracts/instance/module/ISetup.sol +4 -4
  232. package/contracts/instance/module/ITreasury.sol +2 -2
  233. package/contracts/{instance/service → pool}/BundleService.sol +108 -155
  234. package/contracts/pool/BundleServiceManager.sol +42 -0
  235. package/contracts/{instance/service → pool}/IBundleService.sol +43 -18
  236. package/contracts/{components → pool}/IPoolComponent.sol +14 -13
  237. package/contracts/{instance/service → pool}/IPoolService.sol +28 -13
  238. package/contracts/{components → pool}/Pool.sol +20 -21
  239. package/contracts/{instance/service → pool}/PoolService.sol +160 -59
  240. package/contracts/pool/PoolServiceManager.sol +42 -0
  241. package/contracts/product/ApplicationService.sol +187 -0
  242. package/contracts/{instance/service → product}/ApplicationServiceManager.sol +11 -8
  243. package/contracts/product/ClaimService.sol +443 -0
  244. package/contracts/{instance/service → product}/ClaimServiceManager.sol +11 -8
  245. package/contracts/{instance/service → product}/IApplicationService.sol +14 -34
  246. package/contracts/product/IClaimService.sol +93 -0
  247. package/contracts/{instance/service → product}/IPolicyService.sol +34 -26
  248. package/contracts/product/IPricingService.sol +37 -0
  249. package/contracts/{components → product}/IProductComponent.sol +11 -10
  250. package/contracts/{instance/service → product}/IProductService.sol +10 -10
  251. package/contracts/{instance/service → product}/PolicyService.sol +154 -138
  252. package/contracts/product/PolicyServiceManager.sol +42 -0
  253. package/contracts/product/PricingService.sol +276 -0
  254. package/contracts/product/PricingServiceManager.sol +42 -0
  255. package/contracts/{components → product}/Product.sol +160 -74
  256. package/contracts/{instance/service → product}/ProductService.sol +50 -47
  257. package/contracts/product/ProductServiceManager.sol +42 -0
  258. package/contracts/registry/IRegistry.sol +23 -16
  259. package/contracts/registry/IRegistryService.sol +26 -36
  260. package/contracts/registry/Registry.sol +43 -39
  261. package/contracts/registry/RegistryAccessManager.sol +39 -123
  262. package/contracts/registry/RegistryService.sol +32 -83
  263. package/contracts/registry/RegistryServiceManager.sol +21 -11
  264. package/contracts/registry/ReleaseManager.sol +247 -189
  265. package/contracts/registry/TokenRegistry.sol +2 -2
  266. package/contracts/{components → shared}/Component.sol +26 -8
  267. package/contracts/{instance/base → shared}/ComponentService.sol +60 -40
  268. package/contracts/{components → shared}/IComponent.sol +19 -5
  269. package/contracts/shared/INftOwnable.sol +1 -1
  270. package/contracts/shared/IPolicyHolder.sol +24 -10
  271. package/contracts/shared/IRegistryLinked.sol +0 -1
  272. package/contracts/shared/IService.sol +3 -1
  273. package/contracts/shared/IVersionable.sol +1 -1
  274. package/contracts/shared/NftOwnable.sol +1 -3
  275. package/contracts/shared/PolicyHolder.sol +31 -18
  276. package/contracts/shared/ProxyManager.sol +29 -3
  277. package/contracts/shared/Registerable.sol +12 -11
  278. package/contracts/shared/RegistryLinked.sol +0 -5
  279. package/contracts/shared/Service.sol +3 -3
  280. package/contracts/shared/TokenHandler.sol +4 -2
  281. package/contracts/shared/Versionable.sol +1 -1
  282. package/contracts/staking/IStakingService.sol +102 -0
  283. package/contracts/staking/StakingService.sol +169 -0
  284. package/contracts/staking/StakingServiceManager.sol +40 -0
  285. package/contracts/{types → type}/Amount.sol +49 -0
  286. package/contracts/{types → type}/ClaimId.sol +25 -2
  287. package/contracts/{types → type}/Fee.sol +7 -6
  288. package/contracts/{types → type}/NftIdSet.sol +1 -1
  289. package/contracts/{types → type}/ObjectType.sol +10 -5
  290. package/contracts/{types → type}/PayoutId.sol +33 -5
  291. package/contracts/{types → type}/RoleId.sol +50 -8
  292. package/contracts/{types → type}/StateId.sol +6 -2
  293. package/contracts/{types → type}/Timestamp.sol +5 -0
  294. package/package.json +1 -1
  295. package/artifacts/contracts/components/Component.sol/Component.dbg.json +0 -4
  296. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +0 -4
  297. package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +0 -4
  298. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +0 -4
  299. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +0 -4
  300. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +0 -4
  301. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +0 -4
  302. package/artifacts/contracts/components/Product.sol/Product.dbg.json +0 -4
  303. package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +0 -4
  304. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +0 -4
  305. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +0 -4
  306. package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json +0 -4
  307. package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.dbg.json +0 -4
  308. package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.json +0 -1039
  309. package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +0 -4
  310. package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.json +0 -673
  311. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +0 -4
  312. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +0 -1231
  313. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +0 -4
  314. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +0 -721
  315. package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.dbg.json +0 -4
  316. package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.json +0 -817
  317. package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +0 -4
  318. package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.json +0 -641
  319. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +0 -4
  320. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +0 -1798
  321. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +0 -4
  322. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +0 -805
  323. package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.dbg.json +0 -4
  324. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +0 -4
  325. package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.dbg.json +0 -4
  326. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +0 -4
  327. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +0 -4
  328. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +0 -4
  329. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +0 -4
  330. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +0 -4
  331. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +0 -1092
  332. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +0 -4
  333. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +0 -697
  334. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +0 -4
  335. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +0 -1237
  336. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +0 -4
  337. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +0 -661
  338. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +0 -4
  339. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +0 -840
  340. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +0 -4
  341. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +0 -653
  342. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +0 -4
  343. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.json +0 -107
  344. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +0 -4
  345. package/artifacts/contracts/test/TestFee.sol/TestFee.json +0 -119
  346. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +0 -4
  347. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +0 -383
  348. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +0 -4
  349. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +0 -116
  350. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +0 -4
  351. package/artifacts/contracts/test/TestService.sol/TestService.json +0 -596
  352. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +0 -4
  353. package/artifacts/contracts/test/TestToken.sol/TestUsdc.json +0 -376
  354. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +0 -4
  355. package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +0 -218
  356. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +0 -4
  357. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +0 -104
  358. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +0 -4
  359. package/artifacts/contracts/test/Usdc.sol/USDC.json +0 -376
  360. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +0 -4
  361. package/artifacts/contracts/types/Amount.sol/AmountLib.dbg.json +0 -4
  362. package/artifacts/contracts/types/Amount.sol/AmountLib.json +0 -161
  363. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +0 -4
  364. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +0 -4
  365. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.json +0 -10
  366. package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.dbg.json +0 -4
  367. package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.json +0 -100
  368. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +0 -4
  369. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +0 -4
  370. package/artifacts/contracts/types/Fee.sol/FeeLib.json +0 -288
  371. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +0 -4
  372. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +0 -4
  373. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +0 -4
  374. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +0 -4
  375. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.json +0 -100
  376. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +0 -4
  377. package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.dbg.json +0 -4
  378. package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.json +0 -100
  379. package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +0 -4
  380. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +0 -4
  381. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +0 -4
  382. package/artifacts/contracts/types/Seconds.sol/SecondsLib.dbg.json +0 -4
  383. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +0 -4
  384. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +0 -4
  385. package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +0 -4
  386. package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +0 -4
  387. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +0 -4
  388. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +0 -4
  389. package/contracts/instance/service/ApplicationService.sol +0 -351
  390. package/contracts/instance/service/BundleServiceManager.sol +0 -51
  391. package/contracts/instance/service/ClaimService.sol +0 -151
  392. package/contracts/instance/service/IClaimService.sol +0 -61
  393. package/contracts/instance/service/PolicyServiceManager.sol +0 -54
  394. package/contracts/instance/service/PoolServiceManager.sol +0 -51
  395. package/contracts/instance/service/ProductServiceManager.sol +0 -54
  396. package/contracts/shared/ContractDeployerLib.sol +0 -72
  397. package/contracts/test/TestFee.sol +0 -25
  398. package/contracts/test/TestRegisterable.sol +0 -18
  399. package/contracts/test/TestRoleId.sol +0 -14
  400. package/contracts/test/TestService.sol +0 -25
  401. package/contracts/test/TestToken.sol +0 -26
  402. package/contracts/test/TestVersion.sol +0 -44
  403. package/contracts/test/TestVersionable.sol +0 -17
  404. package/contracts/test/Usdc.sol +0 -26
  405. package/contracts/types/ChainId.sol +0 -38
  406. package/contracts/types/NumberId.sol +0 -52
  407. /package/contracts/{instance → shared}/AccessManagerUpgradeableInitializeable.sol +0 -0
  408. /package/contracts/{types → type}/AddressSet.sol +0 -0
  409. /package/contracts/{types → type}/Blocknumber.sol +0 -0
  410. /package/contracts/{types → type}/DistributorType.sol +0 -0
  411. /package/contracts/{types → type}/Key32.sol +0 -0
  412. /package/contracts/{types → type}/NftId.sol +0 -0
  413. /package/contracts/{types → type}/Referral.sol +0 -0
  414. /package/contracts/{types → type}/RiskId.sol +0 -0
  415. /package/contracts/{types → type}/Seconds.sol +0 -0
  416. /package/contracts/{types → type}/UFixed.sol +0 -0
  417. /package/contracts/{types → type}/Version.sol +0 -0
@@ -1,33 +1,30 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.19;
3
3
 
4
- import {IComponent} from "../../components/IComponent.sol";
5
- import {IRegistry} from "../../registry/IRegistry.sol";
6
- import {IRegistryService} from "../../registry/IRegistryService.sol";
7
- import {IInstance} from "../../instance/IInstance.sol";
8
- import {IAccess} from "../module/IAccess.sol";
9
- import {ObjectType, INSTANCE, REGISTRY} from "../../types/ObjectType.sol";
10
- import {NftId} from "../../types/NftId.sol";
11
- import {RoleId} from "../../types/RoleId.sol";
12
-
13
- import {Service} from "../../shared/Service.sol";
14
- import {InstanceService} from "../InstanceService.sol";
15
- import {InstanceAccessManager} from "../InstanceAccessManager.sol";
16
-
17
- abstract contract ComponentService is Service {
4
+ import {IComponent} from "./IComponent.sol";
5
+ import {IRegistry} from "../registry/IRegistry.sol";
6
+ import {IRegistryService} from "../registry/IRegistryService.sol";
7
+ import {IInstance} from "../instance/IInstance.sol";
8
+ import {IAccess} from "../instance/module/IAccess.sol";
9
+ import {ObjectType, INSTANCE, REGISTRY} from "../type/ObjectType.sol";
10
+ import {NftId} from "../type/NftId.sol";
11
+ import {RoleId} from "../type/RoleId.sol";
12
+
13
+ import {Service} from "../shared/Service.sol";
14
+ import {InstanceService} from "../instance/InstanceService.sol";
15
+ import {InstanceAccessManager} from "../instance/InstanceAccessManager.sol";
16
+
17
+ abstract contract ComponentService is
18
+ Service
19
+ {
18
20
 
19
21
  error ErrorComponentServiceNotComponent(address component);
20
22
  error ErrorComponentServiceInvalidType(address component, ObjectType requiredType, ObjectType componentType);
21
23
  error ErrorComponentServiceSenderNotOwner(address component, address initialOwner, address sender);
22
24
  error ErrorComponentServiceExpectedRoleMissing(NftId instanceNftId, RoleId requiredRole, address sender);
23
25
  error ErrorComponentServiceComponentLocked(address component);
24
-
25
- /// @dev modifier to check if caller is a registered service
26
- modifier onlyService() {
27
- address caller = msg.sender;
28
- require(getRegistry().isRegisteredService(caller), "ERROR_NOT_SERVICE");
29
- _;
30
- }
26
+ error ErrorComponentServiceSenderNotService(address sender);
27
+ error ErrorComponentServiceComponentTypeInvalid(address component, ObjectType expectedType, ObjectType foundType);
31
28
 
32
29
  // view functions
33
30
 
@@ -39,10 +36,6 @@ abstract contract ComponentService is Service {
39
36
  return InstanceService(_getServiceAddress(INSTANCE()));
40
37
  }
41
38
 
42
- function _getServiceAddress(ObjectType domain) internal view returns (address) {
43
- return getRegistry().getServiceAddress(domain, getVersion().toMajorPart());
44
- }
45
-
46
39
  // internal functions
47
40
  function _checkComponentForRegistration(
48
41
  address componentAddress,
@@ -88,34 +81,61 @@ abstract contract ComponentService is Service {
88
81
  }
89
82
 
90
83
  // internal view functions
91
-
92
- function _getAndVerifyComponentInfoAndInstance(
93
- ObjectType expectedType
84
+ function _getAndVerifyCallingComponentAndInstance(
85
+ ObjectType expectedType // assume always of `component` type
94
86
  )
95
87
  internal
96
88
  view
97
89
  returns(
98
- NftId nftId,
99
- IRegistry.ObjectInfo memory info,
90
+ NftId componentNftId,
91
+ IRegistry.ObjectInfo memory componentInfo,
100
92
  IInstance instance
101
93
  )
102
94
  {
103
- IRegistry registry = getRegistry();
104
-
105
- info = registry.getObjectInfo(msg.sender);
106
- require(info.objectType == expectedType, "OBJECT_TYPE_INVALID");
95
+ componentNftId = getRegistry().getNftId(msg.sender);
96
+ (componentInfo, instance) = _getAndVerifyComponentInfoAndInstance(componentNftId, expectedType);
107
97
 
108
- nftId = info.nftId;
109
- instance = _getInstance(info.parentNftId);
110
-
111
- if (instance.getInstanceAccessManager().isTargetLocked(info.objectAddress)) {
112
- revert IAccess.ErrorIAccessTargetLocked(info.objectAddress);
98
+ // locked component can not call services
99
+ if (instance.getInstanceAccessManager().isTargetLocked(componentInfo.objectAddress)) {
100
+ revert IAccess.ErrorIAccessTargetLocked(componentInfo.objectAddress);
113
101
  }
114
102
  }
115
103
 
104
+ function _getAndVerifyComponentInfoAndInstance(
105
+ NftId componentNftId,
106
+ ObjectType expectedType // assume always of `component` type
107
+ )
108
+ internal
109
+ view
110
+ returns(
111
+ IRegistry.ObjectInfo memory componentInfo,
112
+ IInstance instance
113
+ )
114
+ {
115
+ componentInfo = getRegistry().getObjectInfo(componentNftId);
116
+ if(componentInfo.objectType != expectedType) {
117
+ revert ErrorComponentServiceComponentTypeInvalid(
118
+ componentInfo.objectAddress,
119
+ expectedType,
120
+ componentInfo.objectType);
121
+ }
122
+
123
+ instance = _getInstance(componentInfo.parentNftId);
124
+ }
125
+ // assume componentNftId is always of `instance` type
116
126
  function _getInstance(NftId instanceNftId) internal view returns (IInstance) {
117
127
  return IInstance(
118
128
  getRegistry().getObjectInfo(
119
129
  instanceNftId).objectAddress);
120
130
  }
121
- }
131
+ // assume componentNftId is always of `component` type
132
+ /*function _getInstanceForComponent(NftId componentNftId) internal view returns (IInstance) {
133
+ NftId instanceNftId = getRegistry().getObjectInfo(componentNftId).parentNftId;
134
+ address instanceAddress = getRegistry().getObjectInfo(instanceNftId).objectAddress;
135
+ return IInstance(instanceAddress);
136
+ }*/
137
+
138
+ function _getServiceAddress(ObjectType domain) internal view returns (address) {
139
+ return getRegistry().getServiceAddress(domain, getVersion().toMajorPart());
140
+ }
141
+ }
@@ -7,11 +7,12 @@ import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IER
7
7
  import {IComponents} from "../instance/module/IComponents.sol";
8
8
  import {IInstance} from "../instance/IInstance.sol";
9
9
  import {IInstanceService} from "../instance/IInstanceService.sol";
10
- import {IProductService} from "../instance/service/IProductService.sol";
10
+ import {IProductService} from "../product/IProductService.sol";
11
11
  import {IRegisterable} from "../shared/IRegisterable.sol";
12
12
  import {ITransferInterceptor} from "../registry/ITransferInterceptor.sol";
13
- import {NftId} from "../types/NftId.sol";
14
- import {ObjectType} from "../types/ObjectType.sol";
13
+ import {NftId} from "../type/NftId.sol";
14
+ import {ObjectType} from "../type/ObjectType.sol";
15
+ import {TokenHandler} from "../shared/TokenHandler.sol";
15
16
 
16
17
  /// @dev component base class
17
18
  /// component examples are product, distribution, pool and oracle
@@ -29,9 +30,13 @@ interface IComponent is
29
30
  error ErrorComponentWalletAddressIsSameAsCurrent();
30
31
  error ErrorComponentWalletAllowanceTooSmall(address oldWallet, address newWallet, uint256 allowance, uint256 balance);
31
32
 
33
+ error ErrorComponentWalletNotComponent();
34
+
32
35
  event LogComponentWalletAddressChanged(address oldWallet, address newWallet);
33
36
  event LogComponentWalletTokensTransferred(address from, address to, uint256 amount);
34
37
 
38
+ event LogComponentTokenHandlerApproved(uint256 limit);
39
+
35
40
  /// @dev locks component to disable functions that may change state related to this component, the only exception is function "unlock"
36
41
  /// only component owner (nft holder) is authorizes to call this function
37
42
  function lock() external;
@@ -40,6 +45,11 @@ interface IComponent is
40
45
  /// only component owner (nft holder) is authorizes to call this function
41
46
  function unlock() external;
42
47
 
48
+ /// @dev approves token hanlder to spend up to the specified amount of tokens
49
+ /// reverts if component wallet is not component itself
50
+ /// only component owner (nft holder) is authorizes to call this function
51
+ function approveTokenHandler(uint256 spendingLimitAmount) external;
52
+
43
53
  /// @dev sets the wallet address for the component
44
54
  /// if the current wallet has tokens, these will be transferred
45
55
  /// if the new wallet address is externally owned, an approval from the
@@ -49,6 +59,9 @@ interface IComponent is
49
59
  /// @dev only product service may set product nft id during registration of product setup
50
60
  function setProductNftId(NftId productNftId) external;
51
61
 
62
+ /// @dev defines the instance to which this component is linked to
63
+ function getInstance() external view returns (IInstance instance);
64
+
52
65
  /// @dev returns the name of this component
53
66
  /// to successfully register the component with an instance the name MUST be unique in the linked instance
54
67
  function getName() external view returns (string memory name);
@@ -56,8 +69,9 @@ interface IComponent is
56
69
  /// @dev defines which ERC20 token is used by this component
57
70
  function getToken() external view returns (IERC20Metadata token);
58
71
 
59
- /// @dev defines the instance to which this component is linked to
60
- function getInstance() external view returns (IInstance instance);
72
+ /// @dev returns token handler for this component
73
+ /// only registered components return a non zero token handler
74
+ function getTokenHandler() external view returns (TokenHandler tokenHandler);
61
75
 
62
76
  /// @dev defines the wallet address used to hold the ERC20 tokens related to this component
63
77
  /// the default address is the component token address
@@ -4,7 +4,7 @@ pragma solidity ^0.8.20;
4
4
  import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
5
5
 
6
6
  import {IRegistryLinked} from "./IRegistryLinked.sol";
7
- import {NftId} from "../types/NftId.sol";
7
+ import {NftId} from "../type/NftId.sol";
8
8
 
9
9
  interface INftOwnable is
10
10
  IERC165,
@@ -4,23 +4,37 @@ pragma solidity ^0.8.20;
4
4
  import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
5
5
  import {IERC721Receiver} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
6
6
 
7
- import {IRegistry} from "../registry/IRegistry.sol";
8
- import {NftId} from "../types/NftId.sol";
9
- import {NumberId} from "../types/NumberId.sol";
7
+ import {Amount} from "../type/Amount.sol";
8
+ import {ClaimId} from "../type/ClaimId.sol";
9
+ import {IRegistryLinked} from "../shared/IRegistryLinked.sol";
10
+ import {NftId} from "../type/NftId.sol";
11
+ import {PayoutId} from "../type/PayoutId.sol";
10
12
 
11
13
  /// @dev generic interface for contracts that need to hold policies and receive payouts
12
14
  /// GIF will notify policy holder contracts for policy creation and payout execution
13
- ///
15
+ interface IPolicyHolder is
16
+ IERC165,
17
+ IERC721Receiver,
18
+ IRegistryLinked
19
+ {
14
20
 
15
- interface IPolicyHolder is IERC165, IERC721Receiver {
21
+ /// @dev callback function that will be called after successful policy activation
22
+ /// active policies may open claims under the activated policy
23
+ function policyActivated(NftId policyNftId) external;
16
24
 
17
- /// @dev callback function that will be called after successful policy creation
18
- function policyCreatedCallback(NftId policyNftId) external;
25
+ /// @dev callback function to indicate the specified policy has expired
26
+ /// expired policies may no longer open claims
27
+ /// it is optional for products to notifiy policy holder of expired claims
28
+ function policyExpired(NftId policyNftId) external;
29
+
30
+ /// @dev callback function to notify the confirmation of the specified claim
31
+ /// active policies may open claims under the activated policy
32
+ function claimConfirmed(NftId policyNftId, ClaimId claimId, Amount amount) external;
19
33
 
20
34
  /// @dev callback function that will be called after a successful payout
21
- function payoutExecutedCallback(NftId policyNftId, NumberId payoutId, address beneficiary, uint256 amount) external;
35
+ function payoutExecuted(NftId policyNftId, PayoutId payoutId, address beneficiary, Amount amount) external;
22
36
 
23
- /// @dev determines beneficiary address that will be used in payouts targeting this contract
37
+ /// @dev determines policy and claim specific beneficiary address
24
38
  /// returned address will override GIF default where the policy nft holder is treated as beneficiary
25
- function getBeneficiary(NftId policyId, NumberId claimId) external view returns (address beneficiary);
39
+ function getBeneficiary(NftId policyNftId, ClaimId claimId) external view returns (address beneficiary);
26
40
  }
@@ -8,5 +8,4 @@ interface IRegistryLinked {
8
8
  error ErrorNotRegistry(address registryAddress);
9
9
 
10
10
  function getRegistry() external view returns (IRegistry);
11
- function getRegistryAddress() external view returns (address);
12
11
  }
@@ -5,12 +5,14 @@ import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessMana
5
5
 
6
6
  import {IRegisterable} from "./IRegisterable.sol";
7
7
  import {IVersionable} from "./IVersionable.sol";
8
- import {ObjectType} from "../types/ObjectType.sol";
8
+ import {ObjectType} from "../type/ObjectType.sol";
9
9
 
10
10
  interface IService is
11
11
  IRegisterable,
12
12
  IVersionable,
13
13
  IAccessManaged
14
14
  {
15
+ error ErrorServiceNotImplemented();
16
+
15
17
  function getDomain() external pure returns(ObjectType serviceDomain);
16
18
  }
@@ -1,7 +1,7 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- import {Version} from "../types/Version.sol";
4
+ import {Version} from "../type/Version.sol";
5
5
 
6
6
  /// IMPORTANT
7
7
  // Upgradeable contract MUST:
@@ -1,11 +1,9 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- // import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
5
-
6
4
  import {ERC165} from "./ERC165.sol";
7
5
  import {INftOwnable} from "./INftOwnable.sol";
8
- import {NftId} from "../types/NftId.sol";
6
+ import {NftId} from "../type/NftId.sol";
9
7
  import {RegistryLinked} from "./RegistryLinked.sol";
10
8
 
11
9
  contract NftOwnable is
@@ -5,11 +5,12 @@ import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
5
5
  import {IERC721Receiver} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
6
6
  import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
7
7
 
8
+ import {Amount} from "../type/Amount.sol";
9
+ import {ClaimId, ClaimIdLib} from "../type/ClaimId.sol";
8
10
  import {ERC165} from "./ERC165.sol";
9
11
  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";
12
+ import {NftId} from "../type/NftId.sol";
13
+ import {PayoutId} from "../type/PayoutId.sol";
13
14
  import {RegistryLinked} from "./RegistryLinked.sol";
14
15
 
15
16
  /// @dev template implementation for IPolicyHolder
@@ -22,33 +23,43 @@ contract PolicyHolder is
22
23
  // TODO fix address
23
24
  bytes32 public constant POLICY_HOLDER_STORAGE_LOCATION_V1 = 0x07ebcf49758b6ed3af50fa146bec0abe157c0218fe65dc0874c286e9d5da4f00;
24
25
 
25
- // TODO uncomment/fix/refactor
26
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;
27
+ mapping(NftId policyId => mapping(ClaimId claimId => address beneficiary)) _beneficiary;
30
28
  }
31
29
 
32
30
  function initializePolicyHolder(
33
- address registryAddress
31
+ address registryAddress,
32
+ address beneficiaryDefault
34
33
  )
35
34
  public
36
35
  virtual
37
36
  onlyInitializing()
38
37
  {
39
38
  initializeRegistryLinked(registryAddress);
39
+ registerInterface(type(IPolicyHolder).interfaceId);
40
40
  }
41
41
 
42
42
  /// @dev empty default implementation
43
- function policyCreatedCallback(NftId policyNftId) external virtual { }
43
+ function policyActivated(NftId policyNftId) external {}
44
44
 
45
45
  /// @dev empty default implementation
46
- function payoutExecutedCallback(NftId policyNftId, NumberId payoutId, address beneficiary, uint256 amount) external virtual { }
46
+ function policyExpired(NftId policyNftId) external {}
47
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
48
+ /// @dev empty default implementation
49
+ function claimConfirmed(NftId policyNftId, ClaimId claimId, Amount amount) external {}
50
+
51
+ /// @dev empty default implementation
52
+ function payoutExecuted(NftId policyNftId, PayoutId payoutId, address beneficiary, Amount amount) external {}
53
+
54
+ /// @dev returns claim specific beneficiary
55
+ /// when no such beneficiary is defined the policy specific beneficiary is returned
56
+ function getBeneficiary(NftId policyNftId, ClaimId claimId) external virtual view returns (address beneficiary) {
57
+ beneficiary = _getPolicyHolderStorage()._beneficiary[policyNftId][claimId];
58
+
59
+ // fallback to claim independent beneficiary
60
+ if(beneficiary == address(0) && claimId.gtz()) {
61
+ beneficiary = _getPolicyHolderStorage()._beneficiary[policyNftId][ClaimIdLib.zero()];
62
+ }
52
63
  }
53
64
 
54
65
  //--- IERC165 functions ---------------//
@@ -65,12 +76,14 @@ contract PolicyHolder is
65
76
  return IERC721Receiver.onERC721Received.selector;
66
77
  }
67
78
 
68
- function _setBeneficiary(address beneficiary) internal {
69
-
79
+ /// @dev sets policy specific beneficiary (used when no claim specific beneficiary is defined)
80
+ function _setBeneficiary(NftId policyNftId, address beneficiary) internal {
81
+ _setBeneficiary(policyNftId, ClaimIdLib.zero(), beneficiary);
70
82
  }
71
83
 
72
- function _setBeneficiary(NftId policyId, address beneficiary) internal {
73
-
84
+ /// @dev sets policy and claim specific beneficiary
85
+ function _setBeneficiary(NftId policyNftId, ClaimId claimId, address beneficiary) internal {
86
+ _getPolicyHolderStorage()._beneficiary[policyNftId][claimId] = beneficiary;
74
87
  }
75
88
 
76
89
  function _getPolicyHolderStorage() private pure returns (PolicyHolderStorage storage $) {
@@ -2,15 +2,16 @@
2
2
  pragma solidity ^0.8.20;
3
3
 
4
4
  import {ITransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
5
+ import {Create2} from "@openzeppelin/contracts/utils/Create2.sol";
5
6
 
6
- import {Blocknumber, blockNumber} from "../types/Blocknumber.sol";
7
+ import {Blocknumber, blockNumber} from "../type/Blocknumber.sol";
7
8
  import {IVersionable} from "./IVersionable.sol";
8
9
  import {NftOwnable} from "./NftOwnable.sol";
9
10
  import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
10
11
  import {ProxyAdmin} from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
11
- import {Timestamp, TimestampLib} from "../types/Timestamp.sol";
12
+ import {Timestamp, TimestampLib} from "../type/Timestamp.sol";
12
13
  import {UpgradableProxyWithAdmin} from "./UpgradableProxyWithAdmin.sol";
13
- import {Version, VersionLib} from "../types/Version.sol";
14
+ import {Version, VersionLib} from "../type/Version.sol";
14
15
 
15
16
  /// @dev manages proxy deployments for upgradable contracs of type IVersionable
16
17
  contract ProxyManager is
@@ -79,6 +80,31 @@ contract ProxyManager is
79
80
  emit LogProxyManagerVersionableDeployed(address(_proxy), initialImplementation);
80
81
  }
81
82
 
83
+ function deployDetermenistic(address initialImplementation, bytes memory initializationData, bytes32 salt)
84
+ public
85
+ virtual
86
+ onlyOwner()
87
+ returns (IVersionable versionable)
88
+ {
89
+ if (_versions.length > 0) {
90
+ revert ErrorProxyManagerAlreadyDeployed();
91
+ }
92
+
93
+ address currentProxyOwner = getOwner();
94
+ address initialProxyAdminOwner = address(this);
95
+
96
+ _proxy = new UpgradableProxyWithAdmin{salt: salt}(
97
+ initialImplementation,
98
+ initialProxyAdminOwner,
99
+ getDeployData(currentProxyOwner, initializationData)
100
+ );
101
+
102
+ versionable = IVersionable(address(_proxy));
103
+ _updateVersionHistory(versionable.getVersion(), initialImplementation, currentProxyOwner);
104
+
105
+ emit LogProxyManagerVersionableDeployed(address(_proxy), initialImplementation);
106
+ }
107
+
82
108
  /// @dev upgrade existing contract
83
109
  function upgrade(address newImplementation, bytes memory upgradeData)
84
110
  public
@@ -3,13 +3,12 @@ pragma solidity ^0.8.20;
3
3
 
4
4
  import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
5
5
 
6
- import {NftId, zeroNftId} from "../types/NftId.sol";
6
+ import {NftId, zeroNftId} from "../type/NftId.sol";
7
7
  import {NftOwnable} from "../shared/NftOwnable.sol";
8
- import {ObjectType} from "../types/ObjectType.sol";
8
+ import {ObjectType} from "../type/ObjectType.sol";
9
9
 
10
10
  import {IRegistry} from "../registry/IRegistry.sol";
11
11
  import {IRegisterable} from "./IRegisterable.sol";
12
- import {Versionable} from "./Versionable.sol";
13
12
 
14
13
  contract Registerable is
15
14
  NftOwnable,
@@ -25,12 +24,6 @@ contract Registerable is
25
24
  bytes _data;
26
25
  }
27
26
 
28
- function _getRegisterableStorage() private pure returns (RegisterableStorage storage $) {
29
- assembly {
30
- $.slot := REGISTERABLE_LOCATION_V1
31
- }
32
- }
33
-
34
27
  function initializeRegisterable(
35
28
  address registryAddress,
36
29
  NftId parentNftId,
@@ -47,7 +40,11 @@ contract Registerable is
47
40
  initialOwner,
48
41
  registryAddress);
49
42
 
50
- RegisterableStorage storage $ = _getRegisterableStorage();
43
+ RegisterableStorage storage $;
44
+ assembly {
45
+ $.slot := REGISTERABLE_LOCATION_V1
46
+ }
47
+
51
48
  $._parentNftId = parentNftId;
52
49
  $._objectType = objectType;
53
50
  $._isInterceptor = isInterceptor;
@@ -61,7 +58,11 @@ contract Registerable is
61
58
  virtual
62
59
  returns (IRegistry.ObjectInfo memory info)
63
60
  {
64
- RegisterableStorage memory $ = _getRegisterableStorage();
61
+ RegisterableStorage storage $;
62
+ assembly {
63
+ $.slot := REGISTERABLE_LOCATION_V1
64
+ }
65
+
65
66
  info = IRegistry.ObjectInfo(
66
67
  zeroNftId(),
67
68
  $._parentNftId,
@@ -40,9 +40,4 @@ contract RegistryLinked is
40
40
  function getRegistry() public view returns (IRegistry) {
41
41
  return _registry;
42
42
  }
43
-
44
-
45
- function getRegistryAddress() public view returns (address) {
46
- return address(_registry);
47
- }
48
43
  }
@@ -4,9 +4,9 @@ pragma solidity ^0.8.19;
4
4
  import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";
5
5
  import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
6
6
 
7
- import {ObjectType, REGISTRY, SERVICE} from "../types/ObjectType.sol";
8
- import {NftId, zeroNftId} from "../types/NftId.sol";
9
- import {Version, VersionPart, VersionLib, VersionPartLib} from "../types/Version.sol";
7
+ import {ObjectType, REGISTRY, SERVICE} from "../type/ObjectType.sol";
8
+ import {NftId, zeroNftId} from "../type/NftId.sol";
9
+ import {Version, VersionPart, VersionLib, VersionPartLib} from "../type/Version.sol";
10
10
 
11
11
  import {Versionable} from "./Versionable.sol";
12
12
  import {IService} from "./IService.sol";
@@ -4,6 +4,8 @@ pragma solidity ^0.8.20;
4
4
  import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
5
5
  import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
6
6
 
7
+ import {Amount} from "../type/Amount.sol";
8
+
7
9
  /// @dev token specific transfer helper
8
10
  /// relies internally on oz SafeERC20.safeTransferFrom
9
11
  contract TokenHandler {
@@ -16,11 +18,11 @@ contract TokenHandler {
16
18
  function transfer(
17
19
  address from,
18
20
  address to,
19
- uint256 amount
21
+ Amount amount
20
22
  )
21
23
  external
22
24
  {
23
- SafeERC20.safeTransferFrom(_token, from, to, amount);
25
+ SafeERC20.safeTransferFrom(_token, from, to, amount.toInt());
24
26
  }
25
27
 
26
28
  function getToken()
@@ -4,7 +4,7 @@ pragma solidity ^0.8.20;
4
4
  import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
5
5
 
6
6
  import {IVersionable} from "./IVersionable.sol";
7
- import {Version, VersionLib} from "../types/Version.sol";
7
+ import {Version, VersionLib} from "../type/Version.sol";
8
8
 
9
9
 
10
10
  abstract contract Versionable is