@etherisc/gif-next 0.0.2-d250c72 → 0.0.2-e5ea33d

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