diff --git a/.github/workflows/ccip-e2e-tests.yml b/.github/workflows/ccip-e2e-tests.yml index 321691850..d3d56d72d 100644 --- a/.github/workflows/ccip-e2e-tests.yml +++ b/.github/workflows/ccip-e2e-tests.yml @@ -14,7 +14,7 @@ jobs: contents: read pull-requests: write name: CCIP E2E tests - runs-on: ubuntu-latest-8cores-32GB + runs-on: ubuntu-latest-16cores-64GB steps: - name: Free up disk space uses: smartcontractkit/.github/actions/free-disk-space@free-disk-space/v1 @@ -33,7 +33,7 @@ jobs: with: repository: smartcontractkit/chainlink-ccv path: chainlink-ccv - ref: c40f342b5ff632ff927ea3b15d311e05cb069889 + ref: 5a8c962531320a7dda8cd5e91a48d4504ae777f0 - name: Set up Docker Buildx uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1 @@ -65,7 +65,7 @@ jobs: working-directory: chainlink-ccv/build/devenv run: | # Build all dependent services docker images - just build-docker-dev-ci + just build-docker-ci env: DOCKER_BUILDKIT: 1 diff --git a/Makefile b/Makefile index e628e6fa2..918fc36c5 100644 --- a/Makefile +++ b/Makefile @@ -80,7 +80,7 @@ build-eds: ## Assuming chainlink-ccv is checked out in ../chainlink-ccv. .PHONY: build-ccv-images build-ccv-images: - cd ../chainlink-ccv/build/devenv && just build-docker-dev + cd ../chainlink-ccv/build/devenv && just build-docker .PHONY: start-devenv start-devenv: build-ccv-images build-committeeverifier build-eds diff --git a/ccip/devenv/env-canton-evm.toml b/ccip/devenv/env-canton-evm.toml index 021cc3f35..34d4c60c5 100644 --- a/ccip/devenv/env-canton-evm.toml +++ b/ccip/devenv/env-canton-evm.toml @@ -103,7 +103,7 @@ execution_interval = 15_000_000_000 number_of_canton_validators = 1 [fake] - image = "ccv-fakes:dev" + image = "ccv-fakes:latest" port = 9111 ################# @@ -112,7 +112,7 @@ execution_interval = 15_000_000_000 ## Default Verifier Setup [[verifier]] - image = "verifier:dev" + image = "verifier:latest" container_name = "default-verifier-1" nop_alias = "evm-default-verifier-1" port = 8100 @@ -125,7 +125,7 @@ execution_interval = 15_000_000_000 [[verifier]] - image = "verifier:dev" + image = "verifier:latest" container_name = "default-verifier-2" nop_alias = "evm-default-verifier-2" port = 8200 @@ -142,7 +142,7 @@ execution_interval = 15_000_000_000 ## Default Verifier Setup [[verifier]] - image = "verifier:dev" + image = "verifier:latest" # Will get prefixed appropriately by the modifier. container_name = "default-verifier-1" nop_alias = "canton-default-verifier-1" @@ -177,7 +177,7 @@ execution_interval = 15_000_000_000 [[verifier]] - image = "verifier:dev" + image = "verifier:latest" # Will get prefixed appropriately by the modifier. container_name = "default-verifier-2" nop_alias = "canton-default-verifier-2" @@ -234,7 +234,7 @@ execution_interval = 15_000_000_000 trace_batch_timeout = 10 [[executor]] - image = "executor:dev" + image = "executor:latest" container_name = "default-executor-1" nop_alias = "default-executor-1" executor_qualifier = "default" @@ -243,7 +243,7 @@ execution_interval = 15_000_000_000 name = "default-executor-1-db" [[indexer]] - image = "indexer:dev" + image = "indexer:latest" port = 8104 [indexer.db] image = "postgres:16-alpine" @@ -311,7 +311,7 @@ URI = "postgresql://indexer:indexer@indexer-db:5432/indexer?sslmode=disable" [[aggregator]] committee_name = "default" - image = "aggregator:dev" + image = "aggregator:latest" host_port = 50051 [aggregator.db] diff --git a/go.mod b/go.mod index 1b49ff887..1f55596ec 100644 --- a/go.mod +++ b/go.mod @@ -36,9 +36,9 @@ require ( github.com/smartcontractkit/chain-selectors v1.0.98 github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20260512180815-d7a89b0a5784 github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260512180815-d7a89b0a5784 - github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260513104050-c40f342b5ff6 - github.com/smartcontractkit/chainlink-ccv/build/devenv v0.0.2-0.20260513104050-c40f342b5ff6 - github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260513104050-c40f342b5ff6 + github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260513115456-5a8c96253132 + github.com/smartcontractkit/chainlink-ccv/build/devenv v0.0.2-0.20260513115456-5a8c96253132 + github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260513115456-5a8c96253132 github.com/smartcontractkit/chainlink-common v0.11.2-0.20260417081611-8bdbd9f45629 github.com/smartcontractkit/chainlink-deployments-framework v0.101.1 github.com/smartcontractkit/chainlink-testing-framework/framework v0.16.0 diff --git a/go.sum b/go.sum index 6a28f94cb..958176f4e 100644 --- a/go.sum +++ b/go.sum @@ -866,12 +866,12 @@ github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260 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-20260512180815-d7a89b0a5784 h1:WND8+86KW8p/mI/JBmn3BW3C4z6EqIjTRGx7EEqHYYM= github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260512180815-d7a89b0a5784/go.mod h1:Ls0oszLvhzV3/D0ivG85sh8qmmcsVhKplmepQdFq98E= -github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260513104050-c40f342b5ff6 h1:56sVouGc8lUWkknJdI0wUY7Fx17mQEt2Uw6iJYkdoPk= -github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260513104050-c40f342b5ff6/go.mod h1:o+orHk6EIrWfuK7mT3wOEQtMetBf0vZ5TDbN2aJSMgM= -github.com/smartcontractkit/chainlink-ccv/build/devenv v0.0.2-0.20260513104050-c40f342b5ff6 h1:yEvjegMrdFzD9US2jN3w/zArylYV10LOMMqanFoIwwY= -github.com/smartcontractkit/chainlink-ccv/build/devenv v0.0.2-0.20260513104050-c40f342b5ff6/go.mod h1:76jzt6VXKL2uxSQb0XHY0iLzEzzQ937WlzkSLCxj/6U= -github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260513104050-c40f342b5ff6 h1:/XbgjULldb6Lgei5F5TRZheqb5EZpwbWdE/7CG6OSgk= -github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260513104050-c40f342b5ff6/go.mod h1:oPiBgyi2/FMyFJT72xW6QPQA5d8p0O7b2gJtKq4EzO4= +github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260513115456-5a8c96253132 h1:dVPNbuQw602H9bkOTsG5UgHmRPzn/jFOlevFV6iFbMU= +github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260513115456-5a8c96253132/go.mod h1:o+orHk6EIrWfuK7mT3wOEQtMetBf0vZ5TDbN2aJSMgM= +github.com/smartcontractkit/chainlink-ccv/build/devenv v0.0.2-0.20260513115456-5a8c96253132 h1:9Ts8muK4lXoqoKQMR+q192gcDFKBrFXo/AwBJYRm5Ig= +github.com/smartcontractkit/chainlink-ccv/build/devenv v0.0.2-0.20260513115456-5a8c96253132/go.mod h1:76jzt6VXKL2uxSQb0XHY0iLzEzzQ937WlzkSLCxj/6U= +github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260513115456-5a8c96253132 h1:ZrnUINHgN1XNOuBnPD9dTD6bm8ESPs1KpWRlAzSss7I= +github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260513115456-5a8c96253132/go.mod h1:oPiBgyi2/FMyFJT72xW6QPQA5d8p0O7b2gJtKq4EzO4= github.com/smartcontractkit/chainlink-common v0.11.2-0.20260417081611-8bdbd9f45629 h1:YZCgnZteDIaV+Jrb6DDk4NQVJJ/ZwwYUaX9De/XUoCA= github.com/smartcontractkit/chainlink-common v0.11.2-0.20260417081611-8bdbd9f45629/go.mod h1:RnNTmxoheJYec/Gl/9t3wPLtFIHrlYjmWDdwZZJjchw= 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 27b06b75d..3d4dfa596 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -29,7 +29,7 @@ require ( github.com/smartcontractkit/chainlink-canton/party-ceremony v0.0.0 github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20260512180815-d7a89b0a5784 github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260512180815-d7a89b0a5784 - github.com/smartcontractkit/chainlink-ccv/build/devenv v0.0.2-0.20260513104050-c40f342b5ff6 + github.com/smartcontractkit/chainlink-ccv/build/devenv v0.0.2-0.20260513115456-5a8c96253132 github.com/smartcontractkit/chainlink-common v0.11.2-0.20260417081611-8bdbd9f45629 github.com/smartcontractkit/chainlink-deployments-framework v0.101.1 github.com/smartcontractkit/freeport v0.1.3-0.20250828155247-add56fa28aad @@ -270,8 +270,8 @@ require ( github.com/smartcontractkit/chainlink-aptos v0.0.0-20260306142855-8d629e752265 // indirect github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260129103204-4c8453dd8139 // indirect github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260129103204-4c8453dd8139 // indirect - github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260513104050-c40f342b5ff6 // indirect - github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260513104050-c40f342b5ff6 // indirect + github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260513115456-5a8c96253132 // indirect + github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260513115456-5a8c96253132 // 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-evm v0.3.4-0.20260427132147-1ef18876ae9b // indirect diff --git a/integration-tests/go.sum b/integration-tests/go.sum index 29cb215de..230e79578 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -795,12 +795,12 @@ github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260 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-20260512180815-d7a89b0a5784 h1:WND8+86KW8p/mI/JBmn3BW3C4z6EqIjTRGx7EEqHYYM= github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260512180815-d7a89b0a5784/go.mod h1:Ls0oszLvhzV3/D0ivG85sh8qmmcsVhKplmepQdFq98E= -github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260513104050-c40f342b5ff6 h1:56sVouGc8lUWkknJdI0wUY7Fx17mQEt2Uw6iJYkdoPk= -github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260513104050-c40f342b5ff6/go.mod h1:o+orHk6EIrWfuK7mT3wOEQtMetBf0vZ5TDbN2aJSMgM= -github.com/smartcontractkit/chainlink-ccv/build/devenv v0.0.2-0.20260513104050-c40f342b5ff6 h1:yEvjegMrdFzD9US2jN3w/zArylYV10LOMMqanFoIwwY= -github.com/smartcontractkit/chainlink-ccv/build/devenv v0.0.2-0.20260513104050-c40f342b5ff6/go.mod h1:76jzt6VXKL2uxSQb0XHY0iLzEzzQ937WlzkSLCxj/6U= -github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260513104050-c40f342b5ff6 h1:/XbgjULldb6Lgei5F5TRZheqb5EZpwbWdE/7CG6OSgk= -github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260513104050-c40f342b5ff6/go.mod h1:oPiBgyi2/FMyFJT72xW6QPQA5d8p0O7b2gJtKq4EzO4= +github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260513115456-5a8c96253132 h1:dVPNbuQw602H9bkOTsG5UgHmRPzn/jFOlevFV6iFbMU= +github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260513115456-5a8c96253132/go.mod h1:o+orHk6EIrWfuK7mT3wOEQtMetBf0vZ5TDbN2aJSMgM= +github.com/smartcontractkit/chainlink-ccv/build/devenv v0.0.2-0.20260513115456-5a8c96253132 h1:9Ts8muK4lXoqoKQMR+q192gcDFKBrFXo/AwBJYRm5Ig= +github.com/smartcontractkit/chainlink-ccv/build/devenv v0.0.2-0.20260513115456-5a8c96253132/go.mod h1:76jzt6VXKL2uxSQb0XHY0iLzEzzQ937WlzkSLCxj/6U= +github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260513115456-5a8c96253132 h1:ZrnUINHgN1XNOuBnPD9dTD6bm8ESPs1KpWRlAzSss7I= +github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260513115456-5a8c96253132/go.mod h1:oPiBgyi2/FMyFJT72xW6QPQA5d8p0O7b2gJtKq4EzO4= github.com/smartcontractkit/chainlink-common v0.11.2-0.20260417081611-8bdbd9f45629 h1:YZCgnZteDIaV+Jrb6DDk4NQVJJ/ZwwYUaX9De/XUoCA= github.com/smartcontractkit/chainlink-common v0.11.2-0.20260417081611-8bdbd9f45629/go.mod h1:RnNTmxoheJYec/Gl/9t3wPLtFIHrlYjmWDdwZZJjchw= github.com/smartcontractkit/chainlink-common/keystore v1.0.2 h1:AWisx4JT3QV8tcgh6J5NCrex+wAgTYpWyHsyNPSXzsQ=