Skip to content

chore(devenv): Bump Chainlink-CCIP, RMN Integration EVM fixes #1333

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
HelloKashif wants to merge 2 commits into
base: main
Choose a base branch
from
Open

chore(devenv): Bump Chainlink-CCIP, RMN Integration EVM fixes #1333

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ee96c3
Bump Chainlink-CCIP, RMN Integration EVM fixes
HelloKashif Aug 10, 2026
ef163a2
Fix CI errors
HelloKashif Aug 10, 2026
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
6 changes: 3 additions & 3 deletions integration/evm/adapters/ccv_executor_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"fmt"

chainsel "github.com/smartcontractkit/chain-selectors"
rmnremote "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_6_0/operations/rmn_remote"
execop "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v2_0_0/operations/executor"
offrampop "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v2_0_0/operations/offramp"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v2_0_0/sequences"
rmnops "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v2_1_0/operations/rmn"
dsutils "github.com/smartcontractkit/chainlink-ccip/deployment/utils/datastore"
"github.com/smartcontractkit/chainlink-deployments-framework/datastore"

Expand Down Expand Up @@ -74,8 +74,8 @@ func (a *EVMCCVExecutorConfigAdapter) BuildChainConfig(ds datastore.DataStore, c
}

rmnRemoteAddr, err := dsutils.FindAndFormatRef(ds, datastore.AddressRef{
Type: datastore.ContractType(rmnremote.ContractType),
Version: rmnremote.Version,
Type: datastore.ContractType(rmnops.ContractType),
Version: rmnops.Version,
}, chainSelector, toAddress)
if err != nil {
return executor.ChainConfiguration{}, fmt.Errorf("failed to get rmn remote address for chain %d: %w", chainSelector, err)
Expand Down
6 changes: 3 additions & 3 deletions integration/evm/adapters/ccv_token_verifier_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package adapters
import (
"fmt"

rmnremote "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_6_0/operations/rmn_remote"
onrampop "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v2_0_0/operations/onramp"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v2_0_0/versioned_verifier_resolver"
cctpverifier "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v2_1_0/operations/cctp_verifier"
lombardverifier "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v2_1_0/operations/lombard_verifier"
rmnops "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v2_1_0/operations/rmn"
dsutils "github.com/smartcontractkit/chainlink-ccip/deployment/utils/datastore"
"github.com/smartcontractkit/chainlink-deployments-framework/datastore"

Expand Down Expand Up @@ -35,8 +35,8 @@ func (a *EVMCCVTokenVerifierConfigAdapter) ResolveTokenVerifierAddresses(
}

rmnRemoteAddr, err := dsutils.FindAndFormatRef(ds, datastore.AddressRef{
Type: datastore.ContractType(rmnremote.ContractType),
Version: rmnremote.Version,
Type: datastore.ContractType(rmnops.ContractType),
Version: rmnops.Version,
}, chainSelector, toAddress)
if err != nil {
return nil, fmt.Errorf("failed to get rmn remote address for chain %d: %w", chainSelector, err)
Expand Down
6 changes: 3 additions & 3 deletions integration/evm/adapters/ccv_verifier_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"fmt"

chainsel "github.com/smartcontractkit/chain-selectors"
rmnremote "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_6_0/operations/rmn_remote"
onrampop "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v2_0_0/operations/onramp"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v2_0_0/versioned_verifier_resolver"
rmnops "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v2_1_0/operations/rmn"
dsutils "github.com/smartcontractkit/chainlink-ccip/deployment/utils/datastore"
"github.com/smartcontractkit/chainlink-deployments-framework/datastore"

Expand Down Expand Up @@ -52,8 +52,8 @@ func (a *EVMCCVVerifierConfigAdapter) ResolveVerifierContractAddresses(
}

rmnRemoteAddr, err := dsutils.FindAndFormatRef(ds, datastore.AddressRef{
Type: datastore.ContractType(rmnremote.ContractType),
Version: rmnremote.Version,
Type: datastore.ContractType(rmnops.ContractType),
Version: rmnops.Version,
}, chainSelector, toAddress)
if err != nil {
return nil, fmt.Errorf("failed to get rmn remote address for chain %d: %w", chainSelector, err)
Expand Down
4 changes: 0 additions & 4 deletions integration/evm/adapters/deploy_defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (

"github.com/smartcontractkit/chainlink-deployments-framework/datastore"

"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_6_0/operations/rmn_remote"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v2_0_0/operations/executor"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v2_0_0/operations/fee_quoter"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v2_0_0/operations/mock_receiver"
Expand All @@ -30,9 +29,6 @@ func defaultDeployContractParams() ccvadapters.DeployContractParams {
panic("invalid usdPerWeth constant")
}
return ccvadapters.DeployContractParams{
RMNRemote: ccvadapters.RMNRemoteDeployParams{
Version: rmn_remote.Version,
},
OffRamp: ccvadapters.OffRampDeployParams{
Version: offramp.Version,
GasForCallExactCheck: 5_000,
Expand Down
34 changes: 0 additions & 34 deletions integration/evm/adapters/protocol_contracts_deploy_adapter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ const (
// optional; an absent key leaves the corresponding deploy default in place.
// The FeeQuoter price fields are big.Int and must be passed as base-10
// strings because TOML integers are limited to int64.
ProtocolContractsRMNRemoteLegacyRMNExtra = "rmnRemoteLegacyRmn"

ProtocolContractsOffRampGasForCallExactCheckExtra = "offRampGasForCallExactCheck"
ProtocolContractsOffRampMaxGasBufferToUpdateStateExtra = "offRampMaxGasBufferToUpdateState"

Expand Down Expand Up @@ -263,12 +261,6 @@ func protocolContractsExecutorFinality(extras map[string]any) (*finality.Config,
// FamilyExtras overrides onto the default DeployContractParams. Each override is
// applied only when its key is present; absent keys leave the deploy default.
func applyProtocolContractParamOverrides(params *ccvadapters.DeployContractParams, extras map[string]any) error {
if v, ok, err := extraString(extras, ProtocolContractsRMNRemoteLegacyRMNExtra); err != nil {
return err
} else if ok {
params.RMNRemote.LegacyRMN = v
}

if v, ok, err := extraBoundedUint[uint16](extras, ProtocolContractsOffRampGasForCallExactCheckExtra, math.MaxUint16); err != nil {
return err
} else if ok {
Expand Down Expand Up @@ -367,20 +359,6 @@ func extraBigInt(extras map[string]any, key string) (*big.Int, bool, error) {
return v, true, nil
}

// extraString reads an optional string FamilyExtras value. The bool return is
// false when the key is absent.
func extraString(extras map[string]any, key string) (string, bool, error) {
raw, present := extras[key]
if !present {
return "", false, nil
}
s, ok := raw.(string)
if !ok {
return "", false, fmt.Errorf("FamilyExtras[%q] must be a string, got %T", key, raw)
}
return s, true, nil
}

// extraBool reads an optional bool FamilyExtras value. The bool ok return is
// false when the key is absent.
func extraBool(extras map[string]any, key string) (value, ok bool, err error) {
Expand Down Expand Up @@ -425,14 +403,6 @@ func toEVMDeployInput(input ccvadapters.DeployChainContractsInput) (sequences.De
return sequences.DeployChainContractsInput{}, err
}

var legacyRMN common.Address
if input.ContractParams.RMNRemote.LegacyRMN != "" {
legacyRMN, err = parseHexAddress(input.ContractParams.RMNRemote.LegacyRMN, "RMNRemote.LegacyRMN")
if err != nil {
return sequences.DeployChainContractsInput{}, err
}
}

var onRampFeeAgg common.Address
if input.ContractParams.OnRamp.FeeAggregator != "" {
onRampFeeAgg, err = parseHexAddress(input.ContractParams.OnRamp.FeeAggregator, "OnRamp.FeeAggregator")
Expand All @@ -450,10 +420,6 @@ func toEVMDeployInput(input ccvadapters.DeployChainContractsInput) (sequences.De
DeployTestRouter: input.DeployTestRouter,
DeployerKeyOwned: input.DeployerKeyOwned,
ContractParams: sequences.ContractParams{
RMNRemote: sequences.RMNRemoteParams{
Version: input.ContractParams.RMNRemote.Version,
LegacyRMN: legacyRMN,
},
Comment on lines -453 to -456

@makramkd makramkd Aug 10, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Since this is a fix PR, can we use fix as the verb, rather than chore?

OffRamp: sequences.OffRampParams{
Version: input.ContractParams.OffRamp.Version,
GasForCallExactCheck: input.ContractParams.OffRamp.GasForCallExactCheck,
Expand Down
24 changes: 12 additions & 12 deletions integration/evm/adapters/protocol_contracts_deploy_adapter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v2_0_0/operations/fee_quoter"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v2_0_0/operations/offramp"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v2_0_0/operations/onramp"
"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v2_0_0/testsetup"
"github.com/smartcontractkit/chainlink-ccip/deployment/finality"
"github.com/smartcontractkit/chainlink-deployments-framework/chain/evm/operations/contract"

Expand Down Expand Up @@ -133,13 +134,6 @@ func TestEVMProtocolContractsDeployAdapter_Validation(t *testing.T) {
},
wantErrSub: "must be a base-10 integer string",
},
{
name: "FamilyExtras rmnRemoteLegacyRmn wrong type",
mutate: func(in *ccvdeploymentadapters.ProtocolContractsDeployInput) {
in.FamilyExtras = map[string]any{adapters.ProtocolContractsRMNRemoteLegacyRMNExtra: 42}
},
wantErrSub: "must be a string",
},
}

for _, tc := range tests {
Expand Down Expand Up @@ -193,6 +187,9 @@ func TestEVMProtocolContractsDeployAdapter_HappyPath(t *testing.T) {
in := ccvdeploymentadapters.ProtocolContractsDeployInput{
ChainSelector: testChainSelector,
DeployerContract: create2FactoryRef.Address,
// RMN deployment resolves the Ultra Fast Curse timelock as its curse admin; it is only a
// constructor arg and never called, so a plain non-zero ref stands in for a real MCMS.
ExistingAddresses: testsetup.UltraFastCurseMCMSRefs(testChainSelector),
// DeployerKeyOwned skips the MCMS timelock ownership-transfer step, which
// would otherwise require pre-deployed timelock contracts.
DeployerKeyOwned: true,
Expand Down Expand Up @@ -290,9 +287,10 @@ func TestEVMProtocolContractsDeployAdapter_ExecutorOverrides(t *testing.T) {
adapter := &adapters.EVMProtocolContractsDeployAdapter{}

in := ccvdeploymentadapters.ProtocolContractsDeployInput{
ChainSelector: testChainSelector,
DeployerContract: create2FactoryRef.Address,
DeployerKeyOwned: true,
ChainSelector: testChainSelector,
DeployerContract: create2FactoryRef.Address,
ExistingAddresses: testsetup.UltraFastCurseMCMSRefs(testChainSelector),
DeployerKeyOwned: true,
Executors: []ccvdeploymentadapters.ExecutorDeployParams{
{Version: executor.Version, Qualifier: "default"},
},
Expand Down Expand Up @@ -381,7 +379,10 @@ func TestEVMProtocolContractsDeployAdapter_ContractParamOverrides(t *testing.T)
in := ccvdeploymentadapters.ProtocolContractsDeployInput{
ChainSelector: testChainSelector,
DeployerContract: create2FactoryRef.Address,
DeployerKeyOwned: true,
// RMN deployment resolves the Ultra Fast Curse timelock as its curse admin; it is only a
// constructor arg and never called, so a plain non-zero ref stands in for a real MCMS.
ExistingAddresses: testsetup.UltraFastCurseMCMSRefs(testChainSelector),
DeployerKeyOwned: true,
Executors: []ccvdeploymentadapters.ExecutorDeployParams{
{Version: executor.Version, Qualifier: "default"},
},
Expand All @@ -395,7 +396,6 @@ func TestEVMProtocolContractsDeployAdapter_ContractParamOverrides(t *testing.T)
adapters.ProtocolContractsFeeQuoterWETHPremiumMultiplierWeiPerEthExtra: int64(1100000000000000000),
adapters.ProtocolContractsFeeQuoterUSDPerLINKExtra: "16000000000000000000",
adapters.ProtocolContractsFeeQuoterUSDPerWETHExtra: "2500000000000000000000",
adapters.ProtocolContractsRMNRemoteLegacyRMNExtra: "0x000000000000000000000000000000000000bEEF",
},
}

Expand Down
4 changes: 2 additions & 2 deletions integration/evm/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ require (
github.com/Masterminds/semver/v3 v3.5.0
github.com/ethereum/go-ethereum v1.17.4
github.com/smartcontractkit/chain-selectors v1.0.107
github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20260805145158-eb67fd002452
github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260805145158-eb67fd002452
github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20260807220022-77e09170ac0e
github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260807220022-77e09170ac0e
github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260608205628-b1fb1b311772
github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260616151800-9a3a31c4e194
github.com/smartcontractkit/chainlink-deployments-framework v0.117.1
Expand Down
8 changes: 4 additions & 4 deletions integration/evm/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading