vm ops

Author: sasurobert

vmhost/vmhooks/baseOps.go

@@ -841,6 +841,16 @@ func TransferValueExecuteWithTypedArgs(
 		}
 	}
 
+	data := ""
+	if contractCallInput != nil {
+		data = makeCrossShardCallFromInput(contractCallInput.Function, contractCallInput.Arguments)
+	}
+
+	if host.IsBuiltinFunctionCall([]byte(data)) {
+		WithFaultAndHost(host, vmhost.ErrTransferValueOnESDTCall, runtime.BaseOpsErrorShouldFailExecution())
+		return 1
+	}
+
 	if host.AreInSameShard(sender, dest) && contractCallInput != nil && host.Blockchain().IsSmartContract(dest) {
 		logEEI.Trace("eGLD pre-transfer execution begin")
 		vmOutput, err := executeOnDestContextFromAPI(host, contractCallInput)
@@ -854,11 +864,6 @@ func TransferValueExecuteWithTypedArgs(
 		return 0
 	}
 
-	data := ""
-	if contractCallInput != nil {
-		data = makeCrossShardCallFromInput(contractCallInput.Function, contractCallInput.Arguments)
-	}
-
 	err = metering.UseGasBounded(uint64(gasLimit))
 	if WithFaultAndHost(host, err, runtime.UseGasBoundedShouldFailExecution()) {
 		return 1