Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

metadium: fixes for sync issues, pending block issue & chaindata directory name issue #14

Merged
merged 8 commits into from
Apr 14, 2022
Merged

metadium: fixes for sync issues, pending block issue & chaindata directory name issue #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
43194ea
conensus, metadium: allow block generation when governance is not ini…
sadoci Mar 30, 2022
10e9aeb
metadium/scripts: updated gmet.sh to check if db is still open
sadoci Apr 7, 2022
dcd3da5
eth/protocols/eth: updated GetBlockHeaders66() to handle legacy cases
sadoci Apr 7, 2022
01c2171
metadium/scripts: removed chaindata* from gmet.sh wipe
sadoci Apr 7, 2022
8e6c344
core, params: reverted metadium testnet berlin & london block height
sadoci Apr 7, 2022
ccf8b63
ethdb/rocksdb: null terminated file name string, fixed read only rocksdb
sadoci Apr 11, 2022
59cab3a
core/rawdb: db detection before opening
sadoci Apr 11, 2022
aff46db
miner: fixed pending block refresh issue
sadoci Apr 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions consensus/ethash/consensus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,13 +700,20 @@ func accumulateRewards(config *params.ChainConfig, state *state.StateDB, header
func(addr common.Address, amt *big.Int) {
state.AddBalance(addr, amt)
})
if err != nil {
if err == nil {
header.Rewards = rewards
if coinbase != nil {
header.Coinbase = *coinbase
}
} else {
if err == metaminer.ErrNotInitialized {
reward := new(big.Int)
reward.Add(blockReward, header.Fees)
state.AddBalance(header.Coinbase, reward)
return nil
}
return err
}
header.Rewards = rewards
if coinbase != nil {
header.Coinbase = *coinbase
}
}
return nil
}
4 changes: 2 additions & 2 deletions core/metadium_genesis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12333,7 +12333,7 @@ var (
},
"coinbase": "0x378360d4f25E6377f3da53F8cF09e9a258118528",
"config": {
"berlinBlock": 25570000,
"berlinBlock": 80000000,
"chainId": 12,
"homesteadBlock": 0,
"eip150Block": 5623000,
Expand All @@ -12342,7 +12342,7 @@ var (
"byzantiumBlock": 0,
"constantinopleBlock": 5623000,
"istanbulBlock": 5623000,
"londonBlock": 25570000,
"londonBlock": 80000000,
"muirGlacierBlock": 5623000
},
"difficulty": "0x1",
Expand Down
26 changes: 26 additions & 0 deletions core/rawdb/database.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,13 @@
package rawdb

import (
"bufio"
"bytes"
"errors"
"fmt"
"os"
"path"
"strings"
"sync/atomic"
"time"

Expand Down Expand Up @@ -293,7 +296,24 @@ func NewRocksDBDatabaseWithFreezer(file string, cache int, handles int, freezer
return frdb, nil
}

func detectDb(file string) int {
if f, err := os.Open(path.Join(file, "LOG")); err != nil {
return 0
} else if s, err := bufio.NewReader(f).ReadString('\n'); err != nil {
return 0
} else if strings.Contains(s, "RocksDB version") {
return 2
}
return 1
}

func NewDB(file string, cache int, handles int, namespace string, readonly bool) (ethdb.Database, error) {
switch detectDb(file) {
case 1:
return NewLevelDBDatabase(file, cache, handles, namespace, readonly)
case 2:
return NewRocksDBDatabase(file, cache, handles, namespace, readonly)
}
if params.UseRocksDb != 0 {
return NewRocksDBDatabase(file, cache, handles, namespace, readonly)
} else {
Expand All @@ -302,6 +322,12 @@ func NewDB(file string, cache int, handles int, namespace string, readonly bool)
}

func NewDBWithFreezer(file string, cache int, handles int, freezer string, namespace string, readonly bool) (ethdb.Database, error) {
switch detectDb(file) {
case 1:
return NewLevelDBDatabaseWithFreezer(file, cache, handles, freezer, namespace, readonly)
case 2:
return NewRocksDBDatabaseWithFreezer(file, cache, handles, freezer, namespace, readonly)
}
if params.UseRocksDb != 0 {
return NewRocksDBDatabaseWithFreezer(file, cache, handles, freezer, namespace, readonly)
} else {
Expand Down
Loading