v0.1.7

builtInFunctions/changeOwnerAddress.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"sync"
 
+	"github.com/Dharitri-org/drtg-core/core"
 	"github.com/Dharitri-org/drtg-core/core/check"
 	vmcommon "github.com/Dharitri-org/drtg-vm-common"
 )
@@ -13,11 +14,20 @@ type changeOwnerAddress struct {
 	baseAlwaysActiveHandler
 	gasCost      uint64
 	mutExecution sync.RWMutex
+
+	enableEpochsHandler vmcommon.EnableEpochsHandler
 }
 
-// NewChangeOwnerAddressFunc create a new change owner built in function
-func NewChangeOwnerAddressFunc(gasCost uint64) *changeOwnerAddress {
-	return &changeOwnerAddress{gasCost: gasCost}
+// NewChangeOwnerAddressFunc create a new change owner built-in function
+func NewChangeOwnerAddressFunc(gasCost uint64, enableEpochsHandler vmcommon.EnableEpochsHandler) (*changeOwnerAddress, error) {
+	if check.IfNil(enableEpochsHandler) {
+		return nil, ErrNilEnableEpochsHandler
+	}
+
+	return &changeOwnerAddress{
+		gasCost:             gasCost,
+		enableEpochsHandler: enableEpochsHandler,
+	}, nil
 }
 
 // SetNewGasConfig is called whenever gas cost is changed
@@ -55,9 +65,12 @@ func (c *changeOwnerAddress) ProcessBuiltinFunction(
 		return nil, ErrNotEnoughGas
 	}
 	gasRemaining := computeGasRemaining(acntSnd, vmInput.GasProvided, c.gasCost)
+
+	vmOutput := &vmcommon.VMOutput{ReturnCode: vmcommon.Ok, GasRemaining: gasRemaining}
+
 	if check.IfNil(acntDst) {
-		// cross-shard call, in sender shard only the gas is taken out
-		return &vmcommon.VMOutput{ReturnCode: vmcommon.Ok, GasRemaining: gasRemaining}, nil
+		c.addOutputTransferToVmOutputForCallThroughSC(acntDst, vmInput, vmOutput)
+		return vmOutput, nil
 	}
 
 	if !bytes.Equal(vmInput.CallerAddr, acntDst.GetOwnerAddress()) {
@@ -69,7 +82,6 @@ func (c *changeOwnerAddress) ProcessBuiltinFunction(
 		return nil, err
 	}
 
-	vmOutput := &vmcommon.VMOutput{GasRemaining: gasRemaining, ReturnCode: vmcommon.Ok}
 	logEntry := &vmcommon.LogEntry{
 		Identifier: []byte(vmInput.Function),
 		Address:    vmInput.RecipientAddr,
@@ -81,6 +93,27 @@ func (c *changeOwnerAddress) ProcessBuiltinFunction(
 	return vmOutput, nil
 }
 
+func (c *changeOwnerAddress) addOutputTransferToVmOutputForCallThroughSC(acntDst vmcommon.UserAccountHandler, vmInput *vmcommon.ContractCallInput, vmOutput *vmcommon.VMOutput) {
+	if !c.enableEpochsHandler.IsChangeOwnerAddressCrossShardThroughSCEnabled() {
+		return
+	}
+
+	isCrossShardCallThroughASmartContract := check.IfNil(acntDst) && vmcommon.IsSmartContractAddress(vmInput.CallerAddr)
+	if !isCrossShardCallThroughASmartContract {
+		return
+	}
+
+	addOutputTransferToVMOutput(
+		1,
+		vmInput.CallerAddr,
+		core.BuiltInFunctionChangeOwnerAddress,
+		vmInput.Arguments,
+		vmInput.RecipientAddr,
+		vmInput.GasLocked,
+		vmInput.CallType,
+		vmOutput)
+}
+
 func computeGasRemaining(snd vmcommon.UserAccountHandler, gasProvided uint64, gasToUse uint64) uint64 {
 	if gasProvided < gasToUse {
 		return 0

builtInFunctions/changeOwnerAddress_test.go

@@ -6,16 +6,27 @@ import (
 
 	"github.com/Dharitri-org/drtg-core/core"
 	"github.com/Dharitri-org/drtg-core/core/check"
+	"github.com/Dharitri-org/drtg-core/data/vm"
 	vmcommon "github.com/Dharitri-org/drtg-vm-common"
 	"github.com/Dharitri-org/drtg-vm-common/mock"
 	"github.com/stretchr/testify/require"
 )
 
+func TestNewChangeOwnerNilEnableEpochsHandler(t *testing.T) {
+	t.Parallel()
+
+	gasCost := uint64(100)
+	coa, err := NewChangeOwnerAddressFunc(gasCost, nil)
+	require.Nil(t, coa)
+	require.Equal(t, ErrNilEnableEpochsHandler, err)
+}
+
 func TestNewChangeOwnerAddressFunc(t *testing.T) {
 	t.Parallel()
 
 	gasCost := uint64(100)
-	coa := NewChangeOwnerAddressFunc(gasCost)
+	coa, err := NewChangeOwnerAddressFunc(gasCost, &mock.EnableEpochsHandlerStub{})
+	require.Nil(t, err)
 	require.False(t, check.IfNil(coa))
 	require.Equal(t, gasCost, coa.gasCost)
 	require.True(t, coa.IsActive())
@@ -24,7 +35,7 @@ func TestNewChangeOwnerAddressFunc(t *testing.T) {
 func TestChangeOwnerAddress_SetNewGasConfig(t *testing.T) {
 	t.Parallel()
 
-	coa := NewChangeOwnerAddressFunc(100)
+	coa, _ := NewChangeOwnerAddressFunc(100, &mock.EnableEpochsHandlerStub{})
 
 	newCost := uint64(37)
 	expectedGasConfig := &vmcommon.GasCost{BuiltInCost: vmcommon.BuiltInCost{ChangeOwnerAddress: newCost}}
@@ -36,7 +47,9 @@ func TestChangeOwnerAddress_SetNewGasConfig(t *testing.T) {
 func TestChangeOwnerAddress_ProcessBuiltinFunction(t *testing.T) {
 	t.Parallel()
 
-	coa := changeOwnerAddress{}
+	coa := changeOwnerAddress{
+		enableEpochsHandler: &mock.EnableEpochsHandlerStub{},
+	}
 
 	owner := []byte("send")
 	addr := []byte("addr")
@@ -80,3 +93,38 @@ func TestChangeOwnerAddress_ProcessBuiltinFunction(t *testing.T) {
 		Topics:     [][]byte{newAddr},
 	}, vmOutput.Logs[0])
 }
+
+func TestProcessBuiltInFunctionCallThroughSC(t *testing.T) {
+	t.Parallel()
+
+	coa := changeOwnerAddress{
+		enableEpochsHandler: &mock.EnableEpochsHandlerStub{
+			IsChangeOwnerAddressCrossShardThroughSCEnabledField: true,
+		},
+	}
+
+	owner := []byte("00000000000")
+	addr := []byte("addraddradd")
+	rcvAddr := []byte("contract")
+
+	acc := mock.NewUserAccount(addr)
+	acc.OwnerAddress = owner
+	vmInput := &vmcommon.ContractCallInput{
+		Function:      core.BuiltInFunctionChangeOwnerAddress,
+		RecipientAddr: rcvAddr,
+		VMInput: vmcommon.VMInput{
+			CallerAddr: make([]byte, 11),
+			CallValue:  big.NewInt(0),
+			Arguments:  [][]byte{[]byte("00000000000")},
+		},
+	}
+
+	vmOutput, err := coa.ProcessBuiltinFunction(acc, nil, vmInput)
+	require.Nil(t, err)
+	require.NotNil(t, vmOutput)
+	require.Equal(t, 1, len(vmOutput.OutputAccounts))
+
+	outputTransfer := vmOutput.OutputAccounts[string(rcvAddr)].OutputTransfers[0]
+	require.Equal(t, []byte("ChangeOwnerAddress@3030303030303030303030"), outputTransfer.Data)
+	require.Equal(t, vm.DirectCall, outputTransfer.CallType)
+}

builtInFunctions/creator.go

@@ -137,7 +137,11 @@ func (b *builtInFuncCreator) CreateBuiltInFunctionContainer() error {
 		return err
 	}
 
-	newFunc = NewChangeOwnerAddressFunc(b.gasConfig.BuiltInCost.ChangeOwnerAddress)
+	newFunc, err = NewChangeOwnerAddressFunc(b.gasConfig.BuiltInCost.ChangeOwnerAddress, b.enableEpochsHandler)
+	if err != nil {
+		return err
+	}
+
 	err = b.builtInFunctions.Add(core.BuiltInFunctionChangeOwnerAddress, newFunc)
 	if err != nil {
 		return err