Merge branch 'develop' into solana-internal-image-create

Author: silaslenihan

.changeset/thick-bushes-occur.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal consistent error handling in app startup

.github/dependabot.yml

@@ -69,12 +69,81 @@ updates:
       - "dependencies"
       - "ctf"
   - package-ecosystem: gomod
-    directories:
-      - "**/*"
+    directory: "/system-tests/tests"
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 10
+    labels:
+      - "dependencies"
+      - "tests"
+  - package-ecosystem: gomod
+    directory: "/system-tests/tests/smoke/cre/httpaction"
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 10
+    labels:
+      - "dependencies"
+      - "tests"
+  - package-ecosystem: gomod
+    directory: "/system-tests/tests/smoke/cre/evm/evmread"
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 10
+    labels:
+      - "dependencies"
+      - "tests"
+  - package-ecosystem: gomod
+    directory: "/system-tests/tests/smoke/cre/evm/logtrigger"
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 10
+    labels:
+      - "dependencies"
+      - "tests"
+  - package-ecosystem: gomod
+    directory: "/system-tests/tests/regression/cre/consensus"
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 10
+    labels:
+      - "dependencies"
+      - "tests"
+  - package-ecosystem: gomod
+    directory: "/system-tests/tests/regression/cre/http"
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 10
+    labels:
+      - "dependencies"
+      - "tests"
+  - package-ecosystem: gomod
+    directory: "/system-tests/tests/regression/cre/evm/evmread-negative"
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 10
+    labels:
+      - "dependencies"
+      - "tests"
+  - package-ecosystem: gomod
+    directory: "/system-tests/tests/regression/cre/evm/evmwrite-negative"
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 10
+    labels:
+      - "dependencies"
+      - "tests"
+  - package-ecosystem: gomod
+    directory: "/system-tests/tests/regression/cre/evm/logtrigger-negative"
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 10
+    labels:
+      - "dependencies"
+      - "tests"
+  - package-ecosystem: gomod
+    directory: "/system-tests/tests/regression/cre/httpaction-negative"
     schedule:
       interval: "daily"
-    allow:
-      - dependency-name: "cre-sdk-go"
     open-pull-requests-limit: 10
     labels:
       - "dependencies"

.github/workflows/build-publish.yml

@@ -14,41 +14,32 @@ jobs:
     permissions:
       contents: read
     outputs:
-      git-tag-type: ${{ steps.check-git-tag-type.outputs.git-tag-type }}
-      ecr-image-name: ${{ steps.check-git-tag-type.outputs.ecr-image-name }}
       is-release: ${{ steps.release-tag-check.outputs.is-release }}
       is-pre-release: ${{ steps.release-tag-check.outputs.is-pre-release }}
+      ccip-image-tag: ${{ steps.compute-ccip-tag.outputs.ccip-image-tag }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
           persist-credentials: false
-      - name: Check git tag type
-        id: check-git-tag-type
-        shell: bash
-        env:
-          GIT_TAG: ${{ github.ref_name}}
-        run: |
-          # Check if git tag is related to CCIP
-          # Should match:
-          #   v2.23.1-ccip1.5
-          #   v2.23.1-ccip1.5-beta.0
-          #   v2.23.1-ccip1.5-rc.1
-          #   v2.23.1-ccip
-          regex_pattern='^v[0-9]+\.[0-9]+\.[0-9]+-ccip.*$'
-          if [[ $GIT_TAG =~ $regex_pattern ]]; then
-            echo "git-tag-type=ccip" | tee -a "$GITHUB_OUTPUT"
-            echo "ecr-image-name=chainlink/ccip" | tee -a "$GITHUB_OUTPUT"
-          else
-            echo "git-tag-type=core" | tee -a "$GITHUB_OUTPUT"
-            echo "ecr-image-name=chainlink/chainlink" | tee -a "$GITHUB_OUTPUT"
-          fi
       - name: Check release tag
         id: release-tag-check
         uses: smartcontractkit/.github/actions/release-tag-check@c5c4a8186da4218cff6cac8184e47dd3dec69ba3 # release-tag-check@0.1.0
+      - name: Compute CCIP image tag
+        id: compute-ccip-tag
+        shell: bash
+        env:
+          GIT_TAG: ${{ github.ref_name }}
+        run: |
+          # Compute CCIP-specific image tag by inserting '-ccip' before pre-release identifier
+          # Examples:
+          #   v2.34.0-rc.1   -> 2.34.0-ccip-rc.1
+          #   v2.34.0-beta.0 -> 2.34.0-ccip-beta.0
+          tag_without_v="${GIT_TAG#v}"
+          ccip_tag=$(echo "$tag_without_v" | sed -E 's/^([0-9]+\.[0-9]+\.[0-9]+)-(.*)$/\1-ccip-\2/')
+          echo "ccip-image-tag=$ccip_tag" | tee -a "$GITHUB_OUTPUT"
       - name: Check for VERSION file bump on tags
-        # Avoids checking VERSION file bump on forks or from CCIP releases.
-        if: ${{ github.repository == 'smartcontractkit/chainlink' && steps.check-git-tag-type.outputs.git-tag-type == 'core' }}
+        if: ${{ github.repository == 'smartcontractkit/chainlink' }}
         uses: ./.github/actions/version-file-bump
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -57,7 +48,7 @@ jobs:
     needs: [checks]
     # No need to build the final image as we promote the last RC to use the final tag
     # so we only run the builds for pre-releases.
-    if: needs.checks.outputs.git-tag-type == 'core' && needs.checks.outputs.is-pre-release == 'true'
+    if: needs.checks.outputs.is-pre-release == 'true'
     permissions:
       contents: read
       id-token: write
@@ -89,7 +80,9 @@ jobs:
 
   docker-ccip:
     needs: [checks]
-    if: needs.checks.outputs.git-tag-type == 'ccip'
+    # No need to build the final image as we promote the last RC to use the final tag
+    # so we only run the builds for pre-releases.
+    if: needs.checks.outputs.is-pre-release == 'true'
     permissions:
       contents: read
       id-token: write
@@ -110,7 +103,7 @@ jobs:
       docker-cache-behaviour: "disable"
       docker-manifest-sign: true
       docker-registry-url-override: public.ecr.aws/chainlink
-      docker-image-tag-strip-prefix: v # strip out the "v" prefix from the git tag for the image tag.
+      docker-image-tag-override: ${{ needs.checks.outputs.ccip-image-tag }}
       git-sha: ${{ github.sha }}
       github-event-name: ${{ github.event_name }}
       github-ref-name: ${{ github.ref_name }}
@@ -124,11 +117,11 @@ jobs:
 
   # Notify Slack channel for new git tags associated with pre-releases.
   # Final release notifications originate from the release coordinator repo.
-  slack-notify-prereleases:
+  slack-notify-core:
     permissions:
       contents: read
-    if: always() && (needs.docker-core.result == 'success' || needs.docker-ccip.result == 'success') && needs.checks.outputs.is-pre-release == 'true'
-    needs: [checks, docker-core, docker-ccip]
+    if: always() && needs.docker-core.result == 'success'
+    needs: [checks, docker-core]
     uses: ./.github/workflows/release-notifications.yml
     secrets: inherit
     with:
@@ -145,12 +138,35 @@ jobs:
       docker-image-name: >-
         ${{
           format(
-            'public.ecr.aws/{0}:{1}',
-            needs.checks.outputs.ecr-image-name,
-            needs.docker-core.outputs.docker-manifest-tag || needs.docker-ccip.outputs.docker-manifest-tag
+            'public.ecr.aws/chainlink/chainlink:{0}',
+            needs.docker-core.outputs.docker-manifest-tag
+          )
+        }}
+      docker-image-digest: ${{ needs.docker-core.outputs.docker-manifest-digest }}
+
+  slack-notify-ccip:
+    permissions:
+      contents: read
+    if: always() && needs.docker-ccip.result == 'success'
+    needs: [checks, docker-ccip]
+    uses: ./.github/workflows/release-notifications.yml
+    secrets: inherit
+    with:
+      git-ref: ${{ github.ref_name }}
+      git-ref-type: ${{ github.ref_type }}
+      changelog-url: >-
+        ${{
+          format(
+            'https://github.com/{0}/blob/{1}/CHANGELOG.md',
+            github.repository,
+            github.ref_name
           )
         }}
-      docker-image-digest: >-
+      docker-image-name: >-
         ${{
-          needs.docker-core.outputs.docker-manifest-digest || needs.docker-ccip.outputs.docker-manifest-digest
+          format(
+            'public.ecr.aws/chainlink/ccip:{0}',
+            needs.docker-ccip.outputs.docker-manifest-tag
+          )
         }}
+      docker-image-digest: ${{ needs.docker-ccip.outputs.docker-manifest-digest }}

.gitignore

@@ -32,6 +32,7 @@ tools/clroot/db.sqlite3-wal
 debug.env
 operator_ui/install
 .devenv
+event_dump.ndjson
 
 # neovim
 .nvim.lua

.mockery.yaml

@@ -277,13 +277,6 @@ packages:
     interfaces:
       ExternalInitiatorManager:
       HTTPClient:
-  github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/read:
-    config:
-      dir: "{{ .InterfaceDir }}/mocks"
-    interfaces:
-      Registrar:
-      Reader:
-      BatchCaller:
   github.com/smartcontractkit/chainlink/v2/core/sessions:
     interfaces:
       BasicAdminUsersORM:
@@ -306,9 +299,6 @@ packages:
     config:
       dir: core/capabilities/targets/mocks
     interfaces:
-      Codec:
-        config:
-          dir: core/services/relay/evm/mocks
       ContractWriter:
   github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_2_0/evm_2_evm_offramp:
     config:

core/capabilities/ccip/ccip_integration_tests/integrationhelpers/integration_helpers.go

@@ -20,6 +20,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	chainsel "github.com/smartcontractkit/chain-selectors"
+
 	"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_6_0/ccip_home"
 	"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_6_0/rmn_home"
 	ccipreader "github.com/smartcontractkit/chainlink-ccip/pkg/reader"
@@ -33,14 +34,14 @@ import (
 	"github.com/smartcontractkit/chainlink-evm/pkg/config"
 	"github.com/smartcontractkit/chainlink-evm/pkg/heads/headstest"
 	"github.com/smartcontractkit/chainlink-evm/pkg/logpoller"
+	"github.com/smartcontractkit/chainlink-evm/pkg/read"
 	evmtestutils "github.com/smartcontractkit/chainlink-evm/pkg/testutils"
 
 	configsevm "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/configs/evm"
 	cctypes "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/types"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/p2pkey"
-	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
 )
 
 const chainID = 1337
@@ -55,7 +56,7 @@ func NewReader(
 	address common.Address,
 	chainReaderConfig config.ChainReaderConfig,
 ) types.ContractReader {
-	cr, err := evm.NewChainReaderService(testutils.Context(t), logger.Test(t), logPoller, headTracker, client, chainReaderConfig)
+	cr, err := read.NewChainReaderService(testutils.Context(t), logger.Test(t), logPoller, headTracker, client, chainReaderConfig)
 	require.NoError(t, err)
 	err = cr.Bind(testutils.Context(t), []types.BoundContract{
 		{
@@ -158,7 +159,7 @@ func (t TestUniverse) NewContractReader(ctx context.Context, cfg []byte) (types.
 	var config config.ChainReaderConfig
 	err := json.Unmarshal(cfg, &config)
 	require.NoError(t.TestingT, err)
-	return evm.NewChainReaderService(ctx, logger.Test(t.TestingT), t.LogPoller, t.HeadTracker, t.SimClient, config)
+	return read.NewChainReaderService(ctx, logger.Test(t.TestingT), t.LogPoller, t.HeadTracker, t.SimClient, config)
 }
 
 func P2pIDsFromInts(ints []int64) [][32]byte {

core/capabilities/ccip/ccip_integration_tests/usdcreader/usdcreader_test.go

@@ -23,6 +23,7 @@ import (
 	typepkgmock "github.com/smartcontractkit/chainlink-ccip/mocks/pkg/types/ccipocr3"
 	ccipocr3common "github.com/smartcontractkit/chainlink-common/pkg/types/ccipocr3"
 	"github.com/smartcontractkit/chainlink-evm/pkg/config"
+	"github.com/smartcontractkit/chainlink-evm/pkg/read"
 
 	sel "github.com/smartcontractkit/chain-selectors"
 
@@ -39,7 +40,6 @@ import (
 	evmconfig "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/configs/evm"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
-	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
 	"github.com/smartcontractkit/chainlink/v2/core/utils/testutils/heavyweight"
 )
 
@@ -460,7 +460,7 @@ func testSetup(ctx context.Context, t testing.TB, readerChain ccipocr3common.Cha
 	)
 	require.NoError(t, lp.Start(ctx))
 
-	cr, err := evm.NewChainReaderService(ctx, lggr, lp, headTracker, cl, cfg)
+	cr, err := read.NewChainReaderService(ctx, lggr, lp, headTracker, cl, cfg)
 	require.NoError(t, err)
 
 	err = cr.Start(ctx)

core/capabilities/compute/cache_test.go

@@ -12,7 +12,6 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
-	"github.com/smartcontractkit/chainlink-common/pkg/utils/tests"
 	"github.com/smartcontractkit/chainlink-common/pkg/workflows/wasm/host"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/wasmtest"
 )
@@ -23,8 +22,6 @@ const (
 
 // Verify that cache evicts an expired module.
 func TestCache(t *testing.T) {
-	tests.SkipFlakey(t, "https://smartcontract-it.atlassian.net/browse/DX-558")
-
 	t.Parallel()
 	clock := clockwork.NewFakeClock()
 	tick := 1 * time.Second