From: HAOYUatHZ <haoyu@protonmail.com>
Date: Tue, 18 Jun 2019 07:32:54 +0000 (+0800)
Subject: add output
X-Git-Url: http://git.osdn.net/view?p=bytom%2Fvapor.git;a=commitdiff_plain;h=1a605d9eaf646c150b793908180833165468fe5f

add output
---

diff --git a/federation/warder.go b/federation/warder.go
index e9ec41db..82b4498b 100644
--- a/federation/warder.go
+++ b/federation/warder.go
@@ -173,7 +173,6 @@ func (w *warder) proposeDestTx(tx *orm.CrossTransaction) (interface{}, string, e
 // addInputWitness(tx, signInsts)?
 func (w *warder) buildSidechainTx(ormTx *orm.CrossTransaction) (*vaporTypes.Tx, string, error) {
 	destTxData := &vaporTypes.TxData{Version: 1, TimeRange: 0}
-	// signInsts := []*SigningInstruction{}
 	muxID := &vaporBc.Hash{}
 	if err := muxID.UnmarshalText([]byte(ormTx.SourceMuxID)); err != nil {
 		return nil, "", errors.Wrap(err, "Unmarshal muxID")
@@ -198,7 +197,13 @@ func (w *warder) buildSidechainTx(ormTx *orm.CrossTransaction) (*vaporTypes.Tx,
 
 		input := vaporTypes.NewCrossChainInput(nil, *muxID, *assetID, req.AssetAmount, req.SourcePos, w.fedProg, rawDefinitionByte)
 		destTxData.Inputs = append(destTxData.Inputs, input)
-		output := vaporTypes.NewIntraChainOutput(*assetID, req.AssetAmount, nil)
+
+		controlProgram, err := hex.DecodeString(req.Script)
+		if err != nil {
+			return nil, "", errors.Wrap(err, "decode req.Script")
+		}
+
+		output := vaporTypes.NewIntraChainOutput(*assetID, req.AssetAmount, controlProgram)
 		destTxData.Outputs = append(destTxData.Outputs, output)
 	}