Merge branch 'develop' into update/postegres-16x

.changeset/flat-guests-marry.md

@@ -0,0 +1,6 @@
+---
+"chainlink": minor
+---
+
+#internal Gas Estimator L1Oracles to be chain specific
+#removed cmd/arbgas

.changeset/gold-bottles-tell.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+#added : Re-enable abandoned transaction tracker

.changeset/great-rockets-obey.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#wip Keystone wrapper regenerate

.changeset/new-forks-grab.md

@@ -0,0 +1,5 @@
+---
+"chainlink": removed
+---
+
+Drop unused queryTimeout config from TXM strategy #internal

.changeset/pretty-flies-fold.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+cor/services/relay/evm/mercury: switch to sqlutil.DataStore #internal

.changeset/real-numbers-taste.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+core/services/functions: switch to sqlutil.DataStore #internal

.changeset/soft-hotels-decide.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+switch more EVM components to use sqlutil.DataStore #internal

.changeset/weak-emus-reply.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+#internal Updated FindTxesWithAttemptsAndReceiptsByIdsAndState method signature to accept int64 for tx ID instead of big.Int

.github/workflows/changeset.yml

@@ -10,17 +10,17 @@ jobs:
   changeset:
     env:
       TAGS: |
-        #nops : For any feature that is NOP facing and needs to be in the official Release Notes for the release.
-        #added : For any new functionality added.
-        #changed : For any change to the existing functionality. 
-        #removed : For any functionality/config that is removed.
-        #updated : For any functionality that is updated.
-        #deprecation_notice : For any upcoming deprecation functionality.
-        #breaking_change : For any functionality that requires manual action for the node to boot.
-        #db_update : For any feature that introduces updates to database schema.
-        #wip : For any change that is not ready yet and external communication about it should be held off till it is feature complete.
-        #bugfix - For bug fixes.
-        #internal - For changesets that need to be excluded from the final changelog.
+        - `#added` For any new functionality added.
+        - `#breaking_change` For any functionality that requires manual action for the node to boot.
+        - `#bugfix` For bug fixes.
+        - `#changed` For any change to the existing functionality. 
+        - `#db_update` For any feature that introduces updates to database schema.
+        - `#deprecation_notice` For any upcoming deprecation functionality.
+        - `#internal` For changesets that need to be excluded from the final changelog.
+        - `#nops` For any feature that is NOP facing and needs to be in the official Release Notes for the release.
+        - `#removed` For any functionality/config that is removed.
+        - `#updated` For any functionality that is updated.
+        - `#wip` For any change that is not ready yet and external communication about it should be held off till it is feature complete.
 
     # For security reasons, GITHUB_TOKEN is read-only on forks, so we cannot leave comments on PRs.
     # This check skips the job if it is detected we are running on a fork.
@@ -66,9 +66,7 @@ jobs:
         with:
           message: |
             I see you updated files related to `core`. Please run `pnpm changeset` in the root directory to add a changeset as well as in the text include at least one of the following tags:
-            ```
             ${{ env.TAGS }}
-            ```
           reactions: eyes
           comment_tag: changeset-core
 
@@ -111,9 +109,7 @@ jobs:
         with:
           message: |
             I see you added a changeset file but it does not contain a tag. Please edit the text include at least one of the following tags:
-            ```
             ${{ env.TAGS }}
-            ```
           reactions: eyes
           comment_tag: changeset-core-tags
 

.github/workflows/goreleaser-build-publish-develop.yml

@@ -26,7 +26,7 @@ jobs:
           role-duration-seconds: ${{ secrets.AWS_ROLE_DURATION_SECONDS }}
           aws-region: ${{ secrets.AWS_REGION }}
           mask-aws-account-id: true
-          role-session-name: goreleaser-build-publish-chainlink.push-chainlink-develop-goreleaser
+          role-session-name: goreleaser-build-publish-chainlink.push-develop
       - name: Build, sign, and publish image
         id: build-sign-publish
         uses: ./.github/actions/goreleaser-build-sign-publish

.github/workflows/helm-chart-publish.yml

@@ -25,7 +25,7 @@ jobs:
 
       - name: Get Github Token
         id: get-gh-token
-        uses: smartcontractkit/chainlink-github-actions/github-app-token-issuer@5dd916d08c03cb5f9a97304f4f174820421bb946 # v2.3.11
+        uses: smartcontractkit/chainlink-github-actions/github-app-token-issuer@5874ff7211cf5a5a2670bb010fbff914eaaae138 # v2.3.12
         with:
           url: ${{ secrets.GATI_LAMBDA_FUNCTION_URL }}
 

.github/workflows/integration-tests.yml

@@ -379,6 +379,7 @@ jobs:
           cl_repo: ${{ env.CHAINLINK_IMAGE }}
           cl_image_tag: ${{ inputs.evm-ref || github.sha }}
           aws_registries: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
+          artifacts_name: ${{ matrix.product.name }}-test-logs
           artifacts_location: |
             ./integration-tests/smoke/logs/
             /tmp/gotest.log
@@ -470,6 +471,7 @@ jobs:
           cl_repo: ${{ env.CHAINLINK_IMAGE }}
           cl_image_tag: ${{ inputs.evm-ref || github.sha }}
           aws_registries: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
+          artifacts_name: ${{ matrix.product.name }}-test-logs
           artifacts_location: |
             ./integration-tests/smoke/logs/
             /tmp/gotest.log
@@ -854,6 +856,7 @@ jobs:
           test_download_vendor_packages_command: cd ./integration-tests && go mod download
           cl_repo: ${{ env.CHAINLINK_IMAGE }}
           cl_image_tag: ${{ steps.get_latest_version.outputs.latest_version }}
+          artifacts_name: node-migration-test-logs
           artifacts_location: |
             ./integration-tests/migration/logs
             /tmp/gotest.log
@@ -865,14 +868,6 @@ jobs:
           QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
           QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
           QA_KUBECONFIG: ${{ secrets.QA_KUBECONFIG }}
-      - name: Upload test log
-        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
-        if: failure()
-        with:
-          name: test-log-${{ matrix.product.name }}
-          path: /tmp/gotest.log
-          retention-days: 7
-        continue-on-error: true
       - name: Collect Metrics
         if: always()
         id: collect-gha-metrics
@@ -1160,21 +1155,17 @@ jobs:
           test_command_to_run: export ENV_JOB_IMAGE=${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink-solana-tests:${{ needs.get_solana_sha.outputs.sha }} && make test_smoke
           cl_repo: ${{ env.CHAINLINK_IMAGE }}
           cl_image_tag: ${{ inputs.evm-ref || github.sha }}
-          artifacts_location: /home/runner/work/chainlink-solana/chainlink-solana/integration-tests/logs
           publish_check_name: Solana Smoke Test Results
           go_mod_path: ./integration-tests/go.mod
           cache_key_id: core-solana-e2e-${{ env.MOD_CACHE_VERSION }}
           token: ${{ secrets.GITHUB_TOKEN }}
           aws_registries: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
+          artifacts_name: solana-test-logs
+          artifacts_location: |
+            ./integration-tests/smoke/logs
+            /tmp/gotest.log
           QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
           QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
           QA_KUBECONFIG: ""
           run_setup: false
-      - name: Upload test log
-        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
-        if: failure()
-        with:
-          name: test-log-solana
-          path: /tmp/gotest.log
-          retention-days: 7
-        continue-on-error: true
+

.github/workflows/operator-ui-ci.yml

@@ -38,7 +38,7 @@ jobs:
 
       - name: Get Github Token
         id: get-gh-token
-        uses: smartcontractkit/chainlink-github-actions/github-app-token-issuer@5dd916d08c03cb5f9a97304f4f174820421bb946 # v2.3.11
+        uses: smartcontractkit/chainlink-github-actions/github-app-token-issuer@5874ff7211cf5a5a2670bb010fbff914eaaae138 # v2.3.12
         with:
           url: ${{ secrets.AWS_INFRA_RELENG_TOKEN_ISSUER_LAMBDA_URL }}
 

.github/workflows/solidity-foundry.yml

@@ -79,7 +79,7 @@ jobs:
           FOUNDRY_PROFILE: ${{ matrix.product }}
 
       - name: Run Forge snapshot
-        if: ${{ !contains(fromJson('["vrf"]'), matrix.product) && !contains(fromJson('["automation"]'), matrix.product) && needs.changes.outputs.changes == 'true' }}
+        if: ${{ !contains(fromJson('["vrf"]'), matrix.product) && !contains(fromJson('["automation"]'), matrix.product) && !contains(fromJson('["keystone"]'), matrix.product) && needs.changes.outputs.changes == 'true' }}
         run: |
           forge snapshot --nmt "testFuzz_\w{1,}?" --check gas-snapshots/${{ matrix.product }}.gas-snapshot
         id: snapshot

.gitignore

@@ -97,3 +97,5 @@ override*.toml
 
 # Pythin venv
 .venv/
+
+ocr_soak_report.csv

CODEOWNERS

@@ -75,7 +75,7 @@ core/scripts/gateway @smartcontractkit/functions
 /contracts/src/v0.8/l2ep @chris-de-leon-cll
 /contracts/src/v0.8/llo-feeds @smartcontractkit/mercury-team
 # TODO: mocks folder, folder should be removed and files moved to the correct folders
-/contracts/src/v0.8/operatorforwarder @RensR
+/contracts/src/v0.8/operatorforwarder @austinborn
 /contracts/src/v0.8/shared @RensR
 # TODO: tests folder, folder should be removed and files moved to the correct folders
 # TODO: transmission folder, owner should be found

common/txmgr/broadcaster.go

@@ -689,7 +689,7 @@ func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) save
 	// is relatively benign and probably nobody will ever run into it in
 	// practice, but something to be aware of.
 	if etx.PipelineTaskRunID.Valid && eb.resumeCallback != nil && etx.SignalCallback {
-		err := eb.resumeCallback(etx.PipelineTaskRunID.UUID, nil, fmt.Errorf("fatal error while sending transaction: %s", etx.Error.String))
+		err := eb.resumeCallback(ctx, etx.PipelineTaskRunID.UUID, nil, fmt.Errorf("fatal error while sending transaction: %s", etx.Error.String))
 		if errors.Is(err, sql.ErrNoRows) {
 			lgr.Debugw("callback missing or already resumed", "etxID", etx.ID)
 		} else if err != nil {

common/txmgr/confirmer.go

@@ -1120,7 +1120,7 @@ func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) Res
 		}
 
 		ec.lggr.Debugw("Callback: resuming tx with receipt", "output", output, "taskErr", taskErr, "pipelineTaskRunID", data.ID)
-		if err := ec.resumeCallback(data.ID, output, taskErr); err != nil {
+		if err := ec.resumeCallback(ctx, data.ID, output, taskErr); err != nil {
 			return fmt.Errorf("failed to resume suspended pipeline run: %w", err)
 		}
 		// Mark tx as having completed callback

common/txmgr/resender.go

@@ -140,9 +140,6 @@ func (er *Resender[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) resendUnco
 		return fmt.Errorf("Resender failed getting enabled keys for chain %s: %w", er.chainID.String(), err)
 	}
 
-	// Tracker currently disabled for BCI-2638; refactor required
-	// resendAddresses = append(resendAddresses, er.tracker.GetAbandonedAddresses()...)
-
 	ageThreshold := er.txConfig.ResendAfterThreshold()
 	maxInFlightTransactions := er.txConfig.MaxInFlight()
 	olderThan := time.Now().Add(-ageThreshold)

common/txmgr/strategies.go

@@ -3,7 +3,6 @@ package txmgr
 import (
 	"context"
 	"fmt"
-	"time"
 
 	"github.com/google/uuid"
 
@@ -14,9 +13,9 @@ var _ txmgrtypes.TxStrategy = SendEveryStrategy{}
 
 // NewQueueingTxStrategy creates a new TxStrategy that drops the oldest transactions after the
 // queue size is exceeded if a queue size is specified, and otherwise does not drop transactions.
-func NewQueueingTxStrategy(subject uuid.UUID, queueSize uint32, queryTimeout time.Duration) (strategy txmgrtypes.TxStrategy) {
+func NewQueueingTxStrategy(subject uuid.UUID, queueSize uint32) (strategy txmgrtypes.TxStrategy) {
 	if queueSize > 0 {
-		strategy = NewDropOldestStrategy(subject, queueSize, queryTimeout)
+		strategy = NewDropOldestStrategy(subject, queueSize)
 	} else {
 		strategy = SendEveryStrategy{}
 	}
@@ -41,26 +40,21 @@ var _ txmgrtypes.TxStrategy = DropOldestStrategy{}
 // DropOldestStrategy will send the newest N transactions, older ones will be
 // removed from the queue
 type DropOldestStrategy struct {
-	subject      uuid.UUID
-	queueSize    uint32
-	queryTimeout time.Duration
+	subject   uuid.UUID
+	queueSize uint32
 }
 
 // NewDropOldestStrategy creates a new TxStrategy that drops the oldest transactions after the
 // queue size is exceeded.
-func NewDropOldestStrategy(subject uuid.UUID, queueSize uint32, queryTimeout time.Duration) DropOldestStrategy {
-	return DropOldestStrategy{subject, queueSize, queryTimeout}
+func NewDropOldestStrategy(subject uuid.UUID, queueSize uint32) DropOldestStrategy {
+	return DropOldestStrategy{subject, queueSize}
 }
 
 func (s DropOldestStrategy) Subject() uuid.NullUUID {
 	return uuid.NullUUID{UUID: s.subject, Valid: true}
 }
 
 func (s DropOldestStrategy) PruneQueue(ctx context.Context, pruneService txmgrtypes.UnstartedTxQueuePruner) (ids []int64, err error) {
-	var cancel context.CancelFunc
-	ctx, cancel = context.WithTimeout(ctx, s.queryTimeout)
-	defer cancel()
-
 	// NOTE: We prune one less than the queue size to prevent the queue from exceeding the max queue size. Which could occur if a new transaction is added to the queue right after we prune.
 	ids, err = pruneService.PruneUnstartedTxQueue(ctx, s.queueSize-1, s.subject)
 	if err != nil {