merge

diff --cc api/transact.go
index 14135bf,350ed85..12fd72e
--- 1/api/transact.go
--- 2/api/transact.go
+++ b/api/transact.go
@@@ -25,11 -25,12 +25,13 @@@ func (a *API) actionDecoder(action stri
        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":               a.wallet.AssetReg.DecodeCrossInAction,
                "spend_account":                a.wallet.AccountMgr.DecodeSpendAction,
                "spend_account_unspent_output": a.wallet.AccountMgr.DecodeSpendUTXOAction,
+               "unvote":                       a.wallet.AccountMgr.DecodeUnvoteAction,
        }
        decoder, ok := decoders[action]
        return decoder, ok