@etherisc/gif-next 0.0.2-c4efd5e → 0.0.2-c630f3f-038
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +10 -2
- package/artifacts/contracts/components/Component.sol/Component.dbg.json +1 -1
- package/artifacts/contracts/components/Component.sol/Component.json +28 -2
- package/artifacts/contracts/components/Component.sol/InstanceLinked.dbg.json +1 -1
- package/artifacts/contracts/components/Component.sol/InstanceLinked.json +2 -2
- package/artifacts/contracts/components/IPool.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IPool.sol/IPoolComponent.json +78 -2
- package/artifacts/contracts/components/IProduct.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IProduct.sol/IProductComponent.json +32 -150
- package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/components/Pool.sol/Pool.json +121 -6
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/components/Product.sol/Product.json +121 -6
- package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +1 -1
- package/artifacts/contracts/experiment/errors/Require.sol/Require.json +2 -2
- package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +1 -1
- package/artifacts/contracts/experiment/errors/Revert.sol/Revert.json +2 -2
- package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/A.sol/A.json +2 -2
- package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/A.sol/AShared.json +2 -2
- package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +1 -1
- 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 +1 -1
- package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.json +2 -2
- package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
- package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.json +2 -2
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +686 -99
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +757 -99
- package/artifacts/contracts/instance/access/Access.sol/AccessModule.dbg.json +1 -1
- package/artifacts/contracts/instance/access/IAccess.sol/IAccess.dbg.json +1 -1
- package/artifacts/contracts/instance/access/IAccess.sol/IAccessCheckRole.dbg.json +1 -1
- package/artifacts/contracts/instance/access/IAccess.sol/IAccessComponentTypeRoles.dbg.json +1 -1
- package/artifacts/contracts/instance/access/IAccess.sol/IAccessModule.dbg.json +1 -1
- package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentModule.dbg.json +1 -1
- package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentModule.json +14 -42
- package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentOwnerService.dbg.json +1 -1
- package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentOwnerService.json +65 -10
- package/artifacts/contracts/instance/component/IComponent.sol/IComponent.dbg.json +1 -1
- package/artifacts/contracts/instance/component/IComponent.sol/IComponentContract.dbg.json +1 -1
- package/artifacts/contracts/instance/component/IComponent.sol/IComponentContract.json +28 -2
- package/artifacts/contracts/instance/component/IComponent.sol/IComponentModule.dbg.json +1 -1
- package/artifacts/contracts/instance/component/IComponent.sol/IComponentModule.json +12 -40
- package/artifacts/contracts/instance/component/IComponent.sol/IComponentOwnerService.dbg.json +1 -1
- package/artifacts/contracts/instance/component/IComponent.sol/IComponentOwnerService.json +47 -0
- package/artifacts/contracts/instance/component/IComponent.sol/IInstanceLinked.dbg.json +1 -1
- package/artifacts/contracts/instance/lifecycle/ILifecycle.sol/ILifecycle.dbg.json +4 -0
- package/artifacts/contracts/instance/lifecycle/ILifecycle.sol/ILifecycle.json +134 -0
- package/artifacts/contracts/instance/lifecycle/ILifecycle.sol/ILifecycleModule.dbg.json +4 -0
- package/artifacts/contracts/instance/lifecycle/ILifecycle.sol/ILifecycleModule.json +182 -0
- package/artifacts/contracts/instance/lifecycle/LifecycleModule.sol/LifecycleModule.dbg.json +4 -0
- package/artifacts/contracts/instance/lifecycle/LifecycleModule.sol/LifecycleModule.json +221 -0
- package/artifacts/contracts/instance/policy/IPolicy.sol/IPolicy.dbg.json +1 -1
- package/artifacts/contracts/instance/policy/IPolicy.sol/IPolicyModule.dbg.json +1 -1
- package/artifacts/contracts/instance/policy/IPolicy.sol/IPolicyModule.json +26 -3
- package/artifacts/contracts/instance/policy/PolicyModule.sol/PolicyModule.dbg.json +1 -1
- package/artifacts/contracts/instance/policy/PolicyModule.sol/PolicyModule.json +26 -3
- package/artifacts/contracts/instance/pool/IPoolModule.sol/IPool.dbg.json +1 -1
- package/artifacts/contracts/instance/pool/IPoolModule.sol/IPoolModule.dbg.json +1 -1
- package/artifacts/contracts/instance/pool/IPoolModule.sol/IPoolModule.json +15 -35
- package/artifacts/contracts/instance/pool/PoolModule.sol/PoolModule.dbg.json +1 -1
- package/artifacts/contracts/instance/pool/PoolModule.sol/PoolModule.json +22 -29
- package/artifacts/contracts/instance/product/IProductService.sol/IProductModule.dbg.json +1 -1
- package/artifacts/contracts/instance/product/IProductService.sol/IProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/product/IProductService.sol/IProductService.json +13 -0
- package/artifacts/contracts/instance/product/ProductService.sol/ProductModule.dbg.json +1 -1
- package/artifacts/contracts/instance/product/ProductService.sol/ProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/product/ProductService.sol/ProductService.json +41 -12
- package/artifacts/contracts/instance/treasury/ITreasury.sol/ITreasury.dbg.json +4 -0
- package/artifacts/contracts/instance/treasury/ITreasury.sol/ITreasury.json +10 -0
- package/artifacts/contracts/instance/treasury/ITreasury.sol/ITreasuryModule.dbg.json +4 -0
- package/artifacts/contracts/instance/treasury/ITreasury.sol/ITreasuryModule.json +490 -0
- package/artifacts/contracts/instance/treasury/TokenHandler.sol/TokenHandler.dbg.json +4 -0
- package/artifacts/contracts/instance/treasury/TokenHandler.sol/TokenHandler.json +45 -0
- package/artifacts/contracts/instance/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +4 -0
- package/artifacts/contracts/instance/treasury/TreasuryModule.sol/TreasuryModule.json +490 -0
- package/artifacts/contracts/mock/Dip.sol/DIP.dbg.json +4 -0
- package/artifacts/contracts/mock/Dip.sol/DIP.json +338 -0
- package/artifacts/contracts/mock/TestPool.sol/TestPool.dbg.json +4 -0
- package/artifacts/contracts/mock/TestPool.sol/TestPool.json +294 -0
- package/artifacts/contracts/mock/TestProduct.sol/TestProduct.dbg.json +4 -0
- package/artifacts/contracts/mock/TestProduct.sol/TestProduct.json +384 -0
- package/artifacts/contracts/mock/Usdc.sol/USDC.dbg.json +4 -0
- package/artifacts/contracts/mock/Usdc.sol/USDC.json +338 -0
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +2 -2
- package/artifacts/contracts/registry/IChainNft.sol/IChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IOwnable.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegisterable.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegisterable.json +2 -2
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +4 -95
- package/artifacts/contracts/registry/IRegistry.sol/IRegistryLinked.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registerable.json +2 -2
- package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.json +14 -105
- package/artifacts/contracts/registry/Registry.sol/RegistryLinked.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/RegistryLinked.json +2 -2
- package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
- package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.json +2 -2
- package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/ChainId.sol/ChainIdLib.json +2 -2
- package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/NftId.sol/NftIdLib.json +2 -2
- 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 +1 -1
- package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +2 -2
- package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.dbg.json +1 -1
- package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.json +37 -11
- package/contracts/components/Component.sol +24 -7
- package/contracts/components/IPool.sol +6 -0
- package/contracts/components/IProduct.sol +9 -2
- package/contracts/components/Pool.sol +34 -4
- package/contracts/components/Product.sol +38 -4
- 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/instance/IInstance.sol +9 -2
- package/contracts/instance/Instance.sol +13 -5
- package/contracts/instance/component/ComponentModule.sol +99 -38
- package/contracts/instance/component/IComponent.sol +18 -17
- package/contracts/instance/lifecycle/ILifecycle.sol +47 -0
- package/contracts/instance/lifecycle/LifecycleModule.sol +88 -0
- package/contracts/instance/policy/IPolicy.sol +8 -9
- package/contracts/instance/policy/PolicyModule.sol +32 -9
- package/contracts/instance/pool/IPoolModule.sol +2 -8
- package/contracts/instance/pool/PoolModule.sol +24 -16
- package/contracts/instance/product/IProductService.sol +1 -1
- package/contracts/instance/product/ProductService.sol +54 -30
- package/contracts/instance/treasury/ITreasury.sol +91 -0
- package/contracts/instance/treasury/TokenHandler.sol +24 -0
- package/contracts/instance/treasury/TreasuryModule.sol +168 -0
- package/contracts/mock/Dip.sol +26 -0
- package/contracts/mock/TestPool.sol +16 -0
- package/contracts/mock/TestProduct.sol +39 -0
- package/contracts/mock/Usdc.sol +26 -0
- package/contracts/registry/IRegistry.sol +4 -17
- package/contracts/registry/Registry.sol +4 -31
- package/contracts/types/Fee.sol +32 -0
- package/contracts/types/ObjectType.sol +107 -0
- package/contracts/types/StateId.sol +91 -0
- package/contracts/types/UFixed.sol +19 -14
- package/package.json +10 -6
@@ -0,0 +1,168 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.19;
|
3
|
+
|
4
|
+
import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
|
5
|
+
|
6
|
+
import {NftId} from "../../types/NftId.sol";
|
7
|
+
import {Fee, feeIsZero} from "../../types/Fee.sol";
|
8
|
+
import {UFixed, UFixedMathLib} from "../../types/UFixed.sol";
|
9
|
+
import {IProductComponent} from "../../components/IProduct.sol";
|
10
|
+
import {IPolicy, IPolicyModule} from "../policy/IPolicy.sol";
|
11
|
+
import {TokenHandler} from "./TokenHandler.sol";
|
12
|
+
import {ITreasuryModule} from "./ITreasury.sol";
|
13
|
+
import {TokenHandler} from "./TokenHandler.sol";
|
14
|
+
|
15
|
+
abstract contract TreasuryModule is ITreasuryModule {
|
16
|
+
mapping(NftId productNftId => ProductSetup setup) private _productSetup;
|
17
|
+
mapping(NftId distributorNftId => DistributorSetup setup)
|
18
|
+
private _distributorSetup;
|
19
|
+
mapping(NftId poolNftId => PoolSetup setup) private _poolSetup;
|
20
|
+
|
21
|
+
IPolicyModule private _policyModule;
|
22
|
+
|
23
|
+
constructor() {
|
24
|
+
_policyModule = IPolicyModule(address(this));
|
25
|
+
}
|
26
|
+
|
27
|
+
function registerProduct(
|
28
|
+
NftId productNftId,
|
29
|
+
NftId distributorNftId,
|
30
|
+
NftId poolNftId,
|
31
|
+
IERC20 token,
|
32
|
+
address wallet,
|
33
|
+
Fee memory policyFee,
|
34
|
+
Fee memory processingFee
|
35
|
+
) external override // TODO add authz (only component module)
|
36
|
+
{
|
37
|
+
// TODO add validation
|
38
|
+
|
39
|
+
// deploy product specific handler contract
|
40
|
+
TokenHandler tokenHandler = new TokenHandler(address(token));
|
41
|
+
|
42
|
+
_productSetup[productNftId] = ProductSetup(
|
43
|
+
productNftId,
|
44
|
+
distributorNftId,
|
45
|
+
poolNftId,
|
46
|
+
token,
|
47
|
+
tokenHandler,
|
48
|
+
wallet,
|
49
|
+
policyFee,
|
50
|
+
processingFee
|
51
|
+
);
|
52
|
+
|
53
|
+
// TODO add logging
|
54
|
+
}
|
55
|
+
|
56
|
+
function setProductFees(
|
57
|
+
NftId productNftId,
|
58
|
+
Fee memory policyFee,
|
59
|
+
Fee memory processingFee
|
60
|
+
) external override // TODO add authz (only component owner service)
|
61
|
+
{
|
62
|
+
// TODO add validation
|
63
|
+
|
64
|
+
ProductSetup storage setup = _productSetup[productNftId];
|
65
|
+
setup.policyFee = policyFee;
|
66
|
+
setup.processingFee = processingFee;
|
67
|
+
|
68
|
+
// TODO add logging
|
69
|
+
}
|
70
|
+
|
71
|
+
function registerPool(
|
72
|
+
NftId poolNftId,
|
73
|
+
address wallet,
|
74
|
+
Fee memory stakingFee,
|
75
|
+
Fee memory performanceFee
|
76
|
+
) external override // TODO add authz (only component module)
|
77
|
+
{
|
78
|
+
// TODO add validation
|
79
|
+
|
80
|
+
_poolSetup[poolNftId] = PoolSetup(
|
81
|
+
poolNftId,
|
82
|
+
wallet,
|
83
|
+
stakingFee,
|
84
|
+
performanceFee
|
85
|
+
);
|
86
|
+
|
87
|
+
// TODO add logging
|
88
|
+
}
|
89
|
+
|
90
|
+
function setPoolFees(
|
91
|
+
NftId poolNftId,
|
92
|
+
Fee memory stakingFee,
|
93
|
+
Fee memory performanceFee
|
94
|
+
) external override // TODO add authz (only component owner service)
|
95
|
+
{
|
96
|
+
// TODO add validation
|
97
|
+
|
98
|
+
PoolSetup storage setup = _poolSetup[poolNftId];
|
99
|
+
setup.stakingFee = stakingFee;
|
100
|
+
setup.performanceFee = performanceFee;
|
101
|
+
|
102
|
+
// TODO add logging
|
103
|
+
}
|
104
|
+
|
105
|
+
function getTokenHandler(
|
106
|
+
NftId productNftId
|
107
|
+
) external view override returns (TokenHandler tokenHandler) {
|
108
|
+
return _productSetup[productNftId].tokenHandler;
|
109
|
+
}
|
110
|
+
|
111
|
+
function getProductSetup(
|
112
|
+
NftId productNftId
|
113
|
+
) external view override returns (ProductSetup memory setup) {
|
114
|
+
return _productSetup[productNftId];
|
115
|
+
}
|
116
|
+
|
117
|
+
function getPoolSetup(
|
118
|
+
NftId poolNftId
|
119
|
+
) external view override returns (PoolSetup memory setup) {
|
120
|
+
return _poolSetup[poolNftId];
|
121
|
+
}
|
122
|
+
|
123
|
+
function processPremium(
|
124
|
+
NftId policyNftId,
|
125
|
+
NftId productNftId
|
126
|
+
) external override // TODO add authz (only product service)
|
127
|
+
{
|
128
|
+
IPolicy.PolicyInfo memory policyInfo = _policyModule.getPolicyInfo(
|
129
|
+
policyNftId
|
130
|
+
);
|
131
|
+
require(
|
132
|
+
policyInfo.nftId == policyNftId,
|
133
|
+
"ERROR:TRS-020:POLICY_UNKNOWN"
|
134
|
+
);
|
135
|
+
|
136
|
+
ProductSetup memory product = _productSetup[productNftId];
|
137
|
+
TokenHandler tokenHandler = product.tokenHandler;
|
138
|
+
address policyOwner = this.getRegistry().getOwner(policyNftId);
|
139
|
+
address poolWallet = _poolSetup[product.poolNftId].wallet;
|
140
|
+
// TODO add validation
|
141
|
+
|
142
|
+
if (feeIsZero(product.policyFee)) {
|
143
|
+
tokenHandler.transfer(
|
144
|
+
policyOwner,
|
145
|
+
poolWallet,
|
146
|
+
policyInfo.premiumAmount
|
147
|
+
);
|
148
|
+
} else {
|
149
|
+
(uint256 feeAmount, uint256 netAmount) = calculateFeeAmount(
|
150
|
+
policyInfo.premiumAmount,
|
151
|
+
product.policyFee
|
152
|
+
);
|
153
|
+
|
154
|
+
tokenHandler.transfer(policyOwner, product.wallet, feeAmount);
|
155
|
+
tokenHandler.transfer(policyOwner, poolWallet, netAmount);
|
156
|
+
}
|
157
|
+
}
|
158
|
+
|
159
|
+
function calculateFeeAmount(
|
160
|
+
uint256 amount,
|
161
|
+
Fee memory fee
|
162
|
+
) public pure override returns (uint256 feeAmount, uint256 netAmount) {
|
163
|
+
UFixed fractionalAmount = UFixedMathLib.itof(amount) *
|
164
|
+
fee.fractionalFee;
|
165
|
+
feeAmount = UFixedMathLib.ftoi(fractionalAmount) + fee.fixedFee;
|
166
|
+
netAmount = amount - feeAmount;
|
167
|
+
}
|
168
|
+
}
|
@@ -0,0 +1,26 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.20;
|
3
|
+
|
4
|
+
import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
|
5
|
+
|
6
|
+
contract DIP is ERC20 {
|
7
|
+
|
8
|
+
// https://etherscan.io/token/0xc719d010b63e5bbf2c0551872cd5316ed26acd83#readContract
|
9
|
+
string public constant NAME = "Decentralized Insurance Protocol - DUMMY";
|
10
|
+
string public constant SYMBOL = "DIP";
|
11
|
+
uint8 public constant DECIMALS = 18;
|
12
|
+
uint256 public constant INITIAL_SUPPLY = 10**9 * 10**DECIMALS; // 1 Billion 1'000'000'000
|
13
|
+
// decimals == 18 (openzeppelin erc20 default)
|
14
|
+
constructor()
|
15
|
+
ERC20(NAME, SYMBOL)
|
16
|
+
{
|
17
|
+
_mint(
|
18
|
+
_msgSender(),
|
19
|
+
INITIAL_SUPPLY
|
20
|
+
);
|
21
|
+
}
|
22
|
+
|
23
|
+
function decimals() public pure override returns(uint8) {
|
24
|
+
return DECIMALS;
|
25
|
+
}
|
26
|
+
}
|
@@ -0,0 +1,16 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.19;
|
3
|
+
|
4
|
+
import {Fee, zeroFee} from "../../contracts/types/Fee.sol";
|
5
|
+
import {Pool} from "../../contracts/components/Pool.sol";
|
6
|
+
|
7
|
+
|
8
|
+
contract TestPool is Pool {
|
9
|
+
|
10
|
+
constructor(address registry, address instance, address token)
|
11
|
+
// feeless pool (no staking fee, no performance fee)
|
12
|
+
Pool(registry, instance, token, zeroFee(), zeroFee())
|
13
|
+
// solhint-disable-next-line no-empty-blocks
|
14
|
+
{}
|
15
|
+
|
16
|
+
}
|
@@ -0,0 +1,39 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.19;
|
3
|
+
|
4
|
+
import {Product} from "../../contracts/components/Product.sol";
|
5
|
+
import {NftId, toNftId} from "../../contracts/types/NftId.sol";
|
6
|
+
import {Fee, zeroFee} from "../../contracts/types/Fee.sol";
|
7
|
+
|
8
|
+
contract TestProduct is Product {
|
9
|
+
|
10
|
+
constructor(address registry, address instance, address token, address pool, Fee memory policyFee)
|
11
|
+
Product(registry, instance, token, pool, policyFee, zeroFee())
|
12
|
+
// solhint-disable-next-line no-empty-blocks
|
13
|
+
{}
|
14
|
+
|
15
|
+
function applyForPolicy(
|
16
|
+
uint256 sumInsuredAmount,
|
17
|
+
uint256 premiumAmount,
|
18
|
+
uint256 lifetime
|
19
|
+
)
|
20
|
+
external
|
21
|
+
returns(NftId nftId)
|
22
|
+
{
|
23
|
+
nftId = _createApplication(
|
24
|
+
msg.sender, // policy holder
|
25
|
+
sumInsuredAmount,
|
26
|
+
premiumAmount,
|
27
|
+
lifetime,
|
28
|
+
toNftId(0) // requested bundle nft id
|
29
|
+
);
|
30
|
+
}
|
31
|
+
|
32
|
+
function underwrite(NftId nftId) external {
|
33
|
+
_underwrite(nftId);
|
34
|
+
}
|
35
|
+
|
36
|
+
function collectPremium(NftId nftId) external {
|
37
|
+
_collectPremium(nftId);
|
38
|
+
}
|
39
|
+
}
|
@@ -0,0 +1,26 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.20;
|
3
|
+
|
4
|
+
import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
|
5
|
+
|
6
|
+
contract USDC is ERC20 {
|
7
|
+
|
8
|
+
// https://etherscan.io/token/0xc719d010b63e5bbf2c0551872cd5316ed26acd83#readContract
|
9
|
+
string public constant NAME = "USDC - DUMMY";
|
10
|
+
string public constant SYMBOL = "USDC";
|
11
|
+
uint8 public constant DECIMALS = 6;
|
12
|
+
uint256 public constant INITIAL_SUPPLY = 10**9 * 10**DECIMALS; // 1 Billion 1'000'000'000
|
13
|
+
// decimals == 18 (openzeppelin erc20 default)
|
14
|
+
constructor()
|
15
|
+
ERC20(NAME, SYMBOL)
|
16
|
+
{
|
17
|
+
_mint(
|
18
|
+
_msgSender(),
|
19
|
+
INITIAL_SUPPLY
|
20
|
+
);
|
21
|
+
}
|
22
|
+
|
23
|
+
function decimals() public pure override returns(uint8) {
|
24
|
+
return DECIMALS;
|
25
|
+
}
|
26
|
+
}
|
@@ -2,6 +2,7 @@
|
|
2
2
|
pragma solidity ^0.8.19;
|
3
3
|
|
4
4
|
import {NftId} from "../types/NftId.sol";
|
5
|
+
import {ObjectType} from "../types/ObjectType.sol";
|
5
6
|
|
6
7
|
interface IOwnable {
|
7
8
|
function getOwner() external view returns (address owner);
|
@@ -20,7 +21,7 @@ interface IRegisterable is IOwnable, IRegistryLinked {
|
|
20
21
|
|
21
22
|
function getParentNftId() external view returns (NftId parentNftId);
|
22
23
|
|
23
|
-
function getType() external view returns (
|
24
|
+
function getType() external view returns (ObjectType objectType);
|
24
25
|
|
25
26
|
function getData() external view returns (bytes memory data);
|
26
27
|
|
@@ -35,30 +36,16 @@ interface IRegistry {
|
|
35
36
|
struct RegistryInfo {
|
36
37
|
NftId nftId;
|
37
38
|
NftId parentNftId;
|
38
|
-
|
39
|
+
ObjectType objectType;
|
39
40
|
address objectAddress;
|
40
41
|
address initialOwner;
|
41
42
|
}
|
42
43
|
|
43
|
-
function TOKEN() external pure returns (uint256);
|
44
|
-
|
45
|
-
function INSTANCE() external pure returns (uint256);
|
46
|
-
|
47
|
-
function PRODUCT() external pure returns (uint256);
|
48
|
-
|
49
|
-
function ORACLE() external pure returns (uint256);
|
50
|
-
|
51
|
-
function POOL() external pure returns (uint256);
|
52
|
-
|
53
|
-
function POLICY() external pure returns (uint256);
|
54
|
-
|
55
|
-
function BUNDLE() external pure returns (uint256);
|
56
|
-
|
57
44
|
function register(address objectAddress) external returns (NftId nftId);
|
58
45
|
|
59
46
|
function registerObjectForInstance(
|
60
47
|
NftId parentNftid,
|
61
|
-
|
48
|
+
ObjectType objectType,
|
62
49
|
address initialOwner
|
63
50
|
) external returns (NftId nftId);
|
64
51
|
|
@@ -3,8 +3,8 @@ pragma solidity ^0.8.19;
|
|
3
3
|
|
4
4
|
import {IChainNft} from "./IChainNft.sol";
|
5
5
|
import {IRegistry, IRegistryLinked, IRegisterable} from "./IRegistry.sol";
|
6
|
-
import {NftId, toNftId} from "../types/NftId.sol";
|
7
|
-
import {
|
6
|
+
import {NftId, toNftId, NftIdLib} from "../types/NftId.sol";
|
7
|
+
import {ObjectType, INSTANCE, POLICY, BUNDLE} from "../types/ObjectType.sol";
|
8
8
|
|
9
9
|
contract RegistryLinked is IRegistryLinked {
|
10
10
|
IRegistry internal _registry;
|
@@ -55,6 +55,7 @@ abstract contract Registerable is RegistryLinked, IRegisterable {
|
|
55
55
|
|
56
56
|
contract Registry is IRegistry {
|
57
57
|
using NftIdLib for NftId;
|
58
|
+
|
58
59
|
string public constant EMPTY_URI = "";
|
59
60
|
|
60
61
|
mapping(NftId nftId => RegistryInfo info) private _info;
|
@@ -71,34 +72,6 @@ contract Registry is IRegistry {
|
|
71
72
|
_chainNft = IChainNft(chainNft);
|
72
73
|
}
|
73
74
|
|
74
|
-
function TOKEN() public pure override returns (uint256) {
|
75
|
-
return 30;
|
76
|
-
}
|
77
|
-
|
78
|
-
function INSTANCE() public pure override returns (uint256) {
|
79
|
-
return 40;
|
80
|
-
}
|
81
|
-
|
82
|
-
function PRODUCT() public pure override returns (uint256) {
|
83
|
-
return 50;
|
84
|
-
}
|
85
|
-
|
86
|
-
function ORACLE() public pure override returns (uint256) {
|
87
|
-
return 60;
|
88
|
-
}
|
89
|
-
|
90
|
-
function POOL() public pure override returns (uint256) {
|
91
|
-
return 70;
|
92
|
-
}
|
93
|
-
|
94
|
-
function POLICY() public pure override returns (uint256) {
|
95
|
-
return 80;
|
96
|
-
}
|
97
|
-
|
98
|
-
function BUNDLE() public pure override returns (uint256) {
|
99
|
-
return 90;
|
100
|
-
}
|
101
|
-
|
102
75
|
function register(
|
103
76
|
address objectAddress
|
104
77
|
) external override returns (NftId nftId) {
|
@@ -145,7 +118,7 @@ contract Registry is IRegistry {
|
|
145
118
|
|
146
119
|
function registerObjectForInstance(
|
147
120
|
NftId parentNftId,
|
148
|
-
|
121
|
+
ObjectType objectType,
|
149
122
|
address initialOwner
|
150
123
|
)
|
151
124
|
external
|
@@ -0,0 +1,32 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.19;
|
3
|
+
|
4
|
+
import {UFixed} from "./UFixed.sol";
|
5
|
+
|
6
|
+
struct Fee {
|
7
|
+
UFixed fractionalFee;
|
8
|
+
uint256 fixedFee;
|
9
|
+
}
|
10
|
+
|
11
|
+
// general pure free functions
|
12
|
+
/// @dev Converts the uint256 to a NftId.
|
13
|
+
function toFee(
|
14
|
+
UFixed fractionalFee,
|
15
|
+
uint256 fixedFee
|
16
|
+
) pure returns (Fee memory fee) {
|
17
|
+
return Fee(fractionalFee, fixedFee);
|
18
|
+
}
|
19
|
+
|
20
|
+
/// @dev Return the NftId zero (0)
|
21
|
+
function zeroFee() pure returns (Fee memory fee) {
|
22
|
+
return Fee(UFixed.wrap(0), 0);
|
23
|
+
}
|
24
|
+
|
25
|
+
// pure free functions for operators
|
26
|
+
function feeIsSame(Fee memory a, Fee memory b) pure returns (bool isSame) {
|
27
|
+
return a.fixedFee == b.fixedFee && a.fractionalFee == b.fractionalFee;
|
28
|
+
}
|
29
|
+
|
30
|
+
function feeIsZero(Fee memory fee) pure returns (bool) {
|
31
|
+
return fee.fixedFee == 0 && UFixed.unwrap(fee.fractionalFee) == 0;
|
32
|
+
}
|
@@ -0,0 +1,107 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.19;
|
3
|
+
|
4
|
+
// uint96 allows for chain ids up to 13 digits
|
5
|
+
type ObjectType is uint8;
|
6
|
+
|
7
|
+
// type bindings
|
8
|
+
using {
|
9
|
+
eqObjectType as ==,
|
10
|
+
neObjectType as !=,
|
11
|
+
ObjectTypeLib.toInt
|
12
|
+
} for ObjectType global;
|
13
|
+
|
14
|
+
// general pure free functions
|
15
|
+
|
16
|
+
function PROTOCOL() pure returns (ObjectType) {
|
17
|
+
return toObjectType(10);
|
18
|
+
}
|
19
|
+
|
20
|
+
function CHAIN() pure returns (ObjectType) {
|
21
|
+
return toObjectType(20);
|
22
|
+
}
|
23
|
+
|
24
|
+
function REGISTRY() pure returns (ObjectType) {
|
25
|
+
return toObjectType(30);
|
26
|
+
}
|
27
|
+
|
28
|
+
function TOKEN() pure returns (ObjectType) {
|
29
|
+
return toObjectType(40);
|
30
|
+
}
|
31
|
+
|
32
|
+
function INSTANCE() pure returns (ObjectType) {
|
33
|
+
return toObjectType(50);
|
34
|
+
}
|
35
|
+
|
36
|
+
function PRODUCT() pure returns (ObjectType) {
|
37
|
+
return toObjectType(60);
|
38
|
+
}
|
39
|
+
|
40
|
+
function ORACLE() pure returns (ObjectType) {
|
41
|
+
return toObjectType(70);
|
42
|
+
}
|
43
|
+
|
44
|
+
function POOL() pure returns (ObjectType) {
|
45
|
+
return toObjectType(80);
|
46
|
+
}
|
47
|
+
|
48
|
+
function BUNDLE() pure returns (ObjectType) {
|
49
|
+
return toObjectType(81);
|
50
|
+
}
|
51
|
+
|
52
|
+
function POLICY() pure returns (ObjectType) {
|
53
|
+
return toObjectType(90);
|
54
|
+
}
|
55
|
+
|
56
|
+
function CLAIM() pure returns (ObjectType) {
|
57
|
+
return toObjectType(91);
|
58
|
+
}
|
59
|
+
|
60
|
+
function PAYOUT() pure returns (ObjectType) {
|
61
|
+
return toObjectType(92);
|
62
|
+
}
|
63
|
+
|
64
|
+
/// @dev Converts the uint8 to a ObjectType.
|
65
|
+
function toObjectType(uint256 objectType) pure returns (ObjectType) {
|
66
|
+
return ObjectType.wrap(uint8(objectType));
|
67
|
+
}
|
68
|
+
|
69
|
+
/// @dev Return the ObjectType zero (0)
|
70
|
+
function zeroObjectType() pure returns (ObjectType) {
|
71
|
+
return ObjectType.wrap(0);
|
72
|
+
}
|
73
|
+
|
74
|
+
// pure free functions for operators
|
75
|
+
function eqObjectType(ObjectType a, ObjectType b) pure returns (bool isSame) {
|
76
|
+
return ObjectType.unwrap(a) == ObjectType.unwrap(b);
|
77
|
+
}
|
78
|
+
|
79
|
+
function neObjectType(
|
80
|
+
ObjectType a,
|
81
|
+
ObjectType b
|
82
|
+
) pure returns (bool isDifferent) {
|
83
|
+
return ObjectType.unwrap(a) != ObjectType.unwrap(b);
|
84
|
+
}
|
85
|
+
|
86
|
+
// library functions that operate on user defined type
|
87
|
+
library ObjectTypeLib {
|
88
|
+
/// @dev Converts the NftId to a uint256.
|
89
|
+
function toInt(ObjectType objectType) public pure returns (uint96) {
|
90
|
+
return uint96(ObjectType.unwrap(objectType));
|
91
|
+
}
|
92
|
+
|
93
|
+
/// @dev Returns true if the value is non-zero (> 0).
|
94
|
+
function gtz(ObjectType a) public pure returns (bool) {
|
95
|
+
return ObjectType.unwrap(a) > 0;
|
96
|
+
}
|
97
|
+
|
98
|
+
/// @dev Returns true if the value is zero (== 0).
|
99
|
+
function eqz(ObjectType a) public pure returns (bool) {
|
100
|
+
return ObjectType.unwrap(a) == 0;
|
101
|
+
}
|
102
|
+
|
103
|
+
/// @dev Returns true if the values are equal (==).
|
104
|
+
function eq(ObjectType a, ObjectType b) public pure returns (bool isSame) {
|
105
|
+
return eqObjectType(a, b);
|
106
|
+
}
|
107
|
+
}
|
@@ -0,0 +1,91 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.19;
|
3
|
+
|
4
|
+
// uint96 allows for chain ids up to 13 digits
|
5
|
+
type StateId is uint8;
|
6
|
+
|
7
|
+
// type bindings
|
8
|
+
using {eqStateId as ==, neStateId as !=, StateIdLib.toInt} for StateId global;
|
9
|
+
|
10
|
+
// general pure free functions
|
11
|
+
function APPLIED() pure returns (StateId) {
|
12
|
+
return toStateId(10);
|
13
|
+
}
|
14
|
+
|
15
|
+
function REVOKED() pure returns (StateId) {
|
16
|
+
return toStateId(20);
|
17
|
+
}
|
18
|
+
|
19
|
+
function DECLINED() pure returns (StateId) {
|
20
|
+
return toStateId(30);
|
21
|
+
}
|
22
|
+
|
23
|
+
function CONFIRMED() pure returns (StateId) {
|
24
|
+
return toStateId(40);
|
25
|
+
}
|
26
|
+
|
27
|
+
function EXPECTED() pure returns (StateId) {
|
28
|
+
return toStateId(50);
|
29
|
+
}
|
30
|
+
|
31
|
+
function ACTIVE() pure returns (StateId) {
|
32
|
+
return toStateId(100);
|
33
|
+
}
|
34
|
+
|
35
|
+
function PAUSED() pure returns (StateId) {
|
36
|
+
return toStateId(110);
|
37
|
+
}
|
38
|
+
|
39
|
+
function CLOSED() pure returns (StateId) {
|
40
|
+
return toStateId(200);
|
41
|
+
}
|
42
|
+
|
43
|
+
function ARCHIVED() pure returns (StateId) {
|
44
|
+
return toStateId(210);
|
45
|
+
}
|
46
|
+
|
47
|
+
function PAID() pure returns (StateId) {
|
48
|
+
return toStateId(220);
|
49
|
+
}
|
50
|
+
|
51
|
+
/// @dev Converts the uint8 to a StateId.
|
52
|
+
function toStateId(uint256 id) pure returns (StateId) {
|
53
|
+
return StateId.wrap(uint8(id));
|
54
|
+
}
|
55
|
+
|
56
|
+
/// @dev Return the StateId zero (0)
|
57
|
+
function zeroStateId() pure returns (StateId) {
|
58
|
+
return StateId.wrap(0);
|
59
|
+
}
|
60
|
+
|
61
|
+
// pure free functions for operators
|
62
|
+
function eqStateId(StateId a, StateId b) pure returns (bool isSame) {
|
63
|
+
return StateId.unwrap(a) == StateId.unwrap(b);
|
64
|
+
}
|
65
|
+
|
66
|
+
function neStateId(StateId a, StateId b) pure returns (bool isDifferent) {
|
67
|
+
return StateId.unwrap(a) != StateId.unwrap(b);
|
68
|
+
}
|
69
|
+
|
70
|
+
// library functions that operate on user defined type
|
71
|
+
library StateIdLib {
|
72
|
+
/// @dev Converts the NftId to a uint256.
|
73
|
+
function toInt(StateId stateId) public pure returns (uint96) {
|
74
|
+
return uint96(StateId.unwrap(stateId));
|
75
|
+
}
|
76
|
+
|
77
|
+
/// @dev Returns true if the value is non-zero (> 0).
|
78
|
+
function gtz(StateId a) public pure returns (bool) {
|
79
|
+
return StateId.unwrap(a) > 0;
|
80
|
+
}
|
81
|
+
|
82
|
+
/// @dev Returns true if the value is zero (== 0).
|
83
|
+
function eqz(StateId a) public pure returns (bool) {
|
84
|
+
return StateId.unwrap(a) == 0;
|
85
|
+
}
|
86
|
+
|
87
|
+
/// @dev Returns true if the values are equal (==).
|
88
|
+
function eq(StateId a, StateId b) public pure returns (bool isSame) {
|
89
|
+
return eqStateId(a, b);
|
90
|
+
}
|
91
|
+
}
|
@@ -76,21 +76,25 @@ function deltaUFixed(UFixed a, UFixed b) pure returns (UFixed) {
|
|
76
76
|
}
|
77
77
|
|
78
78
|
library UFixedMathLib {
|
79
|
-
enum Rounding {
|
80
|
-
/// @dev Round down - floor(value)
|
81
|
-
Down,
|
82
|
-
/// @dev Round up - ceil(value)
|
83
|
-
Up,
|
84
|
-
/// @dev Round half up - round(value)
|
85
|
-
HalfUp
|
86
|
-
}
|
87
79
|
|
88
80
|
int8 public constant EXP = 18;
|
89
81
|
uint256 public constant MULTIPLIER = 10 ** uint256(int256(EXP));
|
90
82
|
uint256 public constant MULTIPLIER_HALF = MULTIPLIER / 2;
|
91
83
|
|
92
|
-
/// @dev
|
93
|
-
|
84
|
+
/// @dev returns the rounding mode DOWN - 0.4 becomes 0, 0.5 becomes 0, 0.6 becomes 0
|
85
|
+
function ROUNDING_DOWN() public pure returns (uint8) {
|
86
|
+
return uint8(0);
|
87
|
+
}
|
88
|
+
|
89
|
+
/// @dev returns the rounding mode UP - 0.4 becomes 1, 0.5 becomes 1, 0.6 becomes 1
|
90
|
+
function ROUNDING_UP() public pure returns (uint8) {
|
91
|
+
return uint8(1);
|
92
|
+
}
|
93
|
+
|
94
|
+
/// @dev returns the rounding mode HALF_UP - 0.4 becomes 0, 0.5 becomes 1, 0.6 becomes 1
|
95
|
+
function ROUNDING_HALF_UP() public pure returns (uint8) {
|
96
|
+
return uint8(2);
|
97
|
+
}
|
94
98
|
|
95
99
|
/// @dev returns the decimals precision of the UFixed type
|
96
100
|
function decimals() public pure returns (uint256) {
|
@@ -102,6 +106,7 @@ library UFixedMathLib {
|
|
102
106
|
return UFixed.wrap(a * MULTIPLIER);
|
103
107
|
}
|
104
108
|
|
109
|
+
// TODO rename to toUFixed
|
105
110
|
/// @dev Converts the uint256 to a UFixed with given exponent.
|
106
111
|
function itof(uint256 a, int8 exp) public pure returns (UFixed) {
|
107
112
|
require(EXP + exp >= 0, "ERROR:FM-010:EXPONENT_TOO_SMALL");
|
@@ -112,12 +117,12 @@ library UFixedMathLib {
|
|
112
117
|
|
113
118
|
/// @dev Converts a UFixed to a uint256.
|
114
119
|
function ftoi(UFixed a) public pure returns (uint256) {
|
115
|
-
return ftoi(a,
|
120
|
+
return ftoi(a, ROUNDING_HALF_UP());
|
116
121
|
}
|
117
122
|
|
118
123
|
/// @dev Converts a UFixed to a uint256 with given rounding mode.
|
119
|
-
function ftoi(UFixed a,
|
120
|
-
if (rounding ==
|
124
|
+
function ftoi(UFixed a, uint8 rounding) public pure returns (uint256) {
|
125
|
+
if (rounding == ROUNDING_HALF_UP()) {
|
121
126
|
return
|
122
127
|
Math.mulDiv(
|
123
128
|
UFixed.unwrap(a) + MULTIPLIER_HALF,
|
@@ -125,7 +130,7 @@ library UFixedMathLib {
|
|
125
130
|
MULTIPLIER,
|
126
131
|
Math.Rounding.Down
|
127
132
|
);
|
128
|
-
} else if (rounding ==
|
133
|
+
} else if (rounding == ROUNDING_DOWN()) {
|
129
134
|
return
|
130
135
|
Math.mulDiv(
|
131
136
|
UFixed.unwrap(a),
|