@etherisc/gif-next 0.0.2-d911522 → 0.0.2-da06f3b-803

Sign up to get free protection for your applications and to get access to all the features.
Files changed (405) hide show
  1. package/README.md +364 -8
  2. package/artifacts/contracts/components/Component.sol/Component.dbg.json +1 -1
  3. package/artifacts/contracts/components/Component.sol/Component.json +510 -33
  4. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +4 -0
  5. package/artifacts/contracts/components/Distribution.sol/Distribution.json +849 -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} +244 -241
  8. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +4 -0
  9. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +648 -0
  10. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +4 -0
  11. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +713 -0
  12. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +4 -0
  13. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +748 -0
  14. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  15. package/artifacts/contracts/components/Pool.sol/Pool.json +752 -51
  16. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  17. package/artifacts/contracts/components/Product.sol/Product.json +773 -55
  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/Require.sol/Require.json +2 -2
  26. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +1 -1
  27. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.json +2 -2
  28. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +1 -1
  29. package/artifacts/contracts/experiment/inheritance/A.sol/A.json +2 -2
  30. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +1 -1
  31. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.json +2 -2
  32. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +1 -1
  33. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +1 -1
  34. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +1 -1
  35. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +1 -1
  36. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +1 -1
  37. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +1 -1
  38. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +4 -0
  39. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +59 -0
  40. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +4 -0
  41. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.json +124 -0
  42. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +4 -0
  43. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.json +74 -0
  44. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +4 -0
  45. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +124 -0
  46. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +4 -0
  47. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +207 -0
  48. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
  49. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.json +2 -2
  50. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
  51. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.json +2 -2
  52. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +4 -0
  53. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +764 -0
  54. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +4 -0
  55. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.json +185 -0
  56. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  57. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +1558 -470
  58. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +4 -0
  59. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +592 -0
  60. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  61. package/artifacts/contracts/instance/Instance.sol/Instance.json +2454 -462
  62. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +4 -0
  63. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +1081 -0
  64. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +4 -0
  65. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +1381 -0
  66. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +4 -0
  67. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +1050 -0
  68. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +4 -0
  69. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +473 -0
  70. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +4 -0
  71. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +261 -0
  72. package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json +4 -0
  73. package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.json +603 -0
  74. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +4 -0
  75. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.json +429 -0
  76. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +4 -0
  77. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.json +115 -0
  78. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +4 -0
  79. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +502 -0
  80. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +4 -0
  81. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +169 -0
  82. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +4 -0
  83. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +228 -0
  84. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +4 -0
  85. package/artifacts/contracts/instance/{access/IAccess.sol/IAccess.json → module/IBundle.sol/IBundle.json} +2 -2
  86. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +4 -0
  87. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.json +10 -0
  88. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +4 -0
  89. package/artifacts/contracts/instance/{policy → module}/IPolicy.sol/IPolicy.json +1 -1
  90. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +4 -0
  91. package/artifacts/contracts/instance/{pool/IPoolModule.sol/IPool.json → module/IRisk.sol/IRisk.json} +2 -2
  92. package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +4 -0
  93. package/artifacts/contracts/instance/{component/IComponent.sol/IComponent.json → module/ISetup.sol/ISetup.json} +2 -2
  94. package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +4 -0
  95. package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.json +10 -0
  96. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +4 -0
  97. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +1102 -0
  98. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +4 -0
  99. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +449 -0
  100. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +4 -0
  101. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +772 -0
  102. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +4 -0
  103. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +437 -0
  104. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +4 -0
  105. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +715 -0
  106. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +4 -0
  107. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +441 -0
  108. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +4 -0
  109. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +766 -0
  110. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +4 -0
  111. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +494 -0
  112. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +4 -0
  113. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +531 -0
  114. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +4 -0
  115. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +1227 -0
  116. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +4 -0
  117. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +505 -0
  118. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +4 -0
  119. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +806 -0
  120. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +4 -0
  121. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +437 -0
  122. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +4 -0
  123. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +856 -0
  124. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +4 -0
  125. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +437 -0
  126. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  127. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +239 -2
  128. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  129. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +525 -61
  130. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +4 -0
  131. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +981 -0
  132. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +4 -0
  133. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +34 -0
  134. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  135. package/artifacts/contracts/registry/Registry.sol/Registry.json +572 -74
  136. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +4 -0
  137. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +285 -0
  138. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +4 -0
  139. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +1200 -0
  140. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +4 -0
  141. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +464 -0
  142. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +4 -0
  143. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +547 -0
  144. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +4 -0
  145. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +394 -0
  146. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +4 -0
  147. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.json +107 -0
  148. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +4 -0
  149. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +35 -0
  150. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +4 -0
  151. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +127 -0
  152. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +4 -0
  153. package/artifacts/contracts/{instance/pool/PoolModule.sol/PoolModule.json → shared/IRegisterable.sol/IRegisterable.json} +107 -73
  154. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +4 -0
  155. package/artifacts/contracts/shared/IService.sol/IService.json +416 -0
  156. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +4 -0
  157. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +205 -0
  158. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +4 -0
  159. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +171 -0
  160. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +4 -0
  161. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +362 -0
  162. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +4 -0
  163. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +282 -0
  164. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +4 -0
  165. package/artifacts/contracts/shared/Service.sol/Service.json +476 -0
  166. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +4 -0
  167. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +96 -0
  168. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +4 -0
  169. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +129 -0
  170. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +4 -0
  171. package/artifacts/contracts/shared/Versionable.sol/Versionable.json +228 -0
  172. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +4 -0
  173. package/artifacts/contracts/test/TestFee.sol/TestFee.json +119 -0
  174. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +4 -0
  175. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +313 -0
  176. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +4 -0
  177. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +116 -0
  178. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +4 -0
  179. package/artifacts/contracts/test/TestService.sol/TestService.json +608 -0
  180. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +4 -0
  181. package/artifacts/contracts/test/TestToken.sol/TestUsdc.json +376 -0
  182. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +4 -0
  183. package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +218 -0
  184. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +4 -0
  185. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +286 -0
  186. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +4 -0
  187. package/artifacts/contracts/test/Usdc.sol/USDC.json +376 -0
  188. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +4 -0
  189. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.json +10 -0
  190. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  191. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.json +2 -2
  192. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  193. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.json +2 -2
  194. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +4 -0
  195. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.json +104 -0
  196. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +4 -0
  197. package/artifacts/contracts/types/Fee.sol/FeeLib.json +257 -0
  198. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +4 -0
  199. package/artifacts/contracts/types/Key32.sol/Key32Lib.json +125 -0
  200. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  201. package/artifacts/contracts/types/NftId.sol/NftIdLib.json +65 -4
  202. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +4 -0
  203. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +33 -0
  204. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +4 -0
  205. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.json +100 -0
  206. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +4 -0
  207. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +92 -0
  208. package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +4 -0
  209. package/artifacts/contracts/types/Referral.sol/ReferralLib.json +123 -0
  210. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +4 -0
  211. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +86 -0
  212. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +4 -0
  213. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +156 -0
  214. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +4 -0
  215. package/artifacts/contracts/types/StateId.sol/StateIdLib.json +92 -0
  216. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
  217. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +77 -2
  218. package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +4 -0
  219. package/artifacts/contracts/types/UFixed.sol/MathLib.json +10 -0
  220. package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +4 -0
  221. package/artifacts/contracts/types/UFixed.sol/UFixedLib.json +479 -0
  222. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +4 -0
  223. package/artifacts/contracts/types/Version.sol/VersionLib.json +177 -0
  224. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +4 -0
  225. package/artifacts/contracts/types/Version.sol/VersionPartLib.json +49 -0
  226. package/contracts/components/Component.sol +192 -38
  227. package/contracts/components/Distribution.sol +153 -0
  228. package/contracts/components/IComponent.sol +43 -0
  229. package/contracts/components/IDistributionComponent.sol +47 -0
  230. package/contracts/components/IPoolComponent.sol +51 -0
  231. package/contracts/components/IProductComponent.sol +39 -0
  232. package/contracts/components/Pool.sol +196 -17
  233. package/contracts/components/Product.sol +236 -36
  234. package/contracts/experiment/cloning/Cloner.sol +47 -0
  235. package/contracts/experiment/errors/Require.sol +10 -5
  236. package/contracts/experiment/errors/Revert.sol +13 -8
  237. package/contracts/experiment/inheritance/A.sol +8 -11
  238. package/contracts/experiment/inheritance/B.sol +10 -5
  239. package/contracts/experiment/inheritance/C.sol +11 -5
  240. package/contracts/experiment/inheritance/IA.sol +2 -7
  241. package/contracts/experiment/inheritance/IB.sol +3 -2
  242. package/contracts/experiment/inheritance/IC.sol +4 -3
  243. package/contracts/experiment/statemachine/Dummy.sol +27 -0
  244. package/contracts/experiment/statemachine/ISM.sol +25 -0
  245. package/contracts/experiment/statemachine/SM.sol +57 -0
  246. package/contracts/experiment/statemachine/SimpleStateMachine.sol +31 -0
  247. package/contracts/experiment/types/TypeA.sol +14 -9
  248. package/contracts/experiment/types/TypeB.sol +14 -9
  249. package/contracts/instance/BundleManager.sol +125 -0
  250. package/contracts/instance/Cloneable.sol +46 -0
  251. package/contracts/instance/IInstance.sol +67 -15
  252. package/contracts/instance/IInstanceService.sol +42 -0
  253. package/contracts/instance/Instance.sol +248 -43
  254. package/contracts/instance/InstanceAccessManager.sol +414 -0
  255. package/contracts/instance/InstanceReader.sol +293 -0
  256. package/contracts/instance/InstanceService.sol +473 -0
  257. package/contracts/instance/InstanceServiceManager.sol +54 -0
  258. package/contracts/instance/ObjectManager.sol +84 -0
  259. package/contracts/instance/base/ComponentService.sol +134 -0
  260. package/contracts/instance/base/IKeyValueStore.sol +49 -0
  261. package/contracts/instance/base/ILifecycle.sol +30 -0
  262. package/contracts/instance/base/KeyValueStore.sol +172 -0
  263. package/contracts/instance/base/Lifecycle.sol +100 -0
  264. package/contracts/instance/module/IAccess.sol +48 -0
  265. package/contracts/instance/module/IBundle.sol +20 -0
  266. package/contracts/instance/module/IDistribution.sol +39 -0
  267. package/contracts/instance/module/IPolicy.sol +45 -0
  268. package/contracts/instance/module/IRisk.sol +11 -0
  269. package/contracts/instance/module/ISetup.sol +46 -0
  270. package/contracts/instance/module/ITreasury.sol +23 -0
  271. package/contracts/instance/service/BundleService.sol +293 -0
  272. package/contracts/instance/service/BundleServiceManager.sol +51 -0
  273. package/contracts/instance/service/DistributionService.sol +106 -0
  274. package/contracts/instance/service/DistributionServiceManager.sol +51 -0
  275. package/contracts/instance/service/IBundleService.sol +44 -0
  276. package/contracts/instance/service/IDistributionService.sol +12 -0
  277. package/contracts/instance/service/IPolicyService.sol +94 -0
  278. package/contracts/instance/service/IPoolService.sol +20 -0
  279. package/contracts/instance/service/IProductService.sol +40 -0
  280. package/contracts/instance/service/PolicyService.sol +538 -0
  281. package/contracts/instance/service/PolicyServiceManager.sol +54 -0
  282. package/contracts/instance/service/PoolService.sol +110 -0
  283. package/contracts/instance/service/PoolServiceManager.sol +51 -0
  284. package/contracts/instance/service/ProductService.sol +233 -0
  285. package/contracts/instance/service/ProductServiceManager.sol +54 -0
  286. package/contracts/registry/ChainNft.sol +138 -109
  287. package/contracts/registry/IRegistry.sol +79 -49
  288. package/contracts/registry/IRegistryService.sol +65 -0
  289. package/contracts/registry/ITransferInterceptor.sol +6 -0
  290. package/contracts/registry/Registry.sol +391 -116
  291. package/contracts/registry/RegistryAccessManager.sol +216 -0
  292. package/contracts/registry/RegistryService.sol +262 -0
  293. package/contracts/registry/RegistryServiceManager.sol +62 -0
  294. package/contracts/registry/ReleaseManager.sol +332 -0
  295. package/contracts/registry/TokenRegistry.sol +112 -0
  296. package/contracts/shared/ContractDeployerLib.sol +72 -0
  297. package/contracts/shared/ERC165.sol +25 -0
  298. package/contracts/shared/INftOwnable.sol +22 -0
  299. package/contracts/shared/IRegisterable.sol +15 -0
  300. package/contracts/shared/IService.sol +16 -0
  301. package/contracts/shared/IVersionable.sol +96 -0
  302. package/contracts/shared/NftOwnable.sol +139 -0
  303. package/contracts/shared/ProxyManager.sol +94 -0
  304. package/contracts/shared/Registerable.sol +86 -0
  305. package/contracts/shared/Service.sol +60 -0
  306. package/contracts/shared/TokenHandler.sol +27 -0
  307. package/contracts/shared/UpgradableProxyWithAdmin.sol +16 -0
  308. package/contracts/shared/Versionable.sol +147 -0
  309. package/contracts/test/TestFee.sol +25 -0
  310. package/contracts/test/TestRegisterable.sol +18 -0
  311. package/contracts/test/TestRoleId.sol +14 -0
  312. package/contracts/test/TestService.sol +25 -0
  313. package/contracts/test/TestToken.sol +26 -0
  314. package/contracts/test/TestVersion.sol +44 -0
  315. package/contracts/test/TestVersionable.sol +17 -0
  316. package/contracts/test/Usdc.sol +26 -0
  317. package/contracts/types/AddressSet.sol +58 -0
  318. package/contracts/types/Blocknumber.sol +76 -18
  319. package/contracts/types/ChainId.sol +18 -10
  320. package/contracts/types/DistributorType.sol +55 -0
  321. package/contracts/types/Fee.sol +56 -0
  322. package/contracts/types/Key32.sol +50 -0
  323. package/contracts/types/NftId.sol +48 -11
  324. package/contracts/types/NftIdSet.sol +62 -0
  325. package/contracts/types/NumberId.sol +52 -0
  326. package/contracts/types/ObjectType.sol +152 -0
  327. package/contracts/types/Referral.sol +85 -0
  328. package/contracts/types/RiskId.sol +43 -0
  329. package/contracts/types/RoleId.sol +93 -0
  330. package/contracts/types/StateId.sol +105 -0
  331. package/contracts/types/Timestamp.sol +89 -17
  332. package/contracts/types/UFixed.sol +193 -75
  333. package/contracts/types/Version.sol +107 -0
  334. package/package.json +21 -6
  335. package/artifacts/contracts/components/Component.sol/InstanceLinked.dbg.json +0 -4
  336. package/artifacts/contracts/components/Component.sol/InstanceLinked.json +0 -35
  337. package/artifacts/contracts/components/IPool.sol/IPoolComponent.dbg.json +0 -4
  338. package/artifacts/contracts/components/IPool.sol/IPoolComponent.json +0 -179
  339. package/artifacts/contracts/components/IProduct.sol/IProductComponent.dbg.json +0 -4
  340. package/artifacts/contracts/components/IProduct.sol/IProductComponent.json +0 -192
  341. package/artifacts/contracts/instance/access/Access.sol/AccessModule.dbg.json +0 -4
  342. package/artifacts/contracts/instance/access/Access.sol/AccessModule.json +0 -400
  343. package/artifacts/contracts/instance/access/IAccess.sol/IAccess.dbg.json +0 -4
  344. package/artifacts/contracts/instance/access/IAccess.sol/IAccessCheckRole.dbg.json +0 -4
  345. package/artifacts/contracts/instance/access/IAccess.sol/IAccessCheckRole.json +0 -35
  346. package/artifacts/contracts/instance/access/IAccess.sol/IAccessComponentTypeRoles.dbg.json +0 -4
  347. package/artifacts/contracts/instance/access/IAccess.sol/IAccessComponentTypeRoles.json +0 -50
  348. package/artifacts/contracts/instance/access/IAccess.sol/IAccessModule.dbg.json +0 -4
  349. package/artifacts/contracts/instance/access/IAccess.sol/IAccessModule.json +0 -336
  350. package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentModule.dbg.json +0 -4
  351. package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentModule.json +0 -327
  352. package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentOwnerService.dbg.json +0 -4
  353. package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentOwnerService.json +0 -147
  354. package/artifacts/contracts/instance/component/IComponent.sol/IComponent.dbg.json +0 -4
  355. package/artifacts/contracts/instance/component/IComponent.sol/IComponentContract.dbg.json +0 -4
  356. package/artifacts/contracts/instance/component/IComponent.sol/IComponentContract.json +0 -179
  357. package/artifacts/contracts/instance/component/IComponent.sol/IComponentModule.dbg.json +0 -4
  358. package/artifacts/contracts/instance/component/IComponent.sol/IComponentModule.json +0 -245
  359. package/artifacts/contracts/instance/component/IComponent.sol/IComponentOwnerService.dbg.json +0 -4
  360. package/artifacts/contracts/instance/component/IComponent.sol/IComponentOwnerService.json +0 -94
  361. package/artifacts/contracts/instance/component/IComponent.sol/IInstanceLinked.dbg.json +0 -4
  362. package/artifacts/contracts/instance/component/IComponent.sol/IInstanceLinked.json +0 -24
  363. package/artifacts/contracts/instance/policy/IPolicy.sol/IPolicy.dbg.json +0 -4
  364. package/artifacts/contracts/instance/policy/IPolicy.sol/IPolicyModule.dbg.json +0 -4
  365. package/artifacts/contracts/instance/policy/IPolicy.sol/IPolicyModule.json +0 -231
  366. package/artifacts/contracts/instance/policy/PolicyModule.sol/PolicyModule.dbg.json +0 -4
  367. package/artifacts/contracts/instance/policy/PolicyModule.sol/PolicyModule.json +0 -231
  368. package/artifacts/contracts/instance/pool/IPoolModule.sol/IPool.dbg.json +0 -4
  369. package/artifacts/contracts/instance/pool/IPoolModule.sol/IPoolModule.dbg.json +0 -4
  370. package/artifacts/contracts/instance/pool/IPoolModule.sol/IPoolModule.json +0 -149
  371. package/artifacts/contracts/instance/pool/PoolModule.sol/PoolModule.dbg.json +0 -4
  372. package/artifacts/contracts/instance/product/IProductService.sol/IProductModule.dbg.json +0 -4
  373. package/artifacts/contracts/instance/product/IProductService.sol/IProductModule.json +0 -75
  374. package/artifacts/contracts/instance/product/IProductService.sol/IProductService.dbg.json +0 -4
  375. package/artifacts/contracts/instance/product/IProductService.sol/IProductService.json +0 -114
  376. package/artifacts/contracts/instance/product/ProductService.sol/ProductModule.dbg.json +0 -4
  377. package/artifacts/contracts/instance/product/ProductService.sol/ProductModule.json +0 -75
  378. package/artifacts/contracts/instance/product/ProductService.sol/ProductService.dbg.json +0 -4
  379. package/artifacts/contracts/instance/product/ProductService.sol/ProductService.json +0 -167
  380. package/artifacts/contracts/registry/IChainNft.sol/IChainNft.dbg.json +0 -4
  381. package/artifacts/contracts/registry/IRegistry.sol/IOwnable.dbg.json +0 -4
  382. package/artifacts/contracts/registry/IRegistry.sol/IOwnable.json +0 -24
  383. package/artifacts/contracts/registry/IRegistry.sol/IRegisterable.dbg.json +0 -4
  384. package/artifacts/contracts/registry/IRegistry.sol/IRegisterable.json +0 -166
  385. package/artifacts/contracts/registry/IRegistry.sol/IRegistryLinked.dbg.json +0 -4
  386. package/artifacts/contracts/registry/IRegistry.sol/IRegistryLinked.json +0 -49
  387. package/artifacts/contracts/registry/Registry.sol/Registerable.dbg.json +0 -4
  388. package/artifacts/contracts/registry/Registry.sol/Registerable.json +0 -166
  389. package/artifacts/contracts/registry/Registry.sol/RegistryLinked.dbg.json +0 -4
  390. package/artifacts/contracts/registry/Registry.sol/RegistryLinked.json +0 -60
  391. package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.dbg.json +0 -4
  392. package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.json +0 -440
  393. package/contracts/components/IPool.sol +0 -9
  394. package/contracts/components/IProduct.sol +0 -12
  395. package/contracts/instance/access/Access.sol +0 -218
  396. package/contracts/instance/access/IAccess.sol +0 -83
  397. package/contracts/instance/component/ComponentModule.sol +0 -248
  398. package/contracts/instance/component/IComponent.sol +0 -95
  399. package/contracts/instance/policy/IPolicy.sol +0 -66
  400. package/contracts/instance/policy/PolicyModule.sol +0 -107
  401. package/contracts/instance/pool/IPoolModule.sol +0 -41
  402. package/contracts/instance/pool/PoolModule.sol +0 -86
  403. package/contracts/instance/product/IProductService.sol +0 -46
  404. package/contracts/instance/product/ProductService.sol +0 -108
  405. package/contracts/registry/IChainNft.sol +0 -18
@@ -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,193 +13,313 @@ 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
 
21
- function addUFixed(UFixed a, UFixed b) pure returns(UFixed) {
22
+ function zeroUFixed() pure returns (UFixed zero) {
23
+ return UFixed.wrap(0);
24
+ }
25
+
26
+ function addUFixed(UFixed a, UFixed b) pure returns (UFixed) {
22
27
  return UFixed.wrap(UFixed.unwrap(a) + UFixed.unwrap(b));
23
28
  }
24
29
 
25
- function subUFixed(UFixed a, UFixed b) pure returns(UFixed) {
30
+ function subUFixed(UFixed a, UFixed b) pure returns (UFixed) {
26
31
  require(a >= b, "ERROR:UFM-010:NEGATIVE_RESULT");
27
32
  return UFixed.wrap(UFixed.unwrap(a) - UFixed.unwrap(b));
28
33
  }
29
34
 
30
- function mulUFixed(UFixed a, UFixed b) pure returns(UFixed) {
31
- return UFixed.wrap(Math.mulDiv(UFixed.unwrap(a), UFixed.unwrap(b), 10 ** 18));
35
+ function mulUFixed(UFixed a, UFixed b) pure returns (UFixed) {
36
+ return
37
+ UFixed.wrap(MathLib.mulDiv(UFixed.unwrap(a), UFixed.unwrap(b), 10 ** 18));
32
38
  }
33
39
 
34
- function divUFixed(UFixed a, UFixed b) pure returns(UFixed) {
40
+ function divUFixed(UFixed a, UFixed b) pure returns (UFixed) {
35
41
  require(UFixed.unwrap(b) > 0, "ERROR:UFM-020:DIVISOR_ZERO");
36
42
 
37
- return UFixed.wrap(
38
- Math.mulDiv(
39
- UFixed.unwrap(a),
40
- 10 ** 18,
41
- UFixed.unwrap(b)));
43
+ return
44
+ UFixed.wrap(MathLib.mulDiv(UFixed.unwrap(a), 10 ** 18, UFixed.unwrap(b)));
42
45
  }
43
46
 
44
- function gtUFixed(UFixed a, UFixed b) pure returns(bool isGreaterThan) {
47
+ function gtUFixed(UFixed a, UFixed b) pure returns (bool isGreaterThan) {
45
48
  return UFixed.unwrap(a) > UFixed.unwrap(b);
46
49
  }
47
50
 
48
- function gteUFixed(UFixed a, UFixed b) pure returns(bool isGreaterThan) {
51
+ function gteUFixed(UFixed a, UFixed b) pure returns (bool isGreaterThan) {
49
52
  return UFixed.unwrap(a) >= UFixed.unwrap(b);
50
53
  }
51
54
 
52
- function ltUFixed(UFixed a, UFixed b) pure returns(bool isGreaterThan) {
55
+ function ltUFixed(UFixed a, UFixed b) pure returns (bool isGreaterThan) {
53
56
  return UFixed.unwrap(a) < UFixed.unwrap(b);
54
57
  }
55
58
 
56
- function lteUFixed(UFixed a, UFixed b) pure returns(bool isGreaterThan) {
59
+ function lteUFixed(UFixed a, UFixed b) pure returns (bool isGreaterThan) {
57
60
  return UFixed.unwrap(a) <= UFixed.unwrap(b);
58
61
  }
59
62
 
60
- function eqUFixed(UFixed a, UFixed b) pure returns(bool isEqual) {
63
+ function eqUFixed(UFixed a, UFixed b) pure returns (bool isEqual) {
61
64
  return UFixed.unwrap(a) == UFixed.unwrap(b);
62
65
  }
63
66
 
64
- function gtzUFixed(UFixed a) pure returns(bool isZero) {
67
+ function neUFixed(UFixed a, UFixed b) pure returns (bool isEqual) {
68
+ return UFixed.unwrap(a) != UFixed.unwrap(b);
69
+ }
70
+
71
+ function gtzUFixed(UFixed a) pure returns (bool isZero) {
65
72
  return UFixed.unwrap(a) > 0;
66
73
  }
67
74
 
68
- function eqzUFixed(UFixed a) pure returns(bool isZero) {
75
+ function eqzUFixed(UFixed a) pure returns (bool isZero) {
69
76
  return UFixed.unwrap(a) == 0;
70
77
  }
71
78
 
72
- function deltaUFixed(UFixed a, UFixed b) pure returns(UFixed) {
73
- if(a > b) {
79
+ function deltaUFixed(UFixed a, UFixed b) pure returns (UFixed) {
80
+ if (a > b) {
74
81
  return a - b;
75
82
  }
76
83
 
77
84
  return b - a;
78
85
  }
79
86
 
80
- library UFixedMathLib {
87
+ /// @dev copied from https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v4.9.3/contracts/utils/math/Math.sol
88
+ library MathLib {
81
89
 
82
90
  enum Rounding {
83
- /// @dev Round down - floor(value)
84
- Down,
85
- /// @dev Round up - ceil(value)
86
- Up,
87
- /// @dev Round half up - round(value)
88
- HalfUp
91
+ Down, // Toward negative infinity
92
+ Up, // Toward infinity
93
+ Zero // Toward zero
89
94
  }
90
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 {
91
196
  int8 public constant EXP = 18;
92
197
  uint256 public constant MULTIPLIER = 10 ** uint256(int256(EXP));
93
198
  uint256 public constant MULTIPLIER_HALF = MULTIPLIER / 2;
94
-
95
- /// @dev Default rounding mode used by ftoi is HalfUp
96
- Rounding public constant ROUNDING_DEFAULT = Rounding.HalfUp;
97
199
 
98
- /// @dev returns the decimals precision of the UFixed type
99
- function decimals() public pure returns(uint256) {
100
- return uint8(EXP);
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);
101
213
  }
102
214
 
103
215
  /// @dev Converts the uint256 to a UFixed.
104
- function itof(uint256 a)
105
- public
106
- pure
107
- returns(UFixed)
108
- {
216
+ function toUFixed(uint256 a) public pure returns (UFixed) {
109
217
  return UFixed.wrap(a * MULTIPLIER);
110
218
  }
111
219
 
112
220
  /// @dev Converts the uint256 to a UFixed with given exponent.
113
- function itof(uint256 a, int8 exp)
114
- public
115
- pure
116
- returns(UFixed)
117
- {
221
+ function toUFixed(uint256 a, int8 exp) public pure returns (UFixed) {
118
222
  require(EXP + exp >= 0, "ERROR:FM-010:EXPONENT_TOO_SMALL");
119
- require(EXP + exp <= 2 * EXP, "ERROR:FM-011:EXPONENT_TOO_LARGE");
223
+ require(EXP + exp <= 64, "ERROR:FM-011:EXPONENT_TOO_LARGE");
120
224
 
121
225
  return UFixed.wrap(a * 10 ** uint8(EXP + exp));
122
226
  }
123
227
 
228
+ /// @dev returns the decimals precision of the UFixed type
229
+ function decimals() public pure returns (uint256) {
230
+ return uint8(EXP);
231
+ }
232
+
124
233
  /// @dev Converts a UFixed to a uint256.
125
- function ftoi(UFixed a)
126
- public
127
- pure
128
- returns(uint256)
129
- {
130
- return ftoi(a, ROUNDING_DEFAULT);
234
+ function toInt(UFixed a) public pure returns (uint256) {
235
+ return toIntWithRounding(a, ROUNDING_HALF_UP());
131
236
  }
132
237
 
133
238
  /// @dev Converts a UFixed to a uint256 with given rounding mode.
134
- function ftoi(UFixed a, Rounding rounding)
135
- public
136
- pure
137
- returns(uint256)
138
- {
139
- if(rounding == Rounding.HalfUp) {
140
- return Math.mulDiv(UFixed.unwrap(a) + MULTIPLIER_HALF, 1, MULTIPLIER, Math.Rounding.Down);
141
- } else if(rounding == Rounding.Down) {
142
- return Math.mulDiv(UFixed.unwrap(a), 1, MULTIPLIER, Math.Rounding.Down);
239
+ function toIntWithRounding(UFixed a, uint8 rounding) public pure returns (uint256) {
240
+ if (rounding == ROUNDING_HALF_UP()) {
241
+ return
242
+ MathLib.mulDiv(
243
+ UFixed.unwrap(a) + MULTIPLIER_HALF,
244
+ 1,
245
+ MULTIPLIER,
246
+ MathLib.Rounding.Down
247
+ );
248
+ } else if (rounding == ROUNDING_DOWN()) {
249
+ return
250
+ MathLib.mulDiv(
251
+ UFixed.unwrap(a),
252
+ 1,
253
+ MULTIPLIER,
254
+ MathLib.Rounding.Down
255
+ );
143
256
  } else {
144
- return Math.mulDiv(UFixed.unwrap(a), 1, MULTIPLIER, Math.Rounding.Up);
257
+ return
258
+ MathLib.mulDiv(UFixed.unwrap(a), 1, MULTIPLIER, MathLib.Rounding.Up);
145
259
  }
146
260
  }
147
261
 
148
262
  /// @dev adds two UFixed numbers
149
- function add(UFixed a, UFixed b) public pure returns(UFixed) {
263
+ function add(UFixed a, UFixed b) public pure returns (UFixed) {
150
264
  return addUFixed(a, b);
151
265
  }
152
266
 
153
267
  /// @dev subtracts two UFixed numbers
154
- function sub(UFixed a, UFixed b) public pure returns(UFixed) {
268
+ function sub(UFixed a, UFixed b) public pure returns (UFixed) {
155
269
  return subUFixed(a, b);
156
270
  }
157
271
 
158
272
  /// @dev multiplies two UFixed numbers
159
- function mul(UFixed a, UFixed b) public pure returns(UFixed) {
273
+ function mul(UFixed a, UFixed b) public pure returns (UFixed) {
160
274
  return mulUFixed(a, b);
161
275
  }
162
276
 
163
277
  /// @dev divides two UFixed numbers
164
- function div(UFixed a, UFixed b) public pure returns(UFixed) {
278
+ function div(UFixed a, UFixed b) public pure returns (UFixed) {
165
279
  return divUFixed(a, b);
166
280
  }
167
281
 
168
282
  /// @dev return true if UFixed a is greater than UFixed b
169
- function gt(UFixed a, UFixed b) public pure returns(bool isGreaterThan) {
283
+ function gt(UFixed a, UFixed b) public pure returns (bool isGreaterThan) {
170
284
  return gtUFixed(a, b);
171
285
  }
172
286
 
173
287
  /// @dev return true if UFixed a is greater than or equal to UFixed b
174
- function gte(UFixed a, UFixed b) public pure returns(bool isGreaterThan) {
288
+ function gte(UFixed a, UFixed b) public pure returns (bool isGreaterThan) {
175
289
  return gteUFixed(a, b);
176
290
  }
177
291
 
178
292
  /// @dev return true if UFixed a is less than UFixed b
179
- function lt(UFixed a, UFixed b) public pure returns(bool isGreaterThan) {
293
+ function lt(UFixed a, UFixed b) public pure returns (bool isGreaterThan) {
180
294
  return ltUFixed(a, b);
181
295
  }
182
296
 
183
297
  /// @dev return true if UFixed a is less than or equal to UFixed b
184
- function lte(UFixed a, UFixed b) public pure returns(bool isGreaterThan) {
298
+ function lte(UFixed a, UFixed b) public pure returns (bool isGreaterThan) {
185
299
  return lteUFixed(a, b);
186
300
  }
187
301
 
188
302
  /// @dev return true if UFixed a is equal to UFixed b
189
- function eq(UFixed a, UFixed b) public pure returns(bool isEqual) {
303
+ function eq(UFixed a, UFixed b) public pure returns (bool isEqual) {
190
304
  return eqUFixed(a, b);
191
305
  }
192
306
 
193
307
  /// @dev return true if UFixed a is not zero
194
- function gtz(UFixed a) public pure returns(bool isZero) {
308
+ function gtz(UFixed a) public pure returns (bool isZero) {
195
309
  return gtzUFixed(a);
196
310
  }
197
311
 
198
312
  /// @dev return true if UFixed a is zero
199
- function eqz(UFixed a) public pure returns(bool isZero) {
313
+ function eqz(UFixed a) public pure returns (bool isZero) {
200
314
  return eqzUFixed(a);
201
315
  }
202
316
 
317
+ function zero() public pure returns (UFixed) {
318
+ return UFixed.wrap(0);
319
+ }
320
+
203
321
  /// @dev return the absolute delta between two UFixed numbers
204
- function delta(UFixed a, UFixed b) public pure returns(UFixed) {
322
+ function delta(UFixed a, UFixed b) public pure returns (UFixed) {
205
323
  return deltaUFixed(a, b);
206
324
  }
207
325
  }
@@ -0,0 +1,107 @@
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
+ versionPartNe as !=,
10
+ VersionPartLib.toInt
11
+ }
12
+ for VersionPart global;
13
+
14
+ function versionPartGt(VersionPart a, VersionPart b) pure returns(bool isGreaterThan) { return VersionPart.unwrap(a) > VersionPart.unwrap(b); }
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); }
17
+
18
+ library VersionPartLib {
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)); }
21
+ }
22
+
23
+ type Version is uint24; // contains major,minor,patch version parts
24
+
25
+ using {
26
+ versionGt as >,
27
+ versionEq as ==,
28
+ VersionLib.toInt,
29
+ VersionLib.toUint64,
30
+ VersionLib.toMajorPart,
31
+ VersionLib.toVersionParts
32
+ }
33
+ for Version global;
34
+
35
+ function versionGt(Version a, Version b) pure returns(bool isGreaterThan) { return Version.unwrap(a) > Version.unwrap(b); }
36
+ function versionEq(Version a, Version b) pure returns(bool isSame) { return Version.unwrap(a) == Version.unwrap(b); }
37
+
38
+ library VersionLib {
39
+ function toInt(Version version) external pure returns(uint) { return Version.unwrap(version); }
40
+
41
+ function toUint64(Version version) external pure returns(uint64) { return Version.unwrap(version); }
42
+
43
+ function toMajorPart(Version version)
44
+ external
45
+ pure
46
+ returns(VersionPart major)
47
+ {
48
+ uint24 versionInt = Version.unwrap(version);
49
+ uint8 majorInt = uint8(versionInt >> 16);
50
+ return VersionPart.wrap(majorInt);
51
+ }
52
+
53
+ function toVersionParts(Version version)
54
+ external
55
+ pure
56
+ returns(
57
+ VersionPart major,
58
+ VersionPart minor,
59
+ VersionPart patch
60
+ )
61
+ {
62
+ uint24 versionInt = Version.unwrap(version);
63
+ uint8 majorInt = uint8(versionInt >> 16);
64
+
65
+ versionInt -= majorInt << 16;
66
+ uint8 minorInt = uint8(versionInt >> 8);
67
+ uint8 patchInt = uint8(versionInt - (minorInt << 8));
68
+
69
+ return (
70
+ VersionPart.wrap(majorInt),
71
+ VersionPart.wrap(minorInt),
72
+ VersionPart.wrap(patchInt)
73
+ );
74
+ }
75
+
76
+ function toVersionPart(uint256 versionPart) external pure returns(VersionPart) {
77
+ return VersionPart.wrap(uint8(versionPart));
78
+ }
79
+
80
+ function toVersion(
81
+ uint256 major,
82
+ uint256 minor,
83
+ uint256 patch
84
+ )
85
+ external
86
+ pure
87
+ returns(Version)
88
+ {
89
+ require(
90
+ major < 256 && minor < 256 && patch < 256,
91
+ "ERROR:VRS-010:VERSION_PART_TOO_BIG");
92
+
93
+ return Version.wrap(
94
+ uint24(
95
+ (major << 16) + (minor << 8) + patch));
96
+ }
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
+
104
+ function zeroVersion() external pure returns(Version) {
105
+ return Version.wrap(0);
106
+ }
107
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@etherisc/gif-next",
3
- "version": "0.0.2-d911522",
3
+ "version": "0.0.2-da06f3b-803",
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": {
@@ -8,7 +8,11 @@
8
8
  "test": "hh test",
9
9
  "ptest": "hh test --parallel",
10
10
  "test-with-gas": "REPORT_GAS=true hh test",
11
- "coverage": "hh coverage"
11
+ "coverage": "hh coverage",
12
+ "styleFix": "prettier --write --plugin=prettier-plugin-solidity 'contracts/**/*.sol' 'test_forge/**/*.t.sol'",
13
+ "styleCheck": "prettier --check --plugin=prettier-plugin-solidity 'contracts/**/*.sol' 'test_forge/**/*.t.sol'",
14
+ "lint": "solhint 'contracts/**/*.sol' 'test_forge/**/*.t.sol'",
15
+ "eslint": "eslint ."
12
16
  },
13
17
  "repository": {
14
18
  "type": "git",
@@ -25,13 +29,24 @@
25
29
  ],
26
30
  "homepage": "https://github.com/etherisc/gif-next#readme",
27
31
  "devDependencies": {
28
- "@nomicfoundation/hardhat-foundry": "^1.0.3",
32
+ "@nomicfoundation/hardhat-foundry": "^1.1.1",
29
33
  "@nomicfoundation/hardhat-toolbox": "^3.0.0",
34
+ "@nomicfoundation/hardhat-verify": "^1.1.1",
35
+ "@typescript-eslint/eslint-plugin": "^7.1.0",
36
+ "@typescript-eslint/parser": "^7.1.0",
30
37
  "dotenv": "^16.3.1",
31
- "hardhat": "^2.17.1"
38
+ "eslint": "^8.50.0",
39
+ "hardhat": "^2.17.2",
40
+ "prettier": "^3.0.3",
41
+ "prettier-plugin-solidity": "^1.1.3",
42
+ "typescript": "^5"
32
43
  },
33
44
  "dependencies": {
34
- "@openzeppelin/contracts": "^4.9.3",
35
- "@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"
36
51
  }
37
52
  }
@@ -1,4 +0,0 @@
1
- {
2
- "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/5d58518916abd285d6742c7724f5c203.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": "0x608060405234801561001057600080fd5b50604051610249380380610249833981810160405281019061003291906100db565b806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050610108565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006100a88261007d565b9050919050565b6100b88161009d565b81146100c357600080fd5b50565b6000815190506100d5816100af565b92915050565b6000602082840312156100f1576100f0610078565b5b60006100ff848285016100c6565b91505092915050565b610132806101176000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c8063de7b5d1414602d575b600080fd5b60336047565b604051603e919060e3565b60405180910390f35b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905090565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000819050919050565b600060af60ab60a7846070565b6090565b6070565b9050919050565b600060bf82609a565b9050919050565b600060cf8260b6565b9050919050565b60dd8160c6565b82525050565b600060208201905060f6600083018460d6565b9291505056fea2646970667358221220e78278246c3e44db4b709006b118bd00a9bc3a08e56a0bb4d74c0cc55c10b23c64736f6c63430008140033",
32
- "deployedBytecode": "0x6080604052348015600f57600080fd5b506004361060285760003560e01c8063de7b5d1414602d575b600080fd5b60336047565b604051603e919060e3565b60405180910390f35b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905090565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000819050919050565b600060af60ab60a7846070565b6090565b6070565b9050919050565b600060bf82609a565b9050919050565b600060cf8260b6565b9050919050565b60dd8160c6565b82525050565b600060208201905060f6600083018460d6565b9291505056fea2646970667358221220e78278246c3e44db4b709006b118bd00a9bc3a08e56a0bb4d74c0cc55c10b23c64736f6c63430008140033",
33
- "linkReferences": {},
34
- "deployedLinkReferences": {}
35
- }
@@ -1,4 +0,0 @@
1
- {
2
- "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/5d58518916abd285d6742c7724f5c203.json"
4
- }