gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
obscuren
2014-09-23 18:19:56 +02:00
parent 5c5db7d931 46a496428f
commit 615d20598a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ethchain/transaction_pool.go
View File

@@ -105,7 +105,7 @@ func (pool *TxPool) ValidateTransaction(tx *Transaction) error {
return fmt.Errorf("[TXPL] Invalid recipient. len = %d", len(tx.Recipient)) 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) return fmt.Errorf("Gas price to low. Require %v > Got %v", MinGasPrice, tx.GasPrice)
} }

2
peer.go
View File

@@ -572,7 +572,7 @@ func (self *Peer) FetchBlocks() {
func (self *Peer) FetchHashes() { func (self *Peer) FetchHashes() {
blockPool := self.ethereum.blockPool blockPool := self.ethereum.blockPool
if self.statusKnown && self.td.Cmp(blockPool.td) >= 0 { if self.td.Cmp(blockPool.td) >= 0 {
blockPool.td = self.td blockPool.td = self.td
if !blockPool.HasLatestHash() { if !blockPool.HasLatestHash() {