Merge branch 'dev' into bvm

diff --cc blockchain/pin/pin.go
Simple merge

diff --cc blockchain/pool.go
index 32ad2a1,514fa32..41e80df
--- 1/blockchain/pool.go
--- 2/blockchain/pool.go
+++ b/blockchain/pool.go
@@@ -5,10 -5,11 +5,10 @@@ import 
        "sync"
        "time"
  
 -      //      "github.com/blockchain/types"
        "github.com/bytom/protocol/bc/legacy"
+       log "github.com/sirupsen/logrus"
        . "github.com/tendermint/tmlibs/common"
        flow "github.com/tendermint/tmlibs/flowrate"
-       "github.com/tendermint/tmlibs/log"
  )
  
  const (

diff --cc node/node.go
Simple merge