Merge branch 'develop' into tt_1151_add_besu_back

.changeset/big-windows-lie.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+improve handling of postgres connection settings and driver versions #db

.changeset/eighty-hotels-sit.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Fix panic if mercury server returns error #bugfix

.changeset/funny-monkeys-heal.md

@@ -0,0 +1,6 @@
+---
+"chainlink": patch
+---
+
+#changed:
+AUTO-10539: adjust logging for offchain config and gas control

.changeset/hungry-apes-hope.md

@@ -0,0 +1,6 @@
+---
+"chainlink": patch
+---
+
+#bugfix
+fix an automation smoke test flake

.changeset/nine-plants-crash.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal improve mercury tranmission debugging

.changeset/silver-birds-wave.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+bumpThreshold config setting for chains using suggestPrice estimator #updated

.changeset/sweet-avocados-do.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal Use Aggregator factory for OCR capability

.changeset/twelve-wolves-clean.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Performance improvements for mercury single insert for multiple mercury servers #internal

.golangci.yml

@@ -89,6 +89,10 @@ linters-settings:
             desc: Use the standard library instead
           - pkg: github.com/gofrs/uuid
             desc: Use github.com/google/uuid instead
+          - pkg: github.com/jackc/pgx3
+            desc: Use github.com/jackc/pgx4 instead
+          - pkg: github.com/jackc/pgx5
+            desc: Use github.com/jackc/pgx4 instead
           - pkg: github.com/satori/go.uuid
             desc: Use github.com/google/uuid instead
           - pkg: github.com/test-go/testify/assert

CHANGELOG.md

@@ -189,7 +189,7 @@
   You may disable if this results in excessive log volume. Disable like so:
 
   ```
-  [Pipeline]
+  [JobPipeline]
   VerboseLogging = false
   ```
 
@@ -219,7 +219,7 @@
 
 - [#12404](https://github.com/smartcontractkit/chainlink/pull/12404) [`b74079b672`](https://github.com/smartcontractkit/chainlink/commit/b74079b672f36fb0c241f90ea1e875ea3a9524da) Thanks [@HenryNguyen5](https://github.com/HenryNguyen5)! - Add OCR3 capability contract wrapper
 
-- [#12498](https://github.com/smartcontractkit/chainlink/pull/12498) [`1c576d0e34`](https://github.com/smartcontractkit/chainlink/commit/1c576d0e34d93a6298ddcb662ee89fd04eeda53e) Thanks [@samsondav](https://github.com/samsondav)! - Add new config option Pipeline.VerboseLogging
+- [#12498](https://github.com/smartcontractkit/chainlink/pull/12498) [`1c576d0e34`](https://github.com/smartcontractkit/chainlink/commit/1c576d0e34d93a6298ddcb662ee89fd04eeda53e) Thanks [@samsondav](https://github.com/samsondav)! - Add new config option JobPipeline.VerboseLogging
 
   VerboseLogging enables detailed logging of pipeline execution steps. This is
   disabled by default because it increases log volume for pipeline runs, but can
@@ -230,7 +230,7 @@
   Set it like the following example:
 
   ```
-  [Pipeline]
+  [JobPipeline]
   VerboseLogging = true
   ```
 

contracts/.changeset/fuzzy-bags-watch.md

@@ -0,0 +1,5 @@
+---
+"@chainlink/contracts": patch
+---
+
+fix solhint issues

contracts/.solhintignore

@@ -21,6 +21,8 @@
 ./src/v0.8/automation/libraries/internal/Cron.sol
 ./src/v0.8/automation/AutomationForwarder.sol
 ./src/v0.8/automation/AutomationForwarderLogic.sol
+./src/v0.8/automation/interfaces/v2_2/IAutomationRegistryMaster.sol
+./src/v0.8/automation/dev/interfaces/v2_3/IAutomationRegistryMaster2_3.sol
 
 
 # Ignore tests / test helpers (for now)

contracts/package.json

@@ -18,7 +18,7 @@
     "prepublishOnly": "pnpm compile && ./scripts/prepublish_generate_abi_folder",
     "publish-beta": "pnpm publish --tag beta",
     "publish-prod": "pnpm publish --tag latest",
-    "solhint": "solhint --max-warnings 69 \"./src/v0.8/**/*.sol\""
+    "solhint": "solhint --max-warnings 0 \"./src/v0.8/**/*.sol\""
   },
   "files": [
     "src/v0.8",
@@ -48,7 +48,7 @@
     "@types/debug": "^4.1.12",
     "@types/deep-equal-in-any-order": "^1.0.3",
     "@types/mocha": "^10.0.6",
-    "@types/node": "^20.12.10",
+    "@types/node": "^20.12.11",
     "@typescript-eslint/eslint-plugin": "^6.21.0",
     "@typescript-eslint/parser": "^6.21.0",
     "abi-to-sol": "^0.6.6",
@@ -66,7 +66,7 @@
     "moment": "^2.30.1",
     "prettier": "^3.2.5",
     "prettier-plugin-solidity": "^1.3.1",
-    "solhint": "^4.5.4",
+    "solhint": "^5.0.1",
     "solhint-plugin-chainlink-solidity": "git+https://github.com/smartcontractkit/chainlink-solhint-rules.git#v1.2.1",
     "solhint-plugin-prettier": "^0.1.0",
     "ts-node": "^10.9.2",
@@ -80,6 +80,6 @@
     "@openzeppelin/contracts": "4.9.3",
     "@openzeppelin/contracts-upgradeable": "4.9.3",
     "@scroll-tech/contracts": "0.1.0",
-    "semver": "^7.6.1"
+    "semver": "^7.6.2"
   }
 }