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 main #118

Merged
merged 98 commits into from
Sep 8, 2023
Merged

Merge main #118

merged 98 commits into from
Sep 8, 2023

Conversation

RensR
Copy link
Collaborator

@RensR RensR commented Sep 7, 2023

Motivation

Solution

infiloop2 and others added 30 commits August 29, 2023 14:18
…#10376)

* Apply custom filter to logs in log recoverer getLogTriggerCheckData

* fix test
Read ID and ToS contract address from router first.
* Fix soak reporting bug in OCR

* Log funding addresses

* Debug resume timing issues

* Fix log
* fix: check LINK.transfer return value

* fix: check LINK.transfer return value in wrapper

* chore: malicious migrator tests

* chore: update snapshot

* chore: run prettier

* chore: check for sub id collision

* chore: bump snapshot

* fix: nonReentrant modifier on migrate()
* update to toml path

* export PTR

* export methods

* move to util
* (fix): Functions OracleWithdrawAll uses transmitters

* Update wrappers

---------

Co-authored-by: Morgan Kuphal <[email protected]>
Co-authored-by: Morgan Kuphal <[email protected]>
* update benchmark test to support v2.1 conditional upkeeps

* increase http write timeout

* add stale report count metrics

* address review comments

* set 2_1 as default registry, fix for run on non-simulated geth
* added cache for transmit event provider, tests wip

* transmit event provider refactoring

* lint

* review fixes

* return events only once

* small fix

* review fix
* Use -1 as sentinel value for missing Link/Native fee

* Fix migration to cascade delete

* Fix tests

* Conform with go naming conventions

* main commit to chainlink-relay
* update VL contract to check upkeep id with check data

* simplify

* gen wrappers

* update

* update

* update

* update

* update

* udpate

* update

* update

* update

* remove

* update mercury upkeep test contract (#10319)

* update mercury upkeep test contract

* fix ts tests

* remove only

* format

* udpate

* update

* fix tests

* udpate

* lint

* fix tests
* add native token field to cosmos config

* remove fcdurl

* change gas token to native token

* rename to fee token

* add basic methods to chain service

* add bech32 prefix to cosmos config

* bump chainlink-cosmos to feature branch

* fix type error

* update chain-cosmos.toml

* fix fee estimator test

* fix types and gas price estimator input

* make config-docs

* update chainlink-cosmos version

* fix cosmos config tests

* update tomls and types

* GetChainStatus, ListNodeStatuses for cosmos and evm

* fix tests

* cleanup CosmosSendAtom

* solana and starknet. fix solana tests

* fix docs and scripts tests

* remove atom references

* use ValidateDenom

* fix cosmos config in relayer test

* sort cosmos config fields alphabetically

* undo accidental test changes

* WIP: remove chainset implementation from all chains

* bump chainlink-cosmos version

* fix cosmos config order

* update relay factor to work with chains instead of chainsets

* remove chainsets implementations :)

* fix implementations to work with existing loop.Relay interfaces. previous developed in a workspace with modified interfaces

* fix dependencies

* fix nil test failure and linter

* fixes and more tests

* update toml passed to loop

* address comments; fix or document TODOs; revert test changes; move/rename code for clarity

* fix variable naming and error messages and revert total to -1 on error

---------

Co-authored-by: Calvin Wang <[email protected]>
Co-authored-by: Calvin <[email protected]>
* Read logs for block number and trigger config

* Use indexed logs

* Cleanup

* Reduce confs

* Update test coverage

* Continue if id cannot be parsed

* Please the linter

* Batch the log trigger upkeep refresh

* Batch the upkeep refresh

* No longer use errgroup

* Dont error on a single batch, add a processing delay, add comments

* Update tests

* Add a todo

* Refresh active upkeeps before batching

* update comment

* Only take max values

* Filter log upkeeps at a higher level

* Refresh after collecting the log upkeep IDs, generate hashes
* core: logger name cleanup

* more logger name cleanup
* add ineligibility reason for simulation failure

* update failure reason
Bumps [sonarsource/sonarqube-scan-action](https://github.com/sonarsource/sonarqube-scan-action) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/sonarsource/sonarqube-scan-action/releases)
- [Commits](SonarSource/sonarqube-scan-action@4b0bfc1...69c1a75)

---
updated-dependencies:
- dependency-name: sonarsource/sonarqube-scan-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jordan Krage <[email protected]>
Bumps [actions/checkout](https://github.com/actions/checkout) from 3.5.3 to 3.6.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@c85c95e...f43a0e5)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jordan Krage <[email protected]>
github.com/rogpeppe/go-internal v1.11.0

github.com/tidwall/gjson v1.16.0
* Error return value of * is not checked (errcheck)

* ineffectual assignment to orm (ineffassign)

* unnecessary use of fmt.Sprintf (gosimple)

* unnecessary nil check around range (gosimple)

* should merge variable declaration with assignment on next line (gosimple)

* type * is unused (unused)

* if-return: redundant if ...; err != nil check, just return error instead. (revive)

* receiver-naming: receiver name * should be consistent with previous receiver name * for * (revive)

* indent-error-flow: if block ends with a return statement, so drop this else and outdent its block (revive)

* Implicit memory aliasing in for loop. (gosec)
* fix: remove log from pending, not just from visited cache

* recoverer: add/rm pending

* check removePending
* evm_transfer cli: wait for and output TxAttempt

* fix cli tests

* update changelog

* fix: potentially flaky test - where confirmer asks for nonce

* cleanup extraneous defer
* add more info to pipeline transmitter error

* update notation
@github-actions
Copy link
Contributor

github-actions bot commented Sep 7, 2023

LCOV of commit e0fde02 during Solidity Foundry #461

Summary coverage rate:
  lines......: 98.9% (899 of 909 lines)
  functions..: 96.4% (188 of 195 functions)
  branches...: 91.0% (355 of 390 branches)

Files changed coverage rate: n/a

@github-actions
Copy link
Contributor

github-actions bot commented Sep 7, 2023

LCOV of commit 61ae9d2 during Solidity Foundry #462

Summary coverage rate:
  lines......: 98.9% (899 of 909 lines)
  functions..: 96.4% (188 of 195 functions)
  branches...: 91.0% (355 of 390 branches)

Files changed coverage rate: n/a

# Conflicts:
#	.github/workflows/build-publish-develop.yml
#	.github/workflows/build-publish.yml
#	.github/workflows/integration-chaos-tests.yml
#	.github/workflows/integration-tests.yml
#	.github/workflows/operator-ui-cd.yml
#	.github/workflows/solidity.yml
#	contracts/GNUmakefile
#	core/scripts/go.mod
#	core/scripts/go.sum
#	core/services/relay/evm/evm.go
#	go.mod
#	go.sum
#	integration-tests/docker/test_env/geth.go
#	integration-tests/docker/test_env/test_env.go
#	integration-tests/go.mod
#	integration-tests/go.sum
#	integration-tests/networks/known_networks.go
#	integration-tests/types/config/node/core.go
@github-actions
Copy link
Contributor

github-actions bot commented Sep 7, 2023

LCOV of commit e728e46 during Solidity Foundry #463

Summary coverage rate:
  lines......: 98.9% (899 of 909 lines)
  functions..: 96.4% (188 of 195 functions)
  branches...: 91.0% (355 of 390 branches)

Files changed coverage rate: n/a

@github-actions
Copy link
Contributor

github-actions bot commented Sep 7, 2023

LCOV of commit 41ba2b7 during Solidity Foundry #464

Summary coverage rate:
  lines......: 98.9% (899 of 909 lines)
  functions..: 96.4% (188 of 195 functions)
  branches...: 91.0% (355 of 390 branches)

Files changed coverage rate: n/a

@github-actions
Copy link
Contributor

github-actions bot commented Sep 7, 2023

LCOV of commit 847fd9e during Solidity Foundry #467

Summary coverage rate:
  lines......: 98.9% (899 of 909 lines)
  functions..: 96.4% (188 of 195 functions)
  branches...: 91.0% (355 of 390 branches)

Files changed coverage rate: n/a

@github-actions
Copy link
Contributor

github-actions bot commented Sep 7, 2023

LCOV of commit f605991 during Solidity Foundry #470

Summary coverage rate:
  lines......: 98.9% (899 of 909 lines)
  functions..: 96.4% (188 of 195 functions)
  branches...: 91.0% (355 of 390 branches)

Files changed coverage rate: n/a

@github-actions
Copy link
Contributor

github-actions bot commented Sep 8, 2023

LCOV of commit 842ddd2 during Solidity Foundry #473

Summary coverage rate:
  lines......: 98.9% (899 of 909 lines)
  functions..: 96.4% (188 of 195 functions)
  branches...: 91.0% (355 of 390 branches)

Files changed coverage rate: n/a

@RensR RensR marked this pull request as ready for review September 8, 2023 11:30
@RensR RensR requested review from connorwstein, matYang and a team as code owners September 8, 2023 11:30
@RensR RensR requested a review from dimkouv September 8, 2023 11:30
@github-actions
Copy link
Contributor

github-actions bot commented Sep 8, 2023

LCOV of commit c1eecab during Solidity Foundry #478

Summary coverage rate:
  lines......: 98.9% (899 of 909 lines)
  functions..: 96.4% (188 of 195 functions)
  branches...: 91.0% (355 of 390 branches)

Files changed coverage rate: n/a

@skudasov skudasov self-requested a review September 8, 2023 15:55
@RensR RensR merged commit f5dc08f into ccip-develop Sep 8, 2023
71 checks passed
@RensR RensR deleted the merge-main branch September 8, 2023 16:49
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.