Skip to content

Add billing params to ccv & call in ramp #1295

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

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

Add billing params to ccv & call in ramp #1295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e1bb79f
add billing params to ccv & call in ramp
RensR Oct 17, 2025
d705c29
cld
RensR Oct 17, 2025
d4a0edb
merge receipts
RensR Oct 17, 2025
82da1aa
add cov
RensR Oct 17, 2025
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
98 changes: 51 additions & 47 deletions chains/evm/.gas-snapshot
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
BaseVerifier_applyAllowlistUpdates:test_applyAllowlistUpdates() (gas: 91947)
BaseVerifier_applyAllowlistUpdates:test_applyAllowlistUpdates_DisableAllowlist() (gas: 95969)
BaseVerifier_applyAllowlistUpdates:test_applyAllowlistUpdates_RemoveSenders() (gas: 117993)
BaseVerifier_applyDestChainConfigUpdates:test_applyDestChainConfigUpdates() (gas: 44335)
BaseVerifier_assertSenderIsAllowed:test_assertSenderIsAllowed() (gas: 18249)
BaseVerifier_assertSenderIsAllowed:test_assertSenderIsAllowed_AllowlistEnabledWithAllowedSender() (gas: 103663)
BaseVerifier_getDestChainConfig:test_getDestChainConfig() (gas: 17264)
BaseVerifier_applyAllowlistUpdates:test_applyAllowlistUpdates() (gas: 92020)
BaseVerifier_applyAllowlistUpdates:test_applyAllowlistUpdates_DisableAllowlist() (gas: 96090)
BaseVerifier_applyAllowlistUpdates:test_applyAllowlistUpdates_RemoveSenders() (gas: 118090)
BaseVerifier_applyDestChainConfigUpdates:test_applyDestChainConfigUpdates() (gas: 45496)
BaseVerifier_assertSenderIsAllowed:test_assertSenderIsAllowed() (gas: 18277)
BaseVerifier_assertSenderIsAllowed:test_assertSenderIsAllowed_AllowlistEnabledWithAllowedSender() (gas: 104873)
BaseVerifier_getDestChainConfig:test_getDestChainConfig() (gas: 17289)
BaseVerifier_getStorageLocation:test_getStorageLocation() (gas: 12722)
BaseVerifier_getStorageLocation:test_supportsInterface() (gas: 9968)
BaseVerifier_withdrawFeeTokens:test_withdrawFeeTokens() (gas: 214607)
BaseVerifier_withdrawFeeTokens:test_withdrawFeeTokens() (gas: 214656)
BurnFromMintTokenPool_lockOrBurn:test_constructor() (gas: 23892)
BurnFromMintTokenPool_lockOrBurn:test_lockOrBurn() (gas: 245914)
BurnMintTokenPool_lockOrBurn:test_constructor() (gas: 17040)
Expand All @@ -23,23 +23,25 @@ BurnToAddressMintTokenPool_lockOrBurn:test_LockOrBurn() (gas: 241476)
BurnWithFromMintTokenPool_lockOrBurn:test_constructor() (gas: 23892)
BurnWithFromMintTokenPool_lockOrBurn:test_lockOrBurn() (gas: 246012)
CCIPClientExampleWithCCVs_applyCCVConfigUpdates:test_applyCCVConfigUpdates() (gas: 166808)
CCIPClientExample_sanity:test_ImmutableExamples() (gas: 2093729)
CCIPClientExample_sanity:test_ImmutableExamples() (gas: 2129160)
CCTPMessageTransmitterProxy_configureAllowedCallers:test_configureAllowedCallers() (gas: 66306)
CCTPMessageTransmitterProxy_getAllowedCallers:test_configureAllowedCallers() (gas: 75959)
CCTPMessageTransmitterProxy_getCCTPTransmitter:test_getCCTPTransmitter() (gas: 10899)
CCTPMessageTransmitterProxy_receiveMessage:test_receiveMessage() (gas: 32098)
CCVConfigValidation_validateDefaultAndMandatedCCVs:test_validateDefaultAndMandatedCCVs_OnlyDefaultProvided() (gas: 7802)
CCVConfigValidation_validateDefaultAndMandatedCCVs:test_validateDefaultAndMandatedCCVs_OnlyMandatedProvided() (gas: 7620)
CommitteeVerifier_applyAllowlistUpdates:test_applyAllowlistUpdates_AsAllowlistAdmin() (gas: 93067)
CommitteeVerifier_applyAllowlistUpdates:test_applyAllowlistUpdates_AsOwner() (gas: 94668)
CommitteeVerifier_applyDestChainConfigUpdates:test_applyDestChainConfigUpdates() (gas: 46135)
CommitteeVerifier_constructor:test_constructor() (gas: 1999428)
CommitteeVerifier_forwardToVerifier:test_forwardToVerifier() (gas: 29614)
CommitteeVerifier_forwardToVerifier:test_forwardToVerifier_ViaVerifierProxy() (gas: 273828)
CommitteeVerifier_setDynamicConfig:test_setDynamicConfig() (gas: 38453)
CommitteeVerifier_updateStorageLocation:test_updateStorageLocation() (gas: 23029)
CommitteeVerifier_verifyMessage:test_verifyMessage_ExtractsSignatureLengthCorrectly() (gas: 31734)
CommitteeVerifier_verifyMessage:test_verifyMessage_ForwardCompatibilityWithExtraData() (gas: 32098)
CommitteeVerifier_applyAllowlistUpdates:test_applyAllowlistUpdates_AsAllowlistAdmin() (gas: 93115)
CommitteeVerifier_applyAllowlistUpdates:test_applyAllowlistUpdates_AsOwner() (gas: 94741)
CommitteeVerifier_applyDestChainConfigUpdates:test_applyDestChainConfigUpdates() (gas: 47193)
CommitteeVerifier_constructor:test_constructor() (gas: 2119920)
CommitteeVerifier_forwardToVerifier:test_forwardToVerifier() (gas: 29642)
CommitteeVerifier_forwardToVerifier:test_forwardToVerifier_ViaVerifierProxy() (gas: 273856)
CommitteeVerifier_setDynamicConfig:test_setDynamicConfig() (gas: 38470)
CommitteeVerifier_updateStorageLocation:test_updateStorageLocation() (gas: 23051)
CommitteeVerifier_verifyMessage:test_verifyMessage_ExtractsSignatureLengthCorrectly() (gas: 31756)
CommitteeVerifier_verifyMessage:test_verifyMessage_ForwardCompatibilityWithExtraData() (gas: 32120)
CommitteeVerifier_withdrawFeeTokens:test_withdrawFeeTokens() (gas: 216326)
CommitteeVerifier_withdrawFeeTokens:test_withdrawFeeTokens_MultipleTokens() (gas: 1494999)
DefensiveExampleTest:test_HappyPath() (gas: 204086)
DefensiveExampleTest:test_Recovery() (gas: 429422)
ERC165CheckerReverting_supportsInterfaceReverting:test__supportsInterfaceReverting() (gas: 10673)
Expand Down Expand Up @@ -212,7 +214,7 @@ OffRamp_ensureCCVQuorumIsReached:test_ensureCCVQuorumIsReached_OptionalIsAlsoReq
OffRamp_ensureCCVQuorumIsReached:test_ensureCCVQuorumIsReached_Success_OptionalCCVsFound() (gas: 55471)
OffRamp_execute:test_execute() (gas: 111526)
OffRamp_execute:test_execute_InsufficientGasToCompleteTx_setsToFailure() (gas: 92259)
OffRamp_execute:test_execute_ReentrancyGuardReentrantCall_Fails() (gas: 1030274)
OffRamp_execute:test_execute_ReentrancyGuardReentrantCall_Fails() (gas: 1043522)
OffRamp_execute:test_execute_RunsOutOfGasAndSetsStateToFailure() (gas: 109908)
OffRamp_execute:test_execute_WithReceiver() (gas: 442713)
OffRamp_getAllSourceChainConfigs:test_getAllSourceChainConfigs_ReturnsMultipleChains() (gas: 225835)
Expand All @@ -226,28 +228,30 @@ OffRamp_getCCVsFromReceiver:test_getCCVsFromReceiver_contractV2_usesReceiverValu
OffRamp_getCCVsFromReceiver:test_getCCVsFromReceiver_noContract_fallsBackToDefaults() (gas: 30666)
OffRamp_getSourceChainConfig:test_getSourceChainConfig_ReturnsCorrectConfig() (gas: 30153)
OffRamp_getStaticConfig:test_getStaticConfig_MatchesConstructorValues() (gas: 4455825)
OnRampTokenPoolReentrancy:test_OnRampTokenPoolReentrancy() (gas: 220057)
OnRamp_applyDestChainConfigUpdates:test_applyDestChainConfigUpdates_AllowsZeroRouterToPause() (gas: 127791)
OnRamp_applyDestChainConfigUpdates:test_applyDestChainConfigUpdates_SetsConfigAndEmitsEvent() (gas: 204056)
OnRamp_constructor:test_constructor() (gas: 3390179)
OnRamp_forwardFromRouter:test_forwardFromRouter_SequenceNumberPersistsAndIncrements() (gas: 203272)
OnRamp_forwardFromRouter:test_forwardFromRouter_oldExtraArgs() (gas: 113713)
OnRampTokenPoolReentrancy:test_OnRampTokenPoolReentrancy() (gas: 230807)
OnRamp_applyDestChainConfigUpdates:test_applyDestChainConfigUpdates_AllowsZeroRouterToPause() (gas: 127813)
OnRamp_applyDestChainConfigUpdates:test_applyDestChainConfigUpdates_SetsConfigAndEmitsEvent() (gas: 204078)
OnRamp_constructor:test_constructor() (gas: 3675284)
OnRamp_forwardFromRouter:test_forwardFromRouter_SequenceNumberPersistsAndIncrements() (gas: 228539)
OnRamp_forwardFromRouter:test_forwardFromRouter_oldExtraArgs() (gas: 126330)
OnRamp_mergeCCVLists:test_mergeCCVLists_DedupUserAndMandatoryCCVs() (gas: 32467)
OnRamp_mergeCCVLists:test_mergeCCVLists_DedupUserAndPoolCCVs() (gas: 23611)
OnRamp_mergeCCVLists:test_mergeCCVLists_EmptyPoolRequiredCCV() (gas: 22503)
OnRamp_mergeCCVLists:test_mergeCCVLists_NoChangesWhenPoolCCVAlreadyInRequired() (gas: 23408)
OnRamp_mergeCCVLists:test_mergeCCVLists_DedupUserAndPoolCCVs() (gas: 23633)
OnRamp_mergeCCVLists:test_mergeCCVLists_EmptyPoolRequiredCCV() (gas: 22525)
OnRamp_mergeCCVLists:test_mergeCCVLists_NoChangesWhenPoolCCVAlreadyInRequired() (gas: 23430)
OnRamp_mergeCCVLists:test_mergeCCVLists_SkipsDuplicatesInPoolRequiredCCV() (gas: 31502)
OnRamp_parseExtraArgsWithDefaults:test_parseExtraArgsWithDefaults_DefaultCCVsAlwaysPresent() (gas: 44957)
OnRamp_parseExtraArgsWithDefaults:test_parseExtraArgsWithDefaults_OldExtraArgs() (gas: 53559)
OnRamp_parseExtraArgsWithDefaults:test_parseExtraArgsWithDefaults_V3WithEmptyRequiredCCVs() (gas: 54288)
OnRamp_parseExtraArgsWithDefaults:test_parseExtraArgsWithDefaults_DefaultCCVsAlwaysPresent() (gas: 44979)
OnRamp_parseExtraArgsWithDefaults:test_parseExtraArgsWithDefaults_OldExtraArgs() (gas: 53581)
OnRamp_parseExtraArgsWithDefaults:test_parseExtraArgsWithDefaults_V3WithEmptyRequiredCCVs() (gas: 54310)
OnRamp_parseExtraArgsWithDefaults:test_parseExtraArgsWithDefaults_V3WithUserProvidedCCVs() (gas: 48557)
OnRamp_setDynamicConfig:test_SetDynamicConfig() (gas: 35513)
OnRamp_setDynamicConfig:test_SetDynamicConfig_MultipleUpdates() (gas: 41766)
PingPong_ccipReceive:test_CcipReceive() (gas: 151722)
OnRamp_setDynamicConfig:test_SetDynamicConfig_MultipleUpdates() (gas: 41788)
OnRamp_withdrawFeeTokens:test_withdrawFeeTokens() (gas: 216614)
OnRamp_withdrawFeeTokens:test_withdrawFeeTokens_MultipleTokens() (gas: 1494944)
PingPong_ccipReceive:test_CcipReceive() (gas: 158804)
PingPong_setOutOfOrderExecution:test_OutOfOrderExecution() (gas: 20879)
PingPong_setPaused:test_Pausing() (gas: 18247)
PingPong_startPingPong:test_StartPingPong_With_OOO() (gas: 158510)
PingPong_startPingPong:test_StartPingPong_With_Sequenced_Ordered() (gas: 153464)
PingPong_startPingPong:test_StartPingPong_With_OOO() (gas: 165592)
PingPong_startPingPong:test_StartPingPong_With_Sequenced_Ordered() (gas: 160546)
RMNProxy_constructor:test_Constructor() (gas: 294118)
RMNProxy_isCursed:test_IsCursed_GlobalCurseSubject() (gas: 90243)
RMNProxy_setARM:test_SetARM() (gas: 16849)
Expand All @@ -271,25 +275,25 @@ RegistryModuleOwnerCustom_registerAdminViaGetCCIPAdmin:test_registerAdminViaGetC
RegistryModuleOwnerCustom_registerAdminViaOwner:test_registerAdminViaOwner() (gas: 128616)
Router_applyRampUpdates:test_applyRampUpdates_OffRampUpdatesWithRouting() (gas: 10941199)
Router_applyRampUpdates:test_applyRampUpdates_OnRampDisable() (gas: 58667)
Router_ccipSend:test_CCIPSendLinkFeeNoTokenSuccess_gas() (gas: 127009)
Router_ccipSend:test_CCIPSendLinkFeeOneTokenSuccess_gas() (gas: 222749)
Router_ccipSend:test_CCIPSendLinkFeeNoTokenSuccess_gas() (gas: 133999)
Router_ccipSend:test_CCIPSendLinkFeeOneTokenSuccess_gas() (gas: 233460)
Router_ccipSend:test_InvalidMsgValue() (gas: 28520)
Router_ccipSend:test_NativeFeeToken() (gas: 153918)
Router_ccipSend:test_NativeFeeToken() (gas: 160908)
Router_ccipSend:test_NativeFeeTokenInsufficientValue() (gas: 34636)
Router_ccipSend:test_NativeFeeTokenOverpay() (gas: 155402)
Router_ccipSend:test_NativeFeeTokenOverpay() (gas: 162392)
Router_ccipSend:test_NativeFeeTokenZeroValue() (gas: 26738)
Router_ccipSend:test_NonLinkFeeToken() (gas: 225785)
Router_ccipSend:test_WrappedNativeFeeToken() (gas: 156794)
Router_ccipSend:test_ccipSend_nativeFeeNoTokenSuccess_gas() (gas: 132931)
Router_ccipSend:test_ccipSend_nativeFeeOneTokenSuccess_gas() (gas: 228693)
Router_ccipSend:test_NonLinkFeeToken() (gas: 232775)
Router_ccipSend:test_WrappedNativeFeeToken() (gas: 163784)
Router_ccipSend:test_ccipSend_nativeFeeNoTokenSuccess_gas() (gas: 139921)
Router_ccipSend:test_ccipSend_nativeFeeOneTokenSuccess_gas() (gas: 239404)
Router_constructor:test_Constructor() (gas: 13301)
Router_getArmProxy:test_getArmProxy() (gas: 10647)
Router_getFee:test_GetFeeSupportedChain() (gas: 20949)
Router_recoverTokens:test_RecoverTokens() (gas: 54414)
Router_routeMessage:test_routeMessage_AutoExec() (gas: 42003)
Router_routeMessage:test_routeMessage_ExecutionEvent() (gas: 157871)
Router_routeMessage:test_routeMessage_ManualExec() (gas: 35172)
SignatureQuorumValidator_constructor:test_constructor_ForkedChainDetection() (gas: 720158)
SignatureQuorumValidator_constructor:test_constructor_ForkedChainDetection() (gas: 720173)
SignatureQuorumValidator_getSignatureConfig:test_getSignatureConfig_AfterUpdate() (gas: 129636)
SignatureQuorumValidator_getSignatureConfig:test_getSignatureConfig_EmptyConfiguration() (gas: 628986)
SignatureQuorumValidator_getSignatureConfig:test_getSignatureConfig_InitialState() (gas: 37813)
Expand Down Expand Up @@ -366,7 +370,7 @@ TokenPoolV2_getTokenTransferFeeConfig:test_getTokenTransferFeeConfig() (gas: 458
TokenPoolV2_getTokenTransferFeeConfig:test_getTokenTransferFeeConfig_DeleteConfig() (gas: 24623)
TokenPoolV2_setCustomFinalityRateLimitConfig:test_setCustomFinalityRateLimitConfig() (gas: 122797)
TokenPoolV2_supportsInterface:test_supportsInterface() (gas: 14579)
TokenPoolV2_validateLockOrBurn:test_validateLockOrBurn() (gas: 50490)
TokenPoolV2_validateLockOrBurn:test_validateLockOrBurn() (gas: 47491)
TokenPoolV2_validateLockOrBurn:test_validateLockOrBurn_WithFastFinality() (gas: 172385)
TokenPoolV2_validateReleaseOrMint:test_validateReleaseOrMint() (gas: 50815)
TokenPoolV2_validateReleaseOrMint:test_validateReleaseOrMint_CursedByRMN() (gas: 23262)
Expand Down Expand Up @@ -427,4 +431,4 @@ USDCTokenPool_releaseOrMint:test_ReleaseOrMintRealTx() (gas: 265877)
USDCTokenPool_supportsInterface:test_SupportsInterface() (gas: 10210)
VerifierProxy_fallback:test_fallback() (gas: 22825)
VerifierProxy_setVerifier:test_setVerifier() (gas: 19935)
e2e:test_e2e() (gas: 507836)
e2e:test_e2e() (gas: 597716)
12 changes: 0 additions & 12 deletions chains/evm/contracts/ccvs/CommitteeVerifier.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ pragma solidity ^0.8.24;

import {ICrossChainVerifierV1} from "../interfaces/ICrossChainVerifierV1.sol";

import {Client} from "../libraries/Client.sol";
import {MessageV1Codec} from "../libraries/MessageV1Codec.sol";
import {BaseVerifier} from "./components/BaseVerifier.sol";
import {SignatureQuorumValidator} from "./components/SignatureQuorumValidator.sol";
Expand Down Expand Up @@ -143,17 +142,6 @@ contract CommitteeVerifier is Ownable2StepMsgSender, ICrossChainVerifierV1, Sign
// │ Fees │
// ================================================================

/// @inheritdoc ICrossChainVerifierV1
function getFee(
address, // originalCaller
uint64, // destChainSelector
Client.EVM2AnyMessage memory, // message
bytes memory // extraArgs
) external pure returns (uint256) {
// TODO: Process msg & return fee
return 0;
}

/// @notice Withdraws the outstanding fee token balances to the fee aggregator.
/// @param feeTokens The fee tokens to withdraw.
/// @dev This function can be permissionless as it only transfers tokens to the fee aggregator which is a trusted address.
Expand Down
Loading
Loading