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

…flakeguardAnalysis

.changeset/beige-geckos-explode.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+#updated Gracefully fail if CL_DATABASE_URL is not set.

.changeset/eighty-geckos-switch.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Reduce PriceMin on Avalanche to 1 gwei #nops

.changeset/large-fishes-enjoy.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+Fix logic for mapping affected files in CI that affects golangci-lint execution

.changeset/mean-ravens-stare.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal add versioned geth wrappers for keystone prod contracts

.changeset/metal-houses-approve.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+Added TxExpirationRebroadcast feature and config for Solana TXM. #added

.changeset/wild-cats-think.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+Added the `EVM.Transactions.Enabled` config to enable or disable the transaction manager. #added

.github/scripts/map-affected-files-to-modules.sh

@@ -21,25 +21,35 @@ echo "Found modules: $modules"
 declare -A unique_modules
 
 for path_to_file in $changed_files; do
-	echo "Resolving a module affected by a file: '$path_to_file'"
+  echo "Resolving a module affected by a file: '$path_to_file'"
+  # the flag that indicates if the path matches any module
+  is_path_in_modules=false
   for module in $modules; do
     echo "Validating against module: '$module'"
-
-    # if no slash in the path, it is the root 
-    # (i.e. `main.go`, `.gitignore` vs `core/main.go`)
-    if [[ ! $path_to_file =~ \/ ]]; then
-      echo "File '$path_to_file' mapped to the "root" module."
-      unique_modules["."]="."
-      break
     # if a module's name matches with a file path 
     # add it, to the affected modules array, skipping the root (`.`) 
-    elif [[ $module != "." && $path_to_file =~ ^$module* ]]; then
-      echo "File '$path_to_file' mapped the module '$module'"
+    if [[ $module != "." && $path_to_file =~ ^$module* ]]; then
+      echo -e "File '$path_to_file' mapped to the module '$module'\n"
       unique_modules["$module"]="$module"
+      is_path_in_modules=true
       break
     fi
-	done
-done
+  done
+  # if no matched module default to root module
+  if [[ $is_path_in_modules == false ]]; then
+    echo "File '$path_to_file' did not match any module, defaulting to root '.'"
+    unique_modules["."]="."
+    is_path_in_modules=false
+  fi
+  is_path_in_modules=false
+done 
+
+# if the path is empty (for any reason), it will not get to the loop,
+# so if the unique_modules array is empty, default to the root module
+if [[ ${#unique_modules[@]} -eq 0 ]]; then
+  echo "No files were changed, defaulting to the root module '.'"
+  unique_modules["."]="."
+fi
 
 # Convert keys (module names) of the associative array to an indexed array
 affected_modules=("${!unique_modules[@]}")

.github/workflows/crib-integration-test.yml

@@ -76,7 +76,7 @@ jobs:
           echo $GITHUB_WORKSPACE
 
       - name: Deploy and validate CRIB Environment for Core
-        uses: smartcontractkit/.github/actions/crib-deploy-environment@57f99fbea73056c490c766d50ef582a13ec4f3bb # crib-deploy-environment@7.2.0
+        uses: smartcontractkit/.github/actions/crib-deploy-environment@815e0d550527897746e889441407926d7e28169c # crib-deploy-environment@7.4.0
         id: deploy-crib
         with:
           github-token: ${{ steps.token.outputs.access-token }}

.golangci.yml

@@ -1,5 +1,5 @@
 run:
-  timeout: 15m0s
+  timeout: 15m
   allow-parallel-runners: true
 linters:
   enable:
@@ -97,7 +97,7 @@ linters-settings:
       - name: waitgroup-by-value
       - name: unconditional-recursion
       - name: struct-tag
-      # - name: string-format
+      - name: string-format
       - name: string-of-int
       - name: range-val-address
       - name: range-val-in-closure

ccip/config/evm/Avalanche_Fuji.toml

@@ -10,9 +10,8 @@ RPCBlockQueryDelay = 2
 NoNewFinalizedHeadsThreshold = '1m'
 
 [GasEstimator]
-PriceDefault = '25 gwei'
-PriceMax = '115792089237316195423570985008687907853269984665.640564039457584007913129639935 tether'
-PriceMin = '25 gwei'
+PriceMin = '1 gwei'
+PriceDefault = '1 gwei'
 
 [GasEstimator.BlockHistory]
 BlockHistorySize = 24

ccip/config/evm/Avalanche_Mainnet.toml

@@ -10,9 +10,8 @@ RPCBlockQueryDelay = 2
 NoNewFinalizedHeadsThreshold = '1m'
 
 [GasEstimator]
-PriceDefault = '25 gwei'
-PriceMax = '115792089237316195423570985008687907853269984665.640564039457584007913129639935 tether'
-PriceMin = '25 gwei'
+PriceMin = '1 gwei'
+PriceDefault = '1 gwei'
 
 [GasEstimator.BlockHistory]
 # Average block time of 2s

common/client/transaction_sender_test.go

@@ -258,7 +258,6 @@ func TestTransactionSender_SendTransaction(t *testing.T) {
 		_, txSender = newTestTransactionSender(t, chainID, logger.Test(t),
 			[]Node[types.ID, TestSendTxRPCClient]{fastNode, slowNode},
 			[]SendOnlyNode[types.ID, TestSendTxRPCClient]{slowSendOnly})
-
 	})
 	t.Run("Returns error if there is no healthy primary nodes", func(t *testing.T) {
 		chainID := types.RandomID()

contracts/.changeset/new-elephants-behave.md

@@ -0,0 +1,5 @@
+---
+'@chainlink/contracts': patch
+---
+
+fix test naming

contracts/.changeset/tame-cycles-ring.md

@@ -0,0 +1,10 @@
+---
+'@chainlink/contracts': patch
+---
+
+enable via-ir in CCIP compilation
+
+
+PR issue: CCIP-4656
+
+Solidity Review issue: CCIP-3966

contracts/.changeset/violet-lamps-pump.md

@@ -0,0 +1,10 @@
+---
+'@chainlink/contracts': patch
+---
+
+Create a new version of the ERC165Checker library which checks for sufficient gas before making an external call to prevent message delivery issues. #bugfix
+
+
+PR issue: CCIP-4659
+
+Solidity Review issue: CCIP-3966

contracts/foundry.toml

@@ -22,12 +22,23 @@ multiline_func_header = "params_first"
 sort_imports = true
 single_line_statement_blocks = "preserve"
 
+# This profile should be used for testing CCIP locally and in CI.
 [profile.ccip]
-solc_version = '0.8.24'
+solc_version = '0.8.26'
 src = 'src/v0.8/ccip'
 test = 'src/v0.8/ccip/test'
+evm_version = 'paris'
 optimizer_runs = 500
+
+# This profile should be used prior to any release to ensure the tests are passing with via-ir enabled. Enabling via-ir
+# locally or in CI will slow down the compilation process, so it is not recommended to use it for everyday development.
+[profile.ccip-viair]
+solc_version = '0.8.26'
+src = 'src/v0.8/ccip'
+test = 'src/v0.8/ccip/test'
 evm_version = 'paris'
+optimizer_runs = 800
+via_ir = true
 
 [profile.functions]
 solc_version = '0.8.19'