Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions build/devenv/environment.go
Original file line number Diff line number Diff line change
Expand Up @@ -1155,7 +1155,7 @@ func NewEnvironment() (in *Cfg, err error) {
output, err := cs.Apply(*e, ccipChangesets.GenerateAggregatorConfigInput{
ServiceIdentifier: instanceName + "-aggregator",
CommitteeQualifier: aggregatorInput.CommitteeName,
ChainSelectors: selectors,
Topology: topology,
})
if err != nil {
return nil, fmt.Errorf("failed to generate aggregator config for %s (committee %s): %w", instanceName, aggregatorInput.CommitteeName, err)
Expand Down Expand Up @@ -1198,7 +1198,6 @@ func NewEnvironment() (in *Cfg, err error) {
CommitteeVerifierNameToQualifier: firstIdx.CommitteeVerifierNameToQualifier,
CCTPVerifierNameToQualifier: firstIdx.CCTPVerifierNameToQualifier,
LombardVerifierNameToQualifier: firstIdx.LombardVerifierNameToQualifier,
ChainSelectors: selectors,
})
if err != nil {
return nil, fmt.Errorf("failed to generate indexer config: %w", err)
Expand Down
24 changes: 4 additions & 20 deletions build/devenv/evm/impl.go
Original file line number Diff line number Diff line change
Expand Up @@ -1321,7 +1321,7 @@ func (m *CCIP17EVMConfig) ConnectContractsWithSelectors(ctx context.Context, e *
)
e.OperationsBundle = bundle

remoteChains := make(map[uint64]lanes.ChainDefinition)
remoteChains := make(map[uint64]ccipChangesets.RemoteLaneConfig)
for _, rs := range remoteSelectors {
// TODO: should be moved to the ChainFamily interface.
var addressBytesLength uint8
Expand All @@ -1338,7 +1338,7 @@ func (m *CCIP17EVMConfig) ConnectContractsWithSelectors(ctx context.Context, e *
return fmt.Errorf("unsupported family %s for chain %d", family, rs)
}

remoteChains[rs] = lanes.ChainDefinition{
remoteChains[rs] = ccipChangesets.RemoteLaneConfig{Chain: lanes.ChainDefinition{
Selector: rs,
FeeQuoterDestChainConfigOverrides: feeQuoterDestChainConfigOverride(rs),
ExecutorDestChainConfig: lanes.ExecutorDestChainConfig{
Expand Down Expand Up @@ -1369,7 +1369,7 @@ func (m *CCIP17EVMConfig) ConnectContractsWithSelectors(ctx context.Context, e *
Qualifier: devenvcommon.DefaultCommitteeVerifierQualifier,
},
},
}
}}
}

committeeVerifierRemoteChainConfigs := make(map[uint64]ccipChangesets.CommitteeVerifierRemoteChainConfig)
Expand All @@ -1393,7 +1393,6 @@ func (m *CCIP17EVMConfig) ConnectContractsWithSelectors(ctx context.Context, e *
mcmsReaderRegistry := changesetscore.GetRegistry()
laneAdapterRegistry := lanes.GetLaneAdapterRegistry()

selectorBytes := changesetsutils.GetSelectorHex(selector)
_, err := ccipChangesets.ConfigureChainsForLanesFromTopology(adapters.GetCommitteeVerifierContractRegistry(), laneAdapterRegistry, mcmsReaderRegistry).Apply(*e, ccipChangesets.ConfigureChainsForLanesFromTopologyConfig{
Topology: topology,
Chains: []ccipChangesets.PartialChainConfig{
Expand Down Expand Up @@ -1423,22 +1422,7 @@ func (m *CCIP17EVMConfig) ConnectContractsWithSelectors(ctx context.Context, e *
Qualifier: devenvcommon.DefaultExecutorQualifier,
ChainSelector: selector,
},
FeeQuoterDestChainConfig: lanes.FeeQuoterDestChainConfig{
IsEnabled: true,
MaxDataBytes: 30_000,
MaxPerMsgGasLimit: 3_000_000,
DestGasOverhead: 300_000,
DefaultTokenFeeUSDCents: 25,
DestGasPerPayloadByteBase: 16,
DefaultTokenDestGasOverhead: 90_000,
DefaultTxGasLimit: 200_000,
NetworkFeeUSDCents: 10,
ChainFamilySelector: binary.BigEndian.Uint32(selectorBytes[:4]),
V2Params: &lanes.FeeQuoterV2Params{
LinkFeeMultiplierPercent: 90,
USDPerUnitGas: big.NewInt(1e6),
},
},
FeeQuoterDestChainConfigOverrides: feeQuoterDestChainConfigOverride(selector),
ExecutorDestChainConfig: lanes.ExecutorDestChainConfig{
Enabled: true,
USDCentsFee: 0,
Expand Down
10 changes: 5 additions & 5 deletions build/devenv/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ require (
github.com/prometheus/client_golang v1.23.0
github.com/rs/zerolog v1.34.0
github.com/smartcontractkit/chain-selectors v1.0.97
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20260319175550-83cf59fe6839
github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment v0.0.0-20260319175550-83cf59fe6839
github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260319175550-83cf59fe6839
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20260323224438-d819cb3228e1
github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment v0.0.0-20260323224438-d819cb3228e1
github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260323224438-d819cb3228e1
github.com/smartcontractkit/chainlink-common v0.10.1-0.20260310151336-c98a9c147ac0
github.com/smartcontractkit/chainlink-deployments-framework v0.85.0
github.com/smartcontractkit/chainlink-testing-framework/framework v0.15.0
Expand All @@ -36,8 +36,8 @@ require (
github.com/jmoiron/sqlx v1.4.0
github.com/lib/pq v1.10.9
github.com/sethvargo/go-retry v0.3.0
github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm v0.0.0-20260319175550-83cf59fe6839
github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment v0.0.0-20260319175550-83cf59fe6839
github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm v0.0.0-20260323224438-d819cb3228e1
github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment v0.0.0-20260323224438-d819cb3228e1
github.com/smartcontractkit/chainlink-ccv v0.0.0-20260218133052-8e7fe2f457f9
github.com/smartcontractkit/chainlink-common/keystore v1.0.0
github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20260119171452-39c98c3b33cd
Expand Down
20 changes: 10 additions & 10 deletions build/devenv/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1117,20 +1117,20 @@ github.com/smartcontractkit/chain-selectors v1.0.97 h1:ECOin+SkJv2MUrfqTUu28J0ku
github.com/smartcontractkit/chain-selectors v1.0.97/go.mod h1:qy7whtgG5g+7z0jt0nRyii9bLND9m15NZTzuQPkMZ5w=
github.com/smartcontractkit/chainlink-aptos v0.0.0-20251212131933-e5e85d6fa4d3 h1:bbVSKb++R+rpLkydNvyS4nZPNkcjtolUuFC8YVwtMVk=
github.com/smartcontractkit/chainlink-aptos v0.0.0-20251212131933-e5e85d6fa4d3/go.mod h1:OywVThRaVXwknATT2B8QAwjOJ1LoYBB9bTsmRpf6RPw=
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20260319175550-83cf59fe6839 h1:RqjW1lsc1CjZw+Og/AdsCg2HYq3lvnoJ1XADpk3aRcw=
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20260319175550-83cf59fe6839/go.mod h1:iZTLsjnvzUR4QODACgkvJ2Xd1z1YYJJvEnLZ61K/sfw=
github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm v0.0.0-20260319175550-83cf59fe6839 h1:kat0vH3ZAl095Tn65nyZdnSkDodeW4kito17ToaNpIk=
github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm v0.0.0-20260319175550-83cf59fe6839/go.mod h1:zLqdD2kBX7NsntBneclb2yrHhjFaJdoyA8dK5eimlrE=
github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment v0.0.0-20260319175550-83cf59fe6839 h1:B+vSmcbTGAgme3piSNCJzLDnMjeOWdS/YFSuhCTrLY8=
github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment v0.0.0-20260319175550-83cf59fe6839/go.mod h1:EwCFQp17IjKDk0DBhANpZRjR4uk3u3ovbIzNtaLhVx0=
github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment v0.0.0-20260319175550-83cf59fe6839 h1:RdVBInzFjJf/RbOm0Ej8olcMK3XWh/ubj1SI1w/G/CU=
github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment v0.0.0-20260319175550-83cf59fe6839/go.mod h1:N2K2pMRf1fZm5Vulski3Ua+ToVzPZAvYLftJNi4kBKY=
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20260323224438-d819cb3228e1 h1:T0g+kBV4UhvDzJzb5WeMlBhVweIJ7lbqI5AfMvJKU+4=
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20260323224438-d819cb3228e1/go.mod h1:iZTLsjnvzUR4QODACgkvJ2Xd1z1YYJJvEnLZ61K/sfw=
github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm v0.0.0-20260323224438-d819cb3228e1 h1:2uMxXrGR5G2sGO5PZ3dj+Wq0H8TeVnwBjVmE0CloLaE=
github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm v0.0.0-20260323224438-d819cb3228e1/go.mod h1:zLqdD2kBX7NsntBneclb2yrHhjFaJdoyA8dK5eimlrE=
github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment v0.0.0-20260323224438-d819cb3228e1 h1:/O/n+vPVqi2YliYdI9JaF2dRJ+ItWdexQX7h/JRVKig=
github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment v0.0.0-20260323224438-d819cb3228e1/go.mod h1:EwCFQp17IjKDk0DBhANpZRjR4uk3u3ovbIzNtaLhVx0=
github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment v0.0.0-20260323224438-d819cb3228e1 h1:oTjXztnQjb2W0/02+VJNOmIMvnra6CvgeMCefMguMw4=
github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment v0.0.0-20260323224438-d819cb3228e1/go.mod h1:N2K2pMRf1fZm5Vulski3Ua+ToVzPZAvYLftJNi4kBKY=
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260129103204-4c8453dd8139 h1:jkChf04hhdiMBApbb+lLDxHMY62Md6UeM7v++GSw3K8=
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260129103204-4c8453dd8139/go.mod h1:wuhagkM/lU0GbV2YcrROOH0GlsfXJYwm6qmpa4CK70w=
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260129103204-4c8453dd8139 h1:tw3K4UkH5XfW5SoyYkvAlbzrccoGSLdz/XkxD6nyGC8=
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260129103204-4c8453dd8139/go.mod h1:1WcontO9PeuKdUf5HXfs3nuICtzUvFNnyCmrHkTCF9Y=
github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260319175550-83cf59fe6839 h1:7VZ3Hsh3nBJf05upZ0UujsKKDydmPppC9AzznSOBKAI=
github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260319175550-83cf59fe6839/go.mod h1:P0/tjeeIIxfsBupk5MneRjq5uI9mj+ZQpMpYnFla6WM=
github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260323224438-d819cb3228e1 h1:fcwsYYWUrUj6c2B2eIfTEPfqny3pjaZIzsnWu7Jl2q8=
github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260323224438-d819cb3228e1/go.mod h1:P0/tjeeIIxfsBupk5MneRjq5uI9mj+ZQpMpYnFla6WM=
github.com/smartcontractkit/chainlink-common v0.10.1-0.20260310151336-c98a9c147ac0 h1:eui+u6ge2RYW01F/DeXWrc5UOqc+8+lyPoi9TIAmMgo=
github.com/smartcontractkit/chainlink-common v0.10.1-0.20260310151336-c98a9c147ac0/go.mod h1:0ghbAr7tRO0tT5ZqBXhOyzgUO37tNNe33Yn0hskauVM=
github.com/smartcontractkit/chainlink-common/keystore v1.0.0 h1:sVa3j2FWK/5OxXpnlfDkF1deDAkuXEfaLKzYqBTA880=
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ require (
github.com/pressly/goose/v3 v3.26.0
github.com/prometheus/client_golang v1.23.0
github.com/smartcontractkit/chain-selectors v1.0.97
github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm v0.0.0-20260319175550-83cf59fe6839
github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm v0.0.0-20260323224438-d819cb3228e1
github.com/smartcontractkit/chainlink-common v0.9.6-0.20260114190811-74301cd99dc3
github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260115212037-5e3a1db0e079
github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20251222115927-36a18321243c // indirect
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -714,8 +714,8 @@ github.com/smartcontractkit/chain-selectors v1.0.97 h1:ECOin+SkJv2MUrfqTUu28J0ku
github.com/smartcontractkit/chain-selectors v1.0.97/go.mod h1:qy7whtgG5g+7z0jt0nRyii9bLND9m15NZTzuQPkMZ5w=
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20260107192940-0be702ef3ff5 h1:zn5uuemiuL/Rda48li8Gql929DeYPTRhR2ZGrO3Tgz4=
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20260107192940-0be702ef3ff5/go.mod h1:k5Ln240ZCu7weL16IgR1EN5xUsgVMjU9qr84eYZfCto=
github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm v0.0.0-20260319175550-83cf59fe6839 h1:kat0vH3ZAl095Tn65nyZdnSkDodeW4kito17ToaNpIk=
github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm v0.0.0-20260319175550-83cf59fe6839/go.mod h1:zLqdD2kBX7NsntBneclb2yrHhjFaJdoyA8dK5eimlrE=
github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm v0.0.0-20260323224438-d819cb3228e1 h1:2uMxXrGR5G2sGO5PZ3dj+Wq0H8TeVnwBjVmE0CloLaE=
github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm v0.0.0-20260323224438-d819cb3228e1/go.mod h1:zLqdD2kBX7NsntBneclb2yrHhjFaJdoyA8dK5eimlrE=
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250912190424-fd2e35d7deb5 h1:f8ak6g6P2KT4HjUbleU+Bh0gUJXMoGuoriMSyGxxD4M=
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250912190424-fd2e35d7deb5/go.mod h1:Ve1xD71bl193YIZQEoJMmBqLGQJdNs29bwbuObwvbhQ=
github.com/smartcontractkit/chainlink-common v0.9.6-0.20260114190811-74301cd99dc3 h1:VINIWIvYhgbGJpaI7O3aBuBOAZgMEN6BGA61zQIqvFw=
Expand Down
Loading