X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=protocol%2Fbc%2Fcrosschain_input.go;h=08a7cc76a043f6acf6549ad01379771a3a9b64bc;hb=HEAD;hp=0ce867d890711a33b957f65931267452bca7fbaf;hpb=6bf0548429896ef136792b04c6dc21dfe95de016;p=bytom%2Fvapor.git diff --git a/protocol/bc/crosschain_input.go b/protocol/bc/crosschain_input.go index 0ce867d8..08a7cc76 100644 --- 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, } }