Merge pull request #921 from multiversx/merge-vm-andromeda

Merge vm andromeda

Author: sasurobert

mock/contracts/transferAndExecuteSC.go

@@ -1,6 +1,7 @@
 package contracts
 
 import (
+	"encoding/hex"
 	"fmt"
 	"math/big"
 
@@ -64,6 +65,27 @@ func TransferEGLDToParent(instanceMock *mock.InstanceMock, config interface{}) {
 	})
 }
 
+func TransferAndExecuteWithBuiltIn(instanceMock *mock.InstanceMock, config interface{}) {
+	instanceMock.AddMockMethod("transferAndExecuteWithBuiltIn", func() *mock.InstanceMock {
+		testConfig := config.(*test.TestConfig)
+		host := instanceMock.Host
+		instance := mock.GetMockInstance(host)
+
+		_ = host.Metering().UseGasBounded(testConfig.GasUsedByChild)
+
+		transferString := "ESDTTransfer@" + hex.EncodeToString([]byte("XYY-ABCDEF")) + "@" + hex.EncodeToString(big.NewInt(100000).Bytes())
+		vmhooks.TransferValueExecuteWithTypedArgs(host,
+			test.UserAddress,
+			big.NewInt(0),
+			1,
+			[]byte(transferString),
+			[][]byte{},
+		)
+
+		return instance
+	})
+}
+
 // GetChildAddressForTransfer -
 func GetChildAddressForTransfer(transfer int) []byte {
 	return testcommon.MakeTestSCAddress(fmt.Sprintf("childSC-%d", transfer))

vmhost/flags.go

@@ -11,4 +11,7 @@ const (
 
 	// UseGasBoundedShouldFailExecutionFlag defines the flag that activates failing of execution if gas bounded check fails
 	UseGasBoundedShouldFailExecutionFlag core.EnableEpochFlag = "UseGasBoundedShouldFailExecutionFlag"
+
+	// CheckBuiltInCallOnTransferValueAndFailExecutionFlag defines the flag that activates failing of execution if gas bounded check fails
+	CheckBuiltInCallOnTransferValueAndFailExecutionFlag core.EnableEpochFlag = "CheckBuiltInCallOnTransferValueAndFailExecutionFlag"
 )

vmhost/hostCore/host.go

@@ -42,6 +42,7 @@ var allFlags = []core.EnableEpochFlag{
 	vmhost.CryptoOpcodesV2Flag,
 	vmhost.MultiESDTNFTTransferAndExecuteByUserFlag,
 	vmhost.UseGasBoundedShouldFailExecutionFlag,
+	vmhost.CheckBuiltInCallOnTransferValueAndFailExecutionFlag,
 }
 
 // vmHost implements HostContext interface.

vmhost/hosttest/execution_gas_test.go

@@ -174,6 +174,36 @@ func TestGasUsed_SingleContract_TransferFromChild(t *testing.T) {
 	assert.Nil(t, err)
 }
 
+func TestGasUsed_SingleContract_TransferFromChildWithBuiltIn(t *testing.T) {
+	testConfig := makeTestConfig()
+
+	_, err := test.BuildMockInstanceCallTest(t).
+		WithContracts(
+			test.CreateMockContract(test.ParentAddress).
+				WithBalance(testConfig.ParentBalance).
+				WithCodeMetadata([]byte{0, vmcommon.MetadataPayable}).
+				WithConfig(testConfig).
+				WithMethods(contracts.ExecOnDestCtxSingleCallParentMock),
+			test.CreateMockContract(test.ChildAddress).
+				WithBalance(testConfig.ChildBalance).
+				WithConfig(testConfig).
+				WithMethods(contracts.TransferAndExecuteWithBuiltIn)).
+		WithInput(test.CreateTestContractCallInputBuilder().
+			WithRecipientAddr(test.ParentAddress).
+			WithGasProvided(testConfig.GasProvided).
+			WithFunction("execOnDestCtxSingleCall").
+			WithArguments(test.ChildAddress, []byte("transferAndExecuteWithBuiltIn")).
+			Build()).
+		WithSetup(func(host vmhost.VMHost, world *worldmock.MockWorld) {
+			createMockBuiltinFunctions(t, host, world)
+			setZeroCodeCosts(host)
+		}).
+		AndAssertResults(func(world *worldmock.MockWorld, verify *test.VMOutputVerifier) {
+			verify.ReturnCode(vmcommon.ExecutionFailed)
+		})
+	assert.Nil(t, err)
+}
+
 func TestGasUsed_ExecuteOnDestChain(t *testing.T) {
 	alphaAddress := test.MakeTestSCAddress("alpha")
 	betaAddress := test.MakeTestSCAddress("beta")

vmhost/vmhooks/baseOps.go

@@ -841,6 +841,18 @@ func TransferValueExecuteWithTypedArgs(
 		}
 	}
 
+	data := ""
+	if contractCallInput != nil {
+		data = makeCrossShardCallFromInput(contractCallInput.Function, contractCallInput.Arguments)
+	}
+
+	lastRound := host.Blockchain().LastRound()
+	if host.IsBuiltinFunctionCall([]byte(data)) &&
+		lastRound >= uint64(host.EnableEpochsHandler().GetActivationEpoch(vmhost.CheckBuiltInCallOnTransferValueAndFailExecutionFlag)) {
+		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 +866,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