@etherisc/gif-next 0.0.2-d96b9e1-825 → 0.0.2-da0f894-204

Sign up to get free protection for your applications and to get access to all the features.
Files changed (471) hide show
  1. package/README.md +327 -8
  2. package/artifacts/contracts/components/Component.sol/Component.dbg.json +4 -0
  3. package/artifacts/contracts/components/Component.sol/Component.json +774 -0
  4. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +4 -0
  5. package/artifacts/contracts/components/Distribution.sol/Distribution.json +1279 -0
  6. package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +4 -0
  7. package/artifacts/contracts/{registry/IChainNft.sol/IChainNft.json → components/IComponent.sol/IComponent.json} +234 -239
  8. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +4 -0
  9. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +829 -0
  10. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  11. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +804 -131
  12. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  13. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +455 -62
  14. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  15. package/artifacts/contracts/components/Pool.sol/Pool.json +1202 -138
  16. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  17. package/artifacts/contracts/components/Product.sol/Product.json +881 -87
  18. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +4 -0
  19. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +764 -0
  20. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +4 -0
  21. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.json +185 -0
  22. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  23. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +1595 -1039
  24. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +4 -0
  25. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +509 -0
  26. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  27. package/artifacts/contracts/instance/Instance.sol/Instance.json +2378 -1208
  28. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +4 -0
  29. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +984 -0
  30. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +4 -0
  31. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +1355 -0
  32. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +4 -0
  33. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +1046 -0
  34. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +4 -0
  35. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +693 -0
  36. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +4 -0
  37. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +261 -0
  38. package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json +4 -0
  39. package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.json +552 -0
  40. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  41. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.json +45 -127
  42. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  43. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  44. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +55 -245
  45. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  46. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +6 -6
  47. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +4 -0
  48. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +254 -0
  49. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +4 -0
  50. package/artifacts/contracts/instance/module/{bundle/IBundle.sol → IBundle.sol}/IBundle.json +1 -1
  51. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +4 -0
  52. package/artifacts/contracts/instance/module/{access/IAccess.sol/IAccess.json → IDistribution.sol/IDistribution.json} +2 -2
  53. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +4 -0
  54. package/artifacts/contracts/instance/module/{policy/IPolicy.sol → IPolicy.sol}/IPolicy.json +1 -1
  55. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +4 -0
  56. package/artifacts/contracts/instance/module/{risk/IRisk.sol → IRisk.sol}/IRisk.json +1 -1
  57. package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +4 -0
  58. package/artifacts/contracts/instance/{base/ModuleBase.sol/ModuleBase.json → module/ISetup.sol/ISetup.json} +2 -2
  59. package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +4 -0
  60. package/artifacts/contracts/instance/module/{treasury/ITreasury.sol → ITreasury.sol}/ITreasury.json +1 -1
  61. package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.dbg.json +4 -0
  62. package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.json +947 -0
  63. package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +4 -0
  64. package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.json +665 -0
  65. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +4 -0
  66. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +1096 -0
  67. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +4 -0
  68. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +661 -0
  69. package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.dbg.json +4 -0
  70. package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.json +754 -0
  71. package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +4 -0
  72. package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.json +637 -0
  73. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +4 -0
  74. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +1553 -0
  75. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +4 -0
  76. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +793 -0
  77. package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.dbg.json +4 -0
  78. package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.json +535 -0
  79. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +4 -0
  80. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +633 -0
  81. package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.dbg.json +4 -0
  82. package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.json +409 -0
  83. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +4 -0
  84. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +858 -0
  85. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +4 -0
  86. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +519 -0
  87. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
  88. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +136 -165
  89. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
  90. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +139 -232
  91. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +4 -0
  92. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +1000 -0
  93. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +4 -0
  94. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +689 -0
  95. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
  96. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +416 -160
  97. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +4 -0
  98. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +649 -0
  99. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
  100. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +401 -297
  101. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +4 -0
  102. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +649 -0
  103. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  104. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +186 -12
  105. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  106. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +466 -34
  107. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +4 -0
  108. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +890 -0
  109. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +4 -0
  110. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +34 -0
  111. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  112. package/artifacts/contracts/registry/Registry.sol/Registry.json +470 -103
  113. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +4 -0
  114. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +285 -0
  115. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +4 -0
  116. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +1177 -0
  117. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +4 -0
  118. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +670 -0
  119. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +4 -0
  120. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +547 -0
  121. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +4 -0
  122. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +498 -0
  123. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +4 -0
  124. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.json +107 -0
  125. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  126. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +41 -3
  127. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +4 -0
  128. package/artifacts/contracts/{components/IBaseComponent.sol/IBaseComponent.json → shared/INftOwnable.sol/INftOwnable.json} +38 -74
  129. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +4 -0
  130. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +129 -0
  131. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  132. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +100 -33
  133. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +4 -0
  134. package/artifacts/contracts/{experiment/inheritance/IB.sol/IB.json → shared/IRegistryLinked.sol/IRegistryLinked.json} +18 -20
  135. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +4 -0
  136. package/artifacts/contracts/{instance/base/ServiceBase.sol/ServiceBase.json → shared/IService.sol/IService.json} +121 -152
  137. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  138. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +16 -125
  139. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +4 -0
  140. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +251 -0
  141. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +4 -0
  142. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +248 -0
  143. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +4 -0
  144. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +582 -0
  145. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  146. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +256 -25
  147. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +4 -0
  148. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +84 -0
  149. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +4 -0
  150. package/artifacts/contracts/{instance/service/IComponentOwnerService.sol/IComponentOwnerService.json → shared/Service.sol/Service.json} +220 -159
  151. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +4 -0
  152. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +96 -0
  153. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +4 -0
  154. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +129 -0
  155. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  156. package/artifacts/contracts/shared/Versionable.sol/Versionable.json +29 -115
  157. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
  158. package/artifacts/contracts/test/TestFee.sol/TestFee.json +10 -10
  159. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
  160. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +272 -26
  161. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
  162. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +44 -10
  163. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
  164. package/artifacts/contracts/test/TestService.sol/TestService.json +281 -139
  165. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
  166. package/artifacts/contracts/test/TestToken.sol/TestUsdc.json +91 -53
  167. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
  168. package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +12 -12
  169. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
  170. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +38 -140
  171. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +4 -0
  172. package/artifacts/contracts/test/Usdc.sol/USDC.json +376 -0
  173. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  174. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.json +2 -2
  175. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  176. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.json +2 -2
  177. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  178. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.json +2 -2
  179. package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.dbg.json +4 -0
  180. package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.json +100 -0
  181. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +4 -0
  182. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.json +104 -0
  183. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
  184. package/artifacts/contracts/types/Fee.sol/FeeLib.json +52 -13
  185. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
  186. package/artifacts/contracts/types/Key32.sol/Key32Lib.json +31 -17
  187. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  188. package/artifacts/contracts/types/NftId.sol/NftIdLib.json +4 -4
  189. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  190. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +26 -3
  191. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +4 -0
  192. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.json +100 -0
  193. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  194. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +2 -2
  195. package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.dbg.json +4 -0
  196. package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.json +100 -0
  197. package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +4 -0
  198. package/artifacts/contracts/types/Referral.sol/ReferralLib.json +123 -0
  199. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +4 -0
  200. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +86 -0
  201. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +4 -0
  202. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +156 -0
  203. package/artifacts/contracts/types/Seconds.sol/SecondsLib.dbg.json +4 -0
  204. package/artifacts/contracts/types/Seconds.sol/SecondsLib.json +124 -0
  205. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
  206. package/artifacts/contracts/types/StateId.sol/StateIdLib.json +2 -2
  207. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
  208. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +38 -7
  209. package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +4 -0
  210. package/artifacts/contracts/types/UFixed.sol/MathLib.json +10 -0
  211. package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +4 -0
  212. package/artifacts/contracts/types/UFixed.sol/UFixedLib.json +479 -0
  213. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
  214. package/artifacts/contracts/types/Version.sol/VersionLib.json +40 -2
  215. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
  216. package/artifacts/contracts/types/Version.sol/VersionPartLib.json +22 -3
  217. package/contracts/components/Component.sol +221 -0
  218. package/contracts/components/Distribution.sol +293 -0
  219. package/contracts/components/IComponent.sol +68 -0
  220. package/contracts/components/IDistributionComponent.sol +79 -0
  221. package/contracts/components/IPoolComponent.sol +136 -42
  222. package/contracts/components/IProductComponent.sol +30 -9
  223. package/contracts/components/Pool.sol +310 -106
  224. package/contracts/components/Product.sol +214 -42
  225. package/contracts/instance/BundleManager.sol +125 -0
  226. package/contracts/instance/Cloneable.sol +46 -0
  227. package/contracts/instance/IInstance.sol +85 -45
  228. package/contracts/instance/IInstanceService.sol +59 -0
  229. package/contracts/instance/Instance.sol +276 -53
  230. package/contracts/instance/InstanceAccessManager.sol +297 -0
  231. package/contracts/instance/InstanceReader.sol +293 -0
  232. package/contracts/instance/InstanceService.sol +490 -0
  233. package/contracts/instance/InstanceServiceManager.sol +54 -0
  234. package/contracts/instance/ObjectManager.sol +84 -0
  235. package/contracts/instance/base/ComponentService.sol +134 -0
  236. package/contracts/instance/base/IKeyValueStore.sol +13 -13
  237. package/contracts/instance/base/ILifecycle.sol +3 -3
  238. package/contracts/instance/base/KeyValueStore.sol +61 -36
  239. package/contracts/instance/base/Lifecycle.sol +16 -11
  240. package/contracts/instance/module/IAccess.sol +47 -0
  241. package/contracts/instance/module/IBundle.sol +21 -0
  242. package/contracts/instance/module/IDistribution.sol +41 -0
  243. package/contracts/instance/module/IPolicy.sol +72 -0
  244. package/contracts/instance/module/IRisk.sol +11 -0
  245. package/contracts/instance/module/ISetup.sol +46 -0
  246. package/contracts/instance/module/ITreasury.sol +23 -0
  247. package/contracts/instance/service/ApplicationService.sol +346 -0
  248. package/contracts/instance/service/ApplicationServiceManager.sol +35 -0
  249. package/contracts/instance/service/BundleService.sol +299 -0
  250. package/contracts/instance/service/BundleServiceManager.sol +51 -0
  251. package/contracts/instance/service/ClaimService.sol +151 -0
  252. package/contracts/instance/service/ClaimServiceManager.sol +35 -0
  253. package/contracts/instance/service/DistributionService.sol +394 -0
  254. package/contracts/instance/service/DistributionServiceManager.sol +51 -0
  255. package/contracts/instance/service/IApplicationService.sol +81 -0
  256. package/contracts/instance/service/IBundleService.sol +55 -0
  257. package/contracts/instance/service/IClaimService.sol +61 -0
  258. package/contracts/instance/service/IDistributionService.sol +86 -0
  259. package/contracts/instance/service/IPolicyService.sol +70 -0
  260. package/contracts/instance/service/IPoolService.sol +8 -18
  261. package/contracts/instance/service/IProductService.sol +21 -39
  262. package/contracts/instance/service/PolicyService.sol +404 -0
  263. package/contracts/instance/service/PolicyServiceManager.sol +54 -0
  264. package/contracts/instance/service/PoolService.sol +78 -92
  265. package/contracts/instance/service/PoolServiceManager.sol +51 -0
  266. package/contracts/instance/service/ProductService.sol +168 -289
  267. package/contracts/instance/service/ProductServiceManager.sol +54 -0
  268. package/contracts/registry/ChainNft.sol +79 -36
  269. package/contracts/registry/IRegistry.sol +66 -24
  270. package/contracts/registry/IRegistryService.sol +67 -0
  271. package/contracts/registry/ITransferInterceptor.sol +6 -0
  272. package/contracts/registry/Registry.sol +366 -283
  273. package/contracts/registry/RegistryAccessManager.sol +216 -0
  274. package/contracts/registry/RegistryService.sol +283 -0
  275. package/contracts/registry/RegistryServiceManager.sol +62 -0
  276. package/contracts/registry/ReleaseManager.sol +322 -0
  277. package/contracts/registry/TokenRegistry.sol +116 -0
  278. package/contracts/shared/ContractDeployerLib.sol +72 -0
  279. package/contracts/shared/ERC165.sol +14 -8
  280. package/contracts/shared/INftOwnable.sol +23 -0
  281. package/contracts/shared/IPolicyHolder.sol +26 -0
  282. package/contracts/shared/IRegisterable.sol +10 -19
  283. package/contracts/shared/IRegistryLinked.sol +12 -0
  284. package/contracts/shared/IService.sol +18 -0
  285. package/contracts/shared/IVersionable.sol +38 -37
  286. package/contracts/shared/NftOwnable.sol +120 -0
  287. package/contracts/shared/PolicyHolder.sol +81 -0
  288. package/contracts/shared/ProxyManager.sol +169 -0
  289. package/contracts/shared/Registerable.sol +54 -66
  290. package/contracts/shared/RegistryLinked.sol +48 -0
  291. package/contracts/shared/Service.sol +58 -0
  292. package/contracts/shared/TokenHandler.sol +27 -0
  293. package/contracts/shared/UpgradableProxyWithAdmin.sol +16 -0
  294. package/contracts/shared/Versionable.sol +38 -68
  295. package/contracts/test/TestFee.sol +2 -2
  296. package/contracts/test/TestRegisterable.sol +5 -6
  297. package/contracts/test/TestRoleId.sol +2 -2
  298. package/contracts/test/TestService.sol +7 -14
  299. package/contracts/test/Usdc.sol +26 -0
  300. package/contracts/types/ClaimId.sol +52 -0
  301. package/contracts/types/DistributorType.sol +55 -0
  302. package/contracts/types/Fee.sol +10 -5
  303. package/contracts/types/Key32.sol +8 -3
  304. package/contracts/types/NftIdSet.sol +26 -24
  305. package/contracts/types/NumberId.sol +52 -0
  306. package/contracts/types/ObjectType.sol +55 -14
  307. package/contracts/types/PayoutId.sol +54 -0
  308. package/contracts/types/Referral.sol +85 -0
  309. package/contracts/types/RiskId.sol +43 -0
  310. package/contracts/types/RoleId.sol +70 -11
  311. package/contracts/types/Seconds.sol +54 -0
  312. package/contracts/types/StateId.sol +5 -1
  313. package/contracts/types/Timestamp.sol +16 -13
  314. package/contracts/types/UFixed.sol +144 -25
  315. package/contracts/types/Version.sol +13 -1
  316. package/package.json +9 -5
  317. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +0 -4
  318. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +0 -174
  319. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +0 -4
  320. package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +0 -4
  321. package/artifacts/contracts/experiment/errors/Require.sol/Require.json +0 -105
  322. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +0 -4
  323. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.json +0 -105
  324. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +0 -4
  325. package/artifacts/contracts/experiment/inheritance/A.sol/A.json +0 -128
  326. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +0 -4
  327. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.json +0 -42
  328. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +0 -4
  329. package/artifacts/contracts/experiment/inheritance/B.sol/B.json +0 -76
  330. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +0 -4
  331. package/artifacts/contracts/experiment/inheritance/C.sol/C.json +0 -89
  332. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +0 -4
  333. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.json +0 -128
  334. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +0 -4
  335. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.json +0 -37
  336. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +0 -4
  337. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +0 -4
  338. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.json +0 -63
  339. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +0 -4
  340. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +0 -59
  341. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +0 -4
  342. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.json +0 -124
  343. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +0 -4
  344. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.json +0 -74
  345. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +0 -4
  346. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +0 -124
  347. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +0 -4
  348. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +0 -207
  349. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +0 -4
  350. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.json +0 -10
  351. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +0 -4
  352. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.json +0 -10
  353. package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.dbg.json +0 -4
  354. package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.json +0 -24
  355. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +0 -4
  356. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.json +0 -300
  357. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +0 -4
  358. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +0 -63
  359. package/artifacts/contracts/instance/base/IService.sol/IService.dbg.json +0 -4
  360. package/artifacts/contracts/instance/base/IService.sol/IService.json +0 -300
  361. package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.dbg.json +0 -4
  362. package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.json +0 -326
  363. package/artifacts/contracts/instance/base/ModuleBase.sol/ModuleBase.dbg.json +0 -4
  364. package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.dbg.json +0 -4
  365. package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.dbg.json +0 -4
  366. package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.json +0 -333
  367. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccess.dbg.json +0 -4
  368. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.dbg.json +0 -4
  369. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.json +0 -333
  370. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.dbg.json +0 -4
  371. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.json +0 -296
  372. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundle.dbg.json +0 -4
  373. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.dbg.json +0 -4
  374. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.json +0 -296
  375. package/artifacts/contracts/instance/module/compensation/CompensationModule.sol/CompensationModule.dbg.json +0 -4
  376. package/artifacts/contracts/instance/module/compensation/CompensationModule.sol/CompensationModule.json +0 -10
  377. package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensation.dbg.json +0 -4
  378. package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensation.json +0 -10
  379. package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensationModule.dbg.json +0 -4
  380. package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensationModule.json +0 -10
  381. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.dbg.json +0 -4
  382. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.json +0 -188
  383. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.dbg.json +0 -4
  384. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.json +0 -10
  385. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.dbg.json +0 -4
  386. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.json +0 -188
  387. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicy.dbg.json +0 -4
  388. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.dbg.json +0 -4
  389. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.json +0 -261
  390. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.dbg.json +0 -4
  391. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.json +0 -261
  392. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.dbg.json +0 -4
  393. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.json +0 -10
  394. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.dbg.json +0 -4
  395. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.json +0 -149
  396. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.dbg.json +0 -4
  397. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.json +0 -149
  398. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRisk.dbg.json +0 -4
  399. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.dbg.json +0 -4
  400. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.json +0 -10
  401. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.dbg.json +0 -4
  402. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.json +0 -10
  403. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasury.dbg.json +0 -4
  404. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.dbg.json +0 -4
  405. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.json +0 -533
  406. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.dbg.json +0 -4
  407. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.json +0 -76
  408. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +0 -4
  409. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.json +0 -533
  410. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +0 -4
  411. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +0 -491
  412. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +0 -4
  413. package/artifacts/contracts/registry/IChainNft.sol/IChainNft.dbg.json +0 -4
  414. package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.dbg.json +0 -4
  415. package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.json +0 -24
  416. package/artifacts/contracts/shared/IOwnable.sol/IOwnable.dbg.json +0 -4
  417. package/artifacts/contracts/shared/IOwnable.sol/IOwnable.json +0 -24
  418. package/artifacts/contracts/test/TestPool.sol/TestPool.dbg.json +0 -4
  419. package/artifacts/contracts/test/TestPool.sol/TestPool.json +0 -387
  420. package/artifacts/contracts/test/TestProduct.sol/TestProduct.dbg.json +0 -4
  421. package/artifacts/contracts/test/TestProduct.sol/TestProduct.json +0 -393
  422. package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.dbg.json +0 -4
  423. package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.json +0 -453
  424. package/contracts/components/BaseComponent.sol +0 -88
  425. package/contracts/components/IBaseComponent.sol +0 -19
  426. package/contracts/experiment/errors/Require.sol +0 -38
  427. package/contracts/experiment/errors/Revert.sol +0 -44
  428. package/contracts/experiment/inheritance/A.sol +0 -53
  429. package/contracts/experiment/inheritance/B.sol +0 -28
  430. package/contracts/experiment/inheritance/C.sol +0 -34
  431. package/contracts/experiment/inheritance/IA.sol +0 -13
  432. package/contracts/experiment/inheritance/IB.sol +0 -10
  433. package/contracts/experiment/inheritance/IC.sol +0 -12
  434. package/contracts/experiment/statemachine/Dummy.sol +0 -27
  435. package/contracts/experiment/statemachine/ISM.sol +0 -25
  436. package/contracts/experiment/statemachine/README.md +0 -112
  437. package/contracts/experiment/statemachine/SM.sol +0 -57
  438. package/contracts/experiment/statemachine/SimpleStateMachine.sol +0 -31
  439. package/contracts/experiment/types/TypeA.sol +0 -47
  440. package/contracts/experiment/types/TypeB.sol +0 -29
  441. package/contracts/instance/IInstanceLinked.sol +0 -8
  442. package/contracts/instance/base/ComponentServiceBase.sol +0 -42
  443. package/contracts/instance/base/IInstanceBase.sol +0 -14
  444. package/contracts/instance/base/IService.sol +0 -15
  445. package/contracts/instance/base/InstanceBase.sol +0 -80
  446. package/contracts/instance/base/ModuleBase.sol +0 -52
  447. package/contracts/instance/base/ServiceBase.sol +0 -37
  448. package/contracts/instance/module/access/Access.sol +0 -149
  449. package/contracts/instance/module/access/IAccess.sol +0 -53
  450. package/contracts/instance/module/bundle/BundleModule.sol +0 -136
  451. package/contracts/instance/module/bundle/IBundle.sol +0 -58
  452. package/contracts/instance/module/compensation/CompensationModule.sol +0 -8
  453. package/contracts/instance/module/compensation/ICompensation.sol +0 -10
  454. package/contracts/instance/module/component/ComponentModule.sol +0 -95
  455. package/contracts/instance/module/component/IComponent.sol +0 -53
  456. package/contracts/instance/module/policy/IPolicy.sol +0 -60
  457. package/contracts/instance/module/policy/PolicyModule.sol +0 -76
  458. package/contracts/instance/module/pool/IPoolModule.sol +0 -41
  459. package/contracts/instance/module/pool/PoolModule.sol +0 -87
  460. package/contracts/instance/module/risk/IRisk.sol +0 -10
  461. package/contracts/instance/module/risk/RiskModule.sol +0 -8
  462. package/contracts/instance/module/treasury/ITreasury.sol +0 -103
  463. package/contracts/instance/module/treasury/TokenHandler.sol +0 -48
  464. package/contracts/instance/module/treasury/TreasuryModule.sol +0 -152
  465. package/contracts/instance/service/ComponentOwnerService.sol +0 -170
  466. package/contracts/instance/service/IComponentOwnerService.sol +0 -22
  467. package/contracts/registry/IChainNft.sol +0 -21
  468. package/contracts/registry/IRegistryLinked.sol +0 -8
  469. package/contracts/shared/IOwnable.sol +0 -6
  470. package/contracts/test/TestPool.sol +0 -22
  471. package/contracts/test/TestProduct.sol +0 -44
@@ -1,7 +1,5 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
- pragma solidity ^0.8.19;
3
-
4
- import {Math} from "@openzeppelin/contracts/utils/math/Math.sol";
2
+ pragma solidity ^0.8.20;
5
3
 
6
4
  /// @dev UFixed is a fixed point number with 18 decimals precision.
7
5
  type UFixed is uint256;
@@ -16,9 +14,15 @@ using {
16
14
  ltUFixed as <,
17
15
  lteUFixed as <=,
18
16
  eqUFixed as ==,
19
- UFixedMathLib.toInt
17
+ neUFixed as !=,
18
+ UFixedLib.toInt,
19
+ UFixedLib.gtz
20
20
  } for UFixed global;
21
21
 
22
+ function zeroUFixed() pure returns (UFixed zero) {
23
+ return UFixed.wrap(0);
24
+ }
25
+
22
26
  function addUFixed(UFixed a, UFixed b) pure returns (UFixed) {
23
27
  return UFixed.wrap(UFixed.unwrap(a) + UFixed.unwrap(b));
24
28
  }
@@ -30,14 +34,14 @@ function subUFixed(UFixed a, UFixed b) pure returns (UFixed) {
30
34
 
31
35
  function mulUFixed(UFixed a, UFixed b) pure returns (UFixed) {
32
36
  return
33
- UFixed.wrap(Math.mulDiv(UFixed.unwrap(a), UFixed.unwrap(b), 10 ** 18));
37
+ UFixed.wrap(MathLib.mulDiv(UFixed.unwrap(a), UFixed.unwrap(b), 10 ** 18));
34
38
  }
35
39
 
36
40
  function divUFixed(UFixed a, UFixed b) pure returns (UFixed) {
37
41
  require(UFixed.unwrap(b) > 0, "ERROR:UFM-020:DIVISOR_ZERO");
38
42
 
39
43
  return
40
- UFixed.wrap(Math.mulDiv(UFixed.unwrap(a), 10 ** 18, UFixed.unwrap(b)));
44
+ UFixed.wrap(MathLib.mulDiv(UFixed.unwrap(a), 10 ** 18, UFixed.unwrap(b)));
41
45
  }
42
46
 
43
47
  function gtUFixed(UFixed a, UFixed b) pure returns (bool isGreaterThan) {
@@ -60,6 +64,10 @@ function eqUFixed(UFixed a, UFixed b) pure returns (bool isEqual) {
60
64
  return UFixed.unwrap(a) == UFixed.unwrap(b);
61
65
  }
62
66
 
67
+ function neUFixed(UFixed a, UFixed b) pure returns (bool isEqual) {
68
+ return UFixed.unwrap(a) != UFixed.unwrap(b);
69
+ }
70
+
63
71
  function gtzUFixed(UFixed a) pure returns (bool isZero) {
64
72
  return UFixed.unwrap(a) > 0;
65
73
  }
@@ -76,20 +84,134 @@ function deltaUFixed(UFixed a, UFixed b) pure returns (UFixed) {
76
84
  return b - a;
77
85
  }
78
86
 
79
- library UFixedMathLib {
87
+ /// @dev copied from https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v4.9.3/contracts/utils/math/Math.sol
88
+ library MathLib {
89
+
80
90
  enum Rounding {
81
- /// @dev Round down - floor(value)
82
- Down,
83
- /// @dev Round up - ceil(value)
84
- Up,
85
- /// @dev Round half up - round(value)
86
- HalfUp
91
+ Down, // Toward negative infinity
92
+ Up, // Toward infinity
93
+ Zero // Toward zero
87
94
  }
88
95
 
96
+ /**
97
+ * @notice Calculates floor(x * y / denominator) with full precision. Throws if result overflows a uint256 or denominator == 0
98
+ * @dev Original credit to Remco Bloemen under MIT license (https://xn--2-umb.com/21/muldiv)
99
+ * with further edits by Uniswap Labs also under MIT license.
100
+ */
101
+ function mulDiv(uint256 x, uint256 y, uint256 denominator) internal pure returns (uint256 result) {
102
+ unchecked {
103
+ // 512-bit multiply [prod1 prod0] = x * y. Compute the product mod 2^256 and mod 2^256 - 1, then use
104
+ // use the Chinese Remainder Theorem to reconstruct the 512 bit result. The result is stored in two 256
105
+ // variables such that product = prod1 * 2^256 + prod0.
106
+ uint256 prod0; // Least significant 256 bits of the product
107
+ uint256 prod1; // Most significant 256 bits of the product
108
+ assembly {
109
+ let mm := mulmod(x, y, not(0))
110
+ prod0 := mul(x, y)
111
+ prod1 := sub(sub(mm, prod0), lt(mm, prod0))
112
+ }
113
+
114
+ // Handle non-overflow cases, 256 by 256 division.
115
+ if (prod1 == 0) {
116
+ // Solidity will revert if denominator == 0, unlike the div opcode on its own.
117
+ // The surrounding unchecked block does not change this fact.
118
+ // See https://docs.soliditylang.org/en/latest/control-structures.html#checked-or-unchecked-arithmetic.
119
+ return prod0 / denominator;
120
+ }
121
+
122
+ // Make sure the result is less than 2^256. Also prevents denominator == 0.
123
+ require(denominator > prod1, "Math: mulDiv overflow");
124
+
125
+ ///////////////////////////////////////////////
126
+ // 512 by 256 division.
127
+ ///////////////////////////////////////////////
128
+
129
+ // Make division exact by subtracting the remainder from [prod1 prod0].
130
+ uint256 remainder;
131
+ assembly {
132
+ // Compute remainder using mulmod.
133
+ remainder := mulmod(x, y, denominator)
134
+
135
+ // Subtract 256 bit number from 512 bit number.
136
+ prod1 := sub(prod1, gt(remainder, prod0))
137
+ prod0 := sub(prod0, remainder)
138
+ }
139
+
140
+ // Factor powers of two out of denominator and compute largest power of two divisor of denominator. Always >= 1.
141
+ // See https://cs.stackexchange.com/q/138556/92363.
142
+
143
+ // Does not overflow because the denominator cannot be zero at this stage in the function.
144
+ uint256 twos = denominator & (~denominator + 1);
145
+ assembly {
146
+ // Divide denominator by twos.
147
+ denominator := div(denominator, twos)
148
+
149
+ // Divide [prod1 prod0] by twos.
150
+ prod0 := div(prod0, twos)
151
+
152
+ // Flip twos such that it is 2^256 / twos. If twos is zero, then it becomes one.
153
+ twos := add(div(sub(0, twos), twos), 1)
154
+ }
155
+
156
+ // Shift in bits from prod1 into prod0.
157
+ prod0 |= prod1 * twos;
158
+
159
+ // Invert denominator mod 2^256. Now that denominator is an odd number, it has an inverse modulo 2^256 such
160
+ // that denominator * inv = 1 mod 2^256. Compute the inverse by starting with a seed that is correct for
161
+ // four bits. That is, denominator * inv = 1 mod 2^4.
162
+ uint256 inverse = (3 * denominator) ^ 2;
163
+
164
+ // Use the Newton-Raphson iteration to improve the precision. Thanks to Hensel's lifting lemma, this also works
165
+ // in modular arithmetic, doubling the correct bits in each step.
166
+ inverse *= 2 - denominator * inverse; // inverse mod 2^8
167
+ inverse *= 2 - denominator * inverse; // inverse mod 2^16
168
+ inverse *= 2 - denominator * inverse; // inverse mod 2^32
169
+ inverse *= 2 - denominator * inverse; // inverse mod 2^64
170
+ inverse *= 2 - denominator * inverse; // inverse mod 2^128
171
+ inverse *= 2 - denominator * inverse; // inverse mod 2^256
172
+
173
+ // Because the division is now exact we can divide by multiplying with the modular inverse of denominator.
174
+ // This will give us the correct result modulo 2^256. Since the preconditions guarantee that the outcome is
175
+ // less than 2^256, this is the final result. We don't need to compute the high bits of the result and prod1
176
+ // is no longer required.
177
+ result = prod0 * inverse;
178
+ return result;
179
+ }
180
+ }
181
+
182
+ /**
183
+ * @notice Calculates x * y / denominator with full precision, following the selected rounding direction.
184
+ */
185
+ function mulDiv(uint256 x, uint256 y, uint256 denominator, Rounding rounding) internal pure returns (uint256) {
186
+ uint256 result = mulDiv(x, y, denominator);
187
+ if (rounding == Rounding.Up && mulmod(x, y, denominator) > 0) {
188
+ result += 1;
189
+ }
190
+ return result;
191
+ }
192
+
193
+ }
194
+
195
+ library UFixedLib {
89
196
  int8 public constant EXP = 18;
90
197
  uint256 public constant MULTIPLIER = 10 ** uint256(int256(EXP));
91
198
  uint256 public constant MULTIPLIER_HALF = MULTIPLIER / 2;
92
199
 
200
+ /// @dev returns the rounding mode DOWN - 0.4 becomes 0, 0.5 becomes 0, 0.6 becomes 0
201
+ function ROUNDING_DOWN() public pure returns (uint8) {
202
+ return uint8(0);
203
+ }
204
+
205
+ /// @dev returns the rounding mode UP - 0.4 becomes 1, 0.5 becomes 1, 0.6 becomes 1
206
+ function ROUNDING_UP() public pure returns (uint8) {
207
+ return uint8(1);
208
+ }
209
+
210
+ /// @dev returns the rounding mode HALF_UP - 0.4 becomes 0, 0.5 becomes 1, 0.6 becomes 1
211
+ function ROUNDING_HALF_UP() public pure returns (uint8) {
212
+ return uint8(2);
213
+ }
214
+
93
215
  /// @dev Converts the uint256 to a UFixed.
94
216
  function toUFixed(uint256 a) public pure returns (UFixed) {
95
217
  return UFixed.wrap(a * MULTIPLIER);
@@ -103,9 +225,6 @@ library UFixedMathLib {
103
225
  return UFixed.wrap(a * 10 ** uint8(EXP + exp));
104
226
  }
105
227
 
106
- /// @dev Default rounding mode used by ftoi is HalfUp
107
- Rounding public constant ROUNDING_DEFAULT = Rounding.HalfUp;
108
-
109
228
  /// @dev returns the decimals precision of the UFixed type
110
229
  function decimals() public pure returns (uint256) {
111
230
  return uint8(EXP);
@@ -113,30 +232,30 @@ library UFixedMathLib {
113
232
 
114
233
  /// @dev Converts a UFixed to a uint256.
115
234
  function toInt(UFixed a) public pure returns (uint256) {
116
- return toIntWithRounding(a, ROUNDING_DEFAULT);
235
+ return toIntWithRounding(a, ROUNDING_HALF_UP());
117
236
  }
118
237
 
119
238
  /// @dev Converts a UFixed to a uint256 with given rounding mode.
120
- function toIntWithRounding(UFixed a, Rounding rounding) public pure returns (uint256) {
121
- if (rounding == Rounding.HalfUp) {
239
+ function toIntWithRounding(UFixed a, uint8 rounding) public pure returns (uint256) {
240
+ if (rounding == ROUNDING_HALF_UP()) {
122
241
  return
123
- Math.mulDiv(
242
+ MathLib.mulDiv(
124
243
  UFixed.unwrap(a) + MULTIPLIER_HALF,
125
244
  1,
126
245
  MULTIPLIER,
127
- Math.Rounding.Down
246
+ MathLib.Rounding.Down
128
247
  );
129
- } else if (rounding == Rounding.Down) {
248
+ } else if (rounding == ROUNDING_DOWN()) {
130
249
  return
131
- Math.mulDiv(
250
+ MathLib.mulDiv(
132
251
  UFixed.unwrap(a),
133
252
  1,
134
253
  MULTIPLIER,
135
- Math.Rounding.Down
254
+ MathLib.Rounding.Down
136
255
  );
137
256
  } else {
138
257
  return
139
- Math.mulDiv(UFixed.unwrap(a), 1, MULTIPLIER, Math.Rounding.Up);
258
+ MathLib.mulDiv(UFixed.unwrap(a), 1, MULTIPLIER, MathLib.Rounding.Up);
140
259
  }
141
260
  }
142
261
 
@@ -6,15 +6,18 @@ type VersionPart is uint8;
6
6
  using {
7
7
  versionPartGt as >,
8
8
  versionPartEq as ==,
9
+ versionPartNe as !=,
9
10
  VersionPartLib.toInt
10
11
  }
11
12
  for VersionPart global;
12
13
 
13
14
  function versionPartGt(VersionPart a, VersionPart b) pure returns(bool isGreaterThan) { return VersionPart.unwrap(a) > VersionPart.unwrap(b); }
14
15
  function versionPartEq(VersionPart a, VersionPart b) pure returns(bool isSame) { return VersionPart.unwrap(a) == VersionPart.unwrap(b); }
16
+ function versionPartNe(VersionPart a, VersionPart b) pure returns(bool isSame) { return VersionPart.unwrap(a) != VersionPart.unwrap(b); }
15
17
 
16
18
  library VersionPartLib {
17
- function toInt(VersionPart x) external pure returns(uint) { return VersionPart.unwrap(x); }
19
+ function toInt(VersionPart a) external pure returns(uint) { return VersionPart.unwrap(a); }
20
+ function toVersionPart(uint256 a) external pure returns(VersionPart) { return VersionPart.wrap(uint8(a)); }
18
21
  }
19
22
 
20
23
  type Version is uint24; // contains major,minor,patch version parts
@@ -23,6 +26,7 @@ using {
23
26
  versionGt as >,
24
27
  versionEq as ==,
25
28
  VersionLib.toInt,
29
+ VersionLib.toUint64,
26
30
  VersionLib.toMajorPart,
27
31
  VersionLib.toVersionParts
28
32
  }
@@ -34,6 +38,8 @@ function versionEq(Version a, Version b) pure returns(bool isSame) { return Vers
34
38
  library VersionLib {
35
39
  function toInt(Version version) external pure returns(uint) { return Version.unwrap(version); }
36
40
 
41
+ function toUint64(Version version) external pure returns(uint64) { return Version.unwrap(version); }
42
+
37
43
  function toMajorPart(Version version)
38
44
  external
39
45
  pure
@@ -89,6 +95,12 @@ library VersionLib {
89
95
  (major << 16) + (minor << 8) + patch));
90
96
  }
91
97
 
98
+ // TODO check for overflow?
99
+ function toVersion(uint64 versionNumber) external pure returns(Version) {
100
+ //assert(versionNumber <= type(Version).max);
101
+ return Version.wrap(uint24(versionNumber));
102
+ }
103
+
92
104
  function zeroVersion() external pure returns(Version) {
93
105
  return Version.wrap(0);
94
106
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@etherisc/gif-next",
3
- "version": "0.0.2-d96b9e1-825",
3
+ "version": "0.0.2-da0f894-204",
4
4
  "description": "This is the repository for the next version of the Generic Insurance Framework (GIF) smart contracts. ",
5
5
  "main": "index.js",
6
6
  "scripts": {
@@ -32,8 +32,8 @@
32
32
  "@nomicfoundation/hardhat-foundry": "^1.1.1",
33
33
  "@nomicfoundation/hardhat-toolbox": "^3.0.0",
34
34
  "@nomicfoundation/hardhat-verify": "^1.1.1",
35
- "@typescript-eslint/eslint-plugin": "^6.7.2",
36
- "@typescript-eslint/parser": "^6.7.2",
35
+ "@typescript-eslint/eslint-plugin": "^7.1.0",
36
+ "@typescript-eslint/parser": "^7.1.0",
37
37
  "dotenv": "^16.3.1",
38
38
  "eslint": "^8.50.0",
39
39
  "hardhat": "^2.17.2",
@@ -42,7 +42,11 @@
42
42
  "typescript": "^5"
43
43
  },
44
44
  "dependencies": {
45
- "@openzeppelin/contracts": "^4.9.3",
46
- "@openzeppelin/contracts-upgradeable": "^4.9.3"
45
+ "@openzeppelin/contracts": "5.0.0",
46
+ "@openzeppelin/contracts-upgradeable": "5.0.0",
47
+ "abi-coder": "^5.0.0",
48
+ "ethers": "^6.7.1",
49
+ "solidity-docgen": "^0.6.0-beta.36",
50
+ "winston": "^3.10.0"
47
51
  }
48
52
  }
@@ -1,4 +0,0 @@
1
- {
2
- "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/746f2ad7b0d888e05db828a61f6d5e10.json"
4
- }
@@ -1,174 +0,0 @@
1
- {
2
- "_format": "hh-sol-artifact-1",
3
- "contractName": "BaseComponent",
4
- "sourceName": "contracts/components/BaseComponent.sol",
5
- "abi": [
6
- {
7
- "inputs": [],
8
- "name": "getData",
9
- "outputs": [
10
- {
11
- "internalType": "bytes",
12
- "name": "data",
13
- "type": "bytes"
14
- }
15
- ],
16
- "stateMutability": "view",
17
- "type": "function"
18
- },
19
- {
20
- "inputs": [],
21
- "name": "getInstance",
22
- "outputs": [
23
- {
24
- "internalType": "contract IInstance",
25
- "name": "instance",
26
- "type": "address"
27
- }
28
- ],
29
- "stateMutability": "view",
30
- "type": "function"
31
- },
32
- {
33
- "inputs": [],
34
- "name": "getNftId",
35
- "outputs": [
36
- {
37
- "internalType": "NftId",
38
- "name": "nftId",
39
- "type": "uint96"
40
- }
41
- ],
42
- "stateMutability": "view",
43
- "type": "function"
44
- },
45
- {
46
- "inputs": [],
47
- "name": "getOwner",
48
- "outputs": [
49
- {
50
- "internalType": "address",
51
- "name": "owner",
52
- "type": "address"
53
- }
54
- ],
55
- "stateMutability": "view",
56
- "type": "function"
57
- },
58
- {
59
- "inputs": [],
60
- "name": "getParentNftId",
61
- "outputs": [
62
- {
63
- "internalType": "NftId",
64
- "name": "nftId",
65
- "type": "uint96"
66
- }
67
- ],
68
- "stateMutability": "view",
69
- "type": "function"
70
- },
71
- {
72
- "inputs": [],
73
- "name": "getRegistry",
74
- "outputs": [
75
- {
76
- "internalType": "contract IRegistry",
77
- "name": "registry",
78
- "type": "address"
79
- }
80
- ],
81
- "stateMutability": "view",
82
- "type": "function"
83
- },
84
- {
85
- "inputs": [],
86
- "name": "getToken",
87
- "outputs": [
88
- {
89
- "internalType": "contract IERC20Metadata",
90
- "name": "token",
91
- "type": "address"
92
- }
93
- ],
94
- "stateMutability": "view",
95
- "type": "function"
96
- },
97
- {
98
- "inputs": [],
99
- "name": "getType",
100
- "outputs": [
101
- {
102
- "internalType": "ObjectType",
103
- "name": "objectType",
104
- "type": "uint8"
105
- }
106
- ],
107
- "stateMutability": "pure",
108
- "type": "function"
109
- },
110
- {
111
- "inputs": [],
112
- "name": "getWallet",
113
- "outputs": [
114
- {
115
- "internalType": "address",
116
- "name": "walletAddress",
117
- "type": "address"
118
- }
119
- ],
120
- "stateMutability": "view",
121
- "type": "function"
122
- },
123
- {
124
- "inputs": [],
125
- "name": "lock",
126
- "outputs": [],
127
- "stateMutability": "nonpayable",
128
- "type": "function"
129
- },
130
- {
131
- "inputs": [],
132
- "name": "register",
133
- "outputs": [
134
- {
135
- "internalType": "NftId",
136
- "name": "componentId",
137
- "type": "uint96"
138
- }
139
- ],
140
- "stateMutability": "nonpayable",
141
- "type": "function"
142
- },
143
- {
144
- "inputs": [
145
- {
146
- "internalType": "bytes4",
147
- "name": "interfaceId",
148
- "type": "bytes4"
149
- }
150
- ],
151
- "name": "supportsInterface",
152
- "outputs": [
153
- {
154
- "internalType": "bool",
155
- "name": "",
156
- "type": "bool"
157
- }
158
- ],
159
- "stateMutability": "view",
160
- "type": "function"
161
- },
162
- {
163
- "inputs": [],
164
- "name": "unlock",
165
- "outputs": [],
166
- "stateMutability": "nonpayable",
167
- "type": "function"
168
- }
169
- ],
170
- "bytecode": "0x",
171
- "deployedBytecode": "0x",
172
- "linkReferences": {},
173
- "deployedLinkReferences": {}
174
- }
@@ -1,4 +0,0 @@
1
- {
2
- "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/746f2ad7b0d888e05db828a61f6d5e10.json"
4
- }
@@ -1,4 +0,0 @@
1
- {
2
- "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../build-info/746f2ad7b0d888e05db828a61f6d5e10.json"
4
- }
@@ -1,105 +0,0 @@
1
- {
2
- "_format": "hh-sol-artifact-1",
3
- "contractName": "Require",
4
- "sourceName": "contracts/experiment/errors/Require.sol",
5
- "abi": [
6
- {
7
- "inputs": [],
8
- "stateMutability": "nonpayable",
9
- "type": "constructor"
10
- },
11
- {
12
- "inputs": [
13
- {
14
- "internalType": "uint256",
15
- "name": "a",
16
- "type": "uint256"
17
- },
18
- {
19
- "internalType": "uint256",
20
- "name": "b",
21
- "type": "uint256"
22
- }
23
- ],
24
- "name": "AsmallerThanB_L",
25
- "type": "error"
26
- },
27
- {
28
- "inputs": [
29
- {
30
- "internalType": "uint256",
31
- "name": "a",
32
- "type": "uint256"
33
- }
34
- ],
35
- "name": "AsmallerThanB_M",
36
- "type": "error"
37
- },
38
- {
39
- "inputs": [],
40
- "name": "AsmallerThanB_S",
41
- "type": "error"
42
- },
43
- {
44
- "inputs": [
45
- {
46
- "internalType": "uint256",
47
- "name": "a",
48
- "type": "uint256"
49
- }
50
- ],
51
- "name": "isAlargerThanBRequire_L",
52
- "outputs": [
53
- {
54
- "internalType": "bool",
55
- "name": "isLarger",
56
- "type": "bool"
57
- }
58
- ],
59
- "stateMutability": "view",
60
- "type": "function"
61
- },
62
- {
63
- "inputs": [
64
- {
65
- "internalType": "uint256",
66
- "name": "a",
67
- "type": "uint256"
68
- }
69
- ],
70
- "name": "isAlargerThanBRequire_M",
71
- "outputs": [
72
- {
73
- "internalType": "bool",
74
- "name": "isLarger",
75
- "type": "bool"
76
- }
77
- ],
78
- "stateMutability": "view",
79
- "type": "function"
80
- },
81
- {
82
- "inputs": [
83
- {
84
- "internalType": "uint256",
85
- "name": "a",
86
- "type": "uint256"
87
- }
88
- ],
89
- "name": "isAlargerThanBRequire_S",
90
- "outputs": [
91
- {
92
- "internalType": "bool",
93
- "name": "isLarger",
94
- "type": "bool"
95
- }
96
- ],
97
- "stateMutability": "view",
98
- "type": "function"
99
- }
100
- ],
101
- "bytecode": "0x608060405234801561001057600080fd5b50602a60008190555061040f806100286000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c806342bf62e0146100465780638db581aa1461007657806394977ddd146100a6575b600080fd5b610060600480360381019061005b91906101fb565b6100d6565b60405161006d9190610243565b60405180910390f35b610090600480360381019061008b91906101fb565b610124565b60405161009d9190610243565b60405180910390f35b6100c060048036038101906100bb91906101fb565b610172565b6040516100cd9190610243565b60405180910390f35b60008054821161011b576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610112906102bb565b60405180910390fd5b60019050919050565b600080548211610169576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161016090610327565b60405180910390fd5b60019050919050565b6000805482116101b7576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016101ae906103b9565b60405180910390fd5b60019050919050565b600080fd5b6000819050919050565b6101d8816101c5565b81146101e357600080fd5b50565b6000813590506101f5816101cf565b92915050565b600060208284031215610211576102106101c0565b5b600061021f848285016101e6565b91505092915050565b60008115159050919050565b61023d81610228565b82525050565b60006020820190506102586000830184610234565b92915050565b600082825260208201905092915050565b7f4552524f523a4142432d3030323a415f49535f534d414c4c4552000000000000600082015250565b60006102a5601a8361025e565b91506102b08261026f565b602082019050919050565b600060208201905081810360008301526102d481610298565b9050919050565b7f4552524f523a4142432d30303100000000000000000000000000000000000000600082015250565b6000610311600d8361025e565b915061031c826102db565b602082019050919050565b6000602082019050818103600083015261034081610304565b9050919050565b7f4552524f523a4142432d3030333a415f49535f534d414c4c45525f5448414e5f60008201527f4200000000000000000000000000000000000000000000000000000000000000602082015250565b60006103a360218361025e565b91506103ae82610347565b604082019050919050565b600060208201905081810360008301526103d281610396565b905091905056fea26469706673582212207f10bf5c332235128519fa30412afeef48946f8606b398b2fed02edcd66fa75164736f6c63430008140033",
102
- "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100415760003560e01c806342bf62e0146100465780638db581aa1461007657806394977ddd146100a6575b600080fd5b610060600480360381019061005b91906101fb565b6100d6565b60405161006d9190610243565b60405180910390f35b610090600480360381019061008b91906101fb565b610124565b60405161009d9190610243565b60405180910390f35b6100c060048036038101906100bb91906101fb565b610172565b6040516100cd9190610243565b60405180910390f35b60008054821161011b576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610112906102bb565b60405180910390fd5b60019050919050565b600080548211610169576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161016090610327565b60405180910390fd5b60019050919050565b6000805482116101b7576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016101ae906103b9565b60405180910390fd5b60019050919050565b600080fd5b6000819050919050565b6101d8816101c5565b81146101e357600080fd5b50565b6000813590506101f5816101cf565b92915050565b600060208284031215610211576102106101c0565b5b600061021f848285016101e6565b91505092915050565b60008115159050919050565b61023d81610228565b82525050565b60006020820190506102586000830184610234565b92915050565b600082825260208201905092915050565b7f4552524f523a4142432d3030323a415f49535f534d414c4c4552000000000000600082015250565b60006102a5601a8361025e565b91506102b08261026f565b602082019050919050565b600060208201905081810360008301526102d481610298565b9050919050565b7f4552524f523a4142432d30303100000000000000000000000000000000000000600082015250565b6000610311600d8361025e565b915061031c826102db565b602082019050919050565b6000602082019050818103600083015261034081610304565b9050919050565b7f4552524f523a4142432d3030333a415f49535f534d414c4c45525f5448414e5f60008201527f4200000000000000000000000000000000000000000000000000000000000000602082015250565b60006103a360218361025e565b91506103ae82610347565b604082019050919050565b600060208201905081810360008301526103d281610396565b905091905056fea26469706673582212207f10bf5c332235128519fa30412afeef48946f8606b398b2fed02edcd66fa75164736f6c63430008140033",
103
- "linkReferences": {},
104
- "deployedLinkReferences": {}
105
- }
@@ -1,4 +0,0 @@
1
- {
2
- "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../build-info/746f2ad7b0d888e05db828a61f6d5e10.json"
4
- }