Merge main into PR branch

Author: Giulio2002

.github/workflows/test-all-erigon.yml

@@ -127,14 +127,16 @@ jobs:
     strategy:
       matrix:
         os: [ windows-2025 ]
-    runs-on: ${{ matrix.os }}
+    runs-on:
+      group: "selfhosted-win"
 
     steps:
-      - name: Configure Pagefile
-        uses: al-cheb/configure-pagefile-action@v1.5
-        with:
-          minimum-size: 8GB
-          disk-root: "C:"
+      # not needed on self-hosted runner. already configured.
+      #- name: Configure Pagefile
+      #  uses: al-cheb/configure-pagefile-action@v1.5
+      #  with:
+      #    minimum-size: 8GB
+      #    disk-root: "C:"
 
       - name: "Checkout code with submodules and large files (lfs) on ${{ matrix.os }}"
         if: needs.source-of-changes.outputs.changed_files != 'true'
@@ -143,22 +145,32 @@ jobs:
           fetch-depth: 1
           submodules: recursive
           lfs: true
+          clean: true
 
       - name: Setup Go environment on ${{ matrix.os }}
         if: needs.source-of-changes.outputs.changed_files != 'true'
         uses: actions/setup-go@v6
         with:
-          go-version: '1.25'
-          cache: true
+          go-version: '>=1.25'
+          cache: false
 
-      - name: Install make
-        run: choco install make -y
+      # "make" already preinstalled:
+      #- name: Install make
+      #  run: choco install make -y
 
       - name: Run all tests on ${{ matrix.os }}
         if: needs.source-of-changes.outputs.changed_files != 'true'
         shell: bash
+        env:
+          GOMODCACHE: C:\go-cache\mod
+          GOCACHE: C:\go-cache\build
         run: make test-all
 
+      - name: Cleanup
+        if: always()
+        run: |
+          Remove-Item -Path "$env:TEMP\*" -Recurse -Force -ErrorAction SilentlyContinue
+
       - name: This ${{ matrix.os }} check does not make sense for changes within out-of-scope directories
         if: needs.source-of-changes.outputs.changed_files == 'true'
         run: echo "This check does not make sense for changes within out-of-scope directories"

cmd/rpcdaemon/graphql/graphql_test.go

@@ -139,9 +139,8 @@ func TestGraphQLQueryBlock(t *testing.T) {
 		if err != nil {
 			t.Fatalf("could not post: %v", err)
 		}
-		defer resp.Body.Close()
-
 		bodyBytes, err := io.ReadAll(resp.Body)
+		resp.Body.Close()
 		if err != nil {
 			t.Fatalf("could not read from response body: %v", err)
 		}

db/datastruct/fusefilter/fusefilter_writer_test.go

@@ -219,7 +219,6 @@ func TestMultipleFilters(t *testing.T) {
 
 		writer, err := NewWriter(filePath)
 		require.NoError(err, "Failed to create writer %d", i)
-		defer writer.Close()
 
 		// Add some keys
 		for j := 0; j < 100; j++ {
@@ -233,7 +232,6 @@ func TestMultipleFilters(t *testing.T) {
 		// Read back and verify
 		reader, err := NewReader(filePath)
 		require.NoError(err, "Failed to create reader for filter %d", i)
-		defer reader.Close()
 		for j := 0; j < 100; j++ {
 			key := baseKey + uint64(j)
 			require.True(reader.ContainsHash(key), "Key %d not found in filter %d", key, i)

db/integrity/commitment_integirty.go

@@ -244,8 +244,11 @@ func checkCommitmentRootViaSd(ctx context.Context, tx kv.TemporalTx, f state.Vis
 }
 
 func checkCommitmentRootViaRecompute(ctx context.Context, tx kv.TemporalTx, sd *execctx.SharedDomains, info commitmentRootInfo, f state.VisibleFile, logger log.Logger) error {
+	trace := logger.Enabled(ctx, log.LvlTrace)
 	touchLoggingVisitor := func(k []byte) {
-		logger.Debug("account touch for root block", "key", common.Address(k), "blockNum", info.blockNum, "file", filepath.Base(f.Fullpath()))
+		if trace {
+			logger.Trace("account touch for root block", "key", common.Address(k), "blockNum", info.blockNum, "file", filepath.Base(f.Fullpath()))
+		}
 	}
 	touches, err := touchHistoricalKeys(sd, tx, kv.AccountsDomain, info.blockMinTxNum, info.txNum+1, touchLoggingVisitor)
 	if err != nil {
@@ -353,6 +356,7 @@ func checkCommitmentKvDeref(ctx context.Context, file state.VisibleFile, stepSiz
 		)
 		return derefCounts{}, nil
 	}
+	trace := logger.Enabled(ctx, log.LvlTrace)
 	logger.Info("[integrity] commitment deref in", "kv", fileName, "startTxNum", startTxNum, "endTxNum", endTxNum)
 	commDecomp, err := seg.NewDecompressor(file.Fullpath())
 	if err != nil {
@@ -424,7 +428,7 @@ func checkCommitmentKvDeref(ctx context.Context, file state.VisibleFile, stepSiz
 		counts.branchKeys++
 		branchData := commitment.BranchData(branchValue)
 		newBranchData, err := branchData.ReplacePlainKeys(newBranchValueBuf[:0], func(key []byte, isStorage bool) ([]byte, error) {
-			if logger.Enabled(ctx, log.LvlTrace) {
+			if trace {
 				logger.Trace(
 					"checking commitment deref for branch",
 					"branchKey", hex.EncodeToString(branchKey),
@@ -435,7 +439,7 @@ func checkCommitmentKvDeref(ctx context.Context, file state.VisibleFile, stepSiz
 			}
 			if isStorage {
 				if len(key) == length.Addr+length.Hash {
-					if logger.Enabled(ctx, log.LvlTrace) {
+					if trace {
 						logger.Trace(
 							"skipping, not a storage reference",
 							"branchKey", hex.EncodeToString(branchKey),
@@ -468,7 +472,7 @@ func checkCommitmentKvDeref(ctx context.Context, file state.VisibleFile, stepSiz
 					integrityErr = fmt.Errorf("%w: %w", ErrIntegrity, err)
 					return key, nil
 				}
-				if logger.Enabled(ctx, log.LvlTrace) {
+				if trace {
 					logger.Trace(
 						"dereferenced storage key",
 						"branchKey", hex.EncodeToString(branchKey),
@@ -482,7 +486,7 @@ func checkCommitmentKvDeref(ctx context.Context, file state.VisibleFile, stepSiz
 				return plainKey, nil
 			}
 			if len(key) == length.Addr {
-				if logger.Enabled(ctx, log.LvlTrace) {
+				if trace {
 					logger.Trace(
 						"skipping, not an account reference",
 						"branchKey", hex.EncodeToString(branchKey),
@@ -514,7 +518,7 @@ func checkCommitmentKvDeref(ctx context.Context, file state.VisibleFile, stepSiz
 				integrityErr = fmt.Errorf("%w: %w", ErrIntegrity, err)
 				return key, nil
 			}
-			if logger.Enabled(ctx, log.LvlTrace) {
+			if trace {
 				logger.Trace(
 					"dereferenced account key",
 					"branchKey", hex.EncodeToString(branchKey),
@@ -770,12 +774,15 @@ func CheckCommitmentHistAtBlk(ctx context.Context, db kv.TemporalRoDB, br servic
 		return fmt.Errorf("commitment state txNum doesn't match maxTxNum: %d != %d", latestTxNum, maxTxNum)
 	}
 	logger.Info("commitment recalc info", "blockNum", blockNum, "minTxNum", minTxNum, "maxTxNum", maxTxNum, "toTxNum", toTxNum)
+	trace := logger.Enabled(ctx, log.LvlTrace)
 	touchLoggingVisitor := func(k []byte) {
-		args := []any{"key", common.Address(k[:length.Addr])}
-		if len(k) > length.Addr {
-			args = append(args, "slot", common.Hash(k[length.Addr:]))
+		if trace {
+			args := []any{"key", common.Address(k[:length.Addr])}
+			if len(k) > length.Addr {
+				args = append(args, "slot", common.Hash(k[length.Addr:]))
+			}
+			logger.Trace("commitment touched key", args...)
 		}
-		logger.Debug("commitment touched key", args...)
 	}
 	touchStart := time.Now()
 	accTouches, err := touchHistoricalKeys(sd, tx, kv.AccountsDomain, minTxNum, toTxNum, touchLoggingVisitor)