From 0cdf3992a10af25d7e672e3bc5e453868d4fa2f9 Mon Sep 17 00:00:00 2001 From: FelixFan1992 Date: Wed, 18 Mar 2026 22:57:53 -0400 Subject: [PATCH 1/2] upgrade ccv --- core/scripts/go.mod | 2 +- core/scripts/go.sum | 4 ++-- deployment/go.mod | 2 +- deployment/go.sum | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- integration-tests/go.mod | 2 +- integration-tests/go.sum | 4 ++-- integration-tests/load/go.mod | 2 +- integration-tests/load/go.sum | 4 ++-- system-tests/lib/go.mod | 4 +++- system-tests/lib/go.sum | 16 ++++++++++++++-- system-tests/tests/go.mod | 4 +++- system-tests/tests/go.sum | 16 ++++++++++++++-- 14 files changed, 49 insertions(+), 21 deletions(-) diff --git a/core/scripts/go.mod b/core/scripts/go.mod index 023e6862a1a..7ae8b35f4f5 100644 --- a/core/scripts/go.mod +++ b/core/scripts/go.mod @@ -491,7 +491,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260310183131-8d0f0e383288 // indirect github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260310183131-8d0f0e383288 // indirect github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260317185256-d5f7db87ae70 // indirect - github.com/smartcontractkit/chainlink-ccv v0.0.0-20260317124520-6b2931b8cd0a // indirect + github.com/smartcontractkit/chainlink-ccv v0.0.0-20260318162338-b750bbe0ae6d // indirect github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20251211140724-319861e514c4 // indirect github.com/smartcontractkit/chainlink-evm/contracts/cre/gobindings v0.0.0-20260107191744-4b93f62cffe3 // indirect github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 // indirect diff --git a/core/scripts/go.sum b/core/scripts/go.sum index fc6f5475c55..dc1bcf149ee 100644 --- a/core/scripts/go.sum +++ b/core/scripts/go.sum @@ -1632,8 +1632,8 @@ github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260 github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260310183131-8d0f0e383288/go.mod h1:67YbnoglYD61Pz/jTVCgav9wFq7S35OU8UyQSvPllRw= github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260317185256-d5f7db87ae70 h1:LlNlfnonayAzFsVK3RjT3tJmUPOJu/hu4f1C0dLbMtI= github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260317185256-d5f7db87ae70/go.mod h1:P0/tjeeIIxfsBupk5MneRjq5uI9mj+ZQpMpYnFla6WM= -github.com/smartcontractkit/chainlink-ccv v0.0.0-20260317124520-6b2931b8cd0a h1:6c6WDGfZB2ehsw9/nBuuKNCw89+rCav2k9so41pIu4o= -github.com/smartcontractkit/chainlink-ccv v0.0.0-20260317124520-6b2931b8cd0a/go.mod h1:4+ngpFXBJrxcKR0jd2CUZFYJVtL8pPJfBXHbGfSNJeA= +github.com/smartcontractkit/chainlink-ccv v0.0.0-20260318162338-b750bbe0ae6d h1:EL1WR//m6DWhwTYu9hNI1EwOF8hYQDPGcSxLlY4MIwY= +github.com/smartcontractkit/chainlink-ccv v0.0.0-20260318162338-b750bbe0ae6d/go.mod h1:SoXToUX+f3Y2Sl6tgvjprEWC9zx3vrWXWExRyXGqa1o= github.com/smartcontractkit/chainlink-common v0.10.1-0.20260317233127-178dd2eeaa87 h1:nvv1kiv/7jwALkFztO//NhIq4Y9M4kmJ0UCgTZMC/qI= github.com/smartcontractkit/chainlink-common v0.10.1-0.20260317233127-178dd2eeaa87/go.mod h1:0ghbAr7tRO0tT5ZqBXhOyzgUO37tNNe33Yn0hskauVM= github.com/smartcontractkit/chainlink-common/keystore v1.0.2 h1:AWisx4JT3QV8tcgh6J5NCrex+wAgTYpWyHsyNPSXzsQ= diff --git a/deployment/go.mod b/deployment/go.mod index 00fe58b1676..0238007a0c9 100644 --- a/deployment/go.mod +++ b/deployment/go.mod @@ -422,7 +422,7 @@ require ( github.com/sirupsen/logrus v1.9.4 // indirect github.com/smartcontractkit/chainlink-automation v0.8.1 // indirect github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm v0.0.0-20260313162934-73fcb2020b93 // indirect - github.com/smartcontractkit/chainlink-ccv v0.0.0-20260317124520-6b2931b8cd0a // indirect + github.com/smartcontractkit/chainlink-ccv v0.0.0-20260318162338-b750bbe0ae6d // indirect github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10 // indirect github.com/smartcontractkit/chainlink-data-streams v0.1.12 // indirect github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 // indirect diff --git a/deployment/go.sum b/deployment/go.sum index acdecd591f0..1f8feb3ace8 100644 --- a/deployment/go.sum +++ b/deployment/go.sum @@ -1385,8 +1385,8 @@ github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260 github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260310183131-8d0f0e383288/go.mod h1:67YbnoglYD61Pz/jTVCgav9wFq7S35OU8UyQSvPllRw= github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260317175207-e9ff89561326 h1:JwBN5rCqJTHYJTSBdYS/nVWl1z/NtmHAxA7Petvr4Q0= github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260317175207-e9ff89561326/go.mod h1:P0/tjeeIIxfsBupk5MneRjq5uI9mj+ZQpMpYnFla6WM= -github.com/smartcontractkit/chainlink-ccv v0.0.0-20260317124520-6b2931b8cd0a h1:6c6WDGfZB2ehsw9/nBuuKNCw89+rCav2k9so41pIu4o= -github.com/smartcontractkit/chainlink-ccv v0.0.0-20260317124520-6b2931b8cd0a/go.mod h1:4+ngpFXBJrxcKR0jd2CUZFYJVtL8pPJfBXHbGfSNJeA= +github.com/smartcontractkit/chainlink-ccv v0.0.0-20260318162338-b750bbe0ae6d h1:EL1WR//m6DWhwTYu9hNI1EwOF8hYQDPGcSxLlY4MIwY= +github.com/smartcontractkit/chainlink-ccv v0.0.0-20260318162338-b750bbe0ae6d/go.mod h1:SoXToUX+f3Y2Sl6tgvjprEWC9zx3vrWXWExRyXGqa1o= github.com/smartcontractkit/chainlink-common v0.10.1-0.20260317233127-178dd2eeaa87 h1:nvv1kiv/7jwALkFztO//NhIq4Y9M4kmJ0UCgTZMC/qI= github.com/smartcontractkit/chainlink-common v0.10.1-0.20260317233127-178dd2eeaa87/go.mod h1:0ghbAr7tRO0tT5ZqBXhOyzgUO37tNNe33Yn0hskauVM= github.com/smartcontractkit/chainlink-common/keystore v1.0.2 h1:AWisx4JT3QV8tcgh6J5NCrex+wAgTYpWyHsyNPSXzsQ= diff --git a/go.mod b/go.mod index 77430cbacfa..d5a9922e83d 100644 --- a/go.mod +++ b/go.mod @@ -84,7 +84,7 @@ require ( github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20260317185256-d5f7db87ae70 github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260224214816-cb23ec38649f github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250912190424-fd2e35d7deb5 - github.com/smartcontractkit/chainlink-ccv v0.0.0-20260317124520-6b2931b8cd0a + github.com/smartcontractkit/chainlink-ccv v0.0.0-20260318162338-b750bbe0ae6d github.com/smartcontractkit/chainlink-common v0.10.1-0.20260317233127-178dd2eeaa87 github.com/smartcontractkit/chainlink-common/keystore v1.0.2 github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10 diff --git a/go.sum b/go.sum index 126dab1cb32..3101466e12a 100644 --- a/go.sum +++ b/go.sum @@ -1233,8 +1233,8 @@ github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260224214816-c github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260224214816-cb23ec38649f/go.mod h1:Kle+8kmKvbF8Cagj5hOAT+En5cZh28Qoi25aqxTHLUY= github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250912190424-fd2e35d7deb5 h1:Z4t2ZY+ZyGWxtcXvPr11y4o3CGqhg3frJB5jXkCSvWA= github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250912190424-fd2e35d7deb5/go.mod h1:xtZNi6pOKdC3sLvokDvXOhgHzT+cyBqH/gWwvxTxqrg= -github.com/smartcontractkit/chainlink-ccv v0.0.0-20260317124520-6b2931b8cd0a h1:6c6WDGfZB2ehsw9/nBuuKNCw89+rCav2k9so41pIu4o= -github.com/smartcontractkit/chainlink-ccv v0.0.0-20260317124520-6b2931b8cd0a/go.mod h1:4+ngpFXBJrxcKR0jd2CUZFYJVtL8pPJfBXHbGfSNJeA= +github.com/smartcontractkit/chainlink-ccv v0.0.0-20260318162338-b750bbe0ae6d h1:EL1WR//m6DWhwTYu9hNI1EwOF8hYQDPGcSxLlY4MIwY= +github.com/smartcontractkit/chainlink-ccv v0.0.0-20260318162338-b750bbe0ae6d/go.mod h1:SoXToUX+f3Y2Sl6tgvjprEWC9zx3vrWXWExRyXGqa1o= github.com/smartcontractkit/chainlink-common v0.10.1-0.20260317233127-178dd2eeaa87 h1:nvv1kiv/7jwALkFztO//NhIq4Y9M4kmJ0UCgTZMC/qI= github.com/smartcontractkit/chainlink-common v0.10.1-0.20260317233127-178dd2eeaa87/go.mod h1:0ghbAr7tRO0tT5ZqBXhOyzgUO37tNNe33Yn0hskauVM= github.com/smartcontractkit/chainlink-common/keystore v1.0.2 h1:AWisx4JT3QV8tcgh6J5NCrex+wAgTYpWyHsyNPSXzsQ= diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 126d6cf6d10..bb250fac496 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -499,7 +499,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm v0.0.0-20260313162934-73fcb2020b93 // indirect github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment v0.0.0-20260317185256-d5f7db87ae70 // indirect github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260317185256-d5f7db87ae70 // indirect - github.com/smartcontractkit/chainlink-ccv v0.0.0-20260317124520-6b2931b8cd0a // indirect + github.com/smartcontractkit/chainlink-ccv v0.0.0-20260318162338-b750bbe0ae6d // indirect github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10 // indirect github.com/smartcontractkit/chainlink-data-streams v0.1.12 // indirect github.com/smartcontractkit/chainlink-evm/contracts/cre/gobindings v0.0.0-20260107191744-4b93f62cffe3 // indirect diff --git a/integration-tests/go.sum b/integration-tests/go.sum index 4315e91a94f..ae9641b3b8f 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1624,8 +1624,8 @@ github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260 github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260310183131-8d0f0e383288/go.mod h1:67YbnoglYD61Pz/jTVCgav9wFq7S35OU8UyQSvPllRw= github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260317185256-d5f7db87ae70 h1:LlNlfnonayAzFsVK3RjT3tJmUPOJu/hu4f1C0dLbMtI= github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260317185256-d5f7db87ae70/go.mod h1:P0/tjeeIIxfsBupk5MneRjq5uI9mj+ZQpMpYnFla6WM= -github.com/smartcontractkit/chainlink-ccv v0.0.0-20260317124520-6b2931b8cd0a h1:6c6WDGfZB2ehsw9/nBuuKNCw89+rCav2k9so41pIu4o= -github.com/smartcontractkit/chainlink-ccv v0.0.0-20260317124520-6b2931b8cd0a/go.mod h1:4+ngpFXBJrxcKR0jd2CUZFYJVtL8pPJfBXHbGfSNJeA= +github.com/smartcontractkit/chainlink-ccv v0.0.0-20260318162338-b750bbe0ae6d h1:EL1WR//m6DWhwTYu9hNI1EwOF8hYQDPGcSxLlY4MIwY= +github.com/smartcontractkit/chainlink-ccv v0.0.0-20260318162338-b750bbe0ae6d/go.mod h1:SoXToUX+f3Y2Sl6tgvjprEWC9zx3vrWXWExRyXGqa1o= github.com/smartcontractkit/chainlink-common v0.10.1-0.20260317233127-178dd2eeaa87 h1:nvv1kiv/7jwALkFztO//NhIq4Y9M4kmJ0UCgTZMC/qI= github.com/smartcontractkit/chainlink-common v0.10.1-0.20260317233127-178dd2eeaa87/go.mod h1:0ghbAr7tRO0tT5ZqBXhOyzgUO37tNNe33Yn0hskauVM= github.com/smartcontractkit/chainlink-common/keystore v1.0.2 h1:AWisx4JT3QV8tcgh6J5NCrex+wAgTYpWyHsyNPSXzsQ= diff --git a/integration-tests/load/go.mod b/integration-tests/load/go.mod index b7c50bcbf76..57bbe8dc231 100644 --- a/integration-tests/load/go.mod +++ b/integration-tests/load/go.mod @@ -482,7 +482,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm v0.0.0-20260313162934-73fcb2020b93 // indirect github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment v0.0.0-20260317185256-d5f7db87ae70 // indirect github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260317185256-d5f7db87ae70 // indirect - github.com/smartcontractkit/chainlink-ccv v0.0.0-20260317124520-6b2931b8cd0a // indirect + github.com/smartcontractkit/chainlink-ccv v0.0.0-20260318162338-b750bbe0ae6d // indirect github.com/smartcontractkit/chainlink-common/keystore v1.0.2 // indirect github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10 // indirect github.com/smartcontractkit/chainlink-data-streams v0.1.12 // indirect diff --git a/integration-tests/load/go.sum b/integration-tests/load/go.sum index 81fa9f6eff0..18481d5b3ec 100644 --- a/integration-tests/load/go.sum +++ b/integration-tests/load/go.sum @@ -1602,8 +1602,8 @@ github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260 github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260310183131-8d0f0e383288/go.mod h1:67YbnoglYD61Pz/jTVCgav9wFq7S35OU8UyQSvPllRw= github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260317185256-d5f7db87ae70 h1:LlNlfnonayAzFsVK3RjT3tJmUPOJu/hu4f1C0dLbMtI= github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260317185256-d5f7db87ae70/go.mod h1:P0/tjeeIIxfsBupk5MneRjq5uI9mj+ZQpMpYnFla6WM= -github.com/smartcontractkit/chainlink-ccv v0.0.0-20260317124520-6b2931b8cd0a h1:6c6WDGfZB2ehsw9/nBuuKNCw89+rCav2k9so41pIu4o= -github.com/smartcontractkit/chainlink-ccv v0.0.0-20260317124520-6b2931b8cd0a/go.mod h1:4+ngpFXBJrxcKR0jd2CUZFYJVtL8pPJfBXHbGfSNJeA= +github.com/smartcontractkit/chainlink-ccv v0.0.0-20260318162338-b750bbe0ae6d h1:EL1WR//m6DWhwTYu9hNI1EwOF8hYQDPGcSxLlY4MIwY= +github.com/smartcontractkit/chainlink-ccv v0.0.0-20260318162338-b750bbe0ae6d/go.mod h1:SoXToUX+f3Y2Sl6tgvjprEWC9zx3vrWXWExRyXGqa1o= github.com/smartcontractkit/chainlink-common v0.10.1-0.20260317233127-178dd2eeaa87 h1:nvv1kiv/7jwALkFztO//NhIq4Y9M4kmJ0UCgTZMC/qI= github.com/smartcontractkit/chainlink-common v0.10.1-0.20260317233127-178dd2eeaa87/go.mod h1:0ghbAr7tRO0tT5ZqBXhOyzgUO37tNNe33Yn0hskauVM= github.com/smartcontractkit/chainlink-common/keystore v1.0.2 h1:AWisx4JT3QV8tcgh6J5NCrex+wAgTYpWyHsyNPSXzsQ= diff --git a/system-tests/lib/go.mod b/system-tests/lib/go.mod index 969b2f67df9..353542acaa6 100644 --- a/system-tests/lib/go.mod +++ b/system-tests/lib/go.mod @@ -361,6 +361,7 @@ require ( github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-runewidth v0.0.16 // indirect github.com/mattn/go-shellwords v1.0.12 // indirect + github.com/mfridman/interpolate v0.0.2 // indirect github.com/miekg/dns v1.1.65 // indirect github.com/minio/crc64nvme v1.0.0 // indirect github.com/minio/md5-simd v1.1.2 // indirect @@ -418,6 +419,7 @@ require ( github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect + github.com/pressly/goose/v3 v3.26.0 // indirect github.com/prometheus/client_golang v1.23.2 // indirect github.com/prometheus/client_model v0.6.2 // indirect github.com/prometheus/common v0.66.1 // indirect @@ -453,7 +455,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm v0.0.0-20260313162934-73fcb2020b93 // indirect github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260310183131-8d0f0e383288 // indirect github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260317185256-d5f7db87ae70 // indirect - github.com/smartcontractkit/chainlink-ccv v0.0.0-20260317124520-6b2931b8cd0a // indirect + github.com/smartcontractkit/chainlink-ccv v0.0.0-20260318162338-b750bbe0ae6d // indirect github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10 // indirect github.com/smartcontractkit/chainlink-data-streams v0.1.12 // indirect github.com/smartcontractkit/chainlink-evm/contracts/cre/gobindings v0.0.0-20260107191744-4b93f62cffe3 // indirect diff --git a/system-tests/lib/go.sum b/system-tests/lib/go.sum index 248ce1eef6b..7e1d19e1301 100644 --- a/system-tests/lib/go.sum +++ b/system-tests/lib/go.sum @@ -1334,6 +1334,8 @@ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= +github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4= +github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls= github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo= github.com/neelance/sourcemap v0.0.0-20200213170602-2833bce08e4c/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= @@ -1473,6 +1475,8 @@ github.com/prysmaticlabs/gohashtree v0.0.4-beta h1:H/EbCuXPeTV3lpKeXGPpEV9gsUpkq github.com/prysmaticlabs/gohashtree v0.0.4-beta/go.mod h1:BFdtALS+Ffhg3lGQIHv9HDWuHS8cTvHZzrHWxwOtGOs= github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9 h1:bsUq1dX0N8AOIL7EB/X911+m4EHsnWEHeJ0c+3TTBrg= github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= +github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/riferrei/srclient v0.5.4 h1:dfwyR5u23QF7beuVl2WemUY2KXh5+Sc4DHKyPXBNYuc= github.com/riferrei/srclient v0.5.4/go.mod h1:vbkLmWcgYa7JgfPvuy/+K8fTS0p1bApqadxrxi/S1MI= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= @@ -1595,8 +1599,8 @@ github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260 github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260310183131-8d0f0e383288/go.mod h1:67YbnoglYD61Pz/jTVCgav9wFq7S35OU8UyQSvPllRw= github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260317185256-d5f7db87ae70 h1:LlNlfnonayAzFsVK3RjT3tJmUPOJu/hu4f1C0dLbMtI= github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260317185256-d5f7db87ae70/go.mod h1:P0/tjeeIIxfsBupk5MneRjq5uI9mj+ZQpMpYnFla6WM= -github.com/smartcontractkit/chainlink-ccv v0.0.0-20260317124520-6b2931b8cd0a h1:6c6WDGfZB2ehsw9/nBuuKNCw89+rCav2k9so41pIu4o= -github.com/smartcontractkit/chainlink-ccv v0.0.0-20260317124520-6b2931b8cd0a/go.mod h1:4+ngpFXBJrxcKR0jd2CUZFYJVtL8pPJfBXHbGfSNJeA= +github.com/smartcontractkit/chainlink-ccv v0.0.0-20260318162338-b750bbe0ae6d h1:EL1WR//m6DWhwTYu9hNI1EwOF8hYQDPGcSxLlY4MIwY= +github.com/smartcontractkit/chainlink-ccv v0.0.0-20260318162338-b750bbe0ae6d/go.mod h1:SoXToUX+f3Y2Sl6tgvjprEWC9zx3vrWXWExRyXGqa1o= github.com/smartcontractkit/chainlink-common v0.10.1-0.20260317233127-178dd2eeaa87 h1:nvv1kiv/7jwALkFztO//NhIq4Y9M4kmJ0UCgTZMC/qI= github.com/smartcontractkit/chainlink-common v0.10.1-0.20260317233127-178dd2eeaa87/go.mod h1:0ghbAr7tRO0tT5ZqBXhOyzgUO37tNNe33Yn0hskauVM= github.com/smartcontractkit/chainlink-common/keystore v1.0.2 h1:AWisx4JT3QV8tcgh6J5NCrex+wAgTYpWyHsyNPSXzsQ= @@ -2596,6 +2600,14 @@ k8s.io/kubectl v0.31.2 h1:gTxbvRkMBwvTSAlobiTVqsH6S8Aa1aGyBcu5xYLsn8M= k8s.io/kubectl v0.31.2/go.mod h1:EyASYVU6PY+032RrTh5ahtSOMgoDRIux9V1JLKtG5xM= k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y= k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +modernc.org/libc v1.66.10 h1:yZkb3YeLx4oynyR+iUsXsybsX4Ubx7MQlSYEw4yj59A= +modernc.org/libc v1.66.10/go.mod h1:8vGSEwvoUoltr4dlywvHqjtAqHBaw0j1jI7iFBTAr2I= +modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU= +modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg= +modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI= +modernc.org/memory v1.11.0/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw= +modernc.org/sqlite v1.39.0 h1:6bwu9Ooim0yVYA7IZn9demiQk/Ejp0BtTjBWFLymSeY= +modernc.org/sqlite v1.39.0/go.mod h1:cPTJYSlgg3Sfg046yBShXENNtPrWrDX8bsbAQBzgQ5E= nhooyr.io/websocket v1.8.10 h1:mv4p+MnGrLDcPlBoWsvPP7XCzTYMXP9F9eIGoKbgx7Q= nhooyr.io/websocket v1.8.10/go.mod h1:rN9OFWIUwuxg4fR5tELlYC04bXYowCP9GX47ivo2l+c= nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50= diff --git a/system-tests/tests/go.mod b/system-tests/tests/go.mod index 6476ffef3ef..b2168788e9b 100644 --- a/system-tests/tests/go.mod +++ b/system-tests/tests/go.mod @@ -117,9 +117,11 @@ require ( github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect github.com/influxdata/tdigest v0.0.2-0.20210216194612-fc98d27c9e8b // indirect github.com/jhump/protocompile v0.0.0-20221021153901-4f6f732835e8 // indirect + github.com/mfridman/interpolate v0.0.2 // indirect github.com/moby/moby/api v1.53.0 // indirect github.com/moby/moby/client v0.2.2 // indirect github.com/oapi-codegen/runtime v1.1.2 // indirect + github.com/pressly/goose/v3 v3.26.0 // indirect github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect github.com/sigstore/sigstore v1.10.4 // indirect github.com/sigstore/sigstore-go v1.1.4-0.20251124094504-b5fe07a5a7d7 // indirect @@ -127,7 +129,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260310183131-8d0f0e383288 // indirect github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260310183131-8d0f0e383288 // indirect github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260317185256-d5f7db87ae70 // indirect - github.com/smartcontractkit/chainlink-ccv v0.0.0-20260317124520-6b2931b8cd0a // indirect + github.com/smartcontractkit/chainlink-ccv v0.0.0-20260318162338-b750bbe0ae6d // indirect github.com/smartcontractkit/chainlink-evm/contracts/cre/gobindings v0.0.0-20260107191744-4b93f62cffe3 // indirect github.com/smartcontractkit/chainlink-protos/chainlink-ccv/committee-verifier v0.0.0-20251211142334-5c3421fe2c8d // indirect github.com/smartcontractkit/chainlink-protos/chainlink-ccv/heartbeat v0.0.0-20260115142640-f6b99095c12e // indirect diff --git a/system-tests/tests/go.sum b/system-tests/tests/go.sum index cf24fa02749..2897bb337b4 100644 --- a/system-tests/tests/go.sum +++ b/system-tests/tests/go.sum @@ -1479,6 +1479,8 @@ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= +github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4= +github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls= github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo= github.com/neelance/sourcemap v0.0.0-20200213170602-2833bce08e4c/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= @@ -1652,6 +1654,8 @@ github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9 h1:bsUq1dX0N8A github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/redis/go-redis/v9 v9.10.0 h1:FxwK3eV8p/CQa0Ch276C7u2d0eNC9kCmAYQ7mCXCzVs= github.com/redis/go-redis/v9 v9.10.0/go.mod h1:huWgSWd8mW6+m0VPhJjSSQ+d6Nh1VICQ6Q5lHuCH/Iw= +github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= +github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/riferrei/srclient v0.5.4 h1:dfwyR5u23QF7beuVl2WemUY2KXh5+Sc4DHKyPXBNYuc= github.com/riferrei/srclient v0.5.4/go.mod h1:vbkLmWcgYa7JgfPvuy/+K8fTS0p1bApqadxrxi/S1MI= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= @@ -1779,8 +1783,8 @@ github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260 github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260310183131-8d0f0e383288/go.mod h1:67YbnoglYD61Pz/jTVCgav9wFq7S35OU8UyQSvPllRw= github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260317185256-d5f7db87ae70 h1:LlNlfnonayAzFsVK3RjT3tJmUPOJu/hu4f1C0dLbMtI= github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260317185256-d5f7db87ae70/go.mod h1:P0/tjeeIIxfsBupk5MneRjq5uI9mj+ZQpMpYnFla6WM= -github.com/smartcontractkit/chainlink-ccv v0.0.0-20260317124520-6b2931b8cd0a h1:6c6WDGfZB2ehsw9/nBuuKNCw89+rCav2k9so41pIu4o= -github.com/smartcontractkit/chainlink-ccv v0.0.0-20260317124520-6b2931b8cd0a/go.mod h1:4+ngpFXBJrxcKR0jd2CUZFYJVtL8pPJfBXHbGfSNJeA= +github.com/smartcontractkit/chainlink-ccv v0.0.0-20260318162338-b750bbe0ae6d h1:EL1WR//m6DWhwTYu9hNI1EwOF8hYQDPGcSxLlY4MIwY= +github.com/smartcontractkit/chainlink-ccv v0.0.0-20260318162338-b750bbe0ae6d/go.mod h1:SoXToUX+f3Y2Sl6tgvjprEWC9zx3vrWXWExRyXGqa1o= github.com/smartcontractkit/chainlink-common v0.10.1-0.20260317233127-178dd2eeaa87 h1:nvv1kiv/7jwALkFztO//NhIq4Y9M4kmJ0UCgTZMC/qI= github.com/smartcontractkit/chainlink-common v0.10.1-0.20260317233127-178dd2eeaa87/go.mod h1:0ghbAr7tRO0tT5ZqBXhOyzgUO37tNNe33Yn0hskauVM= github.com/smartcontractkit/chainlink-common/keystore v1.0.2 h1:AWisx4JT3QV8tcgh6J5NCrex+wAgTYpWyHsyNPSXzsQ= @@ -2873,6 +2877,14 @@ k8s.io/kubectl v0.31.2 h1:gTxbvRkMBwvTSAlobiTVqsH6S8Aa1aGyBcu5xYLsn8M= k8s.io/kubectl v0.31.2/go.mod h1:EyASYVU6PY+032RrTh5ahtSOMgoDRIux9V1JLKtG5xM= k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 h1:SjGebBtkBqHFOli+05xYbK8YF1Dzkbzn+gDM4X9T4Ck= k8s.io/utils v0.0.0-20251002143259-bc988d571ff4/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +modernc.org/libc v1.66.10 h1:yZkb3YeLx4oynyR+iUsXsybsX4Ubx7MQlSYEw4yj59A= +modernc.org/libc v1.66.10/go.mod h1:8vGSEwvoUoltr4dlywvHqjtAqHBaw0j1jI7iFBTAr2I= +modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU= +modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg= +modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI= +modernc.org/memory v1.11.0/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw= +modernc.org/sqlite v1.39.0 h1:6bwu9Ooim0yVYA7IZn9demiQk/Ejp0BtTjBWFLymSeY= +modernc.org/sqlite v1.39.0/go.mod h1:cPTJYSlgg3Sfg046yBShXENNtPrWrDX8bsbAQBzgQ5E= nhooyr.io/websocket v1.8.10 h1:mv4p+MnGrLDcPlBoWsvPP7XCzTYMXP9F9eIGoKbgx7Q= nhooyr.io/websocket v1.8.10/go.mod h1:rN9OFWIUwuxg4fR5tELlYC04bXYowCP9GX47ivo2l+c= nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50= From 116d92b17b5530dd13b72e30b23ccf5c5f2c9dbd Mon Sep 17 00:00:00 2001 From: FelixFan1992 Date: Thu, 19 Mar 2026 09:49:10 -0400 Subject: [PATCH 2/2] update --- .../ccip/changeset/aptos/config/deploy_curse_mcms.go | 1 + .../ccip/changeset/aptos/cs_deploy_curse_mcms.go | 7 ++++--- .../ccip/changeset/aptos/operation/curse_mcms.go | 7 ++++--- .../changeset/aptos/sequence/deploy_curse_mcms.go | 12 +++++++----- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/deployment/ccip/changeset/aptos/config/deploy_curse_mcms.go b/deployment/ccip/changeset/aptos/config/deploy_curse_mcms.go index 2136654fda0..16cd57e9f20 100644 --- a/deployment/ccip/changeset/aptos/config/deploy_curse_mcms.go +++ b/deployment/ccip/changeset/aptos/config/deploy_curse_mcms.go @@ -15,6 +15,7 @@ import ( type DeployCurseMCMSConfig struct { CurseMCMSConfigPerChain map[uint64]types.MCMSWithTimelockConfigV2 MCMSTimelockConfigPerChain map[uint64]proposalutils.TimelockConfig + MaxGasAmountPerChain map[uint64]uint64 } func (c DeployCurseMCMSConfig) Validate() error { diff --git a/deployment/ccip/changeset/aptos/cs_deploy_curse_mcms.go b/deployment/ccip/changeset/aptos/cs_deploy_curse_mcms.go index 900bb34e89b..0e1c060645b 100644 --- a/deployment/ccip/changeset/aptos/cs_deploy_curse_mcms.go +++ b/deployment/ccip/changeset/aptos/cs_deploy_curse_mcms.go @@ -80,9 +80,10 @@ func (cs DeployCurseMCMS) Apply(env cldf.Environment, cfg config.DeployCurseMCMS } seqInput := seq.DeployCurseMCMSSeqInput{ - MCMSAddress: chainState.MCMSAddress, - CCIPAddress: chainState.CCIPAddress, - CurseMCMS: curseMCMSConfig, + MCMSAddress: chainState.MCMSAddress, + CCIPAddress: chainState.CCIPAddress, + CurseMCMS: curseMCMSConfig, + MaxGasAmount: cfg.MaxGasAmountPerChain[chainSel], } curseMCMSSeqReport, err := operations.ExecuteSequence(env.OperationsBundle, seq.DeployCurseMCMSSequence, deps, seqInput) diff --git a/deployment/ccip/changeset/aptos/operation/curse_mcms.go b/deployment/ccip/changeset/aptos/operation/curse_mcms.go index 0bfe2a47647..e03bcb8bef4 100644 --- a/deployment/ccip/changeset/aptos/operation/curse_mcms.go +++ b/deployment/ccip/changeset/aptos/operation/curse_mcms.go @@ -19,8 +19,9 @@ import ( // OP: DeployCurseMCMSOp deploys CurseMCMS to a new resource account. type DeployCurseMCMSInput struct { - MCMSAddress aptos.AccountAddress - CCIPAddress aptos.AccountAddress + MCMSAddress aptos.AccountAddress + CCIPAddress aptos.AccountAddress + MaxGasAmount uint64 } var DeployCurseMCMSOp = operations.NewOperation( @@ -43,7 +44,7 @@ func deployCurseMCMS(b operations.Bundle, deps dependency.AptosDeps, in DeployCu "mcms": in.MCMSAddress, "mcms_register_entrypoints": aptos.AccountOne, }, - aptos.MaxGasAmount(1_000_000), + aptos.MaxGasAmount(in.MaxGasAmount), ) if err != nil { return aptos.AccountAddress{}, fmt.Errorf("failed to deploy CurseMCMS: %w", err) diff --git a/deployment/ccip/changeset/aptos/sequence/deploy_curse_mcms.go b/deployment/ccip/changeset/aptos/sequence/deploy_curse_mcms.go index ad18d645427..3e01fd64344 100644 --- a/deployment/ccip/changeset/aptos/sequence/deploy_curse_mcms.go +++ b/deployment/ccip/changeset/aptos/sequence/deploy_curse_mcms.go @@ -13,9 +13,10 @@ import ( // DeployCurseMCMSSeqInput holds the configuration for deploying CurseMCMS. type DeployCurseMCMSSeqInput struct { - MCMSAddress aptos.AccountAddress - CCIPAddress aptos.AccountAddress - CurseMCMS types.MCMSWithTimelockConfigV2 + MCMSAddress aptos.AccountAddress + CCIPAddress aptos.AccountAddress + CurseMCMS types.MCMSWithTimelockConfigV2 + MaxGasAmount uint64 } // DeployCurseMCMSSeqOutput holds the deployed address and a CurseMCMS @@ -43,8 +44,9 @@ func deployCurseMCMSSequence(b operations.Bundle, deps dependency.AptosDeps, in // Deploy CurseMCMS deployReport, err := operations.ExecuteOperation(b, operation.DeployCurseMCMSOp, deps, operation.DeployCurseMCMSInput{ - MCMSAddress: in.MCMSAddress, - CCIPAddress: in.CCIPAddress, + MCMSAddress: in.MCMSAddress, + CCIPAddress: in.CCIPAddress, + MaxGasAmount: in.MaxGasAmount, }) if err != nil { return DeployCurseMCMSSeqOutput{}, err