@etherisc/gif-next 0.0.2-e5ea33d → 0.0.2-e6ad61d-739
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +10 -1
- 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 +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/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 +7 -4
@@ -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),
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@etherisc/gif-next",
|
3
|
-
"version": "0.0.2-
|
3
|
+
"version": "0.0.2-e6ad61d-739",
|
4
4
|
"description": "This is the repository for the next version of the Generic Insurance Framework (GIF) smart contracts. ",
|
5
5
|
"main": "index.js",
|
6
6
|
"scripts": {
|
@@ -9,8 +9,9 @@
|
|
9
9
|
"ptest": "hh test --parallel",
|
10
10
|
"test-with-gas": "REPORT_GAS=true hh test",
|
11
11
|
"coverage": "hh coverage",
|
12
|
-
"
|
13
|
-
"
|
12
|
+
"styleFix": "prettier --write --plugin=prettier-plugin-solidity 'contracts/**/*.sol' 'test_forge/**/*.t.sol'",
|
13
|
+
"styleCheck": "prettier --check --plugin=prettier-plugin-solidity 'contracts/**/*.sol' 'test_forge/**/*.t.sol'",
|
14
|
+
"lint": "solhint 'contracts/**/*.sol' 'test_forge/**/*.t.sol'"
|
14
15
|
},
|
15
16
|
"repository": {
|
16
17
|
"type": "git",
|
@@ -37,6 +38,8 @@
|
|
37
38
|
},
|
38
39
|
"dependencies": {
|
39
40
|
"@openzeppelin/contracts": "^4.9.3",
|
40
|
-
"@openzeppelin/contracts-upgradeable": "^4.9.3"
|
41
|
+
"@openzeppelin/contracts-upgradeable": "^4.9.3",
|
42
|
+
"ethers": "^6.7.1",
|
43
|
+
"winston": "^3.10.0"
|
41
44
|
}
|
42
45
|
}
|