@etherisc/gif-next 0.0.2-fe88ad7-208 → 0.0.2-ff282a4-523

Sign up to get free protection for your applications and to get access to all the features.
Files changed (511) hide show
  1. package/README.md +8 -13
  2. package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +4 -0
  3. package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +1376 -0
  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 +780 -0
  8. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +4 -0
  9. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +1000 -0
  10. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +4 -0
  11. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +840 -0
  12. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +1 -1
  13. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +73 -83
  14. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  15. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +275 -1359
  16. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  17. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +264 -218
  18. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  19. package/artifacts/contracts/instance/Instance.sol/Instance.json +441 -2539
  20. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
  21. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +479 -178
  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 +432 -280
  26. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  27. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +399 -383
  28. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  29. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +295 -99
  30. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +4 -0
  31. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +2847 -0
  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 +6 -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 +93 -14
  39. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  40. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +38 -13
  41. package/artifacts/contracts/instance/base/ObjectManager.sol/ObjectManager.dbg.json +4 -0
  42. package/artifacts/contracts/instance/base/ObjectManager.sol/ObjectManager.json +256 -0
  43. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
  44. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +58 -75
  45. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  46. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +4 -0
  47. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.json +10 -0
  48. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  49. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  50. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  51. package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +1 -1
  52. package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +1 -1
  53. package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +4 -0
  54. package/artifacts/contracts/pool/BundleService.sol/BundleService.json +1288 -0
  55. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +4 -0
  56. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +696 -0
  57. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +4 -0
  58. package/artifacts/contracts/{instance/service → pool}/IBundleService.sol/IBundleService.json +316 -250
  59. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +4 -0
  60. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +1095 -0
  61. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +4 -0
  62. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +1077 -0
  63. package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +4 -0
  64. package/artifacts/contracts/pool/Pool.sol/Pool.json +1407 -0
  65. package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +4 -0
  66. package/artifacts/contracts/pool/PoolService.sol/PoolService.json +1622 -0
  67. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +4 -0
  68. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +708 -0
  69. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +4 -0
  70. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +918 -0
  71. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +4 -0
  72. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +648 -0
  73. package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +4 -0
  74. package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +1386 -0
  75. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +4 -0
  76. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +748 -0
  77. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +4 -0
  78. package/artifacts/contracts/{instance/service/IComponentOwnerService.sol/IComponentOwnerService.json → product/IApplicationService.sol/IApplicationService.json} +218 -191
  79. package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +4 -0
  80. package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +753 -0
  81. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +4 -0
  82. package/artifacts/contracts/{instance/service → product}/IPolicyService.sol/IPolicyService.json +264 -277
  83. package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +4 -0
  84. package/artifacts/contracts/{instance/service/IPoolService.sol/IPoolService.json → product/IPricingService.sol/IPricingService.json} +241 -230
  85. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +4 -0
  86. package/artifacts/contracts/{components/Product.sol/Product.json → product/IProductComponent.sol/IProductComponent.json} +254 -168
  87. package/artifacts/contracts/product/IProductService.sol/IProductService.dbg.json +4 -0
  88. package/artifacts/contracts/{instance/service → product}/IProductService.sol/IProductService.json +72 -166
  89. package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +4 -0
  90. package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +1281 -0
  91. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +4 -0
  92. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +740 -0
  93. package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +4 -0
  94. package/artifacts/contracts/product/PricingService.sol/PricingService.json +1004 -0
  95. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +4 -0
  96. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +688 -0
  97. package/artifacts/contracts/product/Product.sol/Product.dbg.json +4 -0
  98. package/artifacts/contracts/product/Product.sol/Product.json +1198 -0
  99. package/artifacts/contracts/product/ProductService.sol/ProductService.dbg.json +4 -0
  100. package/artifacts/contracts/product/ProductService.sol/ProductService.json +864 -0
  101. package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.dbg.json +4 -0
  102. package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.json +640 -0
  103. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  104. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +15 -2
  105. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  106. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +165 -5
  107. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  108. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +158 -215
  109. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  110. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +18 -0
  111. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  112. package/artifacts/contracts/registry/Registry.sol/Registry.json +196 -31
  113. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +1 -1
  114. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +20 -20
  115. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  116. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +270 -254
  117. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  118. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +291 -85
  119. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +1 -1
  120. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +151 -77
  121. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  122. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +142 -54
  123. package/artifacts/contracts/shared/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +4 -0
  124. package/artifacts/contracts/shared/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.json +1206 -0
  125. package/artifacts/contracts/shared/Component.sol/Component.dbg.json +4 -0
  126. package/artifacts/contracts/{components/Pool.sol/Pool.json → shared/Component.sol/Component.json} +358 -327
  127. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +4 -0
  128. package/artifacts/contracts/{instance/base/ComponentServiceBase.sol/ComponentServiceBase.json → shared/ComponentService.sol/ComponentService.json} +263 -164
  129. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  130. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +41 -3
  131. package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +4 -0
  132. package/artifacts/contracts/{components/Distribution.sol/Distribution.json → shared/IComponent.sol/IComponent.json} +173 -212
  133. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  134. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +27 -29
  135. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +4 -0
  136. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +189 -0
  137. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  138. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +8 -34
  139. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +4 -0
  140. package/artifacts/contracts/{experiment/inheritance/IA.sol/ISharedA.json → shared/IRegistryLinked.sol/IRegistryLinked.json} +15 -17
  141. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  142. package/artifacts/contracts/shared/IService.sol/IService.json +71 -165
  143. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  144. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +2 -152
  145. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  146. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +109 -29
  147. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +4 -0
  148. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +302 -0
  149. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  150. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +285 -65
  151. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  152. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +118 -53
  153. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +4 -0
  154. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +71 -0
  155. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  156. package/artifacts/contracts/shared/Service.sol/Service.json +173 -153
  157. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  158. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +24 -6
  159. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  160. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +2 -2
  161. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  162. package/artifacts/contracts/shared/Versionable.sol/Versionable.json +2 -152
  163. package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +4 -0
  164. package/artifacts/contracts/{components/IBaseComponent.sol/IBaseComponent.json → staking/IStaking.sol/IStaking.json} +62 -150
  165. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +4 -0
  166. package/artifacts/contracts/{components/BaseComponent.sol/BaseComponent.json → staking/IStakingService.sol/IStakingService.json} +232 -169
  167. package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +4 -0
  168. package/artifacts/contracts/staking/Staking.sol/Staking.json +497 -0
  169. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +4 -0
  170. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +623 -0
  171. package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +4 -0
  172. package/artifacts/contracts/staking/StakingService.sol/StakingService.json +797 -0
  173. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +4 -0
  174. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +632 -0
  175. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +4 -0
  176. package/artifacts/contracts/{types → type}/AddressSet.sol/LibAddressSet.json +3 -3
  177. package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +4 -0
  178. package/artifacts/contracts/type/Amount.sol/AmountLib.json +281 -0
  179. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +4 -0
  180. package/artifacts/contracts/{types → type}/Blocknumber.sol/BlocknumberLib.json +3 -3
  181. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +4 -0
  182. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +179 -0
  183. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +4 -0
  184. package/artifacts/contracts/{types → type}/DistributorType.sol/DistributorTypeLib.json +5 -5
  185. package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +4 -0
  186. package/artifacts/contracts/type/Fee.sol/FeeLib.json +312 -0
  187. package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +4 -0
  188. package/artifacts/contracts/{types → type}/Key32.sol/Key32Lib.json +3 -3
  189. package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +4 -0
  190. package/artifacts/contracts/type/NftId.sol/NftIdLib.json +166 -0
  191. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +4 -0
  192. package/artifacts/contracts/{types → type}/NftIdSet.sol/LibNftIdSet.json +3 -3
  193. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +4 -0
  194. package/artifacts/contracts/{types → type}/ObjectType.sol/ObjectTypeLib.json +3 -3
  195. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +4 -0
  196. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +209 -0
  197. package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +4 -0
  198. package/artifacts/contracts/type/Referral.sol/ReferralLib.json +142 -0
  199. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +4 -0
  200. package/artifacts/contracts/{types → type}/RiskId.sol/RiskIdLib.json +5 -5
  201. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +4 -0
  202. package/artifacts/contracts/{types → type}/RoleId.sol/RoleIdLib.json +5 -5
  203. package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +4 -0
  204. package/artifacts/contracts/type/Seconds.sol/SecondsLib.json +124 -0
  205. package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +4 -0
  206. package/artifacts/contracts/{types → type}/StateId.sol/StateIdLib.json +3 -3
  207. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +4 -0
  208. package/artifacts/contracts/{types → type}/Timestamp.sol/TimestampLib.json +39 -8
  209. package/artifacts/contracts/type/UFixed.sol/MathLib.dbg.json +4 -0
  210. package/artifacts/contracts/{types → type}/UFixed.sol/MathLib.json +3 -3
  211. package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +4 -0
  212. package/artifacts/contracts/{types → type}/UFixed.sol/UFixedLib.json +3 -3
  213. package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +4 -0
  214. package/artifacts/contracts/{types → type}/Version.sol/VersionLib.json +3 -3
  215. package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +4 -0
  216. package/artifacts/contracts/{types → type}/Version.sol/VersionPartLib.json +3 -3
  217. package/contracts/distribution/Distribution.sol +285 -0
  218. package/contracts/distribution/DistributionService.sol +349 -0
  219. package/contracts/{instance/service → distribution}/DistributionServiceManager.sol +6 -6
  220. package/contracts/distribution/IDistributionComponent.sol +71 -0
  221. package/contracts/distribution/IDistributionService.sol +87 -0
  222. package/contracts/instance/BundleManager.sol +22 -25
  223. package/contracts/instance/IInstance.sol +56 -41
  224. package/contracts/instance/IInstanceService.sol +49 -16
  225. package/contracts/instance/Instance.sol +149 -196
  226. package/contracts/instance/InstanceAccessManager.sol +406 -166
  227. package/contracts/instance/InstanceAuthorizationsLib.sol +308 -0
  228. package/contracts/instance/InstanceReader.sol +102 -49
  229. package/contracts/instance/InstanceService.sol +206 -248
  230. package/contracts/instance/InstanceServiceManager.sol +2 -2
  231. package/contracts/instance/InstanceStore.sol +211 -0
  232. package/contracts/instance/{Cloneable.sol → base/Cloneable.sol} +8 -3
  233. package/contracts/instance/base/IKeyValueStore.sol +14 -10
  234. package/contracts/instance/base/ILifecycle.sol +3 -3
  235. package/contracts/instance/base/KeyValueStore.sol +44 -47
  236. package/contracts/instance/base/Lifecycle.sol +28 -7
  237. package/contracts/instance/{ObjectManager.sol → base/ObjectManager.sol} +16 -35
  238. package/contracts/instance/module/IAccess.sol +24 -18
  239. package/contracts/instance/module/IBundle.sol +11 -8
  240. package/contracts/instance/module/IComponents.sol +41 -0
  241. package/contracts/instance/module/IDistribution.sol +7 -4
  242. package/contracts/instance/module/IPolicy.sol +50 -17
  243. package/contracts/instance/module/IRisk.sol +1 -1
  244. package/contracts/instance/module/ISetup.sol +9 -22
  245. package/contracts/instance/module/ITreasury.sol +2 -2
  246. package/contracts/pool/BundleService.sol +382 -0
  247. package/contracts/{instance/service → pool}/BundleServiceManager.sol +6 -6
  248. package/contracts/pool/IBundleService.sol +118 -0
  249. package/contracts/pool/IPoolComponent.sol +114 -0
  250. package/contracts/pool/IPoolService.sol +114 -0
  251. package/contracts/pool/Pool.sol +302 -0
  252. package/contracts/pool/PoolService.sol +403 -0
  253. package/contracts/{instance/service → pool}/PoolServiceManager.sol +6 -6
  254. package/contracts/product/ApplicationService.sol +186 -0
  255. package/contracts/product/ApplicationServiceManager.sol +35 -0
  256. package/contracts/product/ClaimService.sol +442 -0
  257. package/contracts/product/ClaimServiceManager.sol +35 -0
  258. package/contracts/product/IApplicationService.sol +62 -0
  259. package/contracts/product/IClaimService.sol +93 -0
  260. package/contracts/product/IPolicyService.sol +80 -0
  261. package/contracts/product/IPricingService.sol +37 -0
  262. package/contracts/product/IProductComponent.sol +41 -0
  263. package/contracts/{instance/service → product}/IProductService.sol +10 -10
  264. package/contracts/product/PolicyService.sol +376 -0
  265. package/contracts/{instance/service → product}/PolicyServiceManager.sol +7 -7
  266. package/contracts/product/PricingService.sol +275 -0
  267. package/contracts/product/PricingServiceManager.sol +51 -0
  268. package/contracts/product/Product.sol +379 -0
  269. package/contracts/product/ProductService.sol +210 -0
  270. package/contracts/{instance/service → product}/ProductServiceManager.sol +7 -7
  271. package/contracts/registry/ChainNft.sol +15 -1
  272. package/contracts/registry/IRegistry.sol +33 -14
  273. package/contracts/registry/IRegistryService.sol +28 -17
  274. package/contracts/registry/ITransferInterceptor.sol +1 -0
  275. package/contracts/registry/Registry.sol +184 -75
  276. package/contracts/registry/RegistryAccessManager.sol +32 -35
  277. package/contracts/registry/RegistryService.sol +126 -145
  278. package/contracts/registry/RegistryServiceManager.sol +13 -15
  279. package/contracts/registry/ReleaseManager.sol +157 -145
  280. package/contracts/registry/TokenRegistry.sol +21 -15
  281. package/contracts/shared/AccessManagerUpgradeableInitializeable.sol +13 -0
  282. package/contracts/shared/Component.sol +271 -0
  283. package/contracts/shared/ComponentService.sol +150 -0
  284. package/contracts/shared/ERC165.sol +14 -12
  285. package/contracts/shared/IComponent.sol +90 -0
  286. package/contracts/shared/INftOwnable.sol +12 -11
  287. package/contracts/shared/IPolicyHolder.sol +40 -0
  288. package/contracts/shared/IRegisterable.sol +4 -6
  289. package/contracts/shared/IRegistryLinked.sol +11 -0
  290. package/contracts/shared/IService.sol +6 -4
  291. package/contracts/shared/IVersionable.sol +5 -48
  292. package/contracts/shared/NftOwnable.sol +64 -80
  293. package/contracts/shared/PolicyHolder.sol +94 -0
  294. package/contracts/shared/ProxyManager.sol +100 -25
  295. package/contracts/shared/Registerable.sol +26 -41
  296. package/contracts/shared/RegistryLinked.sol +43 -0
  297. package/contracts/shared/Service.sol +37 -23
  298. package/contracts/shared/TokenHandler.sol +14 -6
  299. package/contracts/shared/Versionable.sol +4 -92
  300. package/contracts/staking/IStaking.sol +15 -0
  301. package/contracts/staking/IStakingService.sol +105 -0
  302. package/contracts/staking/Staking.sol +64 -0
  303. package/contracts/staking/StakingManager.sol +44 -0
  304. package/contracts/staking/StakingService.sol +204 -0
  305. package/contracts/staking/StakingServiceManager.sol +41 -0
  306. package/contracts/type/Amount.sol +109 -0
  307. package/contracts/{types → type}/Blocknumber.sol +1 -0
  308. package/contracts/type/ClaimId.sol +75 -0
  309. package/contracts/{types → type}/DistributorType.sol +2 -2
  310. package/contracts/{types → type}/Fee.sol +17 -8
  311. package/contracts/{types → type}/NftId.sol +8 -0
  312. package/contracts/{types → type}/NftIdSet.sol +1 -1
  313. package/contracts/{types → type}/ObjectType.sol +21 -7
  314. package/contracts/type/PayoutId.sol +82 -0
  315. package/contracts/{types → type}/Referral.sol +4 -0
  316. package/contracts/{types → type}/RoleId.sol +56 -14
  317. package/contracts/type/Seconds.sol +54 -0
  318. package/contracts/{types → type}/StateId.sol +7 -2
  319. package/contracts/{types → type}/Timestamp.sol +18 -13
  320. package/contracts/{types → type}/UFixed.sol +1 -0
  321. package/contracts/{types → type}/Version.sol +1 -0
  322. package/package.json +3 -3
  323. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +0 -4
  324. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +0 -4
  325. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +0 -4
  326. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +0 -4
  327. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +0 -152
  328. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +0 -4
  329. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +0 -275
  330. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +0 -4
  331. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +0 -157
  332. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +0 -4
  333. package/artifacts/contracts/components/Product.sol/Product.dbg.json +0 -4
  334. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.dbg.json +0 -4
  335. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.json +0 -66
  336. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.dbg.json +0 -4
  337. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.json +0 -24
  338. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.dbg.json +0 -4
  339. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.json +0 -42
  340. package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +0 -4
  341. package/artifacts/contracts/experiment/errors/Require.sol/Require.json +0 -105
  342. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +0 -4
  343. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.json +0 -105
  344. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +0 -4
  345. package/artifacts/contracts/experiment/inheritance/A.sol/A.json +0 -128
  346. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +0 -4
  347. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.json +0 -42
  348. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +0 -4
  349. package/artifacts/contracts/experiment/inheritance/B.sol/B.json +0 -76
  350. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +0 -4
  351. package/artifacts/contracts/experiment/inheritance/C.sol/C.json +0 -89
  352. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +0 -4
  353. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.json +0 -128
  354. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +0 -4
  355. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +0 -4
  356. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.json +0 -50
  357. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +0 -4
  358. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.json +0 -63
  359. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +0 -4
  360. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +0 -59
  361. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +0 -4
  362. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.json +0 -124
  363. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +0 -4
  364. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.json +0 -74
  365. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +0 -4
  366. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +0 -124
  367. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +0 -4
  368. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +0 -207
  369. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +0 -4
  370. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.json +0 -10
  371. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +0 -4
  372. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.json +0 -10
  373. package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +0 -4
  374. package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.json +0 -1206
  375. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +0 -4
  376. package/artifacts/contracts/instance/IInstanceBase.sol/IInstanceBase.dbg.json +0 -4
  377. package/artifacts/contracts/instance/IInstanceBase.sol/IInstanceBase.json +0 -448
  378. package/artifacts/contracts/instance/InstanceBase.sol/InstanceBase.dbg.json +0 -4
  379. package/artifacts/contracts/instance/InstanceBase.sol/InstanceBase.json +0 -763
  380. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +0 -4
  381. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +0 -285
  382. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +0 -4
  383. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +0 -4
  384. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +0 -113
  385. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +0 -4
  386. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +0 -945
  387. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +0 -4
  388. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +0 -432
  389. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +0 -4
  390. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +0 -814
  391. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +0 -4
  392. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +0 -693
  393. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +0 -4
  394. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +0 -420
  395. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +0 -4
  396. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +0 -4
  397. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +0 -4
  398. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +0 -446
  399. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +0 -4
  400. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +0 -4
  401. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +0 -4
  402. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +0 -4
  403. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +0 -993
  404. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +0 -4
  405. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +0 -464
  406. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +0 -4
  407. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +0 -727
  408. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +0 -4
  409. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +0 -420
  410. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +0 -4
  411. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +0 -777
  412. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +0 -4
  413. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +0 -420
  414. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +0 -4
  415. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.json +0 -107
  416. package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.dbg.json +0 -4
  417. package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.json +0 -442
  418. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +0 -4
  419. package/artifacts/contracts/test/TestFee.sol/TestFee.json +0 -119
  420. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +0 -4
  421. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +0 -305
  422. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +0 -4
  423. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +0 -116
  424. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +0 -4
  425. package/artifacts/contracts/test/TestService.sol/TestService.json +0 -600
  426. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +0 -4
  427. package/artifacts/contracts/test/TestToken.sol/TestUsdc.json +0 -376
  428. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +0 -4
  429. package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +0 -218
  430. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +0 -4
  431. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +0 -286
  432. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +0 -4
  433. package/artifacts/contracts/test/Usdc.sol/USDC.json +0 -376
  434. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +0 -4
  435. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +0 -4
  436. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +0 -4
  437. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.json +0 -10
  438. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +0 -4
  439. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +0 -4
  440. package/artifacts/contracts/types/Fee.sol/FeeLib.json +0 -257
  441. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +0 -4
  442. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +0 -4
  443. package/artifacts/contracts/types/NftId.sol/NftIdLib.json +0 -153
  444. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +0 -4
  445. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +0 -4
  446. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.json +0 -100
  447. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +0 -4
  448. package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +0 -4
  449. package/artifacts/contracts/types/Referral.sol/ReferralLib.json +0 -123
  450. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +0 -4
  451. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +0 -4
  452. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +0 -4
  453. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +0 -4
  454. package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +0 -4
  455. package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +0 -4
  456. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +0 -4
  457. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +0 -4
  458. package/contracts/components/BaseComponent.sol +0 -159
  459. package/contracts/components/Distribution.sol +0 -163
  460. package/contracts/components/IBaseComponent.sol +0 -34
  461. package/contracts/components/IDistributionComponent.sol +0 -44
  462. package/contracts/components/IPoolComponent.sol +0 -66
  463. package/contracts/components/IProductComponent.sol +0 -35
  464. package/contracts/components/Pool.sol +0 -271
  465. package/contracts/components/Product.sol +0 -292
  466. package/contracts/experiment/cloning/Cloner.sol +0 -47
  467. package/contracts/experiment/errors/Require.sol +0 -38
  468. package/contracts/experiment/errors/Revert.sol +0 -44
  469. package/contracts/experiment/inheritance/A.sol +0 -53
  470. package/contracts/experiment/inheritance/B.sol +0 -28
  471. package/contracts/experiment/inheritance/C.sol +0 -34
  472. package/contracts/experiment/inheritance/IA.sol +0 -13
  473. package/contracts/experiment/inheritance/IB.sol +0 -10
  474. package/contracts/experiment/inheritance/IC.sol +0 -12
  475. package/contracts/experiment/statemachine/Dummy.sol +0 -27
  476. package/contracts/experiment/statemachine/ISM.sol +0 -25
  477. package/contracts/experiment/statemachine/SM.sol +0 -57
  478. package/contracts/experiment/statemachine/SimpleStateMachine.sol +0 -31
  479. package/contracts/experiment/types/TypeA.sol +0 -47
  480. package/contracts/experiment/types/TypeB.sol +0 -29
  481. package/contracts/instance/AccessManagerUpgradeableInitializeable.sol +0 -23
  482. package/contracts/instance/IInstanceBase.sol +0 -26
  483. package/contracts/instance/InstanceBase.sol +0 -41
  484. package/contracts/instance/base/ComponentServiceBase.sol +0 -82
  485. package/contracts/instance/base/IInstanceBase.sol +0 -23
  486. package/contracts/instance/service/BundleService.sol +0 -260
  487. package/contracts/instance/service/ComponentOwnerService.sol +0 -315
  488. package/contracts/instance/service/DistributionService.sol +0 -113
  489. package/contracts/instance/service/IBundleService.sol +0 -45
  490. package/contracts/instance/service/IComponentOwnerService.sol +0 -20
  491. package/contracts/instance/service/IDistributionService.sol +0 -12
  492. package/contracts/instance/service/IPolicyService.sol +0 -87
  493. package/contracts/instance/service/IPoolService.sol +0 -20
  494. package/contracts/instance/service/PolicyService.sol +0 -503
  495. package/contracts/instance/service/PoolService.sol +0 -124
  496. package/contracts/instance/service/ProductService.sol +0 -170
  497. package/contracts/shared/ContractDeployerLib.sol +0 -72
  498. package/contracts/shared/RegisterableUpgradable.sol +0 -16
  499. package/contracts/test/TestFee.sol +0 -25
  500. package/contracts/test/TestRegisterable.sol +0 -18
  501. package/contracts/test/TestRoleId.sol +0 -14
  502. package/contracts/test/TestService.sol +0 -25
  503. package/contracts/test/TestToken.sol +0 -26
  504. package/contracts/test/TestVersion.sol +0 -44
  505. package/contracts/test/TestVersionable.sol +0 -17
  506. package/contracts/test/Usdc.sol +0 -26
  507. package/contracts/types/ChainId.sol +0 -38
  508. package/contracts/types/NumberId.sol +0 -52
  509. /package/contracts/{types → type}/AddressSet.sol +0 -0
  510. /package/contracts/{types → type}/Key32.sol +0 -0
  511. /package/contracts/{types → type}/RiskId.sol +0 -0
@@ -3,27 +3,20 @@ 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
-
14
- import {ERC165} from "./ERC165.sol";
15
12
 
16
13
  contract Registerable is
17
- ERC165,
18
- Initializable,
19
14
  NftOwnable,
20
15
  IRegisterable
21
16
  {
22
17
  // keccak256(abi.encode(uint256(keccak256("gif-next.contracts.shared.Registerable.sol")) - 1)) & ~bytes32(uint256(0xff));
23
18
  bytes32 public constant REGISTERABLE_LOCATION_V1 = 0x6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa300;
24
19
 
25
- error ErrorRegisterableNotRegistry(address registryAddress);
26
-
27
20
  struct RegisterableStorage {
28
21
  NftId _parentNftId;
29
22
  ObjectType _objectType;
@@ -31,39 +24,31 @@ contract Registerable is
31
24
  bytes _data;
32
25
  }
33
26
 
34
- function _getRegisterableStorage() private pure returns (RegisterableStorage storage $) {
35
- assembly {
36
- $.slot := REGISTERABLE_LOCATION_V1
37
- }
38
- }
39
-
40
- function _initializeRegisterable(
27
+ function initializeRegisterable(
41
28
  address registryAddress,
42
29
  NftId parentNftId,
43
30
  ObjectType objectType,
44
31
  bool isInterceptor,
45
32
  address initialOwner,
46
- bytes memory data
33
+ bytes memory registryData // writeonly data that will saved in the object info record of the registry
47
34
  )
48
- internal
49
- //onlyInitializing//TODO uncomment when "fully" upgradeable
35
+ public
50
36
  virtual
37
+ onlyInitializing
51
38
  {
52
- _initializeERC165();
53
- _initializeNftOwnable(
39
+ initializeNftOwnable(
54
40
  initialOwner,
55
41
  registryAddress);
56
42
 
57
- // TODO check parentNftId -> registry.isRegistered(parentNftId)
58
- // TODO check object-parent type pair -> registry.isValidTypeCombo() or something...verify with registry that setup will be able to register...
43
+ RegisterableStorage storage $;
44
+ assembly {
45
+ $.slot := REGISTERABLE_LOCATION_V1
46
+ }
59
47
 
60
- RegisterableStorage storage $ = _getRegisterableStorage();
61
48
  $._parentNftId = parentNftId;
62
49
  $._objectType = objectType;
63
50
  $._isInterceptor = isInterceptor;
64
- $._data = data;
65
-
66
- _registerInterface(type(IRegisterable).interfaceId);
51
+ $._data = registryData;
67
52
  }
68
53
 
69
54
 
@@ -71,20 +56,20 @@ contract Registerable is
71
56
  public
72
57
  view
73
58
  virtual
74
- returns (IRegistry.ObjectInfo memory, bytes memory data)
59
+ returns (IRegistry.ObjectInfo memory info)
75
60
  {
76
- RegisterableStorage storage $ = _getRegisterableStorage();
77
- return (
78
- IRegistry.ObjectInfo(
79
- getNftId(),
80
- $._parentNftId,
81
- $._objectType,
82
- $._isInterceptor,
83
- address(this),
84
- getOwner(),
85
- $._data
86
- ),
87
- bytes("")
88
- );
61
+ RegisterableStorage storage $;
62
+ assembly {
63
+ $.slot := REGISTERABLE_LOCATION_V1
64
+ }
65
+
66
+ info = IRegistry.ObjectInfo(
67
+ zeroNftId(),
68
+ $._parentNftId,
69
+ $._objectType,
70
+ $._isInterceptor,
71
+ address(this),
72
+ getOwner(),
73
+ $._data);
89
74
  }
90
75
  }
@@ -0,0 +1,43 @@
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
+ }
@@ -1,28 +1,31 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.19;
3
3
 
4
- import {ObjectType, SERVICE} from "../types/ObjectType.sol";
5
- import {NftId, zeroNftId} from "../types/NftId.sol";
6
- import {Version, VersionPart, VersionLib} from "../types/Version.sol";
4
+ import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";
5
+ import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
6
+
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";
7
10
 
8
11
  import {Versionable} from "./Versionable.sol";
9
12
  import {IService} from "./IService.sol";
10
13
  import {IVersionable} from "./IVersionable.sol";
11
- import {RegisterableUpgradable} from "./RegisterableUpgradable.sol";
14
+ import {Versionable} from "./Versionable.sol";
15
+ import {Registerable} from "./Registerable.sol";
12
16
 
13
17
  import {IRegistry} from "../registry/IRegistry.sol";
14
18
 
15
19
 
16
20
  /// @dev service base contract
17
21
  abstract contract Service is
18
- RegisterableUpgradable,
22
+ Registerable,
23
+ Versionable,
24
+ AccessManagedUpgradeable,
19
25
  IService
20
26
  {
21
- function getDomain() public pure virtual override returns(ObjectType);
22
27
 
23
- function getMajorVersion() public view virtual override returns(VersionPart majorVersion) {
24
- return getVersion().toMajorPart();
25
- }
28
+ uint8 private constant GIF_MAJOR_VERSION = 3;
26
29
 
27
30
  // from Versionable
28
31
  function getVersion()
@@ -31,28 +34,39 @@ abstract contract Service is
31
34
  virtual override (IVersionable, Versionable)
32
35
  returns(Version)
33
36
  {
34
- return VersionLib.toVersion(3,0,0);
37
+ return VersionLib.toVersion(GIF_MAJOR_VERSION,0,0);
35
38
  }
36
39
 
37
- function _initializeService(
40
+ function initializeService(
38
41
  address registry,
42
+ address authority, // real authority for registry service adress(0) for other services
39
43
  address initialOwner
40
44
  )
41
- internal
45
+ public
42
46
  virtual
43
- //onlyInitializing //TODO uncomment when "fully" upgradeable
47
+ onlyInitializing()
44
48
  {
45
- // service must provide its name and version upon registration
46
- bytes memory data = abi.encode(getDomain(), getMajorVersion());
47
- NftId registryNftId = _getRegistryNftId(registry);
48
- bool isInterceptor = false;
49
+ initializeRegisterable(
50
+ registry,
51
+ IRegistry(registry).getNftId(),
52
+ SERVICE(),
53
+ false, // is interceptor
54
+ initialOwner,
55
+ ""); // data
49
56
 
50
- _initializeRegisterable(registry, registryNftId, SERVICE(), isInterceptor, initialOwner, data);
51
- _registerInterface(type(IService).interfaceId);
52
- }
57
+ // externally provided authority
58
+ if(authority != address(0)) {
59
+ __AccessManaged_init(authority);
60
+ } else {
61
+ address registryServiceAddress = getRegistry().getServiceAddress(
62
+ REGISTRY(),
63
+ VersionPartLib.toVersionPart(GIF_MAJOR_VERSION));
64
+
65
+ // copy authority from already registered registry services
66
+ __AccessManaged_init(IAccessManaged(registryServiceAddress).authority());
67
+ }
53
68
 
54
- // this is just a conveniene function, actual validation will be done upon registration
55
- function _getRegistryNftId(address registryAddress) internal view returns (NftId) {
56
- return IRegistry(registryAddress).getNftId(registryAddress);
69
+ registerInterface(type(IAccessManaged).interfaceId);
70
+ registerInterface(type(IService).interfaceId);
57
71
  }
58
72
  }
@@ -4,6 +4,10 @@ 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
+
9
+ /// @dev token specific transfer helper
10
+ /// relies internally on oz SafeERC20.safeTransferFrom
7
11
  contract TokenHandler {
8
12
  IERC20Metadata private _token;
9
13
 
@@ -11,17 +15,21 @@ contract TokenHandler {
11
15
  _token = IERC20Metadata(token);
12
16
  }
13
17
 
14
- // TODO add logging
15
18
  function transfer(
16
19
  address from,
17
20
  address to,
18
- uint256 amount // TODO add authz (only treasury/instance/product/pool/ service)
19
- ) external {
20
- SafeERC20.safeTransferFrom(_token, from, to, amount);
21
- // _token.transferFrom(from, to, amount);
21
+ Amount amount
22
+ )
23
+ external
24
+ {
25
+ SafeERC20.safeTransferFrom(_token, from, to, amount.toInt());
22
26
  }
23
27
 
24
- function getToken() external view returns (IERC20Metadata) {
28
+ function getToken()
29
+ external
30
+ view
31
+ returns (IERC20Metadata)
32
+ {
25
33
  return _token;
26
34
  }
27
35
  }
@@ -3,83 +3,39 @@ pragma solidity ^0.8.20;
3
3
 
4
4
  import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
5
5
 
6
- import {Blocknumber, blockNumber} from "../types/Blocknumber.sol";
7
- import {Timestamp, TimestampLib} from "../types/Timestamp.sol";
8
- import {Version, VersionPart, VersionLib} from "../types/Version.sol";
9
-
10
6
  import {IVersionable} from "./IVersionable.sol";
11
-
7
+ import {Version, VersionLib} from "../type/Version.sol";
12
8
 
13
9
 
14
10
  abstract contract Versionable is
15
11
  Initializable,
16
12
  IVersionable
17
13
  {
18
- // keccak256(abi.encode(uint256(keccak256("gif-next.contracts.shared.Versionable.sol")) - 1)) & ~bytes32(uint256(0xff))
19
- bytes32 private constant VERSIONABLE_LOCATION_V1 = 0x4f61291a8ac3d020d0a7d919a76b8592aa88385744dee3f8b4f3873b969ed900;
20
-
21
-
22
- /// @custom:storage-location erc7201:gif-next.contracts.shared.Versionable.sol
23
- struct VersionableStorage {
24
- mapping(Version version => VersionInfo info) _versionHistory;
25
- Version [] _versions;
26
- Version _v1;
27
- }
28
-
29
-
30
14
  constructor() {
31
15
  _disableInitializers();
32
16
  }
33
- // TODO write test where new version of private _updateVersionHistory is added and used...
34
- function initialize(
35
- address implementation,
17
+
18
+ function initializeVersionable(
36
19
  address activatedBy,
37
20
  bytes memory data
38
21
  )
39
22
  public
40
23
  initializer
41
24
  {
42
- _updateVersionHistory(implementation, activatedBy);
43
25
  _initialize(activatedBy, data);
44
26
  }
45
27
 
46
- // TODO activatedBy MUST ALWAYS be an owner?
47
- function upgrade(
48
- address implementation,
49
- address activatedBy,
28
+ function upgradeVersionable(
50
29
  bytes memory data
51
30
  )
52
31
  external
53
32
  reinitializer(VersionLib.toUint64(getVersion()))
54
33
  {
55
- _updateVersionHistory(implementation, activatedBy);
56
34
  _upgrade(data);
57
35
  }
58
36
 
59
- function isInitialized(Version _version) public override view returns(bool) {
60
- return _getVersionableStorage()._versionHistory[_version].activatedIn.toInt() > 0;
61
- }
62
-
63
37
  function getVersion() public pure virtual returns(Version);
64
38
 
65
- function getVersionCount() public view override returns(uint256) {
66
- return _getVersionableStorage()._versions.length;
67
- }
68
-
69
- function getVersion(uint256 idx) public view override returns(Version) {
70
- return _getVersionableStorage()._versions[idx];
71
- }
72
-
73
- function getVersionInfo(Version _version) public override view returns(VersionInfo memory) {
74
- return _getVersionableStorage()._versionHistory[_version];
75
- }
76
-
77
- function getInitializedVersion() public view returns(uint64) {
78
- return _getInitializedVersion();
79
- }
80
-
81
-
82
-
83
39
  // IMPORTANT each version must implement this function
84
40
  // each implementation MUST use onlyInitialising modifier
85
41
  // each implementation MUST call intializers of all base contracts...
@@ -91,7 +47,6 @@ abstract contract Versionable is
91
47
  revert();
92
48
  }
93
49
 
94
-
95
50
  // IMPORTANT each version except version "1" must implement this function
96
51
  // each implementation MUST use onlyInitialising modifier
97
52
  function _upgrade(bytes memory data)
@@ -101,47 +56,4 @@ abstract contract Versionable is
101
56
  {
102
57
  revert();
103
58
  }
104
-
105
- function _getVersionableStorage() private pure returns (VersionableStorage storage $) {
106
- assembly {
107
- $.slot := VERSIONABLE_LOCATION_V1
108
- }
109
- }
110
-
111
- // can only be called once per contract
112
- // needs to be called inside the proxy upgrade tx
113
- // TODO run reinitializer(version().toUint64()) modifier after "version()" is checked,
114
- function _updateVersionHistory(
115
- address implementation,
116
- address activatedBy
117
- )
118
- private
119
- onlyInitializing
120
- {
121
- VersionableStorage storage $ = _getVersionableStorage();
122
-
123
- uint64 version = _getInitializedVersion();
124
-
125
- Version thisVersion = getVersion();
126
-
127
- if(version == 1) {
128
- // thisVersion is alias to version "1"
129
- $._v1 = thisVersion;
130
- }
131
- else {
132
- require(thisVersion > $._v1, "INVALID VERSION");
133
- }
134
-
135
- // update version history
136
- $._versions.push(thisVersion);
137
- $._versionHistory[thisVersion] = VersionInfo(
138
- thisVersion,
139
- implementation,
140
- activatedBy,
141
- TimestampLib.blockTimestamp(),
142
- blockNumber()
143
- );
144
-
145
- emit LogVersionableInitialized(thisVersion, implementation, activatedBy);
146
- }
147
59
  }
@@ -0,0 +1,15 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.20;
3
+
4
+ import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
5
+
6
+ import {IRegisterable} from "../shared/IRegisterable.sol";
7
+ import {IVersionable} from "../shared/IVersionable.sol";
8
+ import {ObjectType} from "../type/ObjectType.sol";
9
+
10
+ interface IStaking is
11
+ IRegisterable,
12
+ IVersionable,
13
+ IAccessManaged
14
+ {
15
+ }
@@ -0,0 +1,105 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.19;
3
+
4
+ import {Amount} from "../type/Amount.sol";
5
+ import {IService} from "../shared/IService.sol";
6
+ import {IStaking} from "./IStaking.sol";
7
+ import {NftId} from "../type/NftId.sol";
8
+ import {ObjectType} from "../type/ObjectType.sol";
9
+ import {Seconds} from "../type/Seconds.sol";
10
+ import {Timestamp} from "../type/Timestamp.sol";
11
+
12
+
13
+ interface IStakingService is IService
14
+ {
15
+
16
+ error ErrorStakingServiceNotStaking(address stakingAddress);
17
+ error ErrorStakingServiceNotSupportingIStaking(address stakingAddress);
18
+
19
+ /// @dev create a new stake with amount DIP to the specified target
20
+ /// returns the id of the newly minted stake nft
21
+ /// permissionless function
22
+ function create(
23
+ NftId targetNftId,
24
+ Amount amount
25
+ )
26
+ external
27
+ returns (
28
+ NftId stakeNftId
29
+ );
30
+
31
+ /// @dev increase an existing stake by amount DIP
32
+ /// updates the staking reward amount
33
+ /// function restricted to the current stake owner
34
+ function stake(
35
+ NftId stakeNftId,
36
+ Amount amount
37
+ )
38
+ external;
39
+
40
+ /// @dev decrease an existing stake by amount DIP
41
+ /// updates the staking reward amount
42
+ /// function restricted to the current stake owner
43
+ function unstake(
44
+ NftId stakeNftId,
45
+ Amount amount
46
+ )
47
+ external;
48
+
49
+ /// @dev closes the specified stake
50
+ /// all related stakes and all accumulated reward DIP are transferred to the current stake holder
51
+ /// function restricted to the current stake owner
52
+ function close(
53
+ NftId stakeNftId
54
+ )
55
+ external;
56
+
57
+ /// @dev re-stakes the current staked DIP as well as all accumulated rewards to the new stake target.
58
+ /// all related stakes and all accumulated reward DIP are transferred to the current stake holder
59
+ /// function restricted to the current stake owner
60
+ function reStake(
61
+ NftId stakeNftId,
62
+ NftId newTargetNftId
63
+ )
64
+ external
65
+ returns (
66
+ NftId newStakeNftId,
67
+ Timestamp unlockedAt
68
+ );
69
+
70
+ /// @dev increases the total value locked amount for the specified target by the provided token amount.
71
+ /// function is called when a new policy is collateralized
72
+ /// function restricted to the pool service
73
+ function increaseTotalValueLocked(
74
+ NftId targetNftId,
75
+ address token,
76
+ Amount amount
77
+ )
78
+ external
79
+ returns (Amount totalValueLocked);
80
+
81
+
82
+ /// @dev decreases the total value locked amount for the specified target by the provided token amount.
83
+ /// function is called when a new policy is closed or payouts are executed
84
+ /// function restricted to the pool service
85
+ function decreaseTotalValueLocked(
86
+ NftId targetNftId,
87
+ address token,
88
+ Amount amount
89
+ )
90
+ external
91
+ returns (Amount totalValueLocked);
92
+
93
+ /// @dev sets total value locked data for a target contract on a different chain.
94
+ /// this is done via CCIP (cross chain communication)
95
+ function setTotalValueLocked(
96
+ NftId targetNftId,
97
+ address token,
98
+ Amount amount
99
+ )
100
+ external;
101
+
102
+ function getStaking()
103
+ external
104
+ returns (IStaking staking);
105
+ }
@@ -0,0 +1,64 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.20;
3
+
4
+ import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";
5
+ import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
6
+
7
+ import {ObjectType, REGISTRY, STAKING} from "../type/ObjectType.sol";
8
+ import {NftId, zeroNftId} from "../type/NftId.sol";
9
+ import {Version, VersionLib, VersionPartLib} from "../type/Version.sol";
10
+
11
+ import {IStaking} from "./IStaking.sol";
12
+ import {IVersionable} from "../shared/IVersionable.sol";
13
+ import {Versionable} from "../shared/Versionable.sol";
14
+ import {Registerable} from "../shared/Registerable.sol";
15
+
16
+ import {IRegistry} from "../registry/IRegistry.sol";
17
+
18
+ contract Staking is
19
+ Registerable,
20
+ Versionable,
21
+ AccessManagedUpgradeable,
22
+ IStaking
23
+ {
24
+
25
+ uint8 private constant GIF_MAJOR_VERSION = 3;
26
+
27
+ // from Versionable
28
+ function getVersion()
29
+ public
30
+ pure
31
+ virtual override (IVersionable, Versionable)
32
+ returns(Version)
33
+ {
34
+ return VersionLib.toVersion(GIF_MAJOR_VERSION,0,0);
35
+ }
36
+
37
+ function _initialize(
38
+ address owner,
39
+ bytes memory data
40
+ )
41
+ internal
42
+ virtual override
43
+ initializer
44
+ {
45
+ (
46
+ address registryAddress,
47
+ address initialAuthority,
48
+ address initialOwner
49
+ ) = abi.decode(data, (address, address, address));
50
+
51
+ initializeRegisterable(
52
+ registryAddress,
53
+ IRegistry(registryAddress).getNftId(),
54
+ STAKING(),
55
+ false, // is interceptor
56
+ initialOwner,
57
+ ""); // data
58
+
59
+ __AccessManaged_init(initialAuthority);
60
+
61
+ registerInterface(type(IAccessManaged).interfaceId);
62
+ registerInterface(type(IStaking).interfaceId);
63
+ }
64
+ }
@@ -0,0 +1,44 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.20;
3
+
4
+ import {IVersionable} from "../shared/IVersionable.sol";
5
+ import {ProxyManager} from "../shared/ProxyManager.sol";
6
+ import {Staking} from "./Staking.sol";
7
+
8
+ contract StakingManager is
9
+ ProxyManager
10
+ {
11
+
12
+ Staking private _staking;
13
+
14
+ /// @dev initializes proxy manager with service implementation
15
+ constructor(
16
+ address registryAddress,
17
+ address initialAuthority
18
+ )
19
+ ProxyManager(registryAddress)
20
+ {
21
+ Staking stk = new Staking();
22
+ address initialOwner = msg.sender;
23
+
24
+ bytes memory data = abi.encode(
25
+ registryAddress,
26
+ initialAuthority,
27
+ initialOwner);
28
+
29
+ IVersionable versionable = deploy(
30
+ address(stk),
31
+ data);
32
+
33
+ _staking = Staking(address(versionable));
34
+ }
35
+
36
+ //--- view functions ----------------------------------------------------//
37
+ function getStaking()
38
+ external
39
+ view
40
+ returns (Staking)
41
+ {
42
+ return _staking;
43
+ }
44
+ }