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.

Sign up for GitHub

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

Jump to bottom

Merge with core #384

Merged
merged 331 commits into from
Dec 19, 2023
Merged

Merge with core #384

merged 331 commits into from
Dec 19, 2023

Conversation

AnieeG
Copy link
Contributor

@AnieeG AnieeG commented Dec 14, 2023

Motivation

Solution

bolekk and others added 30 commits November 6, 2023 20:01
@bolekk @KuphJr
[Functions] Respond with an error on insufficient balance (#11183)
2b38062 
Co-authored-by: Morgan Kuphal <87319522+KuphJr@users.noreply.github.com>
@erikburt
chore: bump sigstore/cosign-installer from 2.1.0 to 3.1.2 (#11192)
0ae0b69
@tateexon
[TT-668] Use Internal Mirror for docker images used in e2e tests (#11…
c71ead7 
…189)

Part of the effor to remove the e2e flakes caused by dockerhub rate limit issues
@anirudhwarrier
Fix Automation benchmark test (#11191)
0e5b523 
* fix benchmark test

* bump runner
@ilija42 @patrickhuie19
@jmank88 @gheorghestrimtu
Add to delegate job spec CaptureEATelemetry override from evm ocr cfg…
fcaf226 
… (#11197)

* Add to delegate job spec CaptureEATelemetry override from evm ocr cfg

* Add logs for when Ea telemetry is disabled

* Update core/services/ocr/delegate.go

Co-authored-by: Jordan Krage <jmank88@gmail.com>

* Update core/services/ocr2/delegate.go

* Update core/services/ocrcommon/data_source.go

---------

Co-authored-by: Patrick <patrick.huie@smartcontract.com>
Co-authored-by: Jordan Krage <jmank88@gmail.com>
Co-authored-by: Gheorghe Strimtu <studentcuza@gmail.com>
@mohamed-mehany @davidcauchi
Adds WeMix chain config (#10793)
48b9902 
* Adds WeMix testnet config

* Extending NoNewHeads threshold to 3s

* Adds WeMix contract loader

* Downgrading to go 1.20.5 bullseye

* Revert "Downgrading to go 1.20.5 bullseye"

This reverts commit 7eab839819456513dcf7f83ca8f08c97bdeb3835.

* Update testing branch

* Excludes fee delegation transactions for Wemix

* Update testing branch

* Linting

* Fix typo

* Update CTF

---------

Co-authored-by: davidcauchi <david.cauchi@smartcontract.com>
@RensR
fix mockery version (#11199)
cc308a1
@cedric-cordenier
[BCF-2632] Adapt median to POC (#11178)
302eb05
@cedric-cordenier
[fix] Pull in correct commit sha for pull request events (#11202)
b1c5a85
@cedric-cordenier
[chore] Pin to chainlink-relay@main (#11203)
031d9d2
@samsondav
Simple delete queue for mercury transmitter (#11182)
f6f3cfe
@EasterTheBunny @jmank88
Update SimulatedBackendClient CallContext (#11164)
8b4e0f8 
* Update SimulatedBackendClient CallContext

The function `CallContext` has different supported contract function calls than
`BatchCallContext` even though the latter is simply a batch version of the
former.

This commit makes the two functions match both in the supported calls, but also
in the validation and execution of those calls.

* Update core/chains/evm/client/simulated_backend_client.go

Use suggestion on default address returned on error.

Co-authored-by: Jordan Krage <jmank88@gmail.com>

* replace errors with panics

* align parameters to documentation, real-world RPCs, and the simulated backend client

* allow different receipt types

* comment on strong typing on result

* remove logic for handling incomplete transaction receipt handling on simulated backend client

* reduce panics in favor of errors

* remove commented code

---------

Co-authored-by: Jordan Krage <jmank88@gmail.com>
@FelixFan1992
add a TODO for 206 response parsing (#11188)
38de9a6
@friedemannf
Add zkSync support (#11162)
4e45a2a 
* feat(zksync): add custom error messages

* feat(zksync): add custom chain type to ignore 0x71 transaction type and commit default node config

* fix: add exhaustive case stmt for zkSync ChainType

* docs: regenerate CONFIG.md

* test: add zksync ChainType to expected output

* test: add test for custom zkSync tx type

* fix: reduce HistoryDepth setting to 5

* ci: trigger pipelines

* fix(zksync): also ignore tx type 0xff

* docs(zksync): regenerate CONFIG.md
@friedemannf
Bump libocr => 13e0202ae8d7e38245422aa93af82010390f9e9b (#11212)
e4b50ff 
* Bump libocr to 13e0202ae8d7e38245422aa93af82010390f9e9b

* go mod tidy
@tateexon
[TT-681] Remove usages of github.com/pkg/errors (#11213)
f5d6797
@tateexon
[TT-685] Enforce CTF version to be tag in the form v1.2.3 (#11209)
8c81f61
@kalverra
[TT-524] Separate Live Testnet Tests (#11196)
5af9bca 
* Separate Live Testnet Tests

* \n

* Remove typo

* Extrapolates building Chainlink image
@momentmaker
add lint and update tests for solidity foundry gha (#11184)
647ce13 
* add lint and update tests for solidity foundry gha

* fix typo

* fix typo

* refactor conditional into individual steps

* remove if statement for checkout repo and add comment
@kalverra
Removes Old Needs Check (#11220)
44f6d38 
* Removes old Needs Check

* Properly gate action
@anirudhwarrier
fix build-test-image action (#11225)
33b9d2a
@davidcauchi
Add baseFeeWei to logs (#11204)
ea27753
@ilija42
BCF-2749 add tests for ocr enhancedTelemetry service creation (#11206)
b5191f1 
* Add Enhanced telemetry is disabled log to newServicesMercury delegate

* Add test to check if eaTelemetry service was created in ocr servicseForSpec based on ocr spec flag
@Tofel
Log poller on demand streamlining (#11231)
c3e889f 
* move workflow to correct directory

* streamline on-demand values a bit

* get RPC urls and private keys from secrets

* download and run from inside the test folder

* checkout repo before running tests

* get inputs and mask them

* fix step ordering in workflow

* fix default image tag

* use latest pumba@CTF

* run one test

* fix directory name

* run on powerful runner

* add guide explaining how to use log poller tests

* update LP readme
@iljapavlovs
chore/VRF-722-externalise-oracleWithdraw-address (#11216)
7be2d65 
* VRF-722: made eoa address configurable which is used for VRF Key registration in VRF super scripts

* VRF-722: PR comments
@shileiwill
remove duplicate contracts (#11127)
c80fb93
@jmank88 @nolag
bump deps (#11148)
027068e 
* bump deps

- github.com/go-webauthn/webauthn v0.8.6

- github.com/prometheus/common v0.45.0

- github.com/prometheus/prometheus v0.47.2

- github.com/tidwall/gjson v1.17.0

- gonum.org/v1/gonum v0.14.0

* Use UnmarshalFirst to maintain compatibility

---------

Co-authored-by: Ryan Tinianov <tinianov@live.com>
@cedric-cordenier
Randomize database names when using heavyweight ORM (#11233)
4ccd1c5
@jmank88
core/store/migration/migrations: rm last sqlx.NewTx use (#11230)
5d4961b
@justinkaseman
(test): Amend Functions onTokenTransferTest to be able to fuzz with f…
b8caeda 
…ull LINK supply (#11234)
RensR
RensR reviewed Dec 18, 2023
View reviewed changes
docs/CONFIG.md Outdated Show resolved Hide resolved
RensR
RensR reviewed Dec 18, 2023
View reviewed changes
docs/CONFIG.md Outdated
@@ -3628,164 +3626,6 @@ GasLimit = 5300000

</p></details>

<details><summary>WeMix Mainnet (1111)</summary><p>
Copy link
Collaborator

Choose a reason for hiding this comment

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

?

Copy link
Contributor

Choose a reason for hiding this comment

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

I think this may be due to some alphabetical order changes, this is still in the file, just in another location. See https://raw.githubusercontent.com/smartcontractkit/ccip/147721d5e1490d1cde18454da026f7a8804618f8/docs/CONFIG.md and CTRL+F for "WeMix Mainnet" and you'll find it.

RensR
RensR reviewed Dec 18, 2023
View reviewed changes
docs/CONFIG.md Outdated Show resolved Hide resolved
RensR
RensR reviewed Dec 18, 2023
View reviewed changes
integration-tests/ccip-tests/testconfig/global.go Outdated
@@ -7,9 +7,13 @@ import (
"fmt"

"github.com/AlekSi/pointer"

Copy link
Collaborator

Choose a reason for hiding this comment

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

What happened 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.

With this PR integration-tests workflow introduced lint checks. All integration-tests/ccip-tests changes are to fix lint erros.

Copy link
Collaborator

Choose a reason for hiding this comment

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

I mean all the imports have newline where they shouldn't have. Not really sure how that happens when these are the only changes made

@github-actions GitHub Actions
Copy link
Contributor

LCOV of commit 89919c2 during Solidity Foundry #1842

Summary coverage rate:
  lines......: 98.8% (927 of 938 lines)
  functions..: 95.0% (192 of 202 functions)
  branches...: 92.0% (366 of 398 branches)

Files changed coverage rate: n/a

@AnieeG AnieeG marked this pull request as ready for review December 18, 2023 17:45
@makramkd
fix issues
ed12f05 
fix integration-tests/go.mod

fix imports
@github-actions GitHub Actions
Copy link
Contributor

LCOV of commit ed12f05 during Solidity Foundry #1846

Summary coverage rate:
  lines......: 98.8% (927 of 938 lines)
  functions..: 95.0% (192 of 202 functions)
  branches...: 92.0% (366 of 398 branches)

Files changed coverage rate: n/a

@github-actions GitHub Actions
Copy link
Contributor

LCOV of commit 815fadd during Solidity Foundry #1857

Summary coverage rate:
  lines......: 98.8% (927 of 938 lines)
  functions..: 95.0% (192 of 202 functions)
  branches...: 92.0% (366 of 398 branches)

Files changed coverage rate: n/a

@github-actions GitHub Actions
Copy link
Contributor

LCOV of commit 02c32bd during Solidity Foundry #1859

Summary coverage rate:
  lines......: 98.8% (927 of 938 lines)
  functions..: 95.0% (192 of 202 functions)
  branches...: 92.0% (366 of 398 branches)

Files changed coverage rate: n/a

@github-actions GitHub Actions
Copy link
Contributor

LCOV of commit 46dab8f during Solidity Foundry #1861

Summary coverage rate:
  lines......: 98.8% (927 of 938 lines)
  functions..: 95.0% (192 of 202 functions)
  branches...: 92.0% (366 of 398 branches)

Files changed coverage rate: n/a

@makramkd makramkd force-pushed the ccip-1449-merge branch 2 times, most recently from 98b860a to c14b2f7 Compare December 19, 2023 13:50
@github-actions GitHub Actions
Copy link
Contributor

LCOV of commit 98b860a during Solidity Foundry #1862

Summary coverage rate:
  lines......: 98.8% (927 of 938 lines)
  functions..: 95.0% (192 of 202 functions)
  branches...: 92.0% (366 of 398 branches)

Files changed coverage rate: n/a

@github-actions GitHub Actions
Copy link
Contributor

LCOV of commit c14b2f7 during Solidity Foundry #1863

Summary coverage rate:
  lines......: 98.8% (927 of 938 lines)
  functions..: 95.0% (192 of 202 functions)
  branches...: 92.0% (366 of 398 branches)

Files changed coverage rate: n/a

@github-actions GitHub Actions
Copy link
Contributor

LCOV of commit 7dd322e during Solidity Foundry #1865

Summary coverage rate:
  lines......: 98.8% (927 of 938 lines)
  functions..: 95.0% (192 of 202 functions)
  branches...: 92.0% (366 of 398 branches)

Files changed coverage rate: n/a

@makramkd makramkd merged commit 80af8e3 into ccip-develop Dec 19, 2023
64 of 65 checks passed
@makramkd makramkd deleted the ccip-1449-merge branch December 19, 2023 15:42
asoliman92 pushed a commit that referenced this pull request Jul 31, 2024
@makramkd
Merge with core (#384)
327bf91
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@makramkd makramkd makramkd left review comments

@kalverra kalverra kalverra approved these changes

@RensR RensR RensR approved these changes

@connorwstein connorwstein Awaiting requested review from connorwstein

@jasonmci jasonmci Awaiting requested review from jasonmci

@matYang matYang Awaiting requested review from matYang

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.