@etherisc/gif-next 0.0.2-f74fcad-685 → 0.0.2-f79a517-071

Sign up to get free protection for your applications and to get access to all the features.
Files changed (398) hide show
  1. package/README.md +264 -7
  2. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +4 -0
  3. package/artifacts/contracts/{instance/component/ComponentModule.sol/ComponentModule.json → components/BaseComponent.sol/BaseComponent.json} +152 -150
  4. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +4 -0
  5. package/artifacts/contracts/components/Distribution.sol/Distribution.json +557 -0
  6. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +4 -0
  7. package/artifacts/contracts/components/{IPool.sol/IPoolComponent.json → IBaseComponent.sol/IBaseComponent.json} +115 -116
  8. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +4 -0
  9. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +177 -0
  10. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +4 -0
  11. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +308 -0
  12. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +4 -0
  13. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +207 -0
  14. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  15. package/artifacts/contracts/components/Pool.sol/Pool.json +471 -83
  16. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  17. package/artifacts/contracts/components/Product.sol/Product.json +345 -77
  18. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.dbg.json +4 -0
  19. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.json +66 -0
  20. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.dbg.json +4 -0
  21. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.json +24 -0
  22. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.dbg.json +4 -0
  23. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.json +42 -0
  24. package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +1 -1
  25. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +1 -1
  26. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +1 -1
  27. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +1 -1
  28. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +1 -1
  29. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +1 -1
  30. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +1 -1
  31. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +1 -1
  32. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +1 -1
  33. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +1 -1
  34. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +1 -1
  35. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +2 -2
  36. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +1 -1
  37. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +1 -1
  38. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +1 -1
  39. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +2 -2
  40. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +1 -1
  41. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +2 -2
  42. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
  43. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
  44. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  45. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +1169 -708
  46. package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.dbg.json +4 -0
  47. package/artifacts/contracts/instance/{component/IComponent.sol → IInstanceLinked.sol}/IInstanceLinked.json +1 -1
  48. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  49. package/artifacts/contracts/instance/Instance.sol/Instance.json +1565 -956
  50. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +4 -0
  51. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.json +481 -0
  52. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +4 -0
  53. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +113 -0
  54. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +4 -0
  55. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.json +560 -0
  56. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +4 -0
  57. package/artifacts/contracts/instance/{lifecycle/ILifecycle.sol/ILifecycleModule.json → base/ILifecycle.sol/ILifecycle.json} +10 -77
  58. package/artifacts/contracts/instance/base/IService.sol/IService.dbg.json +4 -0
  59. package/artifacts/contracts/instance/base/IService.sol/IService.json +421 -0
  60. package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.dbg.json +4 -0
  61. package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.json +544 -0
  62. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +4 -0
  63. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +710 -0
  64. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +4 -0
  65. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +169 -0
  66. package/artifacts/contracts/instance/base/ModuleBase.sol/ModuleBase.dbg.json +4 -0
  67. package/artifacts/contracts/instance/base/ModuleBase.sol/ModuleBase.json +10 -0
  68. package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.dbg.json +4 -0
  69. package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.json +468 -0
  70. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.dbg.json +4 -0
  71. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.json +297 -0
  72. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundle.dbg.json +4 -0
  73. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundle.json +10 -0
  74. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.dbg.json +4 -0
  75. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.json +297 -0
  76. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.dbg.json +4 -0
  77. package/artifacts/contracts/instance/{pool/IPoolModule.sol/IPoolModule.json → module/component/ComponentModule.sol/ComponentModule.json} +49 -61
  78. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.dbg.json +4 -0
  79. package/artifacts/contracts/instance/{component → module/component}/IComponent.sol/IComponent.json +1 -1
  80. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.dbg.json +4 -0
  81. package/artifacts/contracts/instance/{product/IProductService.sol/IProductService.json → module/component/IComponent.sol/IComponentModule.json} +51 -61
  82. package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.dbg.json +4 -0
  83. package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.json +10 -0
  84. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistribution.dbg.json +4 -0
  85. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistribution.json +10 -0
  86. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistributionModule.dbg.json +4 -0
  87. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistributionModule.json +10 -0
  88. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicy.dbg.json +4 -0
  89. package/artifacts/contracts/instance/{policy → module/policy}/IPolicy.sol/IPolicy.json +1 -1
  90. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.dbg.json +4 -0
  91. package/artifacts/contracts/instance/{policy → module/policy}/IPolicy.sol/IPolicyModule.json +136 -119
  92. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.dbg.json +4 -0
  93. package/artifacts/contracts/instance/{policy → module/policy}/PolicyModule.sol/PolicyModule.json +137 -120
  94. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.dbg.json +4 -0
  95. package/artifacts/contracts/instance/{pool → module/pool}/IPoolModule.sol/IPool.json +1 -1
  96. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.dbg.json +4 -0
  97. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.json +164 -0
  98. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.dbg.json +4 -0
  99. package/artifacts/contracts/instance/{pool → module/pool}/PoolModule.sol/PoolModule.json +66 -57
  100. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRisk.dbg.json +4 -0
  101. package/artifacts/contracts/instance/{access/IAccess.sol/IAccess.json → module/risk/IRisk.sol/IRisk.json} +2 -2
  102. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.dbg.json +4 -0
  103. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.json +113 -0
  104. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.dbg.json +4 -0
  105. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.json +131 -0
  106. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasury.dbg.json +4 -0
  107. package/artifacts/contracts/instance/{treasury → module/treasury}/ITreasury.sol/ITreasury.json +1 -1
  108. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.dbg.json +4 -0
  109. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.json +638 -0
  110. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.dbg.json +4 -0
  111. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.json +76 -0
  112. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +4 -0
  113. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.json +638 -0
  114. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +4 -0
  115. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +827 -0
  116. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +4 -0
  117. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +630 -0
  118. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +4 -0
  119. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.json +466 -0
  120. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +4 -0
  121. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +446 -0
  122. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +4 -0
  123. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +561 -0
  124. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +4 -0
  125. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +751 -0
  126. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +4 -0
  127. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +753 -0
  128. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +4 -0
  129. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +1068 -0
  130. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  131. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +239 -2
  132. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  133. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +287 -31
  134. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +4 -0
  135. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +872 -0
  136. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +4 -0
  137. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +34 -0
  138. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  139. package/artifacts/contracts/registry/Registry.sol/Registry.json +500 -43
  140. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +4 -0
  141. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +1245 -0
  142. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +4 -0
  143. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +496 -0
  144. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +4 -0
  145. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.json +107 -0
  146. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +4 -0
  147. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +35 -0
  148. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +4 -0
  149. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +127 -0
  150. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +4 -0
  151. package/artifacts/contracts/{components/Component.sol/Component.json → shared/IRegisterable.sol/IRegisterable.json} +98 -102
  152. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +4 -0
  153. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +205 -0
  154. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +4 -0
  155. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +158 -0
  156. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +4 -0
  157. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +349 -0
  158. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +4 -0
  159. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +274 -0
  160. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +4 -0
  161. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +129 -0
  162. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +4 -0
  163. package/artifacts/contracts/shared/Versionable.sol/Versionable.json +228 -0
  164. package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.dbg.json +4 -0
  165. package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.json +557 -0
  166. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +4 -0
  167. package/artifacts/contracts/test/TestFee.sol/TestFee.json +119 -0
  168. package/artifacts/contracts/test/TestPool.sol/TestPool.dbg.json +4 -0
  169. package/artifacts/contracts/test/TestPool.sol/TestPool.json +716 -0
  170. package/artifacts/contracts/test/TestProduct.sol/TestProduct.dbg.json +4 -0
  171. package/artifacts/contracts/test/TestProduct.sol/TestProduct.json +744 -0
  172. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +4 -0
  173. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +305 -0
  174. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +4 -0
  175. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +116 -0
  176. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +4 -0
  177. package/artifacts/contracts/test/TestService.sol/TestService.json +584 -0
  178. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +4 -0
  179. package/artifacts/contracts/test/TestToken.sol/TestUsdc.json +376 -0
  180. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +4 -0
  181. package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +218 -0
  182. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +4 -0
  183. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +270 -0
  184. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +4 -0
  185. package/artifacts/contracts/test/Usdc.sol/USDC.json +376 -0
  186. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +4 -0
  187. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.json +10 -0
  188. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  189. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  190. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +4 -0
  191. package/artifacts/contracts/types/Fee.sol/FeeLib.json +257 -0
  192. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +4 -0
  193. package/artifacts/contracts/types/Key32.sol/Key32Lib.json +111 -0
  194. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  195. package/artifacts/contracts/types/NftId.sol/NftIdLib.json +65 -4
  196. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +4 -0
  197. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +10 -0
  198. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  199. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +2 -2
  200. package/artifacts/contracts/types/ReferralId.sol/ReferralIdLib.dbg.json +4 -0
  201. package/artifacts/contracts/types/ReferralId.sol/ReferralIdLib.json +99 -0
  202. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +4 -0
  203. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +86 -0
  204. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +4 -0
  205. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +30 -0
  206. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
  207. package/artifacts/contracts/types/StateId.sol/StateIdLib.json +2 -2
  208. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
  209. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +64 -2
  210. package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +4 -0
  211. package/artifacts/contracts/types/UFixed.sol/MathLib.json +10 -0
  212. package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +4 -0
  213. package/artifacts/contracts/types/UFixed.sol/UFixedLib.json +479 -0
  214. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +4 -0
  215. package/artifacts/contracts/types/Version.sol/VersionLib.json +177 -0
  216. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +4 -0
  217. package/artifacts/contracts/types/Version.sol/VersionPartLib.json +30 -0
  218. package/contracts/components/BaseComponent.sol +79 -0
  219. package/contracts/components/Distribution.sol +155 -0
  220. package/contracts/components/IBaseComponent.sol +19 -0
  221. package/contracts/components/IDistributionComponent.sol +46 -0
  222. package/contracts/components/IPoolComponent.sol +64 -0
  223. package/contracts/components/IProductComponent.sol +37 -0
  224. package/contracts/components/Pool.sol +218 -24
  225. package/contracts/components/Product.sol +248 -38
  226. package/contracts/experiment/cloning/Cloner.sol +47 -0
  227. package/contracts/instance/IInstance.sol +39 -12
  228. package/contracts/instance/IInstanceLinked.sol +8 -0
  229. package/contracts/instance/Instance.sol +58 -47
  230. package/contracts/instance/base/ComponentServiceBase.sol +49 -0
  231. package/contracts/instance/base/IInstanceBase.sol +23 -0
  232. package/contracts/instance/base/IKeyValueStore.sol +50 -0
  233. package/contracts/instance/{lifecycle → base}/ILifecycle.sol +4 -21
  234. package/contracts/instance/base/IService.sol +15 -0
  235. package/contracts/instance/base/InstanceBase.sol +89 -0
  236. package/contracts/instance/base/KeyValueStore.sol +161 -0
  237. package/contracts/instance/base/Lifecycle.sol +100 -0
  238. package/contracts/instance/base/ModuleBase.sol +57 -0
  239. package/contracts/instance/base/ServiceBase.sol +44 -0
  240. package/contracts/instance/module/bundle/BundleModule.sol +134 -0
  241. package/contracts/instance/module/bundle/IBundle.sol +53 -0
  242. package/contracts/instance/module/component/ComponentModule.sol +71 -0
  243. package/contracts/instance/module/component/IComponent.sol +28 -0
  244. package/contracts/instance/module/distribution/DistributionModule.sol +17 -0
  245. package/contracts/instance/module/distribution/IDistribution.sol +10 -0
  246. package/contracts/instance/module/policy/IPolicy.sol +63 -0
  247. package/contracts/instance/module/policy/PolicyModule.sol +91 -0
  248. package/contracts/instance/module/pool/IPoolModule.sol +41 -0
  249. package/contracts/instance/module/pool/PoolModule.sol +95 -0
  250. package/contracts/instance/module/risk/IRisk.sol +26 -0
  251. package/contracts/instance/module/risk/RiskModule.sol +62 -0
  252. package/contracts/instance/module/treasury/ITreasury.sol +84 -0
  253. package/contracts/instance/module/treasury/TokenHandler.sol +48 -0
  254. package/contracts/instance/module/treasury/TreasuryModule.sol +131 -0
  255. package/contracts/instance/service/ComponentOwnerService.sol +315 -0
  256. package/contracts/instance/service/DistributionService.sol +54 -0
  257. package/contracts/instance/service/IComponentOwnerService.sol +20 -0
  258. package/contracts/instance/service/IDistributionService.sol +12 -0
  259. package/contracts/instance/service/IPoolService.sol +37 -0
  260. package/contracts/instance/service/IProductService.sol +107 -0
  261. package/contracts/instance/service/PoolService.sol +149 -0
  262. package/contracts/instance/service/ProductService.sol +510 -0
  263. package/contracts/registry/ChainNft.sol +129 -62
  264. package/contracts/registry/IRegistry.sol +35 -45
  265. package/contracts/registry/IRegistryService.sol +35 -0
  266. package/contracts/registry/ITransferInterceptor.sol +6 -0
  267. package/contracts/registry/Registry.sol +367 -126
  268. package/contracts/registry/RegistryService.sol +441 -0
  269. package/contracts/registry/RegistryServiceManager.sol +64 -0
  270. package/contracts/shared/ContractDeployerLib.sol +72 -0
  271. package/contracts/shared/ERC165.sol +21 -0
  272. package/contracts/shared/INftOwnable.sol +22 -0
  273. package/contracts/shared/IRegisterable.sol +17 -0
  274. package/contracts/shared/IVersionable.sol +96 -0
  275. package/contracts/shared/NftOwnable.sol +136 -0
  276. package/contracts/shared/ProxyManager.sol +94 -0
  277. package/contracts/shared/Registerable.sol +89 -0
  278. package/contracts/shared/UpgradableProxyWithAdmin.sol +16 -0
  279. package/contracts/shared/Versionable.sol +147 -0
  280. package/contracts/test/TestDistribution.sol +22 -0
  281. package/contracts/test/TestFee.sol +25 -0
  282. package/contracts/test/TestPool.sol +27 -0
  283. package/contracts/test/TestProduct.sol +74 -0
  284. package/contracts/test/TestRegisterable.sol +18 -0
  285. package/contracts/test/TestRoleId.sol +14 -0
  286. package/contracts/test/TestService.sol +26 -0
  287. package/contracts/{mock/Dip.sol → test/TestToken.sol} +5 -5
  288. package/contracts/test/TestVersion.sol +44 -0
  289. package/contracts/test/TestVersionable.sol +17 -0
  290. package/contracts/{mock → test}/Usdc.sol +1 -1
  291. package/contracts/types/AddressSet.sol +58 -0
  292. package/contracts/types/Fee.sol +44 -20
  293. package/contracts/types/Key32.sol +45 -0
  294. package/contracts/types/NftId.sol +22 -1
  295. package/contracts/types/NftIdSet.sol +60 -0
  296. package/contracts/types/ObjectType.sol +37 -13
  297. package/contracts/types/ReferralId.sol +48 -0
  298. package/contracts/types/RiskId.sol +43 -0
  299. package/contracts/types/RoleId.sol +45 -0
  300. package/contracts/types/StateId.sol +13 -3
  301. package/contracts/types/Timestamp.sol +22 -1
  302. package/contracts/types/UFixed.sol +138 -23
  303. package/contracts/types/Version.sol +104 -0
  304. package/package.json +11 -5
  305. package/artifacts/contracts/components/Component.sol/Component.dbg.json +0 -4
  306. package/artifacts/contracts/components/Component.sol/InstanceLinked.dbg.json +0 -4
  307. package/artifacts/contracts/components/Component.sol/InstanceLinked.json +0 -35
  308. package/artifacts/contracts/components/IPool.sol/IPoolComponent.dbg.json +0 -4
  309. package/artifacts/contracts/components/IProduct.sol/IProductComponent.dbg.json +0 -4
  310. package/artifacts/contracts/components/IProduct.sol/IProductComponent.json +0 -74
  311. package/artifacts/contracts/instance/access/Access.sol/AccessModule.dbg.json +0 -4
  312. package/artifacts/contracts/instance/access/Access.sol/AccessModule.json +0 -400
  313. package/artifacts/contracts/instance/access/IAccess.sol/IAccess.dbg.json +0 -4
  314. package/artifacts/contracts/instance/access/IAccess.sol/IAccessCheckRole.dbg.json +0 -4
  315. package/artifacts/contracts/instance/access/IAccess.sol/IAccessCheckRole.json +0 -35
  316. package/artifacts/contracts/instance/access/IAccess.sol/IAccessComponentTypeRoles.dbg.json +0 -4
  317. package/artifacts/contracts/instance/access/IAccess.sol/IAccessComponentTypeRoles.json +0 -50
  318. package/artifacts/contracts/instance/access/IAccess.sol/IAccessModule.dbg.json +0 -4
  319. package/artifacts/contracts/instance/access/IAccess.sol/IAccessModule.json +0 -336
  320. package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentModule.dbg.json +0 -4
  321. package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentOwnerService.dbg.json +0 -4
  322. package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentOwnerService.json +0 -202
  323. package/artifacts/contracts/instance/component/IComponent.sol/IComponent.dbg.json +0 -4
  324. package/artifacts/contracts/instance/component/IComponent.sol/IComponentContract.dbg.json +0 -4
  325. package/artifacts/contracts/instance/component/IComponent.sol/IComponentContract.json +0 -205
  326. package/artifacts/contracts/instance/component/IComponent.sol/IComponentModule.dbg.json +0 -4
  327. package/artifacts/contracts/instance/component/IComponent.sol/IComponentModule.json +0 -217
  328. package/artifacts/contracts/instance/component/IComponent.sol/IComponentOwnerService.dbg.json +0 -4
  329. package/artifacts/contracts/instance/component/IComponent.sol/IComponentOwnerService.json +0 -141
  330. package/artifacts/contracts/instance/component/IComponent.sol/IInstanceLinked.dbg.json +0 -4
  331. package/artifacts/contracts/instance/lifecycle/ILifecycle.sol/ILifecycle.dbg.json +0 -4
  332. package/artifacts/contracts/instance/lifecycle/ILifecycle.sol/ILifecycle.json +0 -134
  333. package/artifacts/contracts/instance/lifecycle/ILifecycle.sol/ILifecycleModule.dbg.json +0 -4
  334. package/artifacts/contracts/instance/lifecycle/LifecycleModule.sol/LifecycleModule.dbg.json +0 -4
  335. package/artifacts/contracts/instance/lifecycle/LifecycleModule.sol/LifecycleModule.json +0 -221
  336. package/artifacts/contracts/instance/policy/IPolicy.sol/IPolicy.dbg.json +0 -4
  337. package/artifacts/contracts/instance/policy/IPolicy.sol/IPolicyModule.dbg.json +0 -4
  338. package/artifacts/contracts/instance/policy/PolicyModule.sol/PolicyModule.dbg.json +0 -4
  339. package/artifacts/contracts/instance/pool/IPoolModule.sol/IPool.dbg.json +0 -4
  340. package/artifacts/contracts/instance/pool/IPoolModule.sol/IPoolModule.dbg.json +0 -4
  341. package/artifacts/contracts/instance/pool/PoolModule.sol/PoolModule.dbg.json +0 -4
  342. package/artifacts/contracts/instance/product/IProductService.sol/IProductModule.dbg.json +0 -4
  343. package/artifacts/contracts/instance/product/IProductService.sol/IProductModule.json +0 -75
  344. package/artifacts/contracts/instance/product/IProductService.sol/IProductService.dbg.json +0 -4
  345. package/artifacts/contracts/instance/product/ProductService.sol/ProductModule.dbg.json +0 -4
  346. package/artifacts/contracts/instance/product/ProductService.sol/ProductModule.json +0 -75
  347. package/artifacts/contracts/instance/product/ProductService.sol/ProductService.dbg.json +0 -4
  348. package/artifacts/contracts/instance/product/ProductService.sol/ProductService.json +0 -196
  349. package/artifacts/contracts/instance/treasury/ITreasury.sol/ITreasury.dbg.json +0 -4
  350. package/artifacts/contracts/instance/treasury/ITreasury.sol/ITreasuryModule.dbg.json +0 -4
  351. package/artifacts/contracts/instance/treasury/ITreasury.sol/ITreasuryModule.json +0 -490
  352. package/artifacts/contracts/instance/treasury/TokenHandler.sol/TokenHandler.dbg.json +0 -4
  353. package/artifacts/contracts/instance/treasury/TokenHandler.sol/TokenHandler.json +0 -45
  354. package/artifacts/contracts/instance/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +0 -4
  355. package/artifacts/contracts/instance/treasury/TreasuryModule.sol/TreasuryModule.json +0 -490
  356. package/artifacts/contracts/mock/Dip.sol/DIP.dbg.json +0 -4
  357. package/artifacts/contracts/mock/Dip.sol/DIP.json +0 -338
  358. package/artifacts/contracts/mock/TestPool.sol/TestPool.dbg.json +0 -4
  359. package/artifacts/contracts/mock/TestPool.sol/TestPool.json +0 -294
  360. package/artifacts/contracts/mock/TestProduct.sol/TestProduct.dbg.json +0 -4
  361. package/artifacts/contracts/mock/TestProduct.sol/TestProduct.json +0 -384
  362. package/artifacts/contracts/mock/Usdc.sol/USDC.dbg.json +0 -4
  363. package/artifacts/contracts/mock/Usdc.sol/USDC.json +0 -338
  364. package/artifacts/contracts/registry/IChainNft.sol/IChainNft.dbg.json +0 -4
  365. package/artifacts/contracts/registry/IChainNft.sol/IChainNft.json +0 -452
  366. package/artifacts/contracts/registry/IRegistry.sol/IOwnable.dbg.json +0 -4
  367. package/artifacts/contracts/registry/IRegistry.sol/IOwnable.json +0 -24
  368. package/artifacts/contracts/registry/IRegistry.sol/IRegisterable.dbg.json +0 -4
  369. package/artifacts/contracts/registry/IRegistry.sol/IRegisterable.json +0 -166
  370. package/artifacts/contracts/registry/IRegistry.sol/IRegistryLinked.dbg.json +0 -4
  371. package/artifacts/contracts/registry/IRegistry.sol/IRegistryLinked.json +0 -49
  372. package/artifacts/contracts/registry/Registry.sol/Registerable.dbg.json +0 -4
  373. package/artifacts/contracts/registry/Registry.sol/Registerable.json +0 -166
  374. package/artifacts/contracts/registry/Registry.sol/RegistryLinked.dbg.json +0 -4
  375. package/artifacts/contracts/registry/Registry.sol/RegistryLinked.json +0 -60
  376. package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.dbg.json +0 -4
  377. package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.json +0 -479
  378. package/contracts/components/Component.sol +0 -77
  379. package/contracts/components/IPool.sol +0 -15
  380. package/contracts/components/IProduct.sol +0 -16
  381. package/contracts/experiment/statemachine/README.md +0 -112
  382. package/contracts/instance/access/Access.sol +0 -165
  383. package/contracts/instance/access/IAccess.sol +0 -63
  384. package/contracts/instance/component/ComponentModule.sol +0 -274
  385. package/contracts/instance/component/IComponent.sol +0 -74
  386. package/contracts/instance/lifecycle/LifecycleModule.sol +0 -88
  387. package/contracts/instance/policy/IPolicy.sol +0 -50
  388. package/contracts/instance/policy/PolicyModule.sol +0 -114
  389. package/contracts/instance/pool/IPoolModule.sol +0 -23
  390. package/contracts/instance/pool/PoolModule.sol +0 -81
  391. package/contracts/instance/product/IProductService.sol +0 -36
  392. package/contracts/instance/product/ProductService.sol +0 -136
  393. package/contracts/instance/treasury/ITreasury.sol +0 -91
  394. package/contracts/instance/treasury/TokenHandler.sol +0 -24
  395. package/contracts/instance/treasury/TreasuryModule.sol +0 -168
  396. package/contracts/mock/TestPool.sol +0 -16
  397. package/contracts/mock/TestProduct.sol +0 -39
  398. package/contracts/registry/IChainNft.sol +0 -21
@@ -0,0 +1,43 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.19;
3
+
4
+ import {Key32, KeyId, Key32Lib} from "./Key32.sol";
5
+ import {RISK} from "./ObjectType.sol";
6
+
7
+ type RiskId is bytes8;
8
+
9
+ // type bindings
10
+ using {
11
+ eqRiskId as ==,
12
+ neRiskId as !=,
13
+ RiskIdLib.toKey32
14
+ } for RiskId global;
15
+
16
+ // general pure free functions
17
+
18
+ // @dev Returns true iff risk ids a and b are identical
19
+ function eqRiskId(RiskId a, RiskId b) pure returns (bool isSame) {
20
+ return RiskId.unwrap(a) == RiskId.unwrap(b);
21
+ }
22
+
23
+ // @dev Returns true iff risk ids a and b are different
24
+ function neRiskId(RiskId a, RiskId b) pure returns (bool isDifferent) {
25
+ return RiskId.unwrap(a) != RiskId.unwrap(b);
26
+ }
27
+
28
+ library RiskIdLib {
29
+ // @dev Converts a role string into a role id.
30
+ function toRiskId(string memory risk) public pure returns (RiskId) {
31
+ return RiskId.wrap(bytes8(keccak256(abi.encode(risk))));
32
+ }
33
+
34
+ /// @dev Returns the key32 value for the specified nft id and object type.
35
+ function toKey32(RiskId id) public pure returns (Key32 key) {
36
+ return Key32Lib.toKey32(RISK(), toKeyId(id));
37
+ }
38
+
39
+ /// @dev Returns the key id value for the specified nft id
40
+ function toKeyId(RiskId id) public pure returns (KeyId keyId) {
41
+ return KeyId.wrap(bytes31(RiskId.unwrap(id)));
42
+ }
43
+ }
@@ -0,0 +1,45 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.19;
3
+
4
+ type RoleId is bytes8;
5
+
6
+ // type bindings
7
+ using {
8
+ eqRoleId as ==,
9
+ neRoleId as !=
10
+ } for RoleId global;
11
+
12
+ // general pure free functions
13
+ function DISTRIBUTION_OWNER_ROLE_NAME() pure returns (string memory) { return "DistributionOwnerRole"; }
14
+ function ORACLE_OWNER_ROLE_NAME() pure returns (string memory) { return "OracleOwnerRole"; }
15
+ function POOL_OWNER_ROLE_NAME() pure returns (string memory) { return "PoolOwnerRole"; }
16
+ function PRODUCT_OWNER_ROLE_NAME() pure returns (string memory) { return "ProductOwnerRole"; }
17
+
18
+ function DISTRIBUTION_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId("DistributionOwnerRole"); }
19
+ function ORACLE_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId("OracleOwnerRole"); }
20
+ function POOL_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId("PoolOwnerRole"); }
21
+ function PRODUCT_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId("ProductOwnerRole"); }
22
+
23
+ function PRODUCT_REGISTRAR_ROLE() pure returns(uint64 roleId) { return 1; }
24
+ function POOL_REGISTRAR_ROLE() pure returns(uint64 roleId) { return 2; }
25
+ function DISTRIBUTION_REGISTRAR_ROLE() pure returns(uint64 roleId) { return 3; }
26
+ function ORACLE_REGISTRAR_ROLE() pure returns(uint64 roleId) { return 4; }
27
+ function POLICY_REGISTRAR_ROLE() pure returns(uint64 roleId) { return 5; }
28
+ function BUNDLE_REGISTRAR_ROLE() pure returns(uint64 roleId) { return 6; }
29
+
30
+ // @dev Returns true iff role ids a and b are identical
31
+ function eqRoleId(RoleId a, RoleId b) pure returns (bool isSame) {
32
+ return RoleId.unwrap(a) == RoleId.unwrap(b);
33
+ }
34
+
35
+ // @dev Returns true iff role ids a and b are different
36
+ function neRoleId(RoleId a, RoleId b) pure returns (bool isDifferent) {
37
+ return RoleId.unwrap(a) != RoleId.unwrap(b);
38
+ }
39
+
40
+ library RoleIdLib {
41
+ // @dev Converts a role string into a role id.
42
+ function toRoleId(string memory role) public pure returns (RoleId) {
43
+ return RoleId.wrap(bytes8(keccak256(abi.encode(role))));
44
+ }
45
+ }
@@ -5,7 +5,13 @@ pragma solidity ^0.8.19;
5
5
  type StateId is uint8;
6
6
 
7
7
  // type bindings
8
- using {eqStateId as ==, neStateId as !=, StateIdLib.toInt} for StateId global;
8
+ using {
9
+ eqStateId as ==,
10
+ neStateId as !=,
11
+ StateIdLib.eqz,
12
+ StateIdLib.gtz,
13
+ StateIdLib.toInt
14
+ } for StateId global;
9
15
 
10
16
  // general pure free functions
11
17
  function APPLIED() pure returns (StateId) {
@@ -20,14 +26,18 @@ function DECLINED() pure returns (StateId) {
20
26
  return toStateId(30);
21
27
  }
22
28
 
23
- function CONFIRMED() pure returns (StateId) {
29
+ function UNDERWRITTEN() pure returns (StateId) {
24
30
  return toStateId(40);
25
31
  }
26
32
 
27
- function EXPECTED() pure returns (StateId) {
33
+ function CONFIRMED() pure returns (StateId) {
28
34
  return toStateId(50);
29
35
  }
30
36
 
37
+ function EXPECTED() pure returns (StateId) {
38
+ return toStateId(60);
39
+ }
40
+
31
41
  function ACTIVE() pure returns (StateId) {
32
42
  return toStateId(100);
33
43
  }
@@ -9,7 +9,10 @@ using {
9
9
  ltTimestamp as <,
10
10
  lteTimestamp as <=,
11
11
  eqTimestamp as ==,
12
- neTimestamp as !=
12
+ neTimestamp as !=,
13
+ TimestampLib.gtz,
14
+ TimestampLib.eqz,
15
+ TimestampLib.addSeconds
13
16
  } for Timestamp global;
14
17
 
15
18
  /// @dev return true if Timestamp a is after Timestamp b
@@ -96,6 +99,24 @@ library TimestampLib {
96
99
  return neTimestamp(a, b);
97
100
  }
98
101
 
102
+ /// @dev return true if Timestamp is larger than 0
103
+ function gtz(Timestamp timestamp) public pure returns (bool) {
104
+ return Timestamp.unwrap(timestamp) > 0;
105
+ }
106
+
107
+ /// @dev return true if Timestamp equals 0
108
+ function eqz(Timestamp timestamp) public pure returns (bool) {
109
+ return Timestamp.unwrap(timestamp) == 0;
110
+ }
111
+
112
+ /// @dev return true if Timestamp a is not equal to Timestamp b
113
+ function addSeconds(
114
+ Timestamp timestamp,
115
+ uint256 timeDelta
116
+ ) public pure returns (Timestamp) {
117
+ return toTimestamp(Timestamp.unwrap(timestamp) + uint40(timeDelta));
118
+ }
119
+
99
120
  function toInt(Timestamp timestamp) public pure returns (uint256) {
100
121
  return uint256(uint40(Timestamp.unwrap(timestamp)));
101
122
  }
@@ -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;
@@ -15,9 +13,16 @@ using {
15
13
  gteUFixed as >=,
16
14
  ltUFixed as <,
17
15
  lteUFixed as <=,
18
- eqUFixed as ==
16
+ eqUFixed as ==,
17
+ neUFixed as !=,
18
+ UFixedLib.toInt,
19
+ UFixedLib.gtz
19
20
  } for UFixed global;
20
21
 
22
+ function zeroUFixed() pure returns (UFixed zero) {
23
+ return UFixed.wrap(0);
24
+ }
25
+
21
26
  function addUFixed(UFixed a, UFixed b) pure returns (UFixed) {
22
27
  return UFixed.wrap(UFixed.unwrap(a) + UFixed.unwrap(b));
23
28
  }
@@ -29,14 +34,14 @@ function subUFixed(UFixed a, UFixed b) pure returns (UFixed) {
29
34
 
30
35
  function mulUFixed(UFixed a, UFixed b) pure returns (UFixed) {
31
36
  return
32
- 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));
33
38
  }
34
39
 
35
40
  function divUFixed(UFixed a, UFixed b) pure returns (UFixed) {
36
41
  require(UFixed.unwrap(b) > 0, "ERROR:UFM-020:DIVISOR_ZERO");
37
42
 
38
43
  return
39
- 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)));
40
45
  }
41
46
 
42
47
  function gtUFixed(UFixed a, UFixed b) pure returns (bool isGreaterThan) {
@@ -59,6 +64,10 @@ function eqUFixed(UFixed a, UFixed b) pure returns (bool isEqual) {
59
64
  return UFixed.unwrap(a) == UFixed.unwrap(b);
60
65
  }
61
66
 
67
+ function neUFixed(UFixed a, UFixed b) pure returns (bool isEqual) {
68
+ return UFixed.unwrap(a) != UFixed.unwrap(b);
69
+ }
70
+
62
71
  function gtzUFixed(UFixed a) pure returns (bool isZero) {
63
72
  return UFixed.unwrap(a) > 0;
64
73
  }
@@ -75,8 +84,115 @@ function deltaUFixed(UFixed a, UFixed b) pure returns (UFixed) {
75
84
  return b - a;
76
85
  }
77
86
 
78
- 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
+
90
+ enum Rounding {
91
+ Down, // Toward negative infinity
92
+ Up, // Toward infinity
93
+ Zero // Toward zero
94
+ }
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
+ }
79
192
 
193
+ }
194
+
195
+ library UFixedLib {
80
196
  int8 public constant EXP = 18;
81
197
  uint256 public constant MULTIPLIER = 10 ** uint256(int256(EXP));
82
198
  uint256 public constant MULTIPLIER_HALF = MULTIPLIER / 2;
@@ -96,51 +212,50 @@ library UFixedMathLib {
96
212
  return uint8(2);
97
213
  }
98
214
 
99
- /// @dev returns the decimals precision of the UFixed type
100
- function decimals() public pure returns (uint256) {
101
- return uint8(EXP);
102
- }
103
-
104
215
  /// @dev Converts the uint256 to a UFixed.
105
- function itof(uint256 a) public pure returns (UFixed) {
216
+ function toUFixed(uint256 a) public pure returns (UFixed) {
106
217
  return UFixed.wrap(a * MULTIPLIER);
107
218
  }
108
219
 
109
- // TODO rename to toUFixed
110
220
  /// @dev Converts the uint256 to a UFixed with given exponent.
111
- function itof(uint256 a, int8 exp) public pure returns (UFixed) {
221
+ function toUFixed(uint256 a, int8 exp) public pure returns (UFixed) {
112
222
  require(EXP + exp >= 0, "ERROR:FM-010:EXPONENT_TOO_SMALL");
113
223
  require(EXP + exp <= 64, "ERROR:FM-011:EXPONENT_TOO_LARGE");
114
224
 
115
225
  return UFixed.wrap(a * 10 ** uint8(EXP + exp));
116
226
  }
117
227
 
228
+ /// @dev returns the decimals precision of the UFixed type
229
+ function decimals() public pure returns (uint256) {
230
+ return uint8(EXP);
231
+ }
232
+
118
233
  /// @dev Converts a UFixed to a uint256.
119
- function ftoi(UFixed a) public pure returns (uint256) {
120
- return ftoi(a, ROUNDING_HALF_UP());
234
+ function toInt(UFixed a) public pure returns (uint256) {
235
+ return toIntWithRounding(a, ROUNDING_HALF_UP());
121
236
  }
122
237
 
123
238
  /// @dev Converts a UFixed to a uint256 with given rounding mode.
124
- function ftoi(UFixed a, uint8 rounding) public pure returns (uint256) {
239
+ function toIntWithRounding(UFixed a, uint8 rounding) public pure returns (uint256) {
125
240
  if (rounding == ROUNDING_HALF_UP()) {
126
241
  return
127
- Math.mulDiv(
242
+ MathLib.mulDiv(
128
243
  UFixed.unwrap(a) + MULTIPLIER_HALF,
129
244
  1,
130
245
  MULTIPLIER,
131
- Math.Rounding.Down
246
+ MathLib.Rounding.Down
132
247
  );
133
248
  } else if (rounding == ROUNDING_DOWN()) {
134
249
  return
135
- Math.mulDiv(
250
+ MathLib.mulDiv(
136
251
  UFixed.unwrap(a),
137
252
  1,
138
253
  MULTIPLIER,
139
- Math.Rounding.Down
254
+ MathLib.Rounding.Down
140
255
  );
141
256
  } else {
142
257
  return
143
- Math.mulDiv(UFixed.unwrap(a), 1, MULTIPLIER, Math.Rounding.Up);
258
+ MathLib.mulDiv(UFixed.unwrap(a), 1, MULTIPLIER, MathLib.Rounding.Up);
144
259
  }
145
260
  }
146
261
 
@@ -0,0 +1,104 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.19;
3
+
4
+ type VersionPart is uint8;
5
+
6
+ using {
7
+ versionPartGt as >,
8
+ versionPartEq as ==,
9
+ VersionPartLib.toInt
10
+ }
11
+ for VersionPart global;
12
+
13
+ function versionPartGt(VersionPart a, VersionPart b) pure returns(bool isGreaterThan) { return VersionPart.unwrap(a) > VersionPart.unwrap(b); }
14
+ function versionPartEq(VersionPart a, VersionPart b) pure returns(bool isSame) { return VersionPart.unwrap(a) == VersionPart.unwrap(b); }
15
+
16
+ library VersionPartLib {
17
+ function toInt(VersionPart x) external pure returns(uint) { return VersionPart.unwrap(x); }
18
+ }
19
+
20
+ type Version is uint24; // contains major,minor,patch version parts
21
+
22
+ using {
23
+ versionGt as >,
24
+ versionEq as ==,
25
+ VersionLib.toInt,
26
+ VersionLib.toUint64,
27
+ VersionLib.toMajorPart,
28
+ VersionLib.toVersionParts
29
+ }
30
+ for Version global;
31
+
32
+ function versionGt(Version a, Version b) pure returns(bool isGreaterThan) { return Version.unwrap(a) > Version.unwrap(b); }
33
+ function versionEq(Version a, Version b) pure returns(bool isSame) { return Version.unwrap(a) == Version.unwrap(b); }
34
+
35
+ library VersionLib {
36
+ function toInt(Version version) external pure returns(uint) { return Version.unwrap(version); }
37
+
38
+ function toUint64(Version version) external pure returns(uint64) { return Version.unwrap(version); }
39
+
40
+ function toMajorPart(Version version)
41
+ external
42
+ pure
43
+ returns(VersionPart major)
44
+ {
45
+ uint24 versionInt = Version.unwrap(version);
46
+ uint8 majorInt = uint8(versionInt >> 16);
47
+ return VersionPart.wrap(majorInt);
48
+ }
49
+
50
+ function toVersionParts(Version version)
51
+ external
52
+ pure
53
+ returns(
54
+ VersionPart major,
55
+ VersionPart minor,
56
+ VersionPart patch
57
+ )
58
+ {
59
+ uint24 versionInt = Version.unwrap(version);
60
+ uint8 majorInt = uint8(versionInt >> 16);
61
+
62
+ versionInt -= majorInt << 16;
63
+ uint8 minorInt = uint8(versionInt >> 8);
64
+ uint8 patchInt = uint8(versionInt - (minorInt << 8));
65
+
66
+ return (
67
+ VersionPart.wrap(majorInt),
68
+ VersionPart.wrap(minorInt),
69
+ VersionPart.wrap(patchInt)
70
+ );
71
+ }
72
+
73
+ function toVersionPart(uint256 versionPart) external pure returns(VersionPart) {
74
+ return VersionPart.wrap(uint8(versionPart));
75
+ }
76
+
77
+ function toVersion(
78
+ uint256 major,
79
+ uint256 minor,
80
+ uint256 patch
81
+ )
82
+ external
83
+ pure
84
+ returns(Version)
85
+ {
86
+ require(
87
+ major < 256 && minor < 256 && patch < 256,
88
+ "ERROR:VRS-010:VERSION_PART_TOO_BIG");
89
+
90
+ return Version.wrap(
91
+ uint24(
92
+ (major << 16) + (minor << 8) + patch));
93
+ }
94
+
95
+ // TODO check for overflow?
96
+ function toVersion(uint64 versionNumber) external pure returns(Version) {
97
+ //assert(versionNumber <= type(Version).max);
98
+ return Version.wrap(uint24(versionNumber));
99
+ }
100
+
101
+ function zeroVersion() external pure returns(Version) {
102
+ return Version.wrap(0);
103
+ }
104
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@etherisc/gif-next",
3
- "version": "0.0.2-f74fcad-685",
3
+ "version": "0.0.2-f79a517-071",
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": {
@@ -11,7 +11,8 @@
11
11
  "coverage": "hh coverage",
12
12
  "styleFix": "prettier --write --plugin=prettier-plugin-solidity 'contracts/**/*.sol' 'test_forge/**/*.t.sol'",
13
13
  "styleCheck": "prettier --check --plugin=prettier-plugin-solidity 'contracts/**/*.sol' 'test_forge/**/*.t.sol'",
14
- "lint": "solhint 'contracts/**/*.sol' 'test_forge/**/*.t.sol'"
14
+ "lint": "solhint 'contracts/**/*.sol' 'test_forge/**/*.t.sol'",
15
+ "eslint": "eslint ."
15
16
  },
16
17
  "repository": {
17
18
  "type": "git",
@@ -31,16 +32,21 @@
31
32
  "@nomicfoundation/hardhat-foundry": "^1.1.1",
32
33
  "@nomicfoundation/hardhat-toolbox": "^3.0.0",
33
34
  "@nomicfoundation/hardhat-verify": "^1.1.1",
35
+ "@typescript-eslint/eslint-plugin": "^6.7.2",
36
+ "@typescript-eslint/parser": "^6.7.2",
34
37
  "dotenv": "^16.3.1",
38
+ "eslint": "^8.50.0",
35
39
  "hardhat": "^2.17.2",
36
40
  "prettier": "^3.0.3",
37
- "prettier-plugin-solidity": "^1.1.3"
41
+ "prettier-plugin-solidity": "^1.1.3",
42
+ "typescript": "^5"
38
43
  },
39
44
  "dependencies": {
40
- "@openzeppelin/contracts": "^4.9.3",
41
- "@openzeppelin/contracts-upgradeable": "^4.9.3",
45
+ "@openzeppelin/contracts": "5.0.0",
46
+ "@openzeppelin/contracts-upgradeable": "5.0.0",
42
47
  "abi-coder": "^5.0.0",
43
48
  "ethers": "^6.7.1",
49
+ "solidity-docgen": "^0.6.0-beta.36",
44
50
  "winston": "^3.10.0"
45
51
  }
46
52
  }
@@ -1,4 +0,0 @@
1
- {
2
- "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/371956c35f778b248bb1774ada1ed516.json"
4
- }
@@ -1,4 +0,0 @@
1
- {
2
- "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/371956c35f778b248bb1774ada1ed516.json"
4
- }
@@ -1,35 +0,0 @@
1
- {
2
- "_format": "hh-sol-artifact-1",
3
- "contractName": "InstanceLinked",
4
- "sourceName": "contracts/components/Component.sol",
5
- "abi": [
6
- {
7
- "inputs": [
8
- {
9
- "internalType": "address",
10
- "name": "instance",
11
- "type": "address"
12
- }
13
- ],
14
- "stateMutability": "nonpayable",
15
- "type": "constructor"
16
- },
17
- {
18
- "inputs": [],
19
- "name": "getInstance",
20
- "outputs": [
21
- {
22
- "internalType": "contract IInstance",
23
- "name": "instance",
24
- "type": "address"
25
- }
26
- ],
27
- "stateMutability": "view",
28
- "type": "function"
29
- }
30
- ],
31
- "bytecode": "0x608060405234801561001057600080fd5b5060405161011438038061011483398101604081905261002f91610054565b600080546001600160a01b0319166001600160a01b0392909216919091179055610084565b60006020828403121561006657600080fd5b81516001600160a01b038116811461007d57600080fd5b9392505050565b6082806100926000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c8063de7b5d1414602d575b600080fd5b600054604080516001600160a01b039092168252519081900360200190f3fea264697066735822122073a0ea8fa4352d28b2a129d826cfd42d4c8f65d3a006cdf283aa909e0fac0e4264736f6c63430008140033",
32
- "deployedBytecode": "0x6080604052348015600f57600080fd5b506004361060285760003560e01c8063de7b5d1414602d575b600080fd5b600054604080516001600160a01b039092168252519081900360200190f3fea264697066735822122073a0ea8fa4352d28b2a129d826cfd42d4c8f65d3a006cdf283aa909e0fac0e4264736f6c63430008140033",
33
- "linkReferences": {},
34
- "deployedLinkReferences": {}
35
- }
@@ -1,4 +0,0 @@
1
- {
2
- "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/371956c35f778b248bb1774ada1ed516.json"
4
- }
@@ -1,4 +0,0 @@
1
- {
2
- "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/371956c35f778b248bb1774ada1ed516.json"
4
- }
@@ -1,74 +0,0 @@
1
- {
2
- "_format": "hh-sol-artifact-1",
3
- "contractName": "IProductComponent",
4
- "sourceName": "contracts/components/IProduct.sol",
5
- "abi": [
6
- {
7
- "inputs": [],
8
- "name": "getPolicyFee",
9
- "outputs": [
10
- {
11
- "components": [
12
- {
13
- "internalType": "UFixed",
14
- "name": "fractionalFee",
15
- "type": "uint256"
16
- },
17
- {
18
- "internalType": "uint256",
19
- "name": "fixedFee",
20
- "type": "uint256"
21
- }
22
- ],
23
- "internalType": "struct Fee",
24
- "name": "policyFee",
25
- "type": "tuple"
26
- }
27
- ],
28
- "stateMutability": "view",
29
- "type": "function"
30
- },
31
- {
32
- "inputs": [],
33
- "name": "getPoolNftId",
34
- "outputs": [
35
- {
36
- "internalType": "NftId",
37
- "name": "poolNftId",
38
- "type": "uint96"
39
- }
40
- ],
41
- "stateMutability": "view",
42
- "type": "function"
43
- },
44
- {
45
- "inputs": [],
46
- "name": "getProcessingFee",
47
- "outputs": [
48
- {
49
- "components": [
50
- {
51
- "internalType": "UFixed",
52
- "name": "fractionalFee",
53
- "type": "uint256"
54
- },
55
- {
56
- "internalType": "uint256",
57
- "name": "fixedFee",
58
- "type": "uint256"
59
- }
60
- ],
61
- "internalType": "struct Fee",
62
- "name": "processingFee",
63
- "type": "tuple"
64
- }
65
- ],
66
- "stateMutability": "view",
67
- "type": "function"
68
- }
69
- ],
70
- "bytecode": "0x",
71
- "deployedBytecode": "0x",
72
- "linkReferences": {},
73
- "deployedLinkReferences": {}
74
- }