From f8a777d6888a8c0cf0e4bc055ec71e3dce972407 Mon Sep 17 00:00:00 2001 From: Ashitaka <96790496+ashitakah@users.noreply.github.com> Date: Wed, 23 Aug 2023 17:19:36 +0300 Subject: [PATCH] feat: update solhint version (#29) --- .solhint.json | 3 +- out/Greeter.sol/Greeter.json | 366 ++++++++++++++--------------- package.json | 2 +- solidity/test/e2e/Common.sol | 1 - solidity/test/utils/DSTestFull.sol | 1 - yarn.lock | 138 ++++++++--- 6 files changed, 288 insertions(+), 223 deletions(-) diff --git a/.solhint.json b/.solhint.json index 45920841..a8c16441 100644 --- a/.solhint.json +++ b/.solhint.json @@ -23,6 +23,7 @@ "defi-wonderland/named-return-values": ["warn"], "defi-wonderland/struct-name-camelcase": ["warn"], "defi-wonderland/wonder-var-name-mixedcase": ["warn"], - "avoid-low-level-calls": "off" + "avoid-low-level-calls": "off", + "no-console": "off" } } diff --git a/out/Greeter.sol/Greeter.json b/out/Greeter.sol/Greeter.json index 68e5f739..46c60b56 100644 --- a/out/Greeter.sol/Greeter.json +++ b/out/Greeter.sol/Greeter.json @@ -120,7 +120,7 @@ "sourceMap": "178:1366:16:-:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;454:30;;;;;;;;190:42:23;178:55;;;160:74;;148:2;133:18;454:30:16;;;;;;;;917:230;;;;;;:::i;:::-;;:::i;:::-;;1178:158;;;:::i;:::-;;;;;;;;:::i;516:22::-;;;:::i;:::-;;;;;;;:::i;570:19::-;;;;;;;;;917:230;1469:10;:19;1483:5;1469:19;;1465:66;;1505:19;;;;;;;;;;;;;;1465:66;990:27;;::::1;::::0;::::1;::::0;:44;;986:97:::1;;1051:25;;;;;;;;;;;;;;986:97;1089:8;:20;1100:9:::0;1089:8;:20:::1;:::i;:::-;;1120:22;1132:9;1120:22;;;;;;:::i;:::-;;;;;;;;917:230:::0;:::o;1178:158::-;1218:23;1243:16;1279:8;1267:20;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;1304:5:16;;:27;;;;;1320:10;1304:27;;;160:74:23;1267:20:16;;-1:-1:-1;1304:5:16;;;:15;;-1:-1:-1;133:18:23;;;-1:-1:-1;1304:27:16;;-1:-1:-1;14:226:23;1304:27:16;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;1293:38;;1178:158;;:::o;516:22::-;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;245:184:23:-;297:77;294:1;287:88;394:4;391:1;384:15;418:4;415:1;408:15;434:981;503:6;556:2;544:9;535:7;531:23;527:32;524:52;;;572:1;569;562:12;524:52;612:9;599:23;641:18;682:2;674:6;671:14;668:34;;;698:1;695;688:12;668:34;736:6;725:9;721:22;711:32;;781:7;774:4;770:2;766:13;762:27;752:55;;803:1;800;793:12;752:55;839:2;826:16;861:2;857;854:10;851:36;;;867:18;;:::i;:::-;1001:2;995:9;1063:4;1055:13;;906:66;1051:22;;;1075:2;1047:31;1043:40;1031:53;;;1099:18;;;1119:22;;;1096:46;1093:72;;;1145:18;;:::i;:::-;1185:10;1181:2;1174:22;1220:2;1212:6;1205:18;1260:7;1255:2;1250;1246;1242:11;1238:20;1235:33;1232:53;;;1281:1;1278;1271:12;1232:53;1337:2;1332;1328;1324:11;1319:2;1311:6;1307:15;1294:46;1382:1;1360:15;;;1377:2;1356:24;1349:35;;;;-1:-1:-1;1364:6:23;434:981;-1:-1:-1;;;;;434:981:23:o;1420:482::-;1462:3;1500:5;1494:12;1527:6;1522:3;1515:19;1552:1;1562:162;1576:6;1573:1;1570:13;1562:162;;;1638:4;1694:13;;;1690:22;;1684:29;1666:11;;;1662:20;;1655:59;1591:12;1562:162;;;1566:3;1769:1;1762:4;1753:6;1748:3;1744:16;1740:27;1733:38;1891:4;1821:66;1816:2;1808:6;1804:15;1800:88;1795:3;1791:98;1787:109;1780:116;;;1420:482;;;;:::o;1907:291::-;2084:2;2073:9;2066:21;2047:4;2104:45;2145:2;2134:9;2130:18;2122:6;2104:45;:::i;:::-;2096:53;;2185:6;2180:2;2169:9;2165:18;2158:34;1907:291;;;;;:::o;2203:220::-;2352:2;2341:9;2334:21;2315:4;2372:45;2413:2;2402:9;2398:18;2390:6;2372:45;:::i;:::-;2364:53;2203:220;-1:-1:-1;;;2203:220:23:o;2675:437::-;2754:1;2750:12;;;;2797;;;2818:61;;2872:4;2864:6;2860:17;2850:27;;2818:61;2925:2;2917:6;2914:14;2894:18;2891:38;2888:218;;2962:77;2959:1;2952:88;3063:4;3060:1;3053:15;3091:4;3088:1;3081:15;2888:218;;2675:437;;;:::o;3243:545::-;3345:2;3340:3;3337:11;3334:448;;;3381:1;3406:5;3402:2;3395:17;3451:4;3447:2;3437:19;3521:2;3509:10;3505:19;3502:1;3498:27;3492:4;3488:38;3557:4;3545:10;3542:20;3539:47;;;-1:-1:-1;3580:4:23;3539:47;3635:2;3630:3;3626:12;3623:1;3619:20;3613:4;3609:31;3599:41;;3690:82;3708:2;3701:5;3698:13;3690:82;;;3753:17;;;3734:1;3723:13;3690:82;;;3694:3;;;3334:448;3243:545;;;:::o;4024:1471::-;4150:3;4144:10;4177:18;4169:6;4166:30;4163:56;;;4199:18;;:::i;:::-;4228:97;4318:6;4278:38;4310:4;4304:11;4278:38;:::i;:::-;4272:4;4228:97;:::i;:::-;4380:4;;4444:2;4433:14;;4461:1;4456:782;;;;5282:1;5299:6;5296:89;;;-1:-1:-1;5351:19:23;;;5345:26;5296:89;3930:66;3921:1;3917:11;;;3913:84;3909:89;3899:100;4005:1;4001:11;;;3896:117;5398:81;;4426:1063;;4456:782;3190:1;3183:14;;;3227:4;3214:18;;4504:66;4492:79;;;4669:236;4683:7;4680:1;4677:14;4669:236;;;4772:19;;;4766:26;4751:42;;4864:27;;;;4832:1;4820:14;;;;4699:19;;4669:236;;;4673:3;4933:6;4924:7;4921:19;4918:261;;;4994:19;;;4988:26;5095:66;5077:1;5073:14;;;5089:3;5069:24;5065:97;5061:102;5046:118;5031:134;;4918:261;-1:-1:-1;;;;;5225:1:23;5209:14;;;5205:22;5192:36;;-1:-1:-1;4024:1471:23:o;5500:184::-;5570:6;5623:2;5611:9;5602:7;5598:23;5594:32;5591:52;;;5639:1;5636;5629:12;5591:52;-1:-1:-1;5662:16:23;;5500:184;-1:-1:-1;5500:184:23:o", "linkReferences": {}, "immutableReferences": { - "29704": [ + "29706": [ { "start": 113, "length": 32 @@ -307,13 +307,13 @@ }, "settings": { "remappings": [ - ":contracts/=solidity/contracts/", - ":ds-test/=node_modules/ds-test/src/", - ":forge-std/=node_modules/forge-std/src/", - ":interfaces/=solidity/interfaces/", - ":isolmate/=node_modules/isolmate/src/", - ":prb/test/=node_modules/prb/test/src/", - ":test/=solidity/test/" + "contracts/=solidity/contracts/", + "ds-test/=node_modules/ds-test/src/", + "forge-std/=node_modules/forge-std/src/", + "interfaces/=solidity/interfaces/", + "isolmate/=node_modules/isolmate/src/", + "prb/test/=node_modules/prb/test/src/", + "test/=solidity/test/" ], "optimizer": { "enabled": true, @@ -357,23 +357,23 @@ }, "ast": { "absolutePath": "solidity/contracts/Greeter.sol", - "id": 29801, + "id": 29803, "exportedSymbols": { "Greeter": [ - 29800 + 29802 ], "IERC20": [ - 24217 + 24219 ], "IGreeter": [ - 29850 + 29852 ] }, "nodeType": "SourceUnit", "src": "39:1506:16", "nodes": [ { - "id": 29691, + "id": 29693, "nodeType": "PragmaDirective", "src": "39:24:16", "nodes": [], @@ -385,23 +385,23 @@ ] }, { - "id": 29693, + "id": 29695, "nodeType": "ImportDirective", "src": "65:61:16", "nodes": [], "absolutePath": "node_modules/isolmate/src/interfaces/tokens/IERC20.sol", "file": "isolmate/interfaces/tokens/IERC20.sol", "nameLocation": "-1:-1:-1", - "scope": 29801, - "sourceUnit": 24218, + "scope": 29803, + "sourceUnit": 24220, "symbolAliases": [ { "foreign": { - "id": 29692, + "id": 29694, "name": "IERC20", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 24217, + "referencedDeclaration": 24219, "src": "73:6:16", "typeDescriptions": {} }, @@ -411,23 +411,23 @@ "unitAlias": "" }, { - "id": 29695, + "id": 29697, "nodeType": "ImportDirective", "src": "127:49:16", "nodes": [], "absolutePath": "solidity/interfaces/IGreeter.sol", "file": "interfaces/IGreeter.sol", "nameLocation": "-1:-1:-1", - "scope": 29801, - "sourceUnit": 29851, + "scope": 29803, + "sourceUnit": 29853, "symbolAliases": [ { "foreign": { - "id": 29694, + "id": 29696, "name": "IGreeter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 29850, + "referencedDeclaration": 29852, "src": "135:8:16", "typeDescriptions": {} }, @@ -437,18 +437,18 @@ "unitAlias": "" }, { - "id": 29800, + "id": 29802, "nodeType": "ContractDefinition", "src": "178:1366:16", "nodes": [ { - "id": 29701, + "id": 29703, "nodeType": "VariableDeclaration", "src": "314:108:16", "nodes": [], "constant": true, "documentation": { - "id": 29698, + "id": 29700, "nodeType": "StructuredDocumentation", "src": "211:100:16", "text": " @notice Empty string for revert checks\n @dev result of doing keccak256(bytes(''))" @@ -456,7 +456,7 @@ "mutability": "constant", "name": "_EMPTY_STRING", "nameLocation": "340:13:16", - "scope": 29800, + "scope": 29802, "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -464,7 +464,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 29699, + "id": 29701, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "314:7:16", @@ -475,7 +475,7 @@ }, "value": { "hexValue": "307863356432343630313836663732333363393237653764623264636337303363306535303062363533636138323237336237626661643830343564383561343730", - "id": 29700, + "id": 29702, "isConstant": false, "isLValue": false, "isPure": true, @@ -492,16 +492,16 @@ "visibility": "internal" }, { - "id": 29704, + "id": 29706, "nodeType": "VariableDeclaration", "src": "454:30:16", "nodes": [], "baseFunctions": [ - 29822 + 29824 ], "constant": false, "documentation": { - "id": 29702, + "id": 29704, "nodeType": "StructuredDocumentation", "src": "427:24:16", "text": "@inheritdoc IGreeter" @@ -510,7 +510,7 @@ "mutability": "immutable", "name": "OWNER", "nameLocation": "479:5:16", - "scope": 29800, + "scope": 29802, "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -518,7 +518,7 @@ "typeString": "address" }, "typeName": { - "id": 29703, + "id": 29705, "name": "address", "nodeType": "ElementaryTypeName", "src": "454:7:16", @@ -531,16 +531,16 @@ "visibility": "public" }, { - "id": 29707, + "id": 29709, "nodeType": "VariableDeclaration", "src": "516:22:16", "nodes": [], "baseFunctions": [ - 29828 + 29830 ], "constant": false, "documentation": { - "id": 29705, + "id": 29707, "nodeType": "StructuredDocumentation", "src": "489:24:16", "text": "@inheritdoc IGreeter" @@ -549,7 +549,7 @@ "mutability": "mutable", "name": "greeting", "nameLocation": "530:8:16", - "scope": 29800, + "scope": 29802, "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -557,7 +557,7 @@ "typeString": "string" }, "typeName": { - "id": 29706, + "id": 29708, "name": "string", "nodeType": "ElementaryTypeName", "src": "516:6:16", @@ -569,16 +569,16 @@ "visibility": "public" }, { - "id": 29711, + "id": 29713, "nodeType": "VariableDeclaration", "src": "570:19:16", "nodes": [], "baseFunctions": [ - 29835 + 29837 ], "constant": false, "documentation": { - "id": 29708, + "id": 29710, "nodeType": "StructuredDocumentation", "src": "543:24:16", "text": "@inheritdoc IGreeter" @@ -587,59 +587,59 @@ "mutability": "mutable", "name": "token", "nameLocation": "584:5:16", - "scope": 29800, + "scope": 29802, "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_IERC20_$24217", + "typeIdentifier": "t_contract$_IERC20_$24219", "typeString": "contract IERC20" }, "typeName": { - "id": 29710, + "id": 29712, "nodeType": "UserDefinedTypeName", "pathNode": { - "id": 29709, + "id": 29711, "name": "IERC20", "nameLocations": [ "570:6:16" ], "nodeType": "IdentifierPath", - "referencedDeclaration": 24217, + "referencedDeclaration": 24219, "src": "570:6:16" }, - "referencedDeclaration": 24217, + "referencedDeclaration": 24219, "src": "570:6:16", "typeDescriptions": { - "typeIdentifier": "t_contract$_IERC20_$24217", + "typeIdentifier": "t_contract$_IERC20_$24219", "typeString": "contract IERC20" } }, "visibility": "public" }, { - "id": 29734, + "id": 29736, "nodeType": "FunctionDefinition", "src": "757:129:16", "nodes": [], "body": { - "id": 29733, + "id": 29735, "nodeType": "Block", "src": "809:77:16", "nodes": [], "statements": [ { "expression": { - "id": 29723, + "id": 29725, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { - "id": 29720, + "id": 29722, "name": "OWNER", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 29704, + "referencedDeclaration": 29706, "src": "815:5:16", "typeDescriptions": { "typeIdentifier": "t_address", @@ -650,7 +650,7 @@ "operator": "=", "rightHandSide": { "expression": { - "id": 29721, + "id": 29723, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -661,7 +661,7 @@ "typeString": "msg" } }, - "id": 29722, + "id": 29724, "isConstant": false, "isLValue": false, "isPure": false, @@ -681,50 +681,50 @@ "typeString": "address" } }, - "id": 29724, + "id": 29726, "nodeType": "ExpressionStatement", "src": "815:18:16" }, { "expression": { - "id": 29727, + "id": 29729, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { - "id": 29725, + "id": 29727, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 29711, + "referencedDeclaration": 29713, "src": "839:5:16", "typeDescriptions": { - "typeIdentifier": "t_contract$_IERC20_$24217", + "typeIdentifier": "t_contract$_IERC20_$24219", "typeString": "contract IERC20" } }, "nodeType": "Assignment", "operator": "=", "rightHandSide": { - "id": 29726, + "id": 29728, "name": "_token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 29717, + "referencedDeclaration": 29719, "src": "847:6:16", "typeDescriptions": { - "typeIdentifier": "t_contract$_IERC20_$24217", + "typeIdentifier": "t_contract$_IERC20_$24219", "typeString": "contract IERC20" } }, "src": "839:14:16", "typeDescriptions": { - "typeIdentifier": "t_contract$_IERC20_$24217", + "typeIdentifier": "t_contract$_IERC20_$24219", "typeString": "contract IERC20" } }, - "id": 29728, + "id": 29730, "nodeType": "ExpressionStatement", "src": "839:14:16" }, @@ -732,11 +732,11 @@ "expression": { "arguments": [ { - "id": 29730, + "id": 29732, "name": "_greeting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 29714, + "referencedDeclaration": 29716, "src": "871:9:16", "typeDescriptions": { "typeIdentifier": "t_string_memory_ptr", @@ -751,18 +751,18 @@ "typeString": "string memory" } ], - "id": 29729, + "id": 29731, "name": "setGreeting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 29764, + "referencedDeclaration": 29766, "src": "859:11:16", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_string_memory_ptr_$returns$__$", "typeString": "function (string memory)" } }, - "id": 29731, + "id": 29733, "isConstant": false, "isLValue": false, "isPure": false, @@ -778,14 +778,14 @@ "typeString": "tuple()" } }, - "id": 29732, + "id": 29734, "nodeType": "ExpressionStatement", "src": "859:22:16" } ] }, "documentation": { - "id": 29712, + "id": 29714, "nodeType": "StructuredDocumentation", "src": "594:160:16", "text": " @notice Defines the owner to the msg.sender and sets the initial greeting\n @param _greeting Initial greeting\n @param _token Initial token" @@ -796,17 +796,17 @@ "name": "", "nameLocation": "-1:-1:-1", "parameters": { - "id": 29718, + "id": 29720, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 29714, + "id": 29716, "mutability": "mutable", "name": "_greeting", "nameLocation": "783:9:16", "nodeType": "VariableDeclaration", - "scope": 29734, + "scope": 29736, "src": "769:23:16", "stateVariable": false, "storageLocation": "memory", @@ -815,7 +815,7 @@ "typeString": "string" }, "typeName": { - "id": 29713, + "id": 29715, "name": "string", "nodeType": "ElementaryTypeName", "src": "769:6:16", @@ -828,36 +828,36 @@ }, { "constant": false, - "id": 29717, + "id": 29719, "mutability": "mutable", "name": "_token", "nameLocation": "801:6:16", "nodeType": "VariableDeclaration", - "scope": 29734, + "scope": 29736, "src": "794:13:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_IERC20_$24217", + "typeIdentifier": "t_contract$_IERC20_$24219", "typeString": "contract IERC20" }, "typeName": { - "id": 29716, + "id": 29718, "nodeType": "UserDefinedTypeName", "pathNode": { - "id": 29715, + "id": 29717, "name": "IERC20", "nameLocations": [ "794:6:16" ], "nodeType": "IdentifierPath", - "referencedDeclaration": 24217, + "referencedDeclaration": 24219, "src": "794:6:16" }, - "referencedDeclaration": 24217, + "referencedDeclaration": 24219, "src": "794:6:16", "typeDescriptions": { - "typeIdentifier": "t_contract$_IERC20_$24217", + "typeIdentifier": "t_contract$_IERC20_$24219", "typeString": "contract IERC20" } }, @@ -867,23 +867,23 @@ "src": "768:40:16" }, "returnParameters": { - "id": 29719, + "id": 29721, "nodeType": "ParameterList", "parameters": [], "src": "809:0:16" }, - "scope": 29800, + "scope": 29802, "stateMutability": "nonpayable", "virtual": false, "visibility": "public" }, { - "id": 29764, + "id": 29766, "nodeType": "FunctionDefinition", "src": "917:230:16", "nodes": [], "body": { - "id": 29763, + "id": 29765, "nodeType": "Block", "src": "980:167:16", "nodes": [], @@ -894,7 +894,7 @@ "typeIdentifier": "t_bytes32", "typeString": "bytes32" }, - "id": 29749, + "id": 29751, "isConstant": false, "isLValue": false, "isPure": false, @@ -904,11 +904,11 @@ { "arguments": [ { - "id": 29745, + "id": 29747, "name": "_greeting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 29737, + "referencedDeclaration": 29739, "src": "1006:9:16", "typeDescriptions": { "typeIdentifier": "t_string_memory_ptr", @@ -923,7 +923,7 @@ "typeString": "string memory" } ], - "id": 29744, + "id": 29746, "isConstant": false, "isLValue": false, "isPure": true, @@ -935,14 +935,14 @@ "typeString": "type(bytes storage pointer)" }, "typeName": { - "id": 29743, + "id": 29745, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "1000:5:16", "typeDescriptions": {} } }, - "id": 29746, + "id": 29748, "isConstant": false, "isLValue": false, "isPure": false, @@ -966,7 +966,7 @@ "typeString": "bytes memory" } ], - "id": 29742, + "id": 29744, "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -977,7 +977,7 @@ "typeString": "function (bytes memory) pure returns (bytes32)" } }, - "id": 29747, + "id": 29749, "isConstant": false, "isLValue": false, "isPure": false, @@ -996,11 +996,11 @@ "nodeType": "BinaryOperation", "operator": "==", "rightExpression": { - "id": 29748, + "id": 29750, "name": "_EMPTY_STRING", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 29701, + "referencedDeclaration": 29703, "src": "1021:13:16", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1013,11 +1013,11 @@ "typeString": "bool" } }, - "id": 29754, + "id": 29756, "nodeType": "IfStatement", "src": "986:97:16", "trueBody": { - "id": 29753, + "id": 29755, "nodeType": "Block", "src": "1036:47:16", "statements": [ @@ -1026,18 +1026,18 @@ "arguments": [], "expression": { "argumentTypes": [], - "id": 29750, + "id": 29752, "name": "Greeter_InvalidGreeting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 29816, + "referencedDeclaration": 29818, "src": "1051:23:16", "typeDescriptions": { "typeIdentifier": "t_function_error_pure$__$returns$__$", "typeString": "function () pure" } }, - "id": 29751, + "id": 29753, "isConstant": false, "isLValue": false, "isPure": false, @@ -1053,7 +1053,7 @@ "typeString": "tuple()" } }, - "id": 29752, + "id": 29754, "nodeType": "RevertStatement", "src": "1044:32:16" } @@ -1062,17 +1062,17 @@ }, { "expression": { - "id": 29757, + "id": 29759, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { - "id": 29755, + "id": 29757, "name": "greeting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 29707, + "referencedDeclaration": 29709, "src": "1089:8:16", "typeDescriptions": { "typeIdentifier": "t_string_storage", @@ -1082,11 +1082,11 @@ "nodeType": "Assignment", "operator": "=", "rightHandSide": { - "id": 29756, + "id": 29758, "name": "_greeting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 29737, + "referencedDeclaration": 29739, "src": "1100:9:16", "typeDescriptions": { "typeIdentifier": "t_string_memory_ptr", @@ -1099,7 +1099,7 @@ "typeString": "string storage ref" } }, - "id": 29758, + "id": 29760, "nodeType": "ExpressionStatement", "src": "1089:20:16" }, @@ -1107,11 +1107,11 @@ "eventCall": { "arguments": [ { - "id": 29760, + "id": 29762, "name": "_greeting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 29737, + "referencedDeclaration": 29739, "src": "1132:9:16", "typeDescriptions": { "typeIdentifier": "t_string_memory_ptr", @@ -1126,18 +1126,18 @@ "typeString": "string memory" } ], - "id": 29759, + "id": 29761, "name": "GreetingSet", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 29810, + "referencedDeclaration": 29812, "src": "1120:11:16", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_string_memory_ptr_$returns$__$", "typeString": "function (string memory)" } }, - "id": 29761, + "id": 29763, "isConstant": false, "isLValue": false, "isPure": false, @@ -1153,17 +1153,17 @@ "typeString": "tuple()" } }, - "id": 29762, + "id": 29764, "nodeType": "EmitStatement", "src": "1115:27:16" } ] }, "baseFunctions": [ - 29849 + 29851 ], "documentation": { - "id": 29735, + "id": 29737, "nodeType": "StructuredDocumentation", "src": "890:24:16", "text": "@inheritdoc IGreeter" @@ -1173,16 +1173,16 @@ "kind": "function", "modifiers": [ { - "id": 29740, + "id": 29742, "kind": "modifierInvocation", "modifierName": { - "id": 29739, + "id": 29741, "name": "onlyOwner", "nameLocations": [ "970:9:16" ], "nodeType": "IdentifierPath", - "referencedDeclaration": 29799, + "referencedDeclaration": 29801, "src": "970:9:16" }, "nodeType": "ModifierInvocation", @@ -1192,17 +1192,17 @@ "name": "setGreeting", "nameLocation": "926:11:16", "parameters": { - "id": 29738, + "id": 29740, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 29737, + "id": 29739, "mutability": "mutable", "name": "_greeting", "nameLocation": "952:9:16", "nodeType": "VariableDeclaration", - "scope": 29764, + "scope": 29766, "src": "938:23:16", "stateVariable": false, "storageLocation": "memory", @@ -1211,7 +1211,7 @@ "typeString": "string" }, "typeName": { - "id": 29736, + "id": 29738, "name": "string", "nodeType": "ElementaryTypeName", "src": "938:6:16", @@ -1226,40 +1226,40 @@ "src": "937:25:16" }, "returnParameters": { - "id": 29741, + "id": 29743, "nodeType": "ParameterList", "parameters": [], "src": "980:0:16" }, - "scope": 29800, + "scope": 29802, "stateMutability": "nonpayable", "virtual": false, "visibility": "public" }, { - "id": 29785, + "id": 29787, "nodeType": "FunctionDefinition", "src": "1178:158:16", "nodes": [], "body": { - "id": 29784, + "id": 29786, "nodeType": "Block", "src": "1261:75:16", "nodes": [], "statements": [ { "expression": { - "id": 29774, + "id": 29776, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { - "id": 29772, + "id": 29774, "name": "_greeting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 29768, + "referencedDeclaration": 29770, "src": "1267:9:16", "typeDescriptions": { "typeIdentifier": "t_string_memory_ptr", @@ -1269,11 +1269,11 @@ "nodeType": "Assignment", "operator": "=", "rightHandSide": { - "id": 29773, + "id": 29775, "name": "greeting", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 29707, + "referencedDeclaration": 29709, "src": "1279:8:16", "typeDescriptions": { "typeIdentifier": "t_string_storage", @@ -1286,23 +1286,23 @@ "typeString": "string memory" } }, - "id": 29775, + "id": 29777, "nodeType": "ExpressionStatement", "src": "1267:20:16" }, { "expression": { - "id": 29782, + "id": 29784, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { - "id": 29776, + "id": 29778, "name": "_balance", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 29770, + "referencedDeclaration": 29772, "src": "1293:8:16", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1315,7 +1315,7 @@ "arguments": [ { "expression": { - "id": 29779, + "id": 29781, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -1326,7 +1326,7 @@ "typeString": "msg" } }, - "id": 29780, + "id": 29782, "isConstant": false, "isLValue": false, "isPure": false, @@ -1349,18 +1349,18 @@ } ], "expression": { - "id": 29777, + "id": 29779, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 29711, + "referencedDeclaration": 29713, "src": "1304:5:16", "typeDescriptions": { - "typeIdentifier": "t_contract$_IERC20_$24217", + "typeIdentifier": "t_contract$_IERC20_$24219", "typeString": "contract IERC20" } }, - "id": 29778, + "id": 29780, "isConstant": false, "isLValue": false, "isPure": false, @@ -1368,14 +1368,14 @@ "memberLocation": "1310:9:16", "memberName": "balanceOf", "nodeType": "MemberAccess", - "referencedDeclaration": 24149, + "referencedDeclaration": 24151, "src": "1304:15:16", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view external returns (uint256)" } }, - "id": 29781, + "id": 29783, "isConstant": false, "isLValue": false, "isPure": false, @@ -1397,17 +1397,17 @@ "typeString": "uint256" } }, - "id": 29783, + "id": 29785, "nodeType": "ExpressionStatement", "src": "1293:38:16" } ] }, "baseFunctions": [ - 29843 + 29845 ], "documentation": { - "id": 29765, + "id": 29767, "nodeType": "StructuredDocumentation", "src": "1151:24:16", "text": "@inheritdoc IGreeter" @@ -1419,23 +1419,23 @@ "name": "greet", "nameLocation": "1187:5:16", "parameters": { - "id": 29766, + "id": 29768, "nodeType": "ParameterList", "parameters": [], "src": "1192:2:16" }, "returnParameters": { - "id": 29771, + "id": 29773, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 29768, + "id": 29770, "mutability": "mutable", "name": "_greeting", "nameLocation": "1232:9:16", "nodeType": "VariableDeclaration", - "scope": 29785, + "scope": 29787, "src": "1218:23:16", "stateVariable": false, "storageLocation": "memory", @@ -1444,7 +1444,7 @@ "typeString": "string" }, "typeName": { - "id": 29767, + "id": 29769, "name": "string", "nodeType": "ElementaryTypeName", "src": "1218:6:16", @@ -1457,12 +1457,12 @@ }, { "constant": false, - "id": 29770, + "id": 29772, "mutability": "mutable", "name": "_balance", "nameLocation": "1251:8:16", "nodeType": "VariableDeclaration", - "scope": 29785, + "scope": 29787, "src": "1243:16:16", "stateVariable": false, "storageLocation": "default", @@ -1471,7 +1471,7 @@ "typeString": "uint256" }, "typeName": { - "id": 29769, + "id": 29771, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1243:7:16", @@ -1485,18 +1485,18 @@ ], "src": "1217:43:16" }, - "scope": 29800, + "scope": 29802, "stateMutability": "view", "virtual": false, "visibility": "external" }, { - "id": 29799, + "id": 29801, "nodeType": "ModifierDefinition", "src": "1438:104:16", "nodes": [], "body": { - "id": 29798, + "id": 29800, "nodeType": "Block", "src": "1459:83:16", "nodes": [], @@ -1507,14 +1507,14 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 29791, + "id": 29793, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "expression": { - "id": 29788, + "id": 29790, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -1525,7 +1525,7 @@ "typeString": "msg" } }, - "id": 29789, + "id": 29791, "isConstant": false, "isLValue": false, "isPure": false, @@ -1542,11 +1542,11 @@ "nodeType": "BinaryOperation", "operator": "!=", "rightExpression": { - "id": 29790, + "id": 29792, "name": "OWNER", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 29704, + "referencedDeclaration": 29706, "src": "1483:5:16", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1559,11 +1559,11 @@ "typeString": "bool" } }, - "id": 29796, + "id": 29798, "nodeType": "IfStatement", "src": "1465:66:16", "trueBody": { - "id": 29795, + "id": 29797, "nodeType": "Block", "src": "1490:41:16", "statements": [ @@ -1572,18 +1572,18 @@ "arguments": [], "expression": { "argumentTypes": [], - "id": 29792, + "id": 29794, "name": "Greeter_OnlyOwner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 29813, + "referencedDeclaration": 29815, "src": "1505:17:16", "typeDescriptions": { "typeIdentifier": "t_function_error_pure$__$returns$__$", "typeString": "function () pure" } }, - "id": 29793, + "id": 29795, "isConstant": false, "isLValue": false, "isPure": false, @@ -1599,7 +1599,7 @@ "typeString": "tuple()" } }, - "id": 29794, + "id": 29796, "nodeType": "RevertStatement", "src": "1498:26:16" } @@ -1607,14 +1607,14 @@ } }, { - "id": 29797, + "id": 29799, "nodeType": "PlaceholderStatement", "src": "1536:1:16" } ] }, "documentation": { - "id": 29786, + "id": 29788, "nodeType": "StructuredDocumentation", "src": "1340:95:16", "text": " @notice Reverts in case the function was not called by the owner of the contract" @@ -1622,7 +1622,7 @@ "name": "onlyOwner", "nameLocation": "1447:9:16", "parameters": { - "id": 29787, + "id": 29789, "nodeType": "ParameterList", "parameters": [], "src": "1456:2:16" @@ -1635,16 +1635,16 @@ "baseContracts": [ { "baseName": { - "id": 29696, + "id": 29698, "name": "IGreeter", "nameLocations": [ "198:8:16" ], "nodeType": "IdentifierPath", - "referencedDeclaration": 29850, + "referencedDeclaration": 29852, "src": "198:8:16" }, - "id": 29697, + "id": 29699, "nodeType": "InheritanceSpecifier", "src": "198:8:16" } @@ -1654,15 +1654,15 @@ "contractKind": "contract", "fullyImplemented": true, "linearizedBaseContracts": [ - 29800, - 29850 + 29802, + 29852 ], "name": "Greeter", "nameLocation": "187:7:16", - "scope": 29801, + "scope": 29803, "usedErrors": [ - 29813, - 29816 + 29815, + 29818 ] } ], diff --git a/package.json b/package.json index 178be60c..f57b3c3a 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "@commitlint/config-conventional": "17.0.3", "husky": ">=8", "lint-staged": ">=10", - "solhint": "3.3.6", + "solhint": "3.6.2", "solhint-plugin-defi-wonderland": "1.1.0", "sort-package-json": "1.53.1" } diff --git a/solidity/test/e2e/Common.sol b/solidity/test/e2e/Common.sol index 447e1a80..3efcfb75 100644 --- a/solidity/test/e2e/Common.sol +++ b/solidity/test/e2e/Common.sol @@ -2,7 +2,6 @@ pragma solidity =0.8.19; import {DSTestFull} from 'test/utils/DSTestFull.sol'; -import {console} from 'forge-std/console.sol'; import {IERC20} from 'isolmate/interfaces/tokens/IERC20.sol'; import {Greeter, IGreeter} from 'contracts/Greeter.sol'; diff --git a/solidity/test/utils/DSTestFull.sol b/solidity/test/utils/DSTestFull.sol index c2742d89..c1bd8568 100644 --- a/solidity/test/utils/DSTestFull.sol +++ b/solidity/test/utils/DSTestFull.sol @@ -1,7 +1,6 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity =0.8.19; -import {console} from 'forge-std/console.sol'; import {PRBTest} from 'prb/test/PRBTest.sol'; contract DSTestFull is PRBTest { diff --git a/yarn.lock b/yarn.lock index 61cdac28..7b4b14ff 100644 --- a/yarn.lock +++ b/yarn.lock @@ -230,13 +230,6 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@solidity-parser/parser@^0.13.2": - version "0.13.2" - resolved "https://registry.yarnpkg.com/@solidity-parser/parser/-/parser-0.13.2.tgz#b6c71d8ca0b382d90a7bbed241f9bc110af65cbe" - integrity sha512-RwHnpRnfrnD2MSPveYoPh8nhofEvX7fgjHk1Oq+NNvCcLx4r1js91CO9o+F/F3fBzOCyvm8kKRTriFICX/odWw== - dependencies: - antlr4ts "^0.5.0-alpha.4" - "@solidity-parser/parser@^0.14.1": version "0.14.5" resolved "https://registry.yarnpkg.com/@solidity-parser/parser/-/parser-0.14.5.tgz#87bc3cc7b068e08195c219c91cd8ddff5ef1a804" @@ -244,6 +237,13 @@ dependencies: antlr4ts "^0.5.0-alpha.4" +"@solidity-parser/parser@^0.16.0": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@solidity-parser/parser/-/parser-0.16.1.tgz#f7c8a686974e1536da0105466c4db6727311253c" + integrity sha512-PdhRFNhbTtu3x8Axm0uYpqOy/lODYQK+MlYSgqIsq2L8SFYEHJPHNUiOTAJbDGzNjjr1/n9AcIayxafR/fWmYw== + dependencies: + antlr4ts "^0.5.0-alpha.4" + "@tsconfig/node10@^1.0.7": version "1.0.9" resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2" @@ -328,7 +328,7 @@ aggregate-error@^3.0.0: clean-stack "^2.0.0" indent-string "^4.0.0" -ajv@^6.10.2, ajv@^6.6.1, ajv@^6.9.1: +ajv@^6.10.2, ajv@^6.12.6, ajv@^6.6.1, ajv@^6.9.1: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== @@ -338,7 +338,7 @@ ajv@^6.10.2, ajv@^6.6.1, ajv@^6.9.1: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^8.11.0: +ajv@^8.0.1, ajv@^8.11.0: version "8.12.0" resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1" integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA== @@ -404,6 +404,11 @@ antlr4@4.7.1: resolved "https://registry.yarnpkg.com/antlr4/-/antlr4-4.7.1.tgz#69984014f096e9e775f53dd9744bf994d8959773" integrity sha512-haHyTW7Y9joE5MVs37P2lNYfU2RWBLfcRDD8OWldcdZm5TiCE91B5Xl1oWSwiDUSd4rlExpt2pu1fksYQjRBYQ== +antlr4@^4.11.0: + version "4.13.0" + resolved "https://registry.yarnpkg.com/antlr4/-/antlr4-4.13.0.tgz#25c0b17f0d9216de114303d38bafd6f181d5447f" + integrity sha512-zooUbt+UscjnWyOrsuY/tVFL4rwrAGwOivpQmvmUDE22hy/lUA467Rc1rcixyRwcRUIXFYBwv7+dClDSHdmmew== + antlr4ts@^0.5.0-alpha.4: version "0.5.0-alpha.4" resolved "https://registry.yarnpkg.com/antlr4ts/-/antlr4ts-0.5.0-alpha.4.tgz#71702865a87478ed0b40c0709f422cf14d51652a" @@ -441,7 +446,7 @@ arrify@^1.0.1: resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" integrity sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA== -ast-parents@0.0.1: +ast-parents@0.0.1, ast-parents@^0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/ast-parents/-/ast-parents-0.0.1.tgz#508fd0f05d0c48775d9eccda2e174423261e8dd3" integrity sha512-XHusKxKz3zoYk1ic8Un640joHbFMhbqneyoZfoKnEGtf2ey9Uh/IdpcQplODdO/kENaMIWsD0nJm4+wX3UNLHA== @@ -469,6 +474,13 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" +brace-expansion@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" + integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== + dependencies: + balanced-match "^1.0.0" + braces@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" @@ -528,7 +540,7 @@ chalk@^2.0.0, chalk@^2.1.0, chalk@^2.4.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^4.1.0: +chalk@^4.1.0, chalk@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -977,7 +989,7 @@ fast-deep-equal@^3.1.1: resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== -fast-diff@^1.1.2: +fast-diff@^1.1.2, fast-diff@^1.2.0: version "1.3.0" resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.3.0.tgz#ece407fa550a64d638536cd727e129c61616e0f0" integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw== @@ -1134,6 +1146,17 @@ glob@^7.1.2, glob@^7.1.3: once "^1.3.0" path-is-absolute "^1.0.0" +glob@^8.0.3: + version "8.1.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e" + integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^5.0.1" + once "^1.3.0" + global-dirs@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445" @@ -1226,7 +1249,7 @@ ignore@^4.0.6: resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== -ignore@^5.1.1: +ignore@^5.1.1, ignore@^5.2.4: version "5.2.4" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== @@ -1548,6 +1571,11 @@ lodash.startcase@^4.4.0: resolved "https://registry.yarnpkg.com/lodash.startcase/-/lodash.startcase-4.4.0.tgz#9436e34ed26093ed7ffae1936144350915d9add8" integrity sha512-+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg== +lodash.truncate@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" + integrity sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw== + lodash.uniq@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" @@ -1558,7 +1586,7 @@ lodash.upperfirst@^4.3.1: resolved "https://registry.yarnpkg.com/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz#1365edf431480481ef0d1c68957a5ed99d49f7ce" integrity sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg== -lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19: +lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -1657,6 +1685,13 @@ minimatch@^3.0.4, minimatch@^3.1.1: dependencies: brace-expansion "^1.1.7" +minimatch@^5.0.1: + version "5.1.6" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96" + integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g== + dependencies: + brace-expansion "^2.0.1" + minimist-options@4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619" @@ -1902,6 +1937,11 @@ pidtree@^0.6.0: resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.6.0.tgz#90ad7b6d42d5841e69e0a2419ef38f8883aa057c" integrity sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g== +pluralize@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-8.0.0.tgz#1a6fa16a38d12a1901e0320fa017051c539ce3b1" + integrity sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA== + "prb/test@github:paulrberg/prb-test#a245c71": version "0.6.0" resolved "https://codeload.github.com/paulrberg/prb-test/tar.gz/a245c71edc07643aedfe27df4cc7b21048aa8824" @@ -1916,6 +1956,11 @@ prettier@^1.14.3: resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb" integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew== +prettier@^2.8.3: + version "2.8.8" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da" + integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q== + progress@^2.0.0: version "2.0.3" resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" @@ -2116,6 +2161,13 @@ semver@^7.3.4: dependencies: lru-cache "^6.0.0" +semver@^7.5.2: + version "7.5.4" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" + integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== + dependencies: + lru-cache "^6.0.0" + shebang-command@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" @@ -2192,28 +2244,6 @@ solhint-plugin-defi-wonderland@1.1.0: dependencies: solhint "3.3.7" -solhint@3.3.6: - version "3.3.6" - resolved "https://registry.yarnpkg.com/solhint/-/solhint-3.3.6.tgz#abe9af185a9a7defefba480047b3e42cbe9a1210" - integrity sha512-HWUxTAv2h7hx3s3hAab3ifnlwb02ZWhwFU/wSudUHqteMS3ll9c+m1FlGn9V8ztE2rf3Z82fQZA005Wv7KpcFA== - dependencies: - "@solidity-parser/parser" "^0.13.2" - ajv "^6.6.1" - antlr4 "4.7.1" - ast-parents "0.0.1" - chalk "^2.4.2" - commander "2.18.0" - cosmiconfig "^5.0.7" - eslint "^5.6.0" - fast-diff "^1.1.2" - glob "^7.1.3" - ignore "^4.0.6" - js-yaml "^3.12.0" - lodash "^4.17.11" - semver "^6.3.0" - optionalDependencies: - prettier "^1.14.3" - solhint@3.3.7: version "3.3.7" resolved "https://registry.yarnpkg.com/solhint/-/solhint-3.3.7.tgz#b5da4fedf7a0fee954cb613b6c55a5a2b0063aa7" @@ -2236,6 +2266,31 @@ solhint@3.3.7: optionalDependencies: prettier "^1.14.3" +solhint@3.6.2: + version "3.6.2" + resolved "https://registry.yarnpkg.com/solhint/-/solhint-3.6.2.tgz#2b2acbec8fdc37b2c68206a71ba89c7f519943fe" + integrity sha512-85EeLbmkcPwD+3JR7aEMKsVC9YrRSxd4qkXuMzrlf7+z2Eqdfm1wHWq1ffTuo5aDhoZxp2I9yF3QkxZOxOL7aQ== + dependencies: + "@solidity-parser/parser" "^0.16.0" + ajv "^6.12.6" + antlr4 "^4.11.0" + ast-parents "^0.0.1" + chalk "^4.1.2" + commander "^10.0.0" + cosmiconfig "^8.0.0" + fast-diff "^1.2.0" + glob "^8.0.3" + ignore "^5.2.4" + js-yaml "^4.1.0" + lodash "^4.17.21" + pluralize "^8.0.0" + semver "^7.5.2" + strip-ansi "^6.0.1" + table "^6.8.1" + text-table "^0.2.0" + optionalDependencies: + prettier "^2.8.3" + sort-object-keys@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/sort-object-keys/-/sort-object-keys-1.1.3.tgz#bff833fe85cab147b34742e45863453c1e190b45" @@ -2417,6 +2472,17 @@ table@^5.2.3: slice-ansi "^2.1.0" string-width "^3.0.0" +table@^6.8.1: + version "6.8.1" + resolved "https://registry.yarnpkg.com/table/-/table-6.8.1.tgz#ea2b71359fe03b017a5fbc296204471158080bdf" + integrity sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA== + dependencies: + ajv "^8.0.1" + lodash.truncate "^4.4.2" + slice-ansi "^4.0.0" + string-width "^4.2.3" + strip-ansi "^6.0.1" + text-extensions@^1.0.0: version "1.9.0" resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.9.0.tgz#1853e45fee39c945ce6f6c36b2d659b5aabc2a26"