@etherisc/gif-next 0.0.2-f9905e1 → 0.0.2-ffba655

Sign up to get free protection for your applications and to get access to all the features.
Files changed (118) hide show
  1. package/artifacts/contracts/components/Component.sol/Component.dbg.json +1 -1
  2. package/artifacts/contracts/components/Component.sol/Component.json +7 -7
  3. package/artifacts/contracts/components/Component.sol/InstanceLinked.dbg.json +1 -1
  4. package/artifacts/contracts/components/Component.sol/InstanceLinked.json +2 -2
  5. package/artifacts/contracts/components/IPool.sol/IPoolComponent.dbg.json +1 -1
  6. package/artifacts/contracts/components/IPool.sol/IPoolComponent.json +6 -6
  7. package/artifacts/contracts/components/IProduct.sol/IProductComponent.dbg.json +1 -1
  8. package/artifacts/contracts/components/IProduct.sol/IProductComponent.json +8 -8
  9. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  10. package/artifacts/contracts/components/Pool.sol/Pool.json +29 -11
  11. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  12. package/artifacts/contracts/components/Product.sol/Product.json +31 -13
  13. package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +4 -0
  14. package/artifacts/contracts/experiment/errors/Require.sol/Require.json +105 -0
  15. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +4 -0
  16. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.json +105 -0
  17. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +1 -1
  18. package/artifacts/contracts/experiment/inheritance/A.sol/A.json +2 -2
  19. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +1 -1
  20. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.json +2 -2
  21. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +1 -1
  22. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +1 -1
  23. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +1 -1
  24. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +1 -1
  25. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +1 -1
  26. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +1 -1
  27. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
  28. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.json +2 -2
  29. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
  30. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.json +2 -2
  31. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  32. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +60 -60
  33. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  34. package/artifacts/contracts/instance/Instance.sol/Instance.json +122 -64
  35. package/artifacts/contracts/instance/access/Access.sol/AccessModule.dbg.json +1 -1
  36. package/artifacts/contracts/instance/access/IAccess.sol/IAccess.dbg.json +1 -1
  37. package/artifacts/contracts/instance/access/IAccess.sol/IAccessCheckRole.dbg.json +1 -1
  38. package/artifacts/contracts/instance/access/IAccess.sol/IAccessComponentTypeRoles.dbg.json +1 -1
  39. package/artifacts/contracts/instance/access/IAccess.sol/IAccessModule.dbg.json +1 -1
  40. package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentModule.dbg.json +1 -1
  41. package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentModule.json +24 -24
  42. package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentOwnerService.dbg.json +1 -1
  43. package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentOwnerService.json +48 -6
  44. package/artifacts/contracts/instance/component/IComponent.sol/IComponent.dbg.json +1 -1
  45. package/artifacts/contracts/instance/component/IComponent.sol/IComponentContract.dbg.json +1 -1
  46. package/artifacts/contracts/instance/component/IComponent.sol/IComponentContract.json +6 -6
  47. package/artifacts/contracts/instance/component/IComponent.sol/IComponentModule.dbg.json +1 -1
  48. package/artifacts/contracts/instance/component/IComponent.sol/IComponentModule.json +26 -26
  49. package/artifacts/contracts/instance/component/IComponent.sol/IComponentOwnerService.dbg.json +1 -1
  50. package/artifacts/contracts/instance/component/IComponent.sol/IComponentOwnerService.json +3 -3
  51. package/artifacts/contracts/instance/component/IComponent.sol/IInstanceLinked.dbg.json +1 -1
  52. package/artifacts/contracts/instance/policy/IPolicy.sol/IPolicy.dbg.json +1 -1
  53. package/artifacts/contracts/instance/policy/IPolicy.sol/IPolicyModule.dbg.json +1 -1
  54. package/artifacts/contracts/instance/policy/IPolicy.sol/IPolicyModule.json +18 -18
  55. package/artifacts/contracts/instance/policy/PolicyModule.sol/PolicyModule.dbg.json +1 -1
  56. package/artifacts/contracts/instance/policy/PolicyModule.sol/PolicyModule.json +18 -18
  57. package/artifacts/contracts/instance/pool/IPoolModule.sol/IPool.dbg.json +1 -1
  58. package/artifacts/contracts/instance/pool/IPoolModule.sol/IPoolModule.dbg.json +1 -1
  59. package/artifacts/contracts/instance/pool/IPoolModule.sol/IPoolModule.json +10 -10
  60. package/artifacts/contracts/instance/pool/PoolModule.sol/PoolModule.dbg.json +1 -1
  61. package/artifacts/contracts/instance/pool/PoolModule.sol/PoolModule.json +10 -10
  62. package/artifacts/contracts/instance/product/IProductService.sol/IProductModule.dbg.json +1 -1
  63. package/artifacts/contracts/instance/product/IProductService.sol/IProductService.dbg.json +1 -1
  64. package/artifacts/contracts/instance/product/IProductService.sol/IProductService.json +8 -8
  65. package/artifacts/contracts/instance/product/ProductService.sol/ProductModule.dbg.json +1 -1
  66. package/artifacts/contracts/instance/product/ProductService.sol/ProductService.dbg.json +1 -1
  67. package/artifacts/contracts/instance/product/ProductService.sol/ProductService.json +54 -12
  68. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +4 -0
  69. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +534 -0
  70. package/artifacts/contracts/registry/IChainNft.sol/IChainNft.dbg.json +4 -0
  71. package/artifacts/contracts/registry/IChainNft.sol/IChainNft.json +452 -0
  72. package/artifacts/contracts/registry/IRegistry.sol/IOwnable.dbg.json +1 -1
  73. package/artifacts/contracts/registry/IRegistry.sol/IRegisterable.dbg.json +1 -1
  74. package/artifacts/contracts/registry/IRegistry.sol/IRegisterable.json +6 -6
  75. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  76. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +41 -33
  77. package/artifacts/contracts/registry/IRegistry.sol/IRegistryLinked.dbg.json +1 -1
  78. package/artifacts/contracts/registry/Registry.sol/Registerable.dbg.json +1 -1
  79. package/artifacts/contracts/registry/Registry.sol/Registerable.json +7 -7
  80. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  81. package/artifacts/contracts/registry/Registry.sol/Registry.json +100 -42
  82. package/artifacts/contracts/registry/Registry.sol/RegistryLinked.dbg.json +1 -1
  83. package/artifacts/contracts/registry/Registry.sol/RegistryLinked.json +2 -2
  84. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +4 -0
  85. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.json +174 -0
  86. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  87. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.json +2 -2
  88. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +4 -0
  89. package/artifacts/contracts/types/NftId.sol/NftIdLib.json +92 -0
  90. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +4 -0
  91. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +174 -0
  92. package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.dbg.json +4 -0
  93. package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.json +453 -0
  94. package/contracts/components/Component.sol +3 -3
  95. package/contracts/components/IProduct.sol +2 -1
  96. package/contracts/components/Product.sol +5 -4
  97. package/contracts/experiment/errors/Require.sol +33 -0
  98. package/contracts/experiment/errors/Revert.sol +39 -0
  99. package/contracts/instance/IInstance.sol +3 -3
  100. package/contracts/instance/Instance.sol +4 -3
  101. package/contracts/instance/component/ComponentModule.sol +32 -43
  102. package/contracts/instance/component/IComponent.sol +11 -10
  103. package/contracts/instance/policy/IPolicy.sol +8 -8
  104. package/contracts/instance/policy/PolicyModule.sol +12 -11
  105. package/contracts/instance/pool/IPoolModule.sol +6 -5
  106. package/contracts/instance/pool/PoolModule.sol +9 -6
  107. package/contracts/instance/product/IProductService.sol +5 -4
  108. package/contracts/instance/product/ProductService.sol +14 -11
  109. package/contracts/registry/ChainNft.sol +173 -0
  110. package/contracts/registry/IChainNft.sol +18 -0
  111. package/contracts/registry/IRegistry.sol +16 -12
  112. package/contracts/registry/Registry.sol +43 -58
  113. package/contracts/types/Blocknumber.sol +60 -0
  114. package/contracts/types/ChainId.sol +7 -1
  115. package/contracts/types/NftId.sol +35 -0
  116. package/contracts/types/Timestamp.sol +55 -0
  117. package/contracts/types/UFixed.sol +211 -0
  118. package/package.json +1 -1
@@ -0,0 +1,211 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.19;
3
+
4
+ import { Math } from "@openzeppelin/contracts/utils/math/Math.sol";
5
+
6
+ /// @dev UFixed is a fixed point number with 18 decimals precision.
7
+ type UFixed is uint256;
8
+
9
+ using {
10
+ addUFixed as +,
11
+ subUFixed as -,
12
+ mulUFixed as *,
13
+ divUFixed as /,
14
+ gtUFixed as >,
15
+ gteUFixed as >=,
16
+ ltUFixed as <,
17
+ lteUFixed as <=,
18
+ eqUFixed as ==
19
+ } for UFixed global;
20
+
21
+ function addUFixed(UFixed a, UFixed b) pure returns(UFixed) {
22
+ return UFixed.wrap(UFixed.unwrap(a) + UFixed.unwrap(b));
23
+ }
24
+
25
+ function subUFixed(UFixed a, UFixed b) pure returns(UFixed) {
26
+ require(a >= b, "ERROR:UFM-010:NEGATIVE_RESULT");
27
+ return UFixed.wrap(UFixed.unwrap(a) - UFixed.unwrap(b));
28
+ }
29
+
30
+ function mulUFixed(UFixed a, UFixed b) pure returns(UFixed) {
31
+ return UFixed.wrap(Math.mulDiv(UFixed.unwrap(a), UFixed.unwrap(b), 10 ** 18));
32
+ }
33
+
34
+ function divUFixed(UFixed a, UFixed b) pure returns(UFixed) {
35
+ require(UFixed.unwrap(b) > 0, "ERROR:UFM-020:DIVISOR_ZERO");
36
+
37
+ return UFixed.wrap(
38
+ Math.mulDiv(
39
+ UFixed.unwrap(a),
40
+ 10 ** 18,
41
+ UFixed.unwrap(b)));
42
+ }
43
+
44
+ function gtUFixed(UFixed a, UFixed b) pure returns(bool isGreaterThan) {
45
+ return UFixed.unwrap(a) > UFixed.unwrap(b);
46
+ }
47
+
48
+ function gteUFixed(UFixed a, UFixed b) pure returns(bool isGreaterThan) {
49
+ return UFixed.unwrap(a) >= UFixed.unwrap(b);
50
+ }
51
+
52
+ function ltUFixed(UFixed a, UFixed b) pure returns(bool isGreaterThan) {
53
+ return UFixed.unwrap(a) < UFixed.unwrap(b);
54
+ }
55
+
56
+ function lteUFixed(UFixed a, UFixed b) pure returns(bool isGreaterThan) {
57
+ return UFixed.unwrap(a) <= UFixed.unwrap(b);
58
+ }
59
+
60
+ function eqUFixed(UFixed a, UFixed b) pure returns(bool isEqual) {
61
+ return UFixed.unwrap(a) == UFixed.unwrap(b);
62
+ }
63
+
64
+ function gtzUFixed(UFixed a) pure returns(bool isZero) {
65
+ return UFixed.unwrap(a) > 0;
66
+ }
67
+
68
+ function eqzUFixed(UFixed a) pure returns(bool isZero) {
69
+ return UFixed.unwrap(a) == 0;
70
+ }
71
+
72
+ function deltaUFixed(UFixed a, UFixed b) pure returns(UFixed) {
73
+ if(a > b) {
74
+ return a - b;
75
+ }
76
+
77
+ return b - a;
78
+ }
79
+
80
+ library UFixedMathLib {
81
+
82
+ enum Rounding {
83
+ /// @dev Round down - floor(value)
84
+ Down,
85
+ /// @dev Round up - ceil(value)
86
+ Up,
87
+ /// @dev Round half up - round(value)
88
+ HalfUp
89
+ }
90
+
91
+ int8 public constant EXP = 18;
92
+ uint256 public constant MULTIPLIER = 10 ** uint256(int256(EXP));
93
+ uint256 public constant MULTIPLIER_HALF = MULTIPLIER / 2;
94
+
95
+ /// @dev Default rounding mode used by ftoi is HalfUp
96
+ Rounding public constant ROUNDING_DEFAULT = Rounding.HalfUp;
97
+
98
+ /// @dev returns the decimals precision of the UFixed type
99
+ function decimals() public pure returns(uint256) {
100
+ return uint8(EXP);
101
+ }
102
+
103
+ /// @dev Converts the uint256 to a UFixed.
104
+ function itof(uint256 a)
105
+ public
106
+ pure
107
+ returns(UFixed)
108
+ {
109
+ return UFixed.wrap(a * MULTIPLIER);
110
+ }
111
+
112
+ /// @dev Converts the uint256 to a UFixed with given exponent.
113
+ function itof(uint256 a, int8 exp)
114
+ public
115
+ pure
116
+ returns(UFixed)
117
+ {
118
+ require(EXP + exp >= 0, "ERROR:FM-010:EXPONENT_TOO_SMALL");
119
+ require(EXP + exp <= 2 * EXP, "ERROR:FM-011:EXPONENT_TOO_LARGE");
120
+
121
+ return UFixed.wrap(a * 10 ** uint8(EXP + exp));
122
+ }
123
+
124
+ /// @dev Converts a UFixed to a uint256.
125
+ function ftoi(UFixed a)
126
+ public
127
+ pure
128
+ returns(uint256)
129
+ {
130
+ return ftoi(a, ROUNDING_DEFAULT);
131
+ }
132
+
133
+ /// @dev Converts a UFixed to a uint256 with given rounding mode.
134
+ function ftoi(UFixed a, Rounding rounding)
135
+ public
136
+ pure
137
+ returns(uint256)
138
+ {
139
+ if(rounding == Rounding.HalfUp) {
140
+ return Math.mulDiv(UFixed.unwrap(a) + MULTIPLIER_HALF, 1, MULTIPLIER, Math.Rounding.Down);
141
+ } else if(rounding == Rounding.Down) {
142
+ return Math.mulDiv(UFixed.unwrap(a), 1, MULTIPLIER, Math.Rounding.Down);
143
+ } else {
144
+ return Math.mulDiv(UFixed.unwrap(a), 1, MULTIPLIER, Math.Rounding.Up);
145
+ }
146
+ }
147
+
148
+ /// @dev adds two UFixed numbers
149
+ function add(UFixed a, UFixed b) public pure returns(UFixed) {
150
+ return addUFixed(a, b);
151
+ }
152
+
153
+ /// @dev subtracts two UFixed numbers
154
+ function sub(UFixed a, UFixed b) public pure returns(UFixed) {
155
+ return subUFixed(a, b);
156
+ }
157
+
158
+ /// @dev multiplies two UFixed numbers
159
+ function mul(UFixed a, UFixed b) public pure returns(UFixed) {
160
+ return mulUFixed(a, b);
161
+ }
162
+
163
+ /// @dev divides two UFixed numbers
164
+ function div(UFixed a, UFixed b) public pure returns(UFixed) {
165
+ return divUFixed(a, b);
166
+ }
167
+
168
+ /// @dev return true if UFixed a is greater than UFixed b
169
+ function gt(UFixed a, UFixed b) public pure returns(bool isGreaterThan) {
170
+ return gtUFixed(a, b);
171
+ }
172
+
173
+ /// @dev return true if UFixed a is greater than or equal to UFixed b
174
+ function gte(UFixed a, UFixed b) public pure returns(bool isGreaterThan) {
175
+ return gteUFixed(a, b);
176
+ }
177
+
178
+ /// @dev return true if UFixed a is less than UFixed b
179
+ function lt(UFixed a, UFixed b) public pure returns(bool isGreaterThan) {
180
+ return ltUFixed(a, b);
181
+ }
182
+
183
+ /// @dev return true if UFixed a is less than or equal to UFixed b
184
+ function lte(UFixed a, UFixed b) public pure returns(bool isGreaterThan) {
185
+ return lteUFixed(a, b);
186
+ }
187
+
188
+ /// @dev return true if UFixed a is equal to UFixed b
189
+ function eq(UFixed a, UFixed b) public pure returns(bool isEqual) {
190
+ return eqUFixed(a, b);
191
+ }
192
+
193
+ /// @dev return true if UFixed a is not zero
194
+ function gtz(UFixed a) public pure returns(bool isZero) {
195
+ return gtzUFixed(a);
196
+ }
197
+
198
+ /// @dev return true if UFixed a is zero
199
+ function eqz(UFixed a) public pure returns(bool isZero) {
200
+ return eqzUFixed(a);
201
+ }
202
+
203
+ function zero() public pure returns(UFixed) {
204
+ return UFixed.wrap(0);
205
+ }
206
+
207
+ /// @dev return the absolute delta between two UFixed numbers
208
+ function delta(UFixed a, UFixed b) public pure returns(UFixed) {
209
+ return deltaUFixed(a, b);
210
+ }
211
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@etherisc/gif-next",
3
- "version": "0.0.2-f9905e1",
3
+ "version": "0.0.2-ffba655",
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": {