Merge branch 'aw/LoadTest-aws' into aw/LoadTest-aws-chaos

# Conflicts: # integration-tests/load/go.mod
smartcontractkit · Feb 12, 2025 · d16b03e · d16b03e
2 parents 7a0db62 + f4c6967
commit d16b03e
Show file tree

Hide file tree

Showing 212 changed files with 15,182 additions and 3,495 deletions.
diff --git a/.changeset/fresh-meals-admire.md b/.changeset/fresh-meals-admire.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal remove -dev suffix from ccip contracts
diff --git a/.changeset/silent-ducks-report.md b/.changeset/silent-ducks-report.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#updated Allow to whitelist IPs in Gateway's HTTP Client
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -88,6 +88,7 @@ core/scripts/gateway @smartcontractkit/dev-services
 /contracts/**/*l2ep* @smartcontractkit/bix-ship
 /contracts/**/*llo-feeds* @smartcontractkit/data-streams-engineers
 /contracts/**/*operatorforwarder* @smartcontractkit/data-feeds-engineers
+/contracts/**/*data-feeds* @smartcontractkit/data-feeds-engineers
 /contracts/**/*vrf* @smartcontractkit/dev-services
 /contracts/**/*keystone* @smartcontractkit/keystone
 
@@ -98,6 +99,7 @@ core/scripts/gateway @smartcontractkit/dev-services
 /contracts/src/v0.8/llo-feeds @smartcontractkit/data-streams-engineers
 # TODO: mocks folder, folder should be removed and files moved to the correct folders
 /contracts/src/v0.8/operatorforwarder @smartcontractkit/data-feeds-engineers
+/contracts/src/v0.8/data-feeds @smartcontractkit/data-feeds-engineers
 /contracts/src/v0.8/shared @smartcontractkit/core-solidity
 /contracts/src/v0.8/vrf @smartcontractkit/dev-services
 /contracts/src/v0.8/keystone @smartcontractkit/keystone
@@ -109,6 +111,7 @@ core/scripts/gateway @smartcontractkit/dev-services
 /core/gethwrappers/liquiditymanager @smartcontractkit/ccip-onchain
 /core/gethwrappers/llo-feeds @smartcontractkit/data-streams-engineers
 /core/gethwrappers/operatorforwarder @smartcontractkit/data-feeds-engineers
+/core/gethwrappers/data-feeds @smartcontractkit/data-feeds-engineers
 /core/gethwrappers/shared @smartcontractkit/core-solidity
 /core/gethwrappers/workflow @smartcontractkit/dev-services
 
@@ -144,6 +147,7 @@ core/scripts/gateway @smartcontractkit/dev-services
 /deployment @smartcontractkit/ccip-tooling @smartcontractkit/ccip-offchain @smartcontractkit/keystone @smartcontractkit/core @smartcontractkit/deployment-automation
 /deployment/ccip @smartcontractkit/ccip-tooling @smartcontractkit/ccip-offchain @smartcontractkit/deployment-automation
 /deployment/keystone @smartcontractkit/keystone @smartcontractkit/core @smartcontractkit/deployment-automation
+/deployment/ccip/changeset/solana @smartcontractkit/solana-tooling
 # TODO: As more products add their deployment logic here, add the team as an owner
 
 # CI/CD

diff --git a/.github/actions/goreleaser-build-sign-publish/action.yml b/.github/actions/goreleaser-build-sign-publish/action.yml
@@ -57,7 +57,7 @@ runs:
         only-modules: 'true'
 
     - name: Setup goreleaser
-      uses: goreleaser/goreleaser-action@9ed2f89a662bf1735a48bc8557fd212fa902bebf # v6.1.0
+      uses: goreleaser/goreleaser-action@90a3faa9d0182683851fbfa97ca1a2cb983bfca3 # v6.2.1
       with:
         distribution: goreleaser-pro
         install-only: true

diff --git a/.github/e2e-tests.yml b/.github/e2e-tests.yml
@@ -196,7 +196,7 @@ runner-test-matrix:
       E2E_TEST_CHAINLINK_VERSION: '{{ env.DEFAULT_CHAINLINK_PLUGINS_VERSION }}' # This is the chainlink version that has the plugins
       E2E_JD_VERSION: 0.6.0 # there is no latest tag for this repo, so we need to specify the version
       GITHUB_READ_TOKEN: '{{ env.GITHUB_API_TOKEN }}' # GATI-provided token that can read from capabilities and dev-platform repos
-      IS_CI: "true"
+      CI: "true"
       CTF_CONFIGS: "environment-ci.toml"
       # Anvil developer key, not a secret
       PRIVATE_KEY: "ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"

diff --git a/.github/workflows/ci-core-partial.yml b/.github/workflows/ci-core-partial.yml
@@ -1,14 +1,16 @@
 name: Experimental Test Optimization
 
+# Disable
 on:
-  push:
-    branches:
-      - develop
-      # - "release/*"
-  # merge_group:
-  pull_request:
-  schedule:
-    - cron: "0 1 * * *"
+  workflow_dispatch:
+  # push:
+  #   branches:
+  #     - develop
+  #     # - "release/*"
+  # # merge_group:
+  # pull_request:
+  # schedule:
+  #   - cron: "0 1 * * *"
 
 env:
   # We explicitly have this env var not be "CL_DATABASE_URL" to avoid having it be used by core related tests
@@ -140,7 +142,7 @@ jobs:
     if: ${{ needs.filter.outputs.should-collect-coverage == 'true' }}
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout the repo 
+      - name: Checkout the repo
         uses: actions/[email protected]
         with:
           persist-credentials: false

diff --git a/.github/workflows/ci-core.yml b/.github/workflows/ci-core.yml
@@ -176,15 +176,15 @@ jobs:
         type:
           - cmd: go_core_tests
             os: ubuntu22.04-32cores-128GB
-            printResults: true
+            build-solana-artifacts: 'false'
           - cmd: go_core_tests_integration
             os: ubuntu22.04-32cores-128GB
-            printResults: true
+            build-solana-artifacts: 'false'
           - cmd: go_core_ccip_deployment_tests
             os: ubuntu22.04-32cores-128GB
-            printResults: true
           - cmd: go_core_fuzz
             os: ubuntu22.04-8cores-32GB
+            build-solana-artifacts: 'false'
           - cmd: go_core_race_tests
             # use 64cores for certain scheduled runs only
             os: ${{ needs.run-frequency.outputs.two-per-day-frequency == 'true' && 'ubuntu-latest-64cores-256GB' || 'ubuntu-latest-32cores-128GB' }}
@@ -230,7 +230,8 @@ jobs:
         uses: ./.github/actions/setup-solana
 
       - name: Build Solana artifacts
-        if: ${{ needs.filter.outputs.should-run-ci-core == 'true' }}
+        # do not build for core tests, core 'integration' tests, or fuzz tests
+        if: ${{ needs.filter.outputs.should-run-ci-core == 'true' && matrix.type.build-solana-artifacts != 'false' }}
         uses: ./.github/actions/setup-solana/build-contracts
 
       - name: Setup wasmd

diff --git a/.github/workflows/flakeguard.yml b/.github/workflows/flakeguard.yml
@@ -133,7 +133,7 @@ jobs:
       - name: Install flakeguard
         if: ${{ inputs.runAllTests == false }}
         shell: bash
-        run: go install github.com/smartcontractkit/chainlink-testing-framework/tools/flakeguard@103764eb5a9f02e0f3dc677f0d9da2e6796a978c # [email protected]
+        run: go install github.com/smartcontractkit/chainlink-testing-framework/tools/flakeguard@49bbad97ccd743e7b704e4a17f92c475f2ee044d # [email protected]
 
       - name: Find new or updated test packages
         if: ${{ inputs.runAllTests == false && env.RUN_CUSTOM_TEST_PACKAGES == '' }}
@@ -334,7 +334,7 @@ jobs:
 
       - name: Install flakeguard
         shell: bash
-        run: go install github.com/smartcontractkit/chainlink-testing-framework/tools/flakeguard@103764eb5a9f02e0f3dc677f0d9da2e6796a978c # [email protected]
+        run: go install github.com/smartcontractkit/chainlink-testing-framework/tools/flakeguard@49bbad97ccd743e7b704e4a17f92c475f2ee044d # [email protected]
 
       - name: Run tests with flakeguard
         shell: bash
@@ -348,9 +348,9 @@ jobs:
           # Output the status of the flakeguard run to files so that the next step can aggregate them and act accordingly
           EXIT_CODE=$?
           echo "$EXIT_CODE" > status_${GITHUB_JOB}.txt
-          if [ $EXIT_CODE -e 1 ]; then
+          if [ $EXIT_CODE -eq 1 ]; then
             echo "Found flaky tests"
-          elif [ $EXIT_CODE -e 2 ]; then
+          elif [ $EXIT_CODE -eq 2 ]; then
             echo "ERROR: Flakeguard encountered an error while running tests"
             echo "flakeguard_error=true" >> $GITHUB_OUTPUT
           fi
@@ -411,7 +411,7 @@ jobs:
 
       - name: Install flakeguard
         shell: bash
-        run: go install github.com/smartcontractkit/chainlink-testing-framework/tools/flakeguard@103764eb5a9f02e0f3dc677f0d9da2e6796a978c # [email protected]
+        run: go install github.com/smartcontractkit/chainlink-testing-framework/tools/flakeguard@49bbad97ccd743e7b704e4a17f92c475f2ee044d # [email protected]
 
       - name: Aggregate Flakeguard Results
         id: results
@@ -446,7 +446,7 @@ jobs:
             --splunk-token "${{ secrets.FLAKEGUARD_SPLUNK_HEC }}" \
             --splunk-event "${{ github.event_name }}"
           EXIT_CODE=$?
-          if [ $EXIT_CODE -e 2 ]; then
+          if [ $EXIT_CODE -eq 2 ]; then
             echo "ERROR: Flakeguard encountered an error while aggregating results"
             echo "ERROR: Flakeguard encountered an error while aggregating results" >> $GITHUB_STEP_SUMMARY
             exit $EXIT_CODE
@@ -529,7 +529,7 @@ jobs:
               --max-pass-ratio "$GH_INPUTS_MAX_PASS_RATIO"          
           fi
           EXIT_CODE=$?
-          if [ $EXIT_CODE -e 2 ]; then
+          if [ $EXIT_CODE -eq 2 ]; then
             echo "ERROR: Flakeguard encountered an error while generating reports"
             echo "ERROR: Flakeguard encountered an error while generating reports" >> $GITHUB_STEP_SUMMARY
             exit $EXIT_CODE

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -35,7 +35,7 @@ concurrency:
 
 env:
   # for run-test variables and environment
-  ENV_JOB_IMAGE: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink-tests:${{ inputs.evm-ref || github.sha }}
+  ENV_JOB_IMAGE: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink-tests:${{ inputs.evm-ref || github.event.pull_request.head.sha || github.event.merge_group.head_sha }}
   CHAINLINK_IMAGE: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink
   TEST_SUITE: smoke
   TEST_ARGS: -test.timeout 12m
@@ -168,7 +168,7 @@ jobs:
         with:
           tag_suffix: ${{ matrix.image.tag-suffix }}
           dockerfile: ${{ matrix.image.dockerfile }}
-          git_commit_sha: ${{ inputs.evm-ref || github.sha }}
+          git_commit_sha: ${{ inputs.evm-ref || inputs.cl_ref || github.event.pull_request.head.sha || github.event.merge_group.head_sha }}
           AWS_REGION: ${{ secrets.QA_AWS_REGION }}
           AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
           dep_evm_sha: ${{ inputs.evm-ref }}
@@ -183,11 +183,10 @@ jobs:
       contents: read
     needs: [build-chainlink, changes]
     if: github.event_name == 'pull_request' && ( needs.changes.outputs.keystone_changes == 'true' || needs.changes.outputs.github_ci_changes == 'true')
-    uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@f5baaf5e95d718546820cc5fecb42b6df410343d
+    uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@e600c1954dacd5f4a2c24d49b81ab73cc9d75763
     with:
       workflow_name: Run Core Workflow Engine Tests For PR
-      chainlink_version: ${{ inputs.evm-ref || github.sha }}
-      chainlink_upgrade_version: ${{ github.sha }}
+      chainlink_version: ${{ inputs.evm-ref || inputs.cl_ref || github.event.pull_request.head.sha || github.event.merge_group.head_sha }}
       test_path: .github/e2e-tests.yml
       test_trigger: PR Workflow Engine E2E Core Tests
       upload_cl_node_coverage_artifact: true
@@ -227,11 +226,10 @@ jobs:
       contents: read
     needs: [build-chainlink, changes]
     if: github.event_name == 'pull_request' && ( needs.changes.outputs.core_changes == 'true' || needs.changes.outputs.github_ci_changes == 'true')
-    uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@f5baaf5e95d718546820cc5fecb42b6df410343d
+    uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@e600c1954dacd5f4a2c24d49b81ab73cc9d75763
     with:
       workflow_name: Run Core E2E Tests For PR
-      chainlink_version: ${{ inputs.evm-ref || github.sha }}
-      chainlink_upgrade_version: ${{ github.sha }}
+      chainlink_version: ${{ inputs.evm-ref || inputs.cl_ref || github.event.pull_request.head.sha || github.event.merge_group.head_sha }}
       test_path: .github/e2e-tests.yml
       test_trigger: PR E2E Core Tests
       upload_cl_node_coverage_artifact: true
@@ -269,11 +267,10 @@ jobs:
       contents: read
     needs: [build-chainlink, changes]
     if: github.event_name == 'merge_group' && ( needs.changes.outputs.core_changes == 'true' || needs.changes.outputs.github_ci_changes == 'true')
-    uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@f5baaf5e95d718546820cc5fecb42b6df410343d
+    uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@e600c1954dacd5f4a2c24d49b81ab73cc9d75763
     with:
       workflow_name: Run Core E2E Tests For Merge Queue
-      chainlink_version: ${{ inputs.evm-ref || github.sha }}
-      chainlink_upgrade_version: ${{ github.sha }}
+      chainlink_version: ${{ inputs.evm-ref || inputs.cl_ref || github.event.pull_request.head.sha || github.event.merge_group.head_sha }}
       test_path: .github/e2e-tests.yml
       test_trigger: Merge Queue E2E Core Tests
       upload_cl_node_coverage_artifact: true
@@ -315,11 +312,10 @@ jobs:
       contents: read
     needs: [build-chainlink, changes]
     if: github.event_name == 'pull_request' && (needs.changes.outputs.ccip_changes == 'true' || needs.changes.outputs.github_ci_changes == 'true')
-    uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@f5baaf5e95d718546820cc5fecb42b6df410343d
+    uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@e600c1954dacd5f4a2c24d49b81ab73cc9d75763
     with:
       workflow_name: Run CCIP E2E Tests For PR
-      chainlink_version: ${{ inputs.evm-ref || github.sha }}
-      chainlink_upgrade_version: ${{ github.sha }}
+      chainlink_version: ${{ inputs.evm-ref || inputs.cl_ref || github.event.pull_request.head.sha || github.event.merge_group.head_sha }}
       test_path: .github/e2e-tests.yml
       test_trigger: PR E2E CCIP Tests
       upload_cl_node_coverage_artifact: true
@@ -358,11 +354,10 @@ jobs:
       contents: read
     needs: [build-chainlink, changes]
     if: github.event_name == 'merge_group' && (needs.changes.outputs.ccip_changes == 'true' || needs.changes.outputs.github_ci_changes == 'true')
-    uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@f5baaf5e95d718546820cc5fecb42b6df410343d
+    uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@e600c1954dacd5f4a2c24d49b81ab73cc9d75763
     with:
       workflow_name: Run CCIP E2E Tests For Merge Queue
-      chainlink_version: ${{ inputs.evm-ref || github.sha }}
-      chainlink_upgrade_version: ${{ github.sha }}
+      chainlink_version: ${{ inputs.evm-ref || inputs.cl_ref || github.event.pull_request.head.sha || github.event.merge_group.head_sha }}
       test_path: .github/e2e-tests.yml
       test_trigger: Merge Queue E2E CCIP Tests
       upload_cl_node_coverage_artifact: true
@@ -395,13 +390,13 @@ jobs:
     if: always()
     name: ETH Smoke Tests
     runs-on: ubuntu-latest
-    needs: [run-core-e2e-tests-for-pr, run-core-e2e-keystone-tests-for-pr, run-ccip-e2e-tests-for-pr, run-core-e2e-tests-for-merge-queue, run-ccip-e2e-tests-for-merge-queue]
+    needs: [build-chainlink, run-core-e2e-tests-for-pr, run-core-e2e-keystone-tests-for-pr, run-ccip-e2e-tests-for-pr, run-core-e2e-tests-for-merge-queue, run-ccip-e2e-tests-for-merge-queue]
     steps:
       - name: Check Core test results
         id: check_core_results
         run: |
           results='${{ needs.run-core-e2e-tests-for-pr.outputs.test_results }}'
-          echo "Core test results:"
+          echo "Core e2e test results:"
           echo "$results" | jq .
 
           node_migration_tests_failed=$(echo $results | jq '[.[] | select(.id == "integration-tests/migration/upgrade_version_test.go:*" ) | select(.result != "success")] | length > 0')
@@ -411,7 +406,7 @@ jobs:
         id: check_core_keystone_results
         run: |
           results='${{ needs.run-core-e2e-keystone-tests-for-pr.outputs.test_results }}'
-          echo "Core test results:"
+          echo "Keystone e2e test results:"
           echo "$results" | jq .
 
           node_migration_tests_failed=$(echo $results | jq '[.[] | select(.id == "integration-tests/migration/upgrade_version_test.go:*" ) | select(.result != "success")] | length > 0')
@@ -445,6 +440,10 @@ jobs:
         if: always() && needs.run-core-e2e-tests-for-merge-queue.result == 'failure'
         run: exit 1
 
+      - name: Fail the job if Chainlink image wasn't built
+        if: always() && needs.build-chainlink.result == 'failure'
+        run: exit 1
+
   cleanup:
     name: Clean up integration environment deployments
     if: always()
@@ -457,7 +456,7 @@ jobs:
         with:
           persist-credentials: false
           repository: smartcontractkit/chainlink
-          ref: ${{ inputs.cl_ref }}
+          ref: ${{ inputs.cl_ref || github.event.pull_request.head.sha || github.event.merge_group.head_sha }}
 
       - name: 🧼 Clean up Environment
         if: ${{ github.event_name == 'pull_request' }}
@@ -675,7 +674,7 @@ jobs:
         get_solana_sha,
       ]
     env:
-      CHAINLINK_COMMIT_SHA: ${{ inputs.evm-ref || github.sha }}
+      CHAINLINK_COMMIT_SHA: ${{ inputs.evm-ref || inputs.cl_ref || github.event.pull_request.head.sha || github.event.merge_group.head_sha }}
       CHAINLINK_ENV_USER: ${{ github.actor }}
       TEST_LOG_LEVEL: debug
       CONTRACT_ARTIFACTS_PATH: contracts/target/deploy
@@ -727,7 +726,7 @@ jobs:
       - name: Generate config overrides
         env:
           GH_INPUTS_EVM_REF: ${{ inputs.evm-ref }}
-          GH_SHA: ${{ github.sha }}
+          GH_SHA: ${{ inputs.cl_ref || github.event.pull_request.head.sha || github.event.merge_group.head_sha }}
         run: | # https://github.com/smartcontractkit/chainlink-testing-framework/lib/blob/main/config/README.md
           cat << EOF > config.toml
           [ChainlinkImage]
@@ -749,7 +748,7 @@ jobs:
           test_command_to_run: export ENV_JOB_IMAGE=${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink-solana-tests:${{ needs.get_solana_sha.outputs.sha }} && make test_smoke
           test_config_override_base64: ${{ env.BASE64_CONFIG_OVERRIDE }}
           cl_repo: ${{ env.CHAINLINK_IMAGE }}
-          cl_image_tag: ${{ inputs.evm-ref || github.sha }}
+          cl_image_tag: ${{ inputs.evm-ref || inputs.cl_ref || github.event.pull_request.head.sha || github.event.merge_group.head_sha }}
           publish_check_name: Solana Smoke Test Results
           go_mod_path: ./integration-tests/go.mod
           cache_key_id: core-solana-e2e-${{ env.MOD_CACHE_VERSION }}

diff --git a/.github/workflows/solidity-foundry.yml b/.github/workflows/solidity-foundry.yml
@@ -38,7 +38,9 @@ jobs:
             { "name": "operatorforwarder", "setup": { "run-coverage": true, "min-coverage": 55.7, "run-gas-snapshot": true, "run-forge-fmt": false }},
             { "name": "shared", "setup": { "run-coverage": true, "extra-coverage-params": "--no-match-path='*CallWithExactGas*' --ir-minimum", "min-coverage": 32.6, "run-gas-snapshot": true, "run-forge-fmt": false }},
             { "name": "vrf", "setup": { "run-coverage": false, "min-coverage": 98.5, "run-gas-snapshot": false, "run-forge-fmt": false }},
-            { "name": "workflow", "setup": { "run-coverage": true, "extra-coverage-params": "--ir-minimum", "min-coverage": 96.0, "run-gas-snapshot": true, "run-forge-fmt": true }}
+            { "name": "workflow", "setup": { "run-coverage": true, "extra-coverage-params": "--ir-minimum", "min-coverage": 96.0, "run-gas-snapshot": true, "run-forge-fmt": true }},
+            { "name": "data-feeds", "setup": { "run-coverage": true, "min-coverage": 98.5, "run-gas-snapshot": true, "extra-coverage-params": "--no-match-coverage='WIP*'", "run-forge-fmt": false }}
+
           ]
           EOF
 
@@ -110,6 +112,8 @@ jobs:
               - 'contracts/src/v0.8/vendor/**/*.sol'
             workflow:
               - 'contracts/src/v0.8/workflow/**/*.sol'
+            data-feeds:
+              - 'contracts/src/v0.8/data-feeds/**/*.sol'
 
       - name: Detect non-test changes
         uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -13,6 +13,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     permissions:
+      contents: write # only for delete-branch option
       issues: write
       pull-requests: write
 
@@ -23,5 +24,6 @@ jobs:
           exempt-all-pr-assignees: true
           stale-pr-message: "This PR is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 7 days."
           days-before-issue-stale: -1 # disables marking issues as stale automatically. Issues can still be marked as stale manually, in which the closure policy applies.
+          delete-branch: true
           # Comma separated list of labels that exempt issues from being considered stale.
           exempt-pr-labels: "stale-exempt"
diff --git a/.gitignore b/.gitignore
@@ -31,7 +31,6 @@ tools/clroot/db.sqlite3-wal
 .vscode/
 *.iml
 debug.env
-*.txt
 operator_ui/install
 .devenv
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,7 +31,6 @@ tools/clroot/db.sqlite3-wal @@
     .vscode/
     *.iml
     debug.env
-    *.txt
     operator_ui/install
     .devenv
@@ Expand Down @@