aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-09-24 00:19:56 +0800
committerobscuren <geffobscura@gmail.com>2014-09-24 00:19:56 +0800
commit615d20598ababa5988d5b36a48640c154d8866fd (patch)
tree231b6a1931bbe0685d03269769f4df0d396054f4
parent5c5db7d931379b3a36606103eb886a3d26f456e1 (diff)
parent46a496428f2d2a3a0f9ddcb755c825dfc1f73436 (diff)
downloaddexon-615d20598ababa5988d5b36a48640c154d8866fd.tar
dexon-615d20598ababa5988d5b36a48640c154d8866fd.tar.gz
dexon-615d20598ababa5988d5b36a48640c154d8866fd.tar.bz2
dexon-615d20598ababa5988d5b36a48640c154d8866fd.tar.lz
dexon-615d20598ababa5988d5b36a48640c154d8866fd.tar.xz
dexon-615d20598ababa5988d5b36a48640c154d8866fd.tar.zst
dexon-615d20598ababa5988d5b36a48640c154d8866fd.zip
Merge branch 'develop'
-rw-r--r--ethchain/transaction_pool.go2
-rw-r--r--peer.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/ethchain/transaction_pool.go b/ethchain/transaction_pool.go
index 0f7e85982..da6c3d6ba 100644
--- a/ethchain/transaction_pool.go
+++ b/ethchain/transaction_pool.go
@@ -105,7 +105,7 @@ func (pool *TxPool) ValidateTransaction(tx *Transaction) error {
return fmt.Errorf("[TXPL] Invalid recipient. len = %d", len(tx.Recipient))
}
- if tx.GasPrice.Cmp(MinGasPrice) >= 0 {
+ if tx.GasPrice.Cmp(MinGasPrice) < 0 {
return fmt.Errorf("Gas price to low. Require %v > Got %v", MinGasPrice, tx.GasPrice)
}
diff --git a/peer.go b/peer.go
index 34aff5ede..529a35492 100644
--- a/peer.go
+++ b/peer.go
@@ -572,7 +572,7 @@ func (self *Peer) FetchBlocks() {
func (self *Peer) FetchHashes() {
blockPool := self.ethereum.blockPool
- if self.statusKnown && self.td.Cmp(blockPool.td) >= 0 {
+ if self.td.Cmp(blockPool.td) >= 0 {
blockPool.td = self.td
if !blockPool.HasLatestHash() {