@etherisc/gif-next 0.0.2-cc253b3 → 0.0.2-cf606cd
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +6 -0
- package/artifacts/contracts/components/Component.sol/Component.dbg.json +1 -1
- package/artifacts/contracts/components/Component.sol/InstanceLinked.dbg.json +1 -1
- package/artifacts/contracts/components/Component.sol/InstanceLinked.json +2 -2
- package/artifacts/contracts/components/IPool.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IProduct.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/components/Pool.sol/Pool.json +2 -2
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/components/Product.sol/Product.json +2 -2
- package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +1 -1
- package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +1 -1
- package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
- package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +16 -8
- package/artifacts/contracts/instance/access/Access.sol/AccessModule.dbg.json +1 -1
- package/artifacts/contracts/instance/access/IAccess.sol/IAccess.dbg.json +1 -1
- package/artifacts/contracts/instance/access/IAccess.sol/IAccessCheckRole.dbg.json +1 -1
- package/artifacts/contracts/instance/access/IAccess.sol/IAccessComponentTypeRoles.dbg.json +1 -1
- package/artifacts/contracts/instance/access/IAccess.sol/IAccessModule.dbg.json +1 -1
- package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentModule.dbg.json +1 -1
- package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentOwnerService.dbg.json +1 -1
- package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentOwnerService.json +2 -2
- package/artifacts/contracts/instance/component/IComponent.sol/IComponent.dbg.json +1 -1
- package/artifacts/contracts/instance/component/IComponent.sol/IComponentContract.dbg.json +1 -1
- package/artifacts/contracts/instance/component/IComponent.sol/IComponentModule.dbg.json +1 -1
- package/artifacts/contracts/instance/component/IComponent.sol/IComponentOwnerService.dbg.json +1 -1
- package/artifacts/contracts/instance/component/IComponent.sol/IInstanceLinked.dbg.json +1 -1
- package/artifacts/contracts/instance/policy/IPolicy.sol/IPolicy.dbg.json +1 -1
- package/artifacts/contracts/instance/policy/IPolicy.sol/IPolicyModule.dbg.json +1 -1
- package/artifacts/contracts/instance/policy/PolicyModule.sol/PolicyModule.dbg.json +1 -1
- package/artifacts/contracts/instance/pool/IPoolModule.sol/IPool.dbg.json +1 -1
- package/artifacts/contracts/instance/pool/IPoolModule.sol/IPoolModule.dbg.json +1 -1
- package/artifacts/contracts/instance/pool/PoolModule.sol/PoolModule.dbg.json +1 -1
- package/artifacts/contracts/instance/product/IProductService.sol/IProductModule.dbg.json +1 -1
- package/artifacts/contracts/instance/product/IProductService.sol/IProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/product/ProductService.sol/ProductModule.dbg.json +1 -1
- package/artifacts/contracts/instance/product/ProductService.sol/ProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/product/ProductService.sol/ProductService.json +2 -2
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/IChainNft.sol/IChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IOwnable.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegisterable.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistryLinked.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.json +2 -2
- package/artifacts/contracts/registry/Registry.sol/RegistryLinked.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/RegistryLinked.json +2 -2
- package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +4 -0
- package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.json +174 -0
- package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/ChainId.sol/ChainIdLib.json +2 -2
- package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/NftId.sol/NftIdLib.json +28 -4
- package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +4 -0
- package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +174 -0
- package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.dbg.json +4 -0
- package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.json +453 -0
- package/contracts/instance/component/ComponentModule.sol +2 -2
- package/contracts/types/Blocknumber.sol +60 -0
- package/contracts/types/ChainId.sol +7 -1
- package/contracts/types/NftId.sol +10 -1
- package/contracts/types/Timestamp.sol +55 -0
- package/contracts/types/UFixed.sol +211 -0
- package/package.json +1 -1
@@ -0,0 +1,453 @@
|
|
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
|
+
"inputs": [],
|
437
|
+
"name": "zero",
|
438
|
+
"outputs": [
|
439
|
+
{
|
440
|
+
"internalType": "UFixed",
|
441
|
+
"name": "",
|
442
|
+
"type": "uint256"
|
443
|
+
}
|
444
|
+
],
|
445
|
+
"stateMutability": "pure",
|
446
|
+
"type": "function"
|
447
|
+
}
|
448
|
+
],
|
449
|
+
"bytecode": "0x611461610053600b82828239805160001a607314610046577f4e487b7100000000000000000000000000000000000000000000000000000000600052600060045260246000fd5b30600052607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061014c5760003560e01c8063b4773329116100c2578063d05b045211610086578063d05b045214610409578063dd45daa114610439578063ea6515c414610469578063eb646d7114610499578063f30ed598146104b7578063f70dd33e146104d55761014c565b8063b47733291461032b578063b67d77c51461035b578063bc1b392d1461038b578063c8a4ac9c146103a9578063cc8b7b73146103d95761014c565b806332148d731161011457806332148d731461020b578063753b14a51461023b578063771602f71461026b5780637a858b971461029b57806392ae8ce0146102cb578063a391c15b146102fb5761014c565b8063059f8b1614610151578063118fc88c1461016f5780631a12cd471461019f57806321e5749b146101bd578063313ce567146101ed575b600080fd5b610159610505565b6040516101669190610b5e565b60405180910390f35b61018960048036038101906101849190610baa565b610519565b6040516101969190610c05565b60405180910390f35b6101a761052d565b6040516101b49190610c3c565b60405180910390f35b6101d760048036038101906101d29190610baa565b610532565b6040516101e49190610c05565b60405180910390f35b6101f5610546565b6040516102029190610b5e565b60405180910390f35b61022560048036038101906102209190610baa565b610552565b6040516102329190610c05565b60405180910390f35b61025560048036038101906102509190610c57565b610566565b6040516102629190610c05565b60405180910390f35b61028560048036038101906102809190610baa565b610578565b6040516102929190610cbf565b60405180910390f35b6102b560048036038101906102b09190610c57565b61058c565b6040516102c29190610c05565b60405180910390f35b6102e560048036038101906102e09190610d06565b61059e565b6040516102f29190610cbf565b60405180910390f35b61031560048036038101906103109190610baa565b6105c3565b6040516103229190610cbf565b60405180910390f35b61034560048036038101906103409190610baa565b6105d7565b6040516103529190610c05565b60405180910390f35b61037560048036038101906103709190610baa565b6105eb565b6040516103829190610cbf565b60405180910390f35b6103936105ff565b6040516103a09190610cbf565b60405180910390f35b6103c360048036038101906103be9190610baa565b610604565b6040516103d09190610cbf565b60405180910390f35b6103f360048036038101906103ee9190610baa565b610618565b6040516104009190610cbf565b60405180910390f35b610423600480360381019061041e9190610c57565b61062c565b6040516104309190610b5e565b60405180910390f35b610453600480360381019061044e9190610d5f565b610640565b6040516104609190610cbf565b60405180910390f35b610483600480360381019061047e9190610baa565b610713565b6040516104909190610c05565b60405180910390f35b6104a1610727565b6040516104ae9190610b5e565b60405180910390f35b6104bf610747565b6040516104cc9190610e16565b60405180910390f35b6104ef60048036038101906104ea9190610e56565b61074c565b6040516104fc9190610b5e565b60405180910390f35b601260000b600a6105169190610ff8565b81565b6000610525838361083d565b905092915050565b601281565b600061053e838361084a565b905092915050565b6000601260ff16905090565b600061055e8383610857565b905092915050565b600061057182610864565b9050919050565b60006105848383610870565b905092915050565b600061059782610886565b9050919050565b6000601260000b600a6105b19190610ff8565b826105bc9190611043565b9050919050565b60006105cf8383610892565b905092915050565b60006105e383836108f1565b905092915050565b60006105f783836108ff565b905092915050565b600090565b6000610610838361095e565b905092915050565b6000610624838361097b565b905092915050565b600061063982600261074c565b9050919050565b6000808260126106509190611085565b60000b1215610694576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161068b9061113b565b60405180910390fd5b60408260126106a39190611085565b60000b13156106e7576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016106de906111a7565b60405180910390fd5b8160126106f49190611085565b600a61070091906111d4565b8361070b9190611043565b905092915050565b600061071f83836109b0565b905092915050565b6002601260000b600a61073a9190610ff8565b610744919061124e565b81565b600281565b600060028081111561076157610760610d9f565b5b82600281111561077457610773610d9f565b5b036107c5576107be6002601260000b600a61078f9190610ff8565b610799919061124e565b846107a4919061127f565b6001601260000b600a6107b79190610ff8565b60006109be565b9050610837565b600060028111156107d9576107d8610d9f565b5b8260028111156107ec576107eb610d9f565b5b036108165761080f836001601260000b600a6108089190610ff8565b60006109be565b9050610837565b610834836001601260000b600a61082d9190610ff8565b60016109be565b90505b92915050565b6000818310905092915050565b6000818311905092915050565b6000818314905092915050565b60008082149050919050565b6000818361087e919061127f565b905092915050565b60008082119050919050565b60008082116108d6576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016108cd906112ff565b60405180910390fd5b6108e983670de0b6b3a764000084610a34565b905092915050565b600081831015905092915050565b600061090b83836108f1565b61094a576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016109419061136b565b60405180910390fd5b8183610956919061138b565b905092915050565b60006109738383670de0b6b3a7640000610a34565b905092915050565b6000610987838361084a565b1561099d5761099683836108ff565b90506109aa565b6109a782846108ff565b90505b92915050565b600081831115905092915050565b6000806109cc868686610a34565b9050600160028111156109e2576109e1610d9f565b5b8360028111156109f5576109f4610d9f565b5b148015610a13575060008480610a0e57610a0d61121f565b5b868809115b15610a2857600181610a25919061127f565b90505b80915050949350505050565b6000806000801985870985870292508281108382030391505060008103610a6f57838281610a6557610a6461121f565b5b0492505050610b3e565b808411610ab1576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610aa89061140b565b60405180910390fd5b60008486880990508281118203915080830392506000600186190186169050808604955080840493506001818260000304019050808302841793506000600287600302189050808702600203810290508087026002038102905080870260020381029050808702600203810290508087026002038102905080870260020381029050808502955050505050505b9392505050565b6000819050919050565b610b5881610b45565b82525050565b6000602082019050610b736000830184610b4f565b92915050565b600080fd5b610b8781610b45565b8114610b9257600080fd5b50565b600081359050610ba481610b7e565b92915050565b60008060408385031215610bc157610bc0610b79565b5b6000610bcf85828601610b95565b9250506020610be085828601610b95565b9150509250929050565b60008115159050919050565b610bff81610bea565b82525050565b6000602082019050610c1a6000830184610bf6565b92915050565b60008160000b9050919050565b610c3681610c20565b82525050565b6000602082019050610c516000830184610c2d565b92915050565b600060208284031215610c6d57610c6c610b79565b5b6000610c7b84828501610b95565b91505092915050565b6000819050919050565b6000610ca9610ca4610c9f84610b45565b610c84565b610b45565b9050919050565b610cb981610c8e565b82525050565b6000602082019050610cd46000830184610cb0565b92915050565b610ce381610b45565b8114610cee57600080fd5b50565b600081359050610d0081610cda565b92915050565b600060208284031215610d1c57610d1b610b79565b5b6000610d2a84828501610cf1565b91505092915050565b610d3c81610c20565b8114610d4757600080fd5b50565b600081359050610d5981610d33565b92915050565b60008060408385031215610d7657610d75610b79565b5b6000610d8485828601610cf1565b9250506020610d9585828601610d4a565b9150509250929050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602160045260246000fd5b60038110610ddf57610dde610d9f565b5b50565b6000819050610df082610dce565b919050565b6000610e0082610de2565b9050919050565b610e1081610df5565b82525050565b6000602082019050610e2b6000830184610e07565b92915050565b60038110610e3e57600080fd5b50565b600081359050610e5081610e31565b92915050565b60008060408385031215610e6d57610e6c610b79565b5b6000610e7b85828601610b95565b9250506020610e8c85828601610e41565b9150509250929050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60008160011c9050919050565b6000808291508390505b6001851115610f1c57808604811115610ef857610ef7610e96565b5b6001851615610f075780820291505b8081029050610f1585610ec5565b9450610edc565b94509492505050565b600082610f355760019050610ff1565b81610f435760009050610ff1565b8160018114610f595760028114610f6357610f92565b6001915050610ff1565b60ff841115610f7557610f74610e96565b5b8360020a915084821115610f8c57610f8b610e96565b5b50610ff1565b5060208310610133831016604e8410600b8410161715610fc75782820a905083811115610fc257610fc1610e96565b5b610ff1565b610fd48484846001610ed2565b92509050818404811115610feb57610fea610e96565b5b81810290505b9392505050565b600061100382610b45565b915061100e83610b45565b925061103b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8484610f25565b905092915050565b600061104e82610b45565b915061105983610b45565b925082820261106781610b45565b9150828204841483151761107e5761107d610e96565b5b5092915050565b600061109082610c20565b915061109b83610c20565b925082820190507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff808112607f821317156110d8576110d7610e96565b5b92915050565b600082825260208201905092915050565b7f4552524f523a464d2d3031303a4558504f4e454e545f544f4f5f534d414c4c00600082015250565b6000611125601f836110de565b9150611130826110ef565b602082019050919050565b6000602082019050818103600083015261115481611118565b9050919050565b7f4552524f523a464d2d3031313a4558504f4e454e545f544f4f5f4c4152474500600082015250565b6000611191601f836110de565b915061119c8261115b565b602082019050919050565b600060208201905081810360008301526111c081611184565b9050919050565b600060ff82169050919050565b60006111df82610b45565b91506111ea836111c7565b92506112177fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8484610f25565b905092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b600061125982610b45565b915061126483610b45565b9250826112745761127361121f565b5b828204905092915050565b600061128a82610b45565b915061129583610b45565b92508282019050808211156112ad576112ac610e96565b5b92915050565b7f4552524f523a55464d2d3032303a44495649534f525f5a45524f000000000000600082015250565b60006112e9601a836110de565b91506112f4826112b3565b602082019050919050565b60006020820190508181036000830152611318816112dc565b9050919050565b7f4552524f523a55464d2d3031303a4e454741544956455f524553554c54000000600082015250565b6000611355601d836110de565b91506113608261131f565b602082019050919050565b6000602082019050818103600083015261138481611348565b9050919050565b600061139682610b45565b91506113a183610b45565b92508282039050818111156113b9576113b8610e96565b5b92915050565b7f4d6174683a206d756c446976206f766572666c6f770000000000000000000000600082015250565b60006113f56015836110de565b9150611400826113bf565b602082019050919050565b60006020820190508181036000830152611424816113e8565b905091905056fea26469706673582212200cdf7f0304a14a35829b3c911778a227ddf0a8fdc41fbd84cac1ef474046208564736f6c63430008140033",
|
450
|
+
"deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061014c5760003560e01c8063b4773329116100c2578063d05b045211610086578063d05b045214610409578063dd45daa114610439578063ea6515c414610469578063eb646d7114610499578063f30ed598146104b7578063f70dd33e146104d55761014c565b8063b47733291461032b578063b67d77c51461035b578063bc1b392d1461038b578063c8a4ac9c146103a9578063cc8b7b73146103d95761014c565b806332148d731161011457806332148d731461020b578063753b14a51461023b578063771602f71461026b5780637a858b971461029b57806392ae8ce0146102cb578063a391c15b146102fb5761014c565b8063059f8b1614610151578063118fc88c1461016f5780631a12cd471461019f57806321e5749b146101bd578063313ce567146101ed575b600080fd5b610159610505565b6040516101669190610b5e565b60405180910390f35b61018960048036038101906101849190610baa565b610519565b6040516101969190610c05565b60405180910390f35b6101a761052d565b6040516101b49190610c3c565b60405180910390f35b6101d760048036038101906101d29190610baa565b610532565b6040516101e49190610c05565b60405180910390f35b6101f5610546565b6040516102029190610b5e565b60405180910390f35b61022560048036038101906102209190610baa565b610552565b6040516102329190610c05565b60405180910390f35b61025560048036038101906102509190610c57565b610566565b6040516102629190610c05565b60405180910390f35b61028560048036038101906102809190610baa565b610578565b6040516102929190610cbf565b60405180910390f35b6102b560048036038101906102b09190610c57565b61058c565b6040516102c29190610c05565b60405180910390f35b6102e560048036038101906102e09190610d06565b61059e565b6040516102f29190610cbf565b60405180910390f35b61031560048036038101906103109190610baa565b6105c3565b6040516103229190610cbf565b60405180910390f35b61034560048036038101906103409190610baa565b6105d7565b6040516103529190610c05565b60405180910390f35b61037560048036038101906103709190610baa565b6105eb565b6040516103829190610cbf565b60405180910390f35b6103936105ff565b6040516103a09190610cbf565b60405180910390f35b6103c360048036038101906103be9190610baa565b610604565b6040516103d09190610cbf565b60405180910390f35b6103f360048036038101906103ee9190610baa565b610618565b6040516104009190610cbf565b60405180910390f35b610423600480360381019061041e9190610c57565b61062c565b6040516104309190610b5e565b60405180910390f35b610453600480360381019061044e9190610d5f565b610640565b6040516104609190610cbf565b60405180910390f35b610483600480360381019061047e9190610baa565b610713565b6040516104909190610c05565b60405180910390f35b6104a1610727565b6040516104ae9190610b5e565b60405180910390f35b6104bf610747565b6040516104cc9190610e16565b60405180910390f35b6104ef60048036038101906104ea9190610e56565b61074c565b6040516104fc9190610b5e565b60405180910390f35b601260000b600a6105169190610ff8565b81565b6000610525838361083d565b905092915050565b601281565b600061053e838361084a565b905092915050565b6000601260ff16905090565b600061055e8383610857565b905092915050565b600061057182610864565b9050919050565b60006105848383610870565b905092915050565b600061059782610886565b9050919050565b6000601260000b600a6105b19190610ff8565b826105bc9190611043565b9050919050565b60006105cf8383610892565b905092915050565b60006105e383836108f1565b905092915050565b60006105f783836108ff565b905092915050565b600090565b6000610610838361095e565b905092915050565b6000610624838361097b565b905092915050565b600061063982600261074c565b9050919050565b6000808260126106509190611085565b60000b1215610694576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161068b9061113b565b60405180910390fd5b60408260126106a39190611085565b60000b13156106e7576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016106de906111a7565b60405180910390fd5b8160126106f49190611085565b600a61070091906111d4565b8361070b9190611043565b905092915050565b600061071f83836109b0565b905092915050565b6002601260000b600a61073a9190610ff8565b610744919061124e565b81565b600281565b600060028081111561076157610760610d9f565b5b82600281111561077457610773610d9f565b5b036107c5576107be6002601260000b600a61078f9190610ff8565b610799919061124e565b846107a4919061127f565b6001601260000b600a6107b79190610ff8565b60006109be565b9050610837565b600060028111156107d9576107d8610d9f565b5b8260028111156107ec576107eb610d9f565b5b036108165761080f836001601260000b600a6108089190610ff8565b60006109be565b9050610837565b610834836001601260000b600a61082d9190610ff8565b60016109be565b90505b92915050565b6000818310905092915050565b6000818311905092915050565b6000818314905092915050565b60008082149050919050565b6000818361087e919061127f565b905092915050565b60008082119050919050565b60008082116108d6576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016108cd906112ff565b60405180910390fd5b6108e983670de0b6b3a764000084610a34565b905092915050565b600081831015905092915050565b600061090b83836108f1565b61094a576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016109419061136b565b60405180910390fd5b8183610956919061138b565b905092915050565b60006109738383670de0b6b3a7640000610a34565b905092915050565b6000610987838361084a565b1561099d5761099683836108ff565b90506109aa565b6109a782846108ff565b90505b92915050565b600081831115905092915050565b6000806109cc868686610a34565b9050600160028111156109e2576109e1610d9f565b5b8360028111156109f5576109f4610d9f565b5b148015610a13575060008480610a0e57610a0d61121f565b5b868809115b15610a2857600181610a25919061127f565b90505b80915050949350505050565b6000806000801985870985870292508281108382030391505060008103610a6f57838281610a6557610a6461121f565b5b0492505050610b3e565b808411610ab1576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610aa89061140b565b60405180910390fd5b60008486880990508281118203915080830392506000600186190186169050808604955080840493506001818260000304019050808302841793506000600287600302189050808702600203810290508087026002038102905080870260020381029050808702600203810290508087026002038102905080870260020381029050808502955050505050505b9392505050565b6000819050919050565b610b5881610b45565b82525050565b6000602082019050610b736000830184610b4f565b92915050565b600080fd5b610b8781610b45565b8114610b9257600080fd5b50565b600081359050610ba481610b7e565b92915050565b60008060408385031215610bc157610bc0610b79565b5b6000610bcf85828601610b95565b9250506020610be085828601610b95565b9150509250929050565b60008115159050919050565b610bff81610bea565b82525050565b6000602082019050610c1a6000830184610bf6565b92915050565b60008160000b9050919050565b610c3681610c20565b82525050565b6000602082019050610c516000830184610c2d565b92915050565b600060208284031215610c6d57610c6c610b79565b5b6000610c7b84828501610b95565b91505092915050565b6000819050919050565b6000610ca9610ca4610c9f84610b45565b610c84565b610b45565b9050919050565b610cb981610c8e565b82525050565b6000602082019050610cd46000830184610cb0565b92915050565b610ce381610b45565b8114610cee57600080fd5b50565b600081359050610d0081610cda565b92915050565b600060208284031215610d1c57610d1b610b79565b5b6000610d2a84828501610cf1565b91505092915050565b610d3c81610c20565b8114610d4757600080fd5b50565b600081359050610d5981610d33565b92915050565b60008060408385031215610d7657610d75610b79565b5b6000610d8485828601610cf1565b9250506020610d9585828601610d4a565b9150509250929050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602160045260246000fd5b60038110610ddf57610dde610d9f565b5b50565b6000819050610df082610dce565b919050565b6000610e0082610de2565b9050919050565b610e1081610df5565b82525050565b6000602082019050610e2b6000830184610e07565b92915050565b60038110610e3e57600080fd5b50565b600081359050610e5081610e31565b92915050565b60008060408385031215610e6d57610e6c610b79565b5b6000610e7b85828601610b95565b9250506020610e8c85828601610e41565b9150509250929050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60008160011c9050919050565b6000808291508390505b6001851115610f1c57808604811115610ef857610ef7610e96565b5b6001851615610f075780820291505b8081029050610f1585610ec5565b9450610edc565b94509492505050565b600082610f355760019050610ff1565b81610f435760009050610ff1565b8160018114610f595760028114610f6357610f92565b6001915050610ff1565b60ff841115610f7557610f74610e96565b5b8360020a915084821115610f8c57610f8b610e96565b5b50610ff1565b5060208310610133831016604e8410600b8410161715610fc75782820a905083811115610fc257610fc1610e96565b5b610ff1565b610fd48484846001610ed2565b92509050818404811115610feb57610fea610e96565b5b81810290505b9392505050565b600061100382610b45565b915061100e83610b45565b925061103b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8484610f25565b905092915050565b600061104e82610b45565b915061105983610b45565b925082820261106781610b45565b9150828204841483151761107e5761107d610e96565b5b5092915050565b600061109082610c20565b915061109b83610c20565b925082820190507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff808112607f821317156110d8576110d7610e96565b5b92915050565b600082825260208201905092915050565b7f4552524f523a464d2d3031303a4558504f4e454e545f544f4f5f534d414c4c00600082015250565b6000611125601f836110de565b9150611130826110ef565b602082019050919050565b6000602082019050818103600083015261115481611118565b9050919050565b7f4552524f523a464d2d3031313a4558504f4e454e545f544f4f5f4c4152474500600082015250565b6000611191601f836110de565b915061119c8261115b565b602082019050919050565b600060208201905081810360008301526111c081611184565b9050919050565b600060ff82169050919050565b60006111df82610b45565b91506111ea836111c7565b92506112177fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8484610f25565b905092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b600061125982610b45565b915061126483610b45565b9250826112745761127361121f565b5b828204905092915050565b600061128a82610b45565b915061129583610b45565b92508282019050808211156112ad576112ac610e96565b5b92915050565b7f4552524f523a55464d2d3032303a44495649534f525f5a45524f000000000000600082015250565b60006112e9601a836110de565b91506112f4826112b3565b602082019050919050565b60006020820190508181036000830152611318816112dc565b9050919050565b7f4552524f523a55464d2d3031303a4e454741544956455f524553554c54000000600082015250565b6000611355601d836110de565b91506113608261131f565b602082019050919050565b6000602082019050818103600083015261138481611348565b9050919050565b600061139682610b45565b91506113a183610b45565b92508282039050818111156113b9576113b8610e96565b5b92915050565b7f4d6174683a206d756c446976206f766572666c6f770000000000000000000000600082015250565b60006113f56015836110de565b9150611400826113bf565b602082019050919050565b60006020820190508181036000830152611424816113e8565b905091905056fea26469706673582212200cdf7f0304a14a35829b3c911778a227ddf0a8fdc41fbd84cac1ef474046208564736f6c63430008140033",
|
451
|
+
"linkReferences": {},
|
452
|
+
"deployedLinkReferences": {}
|
453
|
+
}
|
@@ -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
|
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() &&
|
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
|
-
|
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
|
-
|
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
|
+
}
|