diff --git a/GNUmakefile b/GNUmakefile index 8224aa4745..af289ec55b 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -68,6 +68,10 @@ install-medianpoc: ## Build & install the chainlink-medianpoc binary. install-ocr3-capability: ## Build & install the chainlink-ocr3-capability binary. go install $(GOFLAGS) ./plugins/cmd/chainlink-ocr3-capability +.PHONY: install-ccip-exec +install-ccip-exec: + go install $(GOFLAGS) ./plugins/cmd/chainlink-ccip-exec + .PHONY: docker ## Build the chainlink docker image docker: docker buildx build \ diff --git a/core/services/ocr2/plugins/ccip/ccipexec/initializers.go b/core/services/ocr2/plugins/ccip/ccipexec/initializers.go index 1cc1cf893d..3d7f61a93f 100644 --- a/core/services/ocr2/plugins/ccip/ccipexec/initializers.go +++ b/core/services/ocr2/plugins/ccip/ccipexec/initializers.go @@ -68,6 +68,9 @@ func NewExecServices(ctx context.Context, lggr logger.Logger, cfg plugins.Regist Cmd: loopCmd, Env: envVars, }) + if err != nil { + return nil, fmt.Errorf("failed to register ccip exec plugin: %w", err) + } // get reporting plugin factory from loop factoryServer := loop.NewExecutionService(lggr, grpcOpts, cmdFn, srcProvider, dstProvider, uint32(srcChainID), uint32(dstChainID), sourceTokenAddress) pluginFactory = factoryServer diff --git a/integration-tests/ccip-tests/Makefile b/integration-tests/ccip-tests/Makefile index 5a40f7ca0f..2a67e02971 100644 --- a/integration-tests/ccip-tests/Makefile +++ b/integration-tests/ccip-tests/Makefile @@ -68,3 +68,7 @@ test_smoke_ccip_default: set_config .PHONY: build_ccip_image build_ccip_image: docker build -f ../../core/chainlink.Dockerfile --build-arg COMMIT_SHA=$(git rev-parse HEAD) --build-arg CHAINLINK_USER=chainlink -t $(image):$(tag) ../../ + +.PHONY: build_ccip_plugin_image +build_ccip_plugin_image: + docker build -f ../../plugins/chainlink.Dockerfile --build-arg COMMIT_SHA=$(git rev-parse HEAD) --build-arg CHAINLINK_USER=chainlink -t $(image):$(tag) ../../ \ No newline at end of file diff --git a/plugins/chainlink.Dockerfile b/plugins/chainlink.Dockerfile index 5098639629..ae25b0d18a 100644 --- a/plugins/chainlink.Dockerfile +++ b/plugins/chainlink.Dockerfile @@ -25,6 +25,9 @@ RUN make install-medianpoc # Install ocr3-capability binary RUN make install-ocr3-capability +# Install ccip-exec binary +RUN make install-ccip-exec + # Link LOOP Plugin source dirs with simple names RUN go list -m -f "{{.Dir}}" github.com/smartcontractkit/chainlink-feeds | xargs -I % ln -s % /chainlink-feeds RUN go list -m -f "{{.Dir}}" github.com/smartcontractkit/chainlink-data-streams | xargs -I % ln -s % /chainlink-data-streams @@ -68,6 +71,7 @@ RUN curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \ COPY --from=buildgo /go/bin/chainlink /usr/local/bin/ COPY --from=buildgo /go/bin/chainlink-medianpoc /usr/local/bin/ COPY --from=buildgo /go/bin/chainlink-ocr3-capability /usr/local/bin/ +COPY --from=buildgo /go/bin/chainlink-ccip-exec /usr/local/bin/ COPY --from=buildplugins /go/bin/chainlink-feeds /usr/local/bin/ ENV CL_MEDIAN_CMD chainlink-feeds @@ -77,6 +81,7 @@ COPY --from=buildplugins /go/bin/chainlink-solana /usr/local/bin/ ENV CL_SOLANA_CMD chainlink-solana COPY --from=buildplugins /go/bin/chainlink-starknet /usr/local/bin/ ENV CL_STARKNET_CMD chainlink-starknet +ENV CL_CCIP-EXEC_CMD chainlink-ccip-exec # Dependency of CosmWasm/wasmd COPY --from=buildgo /go/pkg/mod/github.com/\!cosm\!wasm/wasmvm@v*/internal/api/libwasmvm.*.so /usr/lib/