@etherisc/gif-next 0.0.2-ed4dd55 → 0.0.2-f74fcad-685

Sign up to get free protection for your applications and to get access to all the features.
Files changed (183) hide show
  1. package/README.md +33 -0
  2. package/artifacts/contracts/components/Component.sol/Component.dbg.json +1 -1
  3. package/artifacts/contracts/components/Component.sol/Component.json +35 -9
  4. package/artifacts/contracts/components/Component.sol/InstanceLinked.dbg.json +1 -1
  5. package/artifacts/contracts/components/Component.sol/InstanceLinked.json +2 -2
  6. package/artifacts/contracts/components/IPool.sol/IPoolComponent.dbg.json +1 -1
  7. package/artifacts/contracts/components/IPool.sol/IPoolComponent.json +84 -8
  8. package/artifacts/contracts/components/IProduct.sol/IProductComponent.dbg.json +1 -1
  9. package/artifacts/contracts/components/IProduct.sol/IProductComponent.json +34 -152
  10. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  11. package/artifacts/contracts/components/Pool.sol/Pool.json +146 -13
  12. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  13. package/artifacts/contracts/components/Product.sol/Product.json +148 -15
  14. package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +4 -0
  15. package/artifacts/contracts/experiment/errors/Require.sol/Require.json +105 -0
  16. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +4 -0
  17. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.json +105 -0
  18. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +1 -1
  19. package/artifacts/contracts/experiment/inheritance/A.sol/A.json +2 -2
  20. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +1 -1
  21. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.json +2 -2
  22. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +1 -1
  23. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +1 -1
  24. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +1 -1
  25. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +1 -1
  26. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +1 -1
  27. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +1 -1
  28. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +4 -0
  29. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +59 -0
  30. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +4 -0
  31. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.json +124 -0
  32. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +4 -0
  33. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.json +74 -0
  34. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +4 -0
  35. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +124 -0
  36. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +4 -0
  37. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +207 -0
  38. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
  39. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.json +2 -2
  40. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
  41. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.json +2 -2
  42. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  43. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +714 -127
  44. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  45. package/artifacts/contracts/instance/Instance.sol/Instance.json +845 -129
  46. package/artifacts/contracts/instance/access/Access.sol/AccessModule.dbg.json +1 -1
  47. package/artifacts/contracts/instance/access/IAccess.sol/IAccess.dbg.json +1 -1
  48. package/artifacts/contracts/instance/access/IAccess.sol/IAccessCheckRole.dbg.json +1 -1
  49. package/artifacts/contracts/instance/access/IAccess.sol/IAccessComponentTypeRoles.dbg.json +1 -1
  50. package/artifacts/contracts/instance/access/IAccess.sol/IAccessModule.dbg.json +1 -1
  51. package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentModule.dbg.json +1 -1
  52. package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentModule.json +31 -59
  53. package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentOwnerService.dbg.json +1 -1
  54. package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentOwnerService.json +103 -6
  55. package/artifacts/contracts/instance/component/IComponent.sol/IComponent.dbg.json +1 -1
  56. package/artifacts/contracts/instance/component/IComponent.sol/IComponentContract.dbg.json +1 -1
  57. package/artifacts/contracts/instance/component/IComponent.sol/IComponentContract.json +34 -8
  58. package/artifacts/contracts/instance/component/IComponent.sol/IComponentModule.dbg.json +1 -1
  59. package/artifacts/contracts/instance/component/IComponent.sol/IComponentModule.json +31 -59
  60. package/artifacts/contracts/instance/component/IComponent.sol/IComponentOwnerService.dbg.json +1 -1
  61. package/artifacts/contracts/instance/component/IComponent.sol/IComponentOwnerService.json +50 -3
  62. package/artifacts/contracts/instance/component/IComponent.sol/IInstanceLinked.dbg.json +1 -1
  63. package/artifacts/contracts/instance/lifecycle/ILifecycle.sol/ILifecycle.dbg.json +4 -0
  64. package/artifacts/contracts/instance/lifecycle/ILifecycle.sol/ILifecycle.json +134 -0
  65. package/artifacts/contracts/instance/lifecycle/ILifecycle.sol/ILifecycleModule.dbg.json +4 -0
  66. package/artifacts/contracts/instance/lifecycle/ILifecycle.sol/ILifecycleModule.json +182 -0
  67. package/artifacts/contracts/instance/lifecycle/LifecycleModule.sol/LifecycleModule.dbg.json +4 -0
  68. package/artifacts/contracts/instance/lifecycle/LifecycleModule.sol/LifecycleModule.json +221 -0
  69. package/artifacts/contracts/instance/policy/IPolicy.sol/IPolicy.dbg.json +1 -1
  70. package/artifacts/contracts/instance/policy/IPolicy.sol/IPolicyModule.dbg.json +1 -1
  71. package/artifacts/contracts/instance/policy/IPolicy.sol/IPolicyModule.json +44 -21
  72. package/artifacts/contracts/instance/policy/PolicyModule.sol/PolicyModule.dbg.json +1 -1
  73. package/artifacts/contracts/instance/policy/PolicyModule.sol/PolicyModule.json +44 -21
  74. package/artifacts/contracts/instance/pool/IPoolModule.sol/IPool.dbg.json +1 -1
  75. package/artifacts/contracts/instance/pool/IPoolModule.sol/IPoolModule.dbg.json +1 -1
  76. package/artifacts/contracts/instance/pool/IPoolModule.sol/IPoolModule.json +23 -43
  77. package/artifacts/contracts/instance/pool/PoolModule.sol/PoolModule.dbg.json +1 -1
  78. package/artifacts/contracts/instance/pool/PoolModule.sol/PoolModule.json +28 -35
  79. package/artifacts/contracts/instance/product/IProductService.sol/IProductModule.dbg.json +1 -1
  80. package/artifacts/contracts/instance/product/IProductService.sol/IProductService.dbg.json +1 -1
  81. package/artifacts/contracts/instance/product/IProductService.sol/IProductService.json +21 -8
  82. package/artifacts/contracts/instance/product/ProductService.sol/ProductModule.dbg.json +1 -1
  83. package/artifacts/contracts/instance/product/ProductService.sol/ProductService.dbg.json +1 -1
  84. package/artifacts/contracts/instance/product/ProductService.sol/ProductService.json +85 -14
  85. package/artifacts/contracts/instance/treasury/ITreasury.sol/ITreasury.dbg.json +4 -0
  86. package/artifacts/contracts/instance/treasury/ITreasury.sol/ITreasury.json +10 -0
  87. package/artifacts/contracts/instance/treasury/ITreasury.sol/ITreasuryModule.dbg.json +4 -0
  88. package/artifacts/contracts/instance/treasury/ITreasury.sol/ITreasuryModule.json +490 -0
  89. package/artifacts/contracts/instance/treasury/TokenHandler.sol/TokenHandler.dbg.json +4 -0
  90. package/artifacts/contracts/instance/treasury/TokenHandler.sol/TokenHandler.json +45 -0
  91. package/artifacts/contracts/instance/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +4 -0
  92. package/artifacts/contracts/instance/treasury/TreasuryModule.sol/TreasuryModule.json +490 -0
  93. package/artifacts/contracts/mock/Dip.sol/DIP.dbg.json +4 -0
  94. package/artifacts/contracts/mock/Dip.sol/DIP.json +338 -0
  95. package/artifacts/contracts/mock/TestPool.sol/TestPool.dbg.json +4 -0
  96. package/artifacts/contracts/mock/TestPool.sol/TestPool.json +294 -0
  97. package/artifacts/contracts/mock/TestProduct.sol/TestProduct.dbg.json +4 -0
  98. package/artifacts/contracts/mock/TestProduct.sol/TestProduct.json +384 -0
  99. package/artifacts/contracts/mock/Usdc.sol/USDC.dbg.json +4 -0
  100. package/artifacts/contracts/mock/Usdc.sol/USDC.json +338 -0
  101. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  102. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +2 -2
  103. package/artifacts/contracts/registry/IChainNft.sol/IChainNft.dbg.json +1 -1
  104. package/artifacts/contracts/registry/IRegistry.sol/IOwnable.dbg.json +1 -1
  105. package/artifacts/contracts/registry/IRegistry.sol/IRegisterable.dbg.json +1 -1
  106. package/artifacts/contracts/registry/IRegistry.sol/IRegisterable.json +8 -8
  107. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  108. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +20 -111
  109. package/artifacts/contracts/registry/IRegistry.sol/IRegistryLinked.dbg.json +1 -1
  110. package/artifacts/contracts/registry/Registry.sol/Registerable.dbg.json +1 -1
  111. package/artifacts/contracts/registry/Registry.sol/Registerable.json +9 -9
  112. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  113. package/artifacts/contracts/registry/Registry.sol/Registry.json +66 -115
  114. package/artifacts/contracts/registry/Registry.sol/RegistryLinked.dbg.json +1 -1
  115. package/artifacts/contracts/registry/Registry.sol/RegistryLinked.json +2 -2
  116. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +4 -0
  117. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.json +174 -0
  118. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  119. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.json +2 -2
  120. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  121. package/artifacts/contracts/types/NftId.sol/NftIdLib.json +85 -3
  122. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +4 -0
  123. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +92 -0
  124. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +4 -0
  125. package/artifacts/contracts/types/StateId.sol/StateIdLib.json +92 -0
  126. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +4 -0
  127. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +174 -0
  128. package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.dbg.json +4 -0
  129. package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.json +479 -0
  130. package/contracts/components/Component.sol +39 -24
  131. package/contracts/components/IPool.sol +9 -3
  132. package/contracts/components/IProduct.sol +11 -6
  133. package/contracts/components/Pool.sol +37 -14
  134. package/contracts/components/Product.sol +48 -24
  135. package/contracts/experiment/errors/Require.sol +38 -0
  136. package/contracts/experiment/errors/Revert.sol +44 -0
  137. package/contracts/experiment/inheritance/A.sol +8 -11
  138. package/contracts/experiment/inheritance/B.sol +10 -5
  139. package/contracts/experiment/inheritance/C.sol +11 -5
  140. package/contracts/experiment/inheritance/IA.sol +2 -7
  141. package/contracts/experiment/inheritance/IB.sol +3 -2
  142. package/contracts/experiment/inheritance/IC.sol +4 -3
  143. package/contracts/experiment/statemachine/Dummy.sol +27 -0
  144. package/contracts/experiment/statemachine/ISM.sol +25 -0
  145. package/contracts/experiment/statemachine/README.md +112 -0
  146. package/contracts/experiment/statemachine/SM.sol +57 -0
  147. package/contracts/experiment/statemachine/SimpleStateMachine.sol +31 -0
  148. package/contracts/experiment/types/TypeA.sol +14 -9
  149. package/contracts/experiment/types/TypeB.sol +14 -9
  150. package/contracts/instance/IInstance.sol +8 -3
  151. package/contracts/instance/Instance.sol +24 -15
  152. package/contracts/instance/access/Access.sol +63 -116
  153. package/contracts/instance/access/IAccess.sol +28 -48
  154. package/contracts/instance/component/ComponentModule.sol +162 -147
  155. package/contracts/instance/component/IComponent.sol +41 -61
  156. package/contracts/instance/lifecycle/ILifecycle.sol +47 -0
  157. package/contracts/instance/lifecycle/LifecycleModule.sol +88 -0
  158. package/contracts/instance/policy/IPolicy.sol +19 -35
  159. package/contracts/instance/policy/PolicyModule.sol +52 -44
  160. package/contracts/instance/pool/IPoolModule.sol +9 -26
  161. package/contracts/instance/pool/PoolModule.sol +43 -45
  162. package/contracts/instance/product/IProductService.sol +10 -19
  163. package/contracts/instance/product/ProductService.sol +86 -55
  164. package/contracts/instance/treasury/ITreasury.sol +91 -0
  165. package/contracts/instance/treasury/TokenHandler.sol +24 -0
  166. package/contracts/instance/treasury/TreasuryModule.sol +168 -0
  167. package/contracts/mock/Dip.sol +26 -0
  168. package/contracts/mock/TestPool.sol +16 -0
  169. package/contracts/mock/TestProduct.sol +39 -0
  170. package/contracts/mock/Usdc.sol +26 -0
  171. package/contracts/registry/ChainNft.sol +23 -61
  172. package/contracts/registry/IChainNft.sol +10 -7
  173. package/contracts/registry/IRegistry.sol +40 -41
  174. package/contracts/registry/Registry.sol +73 -67
  175. package/contracts/types/Blocknumber.sol +118 -0
  176. package/contracts/types/ChainId.sol +24 -10
  177. package/contracts/types/Fee.sol +32 -0
  178. package/contracts/types/NftId.sol +36 -10
  179. package/contracts/types/ObjectType.sol +107 -0
  180. package/contracts/types/StateId.sol +91 -0
  181. package/contracts/types/Timestamp.sol +102 -0
  182. package/contracts/types/UFixed.sol +210 -0
  183. package/package.json +14 -5
@@ -1,24 +1,38 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.19;
3
3
 
4
- // bytes5 (uint40) allows for chain ids up to 13 digits
4
+ /// @dev bytes5 (uint40) allows for chain ids up to 13 digits
5
5
  type ChainId is bytes5;
6
6
 
7
7
  // type bindings
8
- using {
9
- eqChainId as ==,
10
- neChainId as !=,
11
- ChainIdLib.toInt
12
- } for ChainId global;
8
+ using {eqChainId as ==, neChainId as !=, ChainIdLib.toInt} for ChainId global;
13
9
 
14
10
  // general pure free functions
15
- function toChainId(uint256 chainId) pure returns(ChainId) { return ChainId.wrap(bytes5(uint40(chainId))); }
11
+ /// @dev Converts the uint256 to a ChainId.
12
+ function toChainId(uint256 chainId) pure returns (ChainId) {
13
+ return ChainId.wrap(bytes5(uint40(chainId)));
14
+ }
15
+
16
+ /// @dev Return the ChainId for the chain the contract is deployed to
17
+ function thisChainId() view returns (ChainId) {
18
+ return toChainId(block.chainid);
19
+ }
16
20
 
17
21
  // pure free functions for operators
18
- function eqChainId(ChainId a, ChainId b) pure returns(bool isSame) { return ChainId.unwrap(a) == ChainId.unwrap(b); }
19
- function neChainId(ChainId a, ChainId b) pure returns(bool isDifferent) { return ChainId.unwrap(a) != ChainId.unwrap(b); }
22
+ /// @dev Returns true if the values are equal (==).
23
+ function eqChainId(ChainId a, ChainId b) pure returns (bool isSame) {
24
+ return ChainId.unwrap(a) == ChainId.unwrap(b);
25
+ }
26
+
27
+ /// @dev Returns true if the values are not equal (!=).
28
+ function neChainId(ChainId a, ChainId b) pure returns (bool isDifferent) {
29
+ return ChainId.unwrap(a) != ChainId.unwrap(b);
30
+ }
20
31
 
21
32
  // library functions that operate on user defined type
22
33
  library ChainIdLib {
23
- function toInt(ChainId chainId) internal pure returns(uint256) { return uint256(uint40(ChainId.unwrap(chainId))); }
34
+ /// @dev Converts the ChainId to a uint256.
35
+ function toInt(ChainId chainId) internal pure returns (uint256) {
36
+ return uint256(uint40(ChainId.unwrap(chainId)));
37
+ }
24
38
  }
@@ -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
+ }
@@ -5,21 +5,47 @@ pragma solidity ^0.8.19;
5
5
  type NftId is uint96;
6
6
 
7
7
  // type bindings
8
- using {
9
- eqNftId as ==,
10
- neNftId as !=,
11
- NftIdLib.toInt
12
- } for NftId global;
8
+ using {eqNftId as ==, neNftId as !=, NftIdLib.toInt} for NftId global;
13
9
 
14
10
  // general pure free functions
15
- function toNftId(uint256 id) pure returns(NftId) { return NftId.wrap(uint96(id)); }
16
- function gtz(NftId a) pure returns(bool) { return NftId.unwrap(a) > 0; }
11
+ /// @dev Converts the uint256 to a NftId.
12
+ function toNftId(uint256 id) pure returns (NftId) {
13
+ return NftId.wrap(uint96(id));
14
+ }
15
+
16
+ /// @dev Return the NftId zero (0)
17
+ function zeroNftId() pure returns (NftId) {
18
+ return NftId.wrap(0);
19
+ }
17
20
 
18
21
  // pure free functions for operators
19
- function eqNftId(NftId a, NftId b) pure returns(bool isSame) { return NftId.unwrap(a) == NftId.unwrap(b); }
20
- function neNftId(NftId a, NftId b) pure returns(bool isDifferent) { return NftId.unwrap(a) != NftId.unwrap(b); }
22
+ function eqNftId(NftId a, NftId b) pure returns (bool isSame) {
23
+ return NftId.unwrap(a) == NftId.unwrap(b);
24
+ }
25
+
26
+ function neNftId(NftId a, NftId b) pure returns (bool isDifferent) {
27
+ return NftId.unwrap(a) != NftId.unwrap(b);
28
+ }
21
29
 
22
30
  // library functions that operate on user defined type
23
31
  library NftIdLib {
24
- function toInt(NftId nftId) internal pure returns(uint256) { return uint256(NftId.unwrap(nftId)); }
32
+ /// @dev Converts the NftId to a uint256.
33
+ function toInt(NftId nftId) public pure returns (uint96) {
34
+ return uint96(NftId.unwrap(nftId));
35
+ }
36
+
37
+ /// @dev Returns true if the value is non-zero (> 0).
38
+ function gtz(NftId a) public pure returns (bool) {
39
+ return NftId.unwrap(a) > 0;
40
+ }
41
+
42
+ /// @dev Returns true if the value is zero (== 0).
43
+ function eqz(NftId a) public pure returns (bool) {
44
+ return NftId.unwrap(a) == 0;
45
+ }
46
+
47
+ /// @dev Returns true if the values are equal (==).
48
+ function eq(NftId a, NftId b) public pure returns (bool isSame) {
49
+ return eqNftId(a, b);
50
+ }
25
51
  }
@@ -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
+ }
@@ -0,0 +1,102 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.19;
3
+
4
+ type Timestamp is uint40;
5
+
6
+ using {
7
+ gtTimestamp as >,
8
+ gteTimestamp as >=,
9
+ ltTimestamp as <,
10
+ lteTimestamp as <=,
11
+ eqTimestamp as ==,
12
+ neTimestamp as !=
13
+ } for Timestamp global;
14
+
15
+ /// @dev return true if Timestamp a is after Timestamp b
16
+ function gtTimestamp(Timestamp a, Timestamp b) pure returns (bool) {
17
+ return Timestamp.unwrap(a) > Timestamp.unwrap(b);
18
+ }
19
+
20
+ /// @dev return true if Timestamp a is after or equal to Timestamp b
21
+ function gteTimestamp(Timestamp a, Timestamp b) pure returns (bool) {
22
+ return Timestamp.unwrap(a) >= Timestamp.unwrap(b);
23
+ }
24
+
25
+ /// @dev return true if Timestamp a is before Timestamp b
26
+ function ltTimestamp(Timestamp a, Timestamp b) pure returns (bool) {
27
+ return Timestamp.unwrap(a) < Timestamp.unwrap(b);
28
+ }
29
+
30
+ /// @dev return true if Timestamp a is before or equal to Timestamp b
31
+ function lteTimestamp(Timestamp a, Timestamp b) pure returns (bool) {
32
+ return Timestamp.unwrap(a) <= Timestamp.unwrap(b);
33
+ }
34
+
35
+ /// @dev return true if Timestamp a is equal to Timestamp b
36
+ function eqTimestamp(Timestamp a, Timestamp b) pure returns (bool) {
37
+ return Timestamp.unwrap(a) == Timestamp.unwrap(b);
38
+ }
39
+
40
+ /// @dev return true if Timestamp a is not equal to Timestamp b
41
+ function neTimestamp(Timestamp a, Timestamp b) pure returns (bool) {
42
+ return Timestamp.unwrap(a) != Timestamp.unwrap(b);
43
+ }
44
+
45
+ /// @dev Converts the uint256 to a Timestamp.
46
+ function toTimestamp(uint256 timestamp) pure returns (Timestamp) {
47
+ return Timestamp.wrap(uint40(timestamp));
48
+ }
49
+
50
+ function blockTimestamp() view returns (Timestamp) {
51
+ return toTimestamp(block.timestamp);
52
+ }
53
+
54
+ /// @dev Return the Timestamp zero (0)
55
+ function zeroTimestamp() pure returns (Timestamp) {
56
+ return toTimestamp(0);
57
+ }
58
+
59
+ library TimestampLib {
60
+ /// @dev return true if Timestamp a is after Timestamp b
61
+ function gt(Timestamp a, Timestamp b) public pure returns (bool isAfter) {
62
+ return gtTimestamp(a, b);
63
+ }
64
+
65
+ /// @dev return true if Timestamp a is after or the same than Timestamp b
66
+ function gte(
67
+ Timestamp a,
68
+ Timestamp b
69
+ ) public pure returns (bool isAfterOrSame) {
70
+ return gteTimestamp(a, b);
71
+ }
72
+
73
+ /// @dev return true if Timestamp a is before Timestamp b
74
+ function lt(Timestamp a, Timestamp b) public pure returns (bool isBefore) {
75
+ return ltTimestamp(a, b);
76
+ }
77
+
78
+ /// @dev return true if Timestamp a is before or the same than Timestamp b
79
+ function lte(
80
+ Timestamp a,
81
+ Timestamp b
82
+ ) public pure returns (bool isBeforeOrSame) {
83
+ return lteTimestamp(a, b);
84
+ }
85
+
86
+ /// @dev return true if Timestamp a is equal to Timestamp b
87
+ function eq(Timestamp a, Timestamp b) public pure returns (bool isSame) {
88
+ return eqTimestamp(a, b);
89
+ }
90
+
91
+ /// @dev return true if Timestamp a is not equal to Timestamp b
92
+ function ne(
93
+ Timestamp a,
94
+ Timestamp b
95
+ ) public pure returns (bool isDifferent) {
96
+ return neTimestamp(a, b);
97
+ }
98
+
99
+ function toInt(Timestamp timestamp) public pure returns (uint256) {
100
+ return uint256(uint40(Timestamp.unwrap(timestamp)));
101
+ }
102
+ }
@@ -0,0 +1,210 @@
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
+
80
+ int8 public constant EXP = 18;
81
+ uint256 public constant MULTIPLIER = 10 ** uint256(int256(EXP));
82
+ uint256 public constant MULTIPLIER_HALF = MULTIPLIER / 2;
83
+
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
+ }
98
+
99
+ /// @dev returns the decimals precision of the UFixed type
100
+ function decimals() public pure returns (uint256) {
101
+ return uint8(EXP);
102
+ }
103
+
104
+ /// @dev Converts the uint256 to a UFixed.
105
+ function itof(uint256 a) public pure returns (UFixed) {
106
+ return UFixed.wrap(a * MULTIPLIER);
107
+ }
108
+
109
+ // TODO rename to toUFixed
110
+ /// @dev Converts the uint256 to a UFixed with given exponent.
111
+ function itof(uint256 a, int8 exp) public pure returns (UFixed) {
112
+ require(EXP + exp >= 0, "ERROR:FM-010:EXPONENT_TOO_SMALL");
113
+ require(EXP + exp <= 64, "ERROR:FM-011:EXPONENT_TOO_LARGE");
114
+
115
+ return UFixed.wrap(a * 10 ** uint8(EXP + exp));
116
+ }
117
+
118
+ /// @dev Converts a UFixed to a uint256.
119
+ function ftoi(UFixed a) public pure returns (uint256) {
120
+ return ftoi(a, ROUNDING_HALF_UP());
121
+ }
122
+
123
+ /// @dev Converts a UFixed to a uint256 with given rounding mode.
124
+ function ftoi(UFixed a, uint8 rounding) public pure returns (uint256) {
125
+ if (rounding == ROUNDING_HALF_UP()) {
126
+ return
127
+ Math.mulDiv(
128
+ UFixed.unwrap(a) + MULTIPLIER_HALF,
129
+ 1,
130
+ MULTIPLIER,
131
+ Math.Rounding.Down
132
+ );
133
+ } else if (rounding == ROUNDING_DOWN()) {
134
+ return
135
+ Math.mulDiv(
136
+ UFixed.unwrap(a),
137
+ 1,
138
+ MULTIPLIER,
139
+ Math.Rounding.Down
140
+ );
141
+ } else {
142
+ return
143
+ Math.mulDiv(UFixed.unwrap(a), 1, MULTIPLIER, Math.Rounding.Up);
144
+ }
145
+ }
146
+
147
+ /// @dev adds two UFixed numbers
148
+ function add(UFixed a, UFixed b) public pure returns (UFixed) {
149
+ return addUFixed(a, b);
150
+ }
151
+
152
+ /// @dev subtracts two UFixed numbers
153
+ function sub(UFixed a, UFixed b) public pure returns (UFixed) {
154
+ return subUFixed(a, b);
155
+ }
156
+
157
+ /// @dev multiplies two UFixed numbers
158
+ function mul(UFixed a, UFixed b) public pure returns (UFixed) {
159
+ return mulUFixed(a, b);
160
+ }
161
+
162
+ /// @dev divides two UFixed numbers
163
+ function div(UFixed a, UFixed b) public pure returns (UFixed) {
164
+ return divUFixed(a, b);
165
+ }
166
+
167
+ /// @dev return true if UFixed a is greater than UFixed b
168
+ function gt(UFixed a, UFixed b) public pure returns (bool isGreaterThan) {
169
+ return gtUFixed(a, b);
170
+ }
171
+
172
+ /// @dev return true if UFixed a is greater than or equal to UFixed b
173
+ function gte(UFixed a, UFixed b) public pure returns (bool isGreaterThan) {
174
+ return gteUFixed(a, b);
175
+ }
176
+
177
+ /// @dev return true if UFixed a is less than UFixed b
178
+ function lt(UFixed a, UFixed b) public pure returns (bool isGreaterThan) {
179
+ return ltUFixed(a, b);
180
+ }
181
+
182
+ /// @dev return true if UFixed a is less than or equal to UFixed b
183
+ function lte(UFixed a, UFixed b) public pure returns (bool isGreaterThan) {
184
+ return lteUFixed(a, b);
185
+ }
186
+
187
+ /// @dev return true if UFixed a is equal to UFixed b
188
+ function eq(UFixed a, UFixed b) public pure returns (bool isEqual) {
189
+ return eqUFixed(a, b);
190
+ }
191
+
192
+ /// @dev return true if UFixed a is not zero
193
+ function gtz(UFixed a) public pure returns (bool isZero) {
194
+ return gtzUFixed(a);
195
+ }
196
+
197
+ /// @dev return true if UFixed a is zero
198
+ function eqz(UFixed a) public pure returns (bool isZero) {
199
+ return eqzUFixed(a);
200
+ }
201
+
202
+ function zero() public pure returns (UFixed) {
203
+ return UFixed.wrap(0);
204
+ }
205
+
206
+ /// @dev return the absolute delta between two UFixed numbers
207
+ function delta(UFixed a, UFixed b) public pure returns (UFixed) {
208
+ return deltaUFixed(a, b);
209
+ }
210
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@etherisc/gif-next",
3
- "version": "0.0.2-ed4dd55",
3
+ "version": "0.0.2-f74fcad-685",
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,10 @@
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
+ "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'"
12
15
  },
13
16
  "repository": {
14
17
  "type": "git",
@@ -25,13 +28,19 @@
25
28
  ],
26
29
  "homepage": "https://github.com/etherisc/gif-next#readme",
27
30
  "devDependencies": {
28
- "@nomicfoundation/hardhat-foundry": "^1.0.3",
31
+ "@nomicfoundation/hardhat-foundry": "^1.1.1",
29
32
  "@nomicfoundation/hardhat-toolbox": "^3.0.0",
33
+ "@nomicfoundation/hardhat-verify": "^1.1.1",
30
34
  "dotenv": "^16.3.1",
31
- "hardhat": "^2.17.1"
35
+ "hardhat": "^2.17.2",
36
+ "prettier": "^3.0.3",
37
+ "prettier-plugin-solidity": "^1.1.3"
32
38
  },
33
39
  "dependencies": {
34
40
  "@openzeppelin/contracts": "^4.9.3",
35
- "@openzeppelin/contracts-upgradeable": "^4.9.3"
41
+ "@openzeppelin/contracts-upgradeable": "^4.9.3",
42
+ "abi-coder": "^5.0.0",
43
+ "ethers": "^6.7.1",
44
+ "winston": "^3.10.0"
36
45
  }
37
46
  }