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

2.15 merge #1401

Merged
merged 35 commits into from
Sep 3, 2024
Merged

2.15 merge #1401

merged 35 commits into from
Sep 3, 2024

Conversation

mateusz-sekara
Copy link
Contributor

@mateusz-sekara mateusz-sekara commented Sep 2, 2024

Merging chainlink repository from v2.15.0

anirudhwarrier and others added 29 commits July 19, 2024 15:46
* fix automation chaos test

* fix ondemand workflow for chaos tests

* use standard automation test functions

* update automation testconfig

* lint

* lint
* Remove the old log buffer

* Add a changeset

* Update integration test

* Lint

* Clean up from config

* Update tests

* Integration test lint

* Clean up sync filters
Wait for the handler to be called before proceeding.
* Notify slack on new release tags and release branches

* Add changelog url

* Use released version of action

* Only notify slack on tags
* [KS-370] Add ConfigForCapability to registry

- This allows us to set some config inside the registry without needing
  to specify it on the capability registry

* Update common

* Update PR

* Linting

* Rename ExecuteConfig -> DefaultConfig

* Add IsLocal to CapabilityInfo

* Minor review feedback; rename GetLocalNode -> LocalNode

* More comments

* Remote CapabilityID type

* Stop coercing capability.ID since it's already a string

* Update common

* Linting / Go generate

* Update common

* Update common
* Update CHANGELOG and package version for contracts release

* Add today's date to CHANGELOG 1.2.0
* Add updateFromPrevious method to Functions ToS contract

* Update test

* Update gethwrappers

* Added test

* prettier

* Address feedback

* Added tag to changeset

* Addressed feedback on tests

* Updated gas snapshot

* Add missing deployment arg to ToS in core tests

* New approach which enables batching

* Add require

* prettier, gas snapshot & wrappers

* update snapshot

* addressed feedback

* prettier

---------

Co-authored-by: app-token-issuer-infra-releng[bot] <120227048+app-token-issuer-infra-releng[bot]@users.noreply.github.com>
* prevent malicious a node operator from taking over another node belonging to another node operator

* prevent malicious node operator from becoming the admin for another node operator
* Bump version and update CHANGELOG fore core v2.14.0

Signed-off-by: Sneha Agnihotri <[email protected]>

* Bump libocr to fix nil msg error (#13919)

* Finalize date on changelog for 2.14.0 (#13943)

---------

Signed-off-by: Sneha Agnihotri <[email protected]>
Co-authored-by: chainchad <[email protected]>
(cherry picked from commit 7147653)
(cherry picked from commit 7147653)
…changelog-fix

Use changeset github changelog generator
}

srvcs = append(srvcs, externalPeerWrapper)
var capabilityRegistrySyncer registrysyncer.Syncer
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code here is a bit outdated. even if 2.15 is 2 weeks ago I think it was different as most of the part related to the capabilities was last edited first week of August. Can you double check nothing was auto resolved wrongly here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2.15 was cut on 30th July from develop, which means that code is at least a month behind the current develop

@@ -258,14 +258,10 @@ packages:
ORM:
Runner:
PipelineParamUnmarshaler:
github.com/smartcontractkit/chainlink/v2/core/services/headreporter:
github.com/smartcontractkit/chainlink/v2/core/services/promreporter:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not familiar with prom or headreporter. What's the reason for removing headreporter completely like this?

Copy link
Contributor Author

@mateusz-sekara mateusz-sekara Sep 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's the state of the repo on v2.15.0. It seems that promreporter replaced headreporter

@asoliman92 asoliman92 self-requested a review September 3, 2024 08:44
@mateusz-sekara
Copy link
Contributor Author

Protobuf checks fails because of this breaking change smartcontractkit/chainlink#13750

.swp Outdated Show resolved Hide resolved
@RensR RensR merged commit b252cf1 into ccip-develop Sep 3, 2024
125 of 126 checks passed
@RensR RensR deleted the 2.15-merge branch September 3, 2024 10:15
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.