feat(warder): add warder backbone (#181)

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

diff --git a/wallet/annotated.go b/wallet/annotated.go
index 5696e34..746ac5a 100644 (file)
--- a/wallet/annotated.go
+++ b/wallet/annotated.go
@@ -16,7 +16,6 @@ import (
        dbm "github.com/vapor/database/leveldb"
        "github.com/vapor/protocol/bc"
        "github.com/vapor/protocol/bc/types"
-       "github.com/vapor/protocol/vm/vmutil"
 )
 
 // annotateTxs adds asset data to transactions
@@ -34,6 +33,7 @@ func annotateTxsAsset(w *Wallet, txs []*query.AnnotatedTx) {
 }
 
 func (w *Wallet) getExternalDefinition(assetID *bc.AssetID) json.RawMessage {
+       // definitionByte := w.DB.Get(asset.ExtAssetKey(assetID))
        definitionByte := w.DB.Get(asset.ExtAssetKey(assetID))
        if definitionByte == nil {
                return nil
@@ -175,10 +175,20 @@ func (w *Wallet) BuildAnnotatedInput(tx *types.Tx, i uint32) *query.AnnotatedInp
        in.InputID = id
        e := tx.Entries[id]
        switch e := e.(type) {
+       case *bc.VetoInput:
+               in.Type = "veto"
+               in.ControlProgram = orig.ControlProgram()
+               in.Address = w.getAddressFromControlProgram(in.ControlProgram, false)
+               in.SpentOutputID = e.SpentOutputId
+               arguments := orig.Arguments()
+               for _, arg := range arguments {
+                       in.WitnessArguments = append(in.WitnessArguments, arg)
+               }
+
        case *bc.CrossChainInput:
                in.Type = "cross_chain_in"
                in.ControlProgram = orig.ControlProgram()
-               in.Address = w.getAddressFromControlProgram(in.ControlProgram)
+               in.Address = w.getAddressFromControlProgram(in.ControlProgram, true)
                in.SpentOutputID = e.MainchainOutputId
                arguments := orig.Arguments()
                for _, arg := range arguments {
@@ -188,7 +198,7 @@ func (w *Wallet) BuildAnnotatedInput(tx *types.Tx, i uint32) *query.AnnotatedInp
        case *bc.Spend:
                in.Type = "spend"
                in.ControlProgram = orig.ControlProgram()
-               in.Address = w.getAddressFromControlProgram(in.ControlProgram)
+               in.Address = w.getAddressFromControlProgram(in.ControlProgram, false)
                in.SpentOutputID = e.SpentOutputId
                arguments := orig.Arguments()
                for _, arg := range arguments {
@@ -202,22 +212,27 @@ func (w *Wallet) BuildAnnotatedInput(tx *types.Tx, i uint32) *query.AnnotatedInp
        return in
 }
 
-func (w *Wallet) getAddressFromControlProgram(prog []byte) string {
+func (w *Wallet) getAddressFromControlProgram(prog []byte, isMainchain bool) string {
+       netParams := &consensus.ActiveNetParams
+       if isMainchain {
+               netParams = &consensus.MainNetParams
+       }
+
        if segwit.IsP2WPKHScript(prog) {
                if pubHash, err := segwit.GetHashFromStandardProg(prog); err == nil {
-                       return buildP2PKHAddress(pubHash)
+                       return buildP2PKHAddress(pubHash, netParams)
                }
        } else if segwit.IsP2WSHScript(prog) {
                if scriptHash, err := segwit.GetHashFromStandardProg(prog); err == nil {
-                       return buildP2SHAddress(scriptHash)
+                       return buildP2SHAddress(scriptHash, netParams)
                }
        }
 
        return ""
 }
 
-func buildP2PKHAddress(pubHash []byte) string {
-       address, err := common.NewAddressWitnessPubKeyHash(pubHash, &consensus.ActiveNetParams)
+func buildP2PKHAddress(pubHash []byte, netParams *consensus.Params) string {
+       address, err := common.NewAddressWitnessPubKeyHash(pubHash, netParams)
        if err != nil {
                return ""
        }
@@ -225,8 +240,8 @@ func buildP2PKHAddress(pubHash []byte) string {
        return address.EncodeAddress()
 }
 
-func buildP2SHAddress(scriptHash []byte) string {
-       address, err := common.NewAddressWitnessScriptHash(scriptHash, &consensus.ActiveNetParams)
+func buildP2SHAddress(scriptHash []byte, netParams *consensus.Params) string {
+       address, err := common.NewAddressWitnessScriptHash(scriptHash, netParams)
        if err != nil {
                return ""
        }
@@ -245,13 +260,24 @@ func (w *Wallet) BuildAnnotatedOutput(tx *types.Tx, idx int) *query.AnnotatedOut
                AssetDefinition: &emptyJSONObject,
                Amount:          orig.AssetAmount().Amount,
                ControlProgram:  orig.ControlProgram(),
-               Address:         w.getAddressFromControlProgram(orig.ControlProgram()),
        }
 
-       if vmutil.IsUnspendable(out.ControlProgram) {
-               out.Type = "retire"
-       } else {
+       var isMainchainAddress bool
+       switch e := tx.Entries[*outid].(type) {
+       case *bc.IntraChainOutput:
                out.Type = "control"
+               isMainchainAddress = false
+
+       case *bc.CrossChainOutput:
+               out.Type = "cross_chain_out"
+               isMainchainAddress = true
+
+       case *bc.VoteOutput:
+               out.Type = "vote"
+               out.Vote = e.Vote
+               isMainchainAddress = false
        }
+
+       out.Address = w.getAddressFromControlProgram(orig.ControlProgram(), isMainchainAddress)
        return out
 }