@etherisc/gif-next 0.0.2-cf606cd → 0.0.2-d3543ee-345
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +27 -0
- 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/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 +2 -2
- package/contracts/components/Component.sol +38 -23
- package/contracts/components/IPool.sol +9 -3
- package/contracts/components/IProduct.sol +10 -6
- package/contracts/components/Pool.sol +37 -14
- package/contracts/components/Product.sol +46 -23
- package/contracts/experiment/errors/Require.sol +10 -5
- package/contracts/experiment/errors/Revert.sol +13 -8
- package/contracts/experiment/inheritance/A.sol +8 -11
- package/contracts/experiment/inheritance/B.sol +10 -5
- package/contracts/experiment/inheritance/C.sol +11 -5
- package/contracts/experiment/inheritance/IA.sol +2 -7
- package/contracts/experiment/inheritance/IB.sol +3 -2
- package/contracts/experiment/inheritance/IC.sol +4 -3
- 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 +14 -9
- package/contracts/experiment/types/TypeB.sol +14 -9
- package/contracts/instance/IInstance.sol +8 -3
- package/contracts/instance/Instance.sol +22 -14
- package/contracts/instance/access/Access.sol +63 -116
- package/contracts/instance/access/IAccess.sol +28 -48
- package/contracts/instance/component/ComponentModule.sol +144 -118
- package/contracts/instance/component/IComponent.sol +39 -60
- package/contracts/instance/lifecycle/ILifecycle.sol +47 -0
- package/contracts/instance/lifecycle/LifecycleModule.sol +88 -0
- package/contracts/instance/policy/IPolicy.sol +16 -32
- package/contracts/instance/policy/PolicyModule.sol +47 -40
- package/contracts/instance/pool/IPoolModule.sol +7 -25
- package/contracts/instance/pool/PoolModule.sol +40 -45
- package/contracts/instance/product/IProductService.sol +6 -16
- package/contracts/instance/product/ProductService.sol +76 -48
- 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/registry/ChainNft.sol +23 -61
- package/contracts/registry/IChainNft.sol +10 -7
- package/contracts/registry/IRegistry.sol +35 -38
- package/contracts/registry/Registry.sol +57 -57
- package/contracts/types/Blocknumber.sol +76 -18
- package/contracts/types/ChainId.sol +18 -10
- package/contracts/types/Fee.sol +32 -0
- package/contracts/types/NftId.sol +29 -13
- package/contracts/types/ObjectType.sol +107 -0
- package/contracts/types/StateId.sol +91 -0
- package/contracts/types/Timestamp.sol +63 -16
- package/contracts/types/UFixed.sol +59 -64
- package/package.json +10 -4
@@ -0,0 +1,91 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.19;
|
3
|
+
|
4
|
+
import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
|
5
|
+
|
6
|
+
import {IRegistryLinked} from "../../registry/IRegistry.sol";
|
7
|
+
|
8
|
+
import {NftId} from "../../types/NftId.sol";
|
9
|
+
import {UFixed} from "../../types/UFixed.sol";
|
10
|
+
import {Fee} from "../../types/Fee.sol";
|
11
|
+
|
12
|
+
import {TokenHandler} from "./TokenHandler.sol";
|
13
|
+
|
14
|
+
interface ITreasury {
|
15
|
+
// TODO add events
|
16
|
+
// TODO add errors
|
17
|
+
}
|
18
|
+
|
19
|
+
interface ITreasuryModule is IRegistryLinked, ITreasury {
|
20
|
+
struct ProductSetup {
|
21
|
+
NftId productNftId;
|
22
|
+
NftId distributorNftId;
|
23
|
+
NftId poolNftId;
|
24
|
+
IERC20 token;
|
25
|
+
TokenHandler tokenHandler;
|
26
|
+
address wallet;
|
27
|
+
Fee policyFee;
|
28
|
+
Fee processingFee;
|
29
|
+
}
|
30
|
+
|
31
|
+
struct DistributorSetup {
|
32
|
+
NftId distributorNftId;
|
33
|
+
address wallet;
|
34
|
+
Fee commissionFees;
|
35
|
+
}
|
36
|
+
|
37
|
+
struct PoolSetup {
|
38
|
+
NftId poolNftId;
|
39
|
+
address wallet;
|
40
|
+
Fee stakingFee;
|
41
|
+
Fee performanceFee;
|
42
|
+
}
|
43
|
+
|
44
|
+
function registerProduct(
|
45
|
+
NftId productNftId,
|
46
|
+
NftId distributorNftId,
|
47
|
+
NftId poolNftId,
|
48
|
+
IERC20 token,
|
49
|
+
address wallet,
|
50
|
+
Fee memory policyFee,
|
51
|
+
Fee memory processingFee
|
52
|
+
) external;
|
53
|
+
|
54
|
+
function setProductFees(
|
55
|
+
NftId productNftId,
|
56
|
+
Fee memory policyFee,
|
57
|
+
Fee memory processingFee
|
58
|
+
) external;
|
59
|
+
|
60
|
+
function registerPool(
|
61
|
+
NftId poolNftId,
|
62
|
+
address wallet,
|
63
|
+
Fee memory stakingFee,
|
64
|
+
Fee memory performanceFee
|
65
|
+
) external;
|
66
|
+
|
67
|
+
function setPoolFees(
|
68
|
+
NftId poolNftId,
|
69
|
+
Fee memory stakingFee,
|
70
|
+
Fee memory performanceFee
|
71
|
+
) external;
|
72
|
+
|
73
|
+
function processPremium(NftId policyNftId, NftId productNftId) external;
|
74
|
+
|
75
|
+
function getTokenHandler(
|
76
|
+
NftId productNftId
|
77
|
+
) external view returns (TokenHandler tokenHandler);
|
78
|
+
|
79
|
+
function getProductSetup(
|
80
|
+
NftId productNftId
|
81
|
+
) external view returns (ProductSetup memory setup);
|
82
|
+
|
83
|
+
function getPoolSetup(
|
84
|
+
NftId poolNftId
|
85
|
+
) external view returns (PoolSetup memory setup);
|
86
|
+
|
87
|
+
function calculateFeeAmount(
|
88
|
+
uint256 amount,
|
89
|
+
Fee memory fee
|
90
|
+
) external pure returns (uint256 feeAmount, uint256 netAmount);
|
91
|
+
}
|
@@ -0,0 +1,24 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.19;
|
3
|
+
|
4
|
+
import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
|
5
|
+
|
6
|
+
contract TokenHandler {
|
7
|
+
// TODO use oz safeTransferFrom
|
8
|
+
|
9
|
+
IERC20 _token;
|
10
|
+
|
11
|
+
constructor(address token) {
|
12
|
+
_token = IERC20(token);
|
13
|
+
}
|
14
|
+
|
15
|
+
// TODO add logging
|
16
|
+
function transfer(
|
17
|
+
address from,
|
18
|
+
address to,
|
19
|
+
uint256 amount
|
20
|
+
) external // TODO add authz (only treasury)
|
21
|
+
{
|
22
|
+
_token.transferFrom(from, to, amount);
|
23
|
+
}
|
24
|
+
}
|
@@ -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
|
+
}
|
@@ -4,10 +4,7 @@ pragma solidity ^0.8.19;
|
|
4
4
|
import {ERC721, ERC721Enumerable} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Enumerable.sol";
|
5
5
|
import {IChainNft} from "./IChainNft.sol";
|
6
6
|
|
7
|
-
contract ChainNft is
|
8
|
-
ERC721Enumerable,
|
9
|
-
IChainNft
|
10
|
-
{
|
7
|
+
contract ChainNft is ERC721Enumerable, IChainNft {
|
11
8
|
string public constant NAME = "Dezentralized Insurance Protocol Registry";
|
12
9
|
string public constant SYMBOL = "DIPR";
|
13
10
|
|
@@ -18,22 +15,18 @@ contract ChainNft is
|
|
18
15
|
address private _registry;
|
19
16
|
|
20
17
|
// only used for _getNextTokenId
|
21
|
-
uint256 internal _chainIdInt;
|
18
|
+
uint256 internal _chainIdInt;
|
22
19
|
uint256 internal _chainIdDigits;
|
23
20
|
uint256 internal _chainIdMultiplier;
|
24
21
|
uint256 internal _idNext;
|
25
22
|
uint256 internal _totalMinted;
|
26
23
|
|
27
|
-
|
28
24
|
modifier onlyRegistry() {
|
29
25
|
require(msg.sender == _registry, "ERROR:NFT-001:CALLER_NOT_REGISTRY");
|
30
26
|
_;
|
31
27
|
}
|
32
28
|
|
33
|
-
|
34
|
-
constructor(address registry)
|
35
|
-
ERC721(NAME, SYMBOL)
|
36
|
-
{
|
29
|
+
constructor(address registry) ERC721(NAME, SYMBOL) {
|
37
30
|
require(registry != address(0), "ERROR:NFT-010:REGISTRY_ZERO");
|
38
31
|
|
39
32
|
_registry = registry;
|
@@ -43,88 +36,59 @@ contract ChainNft is
|
|
43
36
|
_chainIdMultiplier = 10 ** _chainIdDigits;
|
44
37
|
|
45
38
|
// on mainnet/goerli start /1 (reserved for protocol nft) on other chains with 2
|
46
|
-
if(block.chainid == 1 || block.chainid == 5) {
|
39
|
+
if (block.chainid == 1 || block.chainid == 5) {
|
47
40
|
_idNext = 1;
|
48
41
|
} else {
|
49
42
|
_idNext = 2;
|
50
43
|
}
|
51
44
|
}
|
52
45
|
|
53
|
-
|
54
46
|
function mint(
|
55
47
|
address to,
|
56
48
|
string memory uri
|
57
|
-
)
|
58
|
-
external
|
59
|
-
override
|
60
|
-
onlyRegistry
|
61
|
-
returns(uint256 tokenId)
|
62
|
-
{
|
49
|
+
) external override onlyRegistry returns (uint256 tokenId) {
|
63
50
|
tokenId = _getNextTokenId();
|
64
51
|
_totalMinted++;
|
65
52
|
|
66
53
|
_safeMint(to, tokenId);
|
67
54
|
|
68
|
-
if(bytes(uri).length > 0) {
|
55
|
+
if (bytes(uri).length > 0) {
|
69
56
|
_uri[tokenId] = uri;
|
70
57
|
}
|
71
58
|
}
|
72
59
|
|
73
|
-
|
74
|
-
function burn(uint256 tokenId)
|
75
|
-
external
|
76
|
-
override
|
77
|
-
onlyRegistry
|
78
|
-
{
|
60
|
+
function burn(uint256 tokenId) external override onlyRegistry {
|
79
61
|
_requireMinted(tokenId);
|
80
62
|
_burn(tokenId);
|
81
63
|
delete _uri[tokenId];
|
82
64
|
}
|
83
65
|
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
onlyRegistry
|
89
|
-
{
|
66
|
+
function setURI(
|
67
|
+
uint256 tokenId,
|
68
|
+
string memory uri
|
69
|
+
) external override onlyRegistry {
|
90
70
|
require(bytes(uri).length > 0, "ERROR:CRG-011:URI_EMPTY");
|
91
71
|
|
92
72
|
_requireMinted(tokenId);
|
93
73
|
_uri[tokenId] = uri;
|
94
74
|
}
|
95
75
|
|
96
|
-
|
97
|
-
function exists(uint256 tokenId)
|
98
|
-
external
|
99
|
-
view
|
100
|
-
override
|
101
|
-
returns(bool)
|
102
|
-
{
|
76
|
+
function exists(uint256 tokenId) external view override returns (bool) {
|
103
77
|
return _exists(tokenId);
|
104
78
|
}
|
105
79
|
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
view
|
110
|
-
override
|
111
|
-
returns(string memory)
|
112
|
-
{
|
80
|
+
function tokenURI(
|
81
|
+
uint256 tokenId
|
82
|
+
) public view override returns (string memory) {
|
113
83
|
_requireMinted(tokenId);
|
114
84
|
return _uri[tokenId];
|
115
85
|
}
|
116
86
|
|
117
|
-
|
118
|
-
function getRegistryAddress()
|
119
|
-
external
|
120
|
-
view
|
121
|
-
override
|
122
|
-
returns(address)
|
123
|
-
{
|
87
|
+
function getRegistryAddress() external view override returns (address) {
|
124
88
|
return _registry;
|
125
89
|
}
|
126
90
|
|
127
|
-
function totalMinted() external override
|
91
|
+
function totalMinted() external view override returns (uint256) {
|
128
92
|
return _totalMinted;
|
129
93
|
}
|
130
94
|
|
@@ -153,17 +117,15 @@ contract ChainNft is
|
|
153
117
|
// (42 * 10 ** 10 + 9876543210) * 100 + 10
|
154
118
|
// (index * 10 ** digits + chainid) * 100 + digits (1 < digits < 100)
|
155
119
|
|
156
|
-
function _getNextTokenId() private returns(uint256 id) {
|
157
|
-
id =
|
120
|
+
function _getNextTokenId() private returns (uint256 id) {
|
121
|
+
id =
|
122
|
+
(_idNext * _chainIdMultiplier + _chainIdInt) *
|
123
|
+
100 +
|
124
|
+
_chainIdDigits;
|
158
125
|
_idNext++;
|
159
126
|
}
|
160
127
|
|
161
|
-
|
162
|
-
function _countDigits(uint256 num)
|
163
|
-
private
|
164
|
-
pure
|
165
|
-
returns (uint256 count)
|
166
|
-
{
|
128
|
+
function _countDigits(uint256 num) private pure returns (uint256 count) {
|
167
129
|
count = 0;
|
168
130
|
while (num != 0) {
|
169
131
|
count++;
|
@@ -3,16 +3,19 @@ pragma solidity ^0.8.19;
|
|
3
3
|
|
4
4
|
import {IERC721Enumerable} from "@openzeppelin/contracts/token/ERC721/extensions/IERC721Enumerable.sol";
|
5
5
|
|
6
|
-
interface IChainNft is
|
7
|
-
|
8
|
-
|
6
|
+
interface IChainNft is IERC721Enumerable {
|
7
|
+
function mint(
|
8
|
+
address to,
|
9
|
+
string memory uri
|
10
|
+
) external returns (uint256 tokenId);
|
9
11
|
|
10
|
-
function mint(address to, string memory uri) external returns(uint256 tokenId);
|
11
12
|
function burn(uint256 tokenId) external;
|
13
|
+
|
12
14
|
function setURI(uint256 tokenId, string memory uri) external;
|
13
15
|
|
14
|
-
function exists(uint256 tokenId) external view returns(bool);
|
15
|
-
|
16
|
+
function exists(uint256 tokenId) external view returns (bool);
|
17
|
+
|
18
|
+
function totalMinted() external view returns (uint256);
|
16
19
|
|
17
|
-
function getRegistryAddress() external view returns(address registry);
|
20
|
+
function getRegistryAddress() external view returns (address registry);
|
18
21
|
}
|
@@ -2,69 +2,66 @@
|
|
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
|
-
function getOwner() external view returns(address owner);
|
8
|
+
function getOwner() external view returns (address owner);
|
8
9
|
}
|
9
10
|
|
10
11
|
interface IRegistryLinked {
|
11
|
-
|
12
12
|
event LogDebug(uint256 idx, address module, string comment);
|
13
13
|
|
14
|
-
function getRegistry() external view returns(IRegistry registry);
|
14
|
+
function getRegistry() external view returns (IRegistry registry);
|
15
15
|
}
|
16
16
|
|
17
|
-
interface IRegisterable is
|
18
|
-
|
19
|
-
IRegistryLinked
|
20
|
-
{
|
21
|
-
|
22
|
-
function register() external returns(NftId nftId);
|
23
|
-
|
24
|
-
function getNftId() external view returns(NftId nftId);
|
25
|
-
function getParentNftId() external view returns(NftId parentNftId);
|
26
|
-
function getType() external view returns(uint256 objectType);
|
27
|
-
function getData() external view returns(bytes memory data);
|
28
|
-
function isRegisterable() external pure returns(bool);
|
29
|
-
function getInitialOwner() external view returns(address initialOwner);
|
30
|
-
|
31
|
-
function isRegistered() external view returns(bool);
|
32
|
-
}
|
17
|
+
interface IRegisterable is IOwnable, IRegistryLinked {
|
18
|
+
function register() external returns (NftId nftId);
|
33
19
|
|
20
|
+
function getNftId() external view returns (NftId nftId);
|
34
21
|
|
35
|
-
|
22
|
+
function getParentNftId() external view returns (NftId parentNftId);
|
23
|
+
|
24
|
+
function getType() external view returns (ObjectType objectType);
|
25
|
+
|
26
|
+
function getData() external view returns (bytes memory data);
|
27
|
+
|
28
|
+
function isRegisterable() external pure returns (bool);
|
36
29
|
|
30
|
+
function getInitialOwner() external view returns (address initialOwner);
|
31
|
+
|
32
|
+
function isRegistered() external view returns (bool);
|
33
|
+
}
|
34
|
+
|
35
|
+
interface IRegistry {
|
37
36
|
struct RegistryInfo {
|
38
37
|
NftId nftId;
|
39
38
|
NftId parentNftId;
|
40
|
-
|
39
|
+
ObjectType objectType;
|
41
40
|
address objectAddress;
|
42
41
|
address initialOwner;
|
43
42
|
}
|
44
43
|
|
45
|
-
function
|
46
|
-
function INSTANCE() external pure returns(uint256);
|
47
|
-
function PRODUCT() external pure returns(uint256);
|
48
|
-
function ORACLE() external pure returns(uint256);
|
49
|
-
function POOL() external pure returns(uint256);
|
50
|
-
function POLICY() external pure returns(uint256);
|
51
|
-
function BUNDLE() external pure returns(uint256);
|
44
|
+
function register(address objectAddress) external returns (NftId nftId);
|
52
45
|
|
53
|
-
function register(address objectAddress) external returns(NftId nftId);
|
54
46
|
function registerObjectForInstance(
|
55
47
|
NftId parentNftid,
|
56
|
-
|
48
|
+
ObjectType objectType,
|
57
49
|
address initialOwner
|
58
|
-
)
|
59
|
-
|
50
|
+
) external returns (NftId nftId);
|
51
|
+
|
52
|
+
function getObjectCount() external view returns (uint256);
|
53
|
+
|
54
|
+
function getNftId(
|
55
|
+
address objectAddress
|
56
|
+
) external view returns (NftId nftId);
|
60
57
|
|
61
|
-
function
|
58
|
+
function getInfo(
|
59
|
+
NftId nftId
|
60
|
+
) external view returns (RegistryInfo memory info);
|
62
61
|
|
63
|
-
function
|
64
|
-
function getInfo(NftId nftId) external view returns(RegistryInfo memory info);
|
65
|
-
function getOwner(NftId nftId) external view returns(address ownerAddress);
|
62
|
+
function getOwner(NftId nftId) external view returns (address ownerAddress);
|
66
63
|
|
67
|
-
function isRegistered(address objectAddress) external view returns(bool);
|
64
|
+
function isRegistered(address objectAddress) external view returns (bool);
|
68
65
|
|
69
|
-
function getNftAddress() external view returns(address nft);
|
66
|
+
function getNftAddress() external view returns (address nft);
|
70
67
|
}
|