@bloxchain/contracts 1.0.0-alpha.1 → 1.0.0-alpha.2

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 (24) hide show
  1. package/README.md +1 -1
  2. package/abi/{ControlBlox.abi.json → AccountBlox.abi.json} +7 -129
  3. package/abi/GuardController.abi.json +2 -44
  4. package/abi/RoleBlox.abi.json +5 -107
  5. package/abi/RuntimeRBAC.abi.json +0 -31
  6. package/abi/RuntimeRBACDefinitions.abi.json +50 -0
  7. package/abi/SecureBlox.abi.json +5 -76
  8. package/abi/SecureOwnable.abi.json +5 -76
  9. package/abi/SecureOwnableDefinitions.abi.json +38 -0
  10. package/abi/SimpleRWA20.abi.json +5 -76
  11. package/abi/SimpleVault.abi.json +5 -76
  12. package/core/access/RuntimeRBAC.sol +270 -278
  13. package/core/access/interface/IRuntimeRBAC.sol +2 -14
  14. package/core/access/lib/definitions/RuntimeRBACDefinitions.sol +22 -0
  15. package/core/base/BaseStateMachine.sol +881 -847
  16. package/core/execution/GuardController.sol +26 -72
  17. package/core/execution/lib/definitions/GuardControllerDefinitions.sol +30 -1
  18. package/core/lib/EngineBlox.sol +2322 -2283
  19. package/core/research/erc20-blox/ERC20Blox.sol +5 -5
  20. package/core/security/SecureOwnable.sol +412 -409
  21. package/core/security/interface/ISecureOwnable.sol +0 -14
  22. package/core/security/lib/definitions/SecureOwnableDefinitions.sol +20 -0
  23. package/package.json +1 -1
  24. package/utils/SharedValidation.sol +1 -0
package/README.md CHANGED
@@ -50,7 +50,7 @@ import "@bloxchain/contracts/interfaces/IDefinition.sol";
50
50
 
51
51
  ### Templates and examples
52
52
 
53
- Templates (e.g. BareBlox, SecureBlox, ControlBlox) and example applications (SimpleVault, SimpleRWA20) live in the main repository under `contracts/examples/`. They are not included in this npm package. See the [main repo](https://github.com/PracticalParticle/Bloxchain-Protocol) for full documentation and examples.
53
+ Templates (e.g. BareBlox, SecureBlox, AccountBlox) and example applications (SimpleVault, SimpleRWA20) live in the main repository under `contracts/examples/`. They are not included in this npm package. See the [main repo](https://github.com/PracticalParticle/Bloxchain-Protocol) for full documentation and examples.
54
54
 
55
55
  ## Dependencies
56
56
 
package/abi/{ControlBlox.abi.json → AccountBlox.abi.json} RENAMED
@@ -96,22 +96,6 @@
96
96
  "name": "MaxWalletsZero",
97
97
  "type": "error"
98
98
  },
99
- {
100
- "inputs": [
101
- {
102
- "internalType": "uint256",
103
- "name": "newPeriod",
104
- "type": "uint256"
105
- },
106
- {
107
- "internalType": "uint256",
108
- "name": "currentPeriod",
109
- "type": "uint256"
110
- }
111
- ],
112
- "name": "NewTimelockSame",
113
- "type": "error"
114
- },
115
99
  {
116
100
  "inputs": [
117
101
  {
@@ -165,6 +149,11 @@
165
149
  "name": "OnlyCallableByContract",
166
150
  "type": "error"
167
151
  },
152
+ {
153
+ "inputs": [],
154
+ "name": "PendingSecureRequest",
155
+ "type": "error"
156
+ },
168
157
  {
169
158
  "inputs": [
170
159
  {
@@ -261,17 +250,6 @@
261
250
  "name": "RestrictedRecovery",
262
251
  "type": "error"
263
252
  },
264
- {
265
- "inputs": [
266
- {
267
- "internalType": "uint256",
268
- "name": "provided",
269
- "type": "uint256"
270
- }
271
- ],
272
- "name": "TimeLockPeriodZero",
273
- "type": "error"
274
- },
275
253
  {
276
254
  "anonymous": false,
277
255
  "inputs": [
@@ -1221,7 +1199,7 @@
1221
1199
  {
1222
1200
  "components": [
1223
1201
  {
1224
- "internalType": "enum GuardController.GuardConfigActionType",
1202
+ "internalType": "enum GuardControllerDefinitions.GuardConfigActionType",
1225
1203
  "name": "actionType",
1226
1204
  "type": "uint8"
1227
1205
  },
@@ -1231,7 +1209,7 @@
1231
1209
  "type": "bytes"
1232
1210
  }
1233
1211
  ],
1234
- "internalType": "struct GuardController.GuardConfigAction[]",
1212
+ "internalType": "struct GuardControllerDefinitions.GuardConfigAction[]",
1235
1213
  "name": "actions",
1236
1214
  "type": "tuple[]"
1237
1215
  }
@@ -2477,37 +2455,6 @@
2477
2455
  "stateMutability": "view",
2478
2456
  "type": "function"
2479
2457
  },
2480
- {
2481
- "inputs": [
2482
- {
2483
- "components": [
2484
- {
2485
- "internalType": "enum GuardController.GuardConfigActionType",
2486
- "name": "actionType",
2487
- "type": "uint8"
2488
- },
2489
- {
2490
- "internalType": "bytes",
2491
- "name": "data",
2492
- "type": "bytes"
2493
- }
2494
- ],
2495
- "internalType": "struct GuardController.GuardConfigAction[]",
2496
- "name": "actions",
2497
- "type": "tuple[]"
2498
- }
2499
- ],
2500
- "name": "guardConfigBatchExecutionParams",
2501
- "outputs": [
2502
- {
2503
- "internalType": "bytes",
2504
- "name": "",
2505
- "type": "bytes"
2506
- }
2507
- ],
2508
- "stateMutability": "pure",
2509
- "type": "function"
2510
- },
2511
2458
  {
2512
2459
  "inputs": [
2513
2460
  {
@@ -3142,37 +3089,6 @@
3142
3089
  "stateMutability": "nonpayable",
3143
3090
  "type": "function"
3144
3091
  },
3145
- {
3146
- "inputs": [
3147
- {
3148
- "components": [
3149
- {
3150
- "internalType": "enum RuntimeRBAC.RoleConfigActionType",
3151
- "name": "actionType",
3152
- "type": "uint8"
3153
- },
3154
- {
3155
- "internalType": "bytes",
3156
- "name": "data",
3157
- "type": "bytes"
3158
- }
3159
- ],
3160
- "internalType": "struct RuntimeRBAC.RoleConfigAction[]",
3161
- "name": "actions",
3162
- "type": "tuple[]"
3163
- }
3164
- ],
3165
- "name": "roleConfigBatchExecutionParams",
3166
- "outputs": [
3167
- {
3168
- "internalType": "bytes",
3169
- "name": "",
3170
- "type": "bytes"
3171
- }
3172
- ],
3173
- "stateMutability": "pure",
3174
- "type": "function"
3175
- },
3176
3092
  {
3177
3093
  "inputs": [
3178
3094
  {
@@ -5257,25 +5173,6 @@
5257
5173
  "stateMutability": "nonpayable",
5258
5174
  "type": "function"
5259
5175
  },
5260
- {
5261
- "inputs": [
5262
- {
5263
- "internalType": "address",
5264
- "name": "newRecoveryAddress",
5265
- "type": "address"
5266
- }
5267
- ],
5268
- "name": "updateRecoveryExecutionParams",
5269
- "outputs": [
5270
- {
5271
- "internalType": "bytes",
5272
- "name": "",
5273
- "type": "bytes"
5274
- }
5275
- ],
5276
- "stateMutability": "view",
5277
- "type": "function"
5278
- },
5279
5176
  {
5280
5177
  "inputs": [
5281
5178
  {
@@ -5556,25 +5453,6 @@
5556
5453
  "stateMutability": "nonpayable",
5557
5454
  "type": "function"
5558
5455
  },
5559
- {
5560
- "inputs": [
5561
- {
5562
- "internalType": "uint256",
5563
- "name": "newTimeLockPeriodSec",
5564
- "type": "uint256"
5565
- }
5566
- ],
5567
- "name": "updateTimeLockExecutionParams",
5568
- "outputs": [
5569
- {
5570
- "internalType": "bytes",
5571
- "name": "",
5572
- "type": "bytes"
5573
- }
5574
- ],
5575
- "stateMutability": "view",
5576
- "type": "function"
5577
- },
5578
5456
  {
5579
5457
  "inputs": [
5580
5458
  {
package/abi/GuardController.abi.json CHANGED
@@ -53,17 +53,6 @@
53
53
  "name": "InternalFunctionNotAccessible",
54
54
  "type": "error"
55
55
  },
56
- {
57
- "inputs": [
58
- {
59
- "internalType": "address",
60
- "name": "provided",
61
- "type": "address"
62
- }
63
- ],
64
- "name": "InvalidAddress",
65
- "type": "error"
66
- },
67
56
  {
68
57
  "inputs": [],
69
58
  "name": "InvalidInitialization",
@@ -2588,37 +2577,6 @@
2588
2577
  "stateMutability": "nonpayable",
2589
2578
  "type": "function"
2590
2579
  },
2591
- {
2592
- "inputs": [
2593
- {
2594
- "components": [
2595
- {
2596
- "internalType": "enum GuardController.GuardConfigActionType",
2597
- "name": "actionType",
2598
- "type": "uint8"
2599
- },
2600
- {
2601
- "internalType": "bytes",
2602
- "name": "data",
2603
- "type": "bytes"
2604
- }
2605
- ],
2606
- "internalType": "struct GuardController.GuardConfigAction[]",
2607
- "name": "actions",
2608
- "type": "tuple[]"
2609
- }
2610
- ],
2611
- "name": "guardConfigBatchExecutionParams",
2612
- "outputs": [
2613
- {
2614
- "internalType": "bytes",
2615
- "name": "",
2616
- "type": "bytes"
2617
- }
2618
- ],
2619
- "stateMutability": "pure",
2620
- "type": "function"
2621
- },
2622
2580
  {
2623
2581
  "inputs": [
2624
2582
  {
@@ -2904,7 +2862,7 @@
2904
2862
  {
2905
2863
  "components": [
2906
2864
  {
2907
- "internalType": "enum GuardController.GuardConfigActionType",
2865
+ "internalType": "enum GuardControllerDefinitions.GuardConfigActionType",
2908
2866
  "name": "actionType",
2909
2867
  "type": "uint8"
2910
2868
  },
@@ -2914,7 +2872,7 @@
2914
2872
  "type": "bytes"
2915
2873
  }
2916
2874
  ],
2917
- "internalType": "struct GuardController.GuardConfigAction[]",
2875
+ "internalType": "struct GuardControllerDefinitions.GuardConfigAction[]",
2918
2876
  "name": "actions",
2919
2877
  "type": "tuple[]"
2920
2878
  }
package/abi/RoleBlox.abi.json CHANGED
@@ -85,22 +85,6 @@
85
85
  "name": "MaxWalletsZero",
86
86
  "type": "error"
87
87
  },
88
- {
89
- "inputs": [
90
- {
91
- "internalType": "uint256",
92
- "name": "newPeriod",
93
- "type": "uint256"
94
- },
95
- {
96
- "internalType": "uint256",
97
- "name": "currentPeriod",
98
- "type": "uint256"
99
- }
100
- ],
101
- "name": "NewTimelockSame",
102
- "type": "error"
103
- },
104
88
  {
105
89
  "inputs": [
106
90
  {
@@ -154,6 +138,11 @@
154
138
  "name": "OnlyCallableByContract",
155
139
  "type": "error"
156
140
  },
141
+ {
142
+ "inputs": [],
143
+ "name": "PendingSecureRequest",
144
+ "type": "error"
145
+ },
157
146
  {
158
147
  "inputs": [
159
148
  {
@@ -175,17 +164,6 @@
175
164
  "name": "ReentrancyGuardReentrantCall",
176
165
  "type": "error"
177
166
  },
178
- {
179
- "inputs": [
180
- {
181
- "internalType": "bytes32",
182
- "name": "resourceId",
183
- "type": "bytes32"
184
- }
185
- ],
186
- "name": "ResourceAlreadyExists",
187
- "type": "error"
188
- },
189
167
  {
190
168
  "inputs": [
191
169
  {
@@ -250,17 +228,6 @@
250
228
  "name": "RestrictedRecovery",
251
229
  "type": "error"
252
230
  },
253
- {
254
- "inputs": [
255
- {
256
- "internalType": "uint256",
257
- "name": "provided",
258
- "type": "uint256"
259
- }
260
- ],
261
- "name": "TimeLockPeriodZero",
262
- "type": "error"
263
- },
264
231
  {
265
232
  "anonymous": false,
266
233
  "inputs": [
@@ -1543,37 +1510,6 @@
1543
1510
  "stateMutability": "view",
1544
1511
  "type": "function"
1545
1512
  },
1546
- {
1547
- "inputs": [
1548
- {
1549
- "components": [
1550
- {
1551
- "internalType": "enum RuntimeRBAC.RoleConfigActionType",
1552
- "name": "actionType",
1553
- "type": "uint8"
1554
- },
1555
- {
1556
- "internalType": "bytes",
1557
- "name": "data",
1558
- "type": "bytes"
1559
- }
1560
- ],
1561
- "internalType": "struct RuntimeRBAC.RoleConfigAction[]",
1562
- "name": "actions",
1563
- "type": "tuple[]"
1564
- }
1565
- ],
1566
- "name": "roleConfigBatchExecutionParams",
1567
- "outputs": [
1568
- {
1569
- "internalType": "bytes",
1570
- "name": "",
1571
- "type": "bytes"
1572
- }
1573
- ],
1574
- "stateMutability": "pure",
1575
- "type": "function"
1576
- },
1577
1513
  {
1578
1514
  "inputs": [
1579
1515
  {
@@ -3658,25 +3594,6 @@
3658
3594
  "stateMutability": "nonpayable",
3659
3595
  "type": "function"
3660
3596
  },
3661
- {
3662
- "inputs": [
3663
- {
3664
- "internalType": "address",
3665
- "name": "newRecoveryAddress",
3666
- "type": "address"
3667
- }
3668
- ],
3669
- "name": "updateRecoveryExecutionParams",
3670
- "outputs": [
3671
- {
3672
- "internalType": "bytes",
3673
- "name": "",
3674
- "type": "bytes"
3675
- }
3676
- ],
3677
- "stateMutability": "view",
3678
- "type": "function"
3679
- },
3680
3597
  {
3681
3598
  "inputs": [
3682
3599
  {
@@ -3957,25 +3874,6 @@
3957
3874
  "stateMutability": "nonpayable",
3958
3875
  "type": "function"
3959
3876
  },
3960
- {
3961
- "inputs": [
3962
- {
3963
- "internalType": "uint256",
3964
- "name": "newTimeLockPeriodSec",
3965
- "type": "uint256"
3966
- }
3967
- ],
3968
- "name": "updateTimeLockExecutionParams",
3969
- "outputs": [
3970
- {
3971
- "internalType": "bytes",
3972
- "name": "",
3973
- "type": "bytes"
3974
- }
3975
- ],
3976
- "stateMutability": "view",
3977
- "type": "function"
3978
- },
3979
3877
  {
3980
3878
  "inputs": [
3981
3879
  {
package/abi/RuntimeRBAC.abi.json CHANGED
@@ -1356,37 +1356,6 @@
1356
1356
  "stateMutability": "view",
1357
1357
  "type": "function"
1358
1358
  },
1359
- {
1360
- "inputs": [
1361
- {
1362
- "components": [
1363
- {
1364
- "internalType": "enum RuntimeRBAC.RoleConfigActionType",
1365
- "name": "actionType",
1366
- "type": "uint8"
1367
- },
1368
- {
1369
- "internalType": "bytes",
1370
- "name": "data",
1371
- "type": "bytes"
1372
- }
1373
- ],
1374
- "internalType": "struct RuntimeRBAC.RoleConfigAction[]",
1375
- "name": "actions",
1376
- "type": "tuple[]"
1377
- }
1378
- ],
1379
- "name": "roleConfigBatchExecutionParams",
1380
- "outputs": [
1381
- {
1382
- "internalType": "bytes",
1383
- "name": "",
1384
- "type": "bytes"
1385
- }
1386
- ],
1387
- "stateMutability": "pure",
1388
- "type": "function"
1389
- },
1390
1359
  {
1391
1360
  "inputs": [
1392
1361
  {
package/abi/RuntimeRBACDefinitions.abi.json CHANGED
@@ -130,6 +130,56 @@
130
130
  "stateMutability": "pure",
131
131
  "type": "function"
132
132
  },
133
+ {
134
+ "inputs": [
135
+ {
136
+ "components": [
137
+ {
138
+ "internalType": "enum IRuntimeRBAC.RoleConfigActionType",
139
+ "name": "actionType",
140
+ "type": "IRuntimeRBAC.RoleConfigActionType"
141
+ },
142
+ {
143
+ "internalType": "bytes",
144
+ "name": "data",
145
+ "type": "bytes"
146
+ }
147
+ ],
148
+ "internalType": "struct IRuntimeRBAC.RoleConfigAction[]",
149
+ "name": "actions",
150
+ "type": "tuple[]"
151
+ }
152
+ ],
153
+ "name": "roleConfigBatchExecutionParams",
154
+ "outputs": [
155
+ {
156
+ "internalType": "bytes",
157
+ "name": "",
158
+ "type": "bytes"
159
+ }
160
+ ],
161
+ "stateMutability": "pure",
162
+ "type": "function"
163
+ },
164
+ {
165
+ "inputs": [
166
+ {
167
+ "internalType": "bytes",
168
+ "name": "preEncoded",
169
+ "type": "bytes"
170
+ }
171
+ ],
172
+ "name": "roleConfigBatchExecutionParams",
173
+ "outputs": [
174
+ {
175
+ "internalType": "bytes",
176
+ "name": "",
177
+ "type": "bytes"
178
+ }
179
+ ],
180
+ "stateMutability": "pure",
181
+ "type": "function"
182
+ },
133
183
  {
134
184
  "inputs": [
135
185
  {
package/abi/SecureBlox.abi.json CHANGED
@@ -58,22 +58,6 @@
58
58
  "name": "InvalidRange",
59
59
  "type": "error"
60
60
  },
61
- {
62
- "inputs": [
63
- {
64
- "internalType": "uint256",
65
- "name": "newPeriod",
66
- "type": "uint256"
67
- },
68
- {
69
- "internalType": "uint256",
70
- "name": "currentPeriod",
71
- "type": "uint256"
72
- }
73
- ],
74
- "name": "NewTimelockSame",
75
- "type": "error"
76
- },
77
61
  {
78
62
  "inputs": [
79
63
  {
@@ -122,6 +106,11 @@
122
106
  "name": "OnlyCallableByContract",
123
107
  "type": "error"
124
108
  },
109
+ {
110
+ "inputs": [],
111
+ "name": "PendingSecureRequest",
112
+ "type": "error"
113
+ },
125
114
  {
126
115
  "inputs": [
127
116
  {
@@ -143,17 +132,6 @@
143
132
  "name": "ReentrancyGuardReentrantCall",
144
133
  "type": "error"
145
134
  },
146
- {
147
- "inputs": [
148
- {
149
- "internalType": "bytes32",
150
- "name": "resourceId",
151
- "type": "bytes32"
152
- }
153
- ],
154
- "name": "ResourceAlreadyExists",
155
- "type": "error"
156
- },
157
135
  {
158
136
  "inputs": [
159
137
  {
@@ -218,17 +196,6 @@
218
196
  "name": "RestrictedRecovery",
219
197
  "type": "error"
220
198
  },
221
- {
222
- "inputs": [
223
- {
224
- "internalType": "uint256",
225
- "name": "provided",
226
- "type": "uint256"
227
- }
228
- ],
229
- "name": "TimeLockPeriodZero",
230
- "type": "error"
231
- },
232
199
  {
233
200
  "anonymous": false,
234
201
  "inputs": [
@@ -3265,25 +3232,6 @@
3265
3232
  "stateMutability": "nonpayable",
3266
3233
  "type": "function"
3267
3234
  },
3268
- {
3269
- "inputs": [
3270
- {
3271
- "internalType": "address",
3272
- "name": "newRecoveryAddress",
3273
- "type": "address"
3274
- }
3275
- ],
3276
- "name": "updateRecoveryExecutionParams",
3277
- "outputs": [
3278
- {
3279
- "internalType": "bytes",
3280
- "name": "",
3281
- "type": "bytes"
3282
- }
3283
- ],
3284
- "stateMutability": "view",
3285
- "type": "function"
3286
- },
3287
3235
  {
3288
3236
  "inputs": [
3289
3237
  {
@@ -3564,25 +3512,6 @@
3564
3512
  "stateMutability": "nonpayable",
3565
3513
  "type": "function"
3566
3514
  },
3567
- {
3568
- "inputs": [
3569
- {
3570
- "internalType": "uint256",
3571
- "name": "newTimeLockPeriodSec",
3572
- "type": "uint256"
3573
- }
3574
- ],
3575
- "name": "updateTimeLockExecutionParams",
3576
- "outputs": [
3577
- {
3578
- "internalType": "bytes",
3579
- "name": "",
3580
- "type": "bytes"
3581
- }
3582
- ],
3583
- "stateMutability": "view",
3584
- "type": "function"
3585
- },
3586
3515
  {
3587
3516
  "inputs": [
3588
3517
  {