X-Git-Url: http://git.osdn.net/view?p=bytom%2Fvapor.git;a=blobdiff_plain;f=api%2Fcliam_transact.go;h=b6dc44940c260f836170a3a05b92dfd9a51ccda3;hp=c19fce09be9f7815c736abd41d172d918be50c5e;hb=ddc7106558f020bde24cc337d51649611dddaba8;hpb=7d76d575f5101652fba26714b1b6b6523220e126

diff --git a/api/cliam_transact.go b/api/cliam_transact.go
index c19fce09..b6dc4494 100644
--- a/api/cliam_transact.go
+++ b/api/cliam_transact.go
@@ -147,12 +147,11 @@ func (a *API) createRawPegin(ctx context.Context, ins struct {
 	// 用输出作为交易输入 生成新的交易
 	builder := txbuilder.NewBuilder(time.Now())
 	// TODO 根据raw tx生成一个utxo
-	//txInput := types.NewClaimInputInput(nil, *ins.RawTx.Outputs[nOut].AssetId, ins.RawTx.Outputs[nOut].Amount, cp.ControlProgram)
 	sourceID := *ins.RawTx.OutputID(nOut)
 	outputAccount := ins.RawTx.Outputs[nOut].Amount
 	assetID := *ins.RawTx.Outputs[nOut].AssetId
 
-	txInput := types.NewClaimInputInput(nil, sourceID, assetID, outputAccount, uint64(nOut), cp.ControlProgram)
+	txInput := types.NewClaimInput(nil, sourceID, assetID, outputAccount, uint64(nOut), cp.ControlProgram)
 	if err := builder.AddInput(txInput, &txbuilder.SigningInstruction{}); err != nil {
 		return nil, err
 	}
@@ -318,13 +317,12 @@ func (a *API) createContractRawPegin(ctx context.Context, ins struct {
 	// 用输出作为交易输入 生成新的交易
 	builder := txbuilder.NewBuilder(time.Now())
 	// TODO 根据raw tx生成一个utxo
-	//txInput := types.NewClaimInputInput(nil, *ins.RawTx.Outputs[nOut].AssetId, ins.RawTx.Outputs[nOut].Amount, cp.ControlProgram)
 
 	sourceID := *ins.RawTx.OutputID(nOut)
 	outputAccount := ins.RawTx.Outputs[nOut].Amount
 	assetID := *ins.RawTx.Outputs[nOut].AssetId
 
-	txInput := types.NewClaimInputInput(nil, sourceID, assetID, outputAccount, uint64(nOut), cp.ControlProgram)
+	txInput := types.NewClaimInput(nil, sourceID, assetID, outputAccount, uint64(nOut), cp.ControlProgram)
 	if err := builder.AddInput(txInput, &txbuilder.SigningInstruction{}); err != nil {
 		return nil, err
 	}