bump solhint & prettier deps (#11228)

* bump solhint deps * bump cl solhint chainlink-solidity/explicit-returns * bump solhint * bump prettier-plugin-solidity
smartcontractkit · Nov 9, 2023 · bc4ff53 · bc4ff53
1 parent b9bd82a
commit bc4ff53
Show file tree

Hide file tree

Showing 10 changed files with 148 additions and 88 deletions.
diff --git a/contracts/.solhint.json b/contracts/.solhint.json
@@ -37,6 +37,7 @@
 		"chainlink-solidity/prefix-immutable-variables-with-i": "warn",
 		"chainlink-solidity/all-caps-constant-storage-variables": "warn",
 		"chainlink-solidity/no-hardhat-imports": "warn",
-		"chainlink-solidity/inherited-constructor-args-not-in-contract-definition": "warn"
+		"chainlink-solidity/inherited-constructor-args-not-in-contract-definition": "warn",
+		"chainlink-solidity/explicit-returns": "warn"
 	}
 }
diff --git a/contracts/.solhintignore b/contracts/.solhintignore
@@ -1,4 +1,4 @@
-# 377 warnings
+# 344 warnings
 #./src/v0.8/automation
 
 # Ignore Functions v1.0.0 code that was frozen after audit

diff --git a/contracts/package.json b/contracts/package.json
@@ -18,7 +18,7 @@
     "prepublishOnly": "pnpm compile && ./scripts/prepublish_generate_abi_folder",
     "publish-beta": "pnpm publish --tag beta",
     "publish-prod": "npm dist-tag add @chainlink/contracts@0.8.0 latest",
-    "solhint": "solhint --max-warnings 350 \"./src/v0.8/**/*.sol\""
+    "solhint": "solhint --max-warnings 371 \"./src/v0.8/**/*.sol\""
   },
   "files": [
     "src/v0.8",
@@ -72,11 +72,11 @@
     "istanbul": "^0.4.5",
     "moment": "^2.29.4",
     "prettier": "^3.0.3",
-    "prettier-plugin-solidity": "1.1.3",
+    "prettier-plugin-solidity": "1.1.4-dev",
     "rlp": "^2.2.7",
-    "solhint": "^3.6.2",
-    "solhint-plugin-chainlink-solidity": "git+https://github.com/smartcontractkit/chainlink-solhint-rules.git",
-    "solhint-plugin-prettier": "^0.0.5",
+    "solhint": "^4.0.0",
+    "solhint-plugin-chainlink-solidity": "git+https://github.com/smartcontractkit/chainlink-solhint-rules.git#v1.2.0",
+    "solhint-plugin-prettier": "^0.1.0",
     "solidity-coverage": "^0.8.5",
     "ts-node": "^10.9.1",
     "tslib": "^2.6.2",

diff --git a/contracts/pnpm-lock.yaml b/contracts/pnpm-lock.yaml
diff --git a/contracts/src/v0.8/functions/dev/v1_X/interfaces/IOwnableFunctionsRouter.sol b/contracts/src/v0.8/functions/dev/v1_X/interfaces/IOwnableFunctionsRouter.sol
@@ -5,6 +5,4 @@ import {IFunctionsRouter} from "./IFunctionsRouter.sol";
 import {IOwnable} from "../../../../shared/interfaces/IOwnable.sol";
 
 /// @title Chainlink Functions Router interface with Ownability.
-interface IOwnableFunctionsRouter is IOwnable, IFunctionsRouter {
-
-}
+interface IOwnableFunctionsRouter is IOwnable, IFunctionsRouter {}
diff --git a/contracts/src/v0.8/functions/tests/v1_X/FunctionsRequest.t.sol b/contracts/src/v0.8/functions/tests/v1_X/FunctionsRequest.t.sol
@@ -30,31 +30,19 @@ contract FunctionsRequest_EncodeCBOR is Test {
 }
 
 /// @notice #initializeRequest
-contract FunctionsRequest_InitializeRequest is Test {
-
-}
+contract FunctionsRequest_InitializeRequest is Test {}
 
 /// @notice #initializeRequestForInlineJavaScript
-contract FunctionsRequest_InitializeRequestForInlineJavaScript is Test {
-
-}
+contract FunctionsRequest_InitializeRequestForInlineJavaScript is Test {}
 
 /// @notice #addSecretsReference
-contract FunctionsRequest_AddSecretsReference is Test {
-
-}
+contract FunctionsRequest_AddSecretsReference is Test {}
 
 /// @notice #addDONHostedSecrets
-contract FunctionsRequest_AddDONHostedSecrets is Test {
-
-}
+contract FunctionsRequest_AddDONHostedSecrets is Test {}
 
 /// @notice #setArgs
-contract FunctionsRequest_SetArgs is Test {
-
-}
+contract FunctionsRequest_SetArgs is Test {}
 
 /// @notice #setBytesArgs
-contract FunctionsRequest_SetBytesArgs is Test {
-
-}
+contract FunctionsRequest_SetBytesArgs is Test {}