瀏覽代碼

Merge branch 'develop'

obscuren 11 年之前
父節點
當前提交
615d20598a
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      ethchain/transaction_pool.go
  2. 1 1
      peer.go

+ 1 - 1
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)
 	}
 

+ 1 - 1
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() {