Test crossin (#213)

[bytom/vapor.git] / blockchain / txbuilder / actions.go

diff --git a/blockchain/txbuilder/actions.go b/blockchain/txbuilder/actions.go
index f06c3ed..e7320f5 100644 (file)
--- a/blockchain/txbuilder/actions.go
+++ b/blockchain/txbuilder/actions.go
@@ -262,11 +262,11 @@ func DecodeCrossInAction(data []byte) (Action, error) {
 
 type crossInAction struct {
        bc.AssetAmount
-       SourceID          bc.Hash `json:"source_id"`
-       SourcePos         uint64  `json:"source_pos"`
-       VMVersion         uint64  `json:"vm_version"`
-       RawDefinitionByte []byte  `json:"raw_definition_byte"`
-       IssuanceProgram   []byte  `json:"issuance_program"`
+       SourceID          bc.Hash       `json:"source_id"`
+       SourcePos         uint64        `json:"source_pos"`
+       VMVersion         uint64        `json:"vm_version"`
+       RawDefinitionByte json.HexBytes `json:"raw_definition_byte"`
+       IssuanceProgram   json.HexBytes `json:"issuance_program"`
 }
 
 func (a *crossInAction) Build(ctx context.Context, builder *TemplateBuilder) error {
@@ -305,7 +305,7 @@ func (c *crossInAction) checkAssetID() error {
        defHash := bc.NewHash(sha3.Sum256(c.RawDefinitionByte))
        assetID := bc.ComputeAssetID(c.IssuanceProgram, c.VMVersion, &defHash)
 
-       if *c.AssetId == *consensus.BTMAssetID && assetID != *c.AssetAmount.AssetId {
+       if *c.AssetId != *consensus.BTMAssetID && assetID != *c.AssetAmount.AssetId {
                return errors.New("incorrect asset_idincorrect asset_id")
        }