Merge branch 'dev' into fix-tx-feed

diff --cc blockchain/txfeed/txfeed.go
index 6fabadc,eae4e05..b5fa5da
--- 1/blockchain/txfeed/txfeed.go
--- 2/blockchain/txfeed/txfeed.go
+++ b/blockchain/txfeed/txfeed.go
@@@ -282,16 -282,16 +282,16 @@@ func (t *Tracker) Delete(ctx context.Co
  func outputFilter(txfeed *TxFeed, value *query.AnnotatedOutput) bool {
        assetidstr := value.AssetID.String()
  
-       if 0 != strings.Compare(txfeed.Param.AssetID, assetidstr) && txfeed.Param.AssetID != "" {
 -      if txfeed.Param.assetID != assetidstr && txfeed.Param.assetID != "" {
++      if txfeed.Param.AssetID != assetidstr && txfeed.Param.AssetID != "" {
                return false
        }
-       if 0 != strings.Compare(txfeed.Param.TransType, value.Type) && txfeed.Param.TransType != "" {
 -      if txfeed.Param.transType != value.Type && txfeed.Param.transType != "" {
++      if txfeed.Param.TransType != value.Type && txfeed.Param.TransType != "" {
                return false
        }
 -      if txfeed.Param.amountLowerLimit > value.Amount && txfeed.Param.amountLowerLimit != 0 {
 +      if txfeed.Param.AmountLowerLimit > value.Amount && txfeed.Param.AmountLowerLimit != 0 {
                return false
        }
 -      if txfeed.Param.amountUpperLimit < value.Amount && txfeed.Param.amountUpperLimit != 0 {
 +      if txfeed.Param.AmountUpperLimit < value.Amount && txfeed.Param.AmountUpperLimit != 0 {
                return false
        }