V0.1 votetx utxo (#73)

[bytom/vapor.git] / account / builder.go

diff --git a/account/builder.go b/account/builder.go
index ca3c2da..d816056 100644 (file)
--- a/account/builder.go
+++ b/account/builder.go
@@ -122,7 +122,7 @@ func (m *Manager) buildBtmTxChain(utxos []*UTXO, signer *signers.Signer) ([]*txb
                }
 
                outAmount := buildAmount - chainTxMergeGas
-               output := types.NewTxOutput(*consensus.BTMAssetID, outAmount, acp.ControlProgram)
+               output := types.NewIntraChainOutput(*consensus.BTMAssetID, outAmount, acp.ControlProgram)
                if err := builder.AddOutput(output); err != nil {
                        return nil, nil, err
                }
@@ -132,7 +132,7 @@ func (m *Manager) buildBtmTxChain(utxos []*UTXO, signer *signers.Signer) ([]*txb
                        return nil, nil, err
                }
 
-               bcOut, err := tpl.Transaction.Output(*tpl.Transaction.ResultIds[0])
+               bcOut, err := tpl.Transaction.IntraChainOutput(*tpl.Transaction.ResultIds[0])
                if err != nil {
                        return nil, nil, err
                }
@@ -194,7 +194,7 @@ func SpendAccountChain(ctx context.Context, builder *txbuilder.TemplateBuilder,
        }
 
        if utxo.Amount > act.Amount {
-               if err = builder.AddOutput(types.NewTxOutput(*consensus.BTMAssetID, utxo.Amount-act.Amount, utxo.ControlProgram)); err != nil {
+               if err = builder.AddOutput(types.NewIntraChainOutput(*consensus.BTMAssetID, utxo.Amount-act.Amount, utxo.ControlProgram)); err != nil {
                        return nil, errors.Wrap(err, "adding change output")
                }
        }
@@ -244,7 +244,7 @@ func (a *spendAction) Build(ctx context.Context, b *txbuilder.TemplateBuilder) e
 
                // Don't insert the control program until callbacks are executed.
                a.accounts.insertControlProgramDelayed(b, acp)
-               if err = b.AddOutput(types.NewTxOutput(*a.AssetId, res.change, acp.ControlProgram)); err != nil {
+               if err = b.AddOutput(types.NewIntraChainOutput(*a.AssetId, res.change, acp.ControlProgram)); err != nil {
                        return errors.Wrap(err, "adding change output")
                }
        }