@etherisc/gif-next 0.0.2-d911522 → 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 +1 -1
  69. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.json +2 -2
  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 +1 -1
  75. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +2 -2
  76. package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.dbg.json +1 -1
  77. package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.json +15 -2
  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 +76 -18
  110. package/contracts/types/ChainId.sol +18 -10
  111. package/contracts/types/NftId.sol +29 -13
  112. package/contracts/types/Timestamp.sol +63 -16
  113. package/contracts/types/UFixed.sol +62 -64
  114. package/package.json +9 -4
@@ -7,59 +7,50 @@ import {NftId, toNftId} from "../types/NftId.sol";
7
7
  import {NftIdLib} from "../types/NftId.sol";
8
8
 
9
9
  contract RegistryLinked is IRegistryLinked {
10
-
11
10
  IRegistry internal _registry;
12
-
11
+
13
12
  constructor(address registry) {
14
13
  _registry = IRegistry(registry);
15
14
  }
16
15
 
17
- function getRegistry() external view override returns(IRegistry registry) {
16
+ function getRegistry() external view override returns (IRegistry registry) {
18
17
  return _registry;
19
18
  }
20
-
21
19
  }
22
20
 
23
-
24
- abstract contract Registerable is
25
- RegistryLinked,
26
- IRegisterable
27
- {
21
+ abstract contract Registerable is RegistryLinked, IRegisterable {
28
22
  using NftIdLib for NftId;
29
23
 
30
24
  address private _initialOwner;
31
-
32
- constructor(address registry)
33
- RegistryLinked(registry)
34
- {
25
+
26
+ constructor(address registry) RegistryLinked(registry) {
35
27
  _initialOwner = msg.sender;
36
28
  }
37
29
 
38
30
  // getType, getData and register need to be implemented by concrete contract
39
31
 
40
- function isRegisterable() external pure override returns(bool) {
32
+ function isRegisterable() external pure override returns (bool) {
41
33
  return true;
42
34
  }
43
35
 
44
- function getInitialOwner() public view override returns(address deployer) {
36
+ function getInitialOwner() public view override returns (address deployer) {
45
37
  return _initialOwner;
46
38
  }
47
39
 
48
- function isRegistered() public view override returns(bool) {
40
+ function isRegistered() public view override returns (bool) {
49
41
  NftId nftId = _registry.getNftId(address(this));
50
42
  return nftId.gtz();
51
43
  }
52
44
 
53
- function getNftId() public view override returns(NftId nftId) {
45
+ function getNftId() public view override returns (NftId nftId) {
54
46
  return _registry.getNftId(address(this));
55
47
  }
56
48
 
57
- function getOwner() public view override returns(address owner) {
49
+ function getOwner() public view override returns (address owner) {
58
50
  NftId id = _registry.getNftId(address(this));
59
51
  owner = _registry.getOwner(id);
60
52
  return owner != address(0) ? owner : _initialOwner;
61
53
  }
62
-
63
54
  }
64
55
 
65
56
  contract Registry is IRegistry {
@@ -73,37 +64,71 @@ contract Registry is IRegistry {
73
64
  IChainNft private _chainNft;
74
65
 
75
66
  function initialize(address chainNft) external {
76
- require(address(_chainNft) == address(0), "ERROR:REG-001:ALREADY_INITIALIZED");
67
+ require(
68
+ address(_chainNft) == address(0),
69
+ "ERROR:REG-001:ALREADY_INITIALIZED"
70
+ );
77
71
  _chainNft = IChainNft(chainNft);
78
72
  }
79
73
 
80
- function TOKEN() public pure override returns(uint256) { return 30; }
81
- function INSTANCE() public pure override returns(uint256) { return 40; }
82
- function PRODUCT() public pure override returns(uint256) { return 50; }
83
- function ORACLE() public pure override returns(uint256) { return 60; }
84
- function POOL() public pure override returns(uint256) { return 70; }
85
- function POLICY() public pure override returns(uint256) { return 80; }
86
- function BUNDLE() public pure override returns(uint256) { return 90; }
74
+ function TOKEN() public pure override returns (uint256) {
75
+ return 30;
76
+ }
87
77
 
88
- function register(address objectAddress) external override returns(NftId nftId) {
89
- require(_nftIdByAddress[objectAddress].eqz(), "ERROR:REG-002:ALREADY_REGISTERED");
78
+ function INSTANCE() public pure override returns (uint256) {
79
+ return 40;
80
+ }
81
+
82
+ function PRODUCT() public pure override returns (uint256) {
83
+ return 50;
84
+ }
85
+
86
+ function ORACLE() public pure override returns (uint256) {
87
+ return 60;
88
+ }
89
+
90
+ function POOL() public pure override returns (uint256) {
91
+ return 70;
92
+ }
93
+
94
+ function POLICY() public pure override returns (uint256) {
95
+ return 80;
96
+ }
97
+
98
+ function BUNDLE() public pure override returns (uint256) {
99
+ return 90;
100
+ }
101
+
102
+ function register(
103
+ address objectAddress
104
+ ) external override returns (NftId nftId) {
105
+ require(
106
+ _nftIdByAddress[objectAddress].eqz(),
107
+ "ERROR:REG-002:ALREADY_REGISTERED"
108
+ );
90
109
 
91
110
  IRegisterable registerable = IRegisterable(objectAddress);
92
- require(registerable.isRegisterable(), "ERROR:REG-003:NOT_REGISTERABLE");
111
+ require(
112
+ registerable.isRegisterable(),
113
+ "ERROR:REG-003:NOT_REGISTERABLE"
114
+ );
93
115
 
94
116
  // check parent exists (for objects not instances)
95
- if(registerable.getType() != INSTANCE()) {
96
- RegistryInfo memory parentInfo = _info[registerable.getParentNftId()];
117
+ if (registerable.getType() != INSTANCE()) {
118
+ RegistryInfo memory parentInfo = _info[
119
+ registerable.getParentNftId()
120
+ ];
97
121
  require(parentInfo.nftId.gtz(), "ERROR:REG-004:PARENT_NOT_FOUND");
98
122
  // check validity of parent relation, valid relations are
99
123
  // policy -> product, bundle -> pool, product -> instance, pool -> instance
100
124
  }
101
125
 
102
126
  uint256 mintedTokenId = _chainNft.mint(
103
- registerable.getInitialOwner(),
104
- EMPTY_URI);
127
+ registerable.getInitialOwner(),
128
+ EMPTY_URI
129
+ );
105
130
  nftId = toNftId(mintedTokenId);
106
-
131
+
107
132
  RegistryInfo memory info = RegistryInfo(
108
133
  nftId,
109
134
  registerable.getParentNftId(),
@@ -118,25 +143,25 @@ contract Registry is IRegistry {
118
143
  // add logging
119
144
  }
120
145
 
121
-
122
146
  function registerObjectForInstance(
123
147
  NftId parentNftId,
124
148
  uint256 objectType,
125
149
  address initialOwner
126
150
  )
127
- external
151
+ external
128
152
  override
129
- // TODO add onlyRegisteredInstance
130
- returns(NftId nftId)
153
+ returns (
154
+ // TODO add onlyRegisteredInstance
155
+ NftId nftId
156
+ )
131
157
  {
132
158
  // TODO add more validation
133
159
  require(
134
160
  objectType == POLICY() || objectType == BUNDLE(),
135
- "ERROR:REG-005:TYPE_INVALID");
161
+ "ERROR:REG-005:TYPE_INVALID"
162
+ );
136
163
 
137
- uint256 mintedTokenId = _chainNft.mint(
138
- initialOwner,
139
- EMPTY_URI);
164
+ uint256 mintedTokenId = _chainNft.mint(initialOwner, EMPTY_URI);
140
165
  nftId = toNftId(mintedTokenId);
141
166
 
142
167
  RegistryInfo memory info = RegistryInfo(
@@ -152,31 +177,33 @@ contract Registry is IRegistry {
152
177
  // add logging
153
178
  }
154
179
 
155
-
156
- function getObjectCount() external view override returns(uint256) {
180
+ function getObjectCount() external view override returns (uint256) {
157
181
  return _chainNft.totalSupply();
158
182
  }
159
183
 
160
-
161
- function getNftId(address object) external view override returns(NftId id) {
184
+ function getNftId(
185
+ address object
186
+ ) external view override returns (NftId id) {
162
187
  return _nftIdByAddress[object];
163
188
  }
164
189
 
165
-
166
- function isRegistered(address object) external view override returns(bool) {
190
+ function isRegistered(
191
+ address object
192
+ ) external view override returns (bool) {
167
193
  return _nftIdByAddress[object].gtz();
168
194
  }
169
195
 
170
-
171
- function getInfo(NftId nftId) external view override returns(RegistryInfo memory info) {
196
+ function getInfo(
197
+ NftId nftId
198
+ ) external view override returns (RegistryInfo memory info) {
172
199
  return _info[nftId];
173
200
  }
174
201
 
175
- function getOwner(NftId nftId) external view override returns(address) {
202
+ function getOwner(NftId nftId) external view override returns (address) {
176
203
  return _chainNft.ownerOf(nftId.toInt());
177
204
  }
178
205
 
179
- function getNftAddress() external view override returns(address nft) {
206
+ function getNftAddress() external view override returns (address nft) {
180
207
  return address(_chainNft);
181
208
  }
182
209
  }
@@ -14,47 +14,105 @@ using {
14
14
  } for Blocknumber global;
15
15
 
16
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); }
17
+ function gtBlocknumber(Blocknumber a, Blocknumber b) pure returns (bool) {
18
+ return Blocknumber.unwrap(a) > Blocknumber.unwrap(b);
19
+ }
20
+
18
21
  /// @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); }
22
+ function gteBlocknumber(Blocknumber a, Blocknumber b) pure returns (bool) {
23
+ return Blocknumber.unwrap(a) >= Blocknumber.unwrap(b);
24
+ }
20
25
 
21
26
  /// @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); }
27
+ function ltBlocknumber(Blocknumber a, Blocknumber b) pure returns (bool) {
28
+ return Blocknumber.unwrap(a) < Blocknumber.unwrap(b);
29
+ }
30
+
23
31
  /// @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); }
32
+ function lteBlocknumber(Blocknumber a, Blocknumber b) pure returns (bool) {
33
+ return Blocknumber.unwrap(a) <= Blocknumber.unwrap(b);
34
+ }
25
35
 
26
36
  /// @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); }
37
+ function eqBlocknumber(Blocknumber a, Blocknumber b) pure returns (bool) {
38
+ return Blocknumber.unwrap(a) == Blocknumber.unwrap(b);
39
+ }
40
+
28
41
  /// @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); }
42
+ function neBlocknumber(Blocknumber a, Blocknumber b) pure returns (bool) {
43
+ return Blocknumber.unwrap(a) != Blocknumber.unwrap(b);
44
+ }
30
45
 
31
46
  /// @dev Converts the uint256 to a Blocknumber.
32
- function toBlocknumber(uint256 blocknum) pure returns(Blocknumber) { return Blocknumber.wrap(uint32(blocknum)); }
47
+ function toBlocknumber(uint256 blocknum) pure returns (Blocknumber) {
48
+ return Blocknumber.wrap(uint32(blocknum));
49
+ }
33
50
 
34
- function blockBlocknumber() view returns(Blocknumber) { return toBlocknumber(block.number); }
51
+ function blockBlocknumber() view returns (Blocknumber) {
52
+ return toBlocknumber(block.number);
53
+ }
35
54
 
36
55
  /// @dev Return the Blocknumber zero (0)
37
- function zeroBlocknumber() pure returns(Blocknumber) { return toBlocknumber(0); }
56
+ function zeroBlocknumber() pure returns (Blocknumber) {
57
+ return toBlocknumber(0);
58
+ }
38
59
 
39
60
  /// @dev Return the current block number
40
- function blockNumber() view returns(Blocknumber) { return toBlocknumber(block.number); }
61
+ function blockNumber() view returns (Blocknumber) {
62
+ return toBlocknumber(block.number);
63
+ }
41
64
 
42
65
  library BlocknumberLib {
43
66
  /// @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); }
67
+ function gt(
68
+ Blocknumber a,
69
+ Blocknumber b
70
+ ) public pure returns (bool isAfter) {
71
+ return gtBlocknumber(a, b);
72
+ }
73
+
45
74
  /// @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
-
75
+ function gte(
76
+ Blocknumber a,
77
+ Blocknumber b
78
+ ) public pure returns (bool isAfterOrSame) {
79
+ return gteBlocknumber(a, b);
80
+ }
81
+
48
82
  /// @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); }
83
+ function lt(
84
+ Blocknumber a,
85
+ Blocknumber b
86
+ ) public pure returns (bool isBefore) {
87
+ return ltBlocknumber(a, b);
88
+ }
89
+
50
90
  /// @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); }
91
+ function lte(
92
+ Blocknumber a,
93
+ Blocknumber b
94
+ ) public pure returns (bool isBeforeOrSame) {
95
+ return lteBlocknumber(a, b);
96
+ }
52
97
 
53
98
  /// @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); }
99
+ function eq(
100
+ Blocknumber a,
101
+ Blocknumber b
102
+ ) public pure returns (bool isSame) {
103
+ return eqBlocknumber(a, b);
104
+ }
105
+
55
106
  /// @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); }
107
+ function ne(
108
+ Blocknumber a,
109
+ Blocknumber b
110
+ ) public pure returns (bool isDifferent) {
111
+ return neBlocknumber(a, b);
112
+ }
57
113
 
58
114
  /// @dev converts the Blocknumber to a uint256
59
- function toInt(Blocknumber blocknumber) public pure returns(uint256) { return uint256(uint32(Blocknumber.unwrap(blocknumber))); }
115
+ function toInt(Blocknumber blocknumber) public pure returns (uint256) {
116
+ return uint256(uint32(Blocknumber.unwrap(blocknumber)));
117
+ }
60
118
  }
@@ -5,26 +5,34 @@ pragma solidity ^0.8.19;
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
11
  /// @dev Converts the uint256 to a ChainId.
16
- function toChainId(uint256 chainId) pure returns(ChainId) { return ChainId.wrap(bytes5(uint40(chainId))); }
12
+ function toChainId(uint256 chainId) pure returns (ChainId) {
13
+ return ChainId.wrap(bytes5(uint40(chainId)));
14
+ }
15
+
17
16
  /// @dev Return the ChainId for the chain the contract is deployed to
18
- function thisChainId() view returns(ChainId) { return toChainId(block.chainid); }
17
+ function thisChainId() view returns (ChainId) {
18
+ return toChainId(block.chainid);
19
+ }
19
20
 
20
21
  // pure free functions for operators
21
22
  /// @dev Returns true if the values are equal (==).
22
- function eqChainId(ChainId a, ChainId b) pure returns(bool isSame) { return ChainId.unwrap(a) == ChainId.unwrap(b); }
23
+ function eqChainId(ChainId a, ChainId b) pure returns (bool isSame) {
24
+ return ChainId.unwrap(a) == ChainId.unwrap(b);
25
+ }
26
+
23
27
  /// @dev Returns true if the values are not equal (!=).
24
- function neChainId(ChainId a, ChainId b) pure returns(bool isDifferent) { return ChainId.unwrap(a) != ChainId.unwrap(b); }
28
+ function neChainId(ChainId a, ChainId b) pure returns (bool isDifferent) {
29
+ return ChainId.unwrap(a) != ChainId.unwrap(b);
30
+ }
25
31
 
26
32
  // library functions that operate on user defined type
27
33
  library ChainIdLib {
28
34
  /// @dev Converts the ChainId to a uint256.
29
- function toInt(ChainId chainId) internal pure returns(uint256) { return uint256(uint40(ChainId.unwrap(chainId))); }
35
+ function toInt(ChainId chainId) internal pure returns (uint256) {
36
+ return uint256(uint40(ChainId.unwrap(chainId)));
37
+ }
30
38
  }
@@ -5,31 +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
11
  /// @dev Converts the uint256 to a NftId.
16
- function toNftId(uint256 id) pure returns(NftId) { return NftId.wrap(uint96(id)); }
12
+ function toNftId(uint256 id) pure returns (NftId) {
13
+ return NftId.wrap(uint96(id));
14
+ }
17
15
 
18
16
  /// @dev Return the NftId zero (0)
19
- function zeroNftId() pure returns(NftId) { return NftId.wrap(0); }
17
+ function zeroNftId() pure returns (NftId) {
18
+ return NftId.wrap(0);
19
+ }
20
20
 
21
21
  // pure free functions for operators
22
- function eqNftId(NftId a, NftId b) pure returns(bool isSame) { return NftId.unwrap(a) == NftId.unwrap(b); }
23
- 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
+ }
24
29
 
25
30
  // library functions that operate on user defined type
26
31
  library NftIdLib {
27
32
  /// @dev Converts the NftId to a uint256.
28
- function toInt(NftId nftId) public pure returns(uint96) { return uint96(NftId.unwrap(nftId)); }
33
+ function toInt(NftId nftId) public pure returns (uint96) {
34
+ return uint96(NftId.unwrap(nftId));
35
+ }
36
+
29
37
  /// @dev Returns true if the value is non-zero (> 0).
30
- function gtz(NftId a) public pure returns(bool) { return NftId.unwrap(a) > 0; }
38
+ function gtz(NftId a) public pure returns (bool) {
39
+ return NftId.unwrap(a) > 0;
40
+ }
41
+
31
42
  /// @dev Returns true if the value is zero (== 0).
32
- function eqz(NftId a) public pure returns(bool) { return NftId.unwrap(a) == 0; }
43
+ function eqz(NftId a) public pure returns (bool) {
44
+ return NftId.unwrap(a) == 0;
45
+ }
46
+
33
47
  /// @dev Returns true if the values are equal (==).
34
- function eq(NftId a, NftId b) public pure returns(bool isSame) { return eqNftId(a, b); }
48
+ function eq(NftId a, NftId b) public pure returns (bool isSame) {
49
+ return eqNftId(a, b);
50
+ }
35
51
  }
@@ -13,43 +13,90 @@ using {
13
13
  } for Timestamp global;
14
14
 
15
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); }
16
+ function gtTimestamp(Timestamp a, Timestamp b) pure returns (bool) {
17
+ return Timestamp.unwrap(a) > Timestamp.unwrap(b);
18
+ }
19
+
17
20
  /// @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); }
21
+ function gteTimestamp(Timestamp a, Timestamp b) pure returns (bool) {
22
+ return Timestamp.unwrap(a) >= Timestamp.unwrap(b);
23
+ }
19
24
 
20
25
  /// @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); }
26
+ function ltTimestamp(Timestamp a, Timestamp b) pure returns (bool) {
27
+ return Timestamp.unwrap(a) < Timestamp.unwrap(b);
28
+ }
29
+
22
30
  /// @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); }
31
+ function lteTimestamp(Timestamp a, Timestamp b) pure returns (bool) {
32
+ return Timestamp.unwrap(a) <= Timestamp.unwrap(b);
33
+ }
24
34
 
25
35
  /// @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); }
36
+ function eqTimestamp(Timestamp a, Timestamp b) pure returns (bool) {
37
+ return Timestamp.unwrap(a) == Timestamp.unwrap(b);
38
+ }
39
+
27
40
  /// @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); }
41
+ function neTimestamp(Timestamp a, Timestamp b) pure returns (bool) {
42
+ return Timestamp.unwrap(a) != Timestamp.unwrap(b);
43
+ }
29
44
 
30
45
  /// @dev Converts the uint256 to a Timestamp.
31
- function toTimestamp(uint256 timestamp) pure returns(Timestamp) { return Timestamp.wrap(uint40(timestamp));}
46
+ function toTimestamp(uint256 timestamp) pure returns (Timestamp) {
47
+ return Timestamp.wrap(uint40(timestamp));
48
+ }
32
49
 
33
- function blockTimestamp() view returns(Timestamp) { return toTimestamp(block.timestamp); }
50
+ function blockTimestamp() view returns (Timestamp) {
51
+ return toTimestamp(block.timestamp);
52
+ }
34
53
 
35
54
  /// @dev Return the Timestamp zero (0)
36
- function zeroTimestamp() pure returns(Timestamp) { return toTimestamp(0); }
55
+ function zeroTimestamp() pure returns (Timestamp) {
56
+ return toTimestamp(0);
57
+ }
37
58
 
38
59
  library TimestampLib {
39
60
  /// @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); }
61
+ function gt(Timestamp a, Timestamp b) public pure returns (bool isAfter) {
62
+ return gtTimestamp(a, b);
63
+ }
64
+
41
65
  /// @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); }
66
+ function gte(
67
+ Timestamp a,
68
+ Timestamp b
69
+ ) public pure returns (bool isAfterOrSame) {
70
+ return gteTimestamp(a, b);
71
+ }
43
72
 
44
73
  /// @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); }
74
+ function lt(Timestamp a, Timestamp b) public pure returns (bool isBefore) {
75
+ return ltTimestamp(a, b);
76
+ }
77
+
46
78
  /// @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); }
79
+ function lte(
80
+ Timestamp a,
81
+ Timestamp b
82
+ ) public pure returns (bool isBeforeOrSame) {
83
+ return lteTimestamp(a, b);
84
+ }
48
85
 
49
86
  /// @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); }
87
+ function eq(Timestamp a, Timestamp b) public pure returns (bool isSame) {
88
+ return eqTimestamp(a, b);
89
+ }
90
+
51
91
  /// @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); }
92
+ function ne(
93
+ Timestamp a,
94
+ Timestamp b
95
+ ) public pure returns (bool isDifferent) {
96
+ return neTimestamp(a, b);
97
+ }
53
98
 
54
- function toInt(Timestamp timestamp) public pure returns(uint256) { return uint256(uint40(Timestamp.unwrap(timestamp))); }
99
+ function toInt(Timestamp timestamp) public pure returns (uint256) {
100
+ return uint256(uint40(Timestamp.unwrap(timestamp)));
101
+ }
55
102
  }