forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-26 14:46:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
qa to develop
This commit is contained in:
Arpit Temani 2022-11-22 13:30:10 +05:30 committed by GitHub
commit b1739f67d7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 50 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
builder/files/genesis-testnet-v4.json
View file

@ -15,19 +15,24 @@
"londonBlock": 22640000, "londonBlock": 22640000,
"bor": { "bor": {
"jaipurBlock": 22770000, "jaipurBlock": 22770000,
"delhiBlock": 29638656,
"period": { "period": {
"0": 2, "0": 2,
"25275000": 5 "25275000": 5,
"29638656": 2
}, },
"producerDelay": { "producerDelay": {
"0": 6 "0": 6,
"29638656": 4
}, },
"sprint": { "sprint": {
"0": 64 "0": 64,
"29638656": 16
}, },
"backupMultiplier": { "backupMultiplier": {
"0": 2, "0": 2,
"25275000": 5 "25275000": 5,
"29638656": 2
}, },
"validatorContract": "0x0000000000000000000000000000000000001000", "validatorContract": "0x0000000000000000000000000000000000001000",
"stateReceiverContract": "0x0000000000000000000000000000000000001001", "stateReceiverContract": "0x0000000000000000000000000000000000001001",

2
cmd/utils/flags.go
View file

@ -1504,7 +1504,7 @@ func setPeerRequiredBlocks(ctx *cli.Context, cfg *ethconfig.Config) {
if peerRequiredBlocks == "" { if peerRequiredBlocks == "" {
if ctx.GlobalIsSet(LegacyWhitelistFlag.Name) { 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) peerRequiredBlocks = ctx.GlobalString(LegacyWhitelistFlag.Name)
} else { } else {
return return

2
eth/sync.go
View file

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

9
internal/cli/server/chains/mumbai.go
View file

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

15
internal/cli/server/chains/test_files/chain_legacy_test.json
View file

@ -17,17 +17,21 @@
"bor": { "bor": {
"period": { "period": {
"0": 2, "0": 2,
"25275000": 5 "25275000": 5,
"29638656": 2
}, },
"producerDelay": { "producerDelay": {
"0": 6 "0": 6,
"29638656": 4
}, },
"sprint": { "sprint": {
"0": 64 "0": 64,
"29638656": 16
}, },
"backupMultiplier": { "backupMultiplier": {
"0": 2, "0": 2,
"25275000": 5 "25275000": 5,
"29638656": 2
}, },
"validatorContract": "0x0000000000000000000000000000000000001000", "validatorContract": "0x0000000000000000000000000000000000001000",
"stateReceiverContract": "0x0000000000000000000000000000000000001001", "stateReceiverContract": "0x0000000000000000000000000000000000001001",
@ -43,7 +47,8 @@
"burntContract": { "burntContract": {
"22640000": "0x70bcA57F4579f58670aB2d18Ef16e02C17553C38" "22640000": "0x70bcA57F4579f58670aB2d18Ef16e02C17553C38"
}, },
"jaipurBlock": 22770000 "jaipurBlock": 22770000,
"delhiBlock": 29638656
} }
}, },
"nonce": "0x0", "nonce": "0x0",

15
internal/cli/server/chains/test_files/chain_test.json
View file

@ -19,17 +19,21 @@
"bor":{ "bor":{
"period":{ "period":{
"0":2, "0":2,
"25275000": 5 "25275000": 5,
"29638656": 2
}, },
"producerDelay":{ "producerDelay":{
"0": 6 "0": 6,
"29638656": 4
}, },
"sprint":{ "sprint":{
"0": 64 "0": 64,
"29638656": 16
}, },
"backupMultiplier":{ "backupMultiplier":{
"0": 2, "0": 2,
"25275000": 5 "25275000": 5,
"29638656": 2
}, },
"validatorContract":"0x0000000000000000000000000000000000001000", "validatorContract":"0x0000000000000000000000000000000000001000",
"stateReceiverContract":"0x0000000000000000000000000000000000001001", "stateReceiverContract":"0x0000000000000000000000000000000000001001",
@ -45,7 +49,8 @@
"burntContract":{ "burntContract":{
"22640000":"0x70bcA57F4579f58670aB2d18Ef16e02C17553C38" "22640000":"0x70bcA57F4579f58670aB2d18Ef16e02C17553C38"
}, },
"jaipurBlock":22770000 "jaipurBlock":22770000,
"delhiBlock": 29638656
} }
}, },
"nonce":"0x0", "nonce":"0x0",

9
params/config.go
View file

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

8
params/version.go
View file

@ -21,10 +21,10 @@ import (
) )
const ( const (
VersionMajor = 0 // Major version component of the current release VersionMajor = 0 // Major version component of the current release
VersionMinor = 3 // Minor version component of the current release VersionMinor = 3 // Minor version component of the current release
VersionPatch = 1 // Patch 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 VersionMeta = "mumbai" // Version metadata to append to the version string
) )
// Version holds the textual version string. // Version holds the textual version string.