@etherisc/gif-next 0.0.2-cc253b3 → 0.0.2-d911522

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 (76) hide show
  1. package/artifacts/contracts/components/Component.sol/Component.dbg.json +1 -1
  2. package/artifacts/contracts/components/Component.sol/InstanceLinked.dbg.json +1 -1
  3. package/artifacts/contracts/components/Component.sol/InstanceLinked.json +2 -2
  4. package/artifacts/contracts/components/IPool.sol/IPoolComponent.dbg.json +1 -1
  5. package/artifacts/contracts/components/IProduct.sol/IProductComponent.dbg.json +1 -1
  6. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  7. package/artifacts/contracts/components/Pool.sol/Pool.json +2 -2
  8. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  9. package/artifacts/contracts/components/Product.sol/Product.json +2 -2
  10. package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +1 -1
  11. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +1 -1
  12. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +1 -1
  13. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +1 -1
  14. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +1 -1
  15. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +1 -1
  16. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +1 -1
  17. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +1 -1
  18. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +1 -1
  19. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +1 -1
  20. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
  21. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
  22. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  23. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  24. package/artifacts/contracts/instance/Instance.sol/Instance.json +16 -8
  25. package/artifacts/contracts/instance/access/Access.sol/AccessModule.dbg.json +1 -1
  26. package/artifacts/contracts/instance/access/IAccess.sol/IAccess.dbg.json +1 -1
  27. package/artifacts/contracts/instance/access/IAccess.sol/IAccessCheckRole.dbg.json +1 -1
  28. package/artifacts/contracts/instance/access/IAccess.sol/IAccessComponentTypeRoles.dbg.json +1 -1
  29. package/artifacts/contracts/instance/access/IAccess.sol/IAccessModule.dbg.json +1 -1
  30. package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentModule.dbg.json +1 -1
  31. package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentOwnerService.dbg.json +1 -1
  32. package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentOwnerService.json +2 -2
  33. package/artifacts/contracts/instance/component/IComponent.sol/IComponent.dbg.json +1 -1
  34. package/artifacts/contracts/instance/component/IComponent.sol/IComponentContract.dbg.json +1 -1
  35. package/artifacts/contracts/instance/component/IComponent.sol/IComponentModule.dbg.json +1 -1
  36. package/artifacts/contracts/instance/component/IComponent.sol/IComponentOwnerService.dbg.json +1 -1
  37. package/artifacts/contracts/instance/component/IComponent.sol/IInstanceLinked.dbg.json +1 -1
  38. package/artifacts/contracts/instance/policy/IPolicy.sol/IPolicy.dbg.json +1 -1
  39. package/artifacts/contracts/instance/policy/IPolicy.sol/IPolicyModule.dbg.json +1 -1
  40. package/artifacts/contracts/instance/policy/PolicyModule.sol/PolicyModule.dbg.json +1 -1
  41. package/artifacts/contracts/instance/pool/IPoolModule.sol/IPool.dbg.json +1 -1
  42. package/artifacts/contracts/instance/pool/IPoolModule.sol/IPoolModule.dbg.json +1 -1
  43. package/artifacts/contracts/instance/pool/PoolModule.sol/PoolModule.dbg.json +1 -1
  44. package/artifacts/contracts/instance/product/IProductService.sol/IProductModule.dbg.json +1 -1
  45. package/artifacts/contracts/instance/product/IProductService.sol/IProductService.dbg.json +1 -1
  46. package/artifacts/contracts/instance/product/ProductService.sol/ProductModule.dbg.json +1 -1
  47. package/artifacts/contracts/instance/product/ProductService.sol/ProductService.dbg.json +1 -1
  48. package/artifacts/contracts/instance/product/ProductService.sol/ProductService.json +2 -2
  49. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  50. package/artifacts/contracts/registry/IChainNft.sol/IChainNft.dbg.json +1 -1
  51. package/artifacts/contracts/registry/IRegistry.sol/IOwnable.dbg.json +1 -1
  52. package/artifacts/contracts/registry/IRegistry.sol/IRegisterable.dbg.json +1 -1
  53. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  54. package/artifacts/contracts/registry/IRegistry.sol/IRegistryLinked.dbg.json +1 -1
  55. package/artifacts/contracts/registry/Registry.sol/Registerable.dbg.json +1 -1
  56. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  57. package/artifacts/contracts/registry/Registry.sol/Registry.json +2 -2
  58. package/artifacts/contracts/registry/Registry.sol/RegistryLinked.dbg.json +1 -1
  59. package/artifacts/contracts/registry/Registry.sol/RegistryLinked.json +2 -2
  60. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +4 -0
  61. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.json +174 -0
  62. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  63. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.json +2 -2
  64. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  65. package/artifacts/contracts/types/NftId.sol/NftIdLib.json +28 -4
  66. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +4 -0
  67. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +174 -0
  68. package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.dbg.json +4 -0
  69. package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.json +440 -0
  70. package/contracts/instance/component/ComponentModule.sol +2 -2
  71. package/contracts/types/Blocknumber.sol +60 -0
  72. package/contracts/types/ChainId.sol +7 -1
  73. package/contracts/types/NftId.sol +10 -1
  74. package/contracts/types/Timestamp.sol +55 -0
  75. package/contracts/types/UFixed.sol +207 -0
  76. package/package.json +1 -1
@@ -0,0 +1,440 @@
1
+ {
2
+ "_format": "hh-sol-artifact-1",
3
+ "contractName": "UFixedMathLib",
4
+ "sourceName": "contracts/types/UFixed.sol",
5
+ "abi": [
6
+ {
7
+ "inputs": [],
8
+ "name": "EXP",
9
+ "outputs": [
10
+ {
11
+ "internalType": "int8",
12
+ "name": "",
13
+ "type": "int8"
14
+ }
15
+ ],
16
+ "stateMutability": "view",
17
+ "type": "function"
18
+ },
19
+ {
20
+ "inputs": [],
21
+ "name": "MULTIPLIER",
22
+ "outputs": [
23
+ {
24
+ "internalType": "uint256",
25
+ "name": "",
26
+ "type": "uint256"
27
+ }
28
+ ],
29
+ "stateMutability": "view",
30
+ "type": "function"
31
+ },
32
+ {
33
+ "inputs": [],
34
+ "name": "MULTIPLIER_HALF",
35
+ "outputs": [
36
+ {
37
+ "internalType": "uint256",
38
+ "name": "",
39
+ "type": "uint256"
40
+ }
41
+ ],
42
+ "stateMutability": "view",
43
+ "type": "function"
44
+ },
45
+ {
46
+ "inputs": [],
47
+ "name": "ROUNDING_DEFAULT",
48
+ "outputs": [
49
+ {
50
+ "internalType": "enum UFixedMathLib.Rounding",
51
+ "name": "",
52
+ "type": "UFixedMathLib.Rounding"
53
+ }
54
+ ],
55
+ "stateMutability": "view",
56
+ "type": "function"
57
+ },
58
+ {
59
+ "inputs": [
60
+ {
61
+ "internalType": "UFixed",
62
+ "name": "a",
63
+ "type": "uint256"
64
+ },
65
+ {
66
+ "internalType": "UFixed",
67
+ "name": "b",
68
+ "type": "uint256"
69
+ }
70
+ ],
71
+ "name": "add",
72
+ "outputs": [
73
+ {
74
+ "internalType": "UFixed",
75
+ "name": "",
76
+ "type": "uint256"
77
+ }
78
+ ],
79
+ "stateMutability": "pure",
80
+ "type": "function"
81
+ },
82
+ {
83
+ "inputs": [],
84
+ "name": "decimals",
85
+ "outputs": [
86
+ {
87
+ "internalType": "uint256",
88
+ "name": "",
89
+ "type": "uint256"
90
+ }
91
+ ],
92
+ "stateMutability": "pure",
93
+ "type": "function"
94
+ },
95
+ {
96
+ "inputs": [
97
+ {
98
+ "internalType": "UFixed",
99
+ "name": "a",
100
+ "type": "uint256"
101
+ },
102
+ {
103
+ "internalType": "UFixed",
104
+ "name": "b",
105
+ "type": "uint256"
106
+ }
107
+ ],
108
+ "name": "delta",
109
+ "outputs": [
110
+ {
111
+ "internalType": "UFixed",
112
+ "name": "",
113
+ "type": "uint256"
114
+ }
115
+ ],
116
+ "stateMutability": "pure",
117
+ "type": "function"
118
+ },
119
+ {
120
+ "inputs": [
121
+ {
122
+ "internalType": "UFixed",
123
+ "name": "a",
124
+ "type": "uint256"
125
+ },
126
+ {
127
+ "internalType": "UFixed",
128
+ "name": "b",
129
+ "type": "uint256"
130
+ }
131
+ ],
132
+ "name": "div",
133
+ "outputs": [
134
+ {
135
+ "internalType": "UFixed",
136
+ "name": "",
137
+ "type": "uint256"
138
+ }
139
+ ],
140
+ "stateMutability": "pure",
141
+ "type": "function"
142
+ },
143
+ {
144
+ "inputs": [
145
+ {
146
+ "internalType": "UFixed",
147
+ "name": "a",
148
+ "type": "uint256"
149
+ },
150
+ {
151
+ "internalType": "UFixed",
152
+ "name": "b",
153
+ "type": "uint256"
154
+ }
155
+ ],
156
+ "name": "eq",
157
+ "outputs": [
158
+ {
159
+ "internalType": "bool",
160
+ "name": "isEqual",
161
+ "type": "bool"
162
+ }
163
+ ],
164
+ "stateMutability": "pure",
165
+ "type": "function"
166
+ },
167
+ {
168
+ "inputs": [
169
+ {
170
+ "internalType": "UFixed",
171
+ "name": "a",
172
+ "type": "uint256"
173
+ }
174
+ ],
175
+ "name": "eqz",
176
+ "outputs": [
177
+ {
178
+ "internalType": "bool",
179
+ "name": "isZero",
180
+ "type": "bool"
181
+ }
182
+ ],
183
+ "stateMutability": "pure",
184
+ "type": "function"
185
+ },
186
+ {
187
+ "inputs": [
188
+ {
189
+ "internalType": "UFixed",
190
+ "name": "a",
191
+ "type": "uint256"
192
+ }
193
+ ],
194
+ "name": "ftoi",
195
+ "outputs": [
196
+ {
197
+ "internalType": "uint256",
198
+ "name": "",
199
+ "type": "uint256"
200
+ }
201
+ ],
202
+ "stateMutability": "pure",
203
+ "type": "function"
204
+ },
205
+ {
206
+ "inputs": [
207
+ {
208
+ "internalType": "UFixed",
209
+ "name": "a",
210
+ "type": "uint256"
211
+ },
212
+ {
213
+ "internalType": "enum UFixedMathLib.Rounding",
214
+ "name": "rounding",
215
+ "type": "UFixedMathLib.Rounding"
216
+ }
217
+ ],
218
+ "name": "ftoi",
219
+ "outputs": [
220
+ {
221
+ "internalType": "uint256",
222
+ "name": "",
223
+ "type": "uint256"
224
+ }
225
+ ],
226
+ "stateMutability": "pure",
227
+ "type": "function"
228
+ },
229
+ {
230
+ "inputs": [
231
+ {
232
+ "internalType": "UFixed",
233
+ "name": "a",
234
+ "type": "uint256"
235
+ },
236
+ {
237
+ "internalType": "UFixed",
238
+ "name": "b",
239
+ "type": "uint256"
240
+ }
241
+ ],
242
+ "name": "gt",
243
+ "outputs": [
244
+ {
245
+ "internalType": "bool",
246
+ "name": "isGreaterThan",
247
+ "type": "bool"
248
+ }
249
+ ],
250
+ "stateMutability": "pure",
251
+ "type": "function"
252
+ },
253
+ {
254
+ "inputs": [
255
+ {
256
+ "internalType": "UFixed",
257
+ "name": "a",
258
+ "type": "uint256"
259
+ },
260
+ {
261
+ "internalType": "UFixed",
262
+ "name": "b",
263
+ "type": "uint256"
264
+ }
265
+ ],
266
+ "name": "gte",
267
+ "outputs": [
268
+ {
269
+ "internalType": "bool",
270
+ "name": "isGreaterThan",
271
+ "type": "bool"
272
+ }
273
+ ],
274
+ "stateMutability": "pure",
275
+ "type": "function"
276
+ },
277
+ {
278
+ "inputs": [
279
+ {
280
+ "internalType": "UFixed",
281
+ "name": "a",
282
+ "type": "uint256"
283
+ }
284
+ ],
285
+ "name": "gtz",
286
+ "outputs": [
287
+ {
288
+ "internalType": "bool",
289
+ "name": "isZero",
290
+ "type": "bool"
291
+ }
292
+ ],
293
+ "stateMutability": "pure",
294
+ "type": "function"
295
+ },
296
+ {
297
+ "inputs": [
298
+ {
299
+ "internalType": "uint256",
300
+ "name": "a",
301
+ "type": "uint256"
302
+ }
303
+ ],
304
+ "name": "itof",
305
+ "outputs": [
306
+ {
307
+ "internalType": "UFixed",
308
+ "name": "",
309
+ "type": "uint256"
310
+ }
311
+ ],
312
+ "stateMutability": "pure",
313
+ "type": "function"
314
+ },
315
+ {
316
+ "inputs": [
317
+ {
318
+ "internalType": "uint256",
319
+ "name": "a",
320
+ "type": "uint256"
321
+ },
322
+ {
323
+ "internalType": "int8",
324
+ "name": "exp",
325
+ "type": "int8"
326
+ }
327
+ ],
328
+ "name": "itof",
329
+ "outputs": [
330
+ {
331
+ "internalType": "UFixed",
332
+ "name": "",
333
+ "type": "uint256"
334
+ }
335
+ ],
336
+ "stateMutability": "pure",
337
+ "type": "function"
338
+ },
339
+ {
340
+ "inputs": [
341
+ {
342
+ "internalType": "UFixed",
343
+ "name": "a",
344
+ "type": "uint256"
345
+ },
346
+ {
347
+ "internalType": "UFixed",
348
+ "name": "b",
349
+ "type": "uint256"
350
+ }
351
+ ],
352
+ "name": "lt",
353
+ "outputs": [
354
+ {
355
+ "internalType": "bool",
356
+ "name": "isGreaterThan",
357
+ "type": "bool"
358
+ }
359
+ ],
360
+ "stateMutability": "pure",
361
+ "type": "function"
362
+ },
363
+ {
364
+ "inputs": [
365
+ {
366
+ "internalType": "UFixed",
367
+ "name": "a",
368
+ "type": "uint256"
369
+ },
370
+ {
371
+ "internalType": "UFixed",
372
+ "name": "b",
373
+ "type": "uint256"
374
+ }
375
+ ],
376
+ "name": "lte",
377
+ "outputs": [
378
+ {
379
+ "internalType": "bool",
380
+ "name": "isGreaterThan",
381
+ "type": "bool"
382
+ }
383
+ ],
384
+ "stateMutability": "pure",
385
+ "type": "function"
386
+ },
387
+ {
388
+ "inputs": [
389
+ {
390
+ "internalType": "UFixed",
391
+ "name": "a",
392
+ "type": "uint256"
393
+ },
394
+ {
395
+ "internalType": "UFixed",
396
+ "name": "b",
397
+ "type": "uint256"
398
+ }
399
+ ],
400
+ "name": "mul",
401
+ "outputs": [
402
+ {
403
+ "internalType": "UFixed",
404
+ "name": "",
405
+ "type": "uint256"
406
+ }
407
+ ],
408
+ "stateMutability": "pure",
409
+ "type": "function"
410
+ },
411
+ {
412
+ "inputs": [
413
+ {
414
+ "internalType": "UFixed",
415
+ "name": "a",
416
+ "type": "uint256"
417
+ },
418
+ {
419
+ "internalType": "UFixed",
420
+ "name": "b",
421
+ "type": "uint256"
422
+ }
423
+ ],
424
+ "name": "sub",
425
+ "outputs": [
426
+ {
427
+ "internalType": "UFixed",
428
+ "name": "",
429
+ "type": "uint256"
430
+ }
431
+ ],
432
+ "stateMutability": "pure",
433
+ "type": "function"
434
+ }
435
+ ],
436
+ "bytecode": "0x61147f610053600b82828239805160001a607314610046577f4e487b7100000000000000000000000000000000000000000000000000000000600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106101415760003560e01c8063a391c15b116100c2578063d05b045211610086578063d05b0452146103e0578063dd45daa114610410578063ea6515c414610440578063eb646d7114610470578063f30ed5981461048e578063f70dd33e146104ac57610141565b8063a391c15b146102f0578063b477332914610320578063b67d77c514610350578063c8a4ac9c14610380578063cc8b7b73146103b057610141565b806332148d731161010957806332148d7314610200578063753b14a514610230578063771602f7146102605780637a858b971461029057806392ae8ce0146102c057610141565b8063059f8b1614610146578063118fc88c146101645780631a12cd471461019457806321e5749b146101b2578063313ce567146101e2575b600080fd5b61014e6104dc565b60405161015b9190610b3f565b60405180910390f35b61017e60048036038101906101799190610b8b565b6104f0565b60405161018b9190610be6565b60405180910390f35b61019c610504565b6040516101a99190610c1d565b60405180910390f35b6101cc60048036038101906101c79190610b8b565b610509565b6040516101d99190610be6565b60405180910390f35b6101ea61051d565b6040516101f79190610b3f565b60405180910390f35b61021a60048036038101906102159190610b8b565b610529565b6040516102279190610be6565b60405180910390f35b61024a60048036038101906102459190610c38565b61053d565b6040516102579190610be6565b60405180910390f35b61027a60048036038101906102759190610b8b565b61054f565b6040516102879190610ca0565b60405180910390f35b6102aa60048036038101906102a59190610c38565b610563565b6040516102b79190610be6565b60405180910390f35b6102da60048036038101906102d59190610ce7565b610575565b6040516102e79190610ca0565b60405180910390f35b61030a60048036038101906103059190610b8b565b61059a565b6040516103179190610ca0565b60405180910390f35b61033a60048036038101906103359190610b8b565b6105ae565b6040516103479190610be6565b60405180910390f35b61036a60048036038101906103659190610b8b565b6105c2565b6040516103779190610ca0565b60405180910390f35b61039a60048036038101906103959190610b8b565b6105d6565b6040516103a79190610ca0565b60405180910390f35b6103ca60048036038101906103c59190610b8b565b6105ea565b6040516103d79190610ca0565b60405180910390f35b6103fa60048036038101906103f59190610c38565b6105fe565b6040516104079190610b3f565b60405180910390f35b61042a60048036038101906104259190610d40565b610612565b6040516104379190610ca0565b60405180910390f35b61045a60048036038101906104559190610b8b565b6106f4565b6040516104679190610be6565b60405180910390f35b610478610708565b6040516104859190610b3f565b60405180910390f35b610496610728565b6040516104a39190610df7565b60405180910390f35b6104c660048036038101906104c19190610e37565b61072d565b6040516104d39190610b3f565b60405180910390f35b601260000b600a6104ed9190610fd9565b81565b60006104fc838361081e565b905092915050565b601281565b6000610515838361082b565b905092915050565b6000601260ff16905090565b60006105358383610838565b905092915050565b600061054882610845565b9050919050565b600061055b8383610851565b905092915050565b600061056e82610867565b9050919050565b6000601260000b600a6105889190610fd9565b826105939190611024565b9050919050565b60006105a68383610873565b905092915050565b60006105ba83836108d2565b905092915050565b60006105ce83836108e0565b905092915050565b60006105e2838361093f565b905092915050565b60006105f6838361095c565b905092915050565b600061060b82600261072d565b9050919050565b6000808260126106229190611066565b60000b1215610666576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161065d9061111c565b60405180910390fd5b60126002610674919061113c565b60000b8260126106849190611066565b60000b13156106c8576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016106bf906111c5565b60405180910390fd5b8160126106d59190611066565b600a6106e191906111f2565b836106ec9190611024565b905092915050565b60006107008383610991565b905092915050565b6002601260000b600a61071b9190610fd9565b610725919061126c565b81565b600281565b600060028081111561074257610741610d80565b5b82600281111561075557610754610d80565b5b036107a65761079f6002601260000b600a6107709190610fd9565b61077a919061126c565b84610785919061129d565b6001601260000b600a6107989190610fd9565b600061099f565b9050610818565b600060028111156107ba576107b9610d80565b5b8260028111156107cd576107cc610d80565b5b036107f7576107f0836001601260000b600a6107e99190610fd9565b600061099f565b9050610818565b610815836001601260000b600a61080e9190610fd9565b600161099f565b90505b92915050565b6000818310905092915050565b6000818311905092915050565b6000818314905092915050565b60008082149050919050565b6000818361085f919061129d565b905092915050565b60008082119050919050565b60008082116108b7576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016108ae9061131d565b60405180910390fd5b6108ca83670de0b6b3a764000084610a15565b905092915050565b600081831015905092915050565b60006108ec83836108d2565b61092b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161092290611389565b60405180910390fd5b818361093791906113a9565b905092915050565b60006109548383670de0b6b3a7640000610a15565b905092915050565b6000610968838361082b565b1561097e5761097783836108e0565b905061098b565b61098882846108e0565b90505b92915050565b600081831115905092915050565b6000806109ad868686610a15565b9050600160028111156109c3576109c2610d80565b5b8360028111156109d6576109d5610d80565b5b1480156109f45750600084806109ef576109ee61123d565b5b868809115b15610a0957600181610a06919061129d565b90505b80915050949350505050565b6000806000801985870985870292508281108382030391505060008103610a5057838281610a4657610a4561123d565b5b0492505050610b1f565b808411610a92576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610a8990611429565b60405180910390fd5b60008486880990508281118203915080830392506000600186190186169050808604955080840493506001818260000304019050808302841793506000600287600302189050808702600203810290508087026002038102905080870260020381029050808702600203810290508087026002038102905080870260020381029050808502955050505050505b9392505050565b6000819050919050565b610b3981610b26565b82525050565b6000602082019050610b546000830184610b30565b92915050565b600080fd5b610b6881610b26565b8114610b7357600080fd5b50565b600081359050610b8581610b5f565b92915050565b60008060408385031215610ba257610ba1610b5a565b5b6000610bb085828601610b76565b9250506020610bc185828601610b76565b9150509250929050565b60008115159050919050565b610be081610bcb565b82525050565b6000602082019050610bfb6000830184610bd7565b92915050565b60008160000b9050919050565b610c1781610c01565b82525050565b6000602082019050610c326000830184610c0e565b92915050565b600060208284031215610c4e57610c4d610b5a565b5b6000610c5c84828501610b76565b91505092915050565b6000819050919050565b6000610c8a610c85610c8084610b26565b610c65565b610b26565b9050919050565b610c9a81610c6f565b82525050565b6000602082019050610cb56000830184610c91565b92915050565b610cc481610b26565b8114610ccf57600080fd5b50565b600081359050610ce181610cbb565b92915050565b600060208284031215610cfd57610cfc610b5a565b5b6000610d0b84828501610cd2565b91505092915050565b610d1d81610c01565b8114610d2857600080fd5b50565b600081359050610d3a81610d14565b92915050565b60008060408385031215610d5757610d56610b5a565b5b6000610d6585828601610cd2565b9250506020610d7685828601610d2b565b9150509250929050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602160045260246000fd5b60038110610dc057610dbf610d80565b5b50565b6000819050610dd182610daf565b919050565b6000610de182610dc3565b9050919050565b610df181610dd6565b82525050565b6000602082019050610e0c6000830184610de8565b92915050565b60038110610e1f57600080fd5b50565b600081359050610e3181610e12565b92915050565b60008060408385031215610e4e57610e4d610b5a565b5b6000610e5c85828601610b76565b9250506020610e6d85828601610e22565b9150509250929050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60008160011c9050919050565b6000808291508390505b6001851115610efd57808604811115610ed957610ed8610e77565b5b6001851615610ee85780820291505b8081029050610ef685610ea6565b9450610ebd565b94509492505050565b600082610f165760019050610fd2565b81610f245760009050610fd2565b8160018114610f3a5760028114610f4457610f73565b6001915050610fd2565b60ff841115610f5657610f55610e77565b5b8360020a915084821115610f6d57610f6c610e77565b5b50610fd2565b5060208310610133831016604e8410600b8410161715610fa85782820a905083811115610fa357610fa2610e77565b5b610fd2565b610fb58484846001610eb3565b92509050818404811115610fcc57610fcb610e77565b5b81810290505b9392505050565b6000610fe482610b26565b9150610fef83610b26565b925061101c7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8484610f06565b905092915050565b600061102f82610b26565b915061103a83610b26565b925082820261104881610b26565b9150828204841483151761105f5761105e610e77565b5b5092915050565b600061107182610c01565b915061107c83610c01565b925082820190507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff808112607f821317156110b9576110b8610e77565b5b92915050565b600082825260208201905092915050565b7f4552524f523a464d2d3031303a4558504f4e454e545f544f4f5f534d414c4c00600082015250565b6000611106601f836110bf565b9150611111826110d0565b602082019050919050565b60006020820190508181036000830152611135816110f9565b9050919050565b600061114782610c01565b915061115283610c01565b925082820261116081610c01565b915080821461117257611171610e77565b5b5092915050565b7f4552524f523a464d2d3031313a4558504f4e454e545f544f4f5f4c4152474500600082015250565b60006111af601f836110bf565b91506111ba82611179565b602082019050919050565b600060208201905081810360008301526111de816111a2565b9050919050565b600060ff82169050919050565b60006111fd82610b26565b9150611208836111e5565b92506112357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8484610f06565b905092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b600061127782610b26565b915061128283610b26565b9250826112925761129161123d565b5b828204905092915050565b60006112a882610b26565b91506112b383610b26565b92508282019050808211156112cb576112ca610e77565b5b92915050565b7f4552524f523a55464d2d3032303a44495649534f525f5a45524f000000000000600082015250565b6000611307601a836110bf565b9150611312826112d1565b602082019050919050565b60006020820190508181036000830152611336816112fa565b9050919050565b7f4552524f523a55464d2d3031303a4e454741544956455f524553554c54000000600082015250565b6000611373601d836110bf565b915061137e8261133d565b602082019050919050565b600060208201905081810360008301526113a281611366565b9050919050565b60006113b482610b26565b91506113bf83610b26565b92508282039050818111156113d7576113d6610e77565b5b92915050565b7f4d6174683a206d756c446976206f766572666c6f770000000000000000000000600082015250565b60006114136015836110bf565b915061141e826113dd565b602082019050919050565b6000602082019050818103600083015261144281611406565b905091905056fea2646970667358221220a79031ff9896c283cf59d6d16d72edaffbec2a580e23470a5ecc007dabdbca1864736f6c63430008140033",
437
+ "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106101415760003560e01c8063a391c15b116100c2578063d05b045211610086578063d05b0452146103e0578063dd45daa114610410578063ea6515c414610440578063eb646d7114610470578063f30ed5981461048e578063f70dd33e146104ac57610141565b8063a391c15b146102f0578063b477332914610320578063b67d77c514610350578063c8a4ac9c14610380578063cc8b7b73146103b057610141565b806332148d731161010957806332148d7314610200578063753b14a514610230578063771602f7146102605780637a858b971461029057806392ae8ce0146102c057610141565b8063059f8b1614610146578063118fc88c146101645780631a12cd471461019457806321e5749b146101b2578063313ce567146101e2575b600080fd5b61014e6104dc565b60405161015b9190610b3f565b60405180910390f35b61017e60048036038101906101799190610b8b565b6104f0565b60405161018b9190610be6565b60405180910390f35b61019c610504565b6040516101a99190610c1d565b60405180910390f35b6101cc60048036038101906101c79190610b8b565b610509565b6040516101d99190610be6565b60405180910390f35b6101ea61051d565b6040516101f79190610b3f565b60405180910390f35b61021a60048036038101906102159190610b8b565b610529565b6040516102279190610be6565b60405180910390f35b61024a60048036038101906102459190610c38565b61053d565b6040516102579190610be6565b60405180910390f35b61027a60048036038101906102759190610b8b565b61054f565b6040516102879190610ca0565b60405180910390f35b6102aa60048036038101906102a59190610c38565b610563565b6040516102b79190610be6565b60405180910390f35b6102da60048036038101906102d59190610ce7565b610575565b6040516102e79190610ca0565b60405180910390f35b61030a60048036038101906103059190610b8b565b61059a565b6040516103179190610ca0565b60405180910390f35b61033a60048036038101906103359190610b8b565b6105ae565b6040516103479190610be6565b60405180910390f35b61036a60048036038101906103659190610b8b565b6105c2565b6040516103779190610ca0565b60405180910390f35b61039a60048036038101906103959190610b8b565b6105d6565b6040516103a79190610ca0565b60405180910390f35b6103ca60048036038101906103c59190610b8b565b6105ea565b6040516103d79190610ca0565b60405180910390f35b6103fa60048036038101906103f59190610c38565b6105fe565b6040516104079190610b3f565b60405180910390f35b61042a60048036038101906104259190610d40565b610612565b6040516104379190610ca0565b60405180910390f35b61045a60048036038101906104559190610b8b565b6106f4565b6040516104679190610be6565b60405180910390f35b610478610708565b6040516104859190610b3f565b60405180910390f35b610496610728565b6040516104a39190610df7565b60405180910390f35b6104c660048036038101906104c19190610e37565b61072d565b6040516104d39190610b3f565b60405180910390f35b601260000b600a6104ed9190610fd9565b81565b60006104fc838361081e565b905092915050565b601281565b6000610515838361082b565b905092915050565b6000601260ff16905090565b60006105358383610838565b905092915050565b600061054882610845565b9050919050565b600061055b8383610851565b905092915050565b600061056e82610867565b9050919050565b6000601260000b600a6105889190610fd9565b826105939190611024565b9050919050565b60006105a68383610873565b905092915050565b60006105ba83836108d2565b905092915050565b60006105ce83836108e0565b905092915050565b60006105e2838361093f565b905092915050565b60006105f6838361095c565b905092915050565b600061060b82600261072d565b9050919050565b6000808260126106229190611066565b60000b1215610666576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161065d9061111c565b60405180910390fd5b60126002610674919061113c565b60000b8260126106849190611066565b60000b13156106c8576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016106bf906111c5565b60405180910390fd5b8160126106d59190611066565b600a6106e191906111f2565b836106ec9190611024565b905092915050565b60006107008383610991565b905092915050565b6002601260000b600a61071b9190610fd9565b610725919061126c565b81565b600281565b600060028081111561074257610741610d80565b5b82600281111561075557610754610d80565b5b036107a65761079f6002601260000b600a6107709190610fd9565b61077a919061126c565b84610785919061129d565b6001601260000b600a6107989190610fd9565b600061099f565b9050610818565b600060028111156107ba576107b9610d80565b5b8260028111156107cd576107cc610d80565b5b036107f7576107f0836001601260000b600a6107e99190610fd9565b600061099f565b9050610818565b610815836001601260000b600a61080e9190610fd9565b600161099f565b90505b92915050565b6000818310905092915050565b6000818311905092915050565b6000818314905092915050565b60008082149050919050565b6000818361085f919061129d565b905092915050565b60008082119050919050565b60008082116108b7576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016108ae9061131d565b60405180910390fd5b6108ca83670de0b6b3a764000084610a15565b905092915050565b600081831015905092915050565b60006108ec83836108d2565b61092b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161092290611389565b60405180910390fd5b818361093791906113a9565b905092915050565b60006109548383670de0b6b3a7640000610a15565b905092915050565b6000610968838361082b565b1561097e5761097783836108e0565b905061098b565b61098882846108e0565b90505b92915050565b600081831115905092915050565b6000806109ad868686610a15565b9050600160028111156109c3576109c2610d80565b5b8360028111156109d6576109d5610d80565b5b1480156109f45750600084806109ef576109ee61123d565b5b868809115b15610a0957600181610a06919061129d565b90505b80915050949350505050565b6000806000801985870985870292508281108382030391505060008103610a5057838281610a4657610a4561123d565b5b0492505050610b1f565b808411610a92576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610a8990611429565b60405180910390fd5b60008486880990508281118203915080830392506000600186190186169050808604955080840493506001818260000304019050808302841793506000600287600302189050808702600203810290508087026002038102905080870260020381029050808702600203810290508087026002038102905080870260020381029050808502955050505050505b9392505050565b6000819050919050565b610b3981610b26565b82525050565b6000602082019050610b546000830184610b30565b92915050565b600080fd5b610b6881610b26565b8114610b7357600080fd5b50565b600081359050610b8581610b5f565b92915050565b60008060408385031215610ba257610ba1610b5a565b5b6000610bb085828601610b76565b9250506020610bc185828601610b76565b9150509250929050565b60008115159050919050565b610be081610bcb565b82525050565b6000602082019050610bfb6000830184610bd7565b92915050565b60008160000b9050919050565b610c1781610c01565b82525050565b6000602082019050610c326000830184610c0e565b92915050565b600060208284031215610c4e57610c4d610b5a565b5b6000610c5c84828501610b76565b91505092915050565b6000819050919050565b6000610c8a610c85610c8084610b26565b610c65565b610b26565b9050919050565b610c9a81610c6f565b82525050565b6000602082019050610cb56000830184610c91565b92915050565b610cc481610b26565b8114610ccf57600080fd5b50565b600081359050610ce181610cbb565b92915050565b600060208284031215610cfd57610cfc610b5a565b5b6000610d0b84828501610cd2565b91505092915050565b610d1d81610c01565b8114610d2857600080fd5b50565b600081359050610d3a81610d14565b92915050565b60008060408385031215610d5757610d56610b5a565b5b6000610d6585828601610cd2565b9250506020610d7685828601610d2b565b9150509250929050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602160045260246000fd5b60038110610dc057610dbf610d80565b5b50565b6000819050610dd182610daf565b919050565b6000610de182610dc3565b9050919050565b610df181610dd6565b82525050565b6000602082019050610e0c6000830184610de8565b92915050565b60038110610e1f57600080fd5b50565b600081359050610e3181610e12565b92915050565b60008060408385031215610e4e57610e4d610b5a565b5b6000610e5c85828601610b76565b9250506020610e6d85828601610e22565b9150509250929050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60008160011c9050919050565b6000808291508390505b6001851115610efd57808604811115610ed957610ed8610e77565b5b6001851615610ee85780820291505b8081029050610ef685610ea6565b9450610ebd565b94509492505050565b600082610f165760019050610fd2565b81610f245760009050610fd2565b8160018114610f3a5760028114610f4457610f73565b6001915050610fd2565b60ff841115610f5657610f55610e77565b5b8360020a915084821115610f6d57610f6c610e77565b5b50610fd2565b5060208310610133831016604e8410600b8410161715610fa85782820a905083811115610fa357610fa2610e77565b5b610fd2565b610fb58484846001610eb3565b92509050818404811115610fcc57610fcb610e77565b5b81810290505b9392505050565b6000610fe482610b26565b9150610fef83610b26565b925061101c7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8484610f06565b905092915050565b600061102f82610b26565b915061103a83610b26565b925082820261104881610b26565b9150828204841483151761105f5761105e610e77565b5b5092915050565b600061107182610c01565b915061107c83610c01565b925082820190507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff808112607f821317156110b9576110b8610e77565b5b92915050565b600082825260208201905092915050565b7f4552524f523a464d2d3031303a4558504f4e454e545f544f4f5f534d414c4c00600082015250565b6000611106601f836110bf565b9150611111826110d0565b602082019050919050565b60006020820190508181036000830152611135816110f9565b9050919050565b600061114782610c01565b915061115283610c01565b925082820261116081610c01565b915080821461117257611171610e77565b5b5092915050565b7f4552524f523a464d2d3031313a4558504f4e454e545f544f4f5f4c4152474500600082015250565b60006111af601f836110bf565b91506111ba82611179565b602082019050919050565b600060208201905081810360008301526111de816111a2565b9050919050565b600060ff82169050919050565b60006111fd82610b26565b9150611208836111e5565b92506112357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8484610f06565b905092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b600061127782610b26565b915061128283610b26565b9250826112925761129161123d565b5b828204905092915050565b60006112a882610b26565b91506112b383610b26565b92508282019050808211156112cb576112ca610e77565b5b92915050565b7f4552524f523a55464d2d3032303a44495649534f525f5a45524f000000000000600082015250565b6000611307601a836110bf565b9150611312826112d1565b602082019050919050565b60006020820190508181036000830152611336816112fa565b9050919050565b7f4552524f523a55464d2d3031303a4e454741544956455f524553554c54000000600082015250565b6000611373601d836110bf565b915061137e8261133d565b602082019050919050565b600060208201905081810360008301526113a281611366565b9050919050565b60006113b482610b26565b91506113bf83610b26565b92508282039050818111156113d7576113d6610e77565b5b92915050565b7f4d6174683a206d756c446976206f766572666c6f770000000000000000000000600082015250565b60006114136015836110bf565b915061141e826113dd565b602082019050919050565b6000602082019050818103600083015261144281611406565b905091905056fea2646970667358221220a79031ff9896c283cf59d6d16d72edaffbec2a580e23470a5ecc007dabdbca1864736f6c63430008140033",
438
+ "linkReferences": {},
439
+ "deployedLinkReferences": {}
440
+ }
@@ -9,7 +9,7 @@ import {IInstance} from "../IInstance.sol";
9
9
  import {IComponent, IComponentContract, IComponentModule, IComponentOwnerService} from "./IComponent.sol";
10
10
  import {IProductComponent} from "../../components/IProduct.sol";
11
11
  import {IPoolModule} from "../pool/IPoolModule.sol";
12
- import {NftId, NftIdLib, eqNftId} from "../../types/NftId.sol";
12
+ import {NftId, NftIdLib} from "../../types/NftId.sol";
13
13
 
14
14
  abstract contract ComponentModule is
15
15
  IRegistryLinked,
@@ -106,7 +106,7 @@ abstract contract ComponentModule is
106
106
  {
107
107
  nftId = info.nftId;
108
108
  require(
109
- nftId.gtz() && eqNftId(_componentInfo[nftId].nftId, nftId),
109
+ nftId.gtz() && _componentInfo[nftId].nftId.eq(nftId),
110
110
  "ERROR:CMP-006:COMPONENT_UNKNOWN");
111
111
 
112
112
  _componentInfo[nftId] = info;
@@ -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,15 +12,24 @@ 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
17
 
18
+ /// @dev Return the NftId zero (0)
19
+ function zeroNftId() pure returns(NftId) { return NftId.wrap(0); }
20
+
17
21
  // pure free functions for operators
18
22
  function eqNftId(NftId a, NftId b) pure returns(bool isSame) { return NftId.unwrap(a) == NftId.unwrap(b); }
19
23
  function neNftId(NftId a, NftId b) pure returns(bool isDifferent) { return NftId.unwrap(a) != NftId.unwrap(b); }
20
24
 
21
25
  // library functions that operate on user defined type
22
26
  library NftIdLib {
23
- function toInt(NftId nftId) public 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).
24
30
  function gtz(NftId a) public pure returns(bool) { return NftId.unwrap(a) > 0; }
31
+ /// @dev Returns true if the value is zero (== 0).
25
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); }
26
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
+ }