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

Resolve v1.13.0 merge conflicts with develop #8736

Merged
merged 147 commits into from
Mar 17, 2023

Conversation

chainchad
Copy link
Collaborator

lukaszcl and others added 30 commits February 24, 2023 14:12
"MERCURY_SERVER_TAG": "v1.0.0"
"CHAINLINK_VERSION": "latest.1d8f42f643d3acb89a40aef575c715cd666c56c8"
* (fix): Amend Functions Registry calculatePaymentAmount transmitter payment

* Add changelog
* not revert when exact upkeeps length if not known

* updates
* allow offchain config to be set during migration

* remove only
Allow jobs to be deleted from FMS via rpc

Currently there is no straightforward way for FMS to send job deletion requests to managed node ops other than having the node ops manually search for the job via external ID. This will allow jobs proposed and managed by FMS to also be deleted from FMS.
# Conflicts:
#	integration-tests/go.mod
#	integration-tests/go.sum
# Conflicts:
#	integration-tests/testsetups/mercury.go
http/ws load groups for mercury-server + 1 DON
essamhassan and others added 7 commits March 16, 2023 16:27
Emitting UserCallbackRawError when request ID was invalid had several issues:
1. It's not a user error - our contracts set the IDs.
2. OCR can sometimes send the same report twice (expected behavior). If we emit UserCallbackRawError on the second attempt, we cause observability issues (e.g. latency is calculated based on the last one instead of the first one).
3. Similarly - emitting this event causes seom problems in core node state transitions (unwanted and confusing error logs).

Apart from new event, I also cloned old interfaces into the testing dir, to avoid migrating changes in the future.
* Write custom plugin for Mercury

Supported Mercury fields:

- FeedId
- ObservationsTimestamp
- BenchmarkPrice
- Bid
- Ask
- CurrentBlockNum
- CurrentBlockHash
- ValidFromBlockNum

---------

Co-authored-by: Austin Born <[email protected]>
Co-authored-by: Jordan Krage <[email protected]>
Co-authored-by: lukaszcl <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@chainchad chainchad changed the base branch from release/1.13.0 to develop March 16, 2023 22:05
@chainchad chainchad changed the base branch from develop to release/1.13.0 March 16, 2023 22:05
@chainchad
Copy link
Collaborator Author

@cl-sonarqube-production
Copy link

SonarQube Quality Gate

Quality Gate failed

Failed condition 61.9% 61.9% Coverage on New Code (is less than 90%)
Failed condition 4 New Critical Issues (is greater than 0)
Failed condition 7 New Major Issues (is greater than 5)

See analysis details on SonarQube

Fix issues before they fail your Quality Gate with SonarLint SonarLint in your IDE.

1 similar comment
@cl-sonarqube-production
Copy link

SonarQube Quality Gate

Quality Gate failed

Failed condition 61.9% 61.9% Coverage on New Code (is less than 90%)
Failed condition 4 New Critical Issues (is greater than 0)
Failed condition 7 New Major Issues (is greater than 5)

See analysis details on SonarQube

Fix issues before they fail your Quality Gate with SonarLint SonarLint in your IDE.

@chainchad chainchad merged commit e6f5a2a into release/1.13.0 Mar 17, 2023
@chainchad chainchad deleted the chore/release-1.13.0-develop-conflicts branch March 17, 2023 14:13
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.