@etherisc/gif-next 0.0.2-e510b92-393 → 0.0.2-e545d2c-624

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 (231) hide show
  1. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +1 -1
  2. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +29 -0
  3. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
  4. package/artifacts/contracts/components/Distribution.sol/Distribution.json +33 -102
  5. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +1 -1
  6. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +29 -0
  7. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  8. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  9. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  10. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  11. package/artifacts/contracts/components/Pool.sol/Pool.json +33 -130
  12. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  13. package/artifacts/contracts/components/Product.sol/Product.json +33 -113
  14. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.dbg.json +1 -1
  15. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.dbg.json +1 -1
  16. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.dbg.json +1 -1
  17. package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +1 -1
  18. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +1 -1
  19. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +1 -1
  20. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +1 -1
  21. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +1 -1
  22. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +1 -1
  23. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +1 -1
  24. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +1 -1
  25. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +1 -1
  26. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +1 -1
  27. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +1 -1
  28. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +1 -1
  29. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +1 -1
  30. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +1 -1
  31. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +1 -1
  32. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
  33. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
  34. package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +4 -0
  35. package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.json +1206 -0
  36. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +1 -1
  37. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +45 -32
  38. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +1 -1
  39. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  40. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +116 -0
  41. package/artifacts/contracts/instance/IInstanceBase.sol/IInstanceBase.dbg.json +4 -0
  42. package/artifacts/contracts/instance/IInstanceBase.sol/IInstanceBase.json +448 -0
  43. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  44. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +99 -14
  45. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  46. package/artifacts/contracts/instance/Instance.sol/Instance.json +79 -665
  47. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
  48. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +244 -114
  49. package/artifacts/contracts/instance/InstanceBase.sol/InstanceBase.dbg.json +4 -0
  50. package/artifacts/contracts/instance/InstanceBase.sol/InstanceBase.json +763 -0
  51. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  52. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +2 -2
  53. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  54. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +166 -173
  55. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  56. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +26 -78
  57. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +1 -1
  58. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +15 -2
  59. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +1 -1
  60. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.json +24 -32
  61. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +1 -1
  62. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  63. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  64. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  65. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  66. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
  67. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +59 -16
  68. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  69. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  70. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  71. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  72. package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +1 -1
  73. package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +1 -1
  74. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +4 -0
  75. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +1031 -0
  76. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +4 -0
  77. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +436 -0
  78. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +1 -1
  79. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +39 -52
  80. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
  81. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +49 -72
  82. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  83. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +13 -37
  84. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +4 -0
  85. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +720 -0
  86. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +1 -1
  87. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.json +13 -13
  88. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  89. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +13 -13
  90. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +4 -0
  91. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +771 -0
  92. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
  93. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +12 -241
  94. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
  95. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +17 -241
  96. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +4 -0
  97. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +1156 -0
  98. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +4 -0
  99. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +492 -0
  100. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
  101. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +32 -354
  102. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  103. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +13 -57
  104. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
  105. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +40 -410
  106. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +1 -1
  107. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +13 -81
  108. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  109. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +2 -2
  110. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  111. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +132 -133
  112. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  113. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +94 -65
  114. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  115. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  116. package/artifacts/contracts/registry/Registry.sol/Registry.json +145 -227
  117. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +4 -0
  118. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +285 -0
  119. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  120. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +30 -128
  121. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  122. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +38 -104
  123. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +4 -0
  124. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +530 -0
  125. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  126. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +14 -27
  127. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +1 -1
  128. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  129. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  130. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  131. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  132. package/artifacts/contracts/shared/IService.sol/IService.json +13 -13
  133. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  134. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  135. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +2 -2
  136. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  137. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +2 -2
  138. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  139. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +2 -2
  140. package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.dbg.json +1 -1
  141. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  142. package/artifacts/contracts/shared/Service.sol/Service.json +13 -13
  143. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  144. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  145. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  146. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
  147. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
  148. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +2 -2
  149. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
  150. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +2 -2
  151. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
  152. package/artifacts/contracts/test/TestService.sol/TestService.json +31 -31
  153. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
  154. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
  155. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
  156. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
  157. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  158. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  159. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  160. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  161. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
  162. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
  163. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  164. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  165. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +1 -1
  166. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  167. package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +1 -1
  168. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +1 -1
  169. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
  170. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +2 -2
  171. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
  172. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
  173. package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +1 -1
  174. package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +1 -1
  175. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
  176. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
  177. package/contracts/components/BaseComponent.sol +35 -8
  178. package/contracts/components/Distribution.sol +2 -1
  179. package/contracts/components/IBaseComponent.sol +3 -0
  180. package/contracts/components/Pool.sol +11 -6
  181. package/contracts/components/Product.sol +22 -10
  182. package/contracts/instance/AccessManagerUpgradeableInitializeable.sol +23 -0
  183. package/contracts/instance/IInstance.sol +7 -1
  184. package/contracts/instance/IInstanceBase.sol +26 -0
  185. package/contracts/instance/IInstanceService.sol +10 -2
  186. package/contracts/instance/Instance.sol +32 -214
  187. package/contracts/instance/InstanceAccessManager.sol +93 -78
  188. package/contracts/instance/InstanceBase.sol +41 -0
  189. package/contracts/instance/InstanceService.sol +228 -115
  190. package/contracts/instance/InstanceServiceManager.sol +5 -8
  191. package/contracts/instance/ObjectManager.sol +7 -1
  192. package/contracts/instance/base/ComponentServiceBase.sol +29 -87
  193. package/contracts/instance/module/IAccess.sol +27 -17
  194. package/contracts/instance/service/BundleService.sol +294 -0
  195. package/contracts/instance/service/BundleServiceManager.sol +51 -0
  196. package/contracts/instance/service/ComponentOwnerService.sol +4 -6
  197. package/contracts/instance/service/DistributionService.sol +53 -21
  198. package/contracts/instance/service/DistributionServiceManager.sol +6 -9
  199. package/contracts/instance/service/IBundleService.sol +44 -0
  200. package/contracts/instance/service/IPolicyService.sol +94 -0
  201. package/contracts/instance/service/IPoolService.sol +2 -33
  202. package/contracts/instance/service/IProductService.sol +2 -72
  203. package/contracts/instance/service/PolicyService.sol +539 -0
  204. package/contracts/instance/service/PolicyServiceManager.sol +54 -0
  205. package/contracts/instance/service/PoolService.sol +65 -207
  206. package/contracts/instance/service/PoolServiceManager.sol +5 -8
  207. package/contracts/instance/service/ProductService.sol +100 -457
  208. package/contracts/registry/ChainNft.sol +1 -1
  209. package/contracts/registry/IRegistry.sol +26 -16
  210. package/contracts/registry/IRegistryService.sol +13 -5
  211. package/contracts/registry/Registry.sol +149 -201
  212. package/contracts/registry/RegistryAccessManager.sol +210 -0
  213. package/contracts/registry/RegistryService.sol +50 -88
  214. package/contracts/registry/RegistryServiceManager.sol +18 -36
  215. package/contracts/registry/ReleaseManager.sol +342 -0
  216. package/contracts/registry/TokenRegistry.sol +5 -6
  217. package/contracts/shared/IService.sol +2 -1
  218. package/contracts/shared/ProxyManager.sol +1 -1
  219. package/contracts/shared/Service.sol +10 -7
  220. package/contracts/test/TestService.sol +3 -2
  221. package/contracts/types/RoleId.sol +10 -10
  222. package/package.json +1 -1
  223. package/artifacts/contracts/instance/AccessManagedSimple.sol/AccessManagedSimple.dbg.json +0 -4
  224. package/artifacts/contracts/instance/AccessManagedSimple.sol/AccessManagedSimple.json +0 -101
  225. package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.dbg.json +0 -4
  226. package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.json +0 -1132
  227. package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.dbg.json +0 -4
  228. package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.json +0 -1082
  229. package/contracts/instance/AccessManagedSimple.sol +0 -115
  230. package/contracts/instance/AccessManagerSimple.sol +0 -692
  231. package/contracts/instance/IAccessManagerSimple.sol +0 -391
@@ -2,17 +2,16 @@
2
2
  pragma solidity ^0.8.19;
3
3
 
4
4
  import {IRegistry} from "../../registry/IRegistry.sol";
5
- import {IRegistryService} from "../../registry/IRegistryService.sol";
6
5
  import {IInstance} from "../../instance/IInstance.sol";
6
+ import {InstanceAccessManager} from "../InstanceAccessManager.sol";
7
7
  import {InstanceReader} from "../../instance/InstanceReader.sol";
8
8
  import {ISetup} from "../../instance/module/ISetup.sol";
9
- import {ITreasury} from "../../instance/module/ITreasury.sol";
10
9
 
11
10
  import {NftId, NftIdLib} from "../../types/NftId.sol";
12
11
  import {Fee} from "../../types/Fee.sol";
13
12
  import {DISTRIBUTION_OWNER_ROLE} from "../../types/RoleId.sol";
14
13
  import {KEEP_STATE} from "../../types/StateId.sol";
15
- import {DISTRIBUTION} from "../../types/ObjectType.sol";
14
+ import {ObjectType, DISTRIBUTION} from "../../types/ObjectType.sol";
16
15
  import {Version, VersionLib} from "../../types/Version.sol";
17
16
 
18
17
  import {IVersionable} from "../../shared/IVersionable.sol";
@@ -21,13 +20,10 @@ import {Versionable} from "../../shared/Versionable.sol";
21
20
  import {IService} from "../../shared/IService.sol";
22
21
  import {Service} from "../../shared/Service.sol";
23
22
  import {ComponentServiceBase} from "../base/ComponentServiceBase.sol";
24
- import {IDistributionService} from "./IDistributionService.sol";
25
- import {Distribution} from "../../components/Distribution.sol";
26
23
  import {InstanceService} from "../InstanceService.sol";
27
- import {Instance} from "../Instance.sol";
28
- import {INftOwnable} from "../../shared/INftOwnable.sol";
24
+ import {IDistributionService} from "./IDistributionService.sol";
25
+ import {IBaseComponent} from "../../components/IBaseComponent.sol";
29
26
 
30
- string constant DISTRIBUTION_SERVICE_NAME = "DistributionService";
31
27
 
32
28
  contract DistributionService is
33
29
  ComponentServiceBase,
@@ -35,8 +31,6 @@ contract DistributionService is
35
31
  {
36
32
  using NftIdLib for NftId;
37
33
 
38
- string public constant NAME = "DistributionService";
39
-
40
34
  address internal _registryAddress;
41
35
 
42
36
  function _initialize(
@@ -47,27 +41,65 @@ contract DistributionService is
47
41
  initializer
48
42
  virtual override
49
43
  {
50
- address initialOwner = address(0);
51
- (_registryAddress, initialOwner) = abi.decode(data, (address, address));
44
+ address initialOwner;
45
+ address registryAddress;
46
+ (registryAddress, initialOwner) = abi.decode(data, (address, address));
52
47
  // TODO while DistributionService is not deployed in DistributionServiceManager constructor
53
48
  // owner is DistributionServiceManager deployer
54
- _initializeService(_registryAddress, owner);
49
+ _initializeService(registryAddress, owner);
55
50
 
56
- _registerInterface(type(IService).interfaceId);
57
51
  _registerInterface(type(IDistributionService).interfaceId);
58
52
  }
59
53
 
54
+ function getDomain() public pure override(Service, IService) returns(ObjectType) {
55
+ return DISTRIBUTION();
56
+ }
57
+
58
+ function register(address distributionAddress)
59
+ external
60
+ returns(NftId distributionNftId)
61
+ {
62
+ address distributionOwner = msg.sender;
63
+ IBaseComponent distribution = IBaseComponent(distributionAddress);
64
+
65
+ IRegistry.ObjectInfo memory info;
66
+ bytes memory data;
67
+ (info, data) = getRegistryService().registerDistribution(distribution, distributionOwner);
60
68
 
61
- function getName() public pure override(IService, Service) returns(string memory name) {
62
- return NAME;
69
+ NftId instanceNftId = info.parentNftId;
70
+ IInstance instance = _getInstance(instanceNftId);
71
+ InstanceService instanceService = getInstanceService();
72
+
73
+ bool hasRole = instanceService.hasRole(
74
+ distributionOwner,
75
+ DISTRIBUTION_OWNER_ROLE(),
76
+ address(instance));
77
+
78
+ if(!hasRole) {
79
+ revert ExpectedRoleMissing(DISTRIBUTION_OWNER_ROLE(), distributionOwner);
80
+ }
81
+
82
+ distributionNftId = info.nftId;
83
+ string memory distributionName;
84
+ ISetup.DistributionSetupInfo memory initialSetup;
85
+ (distributionName, initialSetup) = _decodeAndVerifyDistributionData(data);
86
+ instance.createDistributionSetup(distributionNftId, initialSetup);
87
+
88
+ instanceService.createTarget(instanceNftId, distributionAddress, distributionName);
89
+
90
+ distribution.linkToRegisteredNftId();
63
91
  }
64
92
 
65
- function _finalizeComponentRegistration(NftId componentNftId, bytes memory initialObjData, IInstance instance) internal override {
66
- ISetup.DistributionSetupInfo memory initialSetup = abi.decode(
67
- initialObjData,
68
- (ISetup.DistributionSetupInfo)
93
+ function _decodeAndVerifyDistributionData(bytes memory data)
94
+ internal
95
+ returns(string memory name, ISetup.DistributionSetupInfo memory setup)
96
+ {
97
+ (name, setup) = abi.decode(
98
+ data,
99
+ (string, ISetup.DistributionSetupInfo)
69
100
  );
70
- instance.createDistributionSetup(componentNftId, initialSetup);
101
+
102
+ // TODO add checks if applicable
71
103
  }
72
104
 
73
105
  function setFees(
@@ -6,7 +6,7 @@ import {ProxyManager} from "../../shared/ProxyManager.sol";
6
6
  import {DistributionService} from "./DistributionService.sol";
7
7
  import {Registry} from "../../registry/Registry.sol";
8
8
  import {RegistryService} from "../../registry/RegistryService.sol";
9
- import {VersionLib} from "../../types/Version.sol";
9
+ import {REGISTRY} from "../../types/ObjectType.sol";
10
10
 
11
11
  contract DistributionServiceManager is ProxyManager {
12
12
 
@@ -25,11 +25,11 @@ contract DistributionServiceManager is ProxyManager {
25
25
  data);
26
26
 
27
27
  _distributionService = DistributionService(address(versionable));
28
-
29
- Registry registry = Registry(registryAddress);
30
- address registryServiceAddress = registry.getServiceAddress("RegistryService", VersionLib.toVersion(3, 0, 0).toMajorPart());
31
- RegistryService registryService = RegistryService(registryServiceAddress);
32
- // TODO this must have a role or own nft to register service
28
+
29
+ // TODO `thi` must have a role or own nft to register service
30
+ //Registry registry = Registry(registryAddress);
31
+ //address registryServiceAddress = registry.getServiceAddress(REGISTRY(), _distributionService.getMajorVersion());
32
+ //RegistryService registryService = RegistryService(registryServiceAddress);
33
33
  //registryService.registerService(_distributionService);
34
34
 
35
35
  // TODO no nft to link yet
@@ -37,9 +37,6 @@ contract DistributionServiceManager is ProxyManager {
37
37
  //_linkToNftOwnable(
38
38
  // address(registryAddress),
39
39
  // address(_distributionService));
40
-
41
- // implies that after this constructor call only upgrade functionality is available
42
- _isDeployed = true;
43
40
  }
44
41
 
45
42
  //--- view functions ----------------------------------------------------//
@@ -0,0 +1,44 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.19;
3
+
4
+ import {NftId} from "../../types/NftId.sol";
5
+ import {Fee} from "../../types/Fee.sol";
6
+ import {StateId} from "../../types/StateId.sol";
7
+ import {IService} from "../../shared/IService.sol";
8
+ import {IBundle} from "../module/IBundle.sol";
9
+ import {IInstance} from "../../instance/IInstance.sol";
10
+
11
+ interface IBundleService is IService {
12
+ error ErrorIBundleServiceInsufficientAllowance(address bundleOwner, address tokenHandlerAddress, uint256 amount);
13
+
14
+ function createBundle(
15
+ address owner,
16
+ Fee memory fee,
17
+ uint256 amount,
18
+ uint256 lifetime,
19
+ bytes calldata filter
20
+ ) external returns(NftId bundleNftId);
21
+
22
+ function setBundleFee(
23
+ NftId bundleNftId,
24
+ Fee memory fee
25
+ ) external;
26
+
27
+ function updateBundle(NftId instanceNftId, NftId bundleNftId, IBundle.BundleInfo memory bundleInfo, StateId state) external;
28
+
29
+ function underwritePolicy(IInstance instanceNftId, NftId policyNftId, NftId bundleNftId, uint256 collateralAmount, uint256 netPremium) external;
30
+
31
+ function increaseBalance(IInstance instance, NftId bundleNftId, uint256 amount) external;
32
+
33
+ function closePolicy(IInstance instance, NftId policyNftId, NftId bundleNftId, uint256 collateralAmount) external;
34
+
35
+ // function fundBundle(NftId bundleNftId, uint256 amount) external returns(uint256 netAmount);
36
+
37
+ // function defundBundle(NftId bundleNftId, uint256 amount) external returns(uint256 netAmount);
38
+
39
+ function lockBundle(NftId bundleNftId) external;
40
+
41
+ function unlockBundle(NftId bundleNftId) external;
42
+
43
+ // function closeBundle(NftId bundleNftId) external;
44
+ }
@@ -0,0 +1,94 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.19;
3
+
4
+ import {IRisk} from "../module/IRisk.sol";
5
+ import {IService} from "../../shared/IService.sol";
6
+
7
+ import {NftId} from "../../types/NftId.sol";
8
+ import {ReferralId} from "../../types/Referral.sol";
9
+ import {RiskId} from "../../types/RiskId.sol";
10
+ import {StateId} from "../../types/StateId.sol";
11
+ import {Timestamp} from "../../types/Timestamp.sol";
12
+ import {UFixed} from "../../types/UFixed.sol";
13
+ import {Fee} from "../../types/Fee.sol";
14
+
15
+ interface IPolicyService is IService {
16
+
17
+ error ErrorIPolicyServiceInsufficientAllowance(address customer, address tokenHandlerAddress, uint256 amount);
18
+ error ErrorIPolicyServicePremiumAlreadyPaid(NftId policyNftId, uint256 premiumPaidAmount);
19
+ error ErrorIPolicyServicePolicyNotActivated(NftId policyNftId);
20
+ error ErrorIPolicyServicePolicyAlreadyClosed(NftId policyNftId);
21
+ error ErrorIPolicyServicePolicyNotActive(NftId policyNftId, StateId state);
22
+ error ErrorIPolicyServicePremiumNotFullyPaid(NftId policyNftId, uint256 premiumAmount, uint256 premiumPaidAmount);
23
+ error ErrorIPolicyServiceOpenClaims(NftId policyNftId, uint16 openClaimsCount);
24
+ error ErrorIPolicyServicePolicyHasNotExpired(NftId policyNftId, Timestamp expiredAt);
25
+
26
+ function calculatePremium(
27
+ RiskId riskId,
28
+ uint256 sumInsuredAmount,
29
+ uint256 lifetime,
30
+ bytes memory applicationData,
31
+ NftId bundleNftId,
32
+ ReferralId referralId
33
+ )
34
+ external
35
+ view
36
+ returns (
37
+ uint256 premiumAmount,
38
+ uint256 productFeeAmount,
39
+ uint256 poolFeeAmount,
40
+ uint256 bundleFeeAmount,
41
+ uint256 distributionFeeAmount
42
+ );
43
+
44
+
45
+ function createApplication(
46
+ address applicationOwner,
47
+ RiskId riskId,
48
+ uint256 sumInsuredAmount,
49
+ uint256 lifetime,
50
+ bytes memory applicationData,
51
+ NftId bundleNftId,
52
+ ReferralId referralId
53
+ ) external returns (NftId nftId);
54
+
55
+ /**
56
+ * @dev revokes the application represented by {policyNftId}.
57
+ * an application can only be revoked in applied state.
58
+ * only the application holder may revoke an application.
59
+ */
60
+ function revoke(NftId policyNftId) external;
61
+
62
+ /**
63
+ * @dev underwrites the policy represented by {policyNftId}.
64
+ * optionally collects premiums and activates the policy.
65
+ * - premium payment is only attempted if requirePremiumPayment is set to true
66
+ * - activation is only done if activateAt is a non-zero timestamp
67
+ */
68
+ function underwrite(
69
+ NftId policyNftId,
70
+ bool requirePremiumPayment,
71
+ Timestamp activateAt
72
+ ) external;
73
+
74
+ // function decline(uint256 nftId) external;
75
+ // function expire(uint256 nftId) external;
76
+
77
+ function collectPremium(NftId policyNftId, Timestamp activateAt) external;
78
+
79
+ function activate(NftId policyNftId, Timestamp activateAt) external;
80
+
81
+
82
+ function close(NftId nftId) external;
83
+
84
+ // function createClaim(uint256 nftId, uint256 claimAmount) external;
85
+ // function confirmClaim(uint256 nftId, uint256 claimId, uint256 claimAmount) external;
86
+ // function declineClaim(uint256 nftId, uint256 claimId) external;
87
+ // function closeClaim(uint256 nftId, uint256 claimId) external; // TODO payoutClaim() -> implicit close when payed out in full
88
+
89
+ function calculateRequiredCollateral(
90
+ UFixed collateralizationLevel,
91
+ uint256 sumInsuredAmount
92
+ ) external pure returns(uint256 collateralAmount);
93
+
94
+ }
@@ -9,43 +9,12 @@ import {IBundle} from "../module/IBundle.sol";
9
9
  import {IInstance} from "../../instance/IInstance.sol";
10
10
 
11
11
  interface IPoolService is IService {
12
- error ErrorIPoolServiceInsufficientAllowance(address bundleOwner, address tokenHandlerAddress, uint256 amount);
12
+
13
+ function register(address poolAddress) external returns(NftId);
13
14
 
14
15
  function setFees(
15
16
  Fee memory poolFee,
16
17
  Fee memory stakingFee,
17
18
  Fee memory performanceFee
18
19
  ) external;
19
-
20
- function createBundle(
21
- address owner,
22
- Fee memory fee,
23
- uint256 amount,
24
- uint256 lifetime,
25
- bytes calldata filter
26
- ) external returns(NftId bundleNftId);
27
-
28
- function setBundleFee(
29
- NftId bundleNftId,
30
- Fee memory fee
31
- ) external;
32
-
33
- function updateBundle(NftId instanceNftId, NftId bundleNftId, IBundle.BundleInfo memory bundleInfo, StateId state) external;
34
-
35
- function underwritePolicy(IInstance instanceNftId,
36
- NftId policyNftId,
37
- NftId bundleNftId,
38
- uint256 collateralAmount,
39
- uint256 netPremium
40
- ) external;
41
-
42
- // function fundBundle(NftId bundleNftId, uint256 amount) external returns(uint256 netAmount);
43
-
44
- // function defundBundle(NftId bundleNftId, uint256 amount) external returns(uint256 netAmount);
45
-
46
- function lockBundle(NftId bundleNftId) external;
47
-
48
- function unlockBundle(NftId bundleNftId) external;
49
-
50
- // function closeBundle(NftId bundleNftId) external;
51
20
  }
@@ -13,9 +13,9 @@ import {UFixed} from "../../types/UFixed.sol";
13
13
  import {Fee} from "../../types/Fee.sol";
14
14
 
15
15
  interface IProductService is IService {
16
-
17
- error ErrorIProductServiceInsufficientAllowance(address customer, address tokenHandlerAddress, uint256 amount);
18
16
 
17
+ function register(address productAddress) external returns(NftId);
18
+
19
19
  function setFees(
20
20
  Fee memory productFee,
21
21
  Fee memory processingFee
@@ -37,74 +37,4 @@ interface IProductService is IService {
37
37
  RiskId riskId,
38
38
  StateId newState
39
39
  ) external;
40
-
41
-
42
- function calculatePremium(
43
- RiskId riskId,
44
- uint256 sumInsuredAmount,
45
- uint256 lifetime,
46
- bytes memory applicationData,
47
- NftId bundleNftId,
48
- ReferralId referralId
49
- )
50
- external
51
- view
52
- returns (
53
- uint256 premiumAmount,
54
- uint256 productFeeAmount,
55
- uint256 poolFeeAmount,
56
- uint256 bundleFeeAmount,
57
- uint256 distributionFeeAmount
58
- );
59
-
60
-
61
- function createApplication(
62
- address applicationOwner,
63
- RiskId riskId,
64
- uint256 sumInsuredAmount,
65
- uint256 lifetime,
66
- bytes memory applicationData,
67
- NftId bundleNftId,
68
- ReferralId referralId
69
- ) external returns (NftId nftId);
70
-
71
- /**
72
- * @dev revokes the application represented by {policyNftId}.
73
- * an application can only be revoked in applied state.
74
- * only the application holder may revoke an application.
75
- */
76
- function revoke(NftId policyNftId) external;
77
-
78
- /**
79
- * @dev underwrites the policy represented by {policyNftId}.
80
- * optionally collects premiums and activates the policy.
81
- * - premium payment is only attempted if requirePremiumPayment is set to true
82
- * - activation is only done if activateAt is a non-zero timestamp
83
- */
84
- function underwrite(
85
- NftId policyNftId,
86
- bool requirePremiumPayment,
87
- Timestamp activateAt
88
- ) external;
89
-
90
- // function decline(uint256 nftId) external;
91
- // function expire(uint256 nftId) external;
92
-
93
- function collectPremium(NftId policyNftId, Timestamp activateAt) external;
94
-
95
- function activate(NftId policyNftId, Timestamp activateAt) external;
96
-
97
-
98
- function close(NftId nftId) external;
99
-
100
- // function createClaim(uint256 nftId, uint256 claimAmount) external;
101
- // function confirmClaim(uint256 nftId, uint256 claimId, uint256 claimAmount) external;
102
- // function declineClaim(uint256 nftId, uint256 claimId) external;
103
- // function closeClaim(uint256 nftId, uint256 claimId) external;
104
-
105
- function calculateRequiredCollateral(
106
- UFixed collateralizationLevel,
107
- uint256 sumInsuredAmount
108
- ) external pure returns(uint256 collateralAmount);
109
-
110
40
  }