forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-16 09:50:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fetcher-hotfix

Browse source
This commit is contained in:
MestryOmkar 2019-03-02 15:10:35 +05:30
parent 10694b2c6f
commit 1861c13bcd
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/blockchain_test.go
View file

@ -1320,4 +1320,4 @@ func TestLargeReorgTrieGC(t *testing.T) {
t.Fatalf("competitor %d: competing chain state missing", i) t.Fatalf("competitor %d: competing chain state missing", i)
} }
} }
} }

4
docker/XDCchain/entrypoint.sh
View file

@ -171,9 +171,9 @@ exec XDC $params \
--datadir $DATA_DIR \ --datadir $DATA_DIR \
--keystore $KEYSTORE_DIR \ --keystore $KEYSTORE_DIR \
--identity $IDENTITY \ --identity $IDENTITY \
--maxpeers $MAXPEERS \
--password ./password \ --password ./password \
--port 30303 \ --port 30303 \
--maxpeers $MAXPEERS \
--txpool.globalqueue 5000 \ --txpool.globalqueue 5000 \
--txpool.globalslots 5000 \ --txpool.globalslots 5000 \
--rpc \ --rpc \
@ -188,4 +188,4 @@ exec XDC $params \
--mine \ --mine \
--gasprice "250000000" \ --gasprice "250000000" \
--targetgaslimit "84000000" \ --targetgaslimit "84000000" \
"$@" "$@"

8
eth/backend.go
View file

@ -242,11 +242,13 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
if m2 == eb { if m2 == eb {
wallet, err := eth.accountManager.Find(accounts.Account{Address: eb}) wallet, err := eth.accountManager.Find(accounts.Account{Address: eb})
if err != nil { if err != nil {
log.Error("Can't find coinbase account wallet", "err", err)
return block, false, err return block, false, err
} }
header := block.Header() header := block.Header()
sighash, err := wallet.SignHash(accounts.Account{Address: eb}, XDPoS.SigHash(header).Bytes()) sighash, err := wallet.SignHash(accounts.Account{Address: eb}, XDPoS.SigHash(header).Bytes())
if err != nil { if err != nil || sighash == nil {
log.Error("Can't get signature hash of m2", "sighash", sighash, "err", err)
return block, false, err return block, false, err
} }
header.Validator = sighash header.Validator = sighash
@ -551,7 +553,7 @@ func CreateDB(ctx *node.ServiceContext, config *Config, name string) (ethdb.Data
// CreateConsensusEngine creates the required type of consensus engine instance for an Ethereum service // CreateConsensusEngine creates the required type of consensus engine instance for an Ethereum service
func CreateConsensusEngine(ctx *node.ServiceContext, config *ethash.Config, chainConfig *params.ChainConfig, db ethdb.Database) consensus.Engine { func CreateConsensusEngine(ctx *node.ServiceContext, config *ethash.Config, chainConfig *params.ChainConfig, db ethdb.Database) consensus.Engine {
// If Xinfin-XDPoS voting is requested, set it up // If Xinfin XDPoS is requested, set it up
if chainConfig.XDPoS != nil { if chainConfig.XDPoS != nil {
return XDPoS.New(chainConfig.XDPoS, db) return XDPoS.New(chainConfig.XDPoS, db)
} }
@ -864,4 +866,4 @@ func rewardInflation(chainReward *big.Int, number uint64, blockPerYear uint64) *
func (s *Ethereum) GetPeer() int { func (s *Ethereum) GetPeer() int {
return len(s.protocolManager.peers.peers) return len(s.protocolManager.peers.peers)
} }