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

Merge pull request #11 from expanse-project/rebase-1.3.4

Browse source 
hotfix 1.3.5
This commit is contained in:
Christopher Franko 2016-03-07 08:26:22 -05:00
commit fa6fc40f48
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VERSION
View file

@ -1 +1 @@
1.3.4
1.3.5

6
cmd/gexp/main.go
View file

@ -1,4 +1,4 @@
// Copyright 2014 The go-ethereum Authors && Copyright 2015 go-expanse Authors
// Copyright 2014 The go-ethereum Authors && Copyright 2015 go-expanse Authors
// This file is part of go-expanse.
//
// go-expanse is free software: you can redistribute it and/or modify
@ -49,10 +49,10 @@ import (
const (
ClientIdentifier = "Gexp"
Version = "1.3.4"
Version = "1.3.5"
VersionMajor = 1
VersionMinor = 3
VersionPatch = 4
VersionPatch = 5
)
var (

6
exp/handler.go
View file

@ -493,7 +493,11 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
uncles[i] = body.Uncles
}
// Filter out any explicitly requested bodies, deliver the rest to the downloader
if trasactions, uncles := pm.fetcher.FilterBodies(trasactions, uncles, time.Now()); len(trasactions) > 0 || len(uncles) > 0 {
filter := len(trasactions) > 0 || len(uncles) > 0
if filter {
trasactions, uncles = pm.fetcher.FilterBodies(trasactions, uncles, time.Now())
}
if len(trasactions) > 0 || len(uncles) > 0 || !filter {
err := pm.downloader.DeliverBodies(p.id, trasactions, uncles)
if err != nil {
glog.V(logger.Debug).Infoln(err)