fix check assetID

diff --git a/blockchain/txbuilder/actions.go b/blockchain/txbuilder/actions.go
index 8c83936..6f4f004 100644 (file)
--- a/blockchain/txbuilder/actions.go
+++ b/blockchain/txbuilder/actions.go
@@ -299,13 +299,9 @@ func (a *crossInAction) ActionType() string {
 }
 
 func (c *crossInAction) checkAssetID() error {
-       if *c.AssetId == *consensus.BTMAssetID {
-               return nil
-       }
-
        assetID := c.CrossChainAssetDefinition.ComputeAssetID()
 
-       if assetID != *c.AssetAmount.AssetId {
+       if *c.AssetId == *consensus.BTMAssetID && assetID != *c.AssetAmount.AssetId {
                return errors.New("incorrect asset_idincorrect asset_id")
        }
 

diff --git a/protocol/validation/tx.go b/protocol/validation/tx.go
index 86137ec..9dab243 100644 (file)
--- a/protocol/validation/tx.go
+++ b/protocol/validation/tx.go
@@ -251,7 +251,7 @@ func checkValid(vs *validationState, e bc.Entry) (err error) {
        case *bc.CrossChainInput:
                // check assetID
                assetID := e.AssetDefinition.ComputeAssetID()
-               if e.Value.AssetId != consensus.BTMAssetID && *e.Value.AssetId != assetID {
+               if *e.Value.AssetId != *consensus.BTMAssetID && *e.Value.AssetId != assetID {
                        return errors.New("incorrect asset_id while check CrossChainInput")
                }