@etherisc/gif-next 0.0.2-e6a90b9 → 0.0.2-eb7397c

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 (105) 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 +1 -1
  14. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +1 -1
  15. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +1 -1
  16. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +1 -1
  17. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +1 -1
  18. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +1 -1
  19. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +1 -1
  20. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +1 -1
  21. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +1 -1
  22. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +1 -1
  23. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
  24. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
  25. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  26. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +60 -60
  27. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  28. package/artifacts/contracts/instance/Instance.sol/Instance.json +122 -64
  29. package/artifacts/contracts/instance/access/Access.sol/AccessModule.dbg.json +1 -1
  30. package/artifacts/contracts/instance/access/IAccess.sol/IAccess.dbg.json +1 -1
  31. package/artifacts/contracts/instance/access/IAccess.sol/IAccessCheckRole.dbg.json +1 -1
  32. package/artifacts/contracts/instance/access/IAccess.sol/IAccessComponentTypeRoles.dbg.json +1 -1
  33. package/artifacts/contracts/instance/access/IAccess.sol/IAccessModule.dbg.json +1 -1
  34. package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentModule.dbg.json +1 -1
  35. package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentModule.json +24 -24
  36. package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentOwnerService.dbg.json +1 -1
  37. package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentOwnerService.json +48 -6
  38. package/artifacts/contracts/instance/component/IComponent.sol/IComponent.dbg.json +1 -1
  39. package/artifacts/contracts/instance/component/IComponent.sol/IComponentContract.dbg.json +1 -1
  40. package/artifacts/contracts/instance/component/IComponent.sol/IComponentContract.json +6 -6
  41. package/artifacts/contracts/instance/component/IComponent.sol/IComponentModule.dbg.json +1 -1
  42. package/artifacts/contracts/instance/component/IComponent.sol/IComponentModule.json +26 -26
  43. package/artifacts/contracts/instance/component/IComponent.sol/IComponentOwnerService.dbg.json +1 -1
  44. package/artifacts/contracts/instance/component/IComponent.sol/IComponentOwnerService.json +3 -3
  45. package/artifacts/contracts/instance/component/IComponent.sol/IInstanceLinked.dbg.json +1 -1
  46. package/artifacts/contracts/instance/policy/IPolicy.sol/IPolicy.dbg.json +1 -1
  47. package/artifacts/contracts/instance/policy/IPolicy.sol/IPolicyModule.dbg.json +1 -1
  48. package/artifacts/contracts/instance/policy/IPolicy.sol/IPolicyModule.json +18 -18
  49. package/artifacts/contracts/instance/policy/PolicyModule.sol/PolicyModule.dbg.json +1 -1
  50. package/artifacts/contracts/instance/policy/PolicyModule.sol/PolicyModule.json +18 -18
  51. package/artifacts/contracts/instance/pool/IPoolModule.sol/IPool.dbg.json +1 -1
  52. package/artifacts/contracts/instance/pool/IPoolModule.sol/IPoolModule.dbg.json +1 -1
  53. package/artifacts/contracts/instance/pool/IPoolModule.sol/IPoolModule.json +10 -10
  54. package/artifacts/contracts/instance/pool/PoolModule.sol/PoolModule.dbg.json +1 -1
  55. package/artifacts/contracts/instance/pool/PoolModule.sol/PoolModule.json +10 -10
  56. package/artifacts/contracts/instance/product/IProductService.sol/IProductModule.dbg.json +1 -1
  57. package/artifacts/contracts/instance/product/IProductService.sol/IProductService.dbg.json +1 -1
  58. package/artifacts/contracts/instance/product/IProductService.sol/IProductService.json +8 -8
  59. package/artifacts/contracts/instance/product/ProductService.sol/ProductModule.dbg.json +1 -1
  60. package/artifacts/contracts/instance/product/ProductService.sol/ProductService.dbg.json +1 -1
  61. package/artifacts/contracts/instance/product/ProductService.sol/ProductService.json +54 -12
  62. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  63. package/artifacts/contracts/registry/IChainNft.sol/IChainNft.dbg.json +1 -1
  64. package/artifacts/contracts/registry/IRegistry.sol/IOwnable.dbg.json +1 -1
  65. package/artifacts/contracts/registry/IRegistry.sol/IRegisterable.dbg.json +1 -1
  66. package/artifacts/contracts/registry/IRegistry.sol/IRegisterable.json +6 -6
  67. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  68. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +16 -16
  69. package/artifacts/contracts/registry/IRegistry.sol/IRegistryLinked.dbg.json +1 -1
  70. package/artifacts/contracts/registry/Registry.sol/Registerable.dbg.json +1 -1
  71. package/artifacts/contracts/registry/Registry.sol/Registerable.json +7 -7
  72. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  73. package/artifacts/contracts/registry/Registry.sol/Registry.json +62 -20
  74. package/artifacts/contracts/registry/Registry.sol/RegistryLinked.dbg.json +1 -1
  75. package/artifacts/contracts/registry/Registry.sol/RegistryLinked.json +2 -2
  76. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +4 -0
  77. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.json +174 -0
  78. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  79. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.json +2 -2
  80. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  81. package/artifacts/contracts/types/NftId.sol/NftIdLib.json +85 -3
  82. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +4 -0
  83. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +174 -0
  84. package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.dbg.json +4 -0
  85. package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.json +440 -0
  86. package/contracts/components/Component.sol +3 -3
  87. package/contracts/components/IProduct.sol +2 -1
  88. package/contracts/components/Product.sol +5 -4
  89. package/contracts/instance/Instance.sol +4 -3
  90. package/contracts/instance/component/ComponentModule.sol +31 -29
  91. package/contracts/instance/component/IComponent.sol +11 -10
  92. package/contracts/instance/policy/IPolicy.sol +8 -8
  93. package/contracts/instance/policy/PolicyModule.sol +12 -11
  94. package/contracts/instance/pool/IPoolModule.sol +6 -5
  95. package/contracts/instance/pool/PoolModule.sol +9 -6
  96. package/contracts/instance/product/IProductService.sol +5 -4
  97. package/contracts/instance/product/ProductService.sol +14 -11
  98. package/contracts/registry/IRegistry.sol +13 -11
  99. package/contracts/registry/Registry.sol +27 -21
  100. package/contracts/types/Blocknumber.sol +60 -0
  101. package/contracts/types/ChainId.sol +7 -1
  102. package/contracts/types/NftId.sol +12 -2
  103. package/contracts/types/Timestamp.sol +55 -0
  104. package/contracts/types/UFixed.sol +207 -0
  105. package/package.json +1 -1
@@ -3,6 +3,8 @@ pragma solidity ^0.8.19;
3
3
 
4
4
  import {IChainNft} from "./IChainNft.sol";
5
5
  import {IRegistry, IRegistryLinked, IRegisterable} from "./IRegistry.sol";
6
+ import {NftId, toNftId} from "../types/NftId.sol";
7
+ import {NftIdLib} from "../types/NftId.sol";
6
8
 
7
9
  contract RegistryLinked is IRegistryLinked {
8
10
 
@@ -23,6 +25,7 @@ abstract contract Registerable is
23
25
  RegistryLinked,
24
26
  IRegisterable
25
27
  {
28
+ using NftIdLib for NftId;
26
29
 
27
30
  address private _initialOwner;
28
31
 
@@ -43,15 +46,16 @@ abstract contract Registerable is
43
46
  }
44
47
 
45
48
  function isRegistered() public view override returns(bool) {
46
- return _registry.getNftId(address(this)) > 0;
49
+ NftId nftId = _registry.getNftId(address(this));
50
+ return nftId.gtz();
47
51
  }
48
52
 
49
- function getNftId() public view override returns(uint256 id) {
53
+ function getNftId() public view override returns(NftId nftId) {
50
54
  return _registry.getNftId(address(this));
51
55
  }
52
56
 
53
57
  function getOwner() public view override returns(address owner) {
54
- uint256 id = _registry.getNftId(address(this));
58
+ NftId id = _registry.getNftId(address(this));
55
59
  owner = _registry.getOwner(id);
56
60
  return owner != address(0) ? owner : _initialOwner;
57
61
  }
@@ -59,12 +63,12 @@ abstract contract Registerable is
59
63
  }
60
64
 
61
65
  contract Registry is IRegistry {
62
-
66
+ using NftIdLib for NftId;
63
67
  string public constant EMPTY_URI = "";
64
68
 
65
- mapping(uint256 id => RegistryInfo info) private _info;
66
- mapping(uint256 id => address owner) private _owner;
67
- mapping(address object => uint256 id) private _idByAddress;
69
+ mapping(NftId nftId => RegistryInfo info) private _info;
70
+ mapping(NftId nftId => address owner) private _owner;
71
+ mapping(address object => NftId nftId) private _nftIdByAddress;
68
72
 
69
73
  IChainNft private _chainNft;
70
74
 
@@ -81,8 +85,8 @@ contract Registry is IRegistry {
81
85
  function POLICY() public pure override returns(uint256) { return 80; }
82
86
  function BUNDLE() public pure override returns(uint256) { return 90; }
83
87
 
84
- function register(address objectAddress) external override returns(uint256 nftId) {
85
- require(_idByAddress[objectAddress] == 0, "ERROR:REG-002:ALREADY_REGISTERED");
88
+ function register(address objectAddress) external override returns(NftId nftId) {
89
+ require(_nftIdByAddress[objectAddress].eqz(), "ERROR:REG-002:ALREADY_REGISTERED");
86
90
 
87
91
  IRegisterable registerable = IRegisterable(objectAddress);
88
92
  require(registerable.isRegisterable(), "ERROR:REG-003:NOT_REGISTERABLE");
@@ -90,14 +94,15 @@ contract Registry is IRegistry {
90
94
  // check parent exists (for objects not instances)
91
95
  if(registerable.getType() != INSTANCE()) {
92
96
  RegistryInfo memory parentInfo = _info[registerable.getParentNftId()];
93
- require(parentInfo.nftId > 0, "ERROR:REG-004:PARENT_NOT_FOUND");
97
+ require(parentInfo.nftId.gtz(), "ERROR:REG-004:PARENT_NOT_FOUND");
94
98
  // check validity of parent relation, valid relations are
95
99
  // policy -> product, bundle -> pool, product -> instance, pool -> instance
96
100
  }
97
101
 
98
- nftId = _chainNft.mint(
102
+ uint256 mintedTokenId = _chainNft.mint(
99
103
  registerable.getInitialOwner(),
100
104
  EMPTY_URI);
105
+ nftId = toNftId(mintedTokenId);
101
106
 
102
107
  RegistryInfo memory info = RegistryInfo(
103
108
  nftId,
@@ -108,30 +113,31 @@ contract Registry is IRegistry {
108
113
  );
109
114
 
110
115
  _info[nftId] = info;
111
- _idByAddress[objectAddress] = nftId;
116
+ _nftIdByAddress[objectAddress] = nftId;
112
117
 
113
118
  // add logging
114
119
  }
115
120
 
116
121
 
117
122
  function registerObjectForInstance(
118
- uint256 parentNftId,
123
+ NftId parentNftId,
119
124
  uint256 objectType,
120
125
  address initialOwner
121
126
  )
122
127
  external
123
128
  override
124
129
  // TODO add onlyRegisteredInstance
125
- returns(uint256 nftId)
130
+ returns(NftId nftId)
126
131
  {
127
132
  // TODO add more validation
128
133
  require(
129
134
  objectType == POLICY() || objectType == BUNDLE(),
130
135
  "ERROR:REG-005:TYPE_INVALID");
131
136
 
132
- nftId = _chainNft.mint(
137
+ uint256 mintedTokenId = _chainNft.mint(
133
138
  initialOwner,
134
139
  EMPTY_URI);
140
+ nftId = toNftId(mintedTokenId);
135
141
 
136
142
  RegistryInfo memory info = RegistryInfo(
137
143
  nftId,
@@ -152,22 +158,22 @@ contract Registry is IRegistry {
152
158
  }
153
159
 
154
160
 
155
- function getNftId(address object) external view override returns(uint256 id) {
156
- return _idByAddress[object];
161
+ function getNftId(address object) external view override returns(NftId id) {
162
+ return _nftIdByAddress[object];
157
163
  }
158
164
 
159
165
 
160
166
  function isRegistered(address object) external view override returns(bool) {
161
- return _idByAddress[object] > 0;
167
+ return _nftIdByAddress[object].gtz();
162
168
  }
163
169
 
164
170
 
165
- function getInfo(uint256 nftId) external view override returns(RegistryInfo memory info) {
171
+ function getInfo(NftId nftId) external view override returns(RegistryInfo memory info) {
166
172
  return _info[nftId];
167
173
  }
168
174
 
169
- function getOwner(uint256 nftId) external view override returns(address) {
170
- return _chainNft.ownerOf(nftId);
175
+ function getOwner(NftId nftId) external view override returns(address) {
176
+ return _chainNft.ownerOf(nftId.toInt());
171
177
  }
172
178
 
173
179
  function getNftAddress() external view override returns(address nft) {
@@ -0,0 +1,60 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.19;
3
+
4
+ type Blocknumber is uint32;
5
+
6
+ using {
7
+ gtBlocknumber as >,
8
+ gteBlocknumber as >=,
9
+ ltBlocknumber as <,
10
+ lteBlocknumber as <=,
11
+ eqBlocknumber as ==,
12
+ neBlocknumber as !=,
13
+ BlocknumberLib.toInt
14
+ } for Blocknumber global;
15
+
16
+ /// @dev return true if Blocknumber a is greater than Blocknumber b
17
+ function gtBlocknumber(Blocknumber a, Blocknumber b) pure returns(bool) { return Blocknumber.unwrap(a) > Blocknumber.unwrap(b); }
18
+ /// @dev return true if Blocknumber a is greater than or equal to Blocknumber b
19
+ function gteBlocknumber(Blocknumber a, Blocknumber b) pure returns(bool) { return Blocknumber.unwrap(a) >= Blocknumber.unwrap(b); }
20
+
21
+ /// @dev return true if Blocknumber a is less than Blocknumber b
22
+ function ltBlocknumber(Blocknumber a, Blocknumber b) pure returns(bool) { return Blocknumber.unwrap(a) < Blocknumber.unwrap(b); }
23
+ /// @dev return true if Blocknumber a is less than or equal to Blocknumber b
24
+ function lteBlocknumber(Blocknumber a, Blocknumber b) pure returns(bool) { return Blocknumber.unwrap(a) <= Blocknumber.unwrap(b); }
25
+
26
+ /// @dev return true if Blocknumber a is equal to Blocknumber b
27
+ function eqBlocknumber(Blocknumber a, Blocknumber b) pure returns(bool) { return Blocknumber.unwrap(a) == Blocknumber.unwrap(b); }
28
+ /// @dev return true if Blocknumber a is not equal to Blocknumber b
29
+ function neBlocknumber(Blocknumber a, Blocknumber b) pure returns(bool) { return Blocknumber.unwrap(a) != Blocknumber.unwrap(b); }
30
+
31
+ /// @dev Converts the uint256 to a Blocknumber.
32
+ function toBlocknumber(uint256 blocknum) pure returns(Blocknumber) { return Blocknumber.wrap(uint32(blocknum)); }
33
+
34
+ function blockBlocknumber() view returns(Blocknumber) { return toBlocknumber(block.number); }
35
+
36
+ /// @dev Return the Blocknumber zero (0)
37
+ function zeroBlocknumber() pure returns(Blocknumber) { return toBlocknumber(0); }
38
+
39
+ /// @dev Return the current block number
40
+ function blockNumber() view returns(Blocknumber) { return toBlocknumber(block.number); }
41
+
42
+ library BlocknumberLib {
43
+ /// @dev return true if Blocknumber a is greater than Blocknumber b
44
+ function gt(Blocknumber a, Blocknumber b) public pure returns(bool isAfter) { return gtBlocknumber(a, b); }
45
+ /// @dev return true if Blocknumber a is greater than or equal to Blocknumber b
46
+ function gte(Blocknumber a, Blocknumber b) public pure returns(bool isAfterOrSame) { return gteBlocknumber(a, b); }
47
+
48
+ /// @dev return true if Blocknumber a is less than Blocknumber b
49
+ function lt(Blocknumber a, Blocknumber b) public pure returns(bool isBefore) { return ltBlocknumber(a, b); }
50
+ /// @dev return true if Blocknumber a is less than or equal to Blocknumber b
51
+ function lte(Blocknumber a, Blocknumber b) public pure returns(bool isBeforeOrSame) { return lteBlocknumber(a, b); }
52
+
53
+ /// @dev return true if Blocknumber a is equal to Blocknumber b
54
+ function eq(Blocknumber a, Blocknumber b) public pure returns(bool isSame) { return eqBlocknumber(a, b); }
55
+ /// @dev return true if Blocknumber a is not equal to Blocknumber b
56
+ function ne(Blocknumber a, Blocknumber b) public pure returns(bool isDifferent) { return neBlocknumber(a, b); }
57
+
58
+ /// @dev converts the Blocknumber to a uint256
59
+ function toInt(Blocknumber blocknumber) public pure returns(uint256) { return uint256(uint32(Blocknumber.unwrap(blocknumber))); }
60
+ }
@@ -1,7 +1,7 @@
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
@@ -12,13 +12,19 @@ using {
12
12
  } for ChainId global;
13
13
 
14
14
  // general pure free functions
15
+ /// @dev Converts the uint256 to a ChainId.
15
16
  function toChainId(uint256 chainId) pure returns(ChainId) { return ChainId.wrap(bytes5(uint40(chainId))); }
17
+ /// @dev Return the ChainId for the chain the contract is deployed to
18
+ function thisChainId() view returns(ChainId) { return toChainId(block.chainid); }
16
19
 
17
20
  // pure free functions for operators
21
+ /// @dev Returns true if the values are equal (==).
18
22
  function eqChainId(ChainId a, ChainId b) pure returns(bool isSame) { return ChainId.unwrap(a) == ChainId.unwrap(b); }
23
+ /// @dev Returns true if the values are not equal (!=).
19
24
  function neChainId(ChainId a, ChainId b) pure returns(bool isDifferent) { return ChainId.unwrap(a) != ChainId.unwrap(b); }
20
25
 
21
26
  // library functions that operate on user defined type
22
27
  library ChainIdLib {
28
+ /// @dev Converts the ChainId to a uint256.
23
29
  function toInt(ChainId chainId) internal pure returns(uint256) { return uint256(uint40(ChainId.unwrap(chainId))); }
24
30
  }
@@ -12,8 +12,11 @@ using {
12
12
  } for NftId global;
13
13
 
14
14
  // general pure free functions
15
+ /// @dev Converts the uint256 to a NftId.
15
16
  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; }
17
+
18
+ /// @dev Return the NftId zero (0)
19
+ function zeroNftId() pure returns(NftId) { return NftId.wrap(0); }
17
20
 
18
21
  // pure free functions for operators
19
22
  function eqNftId(NftId a, NftId b) pure returns(bool isSame) { return NftId.unwrap(a) == NftId.unwrap(b); }
@@ -21,5 +24,12 @@ function neNftId(NftId a, NftId b) pure returns(bool isDifferent) { return NftId
21
24
 
22
25
  // library functions that operate on user defined type
23
26
  library NftIdLib {
24
- function toInt(NftId nftId) internal pure returns(uint256) { return uint256(NftId.unwrap(nftId)); }
27
+ /// @dev Converts the NftId to a uint256.
28
+ function toInt(NftId nftId) public pure returns(uint96) { return uint96(NftId.unwrap(nftId)); }
29
+ /// @dev Returns true if the value is non-zero (> 0).
30
+ function gtz(NftId a) public pure returns(bool) { return NftId.unwrap(a) > 0; }
31
+ /// @dev Returns true if the value is zero (== 0).
32
+ function eqz(NftId a) public pure returns(bool) { return NftId.unwrap(a) == 0; }
33
+ /// @dev Returns true if the values are equal (==).
34
+ function eq(NftId a, NftId b) public pure returns(bool isSame) { return eqNftId(a, b); }
25
35
  }
@@ -0,0 +1,55 @@
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) { return Timestamp.unwrap(a) > Timestamp.unwrap(b); }
17
+ /// @dev return true if Timestamp a is after or equal to Timestamp b
18
+ function gteTimestamp(Timestamp a, Timestamp b) pure returns(bool) { return Timestamp.unwrap(a) >= Timestamp.unwrap(b); }
19
+
20
+ /// @dev return true if Timestamp a is before Timestamp b
21
+ function ltTimestamp(Timestamp a, Timestamp b) pure returns(bool) { return Timestamp.unwrap(a) < Timestamp.unwrap(b); }
22
+ /// @dev return true if Timestamp a is before or equal to Timestamp b
23
+ function lteTimestamp(Timestamp a, Timestamp b) pure returns(bool) { return Timestamp.unwrap(a) <= Timestamp.unwrap(b); }
24
+
25
+ /// @dev return true if Timestamp a is equal to Timestamp b
26
+ function eqTimestamp(Timestamp a, Timestamp b) pure returns(bool) { return Timestamp.unwrap(a) == Timestamp.unwrap(b); }
27
+ /// @dev return true if Timestamp a is not equal to Timestamp b
28
+ function neTimestamp(Timestamp a, Timestamp b) pure returns(bool) { return Timestamp.unwrap(a) != Timestamp.unwrap(b); }
29
+
30
+ /// @dev Converts the uint256 to a Timestamp.
31
+ function toTimestamp(uint256 timestamp) pure returns(Timestamp) { return Timestamp.wrap(uint40(timestamp));}
32
+
33
+ function blockTimestamp() view returns(Timestamp) { return toTimestamp(block.timestamp); }
34
+
35
+ /// @dev Return the Timestamp zero (0)
36
+ function zeroTimestamp() pure returns(Timestamp) { return toTimestamp(0); }
37
+
38
+ library TimestampLib {
39
+ /// @dev return true if Timestamp a is after Timestamp b
40
+ function gt(Timestamp a, Timestamp b) public pure returns(bool isAfter) { return gtTimestamp(a, b); }
41
+ /// @dev return true if Timestamp a is after or the same than Timestamp b
42
+ function gte(Timestamp a, Timestamp b) public pure returns(bool isAfterOrSame) { return gteTimestamp(a, b); }
43
+
44
+ /// @dev return true if Timestamp a is before Timestamp b
45
+ function lt(Timestamp a, Timestamp b) public pure returns(bool isBefore) { return ltTimestamp(a, b); }
46
+ /// @dev return true if Timestamp a is before or the same than Timestamp b
47
+ function lte(Timestamp a, Timestamp b) public pure returns(bool isBeforeOrSame) { return lteTimestamp(a, b); }
48
+
49
+ /// @dev return true if Timestamp a is equal to Timestamp b
50
+ function eq(Timestamp a, Timestamp b) public pure returns(bool isSame) { return eqTimestamp(a, b); }
51
+ /// @dev return true if Timestamp a is not equal to Timestamp b
52
+ function ne(Timestamp a, Timestamp b) public pure returns(bool isDifferent) { return neTimestamp(a, b); }
53
+
54
+ function toInt(Timestamp timestamp) public pure returns(uint256) { return uint256(uint40(Timestamp.unwrap(timestamp))); }
55
+ }
@@ -0,0 +1,207 @@
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
+ /// @dev return the absolute delta between two UFixed numbers
204
+ function delta(UFixed a, UFixed b) public pure returns(UFixed) {
205
+ return deltaUFixed(a, b);
206
+ }
207
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@etherisc/gif-next",
3
- "version": "0.0.2-e6a90b9",
3
+ "version": "0.0.2-eb7397c",
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": {