update GetControlProgram

diff --git a/database/wallet_store.go b/database/wallet_store.go
index cbc9434..16f4fcc 100644 (file)
--- a/database/wallet_store.go
+++ b/database/wallet_store.go
@@ -6,6 +6,7 @@ import (
        "fmt"
        "sort"
 
+       acc "github.com/vapor/account"
        "github.com/vapor/asset"
        "github.com/vapor/blockchain/query"
        "github.com/vapor/blockchain/signers"
@@ -219,23 +220,17 @@ func (store *WalletStore) SetAssetDefinition(assetID *bc.AssetID, definition []b
        }
 }
 
-// // GetRawProgram get raw program by hash
-// func (store *WalletStore) GetRawProgram(hash common.Hash) ([]byte, error) {
-//     rawProgram := store.walletDB.Get(ContractKey(hash))
-//     if rawProgram == nil {
-//             return nil, fmt.Errorf("failed get account control program:%x ", hash)
-//     }
-
-//     accountCP := new(account.CtrlProgram)
-//     if err := json.Unmarshal(rawProgram, &accountCP); err != nil {
-//             return nil, err
-//     }
-//     return accountCP, nil
-// }
-
-// GetRawProgram get raw program by hash
-func (store *WalletStore) GetRawProgram(hash common.Hash) []byte {
-       return store.walletDB.Get(ContractKey(hash))
+// GetControlProgram get raw program by hash
+func (store *WalletStore) GetControlProgram(hash common.Hash) (*acc.CtrlProgram, error) {
+       rawProgram := store.walletDB.Get(ContractKey(hash))
+       if rawProgram == nil {
+               return nil, fmt.Errorf("failed get account control program:%x ", hash)
+       }
+       accountCP := new(acc.CtrlProgram)
+       if err := json.Unmarshal(rawProgram, &accountCP); err != nil {
+               return nil, err
+       }
+       return accountCP, nil
 }
 
 // GetAccountByAccountID get account value by account ID

diff --git a/wallet/annotated.go b/wallet/annotated.go
index f8ab494..b146e4a 100644 (file)
--- a/wallet/annotated.go
+++ b/wallet/annotated.go
@@ -98,18 +98,16 @@ func annotateTxsAccount(txs []*query.AnnotatedTx, store WalletStorer) {
 
 func getAccountFromACP(program []byte, store WalletStorer) (*account.Account, error) {
        var hash common.Hash
-       accountCP := account.CtrlProgram{}
        localAccount := account.Account{}
 
        sha3pool.Sum256(hash[:], program)
-       rawProgram := store.GetRawProgram(hash)
-       if rawProgram == nil {
-               return nil, fmt.Errorf("failed get account control program:%x ", hash)
-       }
-
-       if err := json.Unmarshal(rawProgram, &accountCP); err != nil {
+       accountCP, err := store.GetControlProgram(hash)
+       if err != nil {
                return nil, err
        }
+       if accountCP == nil {
+               return nil, fmt.Errorf("failed get account control program:%x ", hash)
+       }
 
        accountValue := store.GetAccountByAccountID(accountCP.AccountID)
        if accountValue == nil {

diff --git a/wallet/indexer.go b/wallet/indexer.go
index f44128b..139f8c4 100644 (file)
--- a/wallet/indexer.go
+++ b/wallet/indexer.go
@@ -105,7 +105,12 @@ transactionLoop:
                        var hash [32]byte
                        sha3pool.Sum256(hash[:], v.ControlProgram())
 
-                       if bytes := w.store.GetRawProgram(hash); bytes != nil {
+                       cp, err := w.store.GetControlProgram(hash)
+                       if err != nil {
+                               log.WithFields(log.Fields{"module": logModule, "err": err, "hash": string(hash[:])}).Error("filterAccountTxs fail.")
+                               continue
+                       }
+                       if cp != nil {
                                annotatedTxs = append(annotatedTxs, w.buildAnnotatedTransaction(tx, b, statusFail, pos))
                                continue transactionLoop
                        }

diff --git a/wallet/store.go b/wallet/store.go
index 536e91a..e600c13 100644 (file)
--- a/wallet/store.go
+++ b/wallet/store.go
@@ -1,6 +1,7 @@
 package wallet
 
 import (
+       acc "github.com/vapor/account"
        "github.com/vapor/asset"
        "github.com/vapor/blockchain/query"
        "github.com/vapor/common"
@@ -13,7 +14,7 @@ type WalletStorer interface {
        CommitBatch()
        GetAssetDefinition(*bc.AssetID) (*asset.Asset, error)
        SetAssetDefinition(*bc.AssetID, []byte)
-       GetRawProgram(common.Hash) []byte
+       GetControlProgram(hash common.Hash) (*acc.CtrlProgram, error)
        GetAccountByAccountID(string) []byte
        DeleteTransactions(uint64)
        SetTransaction(uint64, uint32, string, []byte)

diff --git a/wallet/unconfirmed.go b/wallet/unconfirmed.go
index f860894..72b1dd2 100644 (file)
--- a/wallet/unconfirmed.go
+++ b/wallet/unconfirmed.go
@@ -107,7 +107,12 @@ func (w *Wallet) checkRelatedTransaction(tx *types.Tx) bool {
        for _, v := range tx.Outputs {
                var hash [32]byte
                sha3pool.Sum256(hash[:], v.ControlProgram())
-               if bytes := w.store.GetRawProgram(hash); bytes != nil {
+               cp, err := w.store.GetControlProgram(hash)
+               if err != nil {
+                       log.WithFields(log.Fields{"module": logModule, "err": err, "hash": string(hash[:])}).Error("checkRelatedTransaction fail.")
+                       continue
+               }
+               if cp != nil {
                        return true
                }
        }

diff --git a/wallet/utxo.go b/wallet/utxo.go
index 0dfec1c..b06e112 100644 (file)
--- a/wallet/utxo.go
+++ b/wallet/utxo.go
@@ -133,14 +133,12 @@ func (w *Wallet) filterAccountUtxo(utxos []*account.UTXO) []*account.UTXO {
 
                var hash [32]byte
                sha3pool.Sum256(hash[:], []byte(s))
-               data := w.store.GetRawProgram(hash)
-               if data == nil {
+               cp, err := w.store.GetControlProgram(hash)
+               if err != nil {
+                       log.WithFields(log.Fields{"module": logModule, "err": err}).Error("filterAccountUtxo fail.")
                        continue
                }
-
-               cp := &account.CtrlProgram{}
-               if err := json.Unmarshal(data, cp); err != nil {
-                       log.WithFields(log.Fields{"module": logModule, "err": err}).Error("filterAccountUtxo fail on unmarshal control program")
+               if cp == nil {
                        continue
                }