modify import path (#1805)

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

diff --git a/wallet/annotated.go b/wallet/annotated.go
index 27c3bfe..536ff0b 100644 (file)
--- a/wallet/annotated.go
+++ b/wallet/annotated.go
@@ -5,19 +5,19 @@ import (
        "fmt"
 
        log "github.com/sirupsen/logrus"
-       "github.com/tendermint/tmlibs/db"
-
-       "github.com/bytom/account"
-       "github.com/bytom/asset"
-       "github.com/bytom/blockchain/query"
-       "github.com/bytom/blockchain/signers"
-       "github.com/bytom/common"
-       "github.com/bytom/consensus"
-       "github.com/bytom/consensus/segwit"
-       "github.com/bytom/crypto/sha3pool"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/protocol/vm/vmutil"
+
+       "github.com/bytom/bytom/account"
+       "github.com/bytom/bytom/asset"
+       "github.com/bytom/bytom/blockchain/query"
+       "github.com/bytom/bytom/blockchain/signers"
+       "github.com/bytom/bytom/common"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/consensus/segwit"
+       "github.com/bytom/bytom/crypto/sha3pool"
+       dbm "github.com/bytom/bytom/database/leveldb"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/vm/vmutil"
 )
 
 // annotateTxs adds asset data to transactions
@@ -55,7 +55,7 @@ func (w *Wallet) getExternalDefinition(assetID *bc.AssetID) json.RawMessage {
        }
 
        if err := w.AssetReg.SaveAsset(externalAsset, alias); err != nil {
-               log.WithFields(log.Fields{"err": err, "assetID": alias}).Warning("fail on save external asset to internal asset DB")
+               log.WithFields(log.Fields{"module": logModule, "err": err, "assetID": alias}).Warning("fail on save external asset to internal asset DB")
        }
        return definitionByte
 }
@@ -85,14 +85,14 @@ func (w *Wallet) getAliasDefinition(assetID bc.AssetID) (string, json.RawMessage
 }
 
 // annotateTxs adds account data to transactions
-func annotateTxsAccount(txs []*query.AnnotatedTx, walletDB db.DB) {
+func annotateTxsAccount(txs []*query.AnnotatedTx, walletDB dbm.DB) {
        for i, tx := range txs {
                for j, input := range tx.Inputs {
                        //issue asset tx input SpentOutputID is nil
                        if input.SpentOutputID == nil {
                                continue
                        }
-                       localAccount, err := getAccountFromUTXO(*input.SpentOutputID, walletDB)
+                       localAccount, err := getAccountFromACP(input.ControlProgram, walletDB)
                        if localAccount == nil || err != nil {
                                continue
                        }
@@ -110,31 +110,7 @@ func annotateTxsAccount(txs []*query.AnnotatedTx, walletDB db.DB) {
        }
 }
 
-func getAccountFromUTXO(outputID bc.Hash, walletDB db.DB) (*account.Account, error) {
-       accountUTXO := account.UTXO{}
-       localAccount := account.Account{}
-
-       accountUTXOValue := walletDB.Get(account.StandardUTXOKey(outputID))
-       if accountUTXOValue == nil {
-               return nil, fmt.Errorf("failed get account utxo:%x ", outputID)
-       }
-
-       if err := json.Unmarshal(accountUTXOValue, &accountUTXO); err != nil {
-               return nil, err
-       }
-
-       accountValue := walletDB.Get(account.Key(accountUTXO.AccountID))
-       if accountValue == nil {
-               return nil, fmt.Errorf("failed get account:%s ", accountUTXO.AccountID)
-       }
-       if err := json.Unmarshal(accountValue, &localAccount); err != nil {
-               return nil, err
-       }
-
-       return &localAccount, nil
-}
-
-func getAccountFromACP(program []byte, walletDB db.DB) (*account.Account, error) {
+func getAccountFromACP(program []byte, walletDB dbm.DB) (*account.Account, error) {
        var hash common.Hash
        accountCP := account.CtrlProgram{}
        localAccount := account.Account{}
@@ -201,9 +177,11 @@ func (w *Wallet) BuildAnnotatedInput(tx *types.Tx, i uint32) *query.AnnotatedInp
        if orig.InputType() != types.CoinbaseInputType {
                in.AssetID = orig.AssetID()
                in.Amount = orig.Amount()
+               in.SignData = tx.SigHash(i)
        }
 
        id := tx.Tx.InputIDs[i]
+       in.InputID = id
        e := tx.Entries[id]
        switch e := e.(type) {
        case *bc.Spend:
@@ -211,9 +189,21 @@ func (w *Wallet) BuildAnnotatedInput(tx *types.Tx, i uint32) *query.AnnotatedInp
                in.ControlProgram = orig.ControlProgram()
                in.Address = w.getAddressFromControlProgram(in.ControlProgram)
                in.SpentOutputID = e.SpentOutputId
+               arguments := orig.Arguments()
+               for _, arg := range arguments {
+                       in.WitnessArguments = append(in.WitnessArguments, arg)
+               }
        case *bc.Issuance:
                in.Type = "issue"
                in.IssuanceProgram = orig.IssuanceProgram()
+               arguments := orig.Arguments()
+               for _, arg := range arguments {
+                       in.WitnessArguments = append(in.WitnessArguments, arg)
+               }
+               if assetDefinition := orig.AssetDefinition(); isValidJSON(assetDefinition) {
+                       assetDefinition := json.RawMessage(assetDefinition)
+                       in.AssetDefinition = &assetDefinition
+               }
        case *bc.Coinbase:
                in.Type = "coinbase"
                in.Arbitrary = e.Arbitrary