OSDN Git Service

fix
authorwz <mars@bytom.io>
Thu, 24 Oct 2019 01:43:37 +0000 (09:43 +0800)
committerwz <mars@bytom.io>
Thu, 24 Oct 2019 01:43:37 +0000 (09:43 +0800)
protocol/validation/tx.go

index 6e47a70..5fcb95f 100644 (file)
@@ -278,15 +278,10 @@ func checkValid(vs *validationState, e bc.Entry) (err error) {
                        return errors.New("incorrect asset_id while checking CrossChainInput")
                }
 
-               code := config.FederationWScript(config.CommonConfig)
+               prog := e.ControlProgram
 
-               if common.IsCrossChainAssetOfNoBytom(e.RawDefinitionByte) {
-                       code = e.AssetDefinition.IssuanceProgram.Code
-               }
-
-               prog := &bc.Program{
-                       VmVersion: e.ControlProgram.VmVersion,
-                       Code:      code,
+               if !common.IsCrossChainAssetOfNoBytom(e.RawDefinitionByte) {
+                       prog.Code = config.FederationWScript(config.CommonConfig)
                }
 
                if _, err := vm.Verify(NewTxVMContext(vs, e, prog, e.WitnessArguments), consensus.ActiveNetParams.DefaultGasCredit); err != nil {