mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-08-10 14:03:46 +00:00
Include missing bad merge changes
This commit is contained in:
parent
34d8949f84
commit
00c78e73af
1 changed files with 6 additions and 2 deletions
|
|
@ -15,10 +15,14 @@
|
||||||
"londonBlock": 23850000,
|
"londonBlock": 23850000,
|
||||||
"bor": {
|
"bor": {
|
||||||
"jaipurBlock": 23850000,
|
"jaipurBlock": 23850000,
|
||||||
"period": 2,
|
"period": {
|
||||||
|
"0": 2
|
||||||
|
},
|
||||||
"producerDelay": 6,
|
"producerDelay": 6,
|
||||||
"sprint": 64,
|
"sprint": 64,
|
||||||
"backupMultiplier": 2,
|
"backupMultiplier": {
|
||||||
|
"0": 2
|
||||||
|
},
|
||||||
"validatorContract": "0x0000000000000000000000000000000000001000",
|
"validatorContract": "0x0000000000000000000000000000000000001000",
|
||||||
"stateReceiverContract": "0x0000000000000000000000000000000000001001",
|
"stateReceiverContract": "0x0000000000000000000000000000000000001001",
|
||||||
"overrideStateSyncRecords": {
|
"overrideStateSyncRecords": {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue