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

core/capabilities/ccip: bump chainlink-ccip #1284

Merged
merged 5 commits into from
Aug 12, 2024

Conversation

makramkd
Copy link
Contributor

Motivation

Recent merges to chainlink-ccip have caused the integration test to break.

Solution

Include the gas estimator changes required as well as some token data reader changes.

Include fixes from smartcontractkit/chainlink-ccip#60

@@ -0,0 +1,23 @@
package superfakes
Copy link
Contributor

@asoliman92 asoliman92 Aug 12, 2024

Choose a reason for hiding this comment

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

What's with the package name? mocks or something makes more sense to me.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Its not really a mock, made this the pkg name mainly because it is hopefully short lived

Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe add a TODO in case it's forgotten.

Comment on lines +44 to +53
{
name: "allowOOO set to true makes no difference to final gas estimate",
args: args{dataLen: 5, numTokens: 2, extraArgs: makeExtraArgsV2(200_000, true)},
want: 1_022_264,
},
{
name: "allowOOO set to false makes no difference to final gas estimate",
args: args{dataLen: 5, numTokens: 2, extraArgs: makeExtraArgsV2(200_000, false)},
want: 1_022_264,
},
Copy link
Contributor Author

Choose a reason for hiding this comment

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

These test cases are new

Comment on lines +98 to +105
{
name: "v2 extra args",
numRequests: 3,
dataLength: len([]byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0}),
numberOfTokens: 1,
extraArgs: makeExtraArgsV2(200_000, true),
want: 678_508,
},
Copy link
Contributor Author

Choose a reason for hiding this comment

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

As is this

@makramkd makramkd merged commit b1db2a0 into ccip-develop Aug 12, 2024
109 checks passed
@makramkd makramkd deleted the mk/bump-chainlink-ccip branch August 12, 2024 17:28
dhaidashenko pushed a commit that referenced this pull request Sep 2, 2024
## Motivation

Recent merges to chainlink-ccip have caused the integration test to
break.

## Solution

Include the gas estimator changes required as well as some token data
reader changes.

Include fixes from
smartcontractkit/chainlink-ccip#60
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.

3 participants