Merge pull request ethereum#1626 from maticnetwork/v2.2.6-candidate

V2.2.6 candidate

Author: pratikspatil024

builder/files/genesis-mainnet-v1.json

@@ -52,6 +52,9 @@
         "14953792": 0,
         "14953856": 0
       },
+      "overrideStateSyncRecordsInRange": [
+        { "startBlock": 73812433, "endBlock": 73822500, "value": 0 }
+      ],
       "blockAlloc": {
         "22156660": {
           "0000000000000000000000000000000000001010": {

consensus/bor/bor.go

@@ -1428,6 +1428,16 @@ func (c *Bor) CommitStates(
 	fetchStart := time.Now()
 	number := header.Number.Uint64()
 
+	// Check for override state sync records before fetching event records
+	if c.config.OverrideStateSyncRecordsInRange != nil {
+		overrideStateSyncRecord, ok := c.config.GetOverrideStateSyncRecord(number)
+		if ok && overrideStateSyncRecord == 0 {
+			// If override value is 0, skip fetching event records entirely
+			log.Info("Skipping state sync events fetch due to override value 0", "number", number)
+			return make([]*types.StateSyncData, 0), nil
+		}
+	}
+
 	var (
 		lastStateIDBig *big.Int
 		from           uint64

consensus/bor/heimdall/client.go

@@ -670,6 +670,7 @@ func internalFetchWithTimeout(ctx context.Context, client http.Client, url *url.
 		// If no timeout is set, use a default timeout
 		client.Timeout = 1 * time.Second
 	}
+	client.Timeout = 30 * time.Second
 	ctx, cancel := context.WithTimeout(ctx, client.Timeout)
 	defer cancel()
 

consensus/bor/heimdallgrpc/client.go

@@ -20,7 +20,7 @@ import (
 
 const (
 	stateFetchLimit = 50
-	defaultTimeout  = 1 * time.Second
+	defaultTimeout  = 30 * time.Second
 )
 
 type HeimdallGRPCClient struct {

internal/cli/server/chains/mainnet.go

@@ -66,6 +66,10 @@ var mainnetBor = &Chain{
 					"14953792": 0,
 					"14953856": 0,
 				},
+				OverrideStateSyncRecordsInRange: []params.BlockRangeOverride{
+					{StartBlock: 73812433, EndBlock: 73822500, Value: 0},
+				},
+
 				BurntContract: map[string]string{
 					"23850000": "0x70bca57f4579f58670ab2d18ef16e02c17553c38",
 					"50523000": "0x7A8ed27F4C30512326878652d20fC85727401854",

params/config.go

@@ -428,6 +428,10 @@ var (
 				"14953792": 0,
 				"14953856": 0,
 			},
+			OverrideStateSyncRecordsInRange: []BlockRangeOverride{
+				{StartBlock: 73812433, EndBlock: 73822500, Value: 0},
+			},
+
 			BurntContract: map[string]string{
 				"23850000": "0x70bca57f4579f58670ab2d18ef16e02c17553c38",
 				"50523000": "0x7A8ed27F4C30512326878652d20fC85727401854",

params/version.go

@@ -25,7 +25,7 @@ import (
 const (
 	VersionMajor = 2  // Major version component of the current release
 	VersionMinor = 2  // Minor version component of the current release
-	VersionPatch = 5  // Patch version component of the current release
+	VersionPatch = 6  // Patch version component of the current release
 	VersionMeta  = "" // Version metadata to append to the version string
 )