Merge pull request ethereum#588 from maticnetwork/arpit/qa-to-develop

qa to develop
streamingfast · Nov 22, 2022 · b1739f6 · b1739f6
2 parents aece5ca + 7ae5bce
commit b1739f6
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 25 deletions.
diff --git a/builder/files/genesis-testnet-v4.json b/builder/files/genesis-testnet-v4.json
@@ -15,19 +15,24 @@
     "londonBlock": 22640000,
     "bor": {
       "jaipurBlock": 22770000,
+      "delhiBlock": 29638656,
       "period": {
         "0": 2,
-        "25275000": 5
+        "25275000": 5,
+        "29638656": 2
       },
       "producerDelay": {
-        "0": 6
+        "0": 6,
+        "29638656": 4
       },
       "sprint": {
-        "0": 64
+        "0": 64,
+        "29638656": 16
       },
       "backupMultiplier": {
         "0": 2,
-        "25275000": 5
+        "25275000": 5,
+        "29638656": 2
       },
       "validatorContract": "0x0000000000000000000000000000000000001000",
       "stateReceiverContract": "0x0000000000000000000000000000000000001001",

diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
@@ -1504,7 +1504,7 @@ func setPeerRequiredBlocks(ctx *cli.Context, cfg *ethconfig.Config) {
 
 	if peerRequiredBlocks == "" {
 		if ctx.GlobalIsSet(LegacyWhitelistFlag.Name) {
-			log.Warn("The flag --rpc is deprecated and will be removed, please use --peer.requiredblocks")
+			log.Warn("The flag --whitelist is deprecated and will be removed, please use --eth.requiredblocks")
 			peerRequiredBlocks = ctx.GlobalString(LegacyWhitelistFlag.Name)
 		} else {
 			return

diff --git a/eth/sync.go b/eth/sync.go
@@ -230,7 +230,7 @@ func (cs *chainSyncer) modeAndLocalHead() (downloader.SyncMode, *big.Int) {
 	// 		return downloader.SnapSync, td
 	// 	}
 	// }
-	// Nope, we're really full syncing
+	// // Nope, we're really full syncing
 	// head := cs.handler.chain.CurrentBlock()
 	// td := cs.handler.chain.GetTd(head.Hash(), head.NumberU64())
 	// return downloader.FullSync, td

diff --git a/internal/cli/server/chains/mumbai.go b/internal/cli/server/chains/mumbai.go
@@ -30,19 +30,24 @@ var mumbaiTestnet = &Chain{
 			LondonBlock:         big.NewInt(22640000),
 			Bor: &params.BorConfig{
 				JaipurBlock: big.NewInt(22770000),
+				DelhiBlock:  big.NewInt(29638656),
 				Period: map[string]uint64{
 					"0":        2,
 					"25275000": 5,
+					"29638656": 2,
 				},
 				ProducerDelay: map[string]uint64{
-					"0": 6,
+					"0":        6,
+					"29638656": 4,
 				},
 				Sprint: map[string]uint64{
-					"0": 64,
+					"0":        64,
+					"29638656": 16,
 				},
 				BackupMultiplier: map[string]uint64{
 					"0":        2,
 					"25275000": 5,
+					"29638656": 2,
 				},
 				ValidatorContract:     "0x0000000000000000000000000000000000001000",
 				StateReceiverContract: "0x0000000000000000000000000000000000001001",

diff --git a/internal/cli/server/chains/test_files/chain_legacy_test.json b/internal/cli/server/chains/test_files/chain_legacy_test.json
@@ -17,17 +17,21 @@
     "bor": {
       "period": {
         "0": 2,
-        "25275000": 5
+        "25275000": 5,
+        "29638656": 2
       },
       "producerDelay": {
-        "0": 6
+        "0": 6,
+        "29638656": 4
       },
       "sprint": {
-        "0": 64
+        "0": 64,
+        "29638656": 16
       },
       "backupMultiplier": {
         "0": 2,
-        "25275000": 5
+        "25275000": 5,
+        "29638656": 2
       },
       "validatorContract": "0x0000000000000000000000000000000000001000",
       "stateReceiverContract": "0x0000000000000000000000000000000000001001",
@@ -43,7 +47,8 @@
       "burntContract": {
         "22640000": "0x70bcA57F4579f58670aB2d18Ef16e02C17553C38"
       },
-      "jaipurBlock": 22770000
+      "jaipurBlock": 22770000,
+      "delhiBlock": 29638656
     }
   },
   "nonce": "0x0",

diff --git a/internal/cli/server/chains/test_files/chain_test.json b/internal/cli/server/chains/test_files/chain_test.json
@@ -19,17 +19,21 @@
         "bor":{
           "period":{
             "0":2,
-            "25275000": 5
+            "25275000": 5,
+            "29638656": 2
           },
           "producerDelay":{
-            "0": 6
+            "0": 6,
+            "29638656": 4
           },
           "sprint":{
-            "0": 64
+            "0": 64,
+            "29638656": 16
           },
           "backupMultiplier":{
             "0": 2,
-            "25275000": 5
+            "25275000": 5,
+            "29638656": 2
           },
           "validatorContract":"0x0000000000000000000000000000000000001000",
           "stateReceiverContract":"0x0000000000000000000000000000000000001001",
@@ -45,7 +49,8 @@
           "burntContract":{
             "22640000":"0x70bcA57F4579f58670aB2d18Ef16e02C17553C38"
           },
-          "jaipurBlock":22770000
+          "jaipurBlock":22770000,
+          "delhiBlock": 29638656
         }
       },
       "nonce":"0x0",

diff --git a/internal/cli/server/command.go b/internal/cli/server/command.go
@@ -41,7 +41,7 @@ func (c *Command) MarkDown() string {
 // Help implements the cli.Command interface
 func (c *Command) Help() string {
 	return `Usage: bor [options]
-  
+
 	Run the Bor server.
   ` + c.Flags().Help()
 }

diff --git a/params/config.go b/params/config.go
@@ -350,19 +350,24 @@ var (
 		LondonBlock:         big.NewInt(22640000),
 		Bor: &BorConfig{
 			JaipurBlock: big.NewInt(22770000),
+			DelhiBlock:  big.NewInt(29638656),
 			Period: map[string]uint64{
 				"0":        2,
 				"25275000": 5,
+				"29638656": 2,
 			},
 			ProducerDelay: map[string]uint64{
-				"0": 6,
+				"0":        6,
+				"29638656": 4,
 			},
 			Sprint: map[string]uint64{
-				"0": 64,
+				"0":        64,
+				"29638656": 16,
 			},
 			BackupMultiplier: map[string]uint64{
 				"0":        2,
 				"25275000": 5,
+				"29638656": 2,
 			},
 			ValidatorContract:     "0x0000000000000000000000000000000000001000",
 			StateReceiverContract: "0x0000000000000000000000000000000000001001",

diff --git a/params/version.go b/params/version.go
@@ -21,10 +21,10 @@ import (
 )
 
 const (
-	VersionMajor = 0      // Major version component of the current release
-	VersionMinor = 3      // Minor version component of the current release
-	VersionPatch = 1      // Patch version component of the current release
-	VersionMeta  = "beta" // Version metadata to append to the version string
+	VersionMajor = 0        // Major version component of the current release
+	VersionMinor = 3        // Minor version component of the current release
+	VersionPatch = 1        // Patch version component of the current release
+	VersionMeta  = "mumbai" // Version metadata to append to the version string
 )
 
 // Version holds the textual version string.