fix conflicts

.changeset/late-windows-clean.md

@@ -0,0 +1,11 @@
+---
+"chainlink": minor
+---
+
+#internal Updated the TXM confirmation logic to use the mined transaction count to identify re-org'd or confirmed transactions.
+
+- Confirmer uses the mined transaction count to determine if transactions have been re-org'd or confirmed.
+- Confirmer no longer sets transaction states to `confirmed_missing_receipt`. This state is maintained in queries for backwards compatibility.
+- Finalizer now responsible for fetching and storing receipts for confirmed transactions.
+- Finalizer now responsible for resuming pending task runs.
+- Finalizer now responsible for marking old transactions without receipts broadcasted before the finalized head as fatal.

.changeset/sixty-queens-wait.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+#updated chain config: allow chain id and account address to be manually provided when no selections are available

.github/actions/goreleaser-build-sign-publish/action.yml

@@ -26,19 +26,32 @@ inputs:
     description: "The goreleaser configuration yaml"
     default: ".goreleaser.yaml"
     required: false
+  # other inputs
+  enable-debug:
+    description: |
+      Enable debug information for the run (true/false). This includes
+      buildkit debug information, and goreleaser debug, etc.
+    required: false
+    default: "${{ runner.debug == '1' }}"
+
 runs:
   using: composite
   steps:
     - # We need QEMU to test the cross architecture builds after they're built. 
       name: Set up QEMU 
       uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
+
     - name: Setup docker buildx
       uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.0
+      with:
+        buildkitd-flags: ${{ inputs.enable-debug == 'true' && '--debug' || '' }}
+
     - name: Set up Go
       uses: ./.github/actions/setup-go
       with:
         go-version-file: 'go.mod'
         only-modules: 'true'
+
     - name: Setup goreleaser
       uses: goreleaser/goreleaser-action@9ed2f89a662bf1735a48bc8557fd212fa902bebf # v6.1.0
       with:
@@ -65,6 +78,7 @@ runs:
         IMAGE_TAG: ${{ inputs.docker-image-tag }}
         GORELEASER_KEY: ${{ inputs.goreleaser-key }}
         GITHUB_TOKEN: ${{ github.token }}
+        DEBUG: ${{ inputs.enable-debug }}
       run: |
         # https://github.com/orgs/community/discussions/24950
         ${GITHUB_ACTION_PATH}/release.js

.github/actions/goreleaser-build-sign-publish/release.js

@@ -168,6 +168,7 @@ function extractDockerImages(artifacts) {
 
 function constructGoreleaserCommand(releaseType, version, goreleaserConfig) {
   const flags = [];
+  const debugFlag = (process.env.DEBUG == 'true') ? '--verbose' : '';
 
   checkReleaseType(releaseType);
 
@@ -192,9 +193,9 @@ function constructGoreleaserCommand(releaseType, version, goreleaserConfig) {
 
   const flagsStr = flags.join(" ");
   if (releaseType === "merge") {
-    return `CHAINLINK_VERSION=${version} goreleaser ${subCmd} ${flagsStr}`;
+    return `CHAINLINK_VERSION=${version} goreleaser ${debugFlag} ${subCmd} ${flagsStr}`;
   } else {
-    return `CHAINLINK_VERSION=${version} goreleaser ${subCmd} --config ${goreleaserConfig} ${flagsStr}`;
+    return `CHAINLINK_VERSION=${version} goreleaser ${debugFlag} ${subCmd} --config ${goreleaserConfig} ${flagsStr}`;
   }
 }
 

.github/e2e-tests.yml

@@ -947,7 +947,7 @@ runner-test-matrix:
     pyroscope_env: ci-smoke-ccipv1_6-evm-simulated
     test_env_vars:
       E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
-      E2E_JD_VERSION: 0.4.0
+      E2E_JD_VERSION: 0.6.0
 
   - id: smoke/ccip_messaging_test.go:*
     path: integration-tests/smoke/ccip_messaging_test.go
@@ -991,15 +991,15 @@ runner-test-matrix:
       E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
       E2E_JD_VERSION: 0.4.0
 
-  - id: smoke/ccip_rmn_test.go:^TestRMN_TwoMessagesOnTwoLanes$
+  - id: smoke/ccip_rmn_test.go:^TestRMN_TwoMessagesOnTwoLanesIncludingBatching$
     path: integration-tests/smoke/ccip_rmn_test.go
     test_env_type: docker
     runs_on: ubuntu-latest
     triggers:
       - PR E2E Core Tests
       - Merge Queue E2E Core Tests
       - Nightly E2E Tests
-    test_cmd: cd integration-tests/smoke && go test -test.run ^TestRMN_TwoMessagesOnTwoLanes$ -timeout 12m -test.parallel=1 -count=1 -json
+    test_cmd: cd integration-tests/smoke && go test -test.run ^TestRMN_TwoMessagesOnTwoLanesIncludingBatching$ -timeout 12m -test.parallel=1 -count=1 -json
     pyroscope_env: ci-smoke-ccipv1_6-evm-simulated
     test_env_vars:
       E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2

.github/workflows/ci-core.yml

@@ -526,10 +526,14 @@ jobs:
           make rm-mocked
           make generate
       - name: Ensure clean after generate
-        run: git diff --stat --exit-code
+        run: |
+          git add --all
+          git diff --stat --cached --exit-code
       - run: make gomodtidy
       - name: Ensure clean after tidy
-        run: git diff --minimal --exit-code
+        run: |
+          git add --all
+          git diff --minimal --cached --exit-code
 
   run-frequency:
     name: Scheduled Run Frequency

.github/workflows/solidity.yml

@@ -97,7 +97,9 @@ jobs:
         run: ./tools/ci/check_solc_hashes
       - name: Check if Go solidity wrappers are updated
         if: ${{ needs.changes.outputs.changes == 'true' }}
-        run: git diff --minimal --color --exit-code | diff-so-fancy
+        run: |
+          git add --all
+          git diff --minimal --color --cached --exit-code | diff-so-fancy
 
   # The if statements for steps after checkout repo is a workaround for
   # passing required check for PRs that don't have filtered changes.

common/txmgr/broadcaster.go

@@ -769,7 +769,7 @@ func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) save
 			}
 		}
 	}
-	return eb.txStore.UpdateTxFatalError(ctx, etx)
+	return eb.txStore.UpdateTxFatalErrorAndDeleteAttempts(ctx, etx)
 }
 
 func observeTimeUntilBroadcast[CHAIN_ID types.ID](chainID CHAIN_ID, createdAt, broadcastAt time.Time) {