mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-08-12 06:53:46 +00:00
revert changes for delhi fork
This commit is contained in:
parent
d5482469d0
commit
366496f68a
7 changed files with 24 additions and 58 deletions
|
|
@ -15,17 +15,14 @@
|
||||||
"londonBlock": 23850000,
|
"londonBlock": 23850000,
|
||||||
"bor": {
|
"bor": {
|
||||||
"jaipurBlock": 23850000,
|
"jaipurBlock": 23850000,
|
||||||
"delhiBlock": 36499456,
|
|
||||||
"period": {
|
"period": {
|
||||||
"0": 2
|
"0": 2
|
||||||
},
|
},
|
||||||
"producerDelay": {
|
"producerDelay": {
|
||||||
"0": 6,
|
"0": 6
|
||||||
"36499456": 4
|
|
||||||
},
|
},
|
||||||
"sprint": {
|
"sprint": {
|
||||||
"0": 64,
|
"0": 64
|
||||||
"36499456": 16
|
|
||||||
},
|
},
|
||||||
"backupMultiplier": {
|
"backupMultiplier": {
|
||||||
"0": 2
|
"0": 2
|
||||||
|
|
|
||||||
|
|
@ -15,24 +15,19 @@
|
||||||
"londonBlock": 22640000,
|
"londonBlock": 22640000,
|
||||||
"bor": {
|
"bor": {
|
||||||
"jaipurBlock": 22770000,
|
"jaipurBlock": 22770000,
|
||||||
"delhiBlock": 29389056,
|
|
||||||
"period": {
|
"period": {
|
||||||
"0": 2,
|
"0": 2,
|
||||||
"25275000": 5,
|
"25275000": 5
|
||||||
"29389056": 2
|
|
||||||
},
|
},
|
||||||
"producerDelay": {
|
"producerDelay": {
|
||||||
"0": 6,
|
"0": 6
|
||||||
"29389056": 4
|
|
||||||
},
|
},
|
||||||
"sprint": {
|
"sprint": {
|
||||||
"0": 64,
|
"0": 64
|
||||||
"29389056": 16
|
|
||||||
},
|
},
|
||||||
"backupMultiplier": {
|
"backupMultiplier": {
|
||||||
"0": 2,
|
"0": 2,
|
||||||
"25275000": 5,
|
"25275000": 5
|
||||||
"29389056": 2
|
|
||||||
},
|
},
|
||||||
"validatorContract": "0x0000000000000000000000000000000000001000",
|
"validatorContract": "0x0000000000000000000000000000000000001000",
|
||||||
"stateReceiverContract": "0x0000000000000000000000000000000000001001",
|
"stateReceiverContract": "0x0000000000000000000000000000000000001001",
|
||||||
|
|
|
||||||
|
|
@ -30,17 +30,14 @@ var mainnetBor = &Chain{
|
||||||
LondonBlock: big.NewInt(23850000),
|
LondonBlock: big.NewInt(23850000),
|
||||||
Bor: ¶ms.BorConfig{
|
Bor: ¶ms.BorConfig{
|
||||||
JaipurBlock: big.NewInt(23850000),
|
JaipurBlock: big.NewInt(23850000),
|
||||||
DelhiBlock: big.NewInt(36499456),
|
|
||||||
Period: map[string]uint64{
|
Period: map[string]uint64{
|
||||||
"0": 2,
|
"0": 2,
|
||||||
},
|
},
|
||||||
ProducerDelay: map[string]uint64{
|
ProducerDelay: map[string]uint64{
|
||||||
"0": 6,
|
"0": 6,
|
||||||
"36499456": 4,
|
|
||||||
},
|
},
|
||||||
Sprint: map[string]uint64{
|
Sprint: map[string]uint64{
|
||||||
"0": 64,
|
"0": 64,
|
||||||
"36499456": 16,
|
|
||||||
},
|
},
|
||||||
BackupMultiplier: map[string]uint64{
|
BackupMultiplier: map[string]uint64{
|
||||||
"0": 2,
|
"0": 2,
|
||||||
|
|
|
||||||
|
|
@ -30,24 +30,19 @@ var mumbaiTestnet = &Chain{
|
||||||
LondonBlock: big.NewInt(22640000),
|
LondonBlock: big.NewInt(22640000),
|
||||||
Bor: ¶ms.BorConfig{
|
Bor: ¶ms.BorConfig{
|
||||||
JaipurBlock: big.NewInt(22770000),
|
JaipurBlock: big.NewInt(22770000),
|
||||||
DelhiBlock: big.NewInt(29389056),
|
|
||||||
Period: map[string]uint64{
|
Period: map[string]uint64{
|
||||||
"0": 2,
|
"0": 2,
|
||||||
"25275000": 5,
|
"25275000": 5,
|
||||||
"29389056": 2,
|
|
||||||
},
|
},
|
||||||
ProducerDelay: map[string]uint64{
|
ProducerDelay: map[string]uint64{
|
||||||
"0": 6,
|
"0": 6,
|
||||||
"29389056": 4,
|
|
||||||
},
|
},
|
||||||
Sprint: map[string]uint64{
|
Sprint: map[string]uint64{
|
||||||
"0": 64,
|
"0": 64,
|
||||||
"29389056": 16,
|
|
||||||
},
|
},
|
||||||
BackupMultiplier: map[string]uint64{
|
BackupMultiplier: map[string]uint64{
|
||||||
"0": 2,
|
"0": 2,
|
||||||
"25275000": 5,
|
"25275000": 5,
|
||||||
"29389056": 2,
|
|
||||||
},
|
},
|
||||||
ValidatorContract: "0x0000000000000000000000000000000000001000",
|
ValidatorContract: "0x0000000000000000000000000000000000001000",
|
||||||
StateReceiverContract: "0x0000000000000000000000000000000000001001",
|
StateReceiverContract: "0x0000000000000000000000000000000000001001",
|
||||||
|
|
|
||||||
|
|
@ -17,21 +17,17 @@
|
||||||
"bor": {
|
"bor": {
|
||||||
"period": {
|
"period": {
|
||||||
"0": 2,
|
"0": 2,
|
||||||
"25275000": 5,
|
"25275000": 5
|
||||||
"29389056": 2
|
|
||||||
},
|
},
|
||||||
"producerDelay": {
|
"producerDelay": {
|
||||||
"0": 6,
|
"0": 6
|
||||||
"29389056": 4
|
|
||||||
},
|
},
|
||||||
"sprint": {
|
"sprint": {
|
||||||
"0": 64,
|
"0": 64
|
||||||
"29389056": 16
|
|
||||||
},
|
},
|
||||||
"backupMultiplier": {
|
"backupMultiplier": {
|
||||||
"0": 2,
|
"0": 2,
|
||||||
"25275000": 5,
|
"25275000": 5
|
||||||
"29389056": 2
|
|
||||||
},
|
},
|
||||||
"validatorContract": "0x0000000000000000000000000000000000001000",
|
"validatorContract": "0x0000000000000000000000000000000000001000",
|
||||||
"stateReceiverContract": "0x0000000000000000000000000000000000001001",
|
"stateReceiverContract": "0x0000000000000000000000000000000000001001",
|
||||||
|
|
@ -47,8 +43,7 @@
|
||||||
"burntContract": {
|
"burntContract": {
|
||||||
"22640000": "0x70bcA57F4579f58670aB2d18Ef16e02C17553C38"
|
"22640000": "0x70bcA57F4579f58670aB2d18Ef16e02C17553C38"
|
||||||
},
|
},
|
||||||
"jaipurBlock": 22770000,
|
"jaipurBlock": 22770000
|
||||||
"delhiBlock": 29389056
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nonce": "0x0",
|
"nonce": "0x0",
|
||||||
|
|
|
||||||
|
|
@ -19,21 +19,17 @@
|
||||||
"bor":{
|
"bor":{
|
||||||
"period":{
|
"period":{
|
||||||
"0":2,
|
"0":2,
|
||||||
"25275000": 5,
|
"25275000": 5
|
||||||
"29389056": 2
|
|
||||||
},
|
},
|
||||||
"producerDelay":{
|
"producerDelay":{
|
||||||
"0": 6,
|
"0": 6
|
||||||
"29389056": 4
|
|
||||||
},
|
},
|
||||||
"sprint":{
|
"sprint":{
|
||||||
"0": 64,
|
"0": 64
|
||||||
"29389056": 16
|
|
||||||
},
|
},
|
||||||
"backupMultiplier":{
|
"backupMultiplier":{
|
||||||
"0": 2,
|
"0": 2,
|
||||||
"25275000": 5,
|
"25275000": 5
|
||||||
"29389056": 2
|
|
||||||
},
|
},
|
||||||
"validatorContract":"0x0000000000000000000000000000000000001000",
|
"validatorContract":"0x0000000000000000000000000000000000001000",
|
||||||
"stateReceiverContract":"0x0000000000000000000000000000000000001001",
|
"stateReceiverContract":"0x0000000000000000000000000000000000001001",
|
||||||
|
|
@ -49,8 +45,7 @@
|
||||||
"burntContract":{
|
"burntContract":{
|
||||||
"22640000":"0x70bcA57F4579f58670aB2d18Ef16e02C17553C38"
|
"22640000":"0x70bcA57F4579f58670aB2d18Ef16e02C17553C38"
|
||||||
},
|
},
|
||||||
"jaipurBlock":22770000,
|
"jaipurBlock":22770000
|
||||||
"delhiBlock": 29389056
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nonce":"0x0",
|
"nonce":"0x0",
|
||||||
|
|
|
||||||
|
|
@ -350,24 +350,19 @@ var (
|
||||||
LondonBlock: big.NewInt(22640000),
|
LondonBlock: big.NewInt(22640000),
|
||||||
Bor: &BorConfig{
|
Bor: &BorConfig{
|
||||||
JaipurBlock: big.NewInt(22770000),
|
JaipurBlock: big.NewInt(22770000),
|
||||||
DelhiBlock: big.NewInt(29389056),
|
|
||||||
Period: map[string]uint64{
|
Period: map[string]uint64{
|
||||||
"0": 2,
|
"0": 2,
|
||||||
"25275000": 5,
|
"25275000": 5,
|
||||||
"29389056": 2,
|
|
||||||
},
|
},
|
||||||
ProducerDelay: map[string]uint64{
|
ProducerDelay: map[string]uint64{
|
||||||
"0": 6,
|
"0": 6,
|
||||||
"29389056": 4,
|
|
||||||
},
|
},
|
||||||
Sprint: map[string]uint64{
|
Sprint: map[string]uint64{
|
||||||
"0": 64,
|
"0": 64,
|
||||||
"29389056": 16,
|
|
||||||
},
|
},
|
||||||
BackupMultiplier: map[string]uint64{
|
BackupMultiplier: map[string]uint64{
|
||||||
"0": 2,
|
"0": 2,
|
||||||
"25275000": 5,
|
"25275000": 5,
|
||||||
"29389056": 2,
|
|
||||||
},
|
},
|
||||||
ValidatorContract: "0x0000000000000000000000000000000000001000",
|
ValidatorContract: "0x0000000000000000000000000000000000001000",
|
||||||
StateReceiverContract: "0x0000000000000000000000000000000000001001",
|
StateReceiverContract: "0x0000000000000000000000000000000000001001",
|
||||||
|
|
@ -404,17 +399,14 @@ var (
|
||||||
LondonBlock: big.NewInt(23850000),
|
LondonBlock: big.NewInt(23850000),
|
||||||
Bor: &BorConfig{
|
Bor: &BorConfig{
|
||||||
JaipurBlock: big.NewInt(23850000),
|
JaipurBlock: big.NewInt(23850000),
|
||||||
DelhiBlock: big.NewInt(36499456),
|
|
||||||
Period: map[string]uint64{
|
Period: map[string]uint64{
|
||||||
"0": 2,
|
"0": 2,
|
||||||
},
|
},
|
||||||
ProducerDelay: map[string]uint64{
|
ProducerDelay: map[string]uint64{
|
||||||
"0": 6,
|
"0": 6,
|
||||||
"36499456": 4,
|
|
||||||
},
|
},
|
||||||
Sprint: map[string]uint64{
|
Sprint: map[string]uint64{
|
||||||
"0": 64,
|
"0": 64,
|
||||||
"36499456": 16,
|
|
||||||
},
|
},
|
||||||
BackupMultiplier: map[string]uint64{
|
BackupMultiplier: map[string]uint64{
|
||||||
"0": 2,
|
"0": 2,
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue