Merge pull request #1885 from ElrondNetwork/EN-6312/Meta-tx-standard

En 6312/meta tx standard

cmd/node/factory/structs.go

@@ -59,7 +59,7 @@ import (
 	"github.com/ElrondNetwork/elrond-go/storage/storageUnit"
 	"github.com/ElrondNetwork/elrond-go/storage/timecache"
 	"github.com/ElrondNetwork/elrond-go/vm"
-	vmcommon "github.com/ElrondNetwork/elrond-vm-common"
+	"github.com/ElrondNetwork/elrond-vm-common/parsers"
 )
 
 const (
@@ -1098,7 +1098,7 @@ func newShardBlockProcessor(
 	txLogsProcessor process.TransactionLogProcessor,
 	version string,
 ) (process.BlockProcessor, error) {
-	argsParser := vmcommon.NewAtArgumentParser()
+	argsParser := smartContract.NewArgumentParser()
 
 	argsBuiltIn := builtInFunctions.ArgsCreateBuiltInFunctionContainer{
 		GasMap:          gasSchedule,
@@ -1170,7 +1170,7 @@ func newShardBlockProcessor(
 		PubkeyConverter:  stateComponents.AddressPubkeyConverter,
 		ShardCoordinator: shardCoordinator,
 		BuiltInFuncNames: builtInFuncs.Keys(),
-		ArgumentParser:   vmcommon.NewAtArgumentParser(),
+		ArgumentParser:   parsers.NewCallArgsParser(),
 	}
 	txTypeHandler, err := coordinator.NewTxTypeHandler(argsTxTypeHandler)
 	if err != nil {
@@ -1230,6 +1230,8 @@ func newShardBlockProcessor(
 		economics,
 		receiptTxInterim,
 		badTxInterim,
+		argsParser,
+		scForwarder,
 	)
 	if err != nil {
 		return nil, errors.New("could not create transaction statisticsProcessor: " + err.Error())
@@ -1396,7 +1398,7 @@ func newMetaBlockProcessor(
 		return nil, err
 	}
 
-	argsParser := vmcommon.NewAtArgumentParser()
+	argsParser := smartContract.NewArgumentParser()
 
 	vmContainer, err := vmFactory.Create()
 	if err != nil {
@@ -1429,7 +1431,7 @@ func newMetaBlockProcessor(
 		PubkeyConverter:  stateComponents.AddressPubkeyConverter,
 		ShardCoordinator: shardCoordinator,
 		BuiltInFuncNames: builtInFuncs.Keys(),
-		ArgumentParser:   vmcommon.NewAtArgumentParser(),
+		ArgumentParser:   parsers.NewCallArgsParser(),
 	}
 	txTypeHandler, err := coordinator.NewTxTypeHandler(argsTxTypeHandler)
 	if err != nil {

cmd/node/main.go

@@ -73,7 +73,7 @@ import (
 	exportFactory "github.com/ElrondNetwork/elrond-go/update/factory"
 	"github.com/ElrondNetwork/elrond-go/update/trigger"
 	"github.com/ElrondNetwork/elrond-go/vm"
-	vmcommon "github.com/ElrondNetwork/elrond-vm-common"
+	"github.com/ElrondNetwork/elrond-vm-common/parsers"
 	"github.com/google/gops/agent"
 	"github.com/urfave/cli"
 )
@@ -879,6 +879,7 @@ func startNode(ctx *cli.Context, log logger.Logger, version string) error {
 		Rounder:                    rounder,
 		AddressPubkeyConverter:     addressPubkeyConverter,
 		LatestStorageDataProvider:  latestStorageDataProvider,
+		ArgumentsParser:            smartContract.NewArgumentParser(),
 		StatusHandler:              coreComponents.StatusHandler,
 	}
 	bootstrapper, err := bootstrap.NewEpochStartBootstrap(epochStartBootstrapArgs)
@@ -1925,7 +1926,7 @@ func createHardForkTrigger(
 		return nil, err
 	}
 
-	atArgumentParser := vmcommon.NewAtArgumentParser()
+	atArgumentParser := smartContract.NewArgumentParser()
 	argTrigger := trigger.ArgHardforkTrigger{
 		TriggerPubKeyBytes:     triggerPubKeyBytes,
 		SelfPubKeyBytes:        selfPubKeyBytes,
@@ -2267,7 +2268,7 @@ func createApiResolver(
 		PubkeyConverter:  pubkeyConv,
 		ShardCoordinator: shardCoordinator,
 		BuiltInFuncNames: builtInFuncs.Keys(),
-		ArgumentParser:   vmcommon.NewAtArgumentParser(),
+		ArgumentParser:   parsers.NewCallArgsParser(),
 	}
 	txTypeHandler, err := coordinator.NewTxTypeHandler(argsTxTypeHandler)
 	if err != nil {

core/constants.go

@@ -414,6 +414,9 @@ const BuiltInFunctionSaveKeyValue = "SaveKeyValue"
 // BuiltInFunctionESDTTransfer is the key for the elrond standard digital token transfer built-in function
 const BuiltInFunctionESDTTransfer = "ESDTTransfer"
 
+// RelayedTransaction is the key for the elrond meta/gassless/relayed transaction standard
+const RelayedTransaction = "relayedTx"
+
 // SCDeployInitFunctionName is the key for the function which is called at smart contract deploy time
 const SCDeployInitFunctionName = "_init"
 

core/converters.go

@@ -3,6 +3,7 @@ package core
 import (
 	"fmt"
 	"math"
+	"math/big"
 	"strconv"
 	"strings"
 
@@ -141,3 +142,23 @@ func ShardIdToString(shardId uint32) string {
 	}
 	return fmt.Sprintf("_%d", shardId)
 }
+
+// ConvertToEvenHex converts the provided value in a hex string, even number of characters
+func ConvertToEvenHex(value int) string {
+	str := fmt.Sprintf("%x", value)
+	if len(str)%2 != 0 {
+		str = "0" + str
+	}
+
+	return str
+}
+
+// ConvertToEvenHexBigInt converts the provided value in a hex string, even number of characters
+func ConvertToEvenHexBigInt(value *big.Int) string {
+	str := value.Text(16)
+	if len(str)%2 != 0 {
+		str = "0" + str
+	}
+
+	return str
+}

core/converters_test.go

@@ -4,6 +4,8 @@ import (
 	"bytes"
 	"fmt"
 	"math"
+	"math/big"
+	"strconv"
 	"strings"
 	"testing"
 
@@ -186,3 +188,32 @@ func TestCommunicationIdentifierBetweenShards_Metachain(t *testing.T) {
 		core.MetachainShardId,
 	))
 }
+
+func TestConvertToEvenHex(t *testing.T) {
+	t.Parallel()
+
+	numCompares := 100000
+	for i := 0; i < numCompares; i++ {
+		str := core.ConvertToEvenHex(i)
+
+		assert.True(t, len(str)%2 == 0)
+		recovered, err := strconv.ParseInt(str, 16, 32)
+		assert.Nil(t, err)
+		assert.Equal(t, i, int(recovered))
+	}
+}
+
+func TestConvertToEvenHexBigInt(t *testing.T) {
+	t.Parallel()
+
+	numCompares := 100000
+	for i := 0; i < numCompares; i++ {
+		bigInt := big.NewInt(int64(i))
+		str := core.ConvertToEvenHexBigInt(bigInt)
+
+		assert.True(t, len(str)%2 == 0)
+		recovered, err := strconv.ParseInt(str, 16, 32)
+		assert.Nil(t, err)
+		assert.Equal(t, i, int(recovered))
+	}
+}

data/smartContractResult/proto/smartContractResult.proto

@@ -13,13 +13,15 @@ message SmartContractResult  {
 	bytes    Value          = 2  [(gogoproto.jsontag) = "value", (gogoproto.casttypewith) = "math/big.Int;github.com/ElrondNetwork/elrond-go/data.BigIntCaster"];
 	bytes    RcvAddr        = 3  [(gogoproto.jsontag) = "receiver"];
 	bytes    SndAddr        = 4  [(gogoproto.jsontag) = "sender"];
-	bytes    Code           = 5  [(gogoproto.jsontag) = "code,omitempty"];
-	bytes    Data           = 6  [(gogoproto.jsontag) = "data,omitempty"];
-	bytes    PrevTxHash     = 7  [(gogoproto.jsontag) = "prevTxHash"];
-	bytes    OriginalTxHash = 8  [(gogoproto.jsontag) = "originalTxHash"];
-	uint64   GasLimit       = 9  [(gogoproto.jsontag) = "gasLimit"];
-	uint64   GasPrice       = 10 [(gogoproto.jsontag) = "gasPrice"];
-	int64    CallType       = 11 [(gogoproto.jsontag) = "callType", (gogoproto.casttype) = "github.com/ElrondNetwork/elrond-vm-common.CallType"];
-	bytes    CodeMetadata   = 12 [(gogoproto.jsontag) = "codeMetadata,omitempty"];
-	bytes    ReturnMessage  = 13 [(gogoproto.jsontag) = "returnMessage,omitempty"];
+	bytes    RelayerAddr    = 5  [(gogoproto.jsontag) = "relayer"];
+	bytes    RelayedValue   = 6  [(gogoproto.jsontag) = "relayedValue", (gogoproto.casttypewith) = "math/big.Int;github.com/ElrondNetwork/elrond-go/data.BigIntCaster"];
+	bytes    Code           = 7  [(gogoproto.jsontag) = "code,omitempty"];
+	bytes    Data           = 8  [(gogoproto.jsontag) = "data,omitempty"];
+	bytes    PrevTxHash     = 9  [(gogoproto.jsontag) = "prevTxHash"];
+	bytes    OriginalTxHash = 10  [(gogoproto.jsontag) = "originalTxHash"];
+	uint64   GasLimit       = 11 [(gogoproto.jsontag) = "gasLimit"];
+	uint64   GasPrice       = 12 [(gogoproto.jsontag) = "gasPrice"];
+	int64    CallType       = 13 [(gogoproto.jsontag) = "callType", (gogoproto.casttype) = "github.com/ElrondNetwork/elrond-vm-common.CallType"];
+	bytes    CodeMetadata   = 14 [(gogoproto.jsontag) = "codeMetadata,omitempty"];
+	bytes    ReturnMessage  = 15 [(gogoproto.jsontag) = "returnMessage,omitempty"];
 }