Merge pull request #192 from binance-chain/release_1.0.7-hf.1

[R4r]prepare for release v1.0.7-hf.1

CHANGELOG.md

@@ -1,4 +1,9 @@
 # Changelog
+## v1.0.7-hf.1
+BUGFIX
+* [\#190](https://github.com/binance-chain/bsc/pull/190) fix disk increase dramaticly
+* [\#191](https://github.com/binance-chain/bsc/pull/191) fix the reorg routine of tx pool stuck issue
+
 ## v1.0.7
 * [\#120](https://github.com/binance-chain/bsc/pull/120) add health check endpoint
 * [\#116](https://github.com/binance-chain/bsc/pull/116) validator only write database state when enough distance 

core/blockchain.go

@@ -82,7 +82,7 @@ var (
 const (
 	bodyCacheLimit      = 256
 	blockCacheLimit     = 256
-	receiptsCacheLimit  = 32
+	receiptsCacheLimit  = 10000
 	txLookupCacheLimit  = 1024
 	maxFutureBlocks     = 256
 	maxTimeFutureBlocks = 30
@@ -322,6 +322,10 @@ func (bc *BlockChain) GetVMConfig() *vm.Config {
 	return &bc.vmConfig
 }
 
+func (bc *BlockChain) CacheReceipts(hash common.Hash, receipts types.Receipts) {
+	bc.receiptsCache.Add(hash, receipts)
+}
+
 // empty returns an indicator whether the blockchain is empty.
 // Note, it's a special case that we connect a non-empty ancient
 // database with an empty node, so that we can plugin the ancient
@@ -1725,6 +1729,7 @@ func (bc *BlockChain) insertChain(chain types.Blocks, verifySeals bool) (int, er
 			atomic.StoreUint32(&followupInterrupt, 1)
 			return it.index, err
 		}
+		bc.CacheReceipts(block.Hash(), receipts)
 		// Update the metrics touched during block processing
 		accountReadTimer.Update(statedb.AccountReads)                 // Account reads are complete, we can mark them
 		storageReadTimer.Update(statedb.StorageReads)                 // Storage reads are complete, we can mark them

eth/peer.go

@@ -204,7 +204,7 @@ func (p *peer) broadcastTransactions() {
 			done = nil
 
 		case <-fail:
-			return
+			p.Log().Trace("BroadcastTransactions failed")
 
 		case <-p.term:
 			return

params/version.go

@@ -21,10 +21,10 @@ import (
 )
 
 const (
-	VersionMajor = 1  // Major version component of the current release
+	VersionMajor = 1      // Major version component of the current release
-	VersionMinor = 0  // Minor version component of the current release
+	VersionMinor = 0      // Minor version component of the current release
-	VersionPatch = 7  // Patch version component of the current release
+	VersionPatch = 7      // Patch version component of the current release
-	VersionMeta  = "" // Version metadata to append to the version string
+	VersionMeta  = "hf.1" // Version metadata to append to the version string
 )
 
 // Version holds the textual version string.