Skip to content

chore(release): merge develop into release/2.45.0 (conflict resolution)#22327

Open
HashWrangler wants to merge 33 commits intorelease/2.45.0from
jd/merge-develop-into-release-2.45.0-22249
Open

chore(release): merge develop into release/2.45.0 (conflict resolution)#22327
HashWrangler wants to merge 33 commits intorelease/2.45.0from
jd/merge-develop-into-release-2.45.0-22249

Conversation

@HashWrangler
Copy link
Copy Markdown
Collaborator

Summary

Resolves merge conflicts blocking Release 2.45.0 #22249.

  • CHANGELOG.md: taken entirely from develop (per RANE).
  • package.json: remains 2.45.0 on the release line.
  • .changeset/minor-bump-1778011583.md: kept from develop (rename/delete conflict).

After this merges into release/2.45.0, #22249 should be mergeable into develop.

huangzhen1997 and others added 30 commits April 29, 2026 17:47
* step 1, remove option for non-LOOP mode

* do not use hard coded cmd

* rm non-LOOPP solana e2e test

* update CI

* add Solana loop for failing test

* refactor solana core test into integration with LOOP plugin

* refactor test

* fix lint

* move refactor and remove solana from non-loop health report

* revert removal, only remove solana

* rm no plugin test

* update comment

* test: align solana interoperator test with cosmos/starknet pattern

* refactor solana relay config to use raw unwrapped

* mod tidy

* fix test

* use default cmd

* fix

* fix test

* add test env var back

* update yml again with plugin fix

* delete solana config as raw config test is covered

* add missing fields back

* remove the old code added accidentally

* revert test modification

* mod tidy
* Bump version and update CHANGELOG for v2.45.0

(cherry picked from commit 22184c0)

* Add minor changeset for next release cycle

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
* Bump chainlink-aptos for account transaction window fix

* Sync chainlink-aptos Go module pins

* Bump chainlink-aptos to latest account tx fix

* Bump chainlink-aptos after log level update

* Bump chainlink-aptos account transaction fallback

* Bump chainlink-aptos to current PR head

* Bump chainlink-aptos to merged tx window fix

* Create changeset to removepool from tar solana

* Skip in CI Expensive tests

* Apply suggestions from code review

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Agustina Aldasoro <agustina.aldasoro@smartcontract.com>
Co-authored-by: Agustina Aldasoro <agusaldasoro@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
* add TON support for OrchestrateChangesets

* fix make

* fix make

* goimport

* fix lint
* Bump Return custom tx receipt in evm service

* Add tests

* run generate

* lint and bump

* run generate

* bump cl-evm

* Fix unit tests
* Absolute basics

* Fix config

* better survey execution

* add signal processing

* add fail fast

* Make it pretty

* More analysis

* iteration summaries

* moar connections

* diagnose

* Better args input

* lint

* Comments

* -count flags

* errors

* Linting

* Review comments

* go tool

* tidy

* lint and generate

* go version

* Fixing go mod tidy

* Generate and tidy

* testcontainers-go v0.41.0

* testcontainers-go v0.41.0

* testcontainers-go v0.37.0

* testcontainers-go v0.42.0

* Pin moby

* Pin buildx version

* Consolidate

* Merge and clean

* More pins

* Revert

* Remove pins?

* Fix bugs, add tests, respond to comments

* testcontainers-go v0.41.0

* lint

* Climb out of dependency hell

* More replaces and docs

* docker/cli 28.5.2

* docker/cli 28.5.2 + comments

* testcontainers-go v0.42.0

* pin testcontainers-go?

* give up using go tool

* update docs

* Reset to go mod files

* delete files

* Fix output and closure

* Lint

* Fix run mentions

* Fix some docs

* Fix desc

* Remove skill

* gitignore
Remove solana crcw config as ContractTransimitter now provided from ccip provider
* Fix vault secret label validation

* Fix vault lint issues

* code fixes for failing tests

* code fixes for failing tests

* lint

* tests

* tests lint

* debug logs

* token leeway

* Allow org-only JWT vault requests
* notify about pre-release test results in Slack

* do return error if posting to Slack fails

* pass slack channel id/bot token as inputs to action

* fix readme
…ld, wake after observation and metrics (#22005)

* llo/datasource: observation pacing, item staleness refresh threshold

* llo/observation: per-pipeline observation workers; 5/4 stale threshold

* llo/observations: scope pipeline observations to plugin-requested streams

* llo/observations: staleRefreshRemainingNumerator 8

* llo/observations: observation wake; metrics

* llo/observations: staleRefreshSkipThreshold = (8/5)
* docs: document Keepers v1 removal in 2.45.0 changelog

Add breaking change entry for PR #22208 (commit b8e5aec). This was
omitted from the published GitHub release notes; CHANGELOG.md is the
durable record for operators.

* Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* Update CHANGELOG.md

---------

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
…22261)

* chore: remove link token and static link token view functions and use cld-changesets instead

* chore: update gomods

* wip: replacing usages to cld-changesets

* wip: continue swapping state funcs to cld-changesets

* fix: go mods

* chore: remove all usages of evm stage file loaders

* chore: remove all usages of evm stage file loaders

* fix: undelete evm.go as it still has usages in CLD

* fix: linting errors

* fix: linting errors

* fix: linting errors

* fix: linting errors
…#22300)

* if port collision is detected use lsof to check what is running there

* CR changes
* chore: move save_existing.go changeset out of common.

* fix: lint errors
…ties registry (#22270)

[CRE-4087] Add support for OCR3_1 to configure_capabilities_registry.

- Including support for Vault and DKG
* [CRE] Per-owner local secrets overrides

* reverse the logic
* Emit node job info platform events

* test: update health fixtures for node job info service

* feat(node-platform): emit job submitter addresses

* chore: update node-platform protos dependency

* fix: improve error message formatting for non-existent timestamp in waitForReportWithTimestamp

* fix: page node job info submitter address queries

* fix: remove unused node job info helper

* refactor: encapsulate node submitter address aggregation

* test: clarify node job info payload assertions
)

* only register beholder with chip router if the latter is running

* restore beholder state file if startup fails or is interrupted

* CR fixes
* Bump version and update CHANGELOG for v2.46.0

(cherry picked from commit e275ecd)

* Add minor changeset for next release cycle

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
* COT-24 Lack Of Lower Bounds Check On Integer Casting

* COT-25 Misleading Error Message
* use dynamic ChIP Ingress/Router host port allocation

* lint fix

* fix actionlints

* tagged CTF
@HashWrangler HashWrangler requested review from a team as code owners May 6, 2026 17:12
@HashWrangler HashWrangler requested review from agusaldasoro, asoliman92, b-gopalswami, carte7000, chris-de-leon-cll, ogtownsend and winder and removed request for a team May 6, 2026 17:12
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented May 6, 2026

CORA - Pending Reviewers

Codeowners Entry Overall Num Files Owners
* 96 @smartcontractkit/foundations, @smartcontractkit/core
/.changeset/ 1 @smartcontractkit/foundations, @smartcontractkit/core
/core/capabilities/ 18 @smartcontractkit/keystone, @smartcontractkit/capabilities-team
/core/capabilities/ccip/ 2 @smartcontractkit/ccip-offchain
/core/capabilities/ccip/ccipsolana/ 3 @smartcontractkit/bix-build
/core/services/ocr*/ 11 @smartcontractkit/foundations, @smartcontractkit/core
/core/services/relay/evm/mercury/ 6 @smartcontractkit/data-streams-engineers, @smartcontractkit/core
/core/services/llo/ 5 @smartcontractkit/data-streams-engineers, @smartcontractkit/core
/core/services/registrysyncer/ 2 @smartcontractkit/keystone
/core/services/workflows/ 9 @smartcontractkit/keystone
/core/scripts/keystone/ 1 @smartcontractkit/keystone
/core/web/resolver/ 3 @smartcontractkit/foundations, @smartcontractkit/core
/devenv/ 1 @smartcontractkit/devex-tooling
/deployment/ 1 @smartcontractkit/ccip-tooling, @smartcontractkit/ccip-offchain, @smartcontractkit/keystone, @smartcontractkit/operations-platform, @smartcontractkit/core
/deployment/ccip/ 33 @smartcontractkit/ccip-tooling, @smartcontractkit/ccip-offchain, @smartcontractkit/operations-platform, @smartcontractkit/core
/deployment/common/ 25 @smartcontractkit/operations-platform
/deployment/cre/ 26 @smartcontractkit/keystone, @smartcontractkit/operations-platform
/deployment/data-feeds/ 2 @smartcontractkit/data-feeds-engineers, @smartcontractkit/operations-platform, @smartcontractkit/core
/deployment/keystone/ 3 @smartcontractkit/keystone, @smartcontractkit/operations-platform, @smartcontractkit/core
/deployment/vault/ 2 @smartcontractkit/cld-vault, @smartcontractkit/operations-platform, @smartcontractkit/core
go.md 1 @smartcontractkit/core, @smartcontractkit/foundations
go.mod 8 @smartcontractkit/core, @smartcontractkit/foundations
go.sum 8 @smartcontractkit/core, @smartcontractkit/foundations
integration-tests/go.mod 1 @smartcontractkit/core, @smartcontractkit/devex-tooling, @smartcontractkit/foundations
integration-tests/go.sum 1 @smartcontractkit/core, @smartcontractkit/devex-tooling, @smartcontractkit/foundations

Legend: ✅ Approved | ❌ Changes Requested | 💬 Commented | 🚫 Dismissed | ⏳ Pending | ❓ Unknown

For more details, see the full review summary.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented May 6, 2026

✅ No conflicts with other open PRs targeting release/2.45.0

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented May 6, 2026

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:

  • #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.

@chainchad
Copy link
Copy Markdown
Collaborator

@trunk-io
Copy link
Copy Markdown

trunk-io Bot commented May 6, 2026

Static BadgeStatic BadgeStatic BadgeStatic Badge

View Full Report ↗︎Docs

@cl-sonarqube-production
Copy link
Copy Markdown

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.