Skip to content

Merge main into develop#1835

Merged
RensR merged 44 commits intodevelopfrom
merge-main-into-develop
Mar 13, 2026
Merged

Merge main into develop#1835
RensR merged 44 commits intodevelopfrom
merge-main-into-develop

Conversation

@RensR
Copy link
Collaborator

@RensR RensR commented Mar 13, 2026

No description provided.

RensR and others added 30 commits February 24, 2026 15:15
* bump go deps

* bump chain selectors

* bump filippo.io/edwards25519
* Fee Quoter changes to support ton and aptos (#1518)

* Fee Quoter changes to support ton and aptos

* add tests for other families

* Add tests for all remote chain selectors

* Bump versios (#1550)

* Bump versios

* Bump all contracts

* Add cpi event

* Reenable tests

* Fix ping-pong test setup

* Fix devenv CI setup and enable verbose logs in some integration tests

* devenv go mod tidy

* Fix CI command

* Fix CI command

* Disable broken tests again, unrelated to these changes

* Update changelog and remove `-candidate` version suffix

---------

Co-authored-by: Tobías Lichtig <toblich@users.noreply.github.com>
* e2e fixes

* casting

* casting

* cll

* pass token pool version

* skip ownership transfer

* fix devenv

* fix: use proper bindings based on token pool version

* feat: infer TokenTransferConfig chain selector for TokenExpansion

* fix transfer in devenv

* fix: remove unnecessary SetPool call after RegisterToken

* bubble up

* skip rate limit admin with authority

* action update

* fix flake

* fix flake

* fix flake

---------

Co-authored-by: chris-de-leon-cll <147140544+chris-de-leon-cll@users.noreply.github.com>
* Implement disable lane

* extend existing adaptor as opposed to creating new one

* cleaner file names
* disable ton

* generate
* condense remotes into top level

* fix test

* nilptr

* move up check

* move up check
* add EVM implementation

* fix tests

* handle error

* add Solana implementation

* add solana test

* naming convention

* update test to use correct Solana mcm program type

* test

* try removing qualifier

* fix test

* remove duplicate import
* fix: use full token ref for filtering

* add interface

* fix: use full token ref for filtering for getTokenMintAndTokenProgram

* chore: refactor convertRemoteChainConfig

* chore: refactor

* chore: revert configure_tokens_for_transfers

* merge token refs

* transfer if needed

* transfer if needed

---------

Co-authored-by: Matthew Romage <ma33r@aol.com>
Co-authored-by: Terry Tata <terry.tata@smartcontract.com>
These calls were being made but the results were not being used by the
plugin code anywhere. Since this is the only call that causes issues w/
the newer fee quoter we need can cleanly remove it and be compatible w/
the newer contract.
* Re-enable TON, support evm->ton extraArgs

* go mod tidy

* chore(deps): bump ctf

* chore: testing timeout

* fix: skip token setup when not supported

* chore: temp trick

* Revert "chore: temp trick"

This reverts commit 7f481cd.

* fix: override bytecode

* Revert "fix: override bytecode"

This reverts commit e66b043.

* fix: devenv deploy override with fq 163

* fix: register ton

* chore: bump

* Bump CTF

* Bump chainlink-ton version to one in main

* Bump chainlink-ton

* Add constants for extra args for easier matching

* Allow configuring extra args

* Reorder

* Remove extract-bytecode-abi

* Correctly skip destination chains with no token pool support

* Refactor tests and add a couple more test cases

* Add test receiver interface

* Support custom extra args

* Dep bump

* Split message and token transfer+message tests

* fix lint

* Fix t.Skip log

* Use uint max rather than int max

* Skip TON on this test case

* go mod tidy

* Add more test cases, restructure so it's callable with existing env

* go mod tidy

* make generate

* Revert moved code block to fix failure

* Bump chainlink-ton

* Move smoke tests into a lib

* fix: invalid receiver not supported by Solana

* fix: inverted bound check

* fix: invalid chain selector

* fix: skip OOO Solana test temporarily

* doc: issues

* fix: wrong skip condition

* tmp: skip gas limit test for Solana

* tmp: skip extra OOO test on evm->sol

* fix: revert reverted reverts

* revert fq bindings to main

* remove fq override

---------

Co-authored-by: Jade Park <jadepark.dev@gmail.com>
Co-authored-by: Terry Tata <terry.tata@smartcontract.com>
Co-authored-by: Patricio Tourne Passarino <patricio.passarino@smartcontract.com>
Co-authored-by: tt-cll <141346969+tt-cll@users.noreply.github.com>
* support malformed protobuf messages

* lint

* replace recover with granular error handling

* lint
* Create deploymnet/v1_6_1

* Add new op

* Port other 1.6.0 changes to 1.6.1

* Change other 1.6.0 to 1.6.1

* Add new sequence

* Remove code from 1.6.0 that is still under development from 1.6.1

* Fix go mods

* Add changeset

* Fix comment

* Add validator

* Fix changeset input and factory

* Bump devenv chainlink-ton

* Go mod tidy

* Add timelock support to changeset

* Remove version filter

* Apply PR feedback

* Move everything back into 1.6.0

* Remove TODO

* Only use 1.6.1 bindings for that new op

* Run go mod tidy

---------

Co-authored-by: Agustina Aldasoro <agustina.aldasoro@smartcontract.com>
* add fq v2 ops

* fix selector return type, inefficient encoding & nil return

* fix nits
* support downgrade

* wip

* wip

* getting closer to passing

* working

* 1.5 import

* doc

* 2.0
* add more nil checks against bytes32 parsing

* use more proto accessors

* character line length
* bump root refs

* bump carpenter

* bump otel

* undo
…mp 1.5 (#1807)

* do a version check before importing config

* co-pilot comments

* handle nil scenario

* fixing test

* adding selective remote chains for config import
…gas prices manually (#1811)

* changes

* changes

* changes

* fix error

* addressed comments

* more comments

* few more updates

* updates

* changes
* transfer fq2 to timelock

* comments

* timelock as price updater
- Add GetLaneVersionForRemoteChain helper to laneversionresolver
- Add UpdateMCMSConfig method to v1_6_0 EVMAdapter
- Add AdditionalFeeQuoterConfig and related fields to FeeQuoterUpdateInput
- Remove unused fmt import in devenv/cldf.go
- Update go.mod/go.sum after dependency reconciliation
@RensR RensR force-pushed the merge-main-into-develop branch from 27eacf8 to b1c65be Compare March 13, 2026 13:26
@RensR RensR marked this pull request as ready for review March 13, 2026 14:38
@RensR RensR requested a review from a team as a code owner March 13, 2026 14:38
Copilot AI review requested due to automatic review settings March 13, 2026 14:38
@RensR RensR requested review from a team as code owners March 13, 2026 14:38
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

This PR merges main into develop, bringing in recent changes across config validation, reader/codec robustness, deployment tooling (including new lane-disable + MCMS config update flows), expanded devenv support (TON), dependency bumps, and new/updated deployment documentation.

Changes:

  • Tighten token observer address validation and improve validation error context.
  • Improve OCR typecodec decode robustness against malformed/partial protos.
  • Extend deployment tooling with lane disabling, MCMS config updates, and additional docs/tests; update module dependencies accordingly.

Reviewed changes

Copilot reviewed 87 out of 95 changed files in this pull request and generated 8 comments.

Show a summary per file
File Description
pluginconfig/token_test.go Adds validation test cases for missing/zero-ish addresses and improved error context.
pluginconfig/token.go Improves USDC/LBTC token config validation and error wrapping.
pkg/reader/config_poller_v2.go Updates API docs: deprecates ChainConfigSnapshot.FeeQuoter population.
pkg/reader/ccip_test.go Removes test covering removed FeeQuoter static config accessor.
pkg/reader/ccip.go Removes getDestFeeQuoterStaticConfig helper.
pkg/ocrtypecodec/v1/exec.go Makes decode paths safer (nil-safe getters + error propagation from translators).
pkg/ocrtypecodec/v1/compatability_test.go Adds malformed-proto decode test for commit observation decoding.
pkg/ocrtypecodec/v1/commit.go Makes commit decode paths safer and propagates translator errors.
pkg/chainaccessor/default_accessor.go Removes FeeQuoter static config read from destination batch request.
pkg/chainaccessor/config_processors.go Removes FeeQuoter result processing.
integration-tests/go.mod Bumps dependencies for integration tests (geth, chainlink-common, otel, etc.).
integration-tests/deployment/update_to_FeeQuoter_1_7_test.go Updates FeeQuoter update test wiring/signature and version expectations.
integration-tests/deployment/mcms_test.go Adds Solana MCMS config update integration test.
integration-tests/deployment/helpers.go Updates FeeQuoter ownership-transfer refs to v1.6.3 ops.
integration-tests/deployment/connect_chains_test.go Adds disable-lane integration test and helper assertions for lane disable behavior.
go.mod Bumps core module dependencies (geth, chainlink-common, otel, time, etc.).
go.md Updates dependency graph (adds node-platform, chainlink-ton, etc.).
execute/plugin_functions_test.go Adds test case for ignoring observations from unknown source chains.
execute/plugin_functions.go Skips consensus evaluation for merkle roots from unknown chains; logs warning.
devenv/tests/e2e/smoke_test.go Refactors smoke test to call shared tests.RunSmokeTests.
devenv/tests/e2e/load_test.go Builds impls from selectors -> family/chainID mapping instead of raw blockchains list.
devenv/go.mod Bumps devenv deps, adds chainlink-ton deps, updates geth + other libs.
devenv/environment.go Increases environment creation timeout; updates impl creation to use chain family mapping.
devenv/cldf.go Enables TON impl construction; changes NewCCIPImplFromNetwork to accept family.
deployment/utils/common.go Adds FeeQuoter contract type and changes selector hex helper return type.
deployment/testhelpers/proposal.go Adds second test MCMS signer and helper config for two-signer MCMS.
deployment/testadapters/adapters.go Adds extra-arg name constants and new adapter method for forcing receiver failures.
deployment/lanes/product.go Extends LaneAdapter interface with DisableRemoteChain.
deployment/lanes/lane_update.go Import formatting change.
deployment/lanes/disable_lane.go Adds new DisableLane changeset to disable bidirectional lanes.
deployment/go.mod Bumps deployment module deps (geth, chainlink-common, grpc, otel, etc.).
deployment/docs/index.md Adds top-level deployment tooling docs overview.
deployment/docs/architecture.md Adds architecture guide and registry/adapter patterns.
deployment/docs/category.yaml Adds docs category metadata.
deployment/deploy/transfer_ownership.go Refactors transfer-ownership changeset; adds helper to transfer to timelock + accept if needed.
deployment/deploy/product.go Extends Deployer interface with UpdateMCMSConfig.
deployment/deploy/mcms.go Adds UpdateMCMSConfig changeset and wires batch-op collection.
chains/solana/go.sum Updates sums for dependency bumps (otel, sys, xxhash, etc.).
chains/solana/go.mod Adds xxhash indirect dep and bumps otel/sys versions.
chains/solana/deployment/v1_6_0/testadapter/test_adapter.go Adds receiver reject-all control + extra-args options handling.
chains/solana/deployment/v1_6_0/sequences/tokens.go Improves Solana manual token registration fallback resolution + optional DS token insertion.
chains/solana/deployment/v1_6_0/sequences/set_rmn_event_authorities.go Adds sequence to set RMN remote event authorities.
chains/solana/deployment/v1_6_0/sequences/mcms.go Adds Solana deployer UpdateMCMSConfig sequence.
chains/solana/deployment/v1_6_0/sequences/disable_remote_chain.go Adds Solana DisableRemoteChain sequence implementation.
chains/solana/deployment/v1_6_0/operations/router/router.go Enhances token admin registry ops; adds transfer operation output.
chains/solana/deployment/v1_6_0/operations/rmn_remote/rmn_remote.go Adds RMN remote SetEventAuthorities op (using v1.6.1 bindings).
chains/solana/deployment/v1_6_0/operations/offramp/offramp.go Adds OffRamp disable-source-chain operation.
chains/solana/deployment/v1_6_0/operations/fee_quoter/fee_quoter.go Adds FeeQuoter disable-dest-chain operation.
chains/solana/deployment/v1_6_0/changesets/rmn_changesets.go Adds RMN set-event-authorities changeset wrapper.
chains/solana/deployment/utils/utils.go Adds token-program type helpers and on-chain token-program inference.
chains/solana/deployment/go.mod Bumps Solana deployment deps and adds node-platform protos indirect.
chains/solana/deployment/docs/index.md Adds Solana deployment docs overview.
chains/solana/deployment/docs/adapter.md Adds SolanaAdapter reference documentation.
chains/solana/deployment/docs/category.yaml Adds Solana docs category metadata.
chains/evm/gobindings/generation/generated-wrapper-dependency-versions-do-not-edit.txt Updates recorded geth version to 1.17.1.
chains/evm/deployment/v2_0_0/sequences/SequenceFeeQuoterInputCreation_Mapping.md Adds FeeQuoter v1.x -> v2.0.0 input mapping doc.
chains/evm/deployment/v2_0_0/adapters/init.go Registers FeeQuoter updater/config import adapters for v2.0.0 flows.
chains/evm/deployment/v2_0_0/adapters/feequoterupdater.go Adds v2 FeeQuoter updater sequences (input creation + deploy/update).
chains/evm/deployment/v1_6_0/testadapter/test_adapter.go Adds extra-args options + TON extra-args encoding; adds receiver reject-all stub.
chains/evm/deployment/v1_6_0/sequences/disable_remote_chain.go Adds EVM DisableRemoteChain sequence via router ramp updates.
chains/evm/deployment/v1_6_0/sequences/deploy_token_pool_contracts.go Simplifies token ref lookup to use provided TokenRef.
chains/evm/deployment/v1_6_0/sequences/deploy_chain_contracts.go Switches FeeQuoter deploy to v1.6.3 ops and wires MCMS update config support.
chains/evm/deployment/v1_5_0/operations/onramp/onramp.go Adds deploy operation for OnRamp v1.5.0.
chains/evm/deployment/v1_2_0/adapters/laneversionresolver.go Adds helper to derive lane version per remote chain.
chains/evm/deployment/v1_0_0/sequences/mcms.go Adds sequence to set MCMS config on existing contracts.
chains/evm/deployment/v1_0_0/adapters/deployer.go Adds deployer sequence to update MCMS config.
chains/evm/deployment/go.mod Bumps EVM deployment deps; adds TON + tonutils-go.
chains/evm/deployment/docs/sequences.md Adds EVM sequences reference docs.
chains/evm/deployment/docs/operations.md Adds EVM operations reference docs.
chains/evm/deployment/docs/index.md Adds EVM deployment docs overview.
chains/evm/deployment/docs/adapter.md Adds EVMAdapter reference docs.
chains/evm/deployment/docs/category.yaml Adds EVM docs category metadata.
ccv/chains/evm/deployment/go.mod Bumps CCV EVM deployment module deps.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

# Conflicts:
#	ccv/chains/evm/deployment/go.mod
#	integration-tests/go.mod
#	integration-tests/go.sum
tt-cll
tt-cll previously approved these changes Mar 13, 2026
@RensR RensR force-pushed the merge-main-into-develop branch 2 times, most recently from 1452c93 to 92e39bf Compare March 13, 2026 16:47
# Conflicts:
#	devenv/go.sum
#	integration-tests/go.sum
@RensR RensR force-pushed the merge-main-into-develop branch from 92e39bf to 1d9b0b2 Compare March 13, 2026 16:53
@github-actions
Copy link

Metric merge-main-into-develop develop
Coverage 70.1% 69.7%

@RensR RensR enabled auto-merge March 13, 2026 17:24
@RensR RensR merged commit 4e3d9fb into develop Mar 13, 2026
26 of 27 checks passed
@RensR RensR deleted the merge-main-into-develop branch March 13, 2026 17:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.