fix the bug (#372)

[bytom/vapor.git] / api / transact.go

diff --git a/api/transact.go b/api/transact.go
index 87a75e2..67d4429 100644 (file)
--- a/api/transact.go
+++ b/api/transact.go
@@ -11,7 +11,6 @@ import (
        "github.com/vapor/account"
        "github.com/vapor/blockchain/txbuilder"
        "github.com/vapor/errors"
-       "github.com/vapor/net/http/reqid"
        "github.com/vapor/protocol/bc"
        "github.com/vapor/protocol/bc/types"
 )
@@ -25,10 +24,13 @@ func (a *API) actionDecoder(action string) (func([]byte) (txbuilder.Action, erro
        decoders := map[string]func([]byte) (txbuilder.Action, error){
                "control_address":              txbuilder.DecodeControlAddressAction,
                "control_program":              txbuilder.DecodeControlProgramAction,
-               "issue":                        a.wallet.AssetReg.DecodeIssueAction,
+               "cross_chain_out":              txbuilder.DecodeCrossOutAction,
+               "vote_output":                  txbuilder.DecodeVoteOutputAction,
                "retire":                       txbuilder.DecodeRetireAction,
+               "cross_chain_in":               txbuilder.DecodeCrossInAction,
                "spend_account":                a.wallet.AccountMgr.DecodeSpendAction,
                "spend_account_unspent_output": a.wallet.AccountMgr.DecodeSpendUTXOAction,
+               "veto":                         a.wallet.AccountMgr.DecodeVetoAction,
        }
        decoder, ok := decoders[action]
        return decoder, ok
@@ -86,8 +88,7 @@ func (a *API) buildSingle(ctx context.Context, req *BuildRequest) (*txbuilder.Te
 
 // POST /build-transaction
 func (a *API) build(ctx context.Context, buildReqs *BuildRequest) Response {
-       subctx := reqid.NewSubContext(ctx, reqid.New())
-       tmpl, err := a.buildSingle(subctx, buildReqs)
+       tmpl, err := a.buildSingle(ctx, buildReqs)
        if err != nil {
                return NewErrorResponse(err)
        }
@@ -175,8 +176,7 @@ func (a *API) buildTxs(ctx context.Context, req *BuildRequest) ([]*txbuilder.Tem
 
 // POST /build-chain-transactions
 func (a *API) buildChainTxs(ctx context.Context, buildReqs *BuildRequest) Response {
-       subctx := reqid.NewSubContext(ctx, reqid.New())
-       tmpls, err := a.buildTxs(subctx, buildReqs)
+       tmpls, err := a.buildTxs(ctx, buildReqs)
        if err != nil {
                return NewErrorResponse(err)
        }