Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge latest v2.12 into release branch #1021

Merged
merged 33 commits into from
Jun 14, 2024
Merged

Conversation

mateusz-sekara
Copy link
Contributor

Motivation

Solution

jmank88 and others added 30 commits May 8, 2024 15:11
…ctx-v2.12.0

Cherry pick BCF-3221 - core/services: fix ocrWrapper saveError contexts
…g_cherrypick

Updating changelog for 2.12.0  with cherry pick fix
… transmitter on OCR2 aggregator (#13221)

* Implement forwarder OCR2 fallback if fwd not present as a transmitter

* Add changeset
…allback-feature-cherry-pick

BCF-3225 - Implement forwarder fallback if forwarder not present as a…
* Fixed CPU usage issues caused by inefficiencies in HeadTracker

* added comments

* revert heads back to the fix

(cherry picked from commit 6f1ebca)
…ise-headtracker-2-12

Hotfix/bci 3285 optimise headtracker (cherry pick for 2.12)
…2.12.0-changelog-bugfixes

Update CHANGELOG for 2.12.0 bugfixes
* fix: Decouple ChainType from config string

* fix: receiver name and failing test

* test: enhance config test to test for xdai specifically

* refactor: directly unmarshal into ChainType

* fix: validation

* test: fix TestDoc/EVM

* test: add xdai to warnings.xtar
[SHIP-2001] Cherry Pick - Decouple ChainType Setting (#13272)
…nly-fifth-word

BCF-3244 Index only the fifth word to reduce the db size overhead #13315
* Add special transmitter for OCR2 feeds

* Add ocr2FeedsTransmitter FromAddress()

* Cherry-pick some forwarders context changes from (#13171)
* Improve ocr2FeedsTransmitter FromAddress() fallback

* Fix forwarders test error assert
…r2-transmitter

BCF-3243 - Cherry pick Add special transmitter for OCR2 feeds (#13323)
…changelog-update

Update 2.12.0 Changelog with bugfixes
…dge-task-timeout

core/services/pipeline: bridge task must continue after cancellation (
core/services/pipeline: hide deadline from monitor
snehaagni and others added 2 commits June 5, 2024 22:58
Copy link
Contributor

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:

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

@mateusz-sekara mateusz-sekara requested a review from a team as a code owner June 14, 2024 07:59
@mateusz-sekara mateusz-sekara changed the title Merge latest v2.12 Merge latest v2.12 into release branch Jun 14, 2024
@makramkd
Copy link
Contributor

Some lint errors https://github.com/smartcontractkit/ccip/actions/runs/9512691213/job/26221321986?pr=1021 but other than that looks good

@RensR RensR merged commit b399007 into release/2.12.0-ccip1.4 Jun 14, 2024
78 of 79 checks passed
@RensR RensR deleted the merge2.12-release branch June 14, 2024 09:47
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.