forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #464 from ngtuna/fetcher-hotfix

Browse source 
Fetcher patch
This commit is contained in:
Tuna 2019-03-12 13:36:40 +07:00 committed by GitHub
commit f78b974b9a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
eth/backend.go
View file

@ -240,9 +240,17 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
return block, false, fmt.Errorf("can't get block validator: %v", err) return block, false, fmt.Errorf("can't get block validator: %v", err)
} }
if m2 == eb { if m2 == eb {
wallet, _ := eth.accountManager.Find(accounts.Account{Address: eb}) wallet, err := eth.accountManager.Find(accounts.Account{Address: eb})
if err != nil {
log.Error("Can't find coinbase account wallet", "err", err)
return block, false, err
}
header := block.Header() header := block.Header()
sighash, _ := wallet.SignHash(accounts.Account{Address: eb}, posv.SigHash(header).Bytes()) sighash, err := wallet.SignHash(accounts.Account{Address: eb}, posv.SigHash(header).Bytes())
if err != nil || sighash == nil {
log.Error("Can't get signature hash of m2", "sighash", sighash, "err", err)
return block, false, err
}
header.Validator = sighash header.Validator = sighash
return types.NewBlockWithHeader(header).WithBody(block.Transactions(), block.Uncles()), true, nil return types.NewBlockWithHeader(header).WithBody(block.Transactions(), block.Uncles()), true, nil
} }

2
params/version.go
View file

@ -23,7 +23,7 @@ import (
const ( const (
VersionMajor = 1 // Major version component of the current release VersionMajor = 1 // 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 = 0 // Patch version component of the current release VersionPatch = 1 // Patch version component of the current release
VersionMeta = "stable" // Version metadata to append to the version string VersionMeta = "stable" // Version metadata to append to the version string
) )