Commit 38e09f6
Merge main into develop 2026-01-30 (#1614)
* Bump Go deps and fix NPM deps (#1570)
* carpenter
* Delete package-lock.json
* rm unused override
* move to dev deps
* [CRE-491] Bump common and other deps (#1576)
* gomods.
* gomods.
* Minor.
* Code (#1562)
* Add more clear instructions to seqno consensus failure log (#1572)
* CCIP-8527: Adding operations and sequences for token governor contract (#1579)
* CCIP-8527: Adding operations and sequences for token governor contract
* review comment
* review commnet -ai
* [CRE-491] Delete unused consts pkg (instead we use its copy from common) (#1577)
* Minor.
* Minor.
* Minor.
* chore: trigger pipeline
* chore: trigger pipeline
* Minor.
* chore: trigger pipeline
* Minor.
* Minor.
* Minor.
* chore: trigger pipeline
* Add GasLimit to commit offchain config (#1598)
* Add GasLimit to commit offchain plugin
* rename to EVMGasLimit
* error on the commit plugin if rmn is enabled (#1587)
* error on the commit plugin if rmn is enabled
* fix tests
* update test
* Ccip-8991 one environment for forked and local chains (#1595)
* one environment
* updates
* Ccip-8552 Adding metadata as onchain output (#1601)
* adding metadata as onchain output
* matching with develop
* handle conflicts
* Clean up lots of dead/deprecated CCIPReader code (#1573)
* Clean up lots of dead CCIPReader code
* lint and regen
* fix processor test
* lint and fix more tests
* make generate
* update discovery tests
* Migrate devenv to test adapters (#1589)
* Migrate devenv to test adapters
* fixes: EVM tests and Solana->EVM pass again
* fix gas limits
* Fix solana->evm and evm->solana
* Revert change
* goimports -w -local github.com/smartcontractkit/chainlink-ccip .
* Remove local replaces
* go mod fixup
* fix lint
* Deduplicate code
* Fix lints
* Fix some of the solana lints
* cleanup
* Remove unnecessary generics
* feat: implement token api for evm 1.6 (#1588)
* feat: implement token api for evm 1.6
* feat: add integration test, refactor evm token adapter impl, fix token pool qualifier bug
* chore: reword comment
* fix: do not use token symbol for token pool qualifier
* chore: add more EVM token expansion checks
* fix: gomodtidy
* chore: add more comments and refactor GetToken calls
* Refactor go bindings and deployment evm (#1578)
* Refactor go bindings and deployment evm
* fix ping pong
* Fix tests
* Fix mock Import
* review comments
* Replace factory bnmerc20 with bnmerc20
* more test has factory bnmerc20
* Remove option to deploy factory_burn_mint_erc20 directly
* lint fix
* make generate
* go sum
* Fix mocks
* Fix imports
* Use correct token for testing
* Modify owner
* Test
---------
Co-authored-by: Balamurali Gopalswami <balamurali.gopalswami@smartcontract.com>
* bump cl-ton version and update tooling adapter (#1604)
* bump cl-ton version and update tooling adapter
* bump dependency for devenv
* bump mod
* update modgraph
---------
Co-authored-by: Jonghyeon Park <jadepark.dev@gmail.com>
* bump mcms, fix ref (#1609)
---------
Co-authored-by: pavel-raykov <165708424+pavel-raykov@users.noreply.github.com>
Co-authored-by: Oliver Townsend <133903322+ogtownsend@users.noreply.github.com>
Co-authored-by: Balamurali Gopalswami <167726375+b-gopalswami@users.noreply.github.com>
Co-authored-by: Abdelrahman Soliman (Boda) <2677789+asoliman92@users.noreply.github.com>
Co-authored-by: Austin <107539019+0xAustinWang@users.noreply.github.com>
Co-authored-by: Anindita Ghosh <88458927+AnieeG@users.noreply.github.com>
Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>
Co-authored-by: Chris De Leon <147140544+chris-de-leon-cll@users.noreply.github.com>
Co-authored-by: Agustina Aldasoro <agusaldasoro@users.noreply.github.com>
Co-authored-by: Balamurali Gopalswami <balamurali.gopalswami@smartcontract.com>
Co-authored-by: Joe Huang <joe.huang@smartcontract.com>
Co-authored-by: Jonghyeon Park <jadepark.dev@gmail.com>File tree
151 files changed
+6683
-8167
lines changed- .github/workflows
- chains
- evm
- deployment
- v1_0_0
- operations
- burn_mint_erc677
- erc677
- factory_burn_mint_erc20
- sequences
- v1_5_0
- operations
- ping_pong_dapp
- token_admin_registry
- sequences
- v1_5_1/operations/token_pool
- v1_6_0
- changesets
- operations/token_governor
- sequences
- testadapter
- v1_6_4/changesets
- solana
- contracts/tests
- examples
- mcms
- testutils
- deployment
- v1_6_0
- operations/router
- testadapter
- utils
- ccip
- common
- cmd/carpenter
- commit
- chainfee
- merkleroot
- tokenprice
- deployment
- common
- testadapters
- tokens
- utils
- changesets
- sequences
- devenv
- chainimpl
- ccip-evm
- ccip-solana
- cmd/ccip
- common
- tests/e2e
- execute
- report
- tokendata/usdc
- integration-tests
- deployment
- internal
- mocks/inmem
- plugincommon/discovery
- discoverytypes
- reader
- mocks/pkg/reader
- pkg
- chainaccessor
- consts
- contractreader
- ocrtypecodec/v1
- reader
- pluginconfig
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
151 files changed
+6683
-8167
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
225 | 225 | | |
226 | 226 | | |
227 | 227 | | |
228 | | - | |
| 228 | + | |
229 | 229 | | |
230 | 230 | | |
231 | 231 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| 14 | + | |
14 | 15 | | |
15 | 16 | | |
16 | 17 | | |
17 | 18 | | |
18 | 19 | | |
19 | | - | |
| 20 | + | |
20 | 21 | | |
21 | 22 | | |
22 | | - | |
23 | | - | |
| 23 | + | |
| 24 | + | |
24 | 25 | | |
25 | 26 | | |
26 | 27 | | |
| |||
106 | 107 | | |
107 | 108 | | |
108 | 109 | | |
109 | | - | |
| 110 | + | |
110 | 111 | | |
111 | 112 | | |
112 | 113 | | |
| |||
197 | 198 | | |
198 | 199 | | |
199 | 200 | | |
200 | | - | |
201 | 201 | | |
202 | | - | |
| 202 | + | |
203 | 203 | | |
204 | 204 | | |
205 | 205 | | |
| |||
209 | 209 | | |
210 | 210 | | |
211 | 211 | | |
212 | | - | |
| 212 | + | |
213 | 213 | | |
214 | 214 | | |
| 215 | + | |
215 | 216 | | |
216 | 217 | | |
217 | 218 | | |
218 | 219 | | |
219 | 220 | | |
220 | 221 | | |
| 222 | + | |
221 | 223 | | |
222 | 224 | | |
223 | 225 | | |
| |||
235 | 237 | | |
236 | 238 | | |
237 | 239 | | |
| 240 | + | |
238 | 241 | | |
239 | 242 | | |
240 | 243 | | |
| |||
275 | 278 | | |
276 | 279 | | |
277 | 280 | | |
278 | | - | |
279 | | - | |
| 281 | + | |
| 282 | + | |
280 | 283 | | |
281 | 284 | | |
| 285 | + | |
282 | 286 | | |
283 | 287 | | |
284 | 288 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
283 | 283 | | |
284 | 284 | | |
285 | 285 | | |
286 | | - | |
287 | | - | |
| 286 | + | |
| 287 | + | |
288 | 288 | | |
289 | 289 | | |
290 | 290 | | |
| |||
650 | 650 | | |
651 | 651 | | |
652 | 652 | | |
653 | | - | |
654 | | - | |
| 653 | + | |
| 654 | + | |
655 | 655 | | |
656 | 656 | | |
657 | 657 | | |
| |||
684 | 684 | | |
685 | 685 | | |
686 | 686 | | |
687 | | - | |
688 | | - | |
| 687 | + | |
| 688 | + | |
689 | 689 | | |
690 | 690 | | |
691 | | - | |
692 | | - | |
| 691 | + | |
| 692 | + | |
693 | 693 | | |
694 | 694 | | |
695 | 695 | | |
696 | 696 | | |
697 | 697 | | |
698 | 698 | | |
699 | | - | |
700 | | - | |
| 699 | + | |
| 700 | + | |
| 701 | + | |
| 702 | + | |
701 | 703 | | |
702 | 704 | | |
703 | 705 | | |
| |||
712 | 714 | | |
713 | 715 | | |
714 | 716 | | |
| 717 | + | |
| 718 | + | |
715 | 719 | | |
716 | 720 | | |
717 | 721 | | |
| |||
722 | 726 | | |
723 | 727 | | |
724 | 728 | | |
725 | | - | |
726 | | - | |
| 729 | + | |
| 730 | + | |
727 | 731 | | |
728 | 732 | | |
729 | 733 | | |
| |||
777 | 781 | | |
778 | 782 | | |
779 | 783 | | |
| 784 | + | |
| 785 | + | |
780 | 786 | | |
781 | 787 | | |
782 | 788 | | |
| |||
1008 | 1014 | | |
1009 | 1015 | | |
1010 | 1016 | | |
1011 | | - | |
1012 | | - | |
| 1017 | + | |
| 1018 | + | |
1013 | 1019 | | |
1014 | 1020 | | |
1015 | 1021 | | |
| |||
1075 | 1081 | | |
1076 | 1082 | | |
1077 | 1083 | | |
1078 | | - | |
1079 | | - | |
1080 | | - | |
1081 | | - | |
| 1084 | + | |
| 1085 | + | |
| 1086 | + | |
| 1087 | + | |
1082 | 1088 | | |
1083 | 1089 | | |
1084 | 1090 | | |
| |||
Lines changed: 0 additions & 34 deletions
This file was deleted.
This file was deleted.
0 commit comments