Merge branch 'develop' into chore/remove-legacy-secrets-support

.github/workflows/automation-benchmark-tests.yml

@@ -6,7 +6,7 @@ on:
         description: Chainlink image version to use
         required: true
         type: string
-        default: 2.0.0
+        default: 2.5.0
       chainlinkImage:
         description: Chainlink image repo to use
         required: true

.github/workflows/automation-ondemand-tests.yml

@@ -10,6 +10,16 @@ on:
         description: Chainlink image repo to use (Leave empty to build from head/ref)
         required: false
         type: string
+      chainlinkVersionUpdate:
+        description: Chainlink image version to use initially for upgrade test
+        default: latest
+        required: true
+        type: string
+      chainlinkImageUpdate:
+        description: Chainlink image repo to use initially for upgrade test
+        required: true
+        default: public.ecr.aws/chainlink/chainlink
+        type: string
 
 env:
   ENV_JOB_IMAGE: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink-tests:${{ github.sha }}
@@ -156,8 +166,8 @@ jobs:
             echo "upgrade_version=${{ inputs.chainlinkVersion }}" >>$GITHUB_OUTPUT
           fi
           if [[ "${{ matrix.tests.name }}" == "upgrade" ]]; then
-            echo "image=${{ env.CHAINLINK_IMAGE }}" >>$GITHUB_OUTPUT
-            echo "version=develop" >>$GITHUB_OUTPUT
+            echo "image=${{ inputs.chainlinkImageUpdate }}" >>$GITHUB_OUTPUT
+            echo "version=${{ inputs.chainlinkVersionUpdate }}" >>$GITHUB_OUTPUT
           fi
       - name: Run Tests
         uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@eccde1970eca69f079d3efb3409938a72ade8497 # v2.2.13
@@ -174,6 +184,7 @@ jobs:
           test_download_vendor_packages_command: cd ./integration-tests && go mod download
           cl_repo: ${{ steps.determine-build.outputs.image }}
           cl_image_tag: ${{ steps.determine-build.outputs.version }}
+          aws_registries: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
           artifacts_location: ./integration-tests/${{ matrix.tests.suite }}/logs
           publish_check_name: Automation On Demand Results ${{ matrix.tests.name }}
           token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ci-core.yml

@@ -107,7 +107,7 @@ jobs:
           output-file: ./output-short.txt
       - name: Print Races
         if: ${{ failure() && matrix.cmd == 'go_core_race_tests' }}
-        run: find *.race | xargs cat
+        run: find race.* | xargs cat
       - name: Store logs artifacts
         if: always()
         uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0

.github/workflows/integration-tests.yml

@@ -449,8 +449,8 @@ jobs:
       CHAINLINK_COMMIT_SHA: ${{ github.sha }}
       CHAINLINK_ENV_USER: ${{ github.actor }}
       CHAINLINK_IMAGE: public.ecr.aws/chainlink/chainlink
-      TEST_UPGRADE_VERSION: ${{ github.sha }}
-      TEST_UPGRADE_IMAGE: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink
+      UPGRADE_VERSION: ${{ github.sha }}
+      UPGRADE_IMAGE: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink
       TEST_LOG_LEVEL: debug
       TEST_SUITE: migration
     steps:

.github/workflows/solidity.yml

@@ -106,6 +106,8 @@ jobs:
         uses: ./.github/actions/setup-nodejs
       - name: Run pnpm lint
         run: pnpm lint
+      - name: Run solhint
+        run: pnpm solhint
       - name: Collect Metrics
         id: collect-gha-metrics
         uses: smartcontractkit/push-gha-metrics-action@d2c2b7bdc9012651230b2608a1bcb0c48538b6ec

CODEOWNERS

@@ -1,5 +1,5 @@
 # CODEOWNERS Best Practices
-# 1. Per Github docs: "Order is important; the last matching pattern takes the most precedence." 
+# 1. Per Github docs: "Order is important; the last matching pattern takes the most precedence."
 # Please define less specific codeowner paths before more specific codeowner paths in order for the more specific rule to have priority
 
 # Misc
@@ -37,6 +37,10 @@
 # VRF-related services
 /core/services/vrf @smartcontractkit/vrf-team
 /core/services/blockhashstore @smartcontractkit/vrf-team
+/core/services/blockheaderfeeder @smartcontractkit/vrf-team
+/core/services/pipeline/task.vrf.go @smartcontractkit/vrf-team
+/core/services/pipeline/task.vrfv2.go @smartcontractkit/vrf-team
+/core/services/pipeline/task.vrfv2plus.go @smartcontractkit/vrf-team
 /core/services/ocr2/plugins/dkg @smartcontractkit/vrf-team
 /core/services/ocr2/plugins/ocr2vrf @smartcontractkit/vrf-team
 
@@ -67,13 +71,17 @@ core/scripts/gateway @bolekk @pinebit
 /operator-ui/ @DeividasK @jkongie
 
 # Contracts
-/contracts/ @se3000 @connorwstein
+/contracts/ @se3000 @connorwstein @RensR
 /contracts/**/*Keeper* @smartcontractkit/keepers
 /contracts/**/*Upkeep* @smartcontractkit/keepers
 /contracts/**/*Functions* @smartcontractkit/functions
 /contracts/src/v0.8/functions @smartcontractkit/functions
-contracts/test/v0.8/functions @smartcontractkit/functions
+/contracts/test/v0.8/functions @smartcontractkit/functions
 /contracts/src/v0.8/llo-feeds @austinborn @Fletch153
+/contracts/src/v0.8/vrf @smartcontractkit/vrf-team
+/contracts/src/v0.8/dev/vrf @smartcontractkit/vrf-team
+/contracts/src/v0.8/dev/BlockhashStore.sol @smartcontractkit/vrf-team
+/contracts/src/v0.8/dev/VRFConsumerBaseV2Upgradeable.sol @smartcontractkit/vrf-team
 
 # Tests
 /integration-tests/ @smartcontractkit/test-tooling-team
@@ -86,6 +94,8 @@ contracts/test/v0.8/functions @smartcontractkit/functions
 /.github/workflows/integration-chaos-tests.yml @smartcontractkit/test-tooling-team
 /.github/workflows/integration-tests-publish.yml @smartcontractkit/test-tooling-team
 /.github/workflows/performance-tests.yml @smartcontractkit/test-tooling-team
+/.github/workflows/automation-ondemand-tests.yml @smartcontractkit/keepers
+/.github/workflows/automation-benchmark-tests.yml @smartcontractkit/keepers
 
 /core/chainlink.Dockerfile @smartcontractkit/prodsec-public
 

contracts/.solhint.json

@@ -1,7 +1,42 @@
 {
 	"extends": "solhint:recommended",
-	"plugins": ["prettier"],
+	"plugins": ["prettier", "chainlink-solidity"],
 	"rules": {
-	  "prettier/prettier": "error"
+		"compiler-version": ["off", "^0.8.0"],
+		"const-name-snakecase": "off",
+		"constructor-syntax": "error",
+		"var-name-mixedcase": "off",
+		"func-named-parameters": "off",
+		"immutable-vars-naming": "off",
+		"no-inline-assembly": "off",
+		"no-unused-import": "error",
+		"func-visibility": [
+			"error",
+			{
+				"ignoreConstructors": true
+			}
+		],
+		"not-rely-on-time": "off",
+		"prettier/prettier": [
+			"off",
+			{
+				"endOfLine": "auto"
+			}
+		],
+		"no-empty-blocks": "off",
+		"quotes": ["error", "double"],
+		"reason-string": [
+			"warn",
+			{
+				"maxLength": 64
+			}
+		],
+		"chainlink-solidity/prefix-internal-functions-with-underscore": "warn",
+		"chainlink-solidity/prefix-private-functions-with-underscore": "warn",
+		"chainlink-solidity/prefix-storage-variables-with-s-underscore": "warn",
+		"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"
 	}
 }

contracts/.solhintignore

@@ -1 +1,32 @@
-node_modules/
+# 368 warnings
+#./src/v0.8/automation
+# 302 warnings
+#./src/v0.8/dev
+# 91 warnings
+#./src/v0.8/functions
+# 91 warnings
+#./src/v0.8/l2ep/dev
+# 116 warnings
+#./src/v0.8/vrf
+
+# Temp ignore the following files as they contain issues.
+./src/v0.8/ChainlinkClient.sol
+./src/v0.8/Flags.sol
+./src/v0.8/KeepersVRFConsumer.sol
+./src/v0.8/PermissionedForwardProxy.sol
+./src/v0.8/ValidatorProxy.sol
+./src/v0.8/Chainlink.sol
+./src/v0.8/ChainSpecificUtil.sol
+
+
+# Ignore tests, this should not be the long term plan but is OK in the short term
+./src/v0.8/**/*.t.sol
+./src/v0.8/mocks
+./src/v0.8/tests
+./src/v0.8/llo-feeds/test
+./src/v0.8/vrf/testhelpers
+./src/v0.8/functions/tests
+
+# Always ignore vendor
+./src/v0.8/vendor
+./node_modules/

contracts/package.json

@@ -17,7 +17,8 @@
     "coverage": "hardhat coverage",
     "prepublishOnly": "pnpm compile && ./scripts/prepublish_generate_abi_folder",
     "publish-beta": "pnpm publish --tag beta",
-    "publish-prod": "npm dist-tag add @chainlink/[email protected] latest"
+    "publish-prod": "npm dist-tag add @chainlink/[email protected] latest",
+    "solhint": "solhint --max-warnings 593 \"./src/v0.8/**/*.sol\""
   },
   "files": [
     "src/",
@@ -73,6 +74,7 @@
     "prettier-plugin-solidity": "1.1.3",
     "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",
     "solidity-coverage": "^0.8.4",
     "ts-node": "^10.9.1",

contracts/scripts/native_solc_compile_all_vrf

@@ -54,6 +54,7 @@ compileContract vrf/testhelpers/VRFCoordinatorV2TestHelper.sol
 compileContractAltOpts vrf/VRFCoordinatorV2.sol 10000
 compileContract mocks/VRFCoordinatorV2Mock.sol
 compileContract vrf/VRFOwner.sol
+compileContract dev/VRFSubscriptionBalanceMonitor.sol
 
 # VRF V2Plus
 compileContract dev/interfaces/IVRFCoordinatorV2PlusInternal.sol

contracts/src/v0.8/automation/KeeperBase.sol

@@ -3,4 +3,5 @@
  * @notice This is a deprecated interface. Please use AutomationBase directly.
  */
 pragma solidity ^0.8.0;
+// solhint-disable-next-line no-unused-import
 import {AutomationBase as KeeperBase} from "./AutomationBase.sol";

contracts/src/v0.8/automation/KeeperCompatible.sol

@@ -3,6 +3,9 @@
  * @notice This is a deprecated interface. Please use AutomationCompatible directly.
  */
 pragma solidity ^0.8.0;
+// solhint-disable-next-line no-unused-import
 import {AutomationCompatible as KeeperCompatible} from "./AutomationCompatible.sol";
+// solhint-disable-next-line no-unused-import
 import {AutomationBase as KeeperBase} from "./AutomationBase.sol";
+// solhint-disable-next-line no-unused-import
 import {AutomationCompatibleInterface as KeeperCompatibleInterface} from "./interfaces/AutomationCompatibleInterface.sol";

contracts/src/v0.8/automation/interfaces/KeeperCompatibleInterface.sol

@@ -3,4 +3,5 @@
  * @notice This is a deprecated interface. Please use AutomationCompatibleInterface directly.
  */
 pragma solidity ^0.8.0;
+// solhint-disable-next-line no-unused-import
 import {AutomationCompatibleInterface as KeeperCompatibleInterface} from "./AutomationCompatibleInterface.sol";

contracts/src/v0.8/automation/interfaces/v1_2/KeeperRegistryInterface1_2.sol

@@ -3,7 +3,11 @@
  * @notice This is a deprecated interface. Please use AutomationRegistryInterface1_2 directly.
  */
 pragma solidity ^0.8.0;
+// solhint-disable-next-line no-unused-import
 import {Config, State} from "./AutomationRegistryInterface1_2.sol";
+// solhint-disable-next-line no-unused-import
 import {AutomationRegistryBaseInterface as KeeperRegistryBaseInterface} from "./AutomationRegistryInterface1_2.sol";
+// solhint-disable-next-line no-unused-import
 import {AutomationRegistryInterface as KeeperRegistryInterface} from "./AutomationRegistryInterface1_2.sol";
+// solhint-disable-next-line no-unused-import
 import {AutomationRegistryExecutableInterface as KeeperRegistryExecutableInterface} from "./AutomationRegistryInterface1_2.sol";

contracts/src/v0.8/automation/v1_3/KeeperRegistry1_3.sol

@@ -6,7 +6,7 @@ import "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 import "@openzeppelin/contracts/utils/Address.sol";
 import "./KeeperRegistryBase1_3.sol";
 import "./KeeperRegistryLogic1_3.sol";
-import {AutomationRegistryExecutableInterface} from "../interfaces/v1_3/AutomationRegistryInterface1_3.sol";
+import {AutomationRegistryExecutableInterface, State} from "../interfaces/v1_3/AutomationRegistryInterface1_3.sol";
 import "../interfaces/MigratableKeeperRegistryInterface.sol";
 import "../../interfaces/TypeAndVersionInterface.sol";
 import "../../shared/interfaces/IERC677Receiver.sol";

contracts/src/v0.8/automation/v1_3/KeeperRegistryBase1_3.sol

@@ -6,7 +6,7 @@ import "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 import "../../vendor/@arbitrum/nitro-contracts/src/precompiles/ArbGasInfo.sol";
 import "../../vendor/@eth-optimism/contracts/v0.8.6/contracts/L2/predeploys/OVM_GasPriceOracle.sol";
 import "../ExecutionPrevention.sol";
-import {Config, State, Upkeep} from "../interfaces/v1_3/AutomationRegistryInterface1_3.sol";
+import {Config, Upkeep} from "../interfaces/v1_3/AutomationRegistryInterface1_3.sol";
 import "../../shared/access/ConfirmedOwner.sol";
 import "../../interfaces/AggregatorV3Interface.sol";
 import "../../shared/interfaces/LinkTokenInterface.sol";

contracts/src/v0.8/automation/v2_0/KeeperRegistry2_0.sol

@@ -5,7 +5,7 @@ import "../../vendor/openzeppelin-solidity/v4.7.3/contracts/proxy/Proxy.sol";
 import "../../vendor/openzeppelin-solidity/v4.7.3/contracts/utils/structs/EnumerableSet.sol";
 import "../../vendor/openzeppelin-solidity/v4.7.3/contracts/utils/Address.sol";
 import "./KeeperRegistryBase2_0.sol";
-import {AutomationRegistryExecutableInterface, UpkeepInfo} from "../interfaces/v2_0/AutomationRegistryInterface2_0.sol";
+import {AutomationRegistryExecutableInterface, UpkeepInfo, State, OnchainConfig, UpkeepFailureReason} from "../interfaces/v2_0/AutomationRegistryInterface2_0.sol";
 import "../interfaces/MigratableKeeperRegistryInterface.sol";
 import "../interfaces/MigratableKeeperRegistryInterfaceV2.sol";
 import "../../shared/interfaces/IERC677Receiver.sol";

contracts/src/v0.8/automation/v2_0/KeeperRegistryBase2_0.sol

@@ -6,7 +6,6 @@ import "../../vendor/@arbitrum/nitro-contracts/src/precompiles/ArbGasInfo.sol";
 import "../../vendor/@eth-optimism/contracts/v0.8.6/contracts/L2/predeploys/OVM_GasPriceOracle.sol";
 import {ArbSys} from "../../vendor/@arbitrum/nitro-contracts/src/precompiles/ArbSys.sol";
 import "../ExecutionPrevention.sol";
-import {OnchainConfig, State, UpkeepFailureReason} from "../interfaces/v2_0/AutomationRegistryInterface2_0.sol";
 import "../../shared/access/ConfirmedOwner.sol";
 import "../../interfaces/AggregatorV3Interface.sol";
 import "../../shared/interfaces/LinkTokenInterface.sol";

contracts/src/v0.8/automation/v2_0/KeeperRegistryLogic2_0.sol

@@ -4,6 +4,7 @@ pragma solidity 0.8.6;
 import "../../vendor/openzeppelin-solidity/v4.7.3/contracts/utils/structs/EnumerableSet.sol";
 import "../../vendor/openzeppelin-solidity/v4.7.3/contracts/utils/Address.sol";
 import "./KeeperRegistryBase2_0.sol";
+import {UpkeepFailureReason} from "../interfaces/v2_0/AutomationRegistryInterface2_0.sol";
 import "../interfaces/MigratableKeeperRegistryInterfaceV2.sol";
 import "../interfaces/UpkeepTranscoderInterfaceV2.sol";
 

contracts/src/v0.8/automation/v2_1/AutomationUtils2_1.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.8.16;
 
 import {KeeperRegistryBase2_1} from "./KeeperRegistryBase2_1.sol";
-import {ILogAutomation, Log} from "../interfaces/ILogAutomation.sol";
+import {Log} from "../interfaces/ILogAutomation.sol";
 
 /**
  * @notice this file exposes structs that are otherwise internal to the automation registry

contracts/src/v0.8/automation/v2_1/KeeperRegistry2_1.sol

@@ -3,7 +3,6 @@ pragma solidity 0.8.16;
 
 import {EnumerableSet} from "../../vendor/openzeppelin-solidity/v4.7.3/contracts/utils/structs/EnumerableSet.sol";
 import {Address} from "../../vendor/openzeppelin-solidity/v4.7.3/contracts/utils/Address.sol";
-import {Proxy} from "../../vendor/openzeppelin-solidity/v4.7.3/contracts/proxy/Proxy.sol";
 import {KeeperRegistryBase2_1} from "./KeeperRegistryBase2_1.sol";
 import {KeeperRegistryLogicB2_1} from "./KeeperRegistryLogicB2_1.sol";
 import {Chainable} from "../Chainable.sol";

contracts/src/v0.8/automation/v2_1/KeeperRegistryBase2_1.sol

@@ -14,7 +14,7 @@ import {ConfirmedOwner} from "../../shared/access/ConfirmedOwner.sol";
 import {AggregatorV3Interface} from "../../interfaces/AggregatorV3Interface.sol";
 import {LinkTokenInterface} from "../../shared/interfaces/LinkTokenInterface.sol";
 import {KeeperCompatibleInterface} from "../interfaces/KeeperCompatibleInterface.sol";
-import {UpkeepTranscoderInterface, UpkeepFormat} from "../interfaces/UpkeepTranscoderInterface.sol";
+import {UpkeepFormat} from "../interfaces/UpkeepTranscoderInterface.sol";
 
 /**
  * @notice Base Keeper Registry contract, contains shared logic between

contracts/src/v0.8/automation/v2_1/UpkeepTranscoder4_0.sol

@@ -6,7 +6,6 @@ import {UpkeepTranscoderInterfaceV2} from "../interfaces/UpkeepTranscoderInterfa
 import {TypeAndVersionInterface} from "../../interfaces/TypeAndVersionInterface.sol";
 import {KeeperRegistryBase2_1 as R21} from "./KeeperRegistryBase2_1.sol";
 import {IAutomationForwarder} from "../interfaces/IAutomationForwarder.sol";
-import {AutomationRegistryBaseInterface, UpkeepInfo} from "../interfaces/v2_0/AutomationRegistryInterface2_0.sol";
 
 enum RegistryVersion {
   V12,

contracts/src/v0.8/dev/BlockhashStore.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.6;
 
-import "../ChainSpecificUtil.sol";
+import {ChainSpecificUtil} from "../ChainSpecificUtil.sol";
 
 /**
  * @title BlockhashStore
@@ -14,14 +14,15 @@ import "../ChainSpecificUtil.sol";
  *   would have to be deployed.
  */
 contract BlockhashStore {
-  mapping(uint => bytes32) internal s_blockhashes;
+  mapping(uint256 => bytes32) internal s_blockhashes;
 
   /**
    * @notice stores blockhash of a given block, assuming it is available through BLOCKHASH
    * @param n the number of the block whose blockhash should be stored
    */
   function store(uint256 n) public {
     bytes32 h = ChainSpecificUtil.getBlockhash(uint64(n));
+    // solhint-disable-next-line custom-errors
     require(h != 0x0, "blockhash(n) failed");
     s_blockhashes[n] = h;
   }
@@ -40,6 +41,7 @@ contract BlockhashStore {
    *   that it hashes to a stored blockhash, and then extract parentHash to get the n-th blockhash.
    */
   function storeVerifyHeader(uint256 n, bytes memory header) public {
+    // solhint-disable-next-line custom-errors
     require(keccak256(header) == s_blockhashes[n + 1], "header has unknown blockhash");
 
     // At this point, we know that header is the correct blockheader for block n+1.
@@ -72,6 +74,7 @@ contract BlockhashStore {
    */
   function getBlockhash(uint256 n) external view returns (bytes32) {
     bytes32 h = s_blockhashes[n];
+    // solhint-disable-next-line custom-errors
     require(h != 0x0, "blockhash not found in store");
     return h;
   }