@bloxchain/contracts 1.0.0-alpha → 1.0.0-alpha.10

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 (55) hide show
  1. package/README.md +55 -18
  2. package/abi/{ControlBlox.abi.json → AccountBlox.abi.json} +699 -2974
  3. package/abi/BareBlox.abi.json +127 -90
  4. package/abi/BaseStateMachine.abi.json +127 -90
  5. package/abi/EngineBlox.abi.json +11 -31
  6. package/abi/GuardController.abi.json +217 -895
  7. package/abi/GuardControllerDefinitions.abi.json +380 -0
  8. package/abi/IDefinition.abi.json +19 -0
  9. package/abi/RoleBlox.abi.json +818 -2404
  10. package/abi/RuntimeRBAC.abi.json +122 -328
  11. package/abi/RuntimeRBACDefinitions.abi.json +243 -0
  12. package/abi/SecureBlox.abi.json +620 -1952
  13. package/abi/SecureOwnable.abi.json +469 -1801
  14. package/abi/SecureOwnableDefinitions.abi.json +57 -0
  15. package/abi/SimpleRWA20.abi.json +486 -1999
  16. package/abi/SimpleRWA20Definitions.abi.json +19 -0
  17. package/abi/SimpleVault.abi.json +884 -2685
  18. package/abi/SimpleVaultDefinitions.abi.json +19 -0
  19. package/components/README.md +8 -0
  20. package/core/access/RuntimeRBAC.sol +184 -0
  21. package/core/access/interface/IRuntimeRBAC.sol +55 -0
  22. package/{contracts/core → core}/access/lib/definitions/RuntimeRBACDefinitions.sol +121 -1
  23. package/{contracts/core → core}/base/BaseStateMachine.sol +187 -54
  24. package/{contracts/core → core}/base/interface/IBaseStateMachine.sol +7 -0
  25. package/{contracts/core → core}/execution/GuardController.sol +89 -155
  26. package/{contracts/core → core}/execution/interface/IGuardController.sol +52 -12
  27. package/{contracts/core → core}/execution/lib/definitions/GuardControllerDefinitions.sol +91 -2
  28. package/{contracts/core → core}/lib/EngineBlox.sol +167 -64
  29. package/{contracts → core/lib}/interfaces/IDefinition.sol +15 -6
  30. package/{contracts → core/lib}/interfaces/IEventForwarder.sol +1 -1
  31. package/{contracts → core/lib}/utils/SharedValidation.sol +490 -486
  32. package/core/pattern/Account.sol +75 -0
  33. package/core/research/BloxchainWallet.sol +133 -0
  34. package/core/research/FactoryBlox/FactoryBlox.sol +344 -0
  35. package/core/research/FactoryBlox/FactoryBloxDefinitions.sol +144 -0
  36. package/core/research/erc1155-blox/ERC1155Blox.sol +170 -0
  37. package/core/research/erc1155-blox/lib/definitions/ERC1155BloxDefinitions.sol +203 -0
  38. package/core/research/erc20-blox/ERC20Blox.sol +135 -0
  39. package/core/research/erc20-blox/lib/definitions/ERC20BloxDefinitions.sol +185 -0
  40. package/core/research/erc721-blox/ERC721Blox.sol +131 -0
  41. package/core/research/erc721-blox/lib/definitions/ERC721BloxDefinitions.sol +172 -0
  42. package/core/research/lending-blox/.gitkeep +1 -0
  43. package/core/research/p2p-blox/P2PBlox.sol +266 -0
  44. package/core/research/p2p-blox/README.md +85 -0
  45. package/core/research/p2p-blox/lib/definitions/P2PBloxDefinitions.sol +19 -0
  46. package/{contracts/core → core}/security/SecureOwnable.sol +390 -419
  47. package/{contracts/core → core}/security/interface/ISecureOwnable.sol +27 -40
  48. package/{contracts/core → core}/security/lib/definitions/SecureOwnableDefinitions.sol +786 -757
  49. package/package.json +49 -47
  50. package/standards/README.md +12 -0
  51. package/standards/behavior/ICopyable.sol +36 -0
  52. package/standards/hooks/IOnActionHook.sol +21 -0
  53. package/contracts/core/access/RuntimeRBAC.sol +0 -344
  54. package/contracts/core/access/interface/IRuntimeRBAC.sol +0 -108
  55. package/contracts/interfaces/IOnActionHook.sol +0 -79
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",
@@ -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
  {
@@ -168,24 +146,12 @@
168
146
  {
169
147
  "anonymous": false,
170
148
  "inputs": [
171
- {
172
- "indexed": true,
173
- "internalType": "enum GuardController.GuardConfigActionType",
174
- "name": "actionType",
175
- "type": "uint8"
176
- },
177
149
  {
178
150
  "indexed": true,
179
151
  "internalType": "bytes4",
180
152
  "name": "functionSelector",
181
153
  "type": "bytes4"
182
154
  },
183
- {
184
- "indexed": true,
185
- "internalType": "address",
186
- "name": "target",
187
- "type": "address"
188
- },
189
155
  {
190
156
  "indexed": false,
191
157
  "internalType": "bytes",
@@ -193,7 +159,7 @@
193
159
  "type": "bytes"
194
160
  }
195
161
  ],
196
- "name": "GuardConfigApplied",
162
+ "name": "ComponentEvent",
197
163
  "type": "event"
198
164
  },
199
165
  {
@@ -209,112 +175,6 @@
209
175
  "name": "Initialized",
210
176
  "type": "event"
211
177
  },
212
- {
213
- "anonymous": false,
214
- "inputs": [
215
- {
216
- "indexed": true,
217
- "internalType": "uint256",
218
- "name": "txId",
219
- "type": "uint256"
220
- },
221
- {
222
- "indexed": true,
223
- "internalType": "bytes32",
224
- "name": "operationType",
225
- "type": "bytes32"
226
- },
227
- {
228
- "indexed": true,
229
- "internalType": "address",
230
- "name": "approver",
231
- "type": "address"
232
- }
233
- ],
234
- "name": "TransactionApproved",
235
- "type": "event"
236
- },
237
- {
238
- "anonymous": false,
239
- "inputs": [
240
- {
241
- "indexed": true,
242
- "internalType": "uint256",
243
- "name": "txId",
244
- "type": "uint256"
245
- },
246
- {
247
- "indexed": true,
248
- "internalType": "bytes32",
249
- "name": "operationType",
250
- "type": "bytes32"
251
- },
252
- {
253
- "indexed": true,
254
- "internalType": "address",
255
- "name": "canceller",
256
- "type": "address"
257
- }
258
- ],
259
- "name": "TransactionCancelled",
260
- "type": "event"
261
- },
262
- {
263
- "anonymous": false,
264
- "inputs": [
265
- {
266
- "indexed": true,
267
- "internalType": "uint256",
268
- "name": "txId",
269
- "type": "uint256"
270
- },
271
- {
272
- "indexed": true,
273
- "internalType": "bytes32",
274
- "name": "operationType",
275
- "type": "bytes32"
276
- },
277
- {
278
- "indexed": false,
279
- "internalType": "bool",
280
- "name": "success",
281
- "type": "bool"
282
- }
283
- ],
284
- "name": "TransactionExecuted",
285
- "type": "event"
286
- },
287
- {
288
- "anonymous": false,
289
- "inputs": [
290
- {
291
- "indexed": true,
292
- "internalType": "uint256",
293
- "name": "txId",
294
- "type": "uint256"
295
- },
296
- {
297
- "indexed": true,
298
- "internalType": "address",
299
- "name": "requester",
300
- "type": "address"
301
- },
302
- {
303
- "indexed": true,
304
- "internalType": "bytes32",
305
- "name": "operationType",
306
- "type": "bytes32"
307
- },
308
- {
309
- "indexed": false,
310
- "internalType": "uint256",
311
- "name": "releaseTime",
312
- "type": "uint256"
313
- }
314
- ],
315
- "name": "TransactionRequested",
316
- "type": "event"
317
- },
318
178
  {
319
179
  "inputs": [
320
180
  {
@@ -961,6 +821,100 @@
961
821
  "stateMutability": "view",
962
822
  "type": "function"
963
823
  },
824
+ {
825
+ "inputs": [
826
+ {
827
+ "internalType": "bytes4",
828
+ "name": "functionSelector",
829
+ "type": "bytes4"
830
+ }
831
+ ],
832
+ "name": "getFunctionSchema",
833
+ "outputs": [
834
+ {
835
+ "components": [
836
+ {
837
+ "internalType": "string",
838
+ "name": "functionSignature",
839
+ "type": "string"
840
+ },
841
+ {
842
+ "internalType": "bytes4",
843
+ "name": "functionSelector",
844
+ "type": "bytes4"
845
+ },
846
+ {
847
+ "internalType": "bytes32",
848
+ "name": "operationType",
849
+ "type": "bytes32"
850
+ },
851
+ {
852
+ "internalType": "string",
853
+ "name": "operationName",
854
+ "type": "string"
855
+ },
856
+ {
857
+ "internalType": "uint16",
858
+ "name": "supportedActionsBitmap",
859
+ "type": "uint16"
860
+ },
861
+ {
862
+ "internalType": "bool",
863
+ "name": "isProtected",
864
+ "type": "bool"
865
+ },
866
+ {
867
+ "internalType": "bytes4[]",
868
+ "name": "handlerForSelectors",
869
+ "type": "bytes4[]"
870
+ }
871
+ ],
872
+ "internalType": "struct EngineBlox.FunctionSchema",
873
+ "name": "",
874
+ "type": "tuple"
875
+ }
876
+ ],
877
+ "stateMutability": "view",
878
+ "type": "function"
879
+ },
880
+ {
881
+ "inputs": [
882
+ {
883
+ "internalType": "bytes4",
884
+ "name": "functionSelector",
885
+ "type": "bytes4"
886
+ }
887
+ ],
888
+ "name": "getFunctionWhitelistTargets",
889
+ "outputs": [
890
+ {
891
+ "internalType": "address[]",
892
+ "name": "",
893
+ "type": "address[]"
894
+ }
895
+ ],
896
+ "stateMutability": "view",
897
+ "type": "function"
898
+ },
899
+ {
900
+ "inputs": [
901
+ {
902
+ "internalType": "bytes4",
903
+ "name": "functionSelector",
904
+ "type": "bytes4"
905
+ }
906
+ ],
907
+ "name": "getHooks",
908
+ "outputs": [
909
+ {
910
+ "internalType": "address[]",
911
+ "name": "hooks",
912
+ "type": "address[]"
913
+ }
914
+ ],
915
+ "stateMutability": "view",
916
+ "type": "function"
917
+ },
964
918
  {
965
919
  "inputs": [],
966
920
  "name": "getPendingTransactions",
@@ -1351,6 +1305,25 @@
1351
1305
  "stateMutability": "view",
1352
1306
  "type": "function"
1353
1307
  },
1308
+ {
1309
+ "inputs": [
1310
+ {
1311
+ "internalType": "bytes32",
1312
+ "name": "roleHash",
1313
+ "type": "bytes32"
1314
+ }
1315
+ ],
1316
+ "name": "getWalletsInRole",
1317
+ "outputs": [
1318
+ {
1319
+ "internalType": "address[]",
1320
+ "name": "",
1321
+ "type": "address[]"
1322
+ }
1323
+ ],
1324
+ "stateMutability": "view",
1325
+ "type": "function"
1326
+ },
1354
1327
  {
1355
1328
  "inputs": [
1356
1329
  {
@@ -1513,105 +1486,9 @@
1513
1486
  "name": "executeWithTimeLock",
1514
1487
  "outputs": [
1515
1488
  {
1516
- "components": [
1517
- {
1518
- "internalType": "uint256",
1519
- "name": "txId",
1520
- "type": "uint256"
1521
- },
1522
- {
1523
- "internalType": "uint256",
1524
- "name": "releaseTime",
1525
- "type": "uint256"
1526
- },
1527
- {
1528
- "internalType": "enum EngineBlox.TxStatus",
1529
- "name": "status",
1530
- "type": "uint8"
1531
- },
1532
- {
1533
- "components": [
1534
- {
1535
- "internalType": "address",
1536
- "name": "requester",
1537
- "type": "address"
1538
- },
1539
- {
1540
- "internalType": "address",
1541
- "name": "target",
1542
- "type": "address"
1543
- },
1544
- {
1545
- "internalType": "uint256",
1546
- "name": "value",
1547
- "type": "uint256"
1548
- },
1549
- {
1550
- "internalType": "uint256",
1551
- "name": "gasLimit",
1552
- "type": "uint256"
1553
- },
1554
- {
1555
- "internalType": "bytes32",
1556
- "name": "operationType",
1557
- "type": "bytes32"
1558
- },
1559
- {
1560
- "internalType": "bytes4",
1561
- "name": "executionSelector",
1562
- "type": "bytes4"
1563
- },
1564
- {
1565
- "internalType": "bytes",
1566
- "name": "executionParams",
1567
- "type": "bytes"
1568
- }
1569
- ],
1570
- "internalType": "struct EngineBlox.TxParams",
1571
- "name": "params",
1572
- "type": "tuple"
1573
- },
1574
- {
1575
- "internalType": "bytes32",
1576
- "name": "message",
1577
- "type": "bytes32"
1578
- },
1579
- {
1580
- "internalType": "bytes",
1581
- "name": "result",
1582
- "type": "bytes"
1583
- },
1584
- {
1585
- "components": [
1586
- {
1587
- "internalType": "address",
1588
- "name": "recipient",
1589
- "type": "address"
1590
- },
1591
- {
1592
- "internalType": "uint256",
1593
- "name": "nativeTokenAmount",
1594
- "type": "uint256"
1595
- },
1596
- {
1597
- "internalType": "address",
1598
- "name": "erc20TokenAddress",
1599
- "type": "address"
1600
- },
1601
- {
1602
- "internalType": "uint256",
1603
- "name": "erc20TokenAmount",
1604
- "type": "uint256"
1605
- }
1606
- ],
1607
- "internalType": "struct EngineBlox.PaymentDetails",
1608
- "name": "payment",
1609
- "type": "tuple"
1610
- }
1611
- ],
1612
- "internalType": "struct EngineBlox.TxRecord",
1613
- "name": "",
1614
- "type": "tuple"
1489
+ "internalType": "uint256",
1490
+ "name": "txId",
1491
+ "type": "uint256"
1615
1492
  }
1616
1493
  ],
1617
1494
  "stateMutability": "nonpayable",
@@ -1619,231 +1496,110 @@
1619
1496
  },
1620
1497
  {
1621
1498
  "inputs": [
1499
+ {
1500
+ "internalType": "address",
1501
+ "name": "target",
1502
+ "type": "address"
1503
+ },
1622
1504
  {
1623
1505
  "internalType": "uint256",
1624
- "name": "txId",
1506
+ "name": "value",
1625
1507
  "type": "uint256"
1626
- }
1627
- ],
1628
- "name": "approveTimeLockExecution",
1629
- "outputs": [
1508
+ },
1630
1509
  {
1631
- "components": [
1632
- {
1633
- "internalType": "uint256",
1634
- "name": "txId",
1635
- "type": "uint256"
1636
- },
1637
- {
1638
- "internalType": "uint256",
1639
- "name": "releaseTime",
1640
- "type": "uint256"
1641
- },
1642
- {
1643
- "internalType": "enum EngineBlox.TxStatus",
1644
- "name": "status",
1645
- "type": "uint8"
1646
- },
1647
- {
1648
- "components": [
1649
- {
1650
- "internalType": "address",
1651
- "name": "requester",
1652
- "type": "address"
1653
- },
1654
- {
1655
- "internalType": "address",
1656
- "name": "target",
1657
- "type": "address"
1658
- },
1659
- {
1660
- "internalType": "uint256",
1661
- "name": "value",
1662
- "type": "uint256"
1663
- },
1664
- {
1665
- "internalType": "uint256",
1666
- "name": "gasLimit",
1667
- "type": "uint256"
1668
- },
1669
- {
1670
- "internalType": "bytes32",
1671
- "name": "operationType",
1672
- "type": "bytes32"
1673
- },
1674
- {
1675
- "internalType": "bytes4",
1676
- "name": "executionSelector",
1677
- "type": "bytes4"
1678
- },
1679
- {
1680
- "internalType": "bytes",
1681
- "name": "executionParams",
1682
- "type": "bytes"
1683
- }
1684
- ],
1685
- "internalType": "struct EngineBlox.TxParams",
1686
- "name": "params",
1687
- "type": "tuple"
1688
- },
1689
- {
1690
- "internalType": "bytes32",
1691
- "name": "message",
1692
- "type": "bytes32"
1693
- },
1694
- {
1695
- "internalType": "bytes",
1696
- "name": "result",
1697
- "type": "bytes"
1698
- },
1699
- {
1700
- "components": [
1701
- {
1702
- "internalType": "address",
1703
- "name": "recipient",
1704
- "type": "address"
1705
- },
1706
- {
1707
- "internalType": "uint256",
1708
- "name": "nativeTokenAmount",
1709
- "type": "uint256"
1710
- },
1711
- {
1712
- "internalType": "address",
1713
- "name": "erc20TokenAddress",
1714
- "type": "address"
1715
- },
1716
- {
1717
- "internalType": "uint256",
1718
- "name": "erc20TokenAmount",
1719
- "type": "uint256"
1720
- }
1721
- ],
1722
- "internalType": "struct EngineBlox.PaymentDetails",
1723
- "name": "payment",
1724
- "type": "tuple"
1725
- }
1726
- ],
1727
- "internalType": "struct EngineBlox.TxRecord",
1728
- "name": "",
1729
- "type": "tuple"
1730
- }
1731
- ],
1732
- "stateMutability": "nonpayable",
1733
- "type": "function"
1734
- },
1735
- {
1736
- "inputs": [
1510
+ "internalType": "bytes4",
1511
+ "name": "functionSelector",
1512
+ "type": "bytes4"
1513
+ },
1514
+ {
1515
+ "internalType": "bytes",
1516
+ "name": "params",
1517
+ "type": "bytes"
1518
+ },
1737
1519
  {
1738
1520
  "internalType": "uint256",
1739
- "name": "txId",
1521
+ "name": "gasLimit",
1740
1522
  "type": "uint256"
1741
- }
1742
- ],
1743
- "name": "cancelTimeLockExecution",
1744
- "outputs": [
1523
+ },
1524
+ {
1525
+ "internalType": "bytes32",
1526
+ "name": "operationType",
1527
+ "type": "bytes32"
1528
+ },
1745
1529
  {
1746
1530
  "components": [
1747
1531
  {
1748
- "internalType": "uint256",
1749
- "name": "txId",
1750
- "type": "uint256"
1532
+ "internalType": "address",
1533
+ "name": "recipient",
1534
+ "type": "address"
1751
1535
  },
1752
1536
  {
1753
1537
  "internalType": "uint256",
1754
- "name": "releaseTime",
1538
+ "name": "nativeTokenAmount",
1755
1539
  "type": "uint256"
1756
1540
  },
1757
1541
  {
1758
- "internalType": "enum EngineBlox.TxStatus",
1759
- "name": "status",
1760
- "type": "uint8"
1761
- },
1762
- {
1763
- "components": [
1764
- {
1765
- "internalType": "address",
1766
- "name": "requester",
1767
- "type": "address"
1768
- },
1769
- {
1770
- "internalType": "address",
1771
- "name": "target",
1772
- "type": "address"
1773
- },
1774
- {
1775
- "internalType": "uint256",
1776
- "name": "value",
1777
- "type": "uint256"
1778
- },
1779
- {
1780
- "internalType": "uint256",
1781
- "name": "gasLimit",
1782
- "type": "uint256"
1783
- },
1784
- {
1785
- "internalType": "bytes32",
1786
- "name": "operationType",
1787
- "type": "bytes32"
1788
- },
1789
- {
1790
- "internalType": "bytes4",
1791
- "name": "executionSelector",
1792
- "type": "bytes4"
1793
- },
1794
- {
1795
- "internalType": "bytes",
1796
- "name": "executionParams",
1797
- "type": "bytes"
1798
- }
1799
- ],
1800
- "internalType": "struct EngineBlox.TxParams",
1801
- "name": "params",
1802
- "type": "tuple"
1803
- },
1804
- {
1805
- "internalType": "bytes32",
1806
- "name": "message",
1807
- "type": "bytes32"
1808
- },
1809
- {
1810
- "internalType": "bytes",
1811
- "name": "result",
1812
- "type": "bytes"
1542
+ "internalType": "address",
1543
+ "name": "erc20TokenAddress",
1544
+ "type": "address"
1813
1545
  },
1814
1546
  {
1815
- "components": [
1816
- {
1817
- "internalType": "address",
1818
- "name": "recipient",
1819
- "type": "address"
1820
- },
1821
- {
1822
- "internalType": "uint256",
1823
- "name": "nativeTokenAmount",
1824
- "type": "uint256"
1825
- },
1826
- {
1827
- "internalType": "address",
1828
- "name": "erc20TokenAddress",
1829
- "type": "address"
1830
- },
1831
- {
1832
- "internalType": "uint256",
1833
- "name": "erc20TokenAmount",
1834
- "type": "uint256"
1835
- }
1836
- ],
1837
- "internalType": "struct EngineBlox.PaymentDetails",
1838
- "name": "payment",
1839
- "type": "tuple"
1547
+ "internalType": "uint256",
1548
+ "name": "erc20TokenAmount",
1549
+ "type": "uint256"
1840
1550
  }
1841
1551
  ],
1842
- "internalType": "struct EngineBlox.TxRecord",
1843
- "name": "",
1552
+ "internalType": "struct EngineBlox.PaymentDetails",
1553
+ "name": "paymentDetails",
1844
1554
  "type": "tuple"
1845
1555
  }
1846
1556
  ],
1557
+ "name": "executeWithPayment",
1558
+ "outputs": [
1559
+ {
1560
+ "internalType": "uint256",
1561
+ "name": "txId",
1562
+ "type": "uint256"
1563
+ }
1564
+ ],
1565
+ "stateMutability": "nonpayable",
1566
+ "type": "function"
1567
+ },
1568
+ {
1569
+ "inputs": [
1570
+ {
1571
+ "internalType": "uint256",
1572
+ "name": "txId",
1573
+ "type": "uint256"
1574
+ }
1575
+ ],
1576
+ "name": "approveTimeLockExecution",
1577
+ "outputs": [
1578
+ {
1579
+ "internalType": "uint256",
1580
+ "name": "",
1581
+ "type": "uint256"
1582
+ }
1583
+ ],
1584
+ "stateMutability": "nonpayable",
1585
+ "type": "function"
1586
+ },
1587
+ {
1588
+ "inputs": [
1589
+ {
1590
+ "internalType": "uint256",
1591
+ "name": "txId",
1592
+ "type": "uint256"
1593
+ }
1594
+ ],
1595
+ "name": "cancelTimeLockExecution",
1596
+ "outputs": [
1597
+ {
1598
+ "internalType": "uint256",
1599
+ "name": "",
1600
+ "type": "uint256"
1601
+ }
1602
+ ],
1847
1603
  "stateMutability": "nonpayable",
1848
1604
  "type": "function"
1849
1605
  },
@@ -2023,105 +1779,9 @@
2023
1779
  "name": "approveTimeLockExecutionWithMetaTx",
2024
1780
  "outputs": [
2025
1781
  {
2026
- "components": [
2027
- {
2028
- "internalType": "uint256",
2029
- "name": "txId",
2030
- "type": "uint256"
2031
- },
2032
- {
2033
- "internalType": "uint256",
2034
- "name": "releaseTime",
2035
- "type": "uint256"
2036
- },
2037
- {
2038
- "internalType": "enum EngineBlox.TxStatus",
2039
- "name": "status",
2040
- "type": "uint8"
2041
- },
2042
- {
2043
- "components": [
2044
- {
2045
- "internalType": "address",
2046
- "name": "requester",
2047
- "type": "address"
2048
- },
2049
- {
2050
- "internalType": "address",
2051
- "name": "target",
2052
- "type": "address"
2053
- },
2054
- {
2055
- "internalType": "uint256",
2056
- "name": "value",
2057
- "type": "uint256"
2058
- },
2059
- {
2060
- "internalType": "uint256",
2061
- "name": "gasLimit",
2062
- "type": "uint256"
2063
- },
2064
- {
2065
- "internalType": "bytes32",
2066
- "name": "operationType",
2067
- "type": "bytes32"
2068
- },
2069
- {
2070
- "internalType": "bytes4",
2071
- "name": "executionSelector",
2072
- "type": "bytes4"
2073
- },
2074
- {
2075
- "internalType": "bytes",
2076
- "name": "executionParams",
2077
- "type": "bytes"
2078
- }
2079
- ],
2080
- "internalType": "struct EngineBlox.TxParams",
2081
- "name": "params",
2082
- "type": "tuple"
2083
- },
2084
- {
2085
- "internalType": "bytes32",
2086
- "name": "message",
2087
- "type": "bytes32"
2088
- },
2089
- {
2090
- "internalType": "bytes",
2091
- "name": "result",
2092
- "type": "bytes"
2093
- },
2094
- {
2095
- "components": [
2096
- {
2097
- "internalType": "address",
2098
- "name": "recipient",
2099
- "type": "address"
2100
- },
2101
- {
2102
- "internalType": "uint256",
2103
- "name": "nativeTokenAmount",
2104
- "type": "uint256"
2105
- },
2106
- {
2107
- "internalType": "address",
2108
- "name": "erc20TokenAddress",
2109
- "type": "address"
2110
- },
2111
- {
2112
- "internalType": "uint256",
2113
- "name": "erc20TokenAmount",
2114
- "type": "uint256"
2115
- }
2116
- ],
2117
- "internalType": "struct EngineBlox.PaymentDetails",
2118
- "name": "payment",
2119
- "type": "tuple"
2120
- }
2121
- ],
2122
- "internalType": "struct EngineBlox.TxRecord",
1782
+ "internalType": "uint256",
2123
1783
  "name": "",
2124
- "type": "tuple"
1784
+ "type": "uint256"
2125
1785
  }
2126
1786
  ],
2127
1787
  "stateMutability": "nonpayable",
@@ -2294,116 +1954,20 @@
2294
1954
  "name": "data",
2295
1955
  "type": "bytes"
2296
1956
  }
2297
- ],
2298
- "internalType": "struct EngineBlox.MetaTransaction",
2299
- "name": "metaTx",
2300
- "type": "tuple"
2301
- }
2302
- ],
2303
- "name": "cancelTimeLockExecutionWithMetaTx",
2304
- "outputs": [
2305
- {
2306
- "components": [
2307
- {
2308
- "internalType": "uint256",
2309
- "name": "txId",
2310
- "type": "uint256"
2311
- },
2312
- {
2313
- "internalType": "uint256",
2314
- "name": "releaseTime",
2315
- "type": "uint256"
2316
- },
2317
- {
2318
- "internalType": "enum EngineBlox.TxStatus",
2319
- "name": "status",
2320
- "type": "uint8"
2321
- },
2322
- {
2323
- "components": [
2324
- {
2325
- "internalType": "address",
2326
- "name": "requester",
2327
- "type": "address"
2328
- },
2329
- {
2330
- "internalType": "address",
2331
- "name": "target",
2332
- "type": "address"
2333
- },
2334
- {
2335
- "internalType": "uint256",
2336
- "name": "value",
2337
- "type": "uint256"
2338
- },
2339
- {
2340
- "internalType": "uint256",
2341
- "name": "gasLimit",
2342
- "type": "uint256"
2343
- },
2344
- {
2345
- "internalType": "bytes32",
2346
- "name": "operationType",
2347
- "type": "bytes32"
2348
- },
2349
- {
2350
- "internalType": "bytes4",
2351
- "name": "executionSelector",
2352
- "type": "bytes4"
2353
- },
2354
- {
2355
- "internalType": "bytes",
2356
- "name": "executionParams",
2357
- "type": "bytes"
2358
- }
2359
- ],
2360
- "internalType": "struct EngineBlox.TxParams",
2361
- "name": "params",
2362
- "type": "tuple"
2363
- },
2364
- {
2365
- "internalType": "bytes32",
2366
- "name": "message",
2367
- "type": "bytes32"
2368
- },
2369
- {
2370
- "internalType": "bytes",
2371
- "name": "result",
2372
- "type": "bytes"
2373
- },
2374
- {
2375
- "components": [
2376
- {
2377
- "internalType": "address",
2378
- "name": "recipient",
2379
- "type": "address"
2380
- },
2381
- {
2382
- "internalType": "uint256",
2383
- "name": "nativeTokenAmount",
2384
- "type": "uint256"
2385
- },
2386
- {
2387
- "internalType": "address",
2388
- "name": "erc20TokenAddress",
2389
- "type": "address"
2390
- },
2391
- {
2392
- "internalType": "uint256",
2393
- "name": "erc20TokenAmount",
2394
- "type": "uint256"
2395
- }
2396
- ],
2397
- "internalType": "struct EngineBlox.PaymentDetails",
2398
- "name": "payment",
2399
- "type": "tuple"
2400
- }
2401
- ],
2402
- "internalType": "struct EngineBlox.TxRecord",
2403
- "name": "",
1957
+ ],
1958
+ "internalType": "struct EngineBlox.MetaTransaction",
1959
+ "name": "metaTx",
2404
1960
  "type": "tuple"
2405
1961
  }
2406
1962
  ],
1963
+ "name": "cancelTimeLockExecutionWithMetaTx",
1964
+ "outputs": [
1965
+ {
1966
+ "internalType": "uint256",
1967
+ "name": "",
1968
+ "type": "uint256"
1969
+ }
1970
+ ],
2407
1971
  "stateMutability": "nonpayable",
2408
1972
  "type": "function"
2409
1973
  },
@@ -2583,141 +2147,14 @@
2583
2147
  "name": "requestAndApproveExecution",
2584
2148
  "outputs": [
2585
2149
  {
2586
- "components": [
2587
- {
2588
- "internalType": "uint256",
2589
- "name": "txId",
2590
- "type": "uint256"
2591
- },
2592
- {
2593
- "internalType": "uint256",
2594
- "name": "releaseTime",
2595
- "type": "uint256"
2596
- },
2597
- {
2598
- "internalType": "enum EngineBlox.TxStatus",
2599
- "name": "status",
2600
- "type": "uint8"
2601
- },
2602
- {
2603
- "components": [
2604
- {
2605
- "internalType": "address",
2606
- "name": "requester",
2607
- "type": "address"
2608
- },
2609
- {
2610
- "internalType": "address",
2611
- "name": "target",
2612
- "type": "address"
2613
- },
2614
- {
2615
- "internalType": "uint256",
2616
- "name": "value",
2617
- "type": "uint256"
2618
- },
2619
- {
2620
- "internalType": "uint256",
2621
- "name": "gasLimit",
2622
- "type": "uint256"
2623
- },
2624
- {
2625
- "internalType": "bytes32",
2626
- "name": "operationType",
2627
- "type": "bytes32"
2628
- },
2629
- {
2630
- "internalType": "bytes4",
2631
- "name": "executionSelector",
2632
- "type": "bytes4"
2633
- },
2634
- {
2635
- "internalType": "bytes",
2636
- "name": "executionParams",
2637
- "type": "bytes"
2638
- }
2639
- ],
2640
- "internalType": "struct EngineBlox.TxParams",
2641
- "name": "params",
2642
- "type": "tuple"
2643
- },
2644
- {
2645
- "internalType": "bytes32",
2646
- "name": "message",
2647
- "type": "bytes32"
2648
- },
2649
- {
2650
- "internalType": "bytes",
2651
- "name": "result",
2652
- "type": "bytes"
2653
- },
2654
- {
2655
- "components": [
2656
- {
2657
- "internalType": "address",
2658
- "name": "recipient",
2659
- "type": "address"
2660
- },
2661
- {
2662
- "internalType": "uint256",
2663
- "name": "nativeTokenAmount",
2664
- "type": "uint256"
2665
- },
2666
- {
2667
- "internalType": "address",
2668
- "name": "erc20TokenAddress",
2669
- "type": "address"
2670
- },
2671
- {
2672
- "internalType": "uint256",
2673
- "name": "erc20TokenAmount",
2674
- "type": "uint256"
2675
- }
2676
- ],
2677
- "internalType": "struct EngineBlox.PaymentDetails",
2678
- "name": "payment",
2679
- "type": "tuple"
2680
- }
2681
- ],
2682
- "internalType": "struct EngineBlox.TxRecord",
2150
+ "internalType": "uint256",
2683
2151
  "name": "",
2684
- "type": "tuple"
2152
+ "type": "uint256"
2685
2153
  }
2686
2154
  ],
2687
2155
  "stateMutability": "nonpayable",
2688
2156
  "type": "function"
2689
2157
  },
2690
- {
2691
- "inputs": [
2692
- {
2693
- "components": [
2694
- {
2695
- "internalType": "enum GuardController.GuardConfigActionType",
2696
- "name": "actionType",
2697
- "type": "uint8"
2698
- },
2699
- {
2700
- "internalType": "bytes",
2701
- "name": "data",
2702
- "type": "bytes"
2703
- }
2704
- ],
2705
- "internalType": "struct GuardController.GuardConfigAction[]",
2706
- "name": "actions",
2707
- "type": "tuple[]"
2708
- }
2709
- ],
2710
- "name": "guardConfigBatchExecutionParams",
2711
- "outputs": [
2712
- {
2713
- "internalType": "bytes",
2714
- "name": "",
2715
- "type": "bytes"
2716
- }
2717
- ],
2718
- "stateMutability": "pure",
2719
- "type": "function"
2720
- },
2721
2158
  {
2722
2159
  "inputs": [
2723
2160
  {
@@ -2894,105 +2331,9 @@
2894
2331
  "name": "guardConfigBatchRequestAndApprove",
2895
2332
  "outputs": [
2896
2333
  {
2897
- "components": [
2898
- {
2899
- "internalType": "uint256",
2900
- "name": "txId",
2901
- "type": "uint256"
2902
- },
2903
- {
2904
- "internalType": "uint256",
2905
- "name": "releaseTime",
2906
- "type": "uint256"
2907
- },
2908
- {
2909
- "internalType": "enum EngineBlox.TxStatus",
2910
- "name": "status",
2911
- "type": "uint8"
2912
- },
2913
- {
2914
- "components": [
2915
- {
2916
- "internalType": "address",
2917
- "name": "requester",
2918
- "type": "address"
2919
- },
2920
- {
2921
- "internalType": "address",
2922
- "name": "target",
2923
- "type": "address"
2924
- },
2925
- {
2926
- "internalType": "uint256",
2927
- "name": "value",
2928
- "type": "uint256"
2929
- },
2930
- {
2931
- "internalType": "uint256",
2932
- "name": "gasLimit",
2933
- "type": "uint256"
2934
- },
2935
- {
2936
- "internalType": "bytes32",
2937
- "name": "operationType",
2938
- "type": "bytes32"
2939
- },
2940
- {
2941
- "internalType": "bytes4",
2942
- "name": "executionSelector",
2943
- "type": "bytes4"
2944
- },
2945
- {
2946
- "internalType": "bytes",
2947
- "name": "executionParams",
2948
- "type": "bytes"
2949
- }
2950
- ],
2951
- "internalType": "struct EngineBlox.TxParams",
2952
- "name": "params",
2953
- "type": "tuple"
2954
- },
2955
- {
2956
- "internalType": "bytes32",
2957
- "name": "message",
2958
- "type": "bytes32"
2959
- },
2960
- {
2961
- "internalType": "bytes",
2962
- "name": "result",
2963
- "type": "bytes"
2964
- },
2965
- {
2966
- "components": [
2967
- {
2968
- "internalType": "address",
2969
- "name": "recipient",
2970
- "type": "address"
2971
- },
2972
- {
2973
- "internalType": "uint256",
2974
- "name": "nativeTokenAmount",
2975
- "type": "uint256"
2976
- },
2977
- {
2978
- "internalType": "address",
2979
- "name": "erc20TokenAddress",
2980
- "type": "address"
2981
- },
2982
- {
2983
- "internalType": "uint256",
2984
- "name": "erc20TokenAmount",
2985
- "type": "uint256"
2986
- }
2987
- ],
2988
- "internalType": "struct EngineBlox.PaymentDetails",
2989
- "name": "payment",
2990
- "type": "tuple"
2991
- }
2992
- ],
2993
- "internalType": "struct EngineBlox.TxRecord",
2334
+ "internalType": "uint256",
2994
2335
  "name": "",
2995
- "type": "tuple"
2336
+ "type": "uint256"
2996
2337
  }
2997
2338
  ],
2998
2339
  "stateMutability": "nonpayable",
@@ -3003,7 +2344,7 @@
3003
2344
  {
3004
2345
  "components": [
3005
2346
  {
3006
- "internalType": "enum GuardController.GuardConfigActionType",
2347
+ "internalType": "enum IGuardController.GuardConfigActionType",
3007
2348
  "name": "actionType",
3008
2349
  "type": "uint8"
3009
2350
  },
@@ -3013,7 +2354,7 @@
3013
2354
  "type": "bytes"
3014
2355
  }
3015
2356
  ],
3016
- "internalType": "struct GuardController.GuardConfigAction[]",
2357
+ "internalType": "struct IGuardController.GuardConfigAction[]",
3017
2358
  "name": "actions",
3018
2359
  "type": "tuple[]"
3019
2360
  }
@@ -3022,24 +2363,5 @@
3022
2363
  "outputs": [],
3023
2364
  "stateMutability": "nonpayable",
3024
2365
  "type": "function"
3025
- },
3026
- {
3027
- "inputs": [
3028
- {
3029
- "internalType": "bytes4",
3030
- "name": "functionSelector",
3031
- "type": "bytes4"
3032
- }
3033
- ],
3034
- "name": "getAllowedTargets",
3035
- "outputs": [
3036
- {
3037
- "internalType": "address[]",
3038
- "name": "",
3039
- "type": "address[]"
3040
- }
3041
- ],
3042
- "stateMutability": "view",
3043
- "type": "function"
3044
2366
  }
3045
2367
  ]