Merge pull request #1759 from 0xPolygon/v2.2.11-candidate

v2.2.11 to master

Author: manav2401

.github/workflows/ci.yml

@@ -32,7 +32,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.24.3
+          go-version: 1.24.6
 
       - name: Install dependencies on Linux
         if: runner.os == 'Linux'
@@ -64,7 +64,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.24.3
+          go-version: 1.24.6
 
       - name: Install dependencies on Linux
         if: runner.os == 'Linux'
@@ -92,7 +92,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.24.3
+          go-version: 1.24.6
 
       - name: Install dependencies on Linux
         if: runner.os == 'Linux'
@@ -143,7 +143,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.24.3
+          go-version: 1.24.6
 
       - name: Install dependencies on Linux
         if: runner.os == 'Linux'

.github/workflows/go.yml

@@ -23,7 +23,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v5
       with:
-        go-version: 1.24.3
+        go-version: 1.24.6
         cache: false
 
     - name: Run linters

.github/workflows/govulncheck.yml

@@ -8,7 +8,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.24.3'
+          go-version: '1.24.6'
           check-latest: true
       - uses: actions/checkout@v4
       - uses: technote-space/get-diff-action@v6

.github/workflows/packager_deb.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@master
         with:
-          go-version: 1.24.3
+          go-version: 1.24.6
       # Variables
       - name: Adding TAG to ENV
         run: echo "GIT_TAG=`echo $(git describe --tags --abbrev=0)`" >> $GITHUB_ENV

.github/workflows/release.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@master
         with:
-          go-version: 1.24.3
+          go-version: 1.24.6
 
       - name: Prepare
         id: prepare

core/rawdb/milestone.go

@@ -52,6 +52,27 @@ func (m *Milestone) block() (uint64, common.Hash) {
 	return m.Block, m.Hash
 }
 
+// PurgeWhitelistedEntriesFromDb removes all entries related to whitelisted checkpoint
+// and milestone from the database. It doesn't return any error back to the caller.
+func PurgeWhitelistedEntriesFromDb(db ethdb.KeyValueWriter) {
+	err := db.Delete(lastMilestone)
+	if err != nil {
+		log.Error("Error deleting last milestone entry", "err", err)
+	}
+	err = db.Delete(lockFieldKey)
+	if err != nil {
+		log.Error("Error deleting lock field entry", "err", err)
+	}
+	err = db.Delete(futureMilestoneKey)
+	if err != nil {
+		log.Error("Error deleting future milestone field entry", "err", err)
+	}
+	err = db.Delete(lastCheckpoint)
+	if err != nil {
+		log.Error("Error deleting last checkpoint entry", "err", err)
+	}
+}
+
 func ReadFinality[T BlockFinality[T]](db ethdb.KeyValueReader) (uint64, common.Hash, error) {
 	lastTV, key := getKey[T]()
 

core/txpool/legacypool/list.go

@@ -713,6 +713,9 @@ func (l *pricedList) Discard(slots int) (types.Transactions, bool) {
 	l.reheapMu.Lock()
 	defer l.reheapMu.Unlock()
 
+	if slots < 0 {
+		slots = 0
+	}
 	drop := make(types.Transactions, 0, slots) // Remote underpriced transactions to drop
 
 	for slots > 0 {

docs/cli/README.md

@@ -40,6 +40,8 @@
 
 - [```peers status```](./peers_status.md)
 
+- [```purge-whitelisted-entries```](./purge-whitelisted-entries.md)
+
 - [```removedb```](./removedb.md)
 
 - [```server```](./server.md)

docs/cli/purge-whitelisted-entries.md

@@ -0,0 +1,9 @@
+# Purge whitelisted entries
+
+The ```bor purge-whitelisted-entries``` command will remove locally whitelisted checkpoint and milestone entries from the database.
+
+## Options
+
+- ```datadir```: Path of the data directory to store information
+
+- ```keystore```: Path of the data directory to store keys

docs/cli/server.md

@@ -40,6 +40,8 @@ The ```bor server``` command runs the Bor client.
 
 - ```dev.period```: Block period to use in developer mode (0 = mine only if transaction pending) (default: 0)
 
+- ```disable-blind-fork-validation```: Disable additional fork validation and accept blind forks without tracing back to last whitelisted entry (default: false)
+
 - ```disable-bor-wallet```: Disable the personal wallet endpoints (default: true)
 
 - ```eth.requiredblocks```: Comma separated block number-to-hash mappings to require for peering (<number>=<hash>)
@@ -76,6 +78,8 @@ The ```bor server``` command runs the Bor client.
 
 - ```log-level```: Log level for the server (trace|debug|info|warn|error|crit), will be deprecated soon. Use verbosity instead
 
+- ```max-blind-fork-validation-limit```: Maximum number of blocks to traverse back in the database when validating blind forks (default: 256)
+
 - ```parallelevm.enable```: Enable Block STM (default: true)
 
 - ```parallelevm.enforce```: Enforce block processing via Block STM (default: false)