Merge branch 'develop'
This commit is contained in:
commit
615d20598a
|
@ -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
2
peer.go
|
@ -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() {
|
||||||
|
|
Loading…
Reference in New Issue