aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-05-13 01:05:51 +0800
committerobscuren <geffobscura@gmail.com>2015-05-13 01:05:51 +0800
commit28d6b30c0f4b11aceae93e73d57c34aab112ca21 (patch)
tree71f866652de6b45da5ad4403b88f5def9a684e36
parentd6357aa616715df1e98cfb90c3aa5372e15cc24b (diff)
parent8fe01b4bfa28ad5a1fdde7f9837e8f982843389a (diff)
downloaddexon-28d6b30c0f4b11aceae93e73d57c34aab112ca21.tar
dexon-28d6b30c0f4b11aceae93e73d57c34aab112ca21.tar.gz
dexon-28d6b30c0f4b11aceae93e73d57c34aab112ca21.tar.bz2
dexon-28d6b30c0f4b11aceae93e73d57c34aab112ca21.tar.lz
dexon-28d6b30c0f4b11aceae93e73d57c34aab112ca21.tar.xz
dexon-28d6b30c0f4b11aceae93e73d57c34aab112ca21.tar.zst
dexon-28d6b30c0f4b11aceae93e73d57c34aab112ca21.zip
Merge branch 'release/0.9.20' into develop
-rw-r--r--cmd/geth/main.go2
-rw-r--r--eth/handler.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index dbcfe8175..1582953f7 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -50,7 +50,7 @@ import _ "net/http/pprof"
const (
ClientIdentifier = "Geth"
- Version = "0.9.19"
+ Version = "0.9.20"
)
var (
diff --git a/eth/handler.go b/eth/handler.go
index 41b6728d9..88394543e 100644
--- a/eth/handler.go
+++ b/eth/handler.go
@@ -381,7 +381,7 @@ func (pm *ProtocolManager) BroadcastTx(hash common.Hash, tx *types.Transaction)
}
}
// Broadcast block to peer set
- peers = peers[:int(math.Sqrt(float64(len(peers))))]
+ //FIXME include this again: peers = peers[:int(math.Sqrt(float64(len(peers))))]
for _, peer := range peers {
peer.sendTransaction(tx)
}