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

Refactor MockCCIPRouter to support EVMExtraArgsV2 #1532

Open
wants to merge 8 commits into
base: ccip-develop
Choose a base branch
from
Open

Refactor MockCCIPRouter to support EVMExtraArgsV2 #1532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
daaf3c8
feat: refactor MockCCIPRouter to support EVMExtraArgsV2
andrejrakic Nov 12, 2024
a304dcd
Merge branch 'ccip-develop' into ccip-develop
RensR Nov 18, 2024
456fd79
chore: Ran make snapshot
andrejrakic Nov 18, 2024
30a37ee
fix: forge fmt MockCCIPRouter
andrejrakic Nov 18, 2024
8bac965
fix: fix CI issues with forge fmt
andrejrakic Nov 18, 2024
7116e1e
fix: Add extra blank line to satisfy forge fmt CI
andrejrakic Nov 18, 2024
6665d36
fix: Re-run make snapshot with the correct foundry version
andrejrakic Nov 18, 2024
6dc2ff7
Merge branch 'smartcontractkit:ccip-develop' into ccip-develop
andrejrakic Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions contracts/gas-snapshots/ccip.gas-snapshot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,11 +482,14 @@ MerkleMultiProofTest:test_EmptyLeaf_Revert() (gas: 3585)
MerkleMultiProofTest:test_MerkleRoot256() (gas: 394891)
MerkleMultiProofTest:test_MerkleRootSingleLeaf_Success() (gas: 3661)
MerkleMultiProofTest:test_SpecSync_gas() (gas: 34129)
MockRouterTest:test_ccipSendWithEVMExtraArgsV1_Success() (gas: 110073)
MockRouterTest:test_ccipSendWithEVMExtraArgsV2_Success() (gas: 132614)
MockRouterTest:test_ccipSendWithInsufficientNativeTokens_Revert() (gas: 34037)
MockRouterTest:test_ccipSendWithInvalidMsgValue_Revert() (gas: 60842)
MockRouterTest:test_ccipSendWithLinkFeeTokenAndValidMsgValue_Success() (gas: 126576)
MockRouterTest:test_ccipSendWithLinkFeeTokenbutInsufficientAllowance_Revert() (gas: 63455)
MockRouterTest:test_ccipSendWithSufficientNativeFeeTokens_Success() (gas: 44012)
MockRouterTest:test_ccipSendWithInvalidEVMExtraArgs_Revert() (gas: 106684)
MockRouterTest:test_ccipSendWithInvalidMsgValue_Revert() (gas: 60864)
MockRouterTest:test_ccipSendWithLinkFeeTokenAndValidMsgValue_Success() (gas: 126685)
MockRouterTest:test_ccipSendWithLinkFeeTokenbutInsufficientAllowance_Revert() (gas: 63477)
MockRouterTest:test_ccipSendWithSufficientNativeFeeTokens_Success() (gas: 44048)
MultiAggregateRateLimiter_applyRateLimiterConfigUpdates:test_MultipleConfigsBothLanes_Success() (gas: 133528)
MultiAggregateRateLimiter_applyRateLimiterConfigUpdates:test_MultipleConfigs_Success() (gas: 315630)
MultiAggregateRateLimiter_applyRateLimiterConfigUpdates:test_OnlyCallableByOwner_Revert() (gas: 17864)
Expand Down
15 changes: 11 additions & 4 deletions contracts/src/v0.8/ccip/test/mocks/MockRouter.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,19 @@ contract MockCCIPRouter is IRouter, IRouterClient {
return mockMsgId;
}

function _fromBytes(bytes calldata extraArgs) internal pure returns (Client.EVMExtraArgsV1 memory) {
function _fromBytes(bytes calldata extraArgs) internal pure returns (Client.EVMExtraArgsV2 memory) {
if (extraArgs.length == 0) {
return Client.EVMExtraArgsV1({gasLimit: DEFAULT_GAS_LIMIT});
return Client.EVMExtraArgsV2({gasLimit: DEFAULT_GAS_LIMIT, allowOutOfOrderExecution: false});
}
if (bytes4(extraArgs) != Client.EVM_EXTRA_ARGS_V1_TAG) revert InvalidExtraArgsTag();
return abi.decode(extraArgs[4:], (Client.EVMExtraArgsV1));

bytes4 extraArgsTag = bytes4(extraArgs);
if (extraArgsTag == Client.EVM_EXTRA_ARGS_V2_TAG) {
return abi.decode(extraArgs[4:], (Client.EVMExtraArgsV2));
} else if (extraArgsTag == Client.EVM_EXTRA_ARGS_V1_TAG) {
return Client.EVMExtraArgsV2({gasLimit: abi.decode(extraArgs[4:], (uint256)), allowOutOfOrderExecution: false});
}

revert InvalidExtraArgsTag();
}

/// @notice Always returns true to make sure this check can be performed on any chain.
Expand Down
20 changes: 20 additions & 0 deletions contracts/src/v0.8/ccip/test/mocks/test/MockRouterTest.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,24 @@ contract MockRouterTest is TokenSetup {

mockRouter.ccipSend(mockChainSelector, message);
}

function test_ccipSendWithEVMExtraArgsV1_Success() public {
Client.EVMExtraArgsV1 memory extraArgs = Client.EVMExtraArgsV1({gasLimit: 500_000});
message.extraArgs = Client._argsToBytes(extraArgs);
mockRouter.ccipSend{value: 0.1 ether}(mockChainSelector, message);
}

function test_ccipSendWithEVMExtraArgsV2_Success() public {
Client.EVMExtraArgsV2 memory extraArgs = Client.EVMExtraArgsV2({gasLimit: 500_000, allowOutOfOrderExecution: true});
message.extraArgs = Client._argsToBytes(extraArgs);
mockRouter.ccipSend{value: 0.1 ether}(mockChainSelector, message);
}

function test_ccipSendWithInvalidEVMExtraArgs_Revert() public {
uint256 gasLimit = 500_000;
bytes4 invalidExtraArgsTag = bytes4(keccak256("CCIP EVMExtraArgsInvalid"));
message.extraArgs = abi.encodeWithSelector(invalidExtraArgsTag, gasLimit);
vm.expectRevert(MockCCIPRouter.InvalidExtraArgsTag.selector);
mockRouter.ccipSend{value: 0.1 ether}(mockChainSelector, message);
}
}
Loading