Merge branch 'develop' of github.com:smartcontractkit/chainlink into …

…rsch.crib-refactor

.changeset/brown-penguins-grin.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Fix in memory data source cache changes/bug that only allowed pipeline results where none of the data sources failed. #bugfix

.changeset/chilled-bikes-unite.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+#internal Add script to create test database user and update docs

.changeset/four-shoes-trade.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Removed AppConfig from Evm config #internal

.changeset/kind-deers-leave.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+bump mockery in makefile #updated

.changeset/stale-terms-march.md

@@ -0,0 +1,7 @@
+---
+"chainlink": patch
+---
+
+Bump libocr => fd3cab206b2ca3b7ff207996b95673b2d6303ec4
+
+#internal

.github/workflows/ci-core.yml

@@ -109,6 +109,7 @@ jobs:
         if: ${{ needs.filter.outputs.changes == 'true' }}
         uses: ./.github/actions/setup-go
       - name: Run short tests
+        if: ${{ needs.filter.outputs.changes == 'true' }}
         run: go test -short ./...
       - name: Setup Solana
         if: ${{ needs.filter.outputs.changes == 'true' }}

.gitignore

@@ -23,6 +23,8 @@ tools/clroot/db.sqlite3-wal
 .DS_Store
 .envrc
 .env*
+.dbenv
+!charts/chainlink-cluster/.env.example
 !crib/.env.example
 !.github/actions/setup-postgres/.env
 .direnv

GNUmakefile

@@ -104,6 +104,10 @@ testscripts: chainlink-test ## Install and run testscript against testdata/scrip
 testscripts-update: ## Update testdata/scripts/* files via testscript.
 	make testscripts TS_FLAGS="-u"
 
+.PHONY: setup-testdb
+setup-testdb: ## Setup the test database.
+	./core/scripts/setup_testdb.sh
+
 .PHONY: testdb
 testdb: ## Prepares the test database.
 	go run . local db preparetest
@@ -125,7 +129,7 @@ gomods: ## Install gomods
 
 .PHONY: mockery
 mockery: $(mockery) ## Install mockery.
-	go install github.com/vektra/mockery/v2@v2.38.0
+	go install github.com/vektra/mockery/v2@v2.42.2
 
 .PHONY: codecgen
 codecgen: $(codecgen) ## Install codecgen

README.md

@@ -167,20 +167,28 @@ go generate ./...
 
 5. Prepare your development environment:
 
-```bash
-export CL_DATABASE_URL=postgresql://127.0.0.1:5432/chainlink_test?sslmode=disable
-```
+The tests require a postgres database. In turn, the environment variable
+`CL_DATABASE_URL` must be set to value that can connect to `_test` database, and the user must be able to create and drop
+the given `_test` database.
 
 Note: Other environment variables should not be set for all tests to pass
 
-6.  Drop/Create test database and run migrations:
+There helper script for initial setup to create an appropriate test user. It requires postgres to be running on localhost at port 5432. You will be prompted for
+the `postgres` user password 
 
+```bash
+make setup-testdb
 ```
+
+This script will save the `CL_DATABASE_URL` in `.dbenv`
+
+Changes to database require migrations to be run. Similarly, `pull`'ing the repo may require migrations to run.
+After the one-time setup above:
+```
+source .dbenv
 make testdb
 ```
 
-If you do end up modifying the migrations for the database, you will need to rerun
-
 7. Run tests:
 
 ```bash

contracts/src/v0.8/vrf/dev/VRFV2PlusWrapper.sol

@@ -35,7 +35,8 @@ contract VRFV2PlusWrapper is ConfirmedOwner, TypeAndVersionInterface, VRFConsume
   event FulfillmentTxSizeSet(uint32 size);
   event ConfigSet(
     uint32 wrapperGasOverhead,
-    uint32 coordinatorGasOverhead,
+    uint32 coordinatorGasOverheadNative,
+    uint32 coordinatorGasOverheadLink,
     uint16 coordinatorGasOverheadPerWord,
     uint8 coordinatorNativePremiumPercentage,
     uint8 coordinatorLinkPremiumPercentage,
@@ -115,11 +116,18 @@ contract VRFV2PlusWrapper is ConfirmedOwner, TypeAndVersionInterface, VRFConsume
   /// @dev total data size = 4608 bits + 32 bits = 4640 bits = 580 bytes
   uint32 public s_fulfillmentTxSizeBytes = 580;
 
-  // s_coordinatorGasOverhead reflects the gas overhead of the coordinator's fulfillRandomWords
-  // function. The cost for this gas is billed to the subscription, and must therefor be included
+  // s_coordinatorGasOverheadNative reflects the gas overhead of the coordinator's fulfillRandomWords
+  // function for native payment. The cost for this gas is billed to the subscription, and must therefor be included
   // in the pricing for wrapped requests. This includes the gas costs of proof verification and
   // payment calculation in the coordinator.
-  uint32 private s_coordinatorGasOverhead;
+  uint32 private s_coordinatorGasOverheadNative;
+
+  // s_coordinatorGasOverheadLink reflects the gas overhead of the coordinator's fulfillRandomWords
+  // function for link payment. The cost for this gas is billed to the subscription, and must therefor be included
+  // in the pricing for wrapped requests. This includes the gas costs of proof verification and
+  // payment calculation in the coordinator.
+  uint32 private s_coordinatorGasOverheadLink;
+
   uint16 private s_coordinatorGasOverheadPerWord;
 
   // s_fulfillmentFlatFeeLinkPPM is the flat fee in millionths of native that VRFCoordinatorV2
@@ -139,8 +147,6 @@ contract VRFV2PlusWrapper is ConfirmedOwner, TypeAndVersionInterface, VRFConsume
   // value of 0 indicates no premium. A value of 15 indicates a 15 percent premium.
   // Wrapper has no premium. This premium is for VRFCoordinator.
   uint8 private s_coordinatorLinkPremiumPercentage;
-
-  // 4 bytes left
   /* Storage Slot 5: END */
 
   struct Callback {
@@ -199,7 +205,13 @@ contract VRFV2PlusWrapper is ConfirmedOwner, TypeAndVersionInterface, VRFConsume
    * @param _wrapperGasOverhead reflects the gas overhead of the wrapper's fulfillRandomWords
    *        function.
    *
-   * @param _coordinatorGasOverhead reflects the gas overhead of the coordinator's
+   * @param _coordinatorGasOverheadNative reflects the gas overhead of the coordinator's
+   *        fulfillRandomWords function for native payment.
+   *
+   * @param _coordinatorGasOverheadLink reflects the gas overhead of the coordinator's
+   *        fulfillRandomWords function for link payment.
+   *
+   * @param _coordinatorGasOverheadPerWord reflects the gas overhead per word of the coordinator's
    *        fulfillRandomWords function.
    *
    * @param _coordinatorNativePremiumPercentage is the coordinator's premium ratio in percentage for requests paid in native.
@@ -222,7 +234,8 @@ contract VRFV2PlusWrapper is ConfirmedOwner, TypeAndVersionInterface, VRFConsume
    */
   function setConfig(
     uint32 _wrapperGasOverhead,
-    uint32 _coordinatorGasOverhead,
+    uint32 _coordinatorGasOverheadNative,
+    uint32 _coordinatorGasOverheadLink,
     uint16 _coordinatorGasOverheadPerWord,
     uint8 _coordinatorNativePremiumPercentage,
     uint8 _coordinatorLinkPremiumPercentage,
@@ -244,7 +257,8 @@ contract VRFV2PlusWrapper is ConfirmedOwner, TypeAndVersionInterface, VRFConsume
     }
 
     s_wrapperGasOverhead = _wrapperGasOverhead;
-    s_coordinatorGasOverhead = _coordinatorGasOverhead;
+    s_coordinatorGasOverheadNative = _coordinatorGasOverheadNative;
+    s_coordinatorGasOverheadLink = _coordinatorGasOverheadLink;
     s_coordinatorGasOverheadPerWord = _coordinatorGasOverheadPerWord;
     s_coordinatorNativePremiumPercentage = _coordinatorNativePremiumPercentage;
     s_coordinatorLinkPremiumPercentage = _coordinatorLinkPremiumPercentage;
@@ -260,7 +274,8 @@ contract VRFV2PlusWrapper is ConfirmedOwner, TypeAndVersionInterface, VRFConsume
 
     emit ConfigSet(
       _wrapperGasOverhead,
-      _coordinatorGasOverhead,
+      _coordinatorGasOverheadNative,
+      _coordinatorGasOverheadLink,
       _coordinatorGasOverheadPerWord,
       _coordinatorNativePremiumPercentage,
       _coordinatorLinkPremiumPercentage,
@@ -291,8 +306,11 @@ contract VRFV2PlusWrapper is ConfirmedOwner, TypeAndVersionInterface, VRFConsume
    * @return wrapperGasOverhead reflects the gas overhead of the wrapper's fulfillRandomWords
    *         function. The cost for this gas is passed to the user.
    *
-   * @return coordinatorGasOverhead reflects the gas overhead of the coordinator's
-   *         fulfillRandomWords function.
+   * @return coordinatorGasOverheadNative reflects the gas overhead of the coordinator's
+   *         fulfillRandomWords function for native payment.
+   *
+   * @return coordinatorGasOverheadLink reflects the gas overhead of the coordinator's
+   *         fulfillRandomWords function for link payment.
    *
    * @return coordinatorGasOverheadPerWord reflects the gas overhead per word of the coordinator's
    *         fulfillRandomWords function.
@@ -318,7 +336,8 @@ contract VRFV2PlusWrapper is ConfirmedOwner, TypeAndVersionInterface, VRFConsume
       uint32 fulfillmentFlatFeeNativePPM,
       uint32 fulfillmentFlatFeeLinkDiscountPPM,
       uint32 wrapperGasOverhead,
-      uint32 coordinatorGasOverhead,
+      uint32 coordinatorGasOverheadNative,
+      uint32 coordinatorGasOverheadLink,
       uint16 coordinatorGasOverheadPerWord,
       uint8 wrapperNativePremiumPercentage,
       uint8 wrapperLinkPremiumPercentage,
@@ -332,7 +351,8 @@ contract VRFV2PlusWrapper is ConfirmedOwner, TypeAndVersionInterface, VRFConsume
       s_fulfillmentFlatFeeNativePPM,
       s_fulfillmentFlatFeeLinkDiscountPPM,
       s_wrapperGasOverhead,
-      s_coordinatorGasOverhead,
+      s_coordinatorGasOverheadNative,
+      s_coordinatorGasOverheadLink,
       s_coordinatorGasOverheadPerWord,
       s_coordinatorNativePremiumPercentage,
       s_coordinatorLinkPremiumPercentage,
@@ -403,7 +423,7 @@ contract VRFV2PlusWrapper is ConfirmedOwner, TypeAndVersionInterface, VRFConsume
     // coordinatorCostWei takes into account the L1 posting costs of the VRF fulfillment transaction, if we are on an L2.
     // (wei/gas) * gas + l1wei
     uint256 coordinatorCostWei = _requestGasPrice *
-      (_gas + _getCoordinatorGasOverhead(_numWords)) +
+      (_gas + _getCoordinatorGasOverhead(_numWords, true)) +
       ChainSpecificUtil._getL1CalldataGasCost(s_fulfillmentTxSizeBytes);
 
     // coordinatorCostWithPremiumAndFlatFeeWei is the coordinator cost with the percentage premium and flat fee applied
@@ -427,7 +447,7 @@ contract VRFV2PlusWrapper is ConfirmedOwner, TypeAndVersionInterface, VRFConsume
     // coordinatorCostWei takes into account the L1 posting costs of the VRF fulfillment transaction, if we are on an L2.
     // (wei/gas) * gas + l1wei
     uint256 coordinatorCostWei = _requestGasPrice *
-      (_gas + _getCoordinatorGasOverhead(_numWords)) +
+      (_gas + _getCoordinatorGasOverhead(_numWords, false)) +
       ChainSpecificUtil._getL1CalldataGasCost(s_fulfillmentTxSizeBytes);
 
     // coordinatorCostWithPremiumAndFlatFeeWei is the coordinator cost with the percentage premium and flat fee applied
@@ -641,8 +661,12 @@ contract VRFV2PlusWrapper is ConfirmedOwner, TypeAndVersionInterface, VRFConsume
     return gas / 63 + 1;
   }
 
-  function _getCoordinatorGasOverhead(uint32 numWords) internal view returns (uint32) {
-    return s_coordinatorGasOverhead + numWords * s_coordinatorGasOverheadPerWord;
+  function _getCoordinatorGasOverhead(uint32 numWords, bool nativePayment) internal view returns (uint32) {
+    if (nativePayment) {
+      return s_coordinatorGasOverheadNative + numWords * s_coordinatorGasOverheadPerWord;
+    } else {
+      return s_coordinatorGasOverheadLink + numWords * s_coordinatorGasOverheadPerWord;
+    }
   }
 
   /**