optimise

[bytom/vapor.git] / wallet / annotated.go

diff --git a/wallet/annotated.go b/wallet/annotated.go
index f0beae1..2fb1adc 100644 (file)
--- a/wallet/annotated.go
+++ b/wallet/annotated.go
@@ -34,7 +34,7 @@ func annotateTxsAsset(w *Wallet, txs []*query.AnnotatedTx) {
 
 func (w *Wallet) getExternalDefinition(assetID *bc.AssetID) json.RawMessage {
        externalAsset, err := w.Store.GetAsset(assetID)
-       if err != nil {
+       if err != nil && err != ErrGetAsset {
                log.WithFields(log.Fields{"module": logModule, "err": err, "assetID": assetID.String()}).Info("fail on get asset definition.")
        }
        if externalAsset == nil {
@@ -192,11 +192,10 @@ func (w *Wallet) BuildAnnotatedInput(tx *types.Tx, i uint32) *query.AnnotatedInp
 }
 
 func (w *Wallet) getAddressFromControlProgram(prog []byte, isMainchain bool) string {
-       netParams := &consensus.ActiveNetParams
+       var netParams interface{}
+       netParams = &consensus.ActiveNetParams
        if isMainchain {
-               netParams := new(consensus.Params)
-               netParams.Name = btmConsensus.MainNetParams.Name
-               netParams.Bech32HRPSegwit = btmConsensus.MainNetParams.Bech32HRPSegwit
+               netParams = &btmConsensus.MainNetParams
        }
 
        if segwit.IsP2WPKHScript(prog) {
@@ -218,18 +217,16 @@ func BuildP2PKHAddress(pubHash []byte, netParams interface{}) string {
        case *consensus.Params:
                params := netParams.(*consensus.Params)
                address, err := common.NewAddressWitnessPubKeyHash(pubHash, params)
-               if err != nil {
-                       return ""
+               if err == nil {
+                       return address.EncodeAddress()
                }
-               return address.EncodeAddress()
 
        case *btmConsensus.Params:
                params := netParams.(*btmConsensus.Params)
                address, err := btmCommon.NewAddressWitnessPubKeyHash(pubHash, params)
-               if err != nil {
-                       return ""
+               if err == nil {
+                       return address.EncodeAddress()
                }
-               return address.EncodeAddress()
        }
        return ""
 }
@@ -240,18 +237,16 @@ func BuildP2SHAddress(scriptHash []byte, netParams interface{}) string {
        case *consensus.Params:
                params := netParams.(*consensus.Params)
                address, err := common.NewAddressWitnessScriptHash(scriptHash, params)
-               if err != nil {
-                       return ""
+               if err == nil {
+                       return address.EncodeAddress()
                }
-               return address.EncodeAddress()
 
        case *btmConsensus.Params:
                params := netParams.(*btmConsensus.Params)
                address, err := btmCommon.NewAddressWitnessScriptHash(scriptHash, params)
-               if err != nil {
-                       return ""
+               if err == nil {
+                       return address.EncodeAddress()
                }
-               return address.EncodeAddress()
        }
        return ""
 }