Bug fix/sc cross built in call

go.mod

@@ -3,7 +3,7 @@ module github.com/ElrondNetwork/elrond-go
 go 1.13
 
 require (
-	github.com/ElrondNetwork/arwen-wasm-vm v0.3.25
+	github.com/ElrondNetwork/arwen-wasm-vm v0.3.26
 	github.com/ElrondNetwork/concurrent-map v0.1.2
 	github.com/ElrondNetwork/elrond-go-logger v1.0.4
 	github.com/ElrondNetwork/elrond-vm-common v0.1.21

go.sum

@@ -7,6 +7,8 @@ github.com/ElrondNetwork/arwen-wasm-vm v0.3.23 h1:Wzr9ZHnf+Tr2zZznrTHuNnI8rAUSHF
 github.com/ElrondNetwork/arwen-wasm-vm v0.3.23/go.mod h1:Ovb7xthI+3qjMiZHCF4IOnDIm2H6DOcdxYx3cOL2uLw=
 github.com/ElrondNetwork/arwen-wasm-vm v0.3.25 h1:TdfSkFHcRUxdD+5g/e9f2qe642EYiX72/HlwDh5lmEY=
 github.com/ElrondNetwork/arwen-wasm-vm v0.3.25/go.mod h1:Ovb7xthI+3qjMiZHCF4IOnDIm2H6DOcdxYx3cOL2uLw=
+github.com/ElrondNetwork/arwen-wasm-vm v0.3.26 h1:iIkOUWZGXSgJ+oVAN6+yYO3QB/+L8Nz0ZYPh4eAqkq4=
+github.com/ElrondNetwork/arwen-wasm-vm v0.3.26/go.mod h1:Ovb7xthI+3qjMiZHCF4IOnDIm2H6DOcdxYx3cOL2uLw=
 github.com/ElrondNetwork/big-int-util v0.0.5 h1:e/9kK++9ZH/SdIYqLSUPRFYrDZmDWDgff3/7SCydq5I=
 github.com/ElrondNetwork/big-int-util v0.0.5/go.mod h1:96viBvoTXLjZOhEvE0D+QnAwg1IJLPAK6GVHMbC7Aw4=
 github.com/ElrondNetwork/concurrent-map v0.1.2 h1:mr2sVF2IPDsJO8DNGzCUiNQOJcadHuIRVZn+QFnCBlE=

integrationTests/multiShard/smartContract/scCallingSC_test.go

@@ -428,9 +428,9 @@ func TestSCCallingDNSUserNames(t *testing.T) {
 		t.Skip("this is not a short test")
 	}
 
-	numOfShards := 1
-	nodesPerShard := 1
-	numMetachainNodes := 1
+	numOfShards := 2
+	nodesPerShard := 2
+	numMetachainNodes := 2
 
 	advertiser := integrationTests.CreateMessengerWithKadDht("")
 	_ = advertiser.Bootstrap()
@@ -511,7 +511,7 @@ func TestSCCallingDNSUserNames(t *testing.T) {
 		userNames[i] = userName
 	}
 
-	nrRoundsToPropagateMultiShard := 5
+	nrRoundsToPropagateMultiShard := 15
 	_, _ = integrationTests.WaitOperationToBeDone(t, nodes, nrRoundsToPropagateMultiShard, nonce, round, idxProposers)
 
 	for i, player := range players {

process/smartContract/builtInFunctions/esdtTransfer.go

@@ -95,8 +95,9 @@ func (e *esdtTransfer) ProcessBuiltinFunction(
 		esdtTransferTxData := core.BuiltInFunctionESDTTransfer + "@" + hex.EncodeToString(vmInput.Arguments[0]) + "@" + hex.EncodeToString(vmInput.Arguments[1])
 		vmOutput.OutputAccounts = make(map[string]*vmcommon.OutputAccount)
 		vmOutput.OutputAccounts[string(vmInput.RecipientAddr)] = &vmcommon.OutputAccount{
-			Address: vmInput.RecipientAddr,
-			Data:    []byte(esdtTransferTxData),
+			Address:  vmInput.RecipientAddr,
+			Data:     []byte(esdtTransferTxData),
+			CallType: vmcommon.AsynchronousCall,
 		}
 	}
 

process/smartContract/builtInFunctions/saveUserName.go

@@ -1,6 +1,9 @@
 package builtInFunctions
 
 import (
+	"encoding/hex"
+
+	"github.com/ElrondNetwork/elrond-go/core"
 	"github.com/ElrondNetwork/elrond-go/core/check"
 	"github.com/ElrondNetwork/elrond-go/data/state"
 	"github.com/ElrondNetwork/elrond-go/process"
@@ -53,20 +56,28 @@ func (s *saveUserName) ProcessBuiltinFunction(
 	if vmInput.GasProvided < s.gasCost {
 		return nil, process.ErrNotEnoughGas
 	}
-	if check.IfNil(acntDst) {
-		// cross-shard call, in sender shard only the gas is taken out
-		return &vmcommon.VMOutput{ReturnCode: vmcommon.Ok}, nil
-	}
-
 	_, ok := s.mapDnsAddresses[string(vmInput.CallerAddr)]
 	if !ok {
 		return nil, process.ErrCallerIsNotTheDNSAddress
 	}
-
-	if len(vmInput.Arguments) == 0 || len(vmInput.Arguments[0]) != userNameHashLength {
+	if len(vmInput.Arguments) != 1 || len(vmInput.Arguments[0]) != userNameHashLength {
 		return nil, process.ErrInvalidArguments
 	}
 
+	if check.IfNil(acntDst) {
+		// cross-shard call, in sender shard only the gas is taken out
+		vmOutput := &vmcommon.VMOutput{ReturnCode: vmcommon.Ok}
+		vmOutput.OutputAccounts = make(map[string]*vmcommon.OutputAccount)
+		setUserNameTxData := core.BuiltInFunctionSetUserName + "@" + hex.EncodeToString(vmInput.Arguments[0])
+		vmOutput.OutputAccounts[string(vmInput.RecipientAddr)] = &vmcommon.OutputAccount{
+			Address:  vmInput.RecipientAddr,
+			Data:     []byte(setUserNameTxData),
+			CallType: vmcommon.AsynchronousCall,
+			GasLimit: vmInput.GasProvided,
+		}
+		return vmOutput, nil
+	}
+
 	currentUserName := acntDst.GetUserName()
 	if !s.enableChange && len(currentUserName) > 0 {
 		return nil, process.ErrUserNameChangeIsDisabled

process/smartContract/builtInFunctions/saveUserName_test.go

@@ -36,14 +36,15 @@ func TestSaveUserName_ProcessBuiltinFunction(t *testing.T) {
 	_, err := coa.ProcessBuiltinFunction(nil, acc, vmInput)
 	require.Equal(t, process.ErrInvalidArguments, err)
 
+	newUserName := []byte("afafafafafafafafafafafafafafafaf")
+	vmInput.Arguments = [][]byte{newUserName}
+
 	_, err = coa.ProcessBuiltinFunction(nil, acc, nil)
 	require.Equal(t, process.ErrNilVmInput, err)
 
 	_, err = coa.ProcessBuiltinFunction(nil, nil, vmInput)
 	require.Nil(t, err)
 
-	newUserName := []byte("afafafafafafafafafafafafafafafaf")
-	vmInput.Arguments = [][]byte{newUserName}
 	_, err = coa.ProcessBuiltinFunction(nil, acc, vmInput)
 	require.Nil(t, err)