X-Git-Url: http://git.osdn.net/view?p=bytom%2Fvapor.git;a=blobdiff_plain;f=api%2Ftransact.go;h=26719d3174a4c3756bb95e9576d6dc85593373e3;hp=4a6c17c2ecd89dcfe2aa66740a9f6638579686bf;hb=1337be95f74a1d2a1a7316737efde413f29bcb2f;hpb=322bc6bcd6f842719322930e7589963dd823615a

diff --git a/api/transact.go b/api/transact.go
index 4a6c17c2..26719d31 100644
--- a/api/transact.go
+++ b/api/transact.go
@@ -8,12 +8,11 @@ import (
 
 	log "github.com/sirupsen/logrus"
 
-	"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"
+	"github.com/bytom/vapor/account"
+	"github.com/bytom/vapor/blockchain/txbuilder"
+	"github.com/bytom/vapor/errors"
+	"github.com/bytom/vapor/protocol/bc"
+	"github.com/bytom/vapor/protocol/bc/types"
 )
 
 var (
@@ -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,
-		"retire":                       txbuilder.DecodeRetireAction,
 		"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)
 	}