-
Notifications
You must be signed in to change notification settings - Fork 1.7k
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
Fixes to capabilities and contracts merges [CCIP-2946] #14266
Fixes to capabilities and contracts merges [CCIP-2946] #14266
Conversation
This reverts commit d6e0b04.
Error: integration-tests/actions/actions.go:493:88: not enough arguments in call to seth.Decode have (unknown type) want (*"github.com/ethereum/go-ethereum/core/types".Transaction, error) (typecheck) decodedTx, err := seth.Decode(operatorFactoryInstance.DeployNewOperatorAndForwarder())
Changes in this PR are almost identical to the
There seem to be some formatting differences on these two files. |
d0d3e58
to
75aa738
Compare
Quality Gate passedIssues Measures |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ran again with the latest commit and these directories are now identical.
I'm not sure how to review the other changes exactly. Since they're being merged into the feature branch, I think they can be reviewed in the next PR.
Relates to #14260
This fixes all conflicts and makes sure that contracts and gethwrappers are identical to the ones on CCIP.
To review this PR you need the following:
./check-diff.sh contracts/src/v0.8/ccip
expected output:
Then
./check-diff.sh core/gethwrappers/ccip
expected ouptut:
Script:
For this reason both forge fmt and solidity lint are failing the CI checks. We're taking identical copy and we're not interested in formatting them for now to make it easier reviewing the branch.
Once both are good to go please review the offchain changes and any other changes.