Skip to content

eth: implement eth/62 synchronization logic #1661

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

Closed
karalabe wants to merge 16 commits into from
Closed

eth: implement eth/62 synchronization logic #1661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
12c83dc
eth, metrics, p2p: prepare metrics and net packets to eth/62
karalabe Jul 2, 2015
6151b23
eth, eth/downloader: handle header requests, table driven proto tests
karalabe Jul 2, 2015
4644814
eth: add state retrieval, test it + block tests
karalabe Jul 3, 2015
5c1cded
eth, eth/downloader: support overlapping messages between proto versions
karalabe Jul 6, 2015
74591a5
eth, eth/downloader: support receipt retrieval (eth/63)
karalabe Jul 6, 2015
2686b20
eth, eth/fetcher: add missing eth62 messages, test bodies
karalabe Aug 11, 2015
12506eb
eth: upgrade the block header query packet to new spec
karalabe Aug 12, 2015
738b34e
cmd, eth: flag for enabling eth protocol versions
karalabe Aug 13, 2015
5615d79
eth: kill off protocol eth/60 in preparation for eth/62
karalabe Aug 14, 2015
3ec2fd8
eth, eth/downloader: eth/62 downloader boilerplace + ancestor lookup
karalabe Aug 14, 2015
5efb072
eth/downloader: finish porting the sync logic to eth/62
karalabe Aug 15, 2015
dcd4383
eth/downloader: enable the downloader for eth/63 and eth/64 too
karalabe Aug 17, 2015
ee35dfd
eth: extend the fetcher fo support eth/62
karalabe Aug 19, 2015
56e1dc4
eth/fetcher: use announce numbers for distance checking
karalabe Aug 19, 2015
7fd2bf5
eth/fetcher: detect empty blocks and short circuit body fetch
karalabe Aug 20, 2015
8016efc
eth/downloader: detect and skip fetching empty blocks
karalabe Aug 21, 2015
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
2 changes: 2 additions & 0 deletions cmd/geth/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,7 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso
utils.DataDirFlag,
utils.BlockchainVersionFlag,
utils.OlympicFlag,
utils.EthVersionFlag,
utils.CacheFlag,
utils.JSpathFlag,
utils.ListenPortFlag,
Expand Down Expand Up @@ -334,6 +335,7 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso
app.Before = func(ctx *cli.Context) error {
utils.SetupLogger(ctx)
utils.SetupVM(ctx)
utils.SetupEth(ctx)
if ctx.GlobalBool(utils.PProfEanbledFlag.Name) {
utils.StartPProf(ctx)
}
Expand Down
17 changes: 17 additions & 0 deletions cmd/utils/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,11 @@ var (
Name: "olympic",
Usage: "Use olympic style protocol",
}
EthVersionFlag = cli.IntFlag{
Name: "eth",
Value: 61,
Usage: "Highest eth protocol to advertise (temporary, dev option)",
}

// miner settings
MinerThreadsFlag = cli.IntFlag{
Expand Down Expand Up @@ -459,6 +464,18 @@ func SetupVM(ctx *cli.Context) {
vm.SetJITCacheSize(ctx.GlobalInt(VMJitCacheFlag.Name))
}

// SetupEth configures the eth packages global settings
func SetupEth(ctx *cli.Context) {
version := ctx.GlobalInt(EthVersionFlag.Name)
for len(eth.ProtocolVersions) > 0 && eth.ProtocolVersions[0] > uint(version) {
eth.ProtocolVersions = eth.ProtocolVersions[1:]
eth.ProtocolLengths = eth.ProtocolLengths[1:]
}
if len(eth.ProtocolVersions) == 0 {
Fatalf("No valid eth protocols remaining")
}
}

// MakeChain creates a chain manager from set command line flags.
func MakeChain(ctx *cli.Context) (chain *core.ChainManager, chainDb common.Database) {
datadir := ctx.GlobalString(DataDirFlag.Name)
Expand Down
14 changes: 14 additions & 0 deletions core/types/block.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,20 @@ func (b *Block) WithMiningResult(nonce uint64, mixDigest common.Hash) *Block {
}
}

// WithBody returns a new block with the given transaction and uncle contents.
func (b *Block) WithBody(transactions []*Transaction, uncles []*Header) *Block {
block := &Block{
header: copyHeader(b.header),
transactions: make([]*Transaction, len(transactions)),
uncles: make([]*Header, len(uncles)),
}
copy(block.transactions, transactions)
for i := range uncles {
block.uncles[i] = copyHeader(uncles[i])
}
return block
}

// Implement pow.Block

func (b *Block) Hash() common.Hash {
Expand Down
2 changes: 1 addition & 1 deletion eth/backend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ func New(config *Config) (*Ethereum, error) {

eth.blockProcessor = core.NewBlockProcessor(chainDb, eth.pow, eth.chainManager, eth.EventMux())
eth.chainManager.SetProcessor(eth.blockProcessor)
eth.protocolManager = NewProtocolManager(config.NetworkId, eth.eventMux, eth.txPool, eth.pow, eth.chainManager)
eth.protocolManager = NewProtocolManager(config.NetworkId, eth.eventMux, eth.txPool, eth.pow, eth.chainManager, chainDb)

eth.miner = miner.New(eth, eth.EventMux(), eth.pow)
eth.miner.SetGasPrice(config.GasPrice)
Expand Down
Loading