@etherisc/gif-next 0.0.2-6f2f76e-746 → 0.0.2-719a8f1-103

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (307) hide show
  1. package/README.md +73 -11
  2. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +1 -1
  3. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +80 -41
  4. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +4 -0
  5. package/artifacts/contracts/components/Distribution.sol/Distribution.json +445 -0
  6. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +1 -1
  7. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +43 -40
  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 +1 -1
  11. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +108 -156
  12. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  13. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +67 -139
  14. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  15. package/artifacts/contracts/components/Pool.sol/Pool.json +299 -84
  16. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  17. package/artifacts/contracts/components/Product.sol/Product.json +250 -53
  18. package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +1 -1
  19. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +1 -1
  20. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +1 -1
  21. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +1 -1
  22. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +1 -1
  23. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +1 -1
  24. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +1 -1
  25. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +1 -1
  26. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +1 -1
  27. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +1 -1
  28. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +1 -1
  29. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +2 -2
  30. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +1 -1
  31. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +1 -1
  32. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +1 -1
  33. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +2 -2
  34. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +1 -1
  35. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +2 -2
  36. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
  37. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
  38. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  39. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +793 -638
  40. package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.dbg.json +1 -1
  41. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  42. package/artifacts/contracts/instance/Instance.sol/Instance.json +1022 -716
  43. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +4 -0
  44. package/artifacts/contracts/instance/{InstanceBase.sol/InstanceBase.json → base/ComponentServiceBase.sol/ComponentServiceBase.json} +145 -65
  45. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +4 -0
  46. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +113 -0
  47. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +4 -0
  48. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.json +560 -0
  49. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +4 -0
  50. package/artifacts/contracts/instance/{module/lifecycle/ILifecycle.sol/ILifecycleModule.json → base/ILifecycle.sol/ILifecycle.json} +10 -77
  51. package/artifacts/contracts/instance/base/IService.sol/IService.dbg.json +4 -0
  52. package/artifacts/contracts/instance/{service → base}/IService.sol/IService.json +100 -56
  53. package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.dbg.json +4 -0
  54. package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.json +456 -0
  55. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +4 -0
  56. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +710 -0
  57. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +4 -0
  58. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +169 -0
  59. package/artifacts/contracts/instance/base/ModuleBase.sol/ModuleBase.dbg.json +4 -0
  60. package/artifacts/contracts/instance/{module/compensation/ICompensation.sol/ICompensation.json → base/ModuleBase.sol/ModuleBase.json} +2 -2
  61. package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.dbg.json +4 -0
  62. package/artifacts/contracts/instance/{service → base}/ServiceBase.sol/ServiceBase.json +136 -56
  63. package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.dbg.json +1 -1
  64. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccess.dbg.json +1 -1
  65. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.dbg.json +1 -1
  66. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.dbg.json +1 -1
  67. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.json +71 -50
  68. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundle.dbg.json +1 -1
  69. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.dbg.json +1 -1
  70. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.json +71 -50
  71. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.dbg.json +1 -1
  72. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.json +22 -93
  73. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.dbg.json +1 -1
  74. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.dbg.json +1 -1
  75. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.json +22 -93
  76. package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.dbg.json +4 -0
  77. package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.json +10 -0
  78. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistribution.dbg.json +4 -0
  79. package/artifacts/contracts/instance/module/{compensation/ICompensation.sol/ICompensationModule.json → distribution/IDistribution.sol/IDistribution.json} +2 -2
  80. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistributionModule.dbg.json +4 -0
  81. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistributionModule.json +10 -0
  82. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicy.dbg.json +1 -1
  83. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.dbg.json +1 -1
  84. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.json +61 -38
  85. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.dbg.json +1 -1
  86. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.json +61 -38
  87. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.dbg.json +1 -1
  88. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.dbg.json +1 -1
  89. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.json +29 -14
  90. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.dbg.json +1 -1
  91. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.json +28 -13
  92. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRisk.dbg.json +1 -1
  93. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.dbg.json +1 -1
  94. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.json +104 -1
  95. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.dbg.json +1 -1
  96. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.json +126 -5
  97. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasury.dbg.json +1 -1
  98. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.dbg.json +1 -1
  99. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.json +326 -221
  100. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  101. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.json +2 -2
  102. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +1 -1
  103. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.json +326 -221
  104. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +1 -1
  105. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +271 -72
  106. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +4 -0
  107. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +526 -0
  108. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +1 -1
  109. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.json +99 -74
  110. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +4 -0
  111. package/artifacts/contracts/instance/service/{ComponentServiceBase.sol/ComponentServiceBase.json → IDistributionService.sol/IDistributionService.json} +125 -56
  112. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
  113. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +158 -50
  114. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
  115. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +246 -49
  116. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
  117. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +230 -52
  118. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
  119. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +361 -70
  120. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  121. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +141 -12
  122. package/artifacts/contracts/registry/IChainNft.sol/IChainNft.dbg.json +1 -1
  123. package/artifacts/contracts/registry/IChainNft.sol/IChainNft.json +5 -0
  124. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  125. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +293 -40
  126. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +4 -0
  127. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +668 -0
  128. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +4 -0
  129. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +34 -0
  130. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  131. package/artifacts/contracts/registry/Registry.sol/Registry.json +483 -120
  132. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +4 -0
  133. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +885 -0
  134. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +4 -0
  135. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +460 -0
  136. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +4 -0
  137. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.json +107 -0
  138. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  139. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +2 -2
  140. package/artifacts/contracts/shared/IOwnable.sol/IOwnable.dbg.json +1 -1
  141. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  142. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +43 -40
  143. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  144. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +55 -14
  145. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +4 -0
  146. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +132 -0
  147. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +4 -0
  148. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +344 -0
  149. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  150. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +76 -37
  151. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +4 -0
  152. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +129 -0
  153. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  154. package/artifacts/contracts/shared/Versionable.sol/Versionable.json +78 -14
  155. package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.dbg.json +4 -0
  156. package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.json +445 -0
  157. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
  158. package/artifacts/contracts/test/TestFee.sol/TestFee.json +2 -2
  159. package/artifacts/contracts/test/TestPool.sol/TestPool.dbg.json +1 -1
  160. package/artifacts/contracts/test/TestPool.sol/TestPool.json +299 -84
  161. package/artifacts/contracts/test/TestProduct.sol/TestProduct.dbg.json +1 -1
  162. package/artifacts/contracts/test/TestProduct.sol/TestProduct.json +297 -58
  163. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
  164. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +93 -39
  165. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
  166. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +38 -4
  167. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
  168. package/artifacts/contracts/test/TestService.sol/TestService.json +161 -68
  169. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
  170. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
  171. package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +2 -2
  172. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
  173. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +89 -25
  174. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +4 -0
  175. package/artifacts/contracts/test/Usdc.sol/USDC.json +338 -0
  176. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  177. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  178. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  179. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
  180. package/artifacts/contracts/types/Fee.sol/FeeLib.json +50 -11
  181. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +4 -0
  182. package/artifacts/contracts/types/Key32.sol/Key32Lib.json +111 -0
  183. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  184. package/artifacts/contracts/types/NftId.sol/NftIdLib.json +65 -4
  185. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  186. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +2 -2
  187. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  188. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +2 -2
  189. package/artifacts/contracts/types/ReferralId.sol/ReferralIdLib.dbg.json +4 -0
  190. package/artifacts/contracts/types/ReferralId.sol/ReferralIdLib.json +99 -0
  191. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +4 -0
  192. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +86 -0
  193. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +4 -0
  194. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +30 -0
  195. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
  196. package/artifacts/contracts/types/StateId.sol/StateIdLib.json +2 -2
  197. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
  198. package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.dbg.json +1 -1
  199. package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.json +34 -8
  200. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
  201. package/artifacts/contracts/types/Version.sol/VersionLib.json +40 -2
  202. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
  203. package/artifacts/contracts/types/Version.sol/VersionPartLib.json +2 -2
  204. package/contracts/components/BaseComponent.sol +12 -22
  205. package/contracts/components/Distribution.sol +155 -0
  206. package/contracts/components/IBaseComponent.sol +2 -2
  207. package/contracts/components/IDistributionComponent.sol +46 -0
  208. package/contracts/components/IPoolComponent.sol +15 -8
  209. package/contracts/components/IProductComponent.sol +26 -8
  210. package/contracts/components/Pool.sol +99 -27
  211. package/contracts/components/Product.sol +204 -22
  212. package/contracts/instance/IInstance.sol +17 -16
  213. package/contracts/instance/Instance.sol +32 -13
  214. package/contracts/instance/{service → base}/ComponentServiceBase.sol +13 -5
  215. package/contracts/instance/base/IInstanceBase.sol +23 -0
  216. package/contracts/instance/base/IKeyValueStore.sol +50 -0
  217. package/contracts/instance/base/ILifecycle.sol +30 -0
  218. package/contracts/instance/base/InstanceBase.sol +89 -0
  219. package/contracts/instance/base/KeyValueStore.sol +161 -0
  220. package/contracts/instance/{module/lifecycle/LifecycleModule.sol → base/Lifecycle.sol} +50 -39
  221. package/contracts/instance/base/ModuleBase.sol +57 -0
  222. package/contracts/instance/base/ServiceBase.sol +43 -0
  223. package/contracts/instance/module/access/Access.sol +6 -6
  224. package/contracts/instance/module/bundle/BundleModule.sol +24 -118
  225. package/contracts/instance/module/bundle/IBundle.sol +9 -9
  226. package/contracts/instance/module/component/ComponentModule.sol +32 -64
  227. package/contracts/instance/module/component/IComponent.sol +7 -32
  228. package/contracts/instance/module/distribution/DistributionModule.sol +17 -0
  229. package/contracts/instance/module/distribution/IDistribution.sol +10 -0
  230. package/contracts/instance/module/policy/IPolicy.sol +12 -9
  231. package/contracts/instance/module/policy/PolicyModule.sol +33 -26
  232. package/contracts/instance/module/pool/IPoolModule.sol +4 -4
  233. package/contracts/instance/module/pool/PoolModule.sol +23 -15
  234. package/contracts/instance/module/risk/IRisk.sol +18 -2
  235. package/contracts/instance/module/risk/RiskModule.sol +56 -2
  236. package/contracts/instance/module/treasury/ITreasury.sol +32 -51
  237. package/contracts/instance/module/treasury/TokenHandler.sol +2 -2
  238. package/contracts/instance/module/treasury/TreasuryModule.sol +68 -89
  239. package/contracts/instance/service/ComponentOwnerService.sol +197 -96
  240. package/contracts/instance/service/DistributionService.sol +54 -0
  241. package/contracts/instance/service/IComponentOwnerService.sol +1 -3
  242. package/contracts/instance/service/IDistributionService.sol +12 -0
  243. package/contracts/instance/service/IPoolService.sol +8 -1
  244. package/contracts/instance/service/IProductService.sol +56 -7
  245. package/contracts/instance/service/PoolService.sol +50 -24
  246. package/contracts/instance/service/ProductService.sol +249 -94
  247. package/contracts/registry/ChainNft.sol +43 -15
  248. package/contracts/registry/IChainNft.sol +3 -2
  249. package/contracts/registry/IRegistry.sol +44 -28
  250. package/contracts/registry/IRegistryService.sol +29 -0
  251. package/contracts/registry/ITransferInterceptor.sol +6 -0
  252. package/contracts/registry/Registry.sol +384 -275
  253. package/contracts/registry/RegistryService.sol +375 -0
  254. package/contracts/registry/RegistryServiceManager.sol +52 -0
  255. package/contracts/shared/ContractDeployerLib.sol +72 -0
  256. package/contracts/shared/ERC165.sol +1 -1
  257. package/contracts/shared/IRegisterable.sol +7 -9
  258. package/contracts/shared/IVersionable.sol +55 -11
  259. package/contracts/shared/NftOwnable.sol +87 -0
  260. package/contracts/shared/ProxyManager.sol +103 -0
  261. package/contracts/shared/Registerable.sol +74 -43
  262. package/contracts/shared/UpgradableProxyWithAdmin.sol +16 -0
  263. package/contracts/shared/Versionable.sol +112 -54
  264. package/contracts/test/TestDistribution.sol +22 -0
  265. package/contracts/test/TestPool.sol +7 -2
  266. package/contracts/test/TestProduct.sol +37 -7
  267. package/contracts/test/TestRegisterable.sol +5 -6
  268. package/contracts/test/TestRoleId.sol +2 -2
  269. package/contracts/test/TestService.sol +6 -12
  270. package/contracts/test/Usdc.sol +26 -0
  271. package/contracts/types/Fee.sol +8 -3
  272. package/contracts/types/Key32.sol +45 -0
  273. package/contracts/types/NftId.sol +16 -1
  274. package/contracts/types/ObjectType.sol +24 -8
  275. package/contracts/types/ReferralId.sol +48 -0
  276. package/contracts/types/RiskId.sol +43 -0
  277. package/contracts/types/RoleId.sol +12 -10
  278. package/contracts/types/StateId.sol +7 -1
  279. package/contracts/types/UFixed.sol +19 -16
  280. package/contracts/types/Version.sol +9 -0
  281. package/package.json +1 -1
  282. package/artifacts/contracts/instance/IServiceLinked.sol/IServiceLinked.dbg.json +0 -4
  283. package/artifacts/contracts/instance/IServiceLinked.sol/IServiceLinked.json +0 -50
  284. package/artifacts/contracts/instance/InstanceBase.sol/InstanceBase.dbg.json +0 -4
  285. package/artifacts/contracts/instance/module/compensation/CompensationModule.sol/CompensationModule.dbg.json +0 -4
  286. package/artifacts/contracts/instance/module/compensation/CompensationModule.sol/CompensationModule.json +0 -10
  287. package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensation.dbg.json +0 -4
  288. package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensationModule.dbg.json +0 -4
  289. package/artifacts/contracts/instance/module/lifecycle/ILifecycle.sol/ILifecycle.dbg.json +0 -4
  290. package/artifacts/contracts/instance/module/lifecycle/ILifecycle.sol/ILifecycle.json +0 -134
  291. package/artifacts/contracts/instance/module/lifecycle/ILifecycle.sol/ILifecycleModule.dbg.json +0 -4
  292. package/artifacts/contracts/instance/module/lifecycle/LifecycleModule.sol/LifecycleModule.dbg.json +0 -4
  293. package/artifacts/contracts/instance/module/lifecycle/LifecycleModule.sol/LifecycleModule.json +0 -221
  294. package/artifacts/contracts/instance/service/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +0 -4
  295. package/artifacts/contracts/instance/service/IService.sol/IService.dbg.json +0 -4
  296. package/artifacts/contracts/instance/service/ServiceBase.sol/ServiceBase.dbg.json +0 -4
  297. package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.dbg.json +0 -4
  298. package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.json +0 -24
  299. package/contracts/experiment/statemachine/README.md +0 -112
  300. package/contracts/instance/IServiceLinked.sol +0 -12
  301. package/contracts/instance/InstanceBase.sol +0 -71
  302. package/contracts/instance/module/compensation/CompensationModule.sol +0 -8
  303. package/contracts/instance/module/compensation/ICompensation.sol +0 -10
  304. package/contracts/instance/module/lifecycle/ILifecycle.sol +0 -47
  305. package/contracts/instance/service/ServiceBase.sol +0 -39
  306. package/contracts/registry/IRegistryLinked.sol +0 -8
  307. /package/contracts/instance/{service → base}/IService.sol +0 -0
@@ -8,12 +8,11 @@ import {Registerable} from "../../contracts/shared/Registerable.sol";
8
8
 
9
9
  contract TestRegisterable is Registerable {
10
10
 
11
- constructor(address registry, NftId registryNftId)
12
- Registerable(registry, registryNftId)
11
+ constructor(address registry, NftId registryNftId, ObjectType objectType, bool isInterceptor, address initialOwner)
12
+ //Registerable(registry, registryNftId)
13
13
  // solhint-disable-next-line no-empty-blocks
14
- {}
15
-
16
- function getType() external pure override returns (ObjectType) {
17
- return TOKEN();
14
+ {
15
+ bytes memory data = "";
16
+ _initializeRegisterable(registry, registryNftId, objectType, isInterceptor, initialOwner, data);
18
17
  }
19
18
  }
@@ -1,10 +1,10 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.19;
3
3
 
4
- import {RoleId, toRoleId, PRODUCT_OWNER_ROLE_NAME, PRODUCT_OWNER_ROLE, POOL_OWNER_ROLE_NAME, POOL_OWNER_ROLE} from "../../contracts/types/RoleId.sol";
4
+ import {RoleId, RoleIdLib, PRODUCT_OWNER_ROLE_NAME, PRODUCT_OWNER_ROLE, POOL_OWNER_ROLE_NAME, POOL_OWNER_ROLE} from "../../contracts/types/RoleId.sol";
5
5
 
6
6
  contract TestRoleId {
7
- function getRole(string memory roleName) external pure returns (RoleId) { return toRoleId(roleName); }
7
+ function getRole(string memory roleName) external pure returns (RoleId) { return RoleIdLib.toRoleId(roleName); }
8
8
 
9
9
  function getProductOwnerRoleName() external pure returns (string memory) { return PRODUCT_OWNER_ROLE_NAME(); }
10
10
  function getProductOwnerRole() external pure returns (RoleId) { return PRODUCT_OWNER_ROLE(); }
@@ -3,30 +3,24 @@ pragma solidity ^0.8.19;
3
3
 
4
4
  import {NftId} from "../../contracts/types/NftId.sol";
5
5
  import {Version, VersionLib} from "../../contracts/types/Version.sol";
6
- import {ServiceBase} from "../../contracts/instance/service/ServiceBase.sol";
6
+ import {ServiceBase} from "../../contracts/instance/base/ServiceBase.sol";
7
7
 
8
8
  import {IVersionable} from "../../contracts/shared/IVersionable.sol";
9
9
  import {Versionable} from "../../contracts/shared/Versionable.sol";
10
10
 
11
+ //import {IService} from "../../contracts/instance/base/IService.sol";
12
+
11
13
  contract TestService is ServiceBase {
12
14
 
13
15
  string public constant NAME = "TestService";
14
16
 
15
- constructor(address registry, NftId registryNftId)
16
- ServiceBase(registry, registryNftId)
17
+ constructor(address registry, NftId registryNftId, address initialOwner)
17
18
  // solhint-disable-next-line no-empty-blocks
18
- {}
19
-
20
- function getVersion()
21
- public
22
- pure
23
- virtual override (IVersionable, Versionable)
24
- returns(Version)
25
19
  {
26
- return VersionLib.toVersion(3,0,0);
20
+ _initializeServiceBase(registry, registryNftId, initialOwner);
27
21
  }
28
22
 
29
- function getName() external pure override returns(string memory name) {
23
+ function getName() public pure override returns(string memory name) {
30
24
  return NAME;
31
25
  }
32
26
  }
@@ -0,0 +1,26 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.19;
3
+
4
+ import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
5
+
6
+ contract USDC is ERC20 {
7
+
8
+ // https://etherscan.io/token/0xc719d010b63e5bbf2c0551872cd5316ed26acd83#readContract
9
+ string public constant NAME = "USDC - DUMMY";
10
+ string public constant SYMBOL = "USDC";
11
+ uint8 public constant DECIMALS = 6;
12
+ uint256 public constant INITIAL_SUPPLY = 10**9 * 10**DECIMALS; // 1 Billion 1'000'000'000
13
+ // decimals == 18 (openzeppelin erc20 default)
14
+ constructor()
15
+ ERC20(NAME, SYMBOL)
16
+ {
17
+ _mint(
18
+ _msgSender(),
19
+ INITIAL_SUPPLY
20
+ );
21
+ }
22
+
23
+ function decimals() public pure override returns(uint8) {
24
+ return DECIMALS;
25
+ }
26
+ }
@@ -11,8 +11,8 @@ struct Fee {
11
11
  library FeeLib {
12
12
 
13
13
  function calculateFee(
14
- uint256 amount,
15
- Fee memory fee
14
+ Fee memory fee,
15
+ uint256 amount
16
16
  )
17
17
  public
18
18
  pure
@@ -35,7 +35,12 @@ library FeeLib {
35
35
  return Fee(fractionalFee, fixedFee);
36
36
  }
37
37
 
38
- /// @dev Return the zero fee struct (0, 0)
38
+ /// @dev Return the percent fee struct (x%, 0)
39
+ function percentageFee(uint8 percent) public pure returns (Fee memory fee) {
40
+ return Fee(UFixedMathLib.toUFixed(percent, -2), 0);
41
+ }
42
+
43
+ /// @dev Return a zero fee struct (0, 0)
39
44
  function zeroFee() public pure returns (Fee memory fee) {
40
45
  return Fee(UFixed.wrap(0), 0);
41
46
  }
@@ -0,0 +1,45 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.19;
3
+
4
+ import {ObjectType} from "./ObjectType.sol";
5
+
6
+ type Key32 is bytes32;
7
+ type KeyId is bytes31;
8
+
9
+ // type bindings
10
+ using {
11
+ eqKey32 as ==,
12
+ neKey32 as !=,
13
+ Key32Lib.toKey
14
+ } for Key32 global;
15
+
16
+ // @dev Returns true iff keys are identical
17
+ function eqKey32(Key32 a, Key32 b) pure returns (bool isSame) {
18
+ return Key32.unwrap(a) == Key32.unwrap(b);
19
+ }
20
+
21
+ // @dev Returns true iff keys are different
22
+ function neKey32(Key32 a, Key32 b) pure returns (bool isDifferent) {
23
+ return Key32.unwrap(a) != Key32.unwrap(b);
24
+ }
25
+
26
+ library Key32Lib {
27
+
28
+ uint8 public constant TYPE_SHIFT = 31 * 8;
29
+ uint8 public constant ID_SHIFT = uint8(32 * 8 - TYPE_SHIFT);
30
+ bytes32 public constant TYPE_MASK = bytes32(bytes1(type(uint8).max)); // first byte in bytes32
31
+ bytes32 public constant ID_MASK = bytes32(~TYPE_MASK); // remaining bytes in bytes32
32
+
33
+ function toKey32(ObjectType objectType, KeyId id) public pure returns (Key32) {
34
+ uint256 uintObjectType = ObjectType.unwrap(objectType);
35
+ uint256 uintId = uint248(KeyId.unwrap(id));
36
+ uint256 uintKey = (uintObjectType << TYPE_SHIFT) + uintId;
37
+ return Key32.wrap(bytes32(uintKey));
38
+ }
39
+
40
+ function toKey(Key32 key) public pure returns (ObjectType objectType, KeyId id) {
41
+ bytes32 key32 = Key32.unwrap(key);
42
+ objectType = ObjectType.wrap(uint8(uint256(key32 & TYPE_MASK) >> TYPE_SHIFT));
43
+ id = KeyId.wrap(bytes31((key32 & ID_MASK) << ID_SHIFT));
44
+ }
45
+ }
@@ -1,6 +1,9 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.19;
3
3
 
4
+ import {Key32, KeyId, Key32Lib} from "./Key32.sol";
5
+ import {ObjectType} from "./ObjectType.sol";
6
+
4
7
  // uint96 allows for chain ids up to 13 digits
5
8
  type NftId is uint96;
6
9
 
@@ -10,7 +13,9 @@ using {
10
13
  neNftId as !=,
11
14
  NftIdLib.toInt,
12
15
  NftIdLib.gtz,
13
- NftIdLib.eqz
16
+ NftIdLib.eqz,
17
+ NftIdLib.toKeyId,
18
+ NftIdLib.toKey32
14
19
  } for NftId global;
15
20
 
16
21
  // general pure free functions
@@ -54,4 +59,14 @@ library NftIdLib {
54
59
  function eq(NftId a, NftId b) public pure returns (bool isSame) {
55
60
  return eqNftId(a, b);
56
61
  }
62
+
63
+ /// @dev Returns the key32 value for the specified nft id and object type.
64
+ function toKey32(NftId id, ObjectType objectType) public pure returns (Key32 key) {
65
+ return Key32Lib.toKey32(objectType, toKeyId(id));
66
+ }
67
+
68
+ /// @dev Returns the key id value for the specified nft id
69
+ function toKeyId(NftId id) public pure returns (KeyId keyId) {
70
+ return KeyId.wrap(bytes31(uint248(NftId.unwrap(id))));
71
+ }
57
72
  }
@@ -37,36 +37,52 @@ function STAKE() pure returns (ObjectType) {
37
37
  return toObjectType(60);
38
38
  }
39
39
 
40
- function PRODUCT() pure returns (ObjectType) {
40
+ function COMPONENT() pure returns (ObjectType) {
41
41
  return toObjectType(100);
42
42
  }
43
43
 
44
- function DISTRIBUTOR() pure returns (ObjectType) {
44
+ function TREASURY() pure returns (ObjectType) {
45
+ return toObjectType(101);
46
+ }
47
+
48
+ function PRODUCT() pure returns (ObjectType) {
45
49
  return toObjectType(110);
46
50
  }
47
51
 
48
- function ORACLE() pure returns (ObjectType) {
52
+ function DISTRIBUTION() pure returns (ObjectType) {
49
53
  return toObjectType(120);
50
54
  }
51
55
 
52
- function POOL() pure returns (ObjectType) {
56
+ function ORACLE() pure returns (ObjectType) {
53
57
  return toObjectType(130);
54
58
  }
55
59
 
56
- function POLICY() pure returns (ObjectType) {
60
+ function POOL() pure returns (ObjectType) {
61
+ return toObjectType(140);
62
+ }
63
+
64
+ function RISK() pure returns (ObjectType) {
57
65
  return toObjectType(200);
58
66
  }
59
67
 
60
- function BUNDLE() pure returns (ObjectType) {
68
+ function POLICY() pure returns (ObjectType) {
61
69
  return toObjectType(210);
62
70
  }
63
71
 
72
+ function REFERRAL() pure returns (ObjectType) {
73
+ return toObjectType(212);
74
+ }
75
+
64
76
  function CLAIM() pure returns (ObjectType) {
65
- return toObjectType(201);
77
+ return toObjectType(214);
66
78
  }
67
79
 
68
80
  function PAYOUT() pure returns (ObjectType) {
69
- return toObjectType(202);
81
+ return toObjectType(216);
82
+ }
83
+
84
+ function BUNDLE() pure returns (ObjectType) {
85
+ return toObjectType(220);
70
86
  }
71
87
 
72
88
  /// @dev Converts the uint8 to a ObjectType.
@@ -0,0 +1,48 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.19;
3
+
4
+ import {Key32, KeyId, Key32Lib} from "./Key32.sol";
5
+ import {REFERRAL} from "./ObjectType.sol";
6
+
7
+ type ReferralId is bytes8;
8
+
9
+ // type bindings
10
+ using {
11
+ eqReferralId as ==,
12
+ neReferralId as !=,
13
+ ReferralIdLib.toKey32
14
+ } for ReferralId global;
15
+
16
+ // general pure free functions
17
+
18
+ // @dev Returns true iff risk ids a and b are identical
19
+ function eqReferralId(ReferralId a, ReferralId b) pure returns (bool isSame) {
20
+ return ReferralId.unwrap(a) == ReferralId.unwrap(b);
21
+ }
22
+
23
+ // @dev Returns true iff risk ids a and b are different
24
+ function neReferralId(ReferralId a, ReferralId b) pure returns (bool isDifferent) {
25
+ return ReferralId.unwrap(a) != ReferralId.unwrap(b);
26
+ }
27
+
28
+ library ReferralIdLib {
29
+
30
+ function zeroReferralId() public pure returns (ReferralId) {
31
+ return ReferralId.wrap(bytes8(0));
32
+ }
33
+
34
+ // @dev Converts a role string into a role id.
35
+ function toReferralId(string memory referral) public pure returns (ReferralId) {
36
+ return ReferralId.wrap(bytes8(keccak256(abi.encode(referral))));
37
+ }
38
+
39
+ /// @dev Returns the key32 value for the specified id
40
+ function toKey32(ReferralId id) public pure returns (Key32 key) {
41
+ return Key32Lib.toKey32(REFERRAL(), toKeyId(id));
42
+ }
43
+
44
+ /// @dev Returns the key id value for the specified id
45
+ function toKeyId(ReferralId id) public pure returns (KeyId keyId) {
46
+ return KeyId.wrap(bytes31(ReferralId.unwrap(id)));
47
+ }
48
+ }
@@ -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
+ }
@@ -10,20 +10,15 @@ using {
10
10
  } for RoleId global;
11
11
 
12
12
  // general pure free functions
13
- function DISTRIBUTOR_OWNER_ROLE_NAME() pure returns (string memory) { return "DistributorOwnerRole"; }
13
+ function DISTRIBUTION_OWNER_ROLE_NAME() pure returns (string memory) { return "DistributionOwnerRole"; }
14
14
  function ORACLE_OWNER_ROLE_NAME() pure returns (string memory) { return "OracleOwnerRole"; }
15
15
  function POOL_OWNER_ROLE_NAME() pure returns (string memory) { return "PoolOwnerRole"; }
16
16
  function PRODUCT_OWNER_ROLE_NAME() pure returns (string memory) { return "ProductOwnerRole"; }
17
17
 
18
- function DISTRIBUTOR_OWNER_ROLE() pure returns (RoleId) { return toRoleId("DistributorOwnerRole"); }
19
- function ORACLE_OWNER_ROLE() pure returns (RoleId) { return toRoleId("OracleOwnerRole"); }
20
- function POOL_OWNER_ROLE() pure returns (RoleId) { return toRoleId("PoolOwnerRole"); }
21
- function PRODUCT_OWNER_ROLE() pure returns (RoleId) { return toRoleId("ProductOwnerRole"); }
22
-
23
- // @dev Converts a role string into a role id.
24
- function toRoleId(string memory role) pure returns (RoleId) {
25
- return RoleId.wrap(bytes8(keccak256(abi.encode(role))));
26
- }
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"); }
27
22
 
28
23
  // @dev Returns true iff role ids a and b are identical
29
24
  function eqRoleId(RoleId a, RoleId b) pure returns (bool isSame) {
@@ -34,3 +29,10 @@ function eqRoleId(RoleId a, RoleId b) pure returns (bool isSame) {
34
29
  function neRoleId(RoleId a, RoleId b) pure returns (bool isDifferent) {
35
30
  return RoleId.unwrap(a) != RoleId.unwrap(b);
36
31
  }
32
+
33
+ library RoleIdLib {
34
+ // @dev Converts a role string into a role id.
35
+ function toRoleId(string memory role) public pure returns (RoleId) {
36
+ return RoleId.wrap(bytes8(keccak256(abi.encode(role))));
37
+ }
38
+ }
@@ -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) {
@@ -77,19 +77,25 @@ function deltaUFixed(UFixed a, UFixed b) pure returns (UFixed) {
77
77
  }
78
78
 
79
79
  library UFixedMathLib {
80
- enum Rounding {
81
- /// @dev Round down - floor(value)
82
- Down,
83
- /// @dev Round up - ceil(value)
84
- Up,
85
- /// @dev Round half up - round(value)
86
- HalfUp
87
- }
88
-
89
80
  int8 public constant EXP = 18;
90
81
  uint256 public constant MULTIPLIER = 10 ** uint256(int256(EXP));
91
82
  uint256 public constant MULTIPLIER_HALF = MULTIPLIER / 2;
92
83
 
84
+ /// @dev returns the rounding mode DOWN - 0.4 becomes 0, 0.5 becomes 0, 0.6 becomes 0
85
+ function ROUNDING_DOWN() public pure returns (uint8) {
86
+ return uint8(0);
87
+ }
88
+
89
+ /// @dev returns the rounding mode UP - 0.4 becomes 1, 0.5 becomes 1, 0.6 becomes 1
90
+ function ROUNDING_UP() public pure returns (uint8) {
91
+ return uint8(1);
92
+ }
93
+
94
+ /// @dev returns the rounding mode HALF_UP - 0.4 becomes 0, 0.5 becomes 1, 0.6 becomes 1
95
+ function ROUNDING_HALF_UP() public pure returns (uint8) {
96
+ return uint8(2);
97
+ }
98
+
93
99
  /// @dev Converts the uint256 to a UFixed.
94
100
  function toUFixed(uint256 a) public pure returns (UFixed) {
95
101
  return UFixed.wrap(a * MULTIPLIER);
@@ -103,9 +109,6 @@ library UFixedMathLib {
103
109
  return UFixed.wrap(a * 10 ** uint8(EXP + exp));
104
110
  }
105
111
 
106
- /// @dev Default rounding mode used by ftoi is HalfUp
107
- Rounding public constant ROUNDING_DEFAULT = Rounding.HalfUp;
108
-
109
112
  /// @dev returns the decimals precision of the UFixed type
110
113
  function decimals() public pure returns (uint256) {
111
114
  return uint8(EXP);
@@ -113,12 +116,12 @@ library UFixedMathLib {
113
116
 
114
117
  /// @dev Converts a UFixed to a uint256.
115
118
  function toInt(UFixed a) public pure returns (uint256) {
116
- return toIntWithRounding(a, ROUNDING_DEFAULT);
119
+ return toIntWithRounding(a, ROUNDING_HALF_UP());
117
120
  }
118
121
 
119
122
  /// @dev Converts a UFixed to a uint256 with given rounding mode.
120
- function toIntWithRounding(UFixed a, Rounding rounding) public pure returns (uint256) {
121
- if (rounding == Rounding.HalfUp) {
123
+ function toIntWithRounding(UFixed a, uint8 rounding) public pure returns (uint256) {
124
+ if (rounding == ROUNDING_HALF_UP()) {
122
125
  return
123
126
  Math.mulDiv(
124
127
  UFixed.unwrap(a) + MULTIPLIER_HALF,
@@ -126,7 +129,7 @@ library UFixedMathLib {
126
129
  MULTIPLIER,
127
130
  Math.Rounding.Down
128
131
  );
129
- } else if (rounding == Rounding.Down) {
132
+ } else if (rounding == ROUNDING_DOWN()) {
130
133
  return
131
134
  Math.mulDiv(
132
135
  UFixed.unwrap(a),
@@ -23,6 +23,7 @@ using {
23
23
  versionGt as >,
24
24
  versionEq as ==,
25
25
  VersionLib.toInt,
26
+ VersionLib.toUint64,
26
27
  VersionLib.toMajorPart,
27
28
  VersionLib.toVersionParts
28
29
  }
@@ -34,6 +35,8 @@ function versionEq(Version a, Version b) pure returns(bool isSame) { return Vers
34
35
  library VersionLib {
35
36
  function toInt(Version version) external pure returns(uint) { return Version.unwrap(version); }
36
37
 
38
+ function toUint64(Version version) external pure returns(uint64) { return Version.unwrap(version); }
39
+
37
40
  function toMajorPart(Version version)
38
41
  external
39
42
  pure
@@ -89,6 +92,12 @@ library VersionLib {
89
92
  (major << 16) + (minor << 8) + patch));
90
93
  }
91
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
+
92
101
  function zeroVersion() external pure returns(Version) {
93
102
  return Version.wrap(0);
94
103
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@etherisc/gif-next",
3
- "version": "0.0.2-6f2f76e-746",
3
+ "version": "0.0.2-719a8f1-103",
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": {
@@ -1,4 +0,0 @@
1
- {
2
- "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/06e83e7724f74452e3c7cb42b0b5994a.json"
4
- }
@@ -1,50 +0,0 @@
1
- {
2
- "_format": "hh-sol-artifact-1",
3
- "contractName": "IServiceLinked",
4
- "sourceName": "contracts/instance/IServiceLinked.sol",
5
- "abi": [
6
- {
7
- "inputs": [],
8
- "name": "getComponentOwnerService",
9
- "outputs": [
10
- {
11
- "internalType": "contract IComponentOwnerService",
12
- "name": "service",
13
- "type": "address"
14
- }
15
- ],
16
- "stateMutability": "view",
17
- "type": "function"
18
- },
19
- {
20
- "inputs": [],
21
- "name": "getPoolService",
22
- "outputs": [
23
- {
24
- "internalType": "contract IPoolService",
25
- "name": "service",
26
- "type": "address"
27
- }
28
- ],
29
- "stateMutability": "view",
30
- "type": "function"
31
- },
32
- {
33
- "inputs": [],
34
- "name": "getProductService",
35
- "outputs": [
36
- {
37
- "internalType": "contract IProductService",
38
- "name": "service",
39
- "type": "address"
40
- }
41
- ],
42
- "stateMutability": "view",
43
- "type": "function"
44
- }
45
- ],
46
- "bytecode": "0x",
47
- "deployedBytecode": "0x",
48
- "linkReferences": {},
49
- "deployedLinkReferences": {}
50
- }
@@ -1,4 +0,0 @@
1
- {
2
- "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/06e83e7724f74452e3c7cb42b0b5994a.json"
4
- }
@@ -1,4 +0,0 @@
1
- {
2
- "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../../build-info/06e83e7724f74452e3c7cb42b0b5994a.json"
4
- }
@@ -1,10 +0,0 @@
1
- {
2
- "_format": "hh-sol-artifact-1",
3
- "contractName": "CompensationModule",
4
- "sourceName": "contracts/instance/module/compensation/CompensationModule.sol",
5
- "abi": [],
6
- "bytecode": "0x6080604052348015600f57600080fd5b50603f80601d6000396000f3fe6080604052600080fdfea2646970667358221220e083bd536daa38f4ab2da87a47489460180ca9e737890e3707e2279d6bddbb1d64736f6c63430008140033",
7
- "deployedBytecode": "0x6080604052600080fdfea2646970667358221220e083bd536daa38f4ab2da87a47489460180ca9e737890e3707e2279d6bddbb1d64736f6c63430008140033",
8
- "linkReferences": {},
9
- "deployedLinkReferences": {}
10
- }
@@ -1,4 +0,0 @@
1
- {
2
- "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../../build-info/06e83e7724f74452e3c7cb42b0b5994a.json"
4
- }
@@ -1,4 +0,0 @@
1
- {
2
- "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../../build-info/06e83e7724f74452e3c7cb42b0b5994a.json"
4
- }
@@ -1,4 +0,0 @@
1
- {
2
- "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../../build-info/06e83e7724f74452e3c7cb42b0b5994a.json"
4
- }