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-3899 fix sender encoding #14877

Merged
merged 8 commits into from
Oct 23, 2024
+101 −76
Merged

CCIP-3899 fix sender encoding #14877

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f0d3304
CCIP-3899 fix sender encoding and comments
0xsuryansh Oct 22, 2024
08dbc03
changeset for contracts
0xsuryansh Oct 22, 2024
931927c
formatting fix
0xsuryansh Oct 22, 2024
fc5e874
Merge branch 'develop' into CCIP-3899_fix-sender-encoding
0xsuryansh Oct 23, 2024
91d5b14
snapshot & wrapper
0xsuryansh Oct 23, 2024
72a3e58
update workflow to include --ir-minimum
0xsuryansh Oct 23, 2024
843618e
Revert "update workflow to include --ir-minimum"
0xsuryansh Oct 23, 2024
90f457c
update workflow to include --ir-minimum
0xsuryansh Oct 23, 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
7 changes: 7 additions & 0 deletions contracts/.changeset/thin-owls-hug.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@chainlink/contracts': minor
---

#internal fix sender encoding and comments in CCIP Any2EVMMEssage and corrected comments

PR issue: CCIP-3899
140 changes: 70 additions & 70 deletions contracts/gas-snapshots/ccip.gas-snapshot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ CCIPHome_setCandidate:test_setCandidate_ConfigDigestMismatch_reverts() (gas: 139
CCIPHome_setCandidate:test_setCandidate_success() (gas: 1365381)
DefensiveExampleTest:test_HappyPath_Success() (gas: 200048)
DefensiveExampleTest:test_Recovery() (gas: 424306)
E2E:test_E2E_3MessagesMMultiOffRampSuccess_gas() (gas: 1518589)
E2E:test_E2E_3MessagesMMultiOffRampSuccess_gas() (gas: 1516906)
EtherSenderReceiverTest_ccipReceive:test_ccipReceive_fallbackToWethTransfer() (gas: 96909)
EtherSenderReceiverTest_ccipReceive:test_ccipReceive_happyPath() (gas: 49796)
EtherSenderReceiverTest_ccipReceive:test_ccipReceive_wrongToken() (gas: 17435)
Expand Down Expand Up @@ -332,12 +332,12 @@ NonceManager_NonceIncrementation:test_getIncrementedOutboundNonce_Success() (gas
NonceManager_NonceIncrementation:test_incrementInboundNonce_Skip() (gas: 23706)
NonceManager_NonceIncrementation:test_incrementInboundNonce_Success() (gas: 38778)
NonceManager_NonceIncrementation:test_incrementNoncesInboundAndOutbound_Success() (gas: 71901)
NonceManager_OffRampUpgrade:test_NoPrevOffRampForChain_Success() (gas: 186535)
NonceManager_OffRampUpgrade:test_UpgradedNonceNewSenderStartsAtZero_Success() (gas: 189890)
NonceManager_OffRampUpgrade:test_UpgradedNonceStartsAtV1Nonce_Success() (gas: 253684)
NonceManager_OffRampUpgrade:test_UpgradedOffRampNonceSkipsIfMsgInFlight_Success() (gas: 221424)
NonceManager_OffRampUpgrade:test_NoPrevOffRampForChain_Success() (gas: 185977)
NonceManager_OffRampUpgrade:test_UpgradedNonceNewSenderStartsAtZero_Success() (gas: 189332)
NonceManager_OffRampUpgrade:test_UpgradedNonceStartsAtV1Nonce_Success() (gas: 252568)
NonceManager_OffRampUpgrade:test_UpgradedOffRampNonceSkipsIfMsgInFlight_Success() (gas: 220866)
NonceManager_OffRampUpgrade:test_UpgradedSenderNoncesReadsPreviousRamp_Success() (gas: 60382)
NonceManager_OffRampUpgrade:test_Upgraded_Success() (gas: 153546)
NonceManager_OffRampUpgrade:test_Upgraded_Success() (gas: 152988)
NonceManager_OnRampUpgrade:test_UpgradeNonceNewSenderStartsAtZero_Success() (gas: 166058)
NonceManager_OnRampUpgrade:test_UpgradeNonceStartsAtV1Nonce_Success() (gas: 195655)
NonceManager_OnRampUpgrade:test_UpgradeSenderNoncesReadsPreviousRamp_Success() (gas: 139121)
Expand All @@ -349,7 +349,7 @@ NonceManager_applyPreviousRampsUpdates:test_PreviousRampAlreadySetOnRamp_Revert(
NonceManager_applyPreviousRampsUpdates:test_SingleRampUpdate() (gas: 66660)
NonceManager_applyPreviousRampsUpdates:test_ZeroInput() (gas: 12090)
NonceManager_typeAndVersion:test_typeAndVersion() (gas: 9705)
OffRamp_afterOC3ConfigSet:test_afterOCR3ConfigSet_SignatureVerificationDisabled_Revert() (gas: 5914022)
OffRamp_afterOC3ConfigSet:test_afterOCR3ConfigSet_SignatureVerificationDisabled_Revert() (gas: 5907003)
OffRamp_applySourceChainConfigUpdates:test_AddMultipleChains_Success() (gas: 626106)
OffRamp_applySourceChainConfigUpdates:test_AddNewChain_Success() (gas: 166490)
OffRamp_applySourceChainConfigUpdates:test_ApplyZeroUpdates_Success() (gas: 16741)
Expand All @@ -359,22 +359,22 @@ OffRamp_applySourceChainConfigUpdates:test_ReplaceExistingChain_Success() (gas:
OffRamp_applySourceChainConfigUpdates:test_RouterAddress_Revert() (gas: 13463)
OffRamp_applySourceChainConfigUpdates:test_ZeroOnRampAddress_Revert() (gas: 72746)
OffRamp_applySourceChainConfigUpdates:test_ZeroSourceChainSelector_Revert() (gas: 15519)
OffRamp_batchExecute:test_MultipleReportsDifferentChainsSkipCursedChain_Success() (gas: 177991)
OffRamp_batchExecute:test_MultipleReportsDifferentChains_Success() (gas: 335638)
OffRamp_batchExecute:test_MultipleReportsSameChain_Success() (gas: 278882)
OffRamp_batchExecute:test_MultipleReportsSkipDuplicate_Success() (gas: 169365)
OffRamp_batchExecute:test_OutOfBoundsGasLimitsAccess_Revert() (gas: 189033)
OffRamp_batchExecute:test_SingleReport_Success() (gas: 157122)
OffRamp_batchExecute:test_Unhealthy_Success() (gas: 554234)
OffRamp_batchExecute:test_MultipleReportsDifferentChainsSkipCursedChain_Success() (gas: 177433)
OffRamp_batchExecute:test_MultipleReportsDifferentChains_Success() (gas: 333964)
OffRamp_batchExecute:test_MultipleReportsSameChain_Success() (gas: 277208)
OffRamp_batchExecute:test_MultipleReportsSkipDuplicate_Success() (gas: 168807)
OffRamp_batchExecute:test_OutOfBoundsGasLimitsAccess_Revert() (gas: 187917)
OffRamp_batchExecute:test_SingleReport_Success() (gas: 156564)
OffRamp_batchExecute:test_Unhealthy_Success() (gas: 553110)
OffRamp_batchExecute:test_ZeroReports_Revert() (gas: 10600)
OffRamp_ccipReceive:test_Reverts() (gas: 15407)
OffRamp_commit:test_CommitOnRampMismatch_Revert() (gas: 92905)
OffRamp_commit:test_FailedRMNVerification_Reverts() (gas: 61590)
OffRamp_commit:test_InvalidIntervalMinLargerThanMax_Revert() (gas: 68151)
OffRamp_commit:test_InvalidInterval_Revert() (gas: 64291)
OffRamp_commit:test_InvalidRootRevert() (gas: 63356)
OffRamp_commit:test_NoConfigWithOtherConfigPresent_Revert() (gas: 6674770)
OffRamp_commit:test_NoConfig_Revert() (gas: 6258376)
OffRamp_commit:test_NoConfigWithOtherConfigPresent_Revert() (gas: 6667751)
OffRamp_commit:test_NoConfig_Revert() (gas: 6251357)
OffRamp_commit:test_OnlyGasPriceUpdates_Success() (gas: 113033)
OffRamp_commit:test_OnlyPriceUpdateStaleReport_Revert() (gas: 121381)
OffRamp_commit:test_OnlyTokenPriceUpdates_Success() (gas: 113032)
Expand All @@ -388,79 +388,79 @@ OffRamp_commit:test_UnauthorizedTransmitter_Revert() (gas: 125387)
OffRamp_commit:test_Unhealthy_Revert() (gas: 58656)
OffRamp_commit:test_ValidPriceUpdateThenStaleReportWithRoot_Success() (gas: 206691)
OffRamp_commit:test_ZeroEpochAndRound_Revert() (gas: 51722)
OffRamp_constructor:test_Constructor_Success() (gas: 6219776)
OffRamp_constructor:test_SourceChainSelector_Revert() (gas: 135943)
OffRamp_constructor:test_ZeroChainSelector_Revert() (gas: 103375)
OffRamp_constructor:test_ZeroNonceManager_Revert() (gas: 101251)
OffRamp_constructor:test_ZeroOnRampAddress_Revert() (gas: 161468)
OffRamp_constructor:test_ZeroRMNRemote_Revert() (gas: 101189)
OffRamp_constructor:test_ZeroTokenAdminRegistry_Revert() (gas: 101204)
OffRamp_constructor:test_Constructor_Success() (gas: 6212757)
OffRamp_constructor:test_SourceChainSelector_Revert() (gas: 135933)
OffRamp_constructor:test_ZeroChainSelector_Revert() (gas: 103365)
OffRamp_constructor:test_ZeroNonceManager_Revert() (gas: 101241)
OffRamp_constructor:test_ZeroOnRampAddress_Revert() (gas: 161459)
OffRamp_constructor:test_ZeroRMNRemote_Revert() (gas: 101179)
OffRamp_constructor:test_ZeroTokenAdminRegistry_Revert() (gas: 101194)
OffRamp_execute:test_IncorrectArrayType_Revert() (gas: 17639)
OffRamp_execute:test_LargeBatch_Success() (gas: 3426335)
OffRamp_execute:test_MultipleReportsWithPartialValidationFailures_Success() (gas: 372990)
OffRamp_execute:test_MultipleReports_Success() (gas: 300979)
OffRamp_execute:test_NoConfigWithOtherConfigPresent_Revert() (gas: 7083599)
OffRamp_execute:test_NoConfig_Revert() (gas: 6308074)
OffRamp_execute:test_LargeBatch_Success() (gas: 3409595)
OffRamp_execute:test_MultipleReportsWithPartialValidationFailures_Success() (gas: 371194)
OffRamp_execute:test_MultipleReports_Success() (gas: 299305)
OffRamp_execute:test_NoConfigWithOtherConfigPresent_Revert() (gas: 7076022)
OffRamp_execute:test_NoConfig_Revert() (gas: 6300497)
OffRamp_execute:test_NonArray_Revert() (gas: 27562)
OffRamp_execute:test_SingleReport_Success() (gas: 176354)
OffRamp_execute:test_UnauthorizedTransmitter_Revert() (gas: 148372)
OffRamp_execute:test_WrongConfigWithSigners_Revert() (gas: 7086348)
OffRamp_execute:test_SingleReport_Success() (gas: 175796)
OffRamp_execute:test_UnauthorizedTransmitter_Revert() (gas: 147814)
OffRamp_execute:test_WrongConfigWithSigners_Revert() (gas: 7078771)
OffRamp_execute:test_ZeroReports_Revert() (gas: 17361)
OffRamp_executeSingleMessage:test_MessageSender_Revert() (gas: 18511)
OffRamp_executeSingleMessage:test_NonContractWithTokens_Success() (gas: 244079)
OffRamp_executeSingleMessage:test_NonContract_Success() (gas: 20781)
OffRamp_executeSingleMessage:test_TokenHandlingError_Revert() (gas: 205116)
OffRamp_executeSingleMessage:test_ZeroGasDONExecution_Revert() (gas: 49306)
OffRamp_executeSingleMessage:test_executeSingleMessage_NoTokens_Success() (gas: 48750)
OffRamp_executeSingleMessage:test_executeSingleMessage_WithFailingValidationNoRouterCall_Revert() (gas: 218006)
OffRamp_executeSingleMessage:test_executeSingleMessage_WithFailingValidation_Revert() (gas: 85296)
OffRamp_executeSingleMessage:test_executeSingleMessage_WithTokens_Success() (gas: 274196)
OffRamp_executeSingleMessage:test_executeSingleMessage_WithVInterception_Success() (gas: 91724)
OffRamp_executeSingleMessage:test_MessageSender_Revert() (gas: 18515)
OffRamp_executeSingleMessage:test_NonContractWithTokens_Success() (gas: 243683)
OffRamp_executeSingleMessage:test_NonContract_Success() (gas: 20389)
OffRamp_executeSingleMessage:test_TokenHandlingError_Revert() (gas: 205120)
OffRamp_executeSingleMessage:test_ZeroGasDONExecution_Revert() (gas: 48752)
OffRamp_executeSingleMessage:test_executeSingleMessage_NoTokens_Success() (gas: 55912)
OffRamp_executeSingleMessage:test_executeSingleMessage_WithFailingValidationNoRouterCall_Revert() (gas: 217464)
OffRamp_executeSingleMessage:test_executeSingleMessage_WithFailingValidation_Revert() (gas: 84754)
OffRamp_executeSingleMessage:test_executeSingleMessage_WithTokens_Success() (gas: 273642)
OffRamp_executeSingleMessage:test_executeSingleMessage_WithVInterception_Success() (gas: 91024)
OffRamp_executeSingleReport:test_DisabledSourceChain_Revert() (gas: 28282)
OffRamp_executeSingleReport:test_EmptyReport_Revert() (gas: 22084)
OffRamp_executeSingleReport:test_InvalidSourcePoolAddress_Success() (gas: 481794)
OffRamp_executeSingleReport:test_InvalidSourcePoolAddress_Success() (gas: 481232)
OffRamp_executeSingleReport:test_ManualExecutionNotYetEnabled_Revert() (gas: 48394)
OffRamp_executeSingleReport:test_MismatchingDestChainSelector_Revert() (gas: 33981)
OffRamp_executeSingleReport:test_NonExistingSourceChain_Revert() (gas: 28458)
OffRamp_executeSingleReport:test_ReceiverError_Success() (gas: 188093)
OffRamp_executeSingleReport:test_RetryFailedMessageWithoutManualExecution_Revert() (gas: 198549)
OffRamp_executeSingleReport:test_ReceiverError_Success() (gas: 187541)
OffRamp_executeSingleReport:test_RetryFailedMessageWithoutManualExecution_Revert() (gas: 197997)
OffRamp_executeSingleReport:test_RootNotCommitted_Revert() (gas: 40763)
OffRamp_executeSingleReport:test_RouterYULCall_Revert() (gas: 413245)
OffRamp_executeSingleReport:test_SingleMessageNoTokensOtherChain_Success() (gas: 249800)
OffRamp_executeSingleReport:test_SingleMessageNoTokensUnordered_Success() (gas: 193614)
OffRamp_executeSingleReport:test_SingleMessageNoTokens_Success() (gas: 213648)
OffRamp_executeSingleReport:test_SingleMessageToNonCCIPReceiver_Success() (gas: 249550)
OffRamp_executeSingleReport:test_SingleMessagesNoTokensSuccess_gas() (gas: 142163)
OffRamp_executeSingleReport:test_SkippedIncorrectNonceStillExecutes_Success() (gas: 409313)
OffRamp_executeSingleReport:test_RouterYULCall_Revert() (gas: 412699)
OffRamp_executeSingleReport:test_SingleMessageNoTokensOtherChain_Success() (gas: 248684)
OffRamp_executeSingleReport:test_SingleMessageNoTokensUnordered_Success() (gas: 192498)
OffRamp_executeSingleReport:test_SingleMessageNoTokens_Success() (gas: 212532)
OffRamp_executeSingleReport:test_SingleMessageToNonCCIPReceiver_Success() (gas: 249156)
OffRamp_executeSingleReport:test_SingleMessagesNoTokensSuccess_gas() (gas: 141605)
OffRamp_executeSingleReport:test_SkippedIncorrectNonceStillExecutes_Success() (gas: 408751)
OffRamp_executeSingleReport:test_SkippedIncorrectNonce_Success() (gas: 58315)
OffRamp_executeSingleReport:test_TokenDataMismatch_Revert() (gas: 73890)
OffRamp_executeSingleReport:test_TwoMessagesWithTokensAndGE_Success() (gas: 583427)
OffRamp_executeSingleReport:test_TwoMessagesWithTokensSuccess_gas() (gas: 532141)
OffRamp_executeSingleReport:test_TwoMessagesWithTokensAndGE_Success() (gas: 582303)
OffRamp_executeSingleReport:test_TwoMessagesWithTokensSuccess_gas() (gas: 531017)
OffRamp_executeSingleReport:test_UnexpectedTokenData_Revert() (gas: 33739)
OffRamp_executeSingleReport:test_UnhealthySingleChainCurse_Revert() (gas: 549786)
OffRamp_executeSingleReport:test_Unhealthy_Success() (gas: 549800)
OffRamp_executeSingleReport:test_WithCurseOnAnotherSourceChain_Success() (gas: 460521)
OffRamp_executeSingleReport:test__execute_SkippedAlreadyExecutedMessageUnordered_Success() (gas: 135944)
OffRamp_executeSingleReport:test__execute_SkippedAlreadyExecutedMessage_Success() (gas: 165649)
OffRamp_executeSingleReport:test_UnhealthySingleChainCurse_Revert() (gas: 548662)
OffRamp_executeSingleReport:test_Unhealthy_Success() (gas: 548676)
OffRamp_executeSingleReport:test_WithCurseOnAnotherSourceChain_Success() (gas: 459397)
OffRamp_executeSingleReport:test__execute_SkippedAlreadyExecutedMessageUnordered_Success() (gas: 135386)
OffRamp_executeSingleReport:test__execute_SkippedAlreadyExecutedMessage_Success() (gas: 165091)
OffRamp_getExecutionState:test_FillExecutionState_Success() (gas: 3885554)
OffRamp_getExecutionState:test_GetDifferentChainExecutionState_Success() (gas: 120629)
OffRamp_getExecutionState:test_GetExecutionState_Success() (gas: 89288)
OffRamp_manuallyExecute:test_ManualExecGasLimitMismatchSingleReport_Revert() (gas: 81016)
OffRamp_manuallyExecute:test_manuallyExecute_DestinationGasAmountCountMismatch_Revert() (gas: 74094)
OffRamp_manuallyExecute:test_manuallyExecute_DoesNotRevertIfUntouched_Success() (gas: 173164)
OffRamp_manuallyExecute:test_manuallyExecute_FailedTx_Revert() (gas: 214099)
OffRamp_manuallyExecute:test_manuallyExecute_DoesNotRevertIfUntouched_Success() (gas: 172611)
OffRamp_manuallyExecute:test_manuallyExecute_FailedTx_Revert() (gas: 212993)
OffRamp_manuallyExecute:test_manuallyExecute_ForkedChain_Revert() (gas: 27085)
OffRamp_manuallyExecute:test_manuallyExecute_GasLimitMismatchMultipleReports_Revert() (gas: 164696)
OffRamp_manuallyExecute:test_manuallyExecute_InvalidReceiverExecutionGasLimit_Revert() (gas: 27622)
OffRamp_manuallyExecute:test_manuallyExecute_InvalidTokenGasOverride_Revert() (gas: 55171)
OffRamp_manuallyExecute:test_manuallyExecute_LowGasLimit_Success() (gas: 498527)
OffRamp_manuallyExecute:test_manuallyExecute_MultipleReportsWithSingleCursedLane_Revert() (gas: 316128)
OffRamp_manuallyExecute:test_manuallyExecute_ReentrancyFails_Success() (gas: 2245200)
OffRamp_manuallyExecute:test_manuallyExecute_SourceChainSelectorMismatch_Revert() (gas: 165525)
OffRamp_manuallyExecute:test_manuallyExecute_Success() (gas: 227144)
OffRamp_manuallyExecute:test_manuallyExecute_WithGasOverride_Success() (gas: 227706)
OffRamp_manuallyExecute:test_manuallyExecute_WithMultiReportGasOverride_Success() (gas: 781362)
OffRamp_manuallyExecute:test_manuallyExecute_WithPartialMessages_Success() (gas: 347321)
OffRamp_manuallyExecute:test_manuallyExecute_LowGasLimit_Success() (gas: 497399)
OffRamp_manuallyExecute:test_manuallyExecute_MultipleReportsWithSingleCursedLane_Revert() (gas: 314469)
OffRamp_manuallyExecute:test_manuallyExecute_ReentrancyFails_Success() (gas: 2244626)
OffRamp_manuallyExecute:test_manuallyExecute_SourceChainSelectorMismatch_Revert() (gas: 164967)
OffRamp_manuallyExecute:test_manuallyExecute_Success() (gas: 226033)
OffRamp_manuallyExecute:test_manuallyExecute_WithGasOverride_Success() (gas: 226595)
OffRamp_manuallyExecute:test_manuallyExecute_WithMultiReportGasOverride_Success() (gas: 775807)
OffRamp_manuallyExecute:test_manuallyExecute_WithPartialMessages_Success() (gas: 345094)
OffRamp_releaseOrMintSingleToken:test__releaseOrMintSingleToken_NotACompatiblePool_Revert() (gas: 37656)
OffRamp_releaseOrMintSingleToken:test__releaseOrMintSingleToken_Success() (gas: 104404)
OffRamp_releaseOrMintSingleToken:test__releaseOrMintSingleToken_TokenHandlingError_transfer_Revert() (gas: 82842)
Expand All @@ -481,8 +481,8 @@ OffRamp_setDynamicConfig:test_SetDynamicConfigWithInterceptor_Success() (gas: 46
OffRamp_setDynamicConfig:test_SetDynamicConfig_Success() (gas: 24398)
OffRamp_trialExecute:test_RateLimitError_Success() (gas: 219355)
OffRamp_trialExecute:test_TokenHandlingErrorIsCaught_Success() (gas: 227977)
OffRamp_trialExecute:test_TokenPoolIsNotAContract_Success() (gas: 295396)
OffRamp_trialExecute:test_trialExecute_Success() (gas: 277874)
OffRamp_trialExecute:test_TokenPoolIsNotAContract_Success() (gas: 294834)
OffRamp_trialExecute:test_trialExecute_Success() (gas: 277312)
OnRampTokenPoolReentrancy:test_OnRampTokenPoolReentrancy_Success() (gas: 250817)
OnRamp_applyAllowListUpdates:test_applyAllowListUpdates_InvalidAllowListRequestDisabledAllowListWithAdds() (gas: 18018)
OnRamp_applyAllowListUpdates:test_applyAllowListUpdates_Revert() (gas: 67797)
Expand Down
2 changes: 1 addition & 1 deletion contracts/src/v0.8/ccip/ocr/MultiOCR3Base.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ abstract contract MultiOCR3Base is ITypeAndVersion, OwnerIsCreator {
struct ConfigInfo {
bytes32 configDigest;
uint8 F; // ──────────────────────────────╮ maximum number of faulty/dishonest oracles the system can tolerate
uint8 n; // │ number of signers / transmitters
uint8 n; // │ number of configured signers
bool isSignatureVerificationEnabled; // ──╯ if true, requires signers and verifies signatures on transmission verification
}

Expand Down
4 changes: 2 additions & 2 deletions contracts/src/v0.8/ccip/offRamp/OffRamp.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@ contract OffRamp is ITypeAndVersion, MultiOCR3Base {
Client.Any2EVMMessage memory any2EvmMessage = Client.Any2EVMMessage({
messageId: message.header.messageId,
sourceChainSelector: message.header.sourceChainSelector,
sender: abi.encode(message.sender),
sender: message.sender,
data: message.data,
destTokenAmounts: destTokenAmounts
});
Expand Down Expand Up @@ -678,7 +678,7 @@ contract OffRamp is ITypeAndVersion, MultiOCR3Base {
// Wrap and rethrow the error so we can catch it lower in the stack
if (!success) revert TokenHandlingError(returnData);

// If the call was successful, the returnData should be the local token address.
// If the call was successful, the returnData should be the amount released or minted denominated in the local token's decimals.
if (returnData.length != Pool.CCIP_POOL_V1_RET_BYTES) {
revert InvalidDataLength(Pool.CCIP_POOL_V1_RET_BYTES, returnData.length);
}
Expand Down
18 changes: 18 additions & 0 deletions contracts/src/v0.8/ccip/test/offRamp/OffRamp.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1021,6 +1021,24 @@ contract OffRamp_executeSingleMessage is OffRampSetup {
function test_executeSingleMessage_NoTokens_Success() public {
Internal.Any2EVMRampMessage memory message =
_generateAny2EVMMessageNoTokens(SOURCE_CHAIN_SELECTOR_1, ON_RAMP_ADDRESS_1, 1);

Client.Any2EVMMessage memory expectedAny2EvmMessage = Client.Any2EVMMessage({
messageId: message.header.messageId,
sourceChainSelector: message.header.sourceChainSelector,
sender: message.sender,
data: message.data,
destTokenAmounts: new Client.EVMTokenAmount[](0)
});
vm.expectCall(
address(s_destRouter),
abi.encodeWithSelector(
IRouter.routeMessage.selector,
expectedAny2EvmMessage,
Internal.GAS_FOR_CALL_EXACT_CHECK,
message.gasLimit,
message.receiver
)
);
Comment on lines +1033 to +1042
Copy link
Contributor

Choose a reason for hiding this comment

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

v nice 👍

s_offRamp.executeSingleMessage(message, new bytes[](message.tokenAmounts.length), new uint32[](0));
}

Expand Down
2 changes: 1 addition & 1 deletion core/gethwrappers/ccip/generated/offramp/offramp.go
View file
Open in desktop

Large diffs are not rendered by default.

Loading
Loading