fix test and add correct comments + SVM specific compute unit error

contracts/gas-snapshots/ccip.gas-snapshot

@@ -6,7 +6,7 @@ BurnMintTokenPool_releaseOrMint:test_PoolMint() (gas: 102527)
 BurnMintWithLockReleaseFlagTokenPool_lockOrBurn:test_LockOrBurn_CorrectReturnData() (gas: 237292)
 BurnWithFromMintTokenPool_lockOrBurn:test_PoolBurn() (gas: 239012)
 BurnWithFromMintTokenPool_lockOrBurn:test_Setup() (gas: 24169)
-CCIPClientExample_sanity:test_ImmutableExamples() (gas: 2078656)
+CCIPClientExample_sanity:test_ImmutableExamples() (gas: 2078616)
 CCIPHome__validateConfig:test__validateConfig() (gas: 300016)
 CCIPHome__validateConfig:test__validateConfigLessTransmittersThanSigners() (gas: 332965)
 CCIPHome__validateConfig:test__validateConfigSmallerFChain() (gas: 459322)
@@ -24,7 +24,7 @@ CCIPHome_setCandidate:test_setCandidate() (gas: 1365392)
 CCIPHome_supportsInterface:test_supportsInterface() (gas: 9885)
 DefensiveExampleTest:test_HappyPath() (gas: 200535)
 DefensiveExampleTest:test_Recovery() (gas: 424996)
-E2E:test_E2E_3MessagesMMultiOffRampSuccess_gas() (gas: 1494323)
+E2E:test_E2E_3MessagesMMultiOffRampSuccess_gas() (gas: 1494299)
 ERC165CheckerReverting_supportsInterfaceReverting:test__supportsInterfaceReverting() (gas: 10445)
 EtherSenderReceiverTest_ccipReceive:test_ccipReceive_fallbackToWethTransfer() (gas: 96964)
 EtherSenderReceiverTest_ccipReceive:test_ccipReceive_happyPath() (gas: 49797)
@@ -67,15 +67,15 @@ FeeQuoter_applyPremiumMultiplierWeiPerEthUpdates:test_applyPremiumMultiplierWeiP
 FeeQuoter_applyPremiumMultiplierWeiPerEthUpdates:test_applyPremiumMultiplierWeiPerEthUpdatesZeroInput() (gas: 12468)
 FeeQuoter_applyTokenTransferFeeConfigUpdates:test_ApplyTokenTransferFeeConfig() (gas: 88604)
 FeeQuoter_applyTokenTransferFeeConfigUpdates:test_ApplyTokenTransferFeeZeroInput() (gas: 13196)
-FeeQuoter_constructor:test_Setup() (gas: 5424623)
+FeeQuoter_constructor:test_Setup() (gas: 5451911)
 FeeQuoter_convertTokenAmount:test_ConvertTokenAmount() (gas: 68417)
-FeeQuoter_getDataAvailabilityCost:test_EmptyMessageCalculatesDataAvailabilityCost() (gas: 98884)
-FeeQuoter_getDataAvailabilityCost:test_SimpleMessageCalculatesDataAvailabilityCost() (gas: 21505)
-FeeQuoter_getDataAvailabilityCost:test_SimpleMessageCalculatesDataAvailabilityCostUnsupportedDestChainSelector() (gas: 14904)
+FeeQuoter_getDataAvailabilityCost:test_EmptyMessageCalculatesDataAvailabilityCost() (gas: 98892)
+FeeQuoter_getDataAvailabilityCost:test_SimpleMessageCalculatesDataAvailabilityCost() (gas: 21509)
+FeeQuoter_getDataAvailabilityCost:test_SimpleMessageCalculatesDataAvailabilityCostUnsupportedDestChainSelector() (gas: 14908)
 FeeQuoter_getTokenAndGasPrices:test_GetFeeTokenAndGasPrices() (gas: 73123)
 FeeQuoter_getTokenAndGasPrices:test_StalenessCheckDisabled() (gas: 113576)
 FeeQuoter_getTokenAndGasPrices:test_ZeroGasPrice() (gas: 110663)
-FeeQuoter_getTokenPrice:test_GetTokenPriceFromFeed() (gas: 68158)
+FeeQuoter_getTokenPrice:test_GetTokenPriceFromFeed() (gas: 68152)
 FeeQuoter_getTokenPrice:test_GetTokenPrice_LocalMoreRecent() (gas: 33546)
 FeeQuoter_getTokenPrices:test_GetTokenPrices() (gas: 78534)
 FeeQuoter_getTokenTransferCost:test_CustomTokenBpsFee() (gas: 34616)
@@ -87,41 +87,42 @@ FeeQuoter_getTokenTransferCost:test_SmallTokenTransferChargesMinFeeAndGas() (gas
 FeeQuoter_getTokenTransferCost:test_ZeroAmountTokenTransferChargesMinFeeAndGas() (gas: 25295)
 FeeQuoter_getTokenTransferCost:test_ZeroFeeConfigChargesMinFee() (gas: 37853)
 FeeQuoter_getTokenTransferCost:test_getTokenTransferCost_selfServeUsesDefaults() (gas: 26989)
-FeeQuoter_getValidatedFee:test_EmptyMessage() (gas: 85182)
-FeeQuoter_getValidatedFee:test_HighGasMessage() (gas: 243118)
-FeeQuoter_getValidatedFee:test_MessageWithDataAndTokenTransfer() (gas: 143760)
-FeeQuoter_getValidatedFee:test_SingleTokenMessage() (gas: 115264)
-FeeQuoter_getValidatedFee:test_SolChainFamilySelector() (gas: 60999)
-FeeQuoter_getValidatedFee:test_ZeroDataAvailabilityMultiplier() (gas: 66251)
+FeeQuoter_getValidatedFee:test_EmptyMessage() (gas: 85174)
+FeeQuoter_getValidatedFee:test_HighGasMessage() (gas: 243110)
+FeeQuoter_getValidatedFee:test_MessageWithDataAndTokenTransfer() (gas: 143752)
+FeeQuoter_getValidatedFee:test_SingleTokenMessage() (gas: 115256)
+FeeQuoter_getValidatedFee:test_SolChainFamilySelector() (gas: 61062)
+FeeQuoter_getValidatedFee:test_ZeroDataAvailabilityMultiplier() (gas: 66237)
 FeeQuoter_getValidatedTokenPrice:test_GetValidatedTokenPrice() (gas: 58905)
-FeeQuoter_getValidatedTokenPrice:test_GetValidatedTokenPriceFromFeed() (gas: 65115)
-FeeQuoter_getValidatedTokenPrice:test_GetValidatedTokenPriceFromFeedErc20Above18Decimals() (gas: 1897724)
-FeeQuoter_getValidatedTokenPrice:test_GetValidatedTokenPriceFromFeedErc20Below18Decimals() (gas: 1897766)
-FeeQuoter_getValidatedTokenPrice:test_GetValidatedTokenPriceFromFeedFeedAt0Decimals() (gas: 1877822)
-FeeQuoter_getValidatedTokenPrice:test_GetValidatedTokenPriceFromFeedFeedAt18Decimals() (gas: 1897564)
-FeeQuoter_getValidatedTokenPrice:test_GetValidatedTokenPriceFromFeedFlippedDecimals() (gas: 1897700)
-FeeQuoter_getValidatedTokenPrice:test_GetValidatedTokenPriceFromFeedMaxInt224Value() (gas: 1897534)
-FeeQuoter_getValidatedTokenPrice:test_GetValidatedTokenPriceFromFeedOverStalenessPeriod() (gas: 65233)
+FeeQuoter_getValidatedTokenPrice:test_GetValidatedTokenPriceFromFeed() (gas: 65109)
+FeeQuoter_getValidatedTokenPrice:test_GetValidatedTokenPriceFromFeedErc20Above18Decimals() (gas: 1897718)
+FeeQuoter_getValidatedTokenPrice:test_GetValidatedTokenPriceFromFeedErc20Below18Decimals() (gas: 1897760)
+FeeQuoter_getValidatedTokenPrice:test_GetValidatedTokenPriceFromFeedFeedAt0Decimals() (gas: 1877816)
+FeeQuoter_getValidatedTokenPrice:test_GetValidatedTokenPriceFromFeedFeedAt18Decimals() (gas: 1897558)
+FeeQuoter_getValidatedTokenPrice:test_GetValidatedTokenPriceFromFeedFlippedDecimals() (gas: 1897694)
+FeeQuoter_getValidatedTokenPrice:test_GetValidatedTokenPriceFromFeedMaxInt224Value() (gas: 1897528)
+FeeQuoter_getValidatedTokenPrice:test_GetValidatedTokenPriceFromFeedOverStalenessPeriod() (gas: 65227)
 FeeQuoter_getValidatedTokenPrice:test_StaleFeeToken() (gas: 61854)
 FeeQuoter_onReport:test_OnReport_SkipPriceUpdateWhenStaleUpdateReceived() (gas: 52565)
 FeeQuoter_onReport:test_onReport() (gas: 88942)
 FeeQuoter_onReport:test_onReport_withKeystoneForwarderContract() (gas: 122570)
-FeeQuoter_parseSVMExtraArgsFromBytes:test_SVMExtraArgsV1() (gas: 23199)
-FeeQuoter_parseSVMExtraArgsFromBytes:test_SVMExtraArgsV1TagSelector() (gas: 3135)
+FeeQuoter_parseSVMExtraArgsFromBytes:test_SVMExtraArgsDefault() (gas: 20480)
+FeeQuoter_parseSVMExtraArgsFromBytes:test_SVMExtraArgsV1() (gas: 23274)
+FeeQuoter_parseSVMExtraArgsFromBytes:test_SVMExtraArgsV1TagSelector() (gas: 3169)
 FeeQuoter_processChainFamilySelector:test_processChainFamilySelectorEVM() (gas: 19457)
-FeeQuoter_processChainFamilySelector:test_processChainFamilySelectorSVM_NoTokenTransfer() (gas: 22632)
-FeeQuoter_processChainFamilySelector:test_processChainFamilySelectorSVM_WithTokenTransfer() (gas: 22621)
-FeeQuoter_processMessageArgs:test_processMessageArgs_WitEVMExtraArgsV2() (gas: 29003)
+FeeQuoter_processChainFamilySelector:test_processChainFamilySelectorSVM_NoTokenTransfer() (gas: 22707)
+FeeQuoter_processChainFamilySelector:test_processChainFamilySelectorSVM_WithTokenTransfer() (gas: 22696)
+FeeQuoter_processMessageArgs:test_processMessageArgs_WitEVMExtraArgsV2() (gas: 29007)
 FeeQuoter_processMessageArgs:test_processMessageArgs_WithConvertedTokenAmount() (gas: 33038)
 FeeQuoter_processMessageArgs:test_processMessageArgs_WithCorrectPoolReturnData() (gas: 77567)
-FeeQuoter_processMessageArgs:test_processMessageArgs_WithEVMExtraArgsV1() (gas: 28634)
-FeeQuoter_processMessageArgs:test_processMessageArgs_WithEmptyEVMExtraArgs() (gas: 26494)
+FeeQuoter_processMessageArgs:test_processMessageArgs_WithEVMExtraArgsV1() (gas: 28638)
+FeeQuoter_processMessageArgs:test_processMessageArgs_WithEmptyEVMExtraArgs() (gas: 26498)
 FeeQuoter_processMessageArgs:test_processMessageArgs_WithLinkTokenAmount() (gas: 22700)
-FeeQuoter_processMessageArgs:test_processMessageArgs_WithSVMExtraArgsV1() (gas: 63391)
-FeeQuoter_resolveGasLimitForDestination:test_EVMExtraArgsDefault() (gas: 17113)
-FeeQuoter_resolveGasLimitForDestination:test_EVMExtraArgsV1() (gas: 16180)
+FeeQuoter_processMessageArgs:test_processMessageArgs_WithSVMExtraArgsV1() (gas: 63541)
+FeeQuoter_resolveGasLimitForDestination:test_EVMExtraArgsDefault() (gas: 17117)
+FeeQuoter_resolveGasLimitForDestination:test_EVMExtraArgsV1() (gas: 16184)
 FeeQuoter_resolveGasLimitForDestination:test_EVMExtraArgsV1TagSelector() (gas: 3169)
-FeeQuoter_resolveGasLimitForDestination:test_EVMExtraArgsV2() (gas: 16306)
+FeeQuoter_resolveGasLimitForDestination:test_EVMExtraArgsV2() (gas: 16310)
 FeeQuoter_resolveGasLimitForDestination:test_EVMExtraArgsV2TagSelector() (gas: 3168)
 FeeQuoter_supportsInterface:test_SupportsInterface() (gas: 13264)
 FeeQuoter_updatePrices:test_OnlyGasPrice() (gas: 24001)
@@ -211,9 +212,9 @@ NonceManager_getIncrementedOutboundNonce:test_getIncrementedOutboundNonce() (gas
 NonceManager_getIncrementedOutboundNonce:test_incrementInboundNonce() (gas: 38746)
 NonceManager_getIncrementedOutboundNonce:test_incrementInboundNonce_SkippedIncorrectNonce() (gas: 23739)
 NonceManager_getIncrementedOutboundNonce:test_incrementNoncesInboundAndOutbound() (gas: 71886)
-NonceManager_getOutboundNonce:test_getOutboundNonce_Upgrade() (gas: 105588)
-NonceManager_getOutboundNonce:test_getOutboundNonce_UpgradeNonceNewSenderStartsAtZero() (gas: 167456)
-NonceManager_getOutboundNonce:test_getOutboundNonce_UpgradeNonceStartsAtV1Nonce() (gas: 197510)
+NonceManager_getOutboundNonce:test_getOutboundNonce_Upgrade() (gas: 105592)
+NonceManager_getOutboundNonce:test_getOutboundNonce_UpgradeNonceNewSenderStartsAtZero() (gas: 167460)
+NonceManager_getOutboundNonce:test_getOutboundNonce_UpgradeNonceStartsAtV1Nonce() (gas: 197518)
 NonceManager_getOutboundNonce:test_getOutboundNonce_UpgradeSenderNoncesReadsPreviousRamp() (gas: 145209)
 OffRamp_applySourceChainConfigUpdates:test_AddMultipleChains() (gas: 626140)
 OffRamp_applySourceChainConfigUpdates:test_AddNewChain() (gas: 166441)
@@ -283,33 +284,33 @@ OffRamp_trialExecute:test_trialExecute_RevertsWhen_NoEnoughGasForCallSigAndSende
 OffRamp_trialExecute:test_trialExecute_RevertsWhen_NoGasForCallExactCheckAndSenderIsGasEstimator() (gas: 29539)
 OffRamp_trialExecute:test_trialExecute_TokenHandlingErrorIsCaught() (gas: 131932)
 OffRamp_trialExecute:test_trialExecute_TokenPoolIsNotAContract() (gas: 281327)
-OnRampTokenPoolReentrancy:test_OnRampTokenPoolReentrancy() (gas: 245442)
+OnRampTokenPoolReentrancy:test_OnRampTokenPoolReentrancy() (gas: 245418)
 OnRamp_applyAllowlistUpdates:test_applyAllowlistUpdates() (gas: 325996)
 OnRamp_applyAllowlistUpdates:test_applyAllowlistUpdates_InvalidAllowListRequestDisabledAllowListWithAdds() (gas: 17190)
 OnRamp_applyDestChainConfigUpdates:test_ApplyDestChainConfigUpdates() (gas: 65874)
 OnRamp_constructor:test_Constructor() (gas: 2672063)
-OnRamp_forwardFromRouter:test_ForwardFromRouter() (gas: 145718)
-OnRamp_forwardFromRouter:test_ForwardFromRouterExtraArgsV2() (gas: 146530)
-OnRamp_forwardFromRouter:test_ForwardFromRouterExtraArgsV2AllowOutOfOrderTrue() (gas: 115709)
-OnRamp_forwardFromRouter:test_ForwardFromRouterSuccessCustomExtraArgs() (gas: 146116)
-OnRamp_forwardFromRouter:test_ForwardFromRouterSuccessEmptyExtraArgs() (gas: 144372)
-OnRamp_forwardFromRouter:test_ForwardFromRouterSuccessLegacyExtraArgs() (gas: 146357)
+OnRamp_forwardFromRouter:test_ForwardFromRouter() (gas: 145722)
+OnRamp_forwardFromRouter:test_ForwardFromRouterExtraArgsV2() (gas: 146534)
+OnRamp_forwardFromRouter:test_ForwardFromRouterExtraArgsV2AllowOutOfOrderTrue() (gas: 115713)
+OnRamp_forwardFromRouter:test_ForwardFromRouterSuccessCustomExtraArgs() (gas: 146120)
+OnRamp_forwardFromRouter:test_ForwardFromRouterSuccessEmptyExtraArgs() (gas: 144376)
+OnRamp_forwardFromRouter:test_ForwardFromRouterSuccessLegacyExtraArgs() (gas: 146361)
 OnRamp_forwardFromRouter:test_ForwardFromRouter_ConfigurableSourceRouter() (gas: 143697)
-OnRamp_forwardFromRouter:test_ShouldIncrementNonceOnlyOnOrdered() (gas: 187475)
-OnRamp_forwardFromRouter:test_ShouldIncrementSeqNumAndNonce() (gas: 213852)
-OnRamp_forwardFromRouter:test_ShouldStoreLinkFees() (gas: 147363)
-OnRamp_forwardFromRouter:test_forwardFromRouter_WithInterception() (gas: 275037)
-OnRamp_getFee:test_EmptyMessage() (gas: 100437)
-OnRamp_getFee:test_GetFeeOfZeroForTokenMessage() (gas: 89422)
-OnRamp_getFee:test_SingleTokenMessage() (gas: 115755)
+OnRamp_forwardFromRouter:test_ShouldIncrementNonceOnlyOnOrdered() (gas: 187487)
+OnRamp_forwardFromRouter:test_ShouldIncrementSeqNumAndNonce() (gas: 213864)
+OnRamp_forwardFromRouter:test_ShouldStoreLinkFees() (gas: 147367)
+OnRamp_forwardFromRouter:test_forwardFromRouter_WithInterception() (gas: 275041)
+OnRamp_getFee:test_EmptyMessage() (gas: 100405)
+OnRamp_getFee:test_GetFeeOfZeroForTokenMessage() (gas: 89400)
+OnRamp_getFee:test_SingleTokenMessage() (gas: 115723)
 OnRamp_getTokenPool:test_GetTokenPool() (gas: 35404)
 OnRamp_setDynamicConfig:test_setDynamicConfig() (gas: 56650)
 OnRamp_withdrawFeeTokens:test_WithdrawFeeTokens() (gas: 125835)
-PingPong_ccipReceive:test_CcipReceive() (gas: 167218)
+PingPong_ccipReceive:test_CcipReceive() (gas: 167210)
 PingPong_setOutOfOrderExecution:test_OutOfOrderExecution() (gas: 20284)
 PingPong_setPaused:test_Pausing() (gas: 17760)
-PingPong_startPingPong:test_StartPingPong_With_OOO() (gas: 146369)
-PingPong_startPingPong:test_StartPingPong_With_Sequenced_Ordered() (gas: 172000)
+PingPong_startPingPong:test_StartPingPong_With_OOO() (gas: 146361)
+PingPong_startPingPong:test_StartPingPong_With_Sequenced_Ordered() (gas: 171992)
 RMNHome_getConfigDigests:test_getConfigDigests() (gas: 1081176)
 RMNHome_promoteCandidateAndRevokeActive:test_promoteCandidateAndRevokeActive() (gas: 1086556)
 RMNHome_revokeCandidate:test_revokeCandidate() (gas: 28085)
@@ -339,20 +340,20 @@ RegistryModuleOwnerCustom_registerAdminViaGetCCIPAdmin:test_registerAdminViaGetC
 RegistryModuleOwnerCustom_registerAdminViaOwner:test_registerAdminViaOwner() (gas: 129941)
 Router_applyRampUpdates:test_applyRampUpdates_OffRampUpdatesWithRouting() (gas: 10413055)
 Router_applyRampUpdates:test_applyRampUpdates_OnRampDisable() (gas: 56445)
-Router_ccipSend:test_CCIPSendLinkFeeNoTokenSuccess_gas() (gas: 125832)
-Router_ccipSend:test_CCIPSendLinkFeeOneTokenSuccess_gas() (gas: 213253)
+Router_ccipSend:test_CCIPSendLinkFeeNoTokenSuccess_gas() (gas: 125824)
+Router_ccipSend:test_CCIPSendLinkFeeOneTokenSuccess_gas() (gas: 213245)
 Router_ccipSend:test_InvalidMsgValue() (gas: 27856)
-Router_ccipSend:test_NativeFeeToken() (gas: 186685)
-Router_ccipSend:test_NativeFeeTokenInsufficientValue() (gas: 62773)
-Router_ccipSend:test_NativeFeeTokenOverpay() (gas: 188080)
-Router_ccipSend:test_NativeFeeTokenZeroValue() (gas: 54865)
-Router_ccipSend:test_NonLinkFeeToken() (gas: 220913)
-Router_ccipSend:test_WrappedNativeFeeToken() (gas: 188902)
-Router_ccipSend:test_ccipSend_nativeFeeNoTokenSuccess_gas() (gas: 134990)
-Router_ccipSend:test_ccipSend_nativeFeeOneTokenSuccess_gas() (gas: 222454)
+Router_ccipSend:test_NativeFeeToken() (gas: 186669)
+Router_ccipSend:test_NativeFeeTokenInsufficientValue() (gas: 62765)
+Router_ccipSend:test_NativeFeeTokenOverpay() (gas: 188064)
+Router_ccipSend:test_NativeFeeTokenZeroValue() (gas: 54857)
+Router_ccipSend:test_NonLinkFeeToken() (gas: 220905)
+Router_ccipSend:test_WrappedNativeFeeToken() (gas: 188886)
+Router_ccipSend:test_ccipSend_nativeFeeNoTokenSuccess_gas() (gas: 134982)
+Router_ccipSend:test_ccipSend_nativeFeeOneTokenSuccess_gas() (gas: 222446)
 Router_constructor:test_Constructor() (gas: 13170)
 Router_getArmProxy:test_getArmProxy() (gas: 10573)
-Router_getFee:test_GetFeeSupportedChain() (gas: 52444)
+Router_getFee:test_GetFeeSupportedChain() (gas: 52436)
 Router_recoverTokens:test_RecoverTokens() (gas: 52686)
 Router_routeMessage:test_routeMessage_AutoExec() (gas: 38071)
 Router_routeMessage:test_routeMessage_ExecutionEvent() (gas: 153593)