@etherisc/gif-next 0.0.2-cff6256-424 → 0.0.2-d10d6b3-916

Sign up to get free protection for your applications and to get access to all the features.
Files changed (188) hide show
  1. package/README.md +43 -0
  2. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +1 -1
  3. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
  4. package/artifacts/contracts/components/Distribution.sol/Distribution.json +10 -62
  5. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +1 -1
  6. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  7. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +0 -52
  8. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  9. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +28 -2
  10. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  11. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  12. package/artifacts/contracts/components/Pool.sol/Pool.json +42 -19
  13. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  14. package/artifacts/contracts/components/Product.sol/Product.json +18 -64
  15. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.dbg.json +1 -1
  16. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.dbg.json +1 -1
  17. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.dbg.json +1 -1
  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/ISM.sol/ISM.dbg.json +1 -1
  30. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +1 -1
  31. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +1 -1
  32. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +1 -1
  33. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
  34. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
  35. package/artifacts/contracts/instance/AccessManagedSimple.sol/AccessManagedSimple.dbg.json +1 -1
  36. package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.dbg.json +1 -1
  37. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +4 -0
  38. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +775 -0
  39. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +4 -0
  40. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.json +185 -0
  41. package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.dbg.json +1 -1
  42. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  43. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +1347 -93
  44. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  45. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +5 -0
  46. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  47. package/artifacts/contracts/instance/Instance.sol/Instance.json +176 -84
  48. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
  49. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +2 -2
  50. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  51. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +177 -38
  52. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  53. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +193 -50
  54. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  55. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +70 -26
  56. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +4 -0
  57. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +272 -0
  58. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +1 -1
  59. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.json +59 -0
  60. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +1 -1
  61. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  62. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  63. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  64. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  65. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
  66. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  67. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  68. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  69. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  70. package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +1 -1
  71. package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +1 -1
  72. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +1 -1
  73. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +16 -16
  74. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
  75. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +100 -25
  76. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  77. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +30 -14
  78. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +1 -1
  79. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  80. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
  81. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +167 -0
  82. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
  83. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +40 -31
  84. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +4 -0
  85. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +1049 -0
  86. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +4 -0
  87. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +464 -0
  88. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +4 -0
  89. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +1147 -0
  90. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +4 -0
  91. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +488 -0
  92. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  93. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  94. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +2 -110
  95. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  96. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +94 -0
  97. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  98. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  99. package/artifacts/contracts/registry/Registry.sol/Registry.json +35 -146
  100. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  101. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +76 -20
  102. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  103. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +26 -34
  104. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  105. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +12 -12
  106. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +1 -1
  107. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  108. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  109. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  110. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  111. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  112. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  113. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +2 -2
  114. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  115. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +2 -2
  116. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  117. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +2 -2
  118. package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.dbg.json +1 -1
  119. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  120. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  121. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  122. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  123. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
  124. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
  125. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +4 -4
  126. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
  127. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +2 -2
  128. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
  129. package/artifacts/contracts/test/TestService.sol/TestService.json +9 -9
  130. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
  131. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
  132. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
  133. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
  134. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  135. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  136. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  137. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  138. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
  139. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
  140. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  141. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  142. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +26 -3
  143. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +1 -1
  144. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  145. package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +1 -1
  146. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +1 -1
  147. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
  148. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +2 -2
  149. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
  150. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
  151. package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +1 -1
  152. package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +1 -1
  153. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
  154. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
  155. package/contracts/components/Distribution.sol +12 -15
  156. package/contracts/components/IDistributionComponent.sol +0 -2
  157. package/contracts/components/IPoolComponent.sol +5 -1
  158. package/contracts/components/Pool.sol +35 -26
  159. package/contracts/components/Product.sol +33 -41
  160. package/contracts/instance/BundleManager.sol +129 -0
  161. package/contracts/instance/Cloneable.sol +46 -0
  162. package/contracts/instance/IInstance.sol +30 -7
  163. package/contracts/instance/IInstanceService.sol +3 -1
  164. package/contracts/instance/Instance.sol +26 -15
  165. package/contracts/instance/InstanceReader.sol +26 -1
  166. package/contracts/instance/InstanceService.sol +90 -16
  167. package/contracts/instance/InstanceServiceManager.sol +6 -5
  168. package/contracts/instance/ObjectManager.sol +95 -0
  169. package/contracts/instance/base/ComponentServiceBase.sol +96 -1
  170. package/contracts/instance/module/IBundle.sol +1 -0
  171. package/contracts/instance/module/ISetup.sol +3 -0
  172. package/contracts/instance/service/DistributionService.sol +12 -20
  173. package/contracts/instance/service/DistributionServiceManager.sol +6 -5
  174. package/contracts/instance/service/IPoolService.sol +16 -2
  175. package/contracts/instance/service/IProductService.sol +6 -3
  176. package/contracts/instance/service/PoolService.sol +287 -0
  177. package/contracts/instance/service/PoolServiceManager.sol +54 -0
  178. package/contracts/instance/service/ProductService.sol +570 -0
  179. package/contracts/instance/service/ProductServiceManager.sol +54 -0
  180. package/contracts/registry/IRegistry.sol +5 -18
  181. package/contracts/registry/IRegistryService.sol +28 -11
  182. package/contracts/registry/Registry.sol +4 -45
  183. package/contracts/registry/RegistryService.sol +30 -71
  184. package/contracts/shared/NftOwnable.sol +2 -4
  185. package/contracts/shared/Service.sol +1 -0
  186. package/contracts/types/NftIdSet.sol +26 -24
  187. package/contracts/types/RoleId.sol +2 -0
  188. package/package.json +1 -1
package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../build-info/12f88fa6a08bb4d5cfb1255c4df52f3e.json"
3
+ "buildInfo": "../../../../build-info/24127e23609fe109bc2a3151090d9147.json"
4
4
  }
package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../build-info/12f88fa6a08bb4d5cfb1255c4df52f3e.json"
3
+ "buildInfo": "../../../../build-info/24127e23609fe109bc2a3151090d9147.json"
4
4
  }
package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../build-info/12f88fa6a08bb4d5cfb1255c4df52f3e.json"
3
+ "buildInfo": "../../../../build-info/24127e23609fe109bc2a3151090d9147.json"
4
4
  }
package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../build-info/12f88fa6a08bb4d5cfb1255c4df52f3e.json"
3
+ "buildInfo": "../../../../build-info/24127e23609fe109bc2a3151090d9147.json"
4
4
  }
package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../build-info/12f88fa6a08bb4d5cfb1255c4df52f3e.json"
3
+ "buildInfo": "../../../../build-info/24127e23609fe109bc2a3151090d9147.json"
4
4
  }
package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../build-info/12f88fa6a08bb4d5cfb1255c4df52f3e.json"
3
+ "buildInfo": "../../../../build-info/24127e23609fe109bc2a3151090d9147.json"
4
4
  }
package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../build-info/12f88fa6a08bb4d5cfb1255c4df52f3e.json"
3
+ "buildInfo": "../../../../build-info/24127e23609fe109bc2a3151090d9147.json"
4
4
  }
package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../build-info/12f88fa6a08bb4d5cfb1255c4df52f3e.json"
3
+ "buildInfo": "../../../../build-info/24127e23609fe109bc2a3151090d9147.json"
4
4
  }
package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../build-info/12f88fa6a08bb4d5cfb1255c4df52f3e.json"
3
+ "buildInfo": "../../../../build-info/24127e23609fe109bc2a3151090d9147.json"
4
4
  }
package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../build-info/12f88fa6a08bb4d5cfb1255c4df52f3e.json"
3
+ "buildInfo": "../../../../build-info/24127e23609fe109bc2a3151090d9147.json"
4
4
  }
package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../build-info/12f88fa6a08bb4d5cfb1255c4df52f3e.json"
3
+ "buildInfo": "../../../../build-info/24127e23609fe109bc2a3151090d9147.json"
4
4
  }
package/artifacts/contracts/instance/AccessManagedSimple.sol/AccessManagedSimple.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/12f88fa6a08bb4d5cfb1255c4df52f3e.json"
3
+ "buildInfo": "../../../build-info/24127e23609fe109bc2a3151090d9147.json"
4
4
  }
package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/12f88fa6a08bb4d5cfb1255c4df52f3e.json"
3
+ "buildInfo": "../../../build-info/24127e23609fe109bc2a3151090d9147.json"
4
4
  }
package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json ADDED
@@ -0,0 +1,4 @@
1
+ {
2
+ "_format": "hh-sol-dbg-1",
3
+ "buildInfo": "../../../build-info/24127e23609fe109bc2a3151090d9147.json"
4
+ }