Merge pull request #2019 from bnb-chain/develop_lock_v1.3.3

CHANGELOG.md

@@ -1,4 +1,15 @@
 # Changelog
+## v1.3.3
+IMPROVEMENT
+* [\#2000](https://github.com/bnb-chain/bsc/pull/2000) cmd/utils: exit process if txlookuplimit flag is set
+
+BUGFIX
+* [\#1986](https://github.com/bnb-chain/bsc/pull/1986) fix(cmd): check pruneancient when creating db
+
+## v1.3.2
+BUGFIX
+fix: remove sharedPool
+
 ## v1.3.1
 FEATURE
 * [\#1881](https://github.com/bnb-chain/bsc/pull/1881) feat: active pbss

core/state_prefetcher.go

@@ -59,7 +59,9 @@ func (p *statePrefetcher) Prefetch(block *types.Block, statedb *state.StateDB, c
  for i := 0; i < prefetchThread; i++ {
  go func() {
  newStatedb := statedb.CopyDoPrefetch()
- newStatedb.EnableWriteOnSharedStorage()
+ if header.Number.Uint64() < 33968300 {
+ newStatedb.EnableWriteOnSharedStorage()
+ }
  gaspool := new(GasPool).AddGas(block.GasLimit())
  blockContext := NewEVMBlockContext(header, p.bc, nil)
  evm := vm.NewEVM(blockContext, vm.TxContext{}, statedb, p.config, *cfg)
@@ -106,7 +108,9 @@ func (p *statePrefetcher) PrefetchMining(txs TransactionsByPriceAndNonce, header
  go func(startCh <-chan *types.Transaction, stopCh <-chan struct{}) {
  idx := 0
  newStatedb := statedb.CopyDoPrefetch()
- newStatedb.EnableWriteOnSharedStorage()
+ if header.Number.Uint64() < 33968300 {
+ newStatedb.EnableWriteOnSharedStorage()
+ }
  gaspool := new(GasPool).AddGas(gasLimit)
  blockContext := NewEVMBlockContext(header, p.bc, nil)
  evm := vm.NewEVM(blockContext, vm.TxContext{}, statedb, p.config, cfg)

params/version.go

@@ -23,7 +23,7 @@ import (
 const (
  VersionMajor = 1 // Major version component of the current release
  VersionMinor = 3 // Minor version component of the current release
- VersionPatch = 1 // Patch version component of the current release
+ VersionPatch = 3 // Patch version component of the current release
  VersionMeta = "" // Version metadata to append to the version string
 )