Merge remote-tracking branch 'zjb/monday-zjb' into dev

diff --cc blockchain/account/accounts.go
index a514965,5dcdc26..d208efd
--- 1/blockchain/account/accounts.go
--- 2/blockchain/account/accounts.go
+++ b/blockchain/account/accounts.go
@@@ -9,8 -9,7 +9,8 @@@ import 
        "time"
  
        "github.com/golang/groupcache/lru"
-       dbm "github.com/tendermint/tmlibs/db"
 +      log "github.com/sirupsen/logrus"
+       dbm "github.com/tendermint/tmlibs/db"
  
        "github.com/bytom/blockchain/pin"
        "github.com/bytom/blockchain/signers"

diff --cc blockchain/pin/pin.go
index c850e89,b30bccc..2db17af
--- 1/blockchain/pin/pin.go
--- 2/blockchain/pin/pin.go
+++ b/blockchain/pin/pin.go
@@@ -6,10 -6,10 +6,10 @@@ import 
        "sort"
        "sync"
  
-       dbm "github.com/tendermint/tmlibs/db"
 +      log "github.com/sirupsen/logrus"
+       dbm "github.com/tendermint/tmlibs/db"
  
        "github.com/bytom/errors"
 -      "github.com/bytom/log"
        "github.com/bytom/protocol"
        "github.com/bytom/protocol/bc/legacy"
  )

diff --cc cmd/bytomcli/main.go
Simple merge