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

CCIP-4223 bubble up revert for estimation #15504

Open
wants to merge 12 commits into
base: develop
Choose a base branch
from
Open

CCIP-4223 bubble up revert for estimation #15504

wants to merge 12 commits into from
+141 −41

Conversation

0xsuryansh
Copy link
Member

@0xsuryansh 0xsuryansh commented Dec 4, 2024 •
edited
Loading

PR adds logic to bubble up the revert when gas estimation address Is address(1)

@0xsuryansh 0xsuryansh changed the title feat: fix estimation by adding a reverting clause CCIP-4223 fix estimation by adding a reverting clause Dec 4, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 4, 2024 •
edited
Loading

Static analysis results are available

Hey @0xsuryansh, you can view Slither reports in the job summary here or download them as artifact here.
Please check them before merging and make sure you have addressed all issues.

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 4, 2024 •
edited
Loading

Solidity Review Jira issue

Hey! We have taken the liberty to link this PR to a Jira issue for Solidity Review.

This is a new feature, that's currently in the pilot phase, so please make sure that the linkage is correct. In a contrary case, please update it manually in JIRA and replace Solidity Review issue key in the changeset file with the correct one.
Please reach out to the Test Tooling team and notify them about any issues you encounter.

Any changes to the Solidity Review Jira issue should be reflected in the changeset file. If you need to update the issue key, please do so manually in the following changeset file: contracts/.changeset/twelve-pianos-chew.md

This PR has been linked to Solidity Review Jira issue: CCIP-3966

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 4, 2024 •
edited
Loading

AER Report: CI Core ran successfully ✅

aer_workflow , commit

AER Report: Operator UI CI ran successfully ✅

aer_workflow , commit

@0xsuryansh
Merge branch 'develop' into CCIP-4223_fix-gas-estimation
a76641b 
# Conflicts:
#	contracts/gas-snapshots/ccip.gas-snapshot
#	core/gethwrappers/ccip/generated/multi_ocr3_helper/multi_ocr3_helper.go
#	core/gethwrappers/ccip/generated/offramp/offramp.go
#	core/gethwrappers/ccip/generation/generated-wrapper-dependency-versions-do-not-edit.txt
@0xsuryansh
updates wrapper and gas snapshot
3db41bf
@0xsuryansh
add tests
d1f8ec9
@0xsuryansh
fix test vars
5686b69
@0xsuryansh 0xsuryansh marked this pull request as ready for review December 9, 2024 12:34
@0xsuryansh 0xsuryansh requested a review from a team as a code owner December 9, 2024 12:34
@0xsuryansh 0xsuryansh requested a review from RensR December 9, 2024 12:35
@0xsuryansh 0xsuryansh requested review from a team as code owners December 9, 2024 13:05
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 9, 2024

Flakeguard Summary

Setting Value
Project github.com/smartcontractkit/chainlink/v2
Max Pass Ratio 100.00%
Test Run Count 3
Race Detection false
Excluded Tests TestChainComponents

Found Flaky Tests ❌

Category Total
Tests 1
Panicked Tests 0
Raced Tests 0
Flaky Tests 1
Flaky Test Ratio 100.00%
Runs 3
Passes 0
Failures 3
Skips 0
Pass Ratio 0.00%
Name Pass Ratio Panicked? Timed Out? Race? Runs Successes Failures Skips Package Package Panicked? Avg Duration Code Owners
TestDeployAllV1_6 0.00% false false false 3 0 3 0 github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/deployment_test false 136.666666ms @smartcontractkit/ccip-onchain

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 9, 2024

Flakeguard Summary

Setting Value
Project github.com/smartcontractkit/chainlink/v2
Max Pass Ratio 100.00%
Test Run Count 3
Race Detection false
Excluded Tests TestChainComponents

Found Flaky Tests ❌

Category Total
Tests 1
Panicked Tests 0
Raced Tests 0
Flaky Tests 1
Flaky Test Ratio 100.00%
Runs 3
Passes 0
Failures 3
Skips 0
Pass Ratio 0.00%
Name Pass Ratio Panicked? Timed Out? Race? Runs Successes Failures Skips Package Package Panicked? Avg Duration Code Owners
TestDeployAllV1_6 0.00% false false false 3 0 3 0 github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/deployment_test false 133.333333ms @smartcontractkit/ccip-onchain

@0xsuryansh 0xsuryansh force-pushed the CCIP-4223_fix-gas-estimation branch from 9b8c6c9 to 5686b69 Compare December 9, 2024 13:48
jhweintraub
jhweintraub requested changes Dec 9, 2024
View reviewed changes
contracts/src/v0.8/ccip/ocr/MultiOCR3Base.sol
constructor() {
i_chainID = block.chainid;
i_gasEstimationSender = address(1);
Copy link
Collaborator

Choose a reason for hiding this comment

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

can you include a comment as to why this is being set as address(1) please.

Copy link
Contributor

Choose a reason for hiding this comment

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

Why do we use a hard coded value to set an immutable value? Doesn't that mean it's simply a constant?

contracts/src/v0.8/ccip/test/offRamp/OffRamp/OffRamp.trialExecute.t.sol Outdated
@@ -1,13 +1,14 @@
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.24;

import {CallWithExactGas} from "../../../../shared/call/CallWithExactGas.sol";
import {IERC20} from "../../../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
Copy link
Collaborator

Choose a reason for hiding this comment

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

nit: order should be interfaces, other, vendor at the bottom for IERC20

contracts/src/v0.8/ccip/test/offRamp/OffRamp/OffRamp.trialExecute.t.sol Show resolved Hide resolved
@0xsuryansh 0xsuryansh changed the title CCIP-4223 fix estimation by adding a reverting clause CCIP-4223 bubble up revert for estimation Dec 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jhweintraub jhweintraub jhweintraub requested changes

@RensR RensR Awaiting requested review from RensR

@krehermann krehermann Awaiting requested review from krehermann krehermann was automatically assigned from smartcontractkit/foundations

@winder winder Awaiting requested review from winder winder was automatically assigned from smartcontractkit/ccip-offchain

@rstout rstout Awaiting requested review from rstout rstout was automatically assigned from smartcontractkit/ccip-offchain

@asoliman92 asoliman92 Awaiting requested review from asoliman92 asoliman92 was automatically assigned from smartcontractkit/ccip-offchain

@makramkd makramkd Awaiting requested review from makramkd makramkd was automatically assigned from smartcontractkit/ccip-offchain

@dimkouv dimkouv Awaiting requested review from dimkouv dimkouv was automatically assigned from smartcontractkit/ccip-offchain

@mateusz-sekara mateusz-sekara Awaiting requested review from mateusz-sekara mateusz-sekara was automatically assigned from smartcontractkit/ccip-offchain

@0xnogo 0xnogo Awaiting requested review from 0xnogo 0xnogo was automatically assigned from smartcontractkit/ccip-offchain

Requested changes must be addressed to merge this pull request.

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

Successfully merging this pull request may close these issues.
3 participants
@0xsuryansh @RensR @jhweintraub