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

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 (42) hide show
  1. package/README.md +7 -7
  2. package/abi/BaseStateMachine.abi.json +85 -45
  3. package/abi/EngineBlox.abi.json +73 -90
  4. package/abi/GuardController.abi.json +252 -806
  5. package/abi/{SimpleVaultDefinitions.abi.json → GuardControllerDefinitions.abi.json} +170 -28
  6. package/abi/IDefinition.abi.json +5 -0
  7. package/abi/RuntimeRBAC.abi.json +155 -218
  8. package/abi/RuntimeRBACDefinitions.abi.json +179 -0
  9. package/abi/SecureOwnable.abi.json +524 -1621
  10. package/abi/SecureOwnableDefinitions.abi.json +5 -0
  11. package/components/README.md +8 -0
  12. package/core/access/RuntimeRBAC.sol +255 -270
  13. package/core/access/interface/IRuntimeRBAC.sol +55 -84
  14. package/core/access/lib/definitions/RuntimeRBACDefinitions.sol +93 -2
  15. package/core/base/BaseStateMachine.sol +193 -107
  16. package/core/base/interface/IBaseStateMachine.sol +153 -153
  17. package/core/execution/GuardController.sol +155 -131
  18. package/core/execution/interface/IGuardController.sol +146 -120
  19. package/core/execution/lib/definitions/GuardControllerDefinitions.sol +193 -43
  20. package/core/lib/EngineBlox.sol +2683 -2322
  21. package/{interfaces → core/lib/interfaces}/IDefinition.sol +49 -49
  22. package/{interfaces → core/lib/interfaces}/IEventForwarder.sol +33 -33
  23. package/{utils → core/lib/utils}/SharedValidation.sol +61 -8
  24. package/core/pattern/Account.sol +84 -0
  25. package/core/security/SecureOwnable.sol +456 -412
  26. package/core/security/interface/ISecureOwnable.sol +105 -104
  27. package/core/security/lib/definitions/SecureOwnableDefinitions.sol +22 -6
  28. package/package.json +5 -5
  29. package/standards/README.md +12 -0
  30. package/standards/behavior/ICopyable.sol +34 -0
  31. package/standards/hooks/IOnActionHook.sol +21 -0
  32. package/abi/AccountBlox.abi.json +0 -5799
  33. package/abi/BareBlox.abi.json +0 -1284
  34. package/abi/RoleBlox.abi.json +0 -4209
  35. package/abi/SecureBlox.abi.json +0 -3828
  36. package/abi/SimpleRWA20.abi.json +0 -5288
  37. package/abi/SimpleRWA20Definitions.abi.json +0 -191
  38. package/abi/SimpleVault.abi.json +0 -4951
  39. package/core/research/BloxchainWallet.sol +0 -306
  40. package/core/research/erc20-blox/ERC20Blox.sol +0 -140
  41. package/core/research/erc20-blox/lib/definitions/ERC20BloxDefinitions.sol +0 -185
  42. package/interfaces/IOnActionHook.sol +0 -79
package/abi/GuardController.abi.json CHANGED
@@ -34,12 +34,12 @@
34
34
  {
35
35
  "inputs": [
36
36
  {
37
- "internalType": "bytes32",
38
- "name": "resourceId",
39
- "type": "bytes32"
37
+ "internalType": "bytes4",
38
+ "name": "functionSelector",
39
+ "type": "bytes4"
40
40
  }
41
41
  ],
42
- "name": "CannotModifyProtected",
42
+ "name": "ContractFunctionMustBeProtected",
43
43
  "type": "error"
44
44
  },
45
45
  {
@@ -58,20 +58,41 @@
58
58
  "name": "InvalidInitialization",
59
59
  "type": "error"
60
60
  },
61
+ {
62
+ "inputs": [],
63
+ "name": "InvalidPayment",
64
+ "type": "error"
65
+ },
61
66
  {
62
67
  "inputs": [
63
68
  {
64
- "internalType": "uint256",
65
- "name": "from",
66
- "type": "uint256"
69
+ "internalType": "address",
70
+ "name": "signedContract",
71
+ "type": "address"
67
72
  },
68
73
  {
69
- "internalType": "uint256",
70
- "name": "to",
71
- "type": "uint256"
74
+ "internalType": "address",
75
+ "name": "entryContract",
76
+ "type": "address"
77
+ }
78
+ ],
79
+ "name": "MetaTxHandlerContractMismatch",
80
+ "type": "error"
81
+ },
82
+ {
83
+ "inputs": [
84
+ {
85
+ "internalType": "bytes4",
86
+ "name": "signedSelector",
87
+ "type": "bytes4"
88
+ },
89
+ {
90
+ "internalType": "bytes4",
91
+ "name": "entrySelector",
92
+ "type": "bytes4"
72
93
  }
73
94
  ],
74
- "name": "InvalidRange",
95
+ "name": "MetaTxHandlerSelectorMismatch",
75
96
  "type": "error"
76
97
  },
77
98
  {
@@ -132,17 +153,6 @@
132
153
  "name": "ReentrancyGuardReentrantCall",
133
154
  "type": "error"
134
155
  },
135
- {
136
- "inputs": [
137
- {
138
- "internalType": "bytes32",
139
- "name": "resourceId",
140
- "type": "bytes32"
141
- }
142
- ],
143
- "name": "ResourceAlreadyExists",
144
- "type": "error"
145
- },
146
156
  {
147
157
  "inputs": [
148
158
  {
@@ -272,25 +282,6 @@
272
282
  "stateMutability": "view",
273
283
  "type": "function"
274
284
  },
275
- {
276
- "inputs": [
277
- {
278
- "internalType": "bytes4",
279
- "name": "functionSelector",
280
- "type": "bytes4"
281
- }
282
- ],
283
- "name": "functionSchemaExists",
284
- "outputs": [
285
- {
286
- "internalType": "bool",
287
- "name": "",
288
- "type": "bool"
289
- }
290
- ],
291
- "stateMutability": "view",
292
- "type": "function"
293
- },
294
285
  {
295
286
  "inputs": [
296
287
  {
@@ -819,6 +810,25 @@
819
810
  "stateMutability": "view",
820
811
  "type": "function"
821
812
  },
813
+ {
814
+ "inputs": [
815
+ {
816
+ "internalType": "bytes32",
817
+ "name": "roleHash",
818
+ "type": "bytes32"
819
+ }
820
+ ],
821
+ "name": "getAuthorizedWallets",
822
+ "outputs": [
823
+ {
824
+ "internalType": "address[]",
825
+ "name": "",
826
+ "type": "address[]"
827
+ }
828
+ ],
829
+ "stateMutability": "view",
830
+ "type": "function"
831
+ },
822
832
  {
823
833
  "inputs": [],
824
834
  "name": "getBroadcasters",
@@ -832,6 +842,105 @@
832
842
  "stateMutability": "view",
833
843
  "type": "function"
834
844
  },
845
+ {
846
+ "inputs": [
847
+ {
848
+ "internalType": "bytes4",
849
+ "name": "functionSelector",
850
+ "type": "bytes4"
851
+ }
852
+ ],
853
+ "name": "getFunctionSchema",
854
+ "outputs": [
855
+ {
856
+ "components": [
857
+ {
858
+ "internalType": "string",
859
+ "name": "functionSignature",
860
+ "type": "string"
861
+ },
862
+ {
863
+ "internalType": "bytes4",
864
+ "name": "functionSelector",
865
+ "type": "bytes4"
866
+ },
867
+ {
868
+ "internalType": "bytes32",
869
+ "name": "operationType",
870
+ "type": "bytes32"
871
+ },
872
+ {
873
+ "internalType": "string",
874
+ "name": "operationName",
875
+ "type": "string"
876
+ },
877
+ {
878
+ "internalType": "uint16",
879
+ "name": "supportedActionsBitmap",
880
+ "type": "uint16"
881
+ },
882
+ {
883
+ "internalType": "bool",
884
+ "name": "enforceHandlerRelations",
885
+ "type": "bool"
886
+ },
887
+ {
888
+ "internalType": "bool",
889
+ "name": "isProtected",
890
+ "type": "bool"
891
+ },
892
+ {
893
+ "internalType": "bytes4[]",
894
+ "name": "handlerForSelectors",
895
+ "type": "bytes4[]"
896
+ }
897
+ ],
898
+ "internalType": "struct EngineBlox.FunctionSchema",
899
+ "name": "",
900
+ "type": "tuple"
901
+ }
902
+ ],
903
+ "stateMutability": "view",
904
+ "type": "function"
905
+ },
906
+ {
907
+ "inputs": [
908
+ {
909
+ "internalType": "bytes4",
910
+ "name": "functionSelector",
911
+ "type": "bytes4"
912
+ }
913
+ ],
914
+ "name": "getFunctionWhitelistTargets",
915
+ "outputs": [
916
+ {
917
+ "internalType": "address[]",
918
+ "name": "",
919
+ "type": "address[]"
920
+ }
921
+ ],
922
+ "stateMutability": "view",
923
+ "type": "function"
924
+ },
925
+ {
926
+ "inputs": [
927
+ {
928
+ "internalType": "bytes4",
929
+ "name": "functionSelector",
930
+ "type": "bytes4"
931
+ }
932
+ ],
933
+ "name": "getHooks",
934
+ "outputs": [
935
+ {
936
+ "internalType": "address[]",
937
+ "name": "hooks",
938
+ "type": "address[]"
939
+ }
940
+ ],
941
+ "stateMutability": "view",
942
+ "type": "function"
943
+ },
835
944
  {
836
945
  "inputs": [],
837
946
  "name": "getPendingTransactions",
@@ -875,7 +984,7 @@
875
984
  },
876
985
  {
877
986
  "internalType": "bytes32",
878
- "name": "roleHashReturn",
987
+ "name": "hash",
879
988
  "type": "bytes32"
880
989
  },
881
990
  {
@@ -1222,25 +1331,6 @@
1222
1331
  "stateMutability": "view",
1223
1332
  "type": "function"
1224
1333
  },
1225
- {
1226
- "inputs": [
1227
- {
1228
- "internalType": "bytes32",
1229
- "name": "roleHash",
1230
- "type": "bytes32"
1231
- }
1232
- ],
1233
- "name": "getWalletsInRole",
1234
- "outputs": [
1235
- {
1236
- "internalType": "address[]",
1237
- "name": "",
1238
- "type": "address[]"
1239
- }
1240
- ],
1241
- "stateMutability": "view",
1242
- "type": "function"
1243
- },
1244
1334
  {
1245
1335
  "inputs": [
1246
1336
  {
@@ -1278,30 +1368,6 @@
1278
1368
  "stateMutability": "view",
1279
1369
  "type": "function"
1280
1370
  },
1281
- {
1282
- "inputs": [
1283
- {
1284
- "internalType": "bytes4",
1285
- "name": "functionSelector",
1286
- "type": "bytes4"
1287
- },
1288
- {
1289
- "internalType": "enum EngineBlox.TxAction",
1290
- "name": "action",
1291
- "type": "uint8"
1292
- }
1293
- ],
1294
- "name": "isActionSupportedByFunction",
1295
- "outputs": [
1296
- {
1297
- "internalType": "bool",
1298
- "name": "",
1299
- "type": "bool"
1300
- }
1301
- ],
1302
- "stateMutability": "view",
1303
- "type": "function"
1304
- },
1305
1371
  {
1306
1372
  "inputs": [],
1307
1373
  "name": "owner",
@@ -1402,108 +1468,83 @@
1402
1468
  ],
1403
1469
  "name": "executeWithTimeLock",
1404
1470
  "outputs": [
1471
+ {
1472
+ "internalType": "uint256",
1473
+ "name": "txId",
1474
+ "type": "uint256"
1475
+ }
1476
+ ],
1477
+ "stateMutability": "nonpayable",
1478
+ "type": "function"
1479
+ },
1480
+ {
1481
+ "inputs": [
1482
+ {
1483
+ "internalType": "address",
1484
+ "name": "target",
1485
+ "type": "address"
1486
+ },
1487
+ {
1488
+ "internalType": "uint256",
1489
+ "name": "value",
1490
+ "type": "uint256"
1491
+ },
1492
+ {
1493
+ "internalType": "bytes4",
1494
+ "name": "functionSelector",
1495
+ "type": "bytes4"
1496
+ },
1497
+ {
1498
+ "internalType": "bytes",
1499
+ "name": "params",
1500
+ "type": "bytes"
1501
+ },
1502
+ {
1503
+ "internalType": "uint256",
1504
+ "name": "gasLimit",
1505
+ "type": "uint256"
1506
+ },
1507
+ {
1508
+ "internalType": "bytes32",
1509
+ "name": "operationType",
1510
+ "type": "bytes32"
1511
+ },
1405
1512
  {
1406
1513
  "components": [
1407
1514
  {
1408
- "internalType": "uint256",
1409
- "name": "txId",
1410
- "type": "uint256"
1515
+ "internalType": "address",
1516
+ "name": "recipient",
1517
+ "type": "address"
1411
1518
  },
1412
1519
  {
1413
1520
  "internalType": "uint256",
1414
- "name": "releaseTime",
1521
+ "name": "nativeTokenAmount",
1415
1522
  "type": "uint256"
1416
1523
  },
1417
1524
  {
1418
- "internalType": "enum EngineBlox.TxStatus",
1419
- "name": "status",
1420
- "type": "uint8"
1525
+ "internalType": "address",
1526
+ "name": "erc20TokenAddress",
1527
+ "type": "address"
1421
1528
  },
1422
1529
  {
1423
- "components": [
1424
- {
1425
- "internalType": "address",
1426
- "name": "requester",
1427
- "type": "address"
1428
- },
1429
- {
1430
- "internalType": "address",
1431
- "name": "target",
1432
- "type": "address"
1433
- },
1434
- {
1435
- "internalType": "uint256",
1436
- "name": "value",
1437
- "type": "uint256"
1438
- },
1439
- {
1440
- "internalType": "uint256",
1441
- "name": "gasLimit",
1442
- "type": "uint256"
1443
- },
1444
- {
1445
- "internalType": "bytes32",
1446
- "name": "operationType",
1447
- "type": "bytes32"
1448
- },
1449
- {
1450
- "internalType": "bytes4",
1451
- "name": "executionSelector",
1452
- "type": "bytes4"
1453
- },
1454
- {
1455
- "internalType": "bytes",
1456
- "name": "executionParams",
1457
- "type": "bytes"
1458
- }
1459
- ],
1460
- "internalType": "struct EngineBlox.TxParams",
1461
- "name": "params",
1462
- "type": "tuple"
1463
- },
1464
- {
1465
- "internalType": "bytes32",
1466
- "name": "message",
1467
- "type": "bytes32"
1468
- },
1469
- {
1470
- "internalType": "bytes",
1471
- "name": "result",
1472
- "type": "bytes"
1473
- },
1474
- {
1475
- "components": [
1476
- {
1477
- "internalType": "address",
1478
- "name": "recipient",
1479
- "type": "address"
1480
- },
1481
- {
1482
- "internalType": "uint256",
1483
- "name": "nativeTokenAmount",
1484
- "type": "uint256"
1485
- },
1486
- {
1487
- "internalType": "address",
1488
- "name": "erc20TokenAddress",
1489
- "type": "address"
1490
- },
1491
- {
1492
- "internalType": "uint256",
1493
- "name": "erc20TokenAmount",
1494
- "type": "uint256"
1495
- }
1496
- ],
1497
- "internalType": "struct EngineBlox.PaymentDetails",
1498
- "name": "payment",
1499
- "type": "tuple"
1530
+ "internalType": "uint256",
1531
+ "name": "erc20TokenAmount",
1532
+ "type": "uint256"
1500
1533
  }
1501
1534
  ],
1502
- "internalType": "struct EngineBlox.TxRecord",
1503
- "name": "",
1535
+ "internalType": "struct EngineBlox.PaymentDetails",
1536
+ "name": "paymentDetails",
1504
1537
  "type": "tuple"
1505
1538
  }
1506
1539
  ],
1540
+ "name": "executeWithPayment",
1541
+ "outputs": [
1542
+ {
1543
+ "internalType": "uint256",
1544
+ "name": "txId",
1545
+ "type": "uint256"
1546
+ }
1547
+ ],
1507
1548
  "stateMutability": "nonpayable",
1508
1549
  "type": "function"
1509
1550
  },
@@ -1518,105 +1559,9 @@
1518
1559
  "name": "approveTimeLockExecution",
1519
1560
  "outputs": [
1520
1561
  {
1521
- "components": [
1522
- {
1523
- "internalType": "uint256",
1524
- "name": "txId",
1525
- "type": "uint256"
1526
- },
1527
- {
1528
- "internalType": "uint256",
1529
- "name": "releaseTime",
1530
- "type": "uint256"
1531
- },
1532
- {
1533
- "internalType": "enum EngineBlox.TxStatus",
1534
- "name": "status",
1535
- "type": "uint8"
1536
- },
1537
- {
1538
- "components": [
1539
- {
1540
- "internalType": "address",
1541
- "name": "requester",
1542
- "type": "address"
1543
- },
1544
- {
1545
- "internalType": "address",
1546
- "name": "target",
1547
- "type": "address"
1548
- },
1549
- {
1550
- "internalType": "uint256",
1551
- "name": "value",
1552
- "type": "uint256"
1553
- },
1554
- {
1555
- "internalType": "uint256",
1556
- "name": "gasLimit",
1557
- "type": "uint256"
1558
- },
1559
- {
1560
- "internalType": "bytes32",
1561
- "name": "operationType",
1562
- "type": "bytes32"
1563
- },
1564
- {
1565
- "internalType": "bytes4",
1566
- "name": "executionSelector",
1567
- "type": "bytes4"
1568
- },
1569
- {
1570
- "internalType": "bytes",
1571
- "name": "executionParams",
1572
- "type": "bytes"
1573
- }
1574
- ],
1575
- "internalType": "struct EngineBlox.TxParams",
1576
- "name": "params",
1577
- "type": "tuple"
1578
- },
1579
- {
1580
- "internalType": "bytes32",
1581
- "name": "message",
1582
- "type": "bytes32"
1583
- },
1584
- {
1585
- "internalType": "bytes",
1586
- "name": "result",
1587
- "type": "bytes"
1588
- },
1589
- {
1590
- "components": [
1591
- {
1592
- "internalType": "address",
1593
- "name": "recipient",
1594
- "type": "address"
1595
- },
1596
- {
1597
- "internalType": "uint256",
1598
- "name": "nativeTokenAmount",
1599
- "type": "uint256"
1600
- },
1601
- {
1602
- "internalType": "address",
1603
- "name": "erc20TokenAddress",
1604
- "type": "address"
1605
- },
1606
- {
1607
- "internalType": "uint256",
1608
- "name": "erc20TokenAmount",
1609
- "type": "uint256"
1610
- }
1611
- ],
1612
- "internalType": "struct EngineBlox.PaymentDetails",
1613
- "name": "payment",
1614
- "type": "tuple"
1615
- }
1616
- ],
1617
- "internalType": "struct EngineBlox.TxRecord",
1562
+ "internalType": "uint256",
1618
1563
  "name": "",
1619
- "type": "tuple"
1564
+ "type": "uint256"
1620
1565
  }
1621
1566
  ],
1622
1567
  "stateMutability": "nonpayable",
@@ -1633,105 +1578,9 @@
1633
1578
  "name": "cancelTimeLockExecution",
1634
1579
  "outputs": [
1635
1580
  {
1636
- "components": [
1637
- {
1638
- "internalType": "uint256",
1639
- "name": "txId",
1640
- "type": "uint256"
1641
- },
1642
- {
1643
- "internalType": "uint256",
1644
- "name": "releaseTime",
1645
- "type": "uint256"
1646
- },
1647
- {
1648
- "internalType": "enum EngineBlox.TxStatus",
1649
- "name": "status",
1650
- "type": "uint8"
1651
- },
1652
- {
1653
- "components": [
1654
- {
1655
- "internalType": "address",
1656
- "name": "requester",
1657
- "type": "address"
1658
- },
1659
- {
1660
- "internalType": "address",
1661
- "name": "target",
1662
- "type": "address"
1663
- },
1664
- {
1665
- "internalType": "uint256",
1666
- "name": "value",
1667
- "type": "uint256"
1668
- },
1669
- {
1670
- "internalType": "uint256",
1671
- "name": "gasLimit",
1672
- "type": "uint256"
1673
- },
1674
- {
1675
- "internalType": "bytes32",
1676
- "name": "operationType",
1677
- "type": "bytes32"
1678
- },
1679
- {
1680
- "internalType": "bytes4",
1681
- "name": "executionSelector",
1682
- "type": "bytes4"
1683
- },
1684
- {
1685
- "internalType": "bytes",
1686
- "name": "executionParams",
1687
- "type": "bytes"
1688
- }
1689
- ],
1690
- "internalType": "struct EngineBlox.TxParams",
1691
- "name": "params",
1692
- "type": "tuple"
1693
- },
1694
- {
1695
- "internalType": "bytes32",
1696
- "name": "message",
1697
- "type": "bytes32"
1698
- },
1699
- {
1700
- "internalType": "bytes",
1701
- "name": "result",
1702
- "type": "bytes"
1703
- },
1704
- {
1705
- "components": [
1706
- {
1707
- "internalType": "address",
1708
- "name": "recipient",
1709
- "type": "address"
1710
- },
1711
- {
1712
- "internalType": "uint256",
1713
- "name": "nativeTokenAmount",
1714
- "type": "uint256"
1715
- },
1716
- {
1717
- "internalType": "address",
1718
- "name": "erc20TokenAddress",
1719
- "type": "address"
1720
- },
1721
- {
1722
- "internalType": "uint256",
1723
- "name": "erc20TokenAmount",
1724
- "type": "uint256"
1725
- }
1726
- ],
1727
- "internalType": "struct EngineBlox.PaymentDetails",
1728
- "name": "payment",
1729
- "type": "tuple"
1730
- }
1731
- ],
1732
- "internalType": "struct EngineBlox.TxRecord",
1581
+ "internalType": "uint256",
1733
1582
  "name": "",
1734
- "type": "tuple"
1583
+ "type": "uint256"
1735
1584
  }
1736
1585
  ],
1737
1586
  "stateMutability": "nonpayable",
@@ -1913,105 +1762,9 @@
1913
1762
  "name": "approveTimeLockExecutionWithMetaTx",
1914
1763
  "outputs": [
1915
1764
  {
1916
- "components": [
1917
- {
1918
- "internalType": "uint256",
1919
- "name": "txId",
1920
- "type": "uint256"
1921
- },
1922
- {
1923
- "internalType": "uint256",
1924
- "name": "releaseTime",
1925
- "type": "uint256"
1926
- },
1927
- {
1928
- "internalType": "enum EngineBlox.TxStatus",
1929
- "name": "status",
1930
- "type": "uint8"
1931
- },
1932
- {
1933
- "components": [
1934
- {
1935
- "internalType": "address",
1936
- "name": "requester",
1937
- "type": "address"
1938
- },
1939
- {
1940
- "internalType": "address",
1941
- "name": "target",
1942
- "type": "address"
1943
- },
1944
- {
1945
- "internalType": "uint256",
1946
- "name": "value",
1947
- "type": "uint256"
1948
- },
1949
- {
1950
- "internalType": "uint256",
1951
- "name": "gasLimit",
1952
- "type": "uint256"
1953
- },
1954
- {
1955
- "internalType": "bytes32",
1956
- "name": "operationType",
1957
- "type": "bytes32"
1958
- },
1959
- {
1960
- "internalType": "bytes4",
1961
- "name": "executionSelector",
1962
- "type": "bytes4"
1963
- },
1964
- {
1965
- "internalType": "bytes",
1966
- "name": "executionParams",
1967
- "type": "bytes"
1968
- }
1969
- ],
1970
- "internalType": "struct EngineBlox.TxParams",
1971
- "name": "params",
1972
- "type": "tuple"
1973
- },
1974
- {
1975
- "internalType": "bytes32",
1976
- "name": "message",
1977
- "type": "bytes32"
1978
- },
1979
- {
1980
- "internalType": "bytes",
1981
- "name": "result",
1982
- "type": "bytes"
1983
- },
1984
- {
1985
- "components": [
1986
- {
1987
- "internalType": "address",
1988
- "name": "recipient",
1989
- "type": "address"
1990
- },
1991
- {
1992
- "internalType": "uint256",
1993
- "name": "nativeTokenAmount",
1994
- "type": "uint256"
1995
- },
1996
- {
1997
- "internalType": "address",
1998
- "name": "erc20TokenAddress",
1999
- "type": "address"
2000
- },
2001
- {
2002
- "internalType": "uint256",
2003
- "name": "erc20TokenAmount",
2004
- "type": "uint256"
2005
- }
2006
- ],
2007
- "internalType": "struct EngineBlox.PaymentDetails",
2008
- "name": "payment",
2009
- "type": "tuple"
2010
- }
2011
- ],
2012
- "internalType": "struct EngineBlox.TxRecord",
1765
+ "internalType": "uint256",
2013
1766
  "name": "",
2014
- "type": "tuple"
1767
+ "type": "uint256"
2015
1768
  }
2016
1769
  ],
2017
1770
  "stateMutability": "nonpayable",
@@ -2161,139 +1914,43 @@
2161
1914
  },
2162
1915
  {
2163
1916
  "internalType": "address",
2164
- "name": "signer",
2165
- "type": "address"
2166
- }
2167
- ],
2168
- "internalType": "struct EngineBlox.MetaTxParams",
2169
- "name": "params",
2170
- "type": "tuple"
2171
- },
2172
- {
2173
- "internalType": "bytes32",
2174
- "name": "message",
2175
- "type": "bytes32"
2176
- },
2177
- {
2178
- "internalType": "bytes",
2179
- "name": "signature",
2180
- "type": "bytes"
2181
- },
2182
- {
2183
- "internalType": "bytes",
2184
- "name": "data",
2185
- "type": "bytes"
2186
- }
2187
- ],
2188
- "internalType": "struct EngineBlox.MetaTransaction",
2189
- "name": "metaTx",
2190
- "type": "tuple"
2191
- }
2192
- ],
2193
- "name": "cancelTimeLockExecutionWithMetaTx",
2194
- "outputs": [
2195
- {
2196
- "components": [
2197
- {
2198
- "internalType": "uint256",
2199
- "name": "txId",
2200
- "type": "uint256"
2201
- },
2202
- {
2203
- "internalType": "uint256",
2204
- "name": "releaseTime",
2205
- "type": "uint256"
2206
- },
2207
- {
2208
- "internalType": "enum EngineBlox.TxStatus",
2209
- "name": "status",
2210
- "type": "uint8"
2211
- },
2212
- {
2213
- "components": [
2214
- {
2215
- "internalType": "address",
2216
- "name": "requester",
2217
- "type": "address"
2218
- },
2219
- {
2220
- "internalType": "address",
2221
- "name": "target",
2222
- "type": "address"
2223
- },
2224
- {
2225
- "internalType": "uint256",
2226
- "name": "value",
2227
- "type": "uint256"
2228
- },
2229
- {
2230
- "internalType": "uint256",
2231
- "name": "gasLimit",
2232
- "type": "uint256"
2233
- },
2234
- {
2235
- "internalType": "bytes32",
2236
- "name": "operationType",
2237
- "type": "bytes32"
2238
- },
2239
- {
2240
- "internalType": "bytes4",
2241
- "name": "executionSelector",
2242
- "type": "bytes4"
2243
- },
2244
- {
2245
- "internalType": "bytes",
2246
- "name": "executionParams",
2247
- "type": "bytes"
2248
- }
2249
- ],
2250
- "internalType": "struct EngineBlox.TxParams",
2251
- "name": "params",
2252
- "type": "tuple"
2253
- },
2254
- {
2255
- "internalType": "bytes32",
2256
- "name": "message",
2257
- "type": "bytes32"
2258
- },
2259
- {
2260
- "internalType": "bytes",
2261
- "name": "result",
2262
- "type": "bytes"
2263
- },
2264
- {
2265
- "components": [
2266
- {
2267
- "internalType": "address",
2268
- "name": "recipient",
2269
- "type": "address"
2270
- },
2271
- {
2272
- "internalType": "uint256",
2273
- "name": "nativeTokenAmount",
2274
- "type": "uint256"
2275
- },
2276
- {
2277
- "internalType": "address",
2278
- "name": "erc20TokenAddress",
1917
+ "name": "signer",
2279
1918
  "type": "address"
2280
- },
2281
- {
2282
- "internalType": "uint256",
2283
- "name": "erc20TokenAmount",
2284
- "type": "uint256"
2285
1919
  }
2286
1920
  ],
2287
- "internalType": "struct EngineBlox.PaymentDetails",
2288
- "name": "payment",
1921
+ "internalType": "struct EngineBlox.MetaTxParams",
1922
+ "name": "params",
2289
1923
  "type": "tuple"
1924
+ },
1925
+ {
1926
+ "internalType": "bytes32",
1927
+ "name": "message",
1928
+ "type": "bytes32"
1929
+ },
1930
+ {
1931
+ "internalType": "bytes",
1932
+ "name": "signature",
1933
+ "type": "bytes"
1934
+ },
1935
+ {
1936
+ "internalType": "bytes",
1937
+ "name": "data",
1938
+ "type": "bytes"
2290
1939
  }
2291
1940
  ],
2292
- "internalType": "struct EngineBlox.TxRecord",
2293
- "name": "",
1941
+ "internalType": "struct EngineBlox.MetaTransaction",
1942
+ "name": "metaTx",
2294
1943
  "type": "tuple"
2295
1944
  }
2296
1945
  ],
1946
+ "name": "cancelTimeLockExecutionWithMetaTx",
1947
+ "outputs": [
1948
+ {
1949
+ "internalType": "uint256",
1950
+ "name": "",
1951
+ "type": "uint256"
1952
+ }
1953
+ ],
2297
1954
  "stateMutability": "nonpayable",
2298
1955
  "type": "function"
2299
1956
  },
@@ -2473,105 +2130,9 @@
2473
2130
  "name": "requestAndApproveExecution",
2474
2131
  "outputs": [
2475
2132
  {
2476
- "components": [
2477
- {
2478
- "internalType": "uint256",
2479
- "name": "txId",
2480
- "type": "uint256"
2481
- },
2482
- {
2483
- "internalType": "uint256",
2484
- "name": "releaseTime",
2485
- "type": "uint256"
2486
- },
2487
- {
2488
- "internalType": "enum EngineBlox.TxStatus",
2489
- "name": "status",
2490
- "type": "uint8"
2491
- },
2492
- {
2493
- "components": [
2494
- {
2495
- "internalType": "address",
2496
- "name": "requester",
2497
- "type": "address"
2498
- },
2499
- {
2500
- "internalType": "address",
2501
- "name": "target",
2502
- "type": "address"
2503
- },
2504
- {
2505
- "internalType": "uint256",
2506
- "name": "value",
2507
- "type": "uint256"
2508
- },
2509
- {
2510
- "internalType": "uint256",
2511
- "name": "gasLimit",
2512
- "type": "uint256"
2513
- },
2514
- {
2515
- "internalType": "bytes32",
2516
- "name": "operationType",
2517
- "type": "bytes32"
2518
- },
2519
- {
2520
- "internalType": "bytes4",
2521
- "name": "executionSelector",
2522
- "type": "bytes4"
2523
- },
2524
- {
2525
- "internalType": "bytes",
2526
- "name": "executionParams",
2527
- "type": "bytes"
2528
- }
2529
- ],
2530
- "internalType": "struct EngineBlox.TxParams",
2531
- "name": "params",
2532
- "type": "tuple"
2533
- },
2534
- {
2535
- "internalType": "bytes32",
2536
- "name": "message",
2537
- "type": "bytes32"
2538
- },
2539
- {
2540
- "internalType": "bytes",
2541
- "name": "result",
2542
- "type": "bytes"
2543
- },
2544
- {
2545
- "components": [
2546
- {
2547
- "internalType": "address",
2548
- "name": "recipient",
2549
- "type": "address"
2550
- },
2551
- {
2552
- "internalType": "uint256",
2553
- "name": "nativeTokenAmount",
2554
- "type": "uint256"
2555
- },
2556
- {
2557
- "internalType": "address",
2558
- "name": "erc20TokenAddress",
2559
- "type": "address"
2560
- },
2561
- {
2562
- "internalType": "uint256",
2563
- "name": "erc20TokenAmount",
2564
- "type": "uint256"
2565
- }
2566
- ],
2567
- "internalType": "struct EngineBlox.PaymentDetails",
2568
- "name": "payment",
2569
- "type": "tuple"
2570
- }
2571
- ],
2572
- "internalType": "struct EngineBlox.TxRecord",
2133
+ "internalType": "uint256",
2573
2134
  "name": "",
2574
- "type": "tuple"
2135
+ "type": "uint256"
2575
2136
  }
2576
2137
  ],
2577
2138
  "stateMutability": "nonpayable",
@@ -2753,105 +2314,9 @@
2753
2314
  "name": "guardConfigBatchRequestAndApprove",
2754
2315
  "outputs": [
2755
2316
  {
2756
- "components": [
2757
- {
2758
- "internalType": "uint256",
2759
- "name": "txId",
2760
- "type": "uint256"
2761
- },
2762
- {
2763
- "internalType": "uint256",
2764
- "name": "releaseTime",
2765
- "type": "uint256"
2766
- },
2767
- {
2768
- "internalType": "enum EngineBlox.TxStatus",
2769
- "name": "status",
2770
- "type": "uint8"
2771
- },
2772
- {
2773
- "components": [
2774
- {
2775
- "internalType": "address",
2776
- "name": "requester",
2777
- "type": "address"
2778
- },
2779
- {
2780
- "internalType": "address",
2781
- "name": "target",
2782
- "type": "address"
2783
- },
2784
- {
2785
- "internalType": "uint256",
2786
- "name": "value",
2787
- "type": "uint256"
2788
- },
2789
- {
2790
- "internalType": "uint256",
2791
- "name": "gasLimit",
2792
- "type": "uint256"
2793
- },
2794
- {
2795
- "internalType": "bytes32",
2796
- "name": "operationType",
2797
- "type": "bytes32"
2798
- },
2799
- {
2800
- "internalType": "bytes4",
2801
- "name": "executionSelector",
2802
- "type": "bytes4"
2803
- },
2804
- {
2805
- "internalType": "bytes",
2806
- "name": "executionParams",
2807
- "type": "bytes"
2808
- }
2809
- ],
2810
- "internalType": "struct EngineBlox.TxParams",
2811
- "name": "params",
2812
- "type": "tuple"
2813
- },
2814
- {
2815
- "internalType": "bytes32",
2816
- "name": "message",
2817
- "type": "bytes32"
2818
- },
2819
- {
2820
- "internalType": "bytes",
2821
- "name": "result",
2822
- "type": "bytes"
2823
- },
2824
- {
2825
- "components": [
2826
- {
2827
- "internalType": "address",
2828
- "name": "recipient",
2829
- "type": "address"
2830
- },
2831
- {
2832
- "internalType": "uint256",
2833
- "name": "nativeTokenAmount",
2834
- "type": "uint256"
2835
- },
2836
- {
2837
- "internalType": "address",
2838
- "name": "erc20TokenAddress",
2839
- "type": "address"
2840
- },
2841
- {
2842
- "internalType": "uint256",
2843
- "name": "erc20TokenAmount",
2844
- "type": "uint256"
2845
- }
2846
- ],
2847
- "internalType": "struct EngineBlox.PaymentDetails",
2848
- "name": "payment",
2849
- "type": "tuple"
2850
- }
2851
- ],
2852
- "internalType": "struct EngineBlox.TxRecord",
2317
+ "internalType": "uint256",
2853
2318
  "name": "",
2854
- "type": "tuple"
2319
+ "type": "uint256"
2855
2320
  }
2856
2321
  ],
2857
2322
  "stateMutability": "nonpayable",
@@ -2862,7 +2327,7 @@
2862
2327
  {
2863
2328
  "components": [
2864
2329
  {
2865
- "internalType": "enum GuardControllerDefinitions.GuardConfigActionType",
2330
+ "internalType": "enum IGuardController.GuardConfigActionType",
2866
2331
  "name": "actionType",
2867
2332
  "type": "uint8"
2868
2333
  },
@@ -2872,7 +2337,7 @@
2872
2337
  "type": "bytes"
2873
2338
  }
2874
2339
  ],
2875
- "internalType": "struct GuardControllerDefinitions.GuardConfigAction[]",
2340
+ "internalType": "struct IGuardController.GuardConfigAction[]",
2876
2341
  "name": "actions",
2877
2342
  "type": "tuple[]"
2878
2343
  }
@@ -2881,24 +2346,5 @@
2881
2346
  "outputs": [],
2882
2347
  "stateMutability": "nonpayable",
2883
2348
  "type": "function"
2884
- },
2885
- {
2886
- "inputs": [
2887
- {
2888
- "internalType": "bytes4",
2889
- "name": "functionSelector",
2890
- "type": "bytes4"
2891
- }
2892
- ],
2893
- "name": "getAllowedTargets",
2894
- "outputs": [
2895
- {
2896
- "internalType": "address[]",
2897
- "name": "",
2898
- "type": "address[]"
2899
- }
2900
- ],
2901
- "stateMutability": "view",
2902
- "type": "function"
2903
2349
  }
2904
2350
  ]