@etherisc/gif-next 0.0.2-ebbe63d → 0.0.2-efdb520-159
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +220 -1
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +4 -0
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +174 -0
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +4 -0
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +174 -0
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +4 -0
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +356 -0
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +4 -0
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +279 -0
- package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +4 -0
- package/artifacts/contracts/components/Pool.sol/Pool.json +387 -0
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +4 -0
- package/artifacts/contracts/components/Product.sol/Product.json +305 -0
- package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +4 -0
- package/artifacts/contracts/experiment/errors/Require.sol/Require.json +105 -0
- package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +4 -0
- package/artifacts/contracts/experiment/errors/Revert.sol/Revert.json +105 -0
- package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +4 -0
- package/artifacts/contracts/experiment/inheritance/A.sol/A.json +128 -0
- package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +4 -0
- package/artifacts/contracts/experiment/inheritance/A.sol/AShared.json +42 -0
- package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +4 -0
- package/artifacts/contracts/experiment/inheritance/B.sol/B.json +76 -0
- package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +4 -0
- package/artifacts/contracts/experiment/inheritance/C.sol/C.json +89 -0
- package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +4 -0
- package/artifacts/contracts/experiment/inheritance/IA.sol/IA.json +128 -0
- package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +4 -0
- package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.json +37 -0
- package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +4 -0
- package/artifacts/contracts/experiment/inheritance/IB.sol/IB.json +50 -0
- package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +4 -0
- package/artifacts/contracts/experiment/inheritance/IC.sol/IC.json +63 -0
- package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +4 -0
- package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +59 -0
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +4 -0
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.json +124 -0
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +4 -0
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.json +74 -0
- package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +4 -0
- package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +124 -0
- package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +4 -0
- package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +207 -0
- package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +4 -0
- package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.json +10 -0
- package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +4 -0
- package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.json +10 -0
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +4 -0
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +2022 -0
- package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.dbg.json +4 -0
- package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.json +24 -0
- package/artifacts/contracts/instance/IServiceLinked.sol/IServiceLinked.dbg.json +4 -0
- package/artifacts/contracts/instance/IServiceLinked.sol/IServiceLinked.json +50 -0
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +4 -0
- package/artifacts/contracts/instance/Instance.sol/Instance.json +2288 -0
- package/artifacts/contracts/instance/InstanceBase.sol/InstanceBase.dbg.json +4 -0
- package/artifacts/contracts/instance/InstanceBase.sol/InstanceBase.json +313 -0
- package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.dbg.json +4 -0
- package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.json +333 -0
- package/artifacts/contracts/instance/module/access/IAccess.sol/IAccess.dbg.json +4 -0
- package/artifacts/contracts/instance/module/access/IAccess.sol/IAccess.json +10 -0
- package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.dbg.json +4 -0
- package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.json +333 -0
- package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.dbg.json +4 -0
- package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.json +276 -0
- package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundle.dbg.json +4 -0
- package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundle.json +10 -0
- package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.dbg.json +4 -0
- package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.json +276 -0
- package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.dbg.json +4 -0
- package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.json +188 -0
- package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.dbg.json +4 -0
- package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.json +10 -0
- package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.dbg.json +4 -0
- package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.json +188 -0
- package/artifacts/contracts/instance/module/lifecycle/ILifecycle.sol/ILifecycle.dbg.json +4 -0
- package/artifacts/contracts/instance/module/lifecycle/ILifecycle.sol/ILifecycle.json +134 -0
- package/artifacts/contracts/instance/module/lifecycle/ILifecycle.sol/ILifecycleModule.dbg.json +4 -0
- package/artifacts/contracts/instance/module/lifecycle/ILifecycle.sol/ILifecycleModule.json +182 -0
- package/artifacts/contracts/instance/module/lifecycle/LifecycleModule.sol/LifecycleModule.dbg.json +4 -0
- package/artifacts/contracts/instance/module/lifecycle/LifecycleModule.sol/LifecycleModule.json +221 -0
- package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicy.dbg.json +4 -0
- package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicy.json +10 -0
- package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.dbg.json +4 -0
- package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.json +261 -0
- package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.dbg.json +4 -0
- package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.json +261 -0
- package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.dbg.json +4 -0
- package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.json +10 -0
- package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.dbg.json +4 -0
- package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.json +149 -0
- package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.dbg.json +4 -0
- package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.json +149 -0
- package/artifacts/contracts/instance/module/product/IProductModule.sol/IProductModule.dbg.json +4 -0
- package/artifacts/contracts/instance/module/product/IProductModule.sol/IProductModule.json +10 -0
- package/artifacts/contracts/instance/module/product/ProductModule.sol/ProductModule.dbg.json +4 -0
- package/artifacts/contracts/instance/module/product/ProductModule.sol/ProductModule.json +10 -0
- package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasury.dbg.json +4 -0
- package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasury.json +10 -0
- package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.dbg.json +4 -0
- package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.json +538 -0
- package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.dbg.json +4 -0
- package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.json +76 -0
- package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +4 -0
- package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.json +538 -0
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +519 -0
- package/artifacts/contracts/instance/service/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ComponentServiceBase.sol/ComponentServiceBase.json +300 -0
- package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.json +364 -0
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +376 -0
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +477 -0
- package/artifacts/contracts/instance/service/IService.sol/IService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IService.sol/IService.json +300 -0
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +499 -0
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +685 -0
- package/artifacts/contracts/instance/service/ServiceBase.sol/ServiceBase.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ServiceBase.sol/ServiceBase.json +300 -0
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +4 -0
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +597 -0
- package/artifacts/contracts/registry/IChainNft.sol/IChainNft.dbg.json +4 -0
- package/artifacts/contracts/registry/IChainNft.sol/IChainNft.json +452 -0
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +4 -0
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +305 -0
- package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.dbg.json +4 -0
- package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.json +24 -0
- package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +4 -0
- package/artifacts/contracts/registry/Registry.sol/Registry.json +472 -0
- package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +4 -0
- package/artifacts/contracts/shared/ERC165.sol/ERC165.json +35 -0
- package/artifacts/contracts/shared/IOwnable.sol/IOwnable.dbg.json +4 -0
- package/artifacts/contracts/shared/IOwnable.sol/IOwnable.json +24 -0
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +4 -0
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +121 -0
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +4 -0
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +164 -0
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +4 -0
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +121 -0
- package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +4 -0
- package/artifacts/contracts/shared/Versionable.sol/Versionable.json +164 -0
- package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +4 -0
- package/artifacts/contracts/test/TestFee.sol/TestFee.json +95 -0
- package/artifacts/contracts/test/TestPool.sol/TestPool.dbg.json +4 -0
- package/artifacts/contracts/test/TestPool.sol/TestPool.json +387 -0
- package/artifacts/contracts/test/TestProduct.sol/TestProduct.dbg.json +4 -0
- package/artifacts/contracts/test/TestProduct.sol/TestProduct.json +393 -0
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +4 -0
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +137 -0
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +4 -0
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +82 -0
- package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +4 -0
- package/artifacts/contracts/test/TestService.sol/TestService.json +407 -0
- package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +4 -0
- package/artifacts/contracts/test/TestToken.sol/TestUsdc.json +338 -0
- package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +4 -0
- package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +222 -0
- package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +4 -0
- package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +230 -0
- package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +4 -0
- package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.json +10 -0
- package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +4 -0
- package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.json +174 -0
- package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +4 -0
- package/artifacts/contracts/types/ChainId.sol/ChainIdLib.json +10 -0
- package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +4 -0
- package/artifacts/contracts/types/NftId.sol/NftIdLib.json +92 -0
- package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +4 -0
- package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +10 -0
- package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +4 -0
- package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +92 -0
- package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +4 -0
- package/artifacts/contracts/types/StateId.sol/StateIdLib.json +92 -0
- package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +4 -0
- package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +236 -0
- package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.dbg.json +4 -0
- package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.json +453 -0
- package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +4 -0
- package/artifacts/contracts/types/Version.sol/VersionLib.json +78 -0
- package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +4 -0
- package/artifacts/contracts/types/Version.sol/VersionPartLib.json +30 -0
- package/contracts/components/BaseComponent.sol +89 -0
- package/contracts/components/IBaseComponent.sol +19 -0
- package/contracts/components/IPoolComponent.sol +57 -0
- package/contracts/components/IProductComponent.sol +19 -0
- package/contracts/components/Pool.sol +174 -0
- package/contracts/components/Product.sol +117 -0
- package/contracts/experiment/errors/Require.sol +38 -0
- package/contracts/experiment/errors/Revert.sol +44 -0
- package/contracts/experiment/inheritance/A.sol +53 -0
- package/contracts/experiment/inheritance/B.sol +28 -0
- package/contracts/experiment/inheritance/C.sol +34 -0
- package/contracts/experiment/inheritance/IA.sol +13 -0
- package/contracts/experiment/inheritance/IB.sol +10 -0
- package/contracts/experiment/inheritance/IC.sol +12 -0
- package/contracts/experiment/statemachine/Dummy.sol +27 -0
- package/contracts/experiment/statemachine/ISM.sol +25 -0
- package/contracts/experiment/statemachine/README.md +112 -0
- package/contracts/experiment/statemachine/SM.sol +57 -0
- package/contracts/experiment/statemachine/SimpleStateMachine.sol +31 -0
- package/contracts/experiment/types/TypeA.sol +47 -0
- package/contracts/experiment/types/TypeB.sol +29 -0
- package/contracts/instance/IInstance.sol +50 -0
- package/contracts/instance/IInstanceLinked.sol +8 -0
- package/contracts/instance/IServiceLinked.sol +12 -0
- package/contracts/instance/Instance.sol +62 -0
- package/contracts/instance/InstanceBase.sol +74 -0
- package/contracts/instance/module/access/Access.sol +149 -0
- package/contracts/instance/module/access/IAccess.sol +53 -0
- package/contracts/instance/module/bundle/BundleModule.sol +228 -0
- package/contracts/instance/module/bundle/IBundle.sol +53 -0
- package/contracts/instance/module/component/ComponentModule.sol +104 -0
- package/contracts/instance/module/component/IComponent.sol +53 -0
- package/contracts/instance/module/lifecycle/ILifecycle.sol +47 -0
- package/contracts/instance/module/lifecycle/LifecycleModule.sol +89 -0
- package/contracts/instance/module/policy/IPolicy.sol +60 -0
- package/contracts/instance/module/policy/PolicyModule.sol +84 -0
- package/contracts/instance/module/pool/IPoolModule.sol +41 -0
- package/contracts/instance/module/pool/PoolModule.sol +87 -0
- package/contracts/instance/module/product/IProductModule.sol +6 -0
- package/contracts/instance/module/product/ProductModule.sol +8 -0
- package/contracts/instance/module/treasury/ITreasury.sol +104 -0
- package/contracts/instance/module/treasury/TokenHandler.sol +48 -0
- package/contracts/instance/module/treasury/TreasuryModule.sol +148 -0
- package/contracts/instance/service/ComponentOwnerService.sol +174 -0
- package/contracts/instance/service/ComponentServiceBase.sol +41 -0
- package/contracts/instance/service/IComponentOwnerService.sol +22 -0
- package/contracts/instance/service/IPoolService.sol +30 -0
- package/contracts/instance/service/IProductService.sol +58 -0
- package/contracts/instance/service/IService.sol +15 -0
- package/contracts/instance/service/PoolService.sol +98 -0
- package/contracts/instance/service/ProductService.sol +358 -0
- package/contracts/instance/service/ServiceBase.sol +39 -0
- package/contracts/registry/ChainNft.sol +159 -0
- package/contracts/registry/IChainNft.sol +21 -0
- package/contracts/registry/IRegistry.sol +57 -0
- package/contracts/registry/IRegistryLinked.sol +8 -0
- package/contracts/registry/Registry.sol +381 -0
- package/contracts/shared/ERC165.sol +21 -0
- package/contracts/shared/IOwnable.sol +6 -0
- package/contracts/shared/IRegisterable.sol +24 -0
- package/contracts/shared/IVersionable.sol +52 -0
- package/contracts/shared/Registerable.sol +86 -0
- package/contracts/shared/Versionable.sol +92 -0
- package/contracts/test/TestFee.sol +25 -0
- package/contracts/test/TestPool.sol +22 -0
- package/contracts/test/TestProduct.sol +44 -0
- package/contracts/test/TestRegisterable.sol +19 -0
- package/contracts/test/TestRoleId.sol +14 -0
- package/contracts/test/TestService.sol +35 -0
- package/contracts/{Dip.sol → test/TestToken.sol} +5 -5
- package/contracts/test/TestVersion.sol +47 -0
- package/contracts/test/TestVersionable.sol +20 -0
- package/contracts/types/AddressSet.sol +58 -0
- package/contracts/types/Blocknumber.sol +118 -0
- package/contracts/types/ChainId.sol +38 -0
- package/contracts/types/Fee.sol +32 -0
- package/contracts/types/NftId.sol +57 -0
- package/contracts/types/NftIdSet.sol +60 -0
- package/contracts/types/ObjectType.sol +115 -0
- package/contracts/types/RoleId.sol +36 -0
- package/contracts/types/StateId.sol +95 -0
- package/contracts/types/Timestamp.sol +123 -0
- package/contracts/types/UFixed.sol +206 -0
- package/contracts/types/Version.sol +91 -0
- package/package.json +24 -9
- package/artifacts/contracts/Dip.sol/DIP.dbg.json +0 -4
- package/artifacts/contracts/Dip.sol/DIP.json +0 -338
- package/artifacts/contracts/Lock.sol/Lock.dbg.json +0 -4
- package/artifacts/contracts/Lock.sol/Lock.json +0 -74
- package/contracts/Lock.sol +0 -34
package/README.md
CHANGED
@@ -1,8 +1,16 @@
|
|
1
1
|
# gif-next (Generic Insurance Framework next version)
|
2
2
|
|
3
|
+
## Submodules checkout
|
4
|
+
|
5
|
+
This repository uses submodules. To checkout or update to the latest submodules, run the following command after updating to any revision (or checking out the repository)
|
6
|
+
|
7
|
+
```shell
|
8
|
+
git submodule update --recursive
|
9
|
+
```
|
10
|
+
|
3
11
|
## Hardhat
|
4
12
|
|
5
|
-
### Commands
|
13
|
+
### NPM Commands
|
6
14
|
|
7
15
|
```shell
|
8
16
|
npm run build
|
@@ -13,6 +21,46 @@ npm run test-with-gas
|
|
13
21
|
npm run coverage
|
14
22
|
```
|
15
23
|
|
24
|
+
### Deployment
|
25
|
+
|
26
|
+
```
|
27
|
+
hh run --network <networkname> scripts/deploy.ts
|
28
|
+
```
|
29
|
+
|
30
|
+
Networks:
|
31
|
+
- hardhat (dynamically created network - https://hardhat.org/hardhat-network/docs/overview)
|
32
|
+
- anvil (anvsil chain running in container next when using devcontainer)
|
33
|
+
- mumbai (polygon testnet, requires WEB3_INFURA_PROJECT_ID)
|
34
|
+
- mainnet (polygon mainnet, requires WEB3_INFURA_PROJECT_ID)
|
35
|
+
|
36
|
+
|
37
|
+
#### Deply all script
|
38
|
+
|
39
|
+
The deploy all script will deploy all required contracts and create a test instance with a test product and a test pool.
|
40
|
+
|
41
|
+
```
|
42
|
+
hh run --network <networkname> scripts/deploy_all.ts
|
43
|
+
```
|
44
|
+
|
45
|
+
Environment variables:
|
46
|
+
|
47
|
+
- `SKIP_VERIFICATION` set to `true` to skip etherscan verification (required for ganacht and anvil)
|
48
|
+
- `WEB3_INFURA_PROJECT_ID` set to infura project id (required for mumbai and mainnet)
|
49
|
+
- `WALLET_MNEMONIC` the mnemonic of the wallet to use for deployment (required for mumbai and mainnet)
|
50
|
+
- `ETHERSCAN_API_KEY` `POLYGONSCAN_API_KEY` the api key for etherscan/polygonscan (required for mumbai and mainnet)
|
51
|
+
|
52
|
+
|
53
|
+
### Console
|
54
|
+
|
55
|
+
```
|
56
|
+
hh console --network <networkname>
|
57
|
+
|
58
|
+
me = hre.ethers.Wallet.fromPhrase('...')
|
59
|
+
provider = hre.ethers.provider
|
60
|
+
await provider.getBalance(me)
|
61
|
+
```
|
62
|
+
|
63
|
+
|
16
64
|
### Documentation
|
17
65
|
|
18
66
|
https://hardhat.org/hardhat-runner/docs/guides/compile-contracts
|
@@ -24,10 +72,181 @@ https://hardhat.org/hardhat-runner/docs/guides/compile-contracts
|
|
24
72
|
```shell
|
25
73
|
forge build
|
26
74
|
|
75
|
+
# contract sizes
|
76
|
+
forge build --sizes | grep Instance
|
77
|
+
|
27
78
|
forge test
|
79
|
+
|
80
|
+
# run single test case
|
81
|
+
forge test --mt test_decimals
|
82
|
+
|
83
|
+
# run single test case with substantial logginglogging
|
84
|
+
# to include logs as well use -vvvvv
|
85
|
+
forge test -vvvv --mt test_decimals
|
86
|
+
|
87
|
+
# provide gas report for a single test
|
88
|
+
forge test --mt test_decimals --gas-report
|
89
|
+
|
90
|
+
forge coverage
|
91
|
+
```
|
92
|
+
|
93
|
+
Chisel session
|
94
|
+
```typescript
|
95
|
+
import "./contracts/components/Component.sol";
|
96
|
+
import "./contracts/components/IPool.sol";
|
97
|
+
import "./contracts/components/IProduct.sol";
|
98
|
+
import "./contracts/components/Pool.sol";
|
99
|
+
import "./contracts/components/Product.sol";
|
100
|
+
import "./contracts/instance/access/Access.sol";
|
101
|
+
import "./contracts/instance/access/IAccess.sol";
|
102
|
+
import "./contracts/instance/component/ComponentModule.sol";
|
103
|
+
import "./contracts/instance/component/IComponent.sol";
|
104
|
+
import "./contracts/instance/IInstance.sol";
|
105
|
+
import "./contracts/instance/policy/IPolicy.sol";
|
106
|
+
import "./contracts/instance/policy/PolicyModule.sol";
|
107
|
+
import "./contracts/instance/product/IProductService.sol";
|
108
|
+
import "./contracts/instance/product/ProductService.sol";
|
109
|
+
import "./contracts/registry/IRegistry.sol";
|
110
|
+
|
111
|
+
import {Instance} from "./contracts/instance/Instance.sol";
|
112
|
+
import {Registry} from "./contracts/registry/Registry.sol";
|
113
|
+
import {DeployAll} from "./scripts/DeployAll.s.sol";
|
114
|
+
import {TestPool} from "./test_forge/mock/TestPool.sol";
|
115
|
+
import {TestProduct} from "./test_forge/mock/TestProduct.sol";
|
116
|
+
|
117
|
+
string memory instanceOwnerName = "instanceOwner";
|
118
|
+
address instanceOwner = vm.addr(uint256(keccak256(abi.encodePacked(instanceOwnerName))));
|
119
|
+
|
120
|
+
string memory productOwnerName = "productOwner";
|
121
|
+
address productOwner = vm.addr(uint256(keccak256(abi.encodePacked(productOwnerName))));
|
122
|
+
|
123
|
+
string memory poolOwnerName = "poolOwner";
|
124
|
+
address poolOwner = vm.addr(uint256(keccak256(abi.encodePacked(poolOwnerName))));
|
125
|
+
|
126
|
+
string memory customerName = "customer";
|
127
|
+
address customer = vm.addr(uint256(keccak256(abi.encodePacked(customerName))));
|
128
|
+
|
129
|
+
DeployAll deployer = new DeployAll();
|
130
|
+
(
|
131
|
+
Registry registry,
|
132
|
+
Instance instance,
|
133
|
+
TestProduct product,
|
134
|
+
TestPool pool
|
135
|
+
) = deployer.run(
|
136
|
+
instanceOwner,
|
137
|
+
productOwner,
|
138
|
+
poolOwner);
|
139
|
+
|
140
|
+
ProductService ps = ProductService(address(registry));
|
141
|
+
|
142
|
+
uint256 bundleNftId = 99;
|
143
|
+
uint256 sumInsuredAmount = 1000*10**6;
|
144
|
+
uint256 premiumAmount = 110*10**6;
|
145
|
+
uint256 lifetime =365*24*3600;
|
146
|
+
uint256 policyNftId = ps.createApplicationForBundle(customer, bundleNftId, sumInsuredAmount, premiumAmount, lifetime);
|
147
|
+
|
148
|
+
```
|
149
|
+
### Library Linking
|
150
|
+
|
151
|
+
https://ethereum.stackexchange.com/questions/153411/does-foundry-support-dynamical-library-linking-in-solidity
|
152
|
+
|
153
|
+
```toml
|
154
|
+
# foundry.toml
|
155
|
+
|
156
|
+
[profile.default]
|
157
|
+
# expected format(example below): libraries = ["<path>:<lib name>:<address>"]
|
158
|
+
libraries = ["src/libraries/MyLibrary.sol:MyLibrary:0x..."]
|
28
159
|
```
|
29
160
|
|
30
161
|
### Documentation
|
31
162
|
|
32
163
|
https://book.getfoundry.sh/reference/
|
33
164
|
|
165
|
+
## Style Guide
|
166
|
+
|
167
|
+
Solidity code is to be written according to the [Solidity Style Guide](https://docs.soliditylang.org/en/latest/style-guide.html).
|
168
|
+
|
169
|
+
Documentation of the code should be written inline using [NatSpec](https://docs.soliditylang.org/en/latest/natspec-format.html).
|
170
|
+
|
171
|
+
### Naming conventions
|
172
|
+
|
173
|
+
Additionally, we use the following naming conventions:
|
174
|
+
|
175
|
+
- Function arguments and return types: If using custom data types, make the name include the type by appending the Type to the argument name, e.g. `function getInfo(NftId bundleNftId)` instead of `function getInfo(NftId bundleId)`. Background: Custom data types are lost when using the ABI or Typescript binding classes (e.g. instead of `NftID` a `uint96` is used), so the type needs to be included in the name to make it clear what the argument is without having to look at the documentation or checking the solidity source code.
|
176
|
+
- When naming a field or an attribute `id` and the context is not clear, call it `nftId` instead so its clear what type if id it is as there will be multiple ids for different kind of objects. Example: if you the function has a bundle nft id and a policy nft id as arguments, call them `bundleNftId` and `policyNftId` instead of `id` and `policyId`. In case of doubt, be a bit more verbose for the sake of clarity.
|
177
|
+
- When naming things, remember that the code will likely be used in Javascript/Typescript as well, so avoid names that are reserved in Javascript/Typescript. A list of reserved words in Javascript can be found [here](https://www.w3schools.com/js/js_reserved.asp) and a list of reserved words in Typescript can be found [here](https://www.tektutorialshub.com/typescript/identifiers-keywords-in-typescript/).
|
178
|
+
|
179
|
+
### Automatic code formatting
|
180
|
+
|
181
|
+
We use prettier and the solidity plugin to format the code automatically.
|
182
|
+
The plugin is configured to use the style guide mentioned above.
|
183
|
+
To execute format checks run `npm run styleCheck`.
|
184
|
+
To execute formatting run `npm run styleFix`.
|
185
|
+
|
186
|
+
### Linting
|
187
|
+
|
188
|
+
We use solhint to lint the code.
|
189
|
+
To execute linting run `npm run lint`.
|
190
|
+
|
191
|
+
|
192
|
+
### Adding Brownie (Legacy)
|
193
|
+
|
194
|
+
python3 is already installed
|
195
|
+
|
196
|
+
```bash
|
197
|
+
npm install -g ganache
|
198
|
+
sudo apt update
|
199
|
+
sudo apt install python3-pip
|
200
|
+
pip install eth-brownie
|
201
|
+
brownie pm install OpenZeppelin/openzeppelin-contracts@4.9.3
|
202
|
+
```
|
203
|
+
|
204
|
+
```bash
|
205
|
+
brownie compile --all
|
206
|
+
brownie console
|
207
|
+
```
|
208
|
+
|
209
|
+
```python
|
210
|
+
registry_owner = accounts[0]
|
211
|
+
instance_owner = accounts[1]
|
212
|
+
product_owner = accounts[2]
|
213
|
+
|
214
|
+
# deploy libs and helper contracts
|
215
|
+
nft_id_lib = NftIdLib.deploy({'from': registry_owner})
|
216
|
+
ufixed_math_lib = UFixedMathLib.deploy({'from': registry_owner})
|
217
|
+
test_fee = TestFee.deploy({'from': registry_owner})
|
218
|
+
|
219
|
+
# deploy registry and a token
|
220
|
+
registry = Registry.deploy({'from': registry_owner})
|
221
|
+
nft = ChainNft.deploy(registry, {'from': registry_owner})
|
222
|
+
registry.initialize(nft, {'from': registry_owner})
|
223
|
+
token = TestUsdc.deploy({'from': registry_owner})
|
224
|
+
|
225
|
+
# deploy services
|
226
|
+
component_owner_service = ComponentOwnerService.deploy(registry, {'from': registry_owner})
|
227
|
+
product_service = ProductService.deploy(registry, {'from': registry_owner})
|
228
|
+
|
229
|
+
# deploy an instance
|
230
|
+
instance = Instance.deploy(registry, component_owner_service, product_service, {'from': instance_owner})
|
231
|
+
|
232
|
+
# deploy product
|
233
|
+
pool = TestPool.deploy(registry, instance, token, {'from': product_owner})
|
234
|
+
policy_fee = test_fee.createFee(1, -1, 0)
|
235
|
+
product = TestProduct.deploy(registry, instance, token, pool, policy_fee, {'from': product_owner})
|
236
|
+
|
237
|
+
# grant roles
|
238
|
+
pool_owner_role = instance.getRoleForName("PoolOwner")
|
239
|
+
product_owner_role = instance.getRoleForName("ProductOwner")
|
240
|
+
instance.grantRole(pool_owner_role, product_owner, {'from': instance_owner})
|
241
|
+
instance.grantRole(product_owner_role, product_owner, {'from': instance_owner})
|
242
|
+
|
243
|
+
# register objects
|
244
|
+
instance.register()
|
245
|
+
component_owner_service.register(pool, {'from': product_owner})
|
246
|
+
component_owner_service.register(product, {'from': product_owner})
|
247
|
+
|
248
|
+
instance_id = instance.getNftId()
|
249
|
+
pool_id = pool.getNftId()
|
250
|
+
product_id = product.getNftId()
|
251
|
+
```
|
252
|
+
|
@@ -0,0 +1,174 @@
|
|
1
|
+
{
|
2
|
+
"_format": "hh-sol-artifact-1",
|
3
|
+
"contractName": "BaseComponent",
|
4
|
+
"sourceName": "contracts/components/BaseComponent.sol",
|
5
|
+
"abi": [
|
6
|
+
{
|
7
|
+
"inputs": [],
|
8
|
+
"name": "getData",
|
9
|
+
"outputs": [
|
10
|
+
{
|
11
|
+
"internalType": "bytes",
|
12
|
+
"name": "data",
|
13
|
+
"type": "bytes"
|
14
|
+
}
|
15
|
+
],
|
16
|
+
"stateMutability": "view",
|
17
|
+
"type": "function"
|
18
|
+
},
|
19
|
+
{
|
20
|
+
"inputs": [],
|
21
|
+
"name": "getInstance",
|
22
|
+
"outputs": [
|
23
|
+
{
|
24
|
+
"internalType": "contract IInstance",
|
25
|
+
"name": "instance",
|
26
|
+
"type": "address"
|
27
|
+
}
|
28
|
+
],
|
29
|
+
"stateMutability": "view",
|
30
|
+
"type": "function"
|
31
|
+
},
|
32
|
+
{
|
33
|
+
"inputs": [],
|
34
|
+
"name": "getNftId",
|
35
|
+
"outputs": [
|
36
|
+
{
|
37
|
+
"internalType": "NftId",
|
38
|
+
"name": "nftId",
|
39
|
+
"type": "uint96"
|
40
|
+
}
|
41
|
+
],
|
42
|
+
"stateMutability": "view",
|
43
|
+
"type": "function"
|
44
|
+
},
|
45
|
+
{
|
46
|
+
"inputs": [],
|
47
|
+
"name": "getOwner",
|
48
|
+
"outputs": [
|
49
|
+
{
|
50
|
+
"internalType": "address",
|
51
|
+
"name": "owner",
|
52
|
+
"type": "address"
|
53
|
+
}
|
54
|
+
],
|
55
|
+
"stateMutability": "view",
|
56
|
+
"type": "function"
|
57
|
+
},
|
58
|
+
{
|
59
|
+
"inputs": [],
|
60
|
+
"name": "getParentNftId",
|
61
|
+
"outputs": [
|
62
|
+
{
|
63
|
+
"internalType": "NftId",
|
64
|
+
"name": "nftId",
|
65
|
+
"type": "uint96"
|
66
|
+
}
|
67
|
+
],
|
68
|
+
"stateMutability": "view",
|
69
|
+
"type": "function"
|
70
|
+
},
|
71
|
+
{
|
72
|
+
"inputs": [],
|
73
|
+
"name": "getRegistry",
|
74
|
+
"outputs": [
|
75
|
+
{
|
76
|
+
"internalType": "contract IRegistry",
|
77
|
+
"name": "registry",
|
78
|
+
"type": "address"
|
79
|
+
}
|
80
|
+
],
|
81
|
+
"stateMutability": "view",
|
82
|
+
"type": "function"
|
83
|
+
},
|
84
|
+
{
|
85
|
+
"inputs": [],
|
86
|
+
"name": "getToken",
|
87
|
+
"outputs": [
|
88
|
+
{
|
89
|
+
"internalType": "contract IERC20Metadata",
|
90
|
+
"name": "token",
|
91
|
+
"type": "address"
|
92
|
+
}
|
93
|
+
],
|
94
|
+
"stateMutability": "view",
|
95
|
+
"type": "function"
|
96
|
+
},
|
97
|
+
{
|
98
|
+
"inputs": [],
|
99
|
+
"name": "getType",
|
100
|
+
"outputs": [
|
101
|
+
{
|
102
|
+
"internalType": "ObjectType",
|
103
|
+
"name": "objectType",
|
104
|
+
"type": "uint8"
|
105
|
+
}
|
106
|
+
],
|
107
|
+
"stateMutability": "pure",
|
108
|
+
"type": "function"
|
109
|
+
},
|
110
|
+
{
|
111
|
+
"inputs": [],
|
112
|
+
"name": "getWallet",
|
113
|
+
"outputs": [
|
114
|
+
{
|
115
|
+
"internalType": "address",
|
116
|
+
"name": "walletAddress",
|
117
|
+
"type": "address"
|
118
|
+
}
|
119
|
+
],
|
120
|
+
"stateMutability": "view",
|
121
|
+
"type": "function"
|
122
|
+
},
|
123
|
+
{
|
124
|
+
"inputs": [],
|
125
|
+
"name": "lock",
|
126
|
+
"outputs": [],
|
127
|
+
"stateMutability": "nonpayable",
|
128
|
+
"type": "function"
|
129
|
+
},
|
130
|
+
{
|
131
|
+
"inputs": [],
|
132
|
+
"name": "register",
|
133
|
+
"outputs": [
|
134
|
+
{
|
135
|
+
"internalType": "NftId",
|
136
|
+
"name": "componentId",
|
137
|
+
"type": "uint96"
|
138
|
+
}
|
139
|
+
],
|
140
|
+
"stateMutability": "nonpayable",
|
141
|
+
"type": "function"
|
142
|
+
},
|
143
|
+
{
|
144
|
+
"inputs": [
|
145
|
+
{
|
146
|
+
"internalType": "bytes4",
|
147
|
+
"name": "interfaceId",
|
148
|
+
"type": "bytes4"
|
149
|
+
}
|
150
|
+
],
|
151
|
+
"name": "supportsInterface",
|
152
|
+
"outputs": [
|
153
|
+
{
|
154
|
+
"internalType": "bool",
|
155
|
+
"name": "",
|
156
|
+
"type": "bool"
|
157
|
+
}
|
158
|
+
],
|
159
|
+
"stateMutability": "view",
|
160
|
+
"type": "function"
|
161
|
+
},
|
162
|
+
{
|
163
|
+
"inputs": [],
|
164
|
+
"name": "unlock",
|
165
|
+
"outputs": [],
|
166
|
+
"stateMutability": "nonpayable",
|
167
|
+
"type": "function"
|
168
|
+
}
|
169
|
+
],
|
170
|
+
"bytecode": "0x",
|
171
|
+
"deployedBytecode": "0x",
|
172
|
+
"linkReferences": {},
|
173
|
+
"deployedLinkReferences": {}
|
174
|
+
}
|
@@ -0,0 +1,174 @@
|
|
1
|
+
{
|
2
|
+
"_format": "hh-sol-artifact-1",
|
3
|
+
"contractName": "IBaseComponent",
|
4
|
+
"sourceName": "contracts/components/IBaseComponent.sol",
|
5
|
+
"abi": [
|
6
|
+
{
|
7
|
+
"inputs": [],
|
8
|
+
"name": "getData",
|
9
|
+
"outputs": [
|
10
|
+
{
|
11
|
+
"internalType": "bytes",
|
12
|
+
"name": "data",
|
13
|
+
"type": "bytes"
|
14
|
+
}
|
15
|
+
],
|
16
|
+
"stateMutability": "view",
|
17
|
+
"type": "function"
|
18
|
+
},
|
19
|
+
{
|
20
|
+
"inputs": [],
|
21
|
+
"name": "getInstance",
|
22
|
+
"outputs": [
|
23
|
+
{
|
24
|
+
"internalType": "contract IInstance",
|
25
|
+
"name": "instance",
|
26
|
+
"type": "address"
|
27
|
+
}
|
28
|
+
],
|
29
|
+
"stateMutability": "view",
|
30
|
+
"type": "function"
|
31
|
+
},
|
32
|
+
{
|
33
|
+
"inputs": [],
|
34
|
+
"name": "getNftId",
|
35
|
+
"outputs": [
|
36
|
+
{
|
37
|
+
"internalType": "NftId",
|
38
|
+
"name": "nftId",
|
39
|
+
"type": "uint96"
|
40
|
+
}
|
41
|
+
],
|
42
|
+
"stateMutability": "view",
|
43
|
+
"type": "function"
|
44
|
+
},
|
45
|
+
{
|
46
|
+
"inputs": [],
|
47
|
+
"name": "getOwner",
|
48
|
+
"outputs": [
|
49
|
+
{
|
50
|
+
"internalType": "address",
|
51
|
+
"name": "owner",
|
52
|
+
"type": "address"
|
53
|
+
}
|
54
|
+
],
|
55
|
+
"stateMutability": "view",
|
56
|
+
"type": "function"
|
57
|
+
},
|
58
|
+
{
|
59
|
+
"inputs": [],
|
60
|
+
"name": "getParentNftId",
|
61
|
+
"outputs": [
|
62
|
+
{
|
63
|
+
"internalType": "NftId",
|
64
|
+
"name": "nftId",
|
65
|
+
"type": "uint96"
|
66
|
+
}
|
67
|
+
],
|
68
|
+
"stateMutability": "view",
|
69
|
+
"type": "function"
|
70
|
+
},
|
71
|
+
{
|
72
|
+
"inputs": [],
|
73
|
+
"name": "getRegistry",
|
74
|
+
"outputs": [
|
75
|
+
{
|
76
|
+
"internalType": "contract IRegistry",
|
77
|
+
"name": "registry",
|
78
|
+
"type": "address"
|
79
|
+
}
|
80
|
+
],
|
81
|
+
"stateMutability": "view",
|
82
|
+
"type": "function"
|
83
|
+
},
|
84
|
+
{
|
85
|
+
"inputs": [],
|
86
|
+
"name": "getToken",
|
87
|
+
"outputs": [
|
88
|
+
{
|
89
|
+
"internalType": "contract IERC20Metadata",
|
90
|
+
"name": "token",
|
91
|
+
"type": "address"
|
92
|
+
}
|
93
|
+
],
|
94
|
+
"stateMutability": "view",
|
95
|
+
"type": "function"
|
96
|
+
},
|
97
|
+
{
|
98
|
+
"inputs": [],
|
99
|
+
"name": "getType",
|
100
|
+
"outputs": [
|
101
|
+
{
|
102
|
+
"internalType": "ObjectType",
|
103
|
+
"name": "objectType",
|
104
|
+
"type": "uint8"
|
105
|
+
}
|
106
|
+
],
|
107
|
+
"stateMutability": "pure",
|
108
|
+
"type": "function"
|
109
|
+
},
|
110
|
+
{
|
111
|
+
"inputs": [],
|
112
|
+
"name": "getWallet",
|
113
|
+
"outputs": [
|
114
|
+
{
|
115
|
+
"internalType": "address",
|
116
|
+
"name": "walletAddress",
|
117
|
+
"type": "address"
|
118
|
+
}
|
119
|
+
],
|
120
|
+
"stateMutability": "view",
|
121
|
+
"type": "function"
|
122
|
+
},
|
123
|
+
{
|
124
|
+
"inputs": [],
|
125
|
+
"name": "lock",
|
126
|
+
"outputs": [],
|
127
|
+
"stateMutability": "nonpayable",
|
128
|
+
"type": "function"
|
129
|
+
},
|
130
|
+
{
|
131
|
+
"inputs": [],
|
132
|
+
"name": "register",
|
133
|
+
"outputs": [
|
134
|
+
{
|
135
|
+
"internalType": "NftId",
|
136
|
+
"name": "nftId",
|
137
|
+
"type": "uint96"
|
138
|
+
}
|
139
|
+
],
|
140
|
+
"stateMutability": "nonpayable",
|
141
|
+
"type": "function"
|
142
|
+
},
|
143
|
+
{
|
144
|
+
"inputs": [
|
145
|
+
{
|
146
|
+
"internalType": "bytes4",
|
147
|
+
"name": "interfaceId",
|
148
|
+
"type": "bytes4"
|
149
|
+
}
|
150
|
+
],
|
151
|
+
"name": "supportsInterface",
|
152
|
+
"outputs": [
|
153
|
+
{
|
154
|
+
"internalType": "bool",
|
155
|
+
"name": "",
|
156
|
+
"type": "bool"
|
157
|
+
}
|
158
|
+
],
|
159
|
+
"stateMutability": "view",
|
160
|
+
"type": "function"
|
161
|
+
},
|
162
|
+
{
|
163
|
+
"inputs": [],
|
164
|
+
"name": "unlock",
|
165
|
+
"outputs": [],
|
166
|
+
"stateMutability": "nonpayable",
|
167
|
+
"type": "function"
|
168
|
+
}
|
169
|
+
],
|
170
|
+
"bytecode": "0x",
|
171
|
+
"deployedBytecode": "0x",
|
172
|
+
"linkReferences": {},
|
173
|
+
"deployedLinkReferences": {}
|
174
|
+
}
|