Supplementary checks for sufficient native token fees on MockRouter #828
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
LCOV of commit
|
RensR
reviewed
May 10, 2024
RensR
reviewed
May 10, 2024
RensR
reviewed
May 10, 2024
RensR
reviewed
May 10, 2024
RensR
reviewed
May 10, 2024
RensR
reviewed
May 10, 2024
matYang
reviewed
May 13, 2024
matYang
reviewed
May 13, 2024
RensR
reviewed
May 16, 2024
RensR
reviewed
May 16, 2024
RensR
reviewed
May 16, 2024
RensR
reviewed
May 16, 2024
RensR
reviewed
May 16, 2024
matYang
reviewed
May 20, 2024
| } | ||
|
|
||
| function test_ccipSendWithInsufficientNativeTokens_Revert() public { | ||
| //Should revert because did not include sufficient eth to pay for fees |
There was a problem hiding this comment.
nit: //[space]comments, same above and below
| @@ -28,6 +28,8 @@ contract MockCCIPRouter is IRouter, IRouterClient { | |||
| uint16 public constant GAS_FOR_CALL_EXACT_CHECK = 5_000; | |||
| uint64 public constant DEFAULT_GAS_LIMIT = 200_000; | |||
|
|
|||
| uint256 internal s_MockFeeTokenAmount; //use setFee() to change to non-zero to test fees | |||
| uint256 feeTokenAmount = getFee(destinationChainSelector, message); | ||
| if (msg.value < feeTokenAmount) revert InsufficientFeeTokenAmount(); | ||
| } else { | ||
| if (msg.value > 0) revert InvalidMsgValue(); |
There was a problem hiding this comment.
I know it's not part of original scope, if user is sending non-native fee token, e.g. LINK, we'd want to make sure their test covers token approvals, can we add something like IERC20(message.feeToken).safeTransferFrom(msg.sender, address(this), feeTokenAmount); and corresponding tests
RensR
approved these changes
May 21, 2024
auto-merge was automatically disabled
May 21, 2024 21:41
Pull request was closed
jhweintraub
force-pushed
the
chore/2261-mockRouter-feeToken-checks
branch
from
c4ad9e4
to
3160ab3
Compare
jhweintraub
requested review from
gtklocker,
kaleofduty,
amirylm,
RyanRHall,
infiloop2,
a team and
jasonmci
as code owners
This was referenced May 21, 2024
jhweintraub
added a commit
that referenced
this pull request
May 22, 2024
…896) ## Motivation Clean PR with every commit signed from #828 ## Solution Added support in MockCCIPRouter contract for supplementary fee-checks in ccipSend. Function now includes toggle-able fees for users to check their contract interactions. If feeToken is the native gas token of the chain, supplementary check is included that msg.value > getFee()
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation
Issue #755
Solution
Added support in MockCCIPRouter contract for supplementary fee-checks in
ccipSend. Function now includes toggle-able fees for users to check their contract interactions. IffeeTokenis the native gas token of the chain, supplementary check is included thatmsg.value > getFee()constant
FEE_ENABLEDin MockRouter.sol can be enabled for testing with fees of0.1 etherfor native gas Tokens and1e18otherwise.