Merge branch 'master' into leo/fix-bootstrap-logging

Author: zhangchiqing

.dockerignore

@@ -1,3 +1,7 @@
+# Do not copy the user's project git directory into the container
+# it's not needed to build the project, and causes issues when working within git worktrees
+.git/
+
 integration/localnet/bootstrap/
 integration/localnet/profiler/
 integration/localnet/data/

.github/workflows/ci.yml

@@ -239,7 +239,7 @@ jobs:
       timeout-minutes: 1
       continue-on-error: true
       with:
-        file: ./coverage.txt
+        files: ./coverage.txt
         flags: unittests
         name: codecov-umbrella
         token: ${{ secrets.CODECOV_TOKEN }}
@@ -285,7 +285,7 @@ jobs:
         timeout-minutes: 1
         continue-on-error: true
         with:
-          file: ./coverage.txt
+          files: ./coverage.txt
           flags: unittests
           name: codecov-umbrella
           token: ${{ secrets.CODECOV_TOKEN }}
@@ -321,6 +321,8 @@ jobs:
           username: ${{ vars.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
         if: ${{ (github.event_name == 'merge_group' || (github.event.pull_request && (github.event.pull_request.author_association == 'MEMBER' || github.event.pull_request.author_association == 'COLLABORATOR'))) }}
+        # this docker auth is exclusively for higher rate limits. continue unauthenticated if it fails
+        continue-on-error: true
 
 
       - name: Docker build
@@ -389,7 +391,7 @@ jobs:
         timeout-minutes: 1
         continue-on-error: true
         with:
-          file: ./coverage.txt
+          files: ./coverage.txt
           flags: unittests
           name: codecov-umbrella
           token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/stale.yml

@@ -7,11 +7,12 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v9
+      - uses: actions/stale@v10
         with:
           days-before-issue-stale: 90
           days-before-issue-close: 7
           exempt-issue-labels: 'Preserve,Idea'
+          exempt-pr-labels: 'Preserve'
           stale-issue-label: 'Stale'
           stale-issue-message: >
             This issue has been automatically marked as stale because it has not had

.gitignore

@@ -3,7 +3,6 @@
 /cmd/consensus/consensus
 /cmd/execution/execution
 /cmd/verification/verification
-/cmd/testclient/testclient
 /cmd/util/util
 /cmd/bootstrap/bootstrap
 

.golangci.yml

@@ -3,10 +3,22 @@ run:
 
 linters-settings:
   goimports:
+    # enforced by linter
     # put imports beginning with prefix after 3rd-party packages;
     # it's a comma-separated list of prefixes
     local-prefixes: github.com/onflow/flow-go/
 
+  # used to generate canonical import ordering
+  # not enforced by linter
+  gci:
+    sections:
+      - standard                           # 1. standard library
+      - default                            # 2. external packages
+      - prefix(github.com/onflow/)         # 3. org packages
+      - prefix(github.com/onflow/flow-go/) # 4. project packages
+    skip-generated: true
+    custom-order: true
+
   gosec:
     # To select a subset of rules to run.
     # Available rules: https://github.com/securego/gosec#available-rules

.mockery.yaml

@@ -0,0 +1,113 @@
+dir: "{{.InterfaceDir}}/mock"
+outpkg: "mock"
+filename: "{{.InterfaceName | snakecase}}.go"
+mockname: "{{.InterfaceName}}"
+
+all: True
+with-expecter: False
+include-auto-generated: False
+disable-func-mocks: True
+fail-on-missing: True
+
+# Suppress warnings
+issue-845-fix: True
+disable-version-string: True
+resolve-type-alias: False
+
+packages:
+  github.com/onflow/flow-go/access:
+  github.com/onflow/flow-go/access/validator:
+  github.com/onflow/flow-go/cmd/util/ledger/reporters:
+  github.com/onflow/flow-go/consensus/hotstuff:
+    config:
+      dir: "consensus/hotstuff/mocks"
+      outpkg: "mocks"
+  github.com/onflow/flow-go/engine/access/ingestion/tx_error_messages:
+  github.com/onflow/flow-go/engine/access/rest/common/models:
+  github.com/onflow/flow-go/engine/access/rest/websockets:
+  github.com/onflow/flow-go/engine/access/rest/websockets/data_providers:
+  github.com/onflow/flow-go/engine/access/rpc/backend/accounts/provider:
+  github.com/onflow/flow-go/engine/access/rpc/backend/events/provider:
+  github.com/onflow/flow-go/engine/access/rpc/backend/node_communicator:
+  github.com/onflow/flow-go/engine/access/rpc/backend/transactions/error_messages:
+  github.com/onflow/flow-go/engine/access/rpc/backend/transactions/provider:
+  github.com/onflow/flow-go/engine/access/rpc/backend/transactions/retrier:
+  github.com/onflow/flow-go/engine/access/rpc/connection:
+  github.com/onflow/flow-go/engine/access/state_stream:
+  github.com/onflow/flow-go/engine/access/subscription:
+  github.com/onflow/flow-go/engine/access/subscription/tracker:
+  github.com/onflow/flow-go/engine/access/wrapper:
+    config:
+      dir: "engine/access/mock"
+  github.com/onflow/flow-go/engine/collection:
+  github.com/onflow/flow-go/engine/collection/epochmgr:
+  github.com/onflow/flow-go/engine/collection/rpc:
+  github.com/onflow/flow-go/engine/common/follower:
+    interfaces:
+      complianceCore:
+        config:
+          exported: true
+          mockname:  "{{.InterfaceName | firstUpper}}"
+  github.com/onflow/flow-go/engine/common/follower/cache:
+  github.com/onflow/flow-go/engine/consensus:
+  github.com/onflow/flow-go/engine/consensus/approvals:
+  github.com/onflow/flow-go/engine/execution:
+  github.com/onflow/flow-go/engine/execution/computation:
+  github.com/onflow/flow-go/engine/execution/computation/computer:
+  github.com/onflow/flow-go/engine/execution/computation/query:
+  github.com/onflow/flow-go/engine/execution/ingestion/uploader:
+  github.com/onflow/flow-go/engine/execution/provider:
+  github.com/onflow/flow-go/engine/execution/state:
+  github.com/onflow/flow-go/engine/protocol:
+  github.com/onflow/flow-go/engine/verification/fetcher:
+  github.com/onflow/flow-go/fvm:
+  github.com/onflow/flow-go/fvm/environment:
+  github.com/onflow/flow-go/fvm/storage/snapshot:
+  github.com/onflow/flow-go/insecure:
+  github.com/onflow/flow-go/ledger:
+  github.com/onflow/flow-go/model/fingerprint:
+  github.com/onflow/flow-go/module:
+  github.com/onflow/flow-go/module/component:
+  github.com/onflow/flow-go/module/execution:
+  github.com/onflow/flow-go/module/executiondatasync/execution_data:
+  github.com/onflow/flow-go/module/executiondatasync/optimistic_sync:
+    config:
+      all: False
+    interfaces:
+      Core:
+  github.com/onflow/flow-go/module/executiondatasync/tracker:
+  github.com/onflow/flow-go/module/forest:
+  github.com/onflow/flow-go/module/mempool:
+  github.com/onflow/flow-go/module/mempool/consensus/mock_interfaces:
+    config:
+      dir: "module/mempool/consensus/mock"
+  github.com/onflow/flow-go/module/state_synchronization:
+  github.com/onflow/flow-go/module/state_synchronization/requester:
+  github.com/onflow/flow-go/network:
+  github.com/onflow/flow-go/network/alsp:
+  github.com/onflow/flow-go/network/p2p:
+  github.com/onflow/flow-go/state/cluster:
+  github.com/onflow/flow-go/state/protocol:
+  github.com/onflow/flow-go/state/protocol/events:
+  github.com/onflow/flow-go/state/protocol/protocol_state:
+  github.com/onflow/flow-go/state/protocol/protocol_state/mock_interfaces:
+    config:
+      dir: "state/protocol/protocol_state/mock"
+  github.com/onflow/flow-go/state/protocol/protocol_state/epochs:
+  github.com/onflow/flow-go/state/protocol/protocol_state/epochs/mock_interfaces:
+    config:
+      dir: "state/protocol/protocol_state/epochs/mock"
+  github.com/onflow/flow-go/storage:
+
+  # external libraries
+  github.com/onflow/flow-go-sdk/access:
+    config:
+      dir: "integration/benchmark/mock"
+    interfaces:
+      Client:
+
+  github.com/onflow/crypto:
+    config:
+      dir: "module/mock"
+    interfaces:
+      PublicKey:

AGENTS.md

@@ -51,13 +51,21 @@ This file provides guidance to AI Agents when working with code in this reposito
 
 ### Code Quality and Generation
 - `make lint` - Run linter (includes tidy and custom checks)
-- `make lint -e LINT_PATH=./path/to/lint/...` - Run linter for a specific module
+- `make fix-new` - Run linter for files changed since master
 - `make fix-lint` - Automatically fix linting issues
+- `make fix-lint-new` - Automatically fix linting issues for files changed since master
+- `make fix-imports` - Automatically fix imports
+- `make fix-imports-new` - Automatically fix imports for files changed since master
+- `make vet` - Run go vet
+- `make vet-new` - Run go vet for files changed since master
 - `make generate` - Run all code generators (proto, mocks, fvm wrappers)
 - `make generate-mocks` - Generate mocks for unit tests
 - `make generate-proto` - Generate protobuf stubs
 - `make tidy` - Run go mod tidy
 
+`lint`, `vet`, `fix-lint`, and `fix-imports` support passing `LINT_PATH`, which sets the path used by golangci-lint
+- `make lint -e LINT_PATH=./path/to/lint/...` - Run linter for a specific module
+
 ### Dependency Management
 - `make install-tools` - Install all required development tools
 - `make install-mock-generators` - Install mock generation tools