versoin1.1.9 (#594)

[bytom/vapor.git] / protocol / bc / crosschain_input.go

diff --git a/protocol/bc/crosschain_input.go b/protocol/bc/crosschain_input.go
index 0ce867d..08a7cc7 100644 (file)
--- a/protocol/bc/crosschain_input.go
+++ b/protocol/bc/crosschain_input.go
@@ -9,6 +9,7 @@ func (CrossChainInput) typ() string { return "crosschaininput1" }
 
 func (cci *CrossChainInput) writeForHash(w io.Writer) {
        mustWriteForHash(w, cci.MainchainOutputId)
+       mustWriteForHash(w, cci.AssetDefinition)
 }
 
 // SetDestination will link the CrossChainInput to the output
@@ -21,10 +22,12 @@ func (cci *CrossChainInput) SetDestination(id *Hash, val *AssetAmount, pos uint6
 }
 
 // NewCrossChainInput creates a new CrossChainInput.
-func NewCrossChainInput(mainchainOutputID *Hash, value *AssetAmount, ordinal uint64) *CrossChainInput {
+func NewCrossChainInput(mainchainOutputID *Hash, prog *Program, ordinal uint64, assetDef *AssetDefinition, rawDefinitionByte []byte) *CrossChainInput {
        return &CrossChainInput{
                MainchainOutputId: mainchainOutputID,
-               Value:             value,
                Ordinal:           ordinal,
+               ControlProgram:    prog,
+               AssetDefinition:   assetDef,
+               RawDefinitionByte: rawDefinitionByte,
        }
 }