Feat/esdt prefix

cmd/node/config/systemSmartContractsConfig.toml

@@ -17,6 +17,7 @@
 [ESDTSystemSCConfig]
     BaseIssuingCost = "5000000000000000000" #5 eGLD
     OwnerAddress = "erd1fpkcgel4gcmh8zqqdt043yfcn5tyx8373kg6q2qmkxzu4dqamc0swts65c"
+    ESDTPrefix = ""
 
 [GovernanceSystemSCConfig]
     OwnerAddress = "erd1vxy22x0fj4zv6hktmydg8vpfh6euv02cz4yg0aaws6rrad5a5awqgqky80" #should use a multisign contract instead of a wallet address

common/tokensParser.go

@@ -3,6 +3,8 @@ package common
 import (
 	"math/big"
 	"strings"
+
+	"github.com/multiversx/mx-chain-core-go/data/esdt"
 )
 
 const (
@@ -11,12 +13,6 @@ const (
 
 	// separatorChar represents the character that separated the token ticker by the random sequence
 	separatorChar = "-"
-
-	// minLengthForTickerName represents the minimum number of characters a token's ticker can have
-	minLengthForTickerName = 3
-
-	// maxLengthForTickerName represents the maximum number of characters a token's ticker can have
-	maxLengthForTickerName = 10
 )
 
 // TODO: move this to core
@@ -33,16 +29,13 @@ func ExtractTokenIDAndNonceFromTokenStorageKey(tokenKey []byte) ([]byte, uint64)
 		return tokenKey, 0
 	}
 
-	tokenTicker := token[:indexOfFirstHyphen]
-	randomSequencePlusNonce := token[indexOfFirstHyphen+1:]
+	indexOfTokenHyphen := getIndexOfTokenHyphen(token, indexOfFirstHyphen)
+	tokenTicker := token[:indexOfTokenHyphen]
+	randomSequencePlusNonce := token[indexOfTokenHyphen+1:]
 
 	tokenTickerLen := len(tokenTicker)
 
-	areTickerAndRandomSequenceInvalid := tokenTickerLen == 0 ||
-		tokenTickerLen < minLengthForTickerName ||
-		tokenTickerLen > maxLengthForTickerName ||
-		len(randomSequencePlusNonce) == 0
-
+	areTickerAndRandomSequenceInvalid := !esdt.IsTokenTickerLenCorrect(tokenTickerLen) || len(randomSequencePlusNonce) == 0
 	if areTickerAndRandomSequenceInvalid {
 		return tokenKey, 0
 	}
@@ -60,3 +53,32 @@ func ExtractTokenIDAndNonceFromTokenStorageKey(tokenKey []byte) ([]byte, uint64)
 
 	return []byte(tokenID), nonceBigInt.Uint64()
 }
+
+func getIndexOfTokenHyphen(token string, indexOfFirstHyphen int) int {
+	if !isValidPrefixedToken(token) {
+		return indexOfFirstHyphen
+	}
+
+	indexOfSecondHyphen := strings.Index(token[indexOfFirstHyphen+1:], separatorChar)
+	return indexOfSecondHyphen + indexOfFirstHyphen + 1
+}
+
+func isValidPrefixedToken(token string) bool {
+	tokenSplit := strings.Split(token, separatorChar)
+	if len(tokenSplit) < 3 {
+		return false
+	}
+
+	prefix := tokenSplit[0]
+	if !esdt.IsValidTokenPrefix(prefix) {
+		return false
+	}
+
+	tokenTicker := tokenSplit[1]
+	if !esdt.IsTickerValid(tokenTicker) {
+		return false
+	}
+
+	tokenRandSeq := tokenSplit[2]
+	return len(tokenRandSeq) >= esdtTickerNumRandChars
+}

common/tokensParser_test.go

@@ -54,6 +54,16 @@ func TestExtractTokenIDAndNonceFromTokenStorageKey(t *testing.T) {
 		// "-" represents nonce 45 and should not be treated as a separator
 		checkTickerAndNonceExtraction(t, "EGLDMEXF-8aa8b6-", "EGLDMEXF-8aa8b6", 45)
 	})
+
+	t.Run("prefixed tokens", func(t *testing.T) {
+		t.Parallel()
+
+		checkTickerAndNonceExtraction(t, "pref-ALC-1q2w3e", "pref-ALC-1q2w3e", 0)
+		checkTickerAndNonceExtraction(t, "pf1-ALC-1q2w3e", "pf1-ALC-1q2w3e", 0)
+
+		checkTickerAndNonceExtraction(t, "sv1-TKN-1q2w3e4", "sv1-TKN-1q2w3e", 52)
+		checkTickerAndNonceExtraction(t, "sv1-TKN-1q2w3e-", "sv1-TKN-1q2w3e", 45)
+	})
 }
 
 func checkTickerAndNonceExtraction(t *testing.T, input string, expectedTicker string, expectedNonce uint64) {

config/systemSmartContractsConfig.go

@@ -32,6 +32,7 @@ type StakingSystemSCConfig struct {
 type ESDTSystemSCConfig struct {
 	BaseIssuingCost string
 	OwnerAddress    string
+	ESDTPrefix      string
 }
 
 // GovernanceSystemSCConfigV1 holds the initial set of values that were used to initialise the

errors/errors.go

@@ -598,3 +598,6 @@ var ErrNilSentSignatureTracker = errors.New("nil sent signature tracker")
 
 // ErrNilEpochSystemSCProcessor defines the error for setting a nil EpochSystemSCProcessor
 var ErrNilEpochSystemSCProcessor = errors.New("nil epoch system SC processor")
+
+// ErrInvalidTokenPrefix signals that an invalid token prefix has been provided
+var ErrInvalidTokenPrefix = errors.New("invalid token prefix, should have max 4 (lowercase/alphanumeric) characters")

factory/api/apiResolverFactory.go

@@ -145,12 +145,6 @@ func CreateApiResolver(args *ApiResolverArgs) (facade.ApiResolver, error) {
 		return nil, errDecode
 	}
 
-	dnsV2AddressesStrings := args.Configs.GeneralConfig.BuiltInFunctions.DNSV2Addresses
-	convertedDNSV2Addresses, errDecode := factory.DecodeAddresses(pkConverter, dnsV2AddressesStrings)
-	if errDecode != nil {
-		return nil, errDecode
-	}
-
 	builtInFuncFactory, err := createBuiltinFuncs(
 		args.GasScheduleNotifier,
 		args.CoreComponents.InternalMarshalizer(),
@@ -161,7 +155,10 @@ func CreateApiResolver(args *ApiResolverArgs) (facade.ApiResolver, error) {
 		args.BootstrapComponents.GuardedAccountHandler(),
 		convertedAddresses,
 		args.Configs.GeneralConfig.BuiltInFunctions.MaxNumAddressesInTransferRole,
-		convertedDNSV2Addresses,
+		args.Configs.GeneralConfig.BuiltInFunctions.DNSV2Addresses,
+		args.Configs.GeneralConfig.VirtualMachine.Querying.TransferAndExecuteByUserAddresses,
+		[]byte(args.Configs.SystemSCConfig.ESDTSystemSCConfig.ESDTPrefix),
+		pkConverter,
 	)
 	if err != nil {
 		return nil, err
@@ -350,12 +347,6 @@ func createScQueryElement(
 		return nil, nil, errDecode
 	}
 
-	dnsV2AddressesStrings := args.generalConfig.BuiltInFunctions.DNSV2Addresses
-	convertedDNSV2Addresses, errDecode := factory.DecodeAddresses(pkConverter, dnsV2AddressesStrings)
-	if errDecode != nil {
-		return nil, nil, errDecode
-	}
-
 	apiBlockchain, err := createBlockchainForScQuery(selfShardID)
 	if err != nil {
 		return nil, nil, err
@@ -376,7 +367,10 @@ func createScQueryElement(
 		args.guardedAccountHandler,
 		convertedAddresses,
 		args.generalConfig.BuiltInFunctions.MaxNumAddressesInTransferRole,
-		convertedDNSV2Addresses,
+		args.generalConfig.BuiltInFunctions.DNSV2Addresses,
+		args.generalConfig.VirtualMachine.Querying.TransferAndExecuteByUserAddresses,
+		[]byte(args.systemSCConfig.ESDTSystemSCConfig.ESDTPrefix),
+		pkConverter,
 	)
 	if err != nil {
 		return nil, nil, err
@@ -640,32 +634,34 @@ func newStoragePruningManager(args scQueryElementArgs) (state.StoragePruningMana
 func createBuiltinFuncs(
 	gasScheduleNotifier core.GasScheduleNotifier,
 	marshalizer marshal.Marshalizer,
-	accnts state.AccountsAdapter,
+	accounts state.AccountsAdapter,
 	shardCoordinator sharding.Coordinator,
 	epochNotifier vmcommon.EpochNotifier,
 	enableEpochsHandler vmcommon.EnableEpochsHandler,
 	guardedAccountHandler vmcommon.GuardedAccountHandler,
 	automaticCrawlerAddresses [][]byte,
 	maxNumAddressesInTransferRole uint32,
-	dnsV2Addresses [][]byte,
+	dnsV2Addresses []string,
+	whiteListedCrossChainAddresses []string,
+	selfESDTPrefix []byte,
+	pubKeyConverter core.PubkeyConverter,
 ) (vmcommon.BuiltInFunctionFactory, error) {
-	mapDNSV2Addresses := make(map[string]struct{})
-	for _, address := range dnsV2Addresses {
-		mapDNSV2Addresses[string(address)] = struct{}{}
-	}
-
 	argsBuiltIn := builtInFunctions.ArgsCreateBuiltInFunctionContainer{
-		GasSchedule:               gasScheduleNotifier,
-		MapDNSAddresses:           make(map[string]struct{}),
-		MapDNSV2Addresses:         mapDNSV2Addresses,
-		Marshalizer:               marshalizer,
-		Accounts:                  accnts,
-		ShardCoordinator:          shardCoordinator,
-		EpochNotifier:             epochNotifier,
-		EnableEpochsHandler:       enableEpochsHandler,
-		GuardedAccountHandler:     guardedAccountHandler,
-		AutomaticCrawlerAddresses: automaticCrawlerAddresses,
-		MaxNumNodesInTransferRole: maxNumAddressesInTransferRole,
+		GasSchedule:                    gasScheduleNotifier,
+		MapDNSAddresses:                make(map[string]struct{}),
+		DNSV2Addresses:                 dnsV2Addresses,
+		WhiteListedCrossChainAddresses: whiteListedCrossChainAddresses,
+		EnableUserNameChange:           false,
+		Marshalizer:                    marshalizer,
+		Accounts:                       accounts,
+		ShardCoordinator:               shardCoordinator,
+		EpochNotifier:                  epochNotifier,
+		EnableEpochsHandler:            enableEpochsHandler,
+		GuardedAccountHandler:          guardedAccountHandler,
+		AutomaticCrawlerAddresses:      automaticCrawlerAddresses,
+		MaxNumAddressesInTransferRole:  maxNumAddressesInTransferRole,
+		SelfESDTPrefix:                 selfESDTPrefix,
+		PubKeyConverter:                pubKeyConverter,
 	}
 	return builtInFunctions.CreateBuiltInFunctionsFactory(argsBuiltIn)
 }

factory/api/apiResolverFactory_test.go

@@ -94,6 +94,7 @@ func createMockArgs(t *testing.T) *api.ApiResolverArgs {
 			GeneralConfig:   &cfg,
 			EpochConfig:     &config.EpochConfig{},
 			EconomicsConfig: &economicsConfig,
+			SystemSCConfig:  &config.SystemSmartContractsConfig{},
 		},
 		CoreComponents:       coreComponents,
 		DataComponents:       dataComponents,
@@ -292,6 +293,7 @@ func createMockSCQueryElementArgs() api.SCQueryElementArgs {
 			BuiltInFunctions: config.BuiltInFunctionsConfig{
 				MaxNumAddressesInTransferRole: 1,
 				AutomaticCrawlerAddresses:     []string{"addr1"},
+				DNSV2Addresses:                []string{"erd1qqqqqqqqqqqqqpgqr46jrxr6r2unaqh75ugd308dwx5vgnhwh47qtvepe3"},
 			},
 			SmartContractDataPool: config.CacheConfig{
 				Type:     "LRU",
@@ -365,8 +367,10 @@ func createMockSCQueryElementArgs() api.SCQueryElementArgs {
 				return gasSchedule
 			},
 		},
-		MessageSigVerifier:    &testscommon.MessageSignVerifierMock{},
-		SystemSCConfig:        &config.SystemSmartContractsConfig{},
+		MessageSigVerifier: &testscommon.MessageSignVerifierMock{},
+		SystemSCConfig: &config.SystemSmartContractsConfig{
+			ESDTSystemSCConfig: config.ESDTSystemSCConfig{},
+		},
 		Bootstrapper:          testsMocks.NewTestBootstrapperMock(),
 		AllowVMQueriesChan:    make(chan struct{}, 1),
 		WorkingDir:            "",

factory/processing/blockProcessorCreator.go

@@ -1162,31 +1162,21 @@ func (pcf *processComponentsFactory) createBuiltInFunctionContainer(
 		return nil, err
 	}
 
-	convertedDNSV2Addresses, err := mainFactory.DecodeAddresses(
-		pcf.coreData.AddressPubKeyConverter(),
-		pcf.config.BuiltInFunctions.DNSV2Addresses,
-	)
-	if err != nil {
-		return nil, err
-	}
-
-	mapDNSV2Addresses := make(map[string]struct{})
-	for _, address := range convertedDNSV2Addresses {
-		mapDNSV2Addresses[string(address)] = struct{}{}
-	}
-
 	argsBuiltIn := builtInFunctions.ArgsCreateBuiltInFunctionContainer{
-		GasSchedule:               pcf.gasSchedule,
-		MapDNSAddresses:           mapDNSAddresses,
-		MapDNSV2Addresses:         mapDNSV2Addresses,
-		Marshalizer:               pcf.coreData.InternalMarshalizer(),
-		Accounts:                  accounts,
-		ShardCoordinator:          pcf.bootstrapComponents.ShardCoordinator(),
-		EpochNotifier:             pcf.coreData.EpochNotifier(),
-		EnableEpochsHandler:       pcf.coreData.EnableEpochsHandler(),
-		GuardedAccountHandler:     pcf.bootstrapComponents.GuardedAccountHandler(),
-		AutomaticCrawlerAddresses: convertedAddresses,
-		MaxNumNodesInTransferRole: pcf.config.BuiltInFunctions.MaxNumAddressesInTransferRole,
+		GasSchedule:                    pcf.gasSchedule,
+		MapDNSAddresses:                mapDNSAddresses,
+		DNSV2Addresses:                 pcf.config.BuiltInFunctions.DNSV2Addresses,
+		WhiteListedCrossChainAddresses: pcf.config.VirtualMachine.Execution.TransferAndExecuteByUserAddresses,
+		Marshalizer:                    pcf.coreData.InternalMarshalizer(),
+		Accounts:                       accounts,
+		ShardCoordinator:               pcf.bootstrapComponents.ShardCoordinator(),
+		EpochNotifier:                  pcf.coreData.EpochNotifier(),
+		EnableEpochsHandler:            pcf.coreData.EnableEpochsHandler(),
+		GuardedAccountHandler:          pcf.bootstrapComponents.GuardedAccountHandler(),
+		AutomaticCrawlerAddresses:      convertedAddresses,
+		MaxNumAddressesInTransferRole:  pcf.config.BuiltInFunctions.MaxNumAddressesInTransferRole,
+		SelfESDTPrefix:                 []byte(pcf.systemSCConfig.ESDTSystemSCConfig.ESDTPrefix),
+		PubKeyConverter:                pcf.coreData.AddressPubKeyConverter(),
 	}
 
 	return builtInFunctions.CreateBuiltInFunctionsFactory(argsBuiltIn)

genesis/process/shardGenesisBlockCreator.go

@@ -362,18 +362,21 @@ func createProcessorsForShardGenesisBlock(arg ArgsGenesisBlockCreator, enableEpo
 	}
 
 	argsBuiltIn := builtInFunctions.ArgsCreateBuiltInFunctionContainer{
-		GasSchedule:               arg.GasSchedule,
-		MapDNSAddresses:           make(map[string]struct{}),
-		MapDNSV2Addresses:         make(map[string]struct{}),
-		EnableUserNameChange:      false,
-		Marshalizer:               arg.Core.InternalMarshalizer(),
-		Accounts:                  arg.Accounts,
-		ShardCoordinator:          arg.ShardCoordinator,
-		EpochNotifier:             epochNotifier,
-		EnableEpochsHandler:       enableEpochsHandler,
-		AutomaticCrawlerAddresses: [][]byte{make([]byte, 32)},
-		MaxNumNodesInTransferRole: math.MaxUint32,
-		GuardedAccountHandler:     disabledGuardian.NewDisabledGuardedAccountHandler(),
+		GasSchedule:                    arg.GasSchedule,
+		MapDNSAddresses:                make(map[string]struct{}),
+		DNSV2Addresses:                 []string{},
+		WhiteListedCrossChainAddresses: arg.VirtualMachineConfig.TransferAndExecuteByUserAddresses,
+		EnableUserNameChange:           false,
+		Marshalizer:                    arg.Core.InternalMarshalizer(),
+		Accounts:                       arg.Accounts,
+		ShardCoordinator:               arg.ShardCoordinator,
+		EpochNotifier:                  epochNotifier,
+		EnableEpochsHandler:            enableEpochsHandler,
+		AutomaticCrawlerAddresses:      [][]byte{make([]byte, 32)},
+		MaxNumAddressesInTransferRole:  math.MaxUint32,
+		GuardedAccountHandler:          disabledGuardian.NewDisabledGuardedAccountHandler(),
+		SelfESDTPrefix:                 []byte(arg.SystemSCConfig.ESDTSystemSCConfig.ESDTPrefix),
+		PubKeyConverter:                arg.Core.AddressPubKeyConverter(),
 	}
 	builtInFuncFactory, err := builtInFunctions.CreateBuiltInFunctionsFactory(argsBuiltIn)
 	if err != nil {

go.mod

@@ -15,13 +15,13 @@ require (
 	github.com/klauspost/cpuid/v2 v2.2.5
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/multiversx/mx-chain-communication-go v1.0.15-0.20240508074652-e128a1c05c8e
-	github.com/multiversx/mx-chain-core-go v1.2.21-0.20240508071047-fefea5737840
+	github.com/multiversx/mx-chain-core-go v1.2.21-0.20240517102534-7befa5957b5d
 	github.com/multiversx/mx-chain-crypto-go v1.2.12-0.20240508074452-cc21c1b505df
 	github.com/multiversx/mx-chain-es-indexer-go v1.7.2-0.20240514103357-929ece92ef86
 	github.com/multiversx/mx-chain-logger-go v1.0.15-0.20240508072523-3f00a726af57
 	github.com/multiversx/mx-chain-scenario-go v1.4.4-0.20240509103754-9e8129721f00
 	github.com/multiversx/mx-chain-storage-go v1.0.16-0.20240508073549-dcb8e6e0370f
-	github.com/multiversx/mx-chain-vm-common-go v1.5.13-0.20240509103544-247ce5639c7a
+	github.com/multiversx/mx-chain-vm-common-go v1.5.13-0.20240528155322-7fceea304c01
 	github.com/multiversx/mx-chain-vm-go v1.5.30-0.20240509104139-8b0eaa8a85d1
 	github.com/multiversx/mx-chain-vm-v1_2-go v1.2.68-0.20240509103859-89de3c5da36b
 	github.com/multiversx/mx-chain-vm-v1_3-go v1.3.69-0.20240509104009-598a37ff36b9

go.sum

@@ -387,8 +387,8 @@ github.com/multiversx/concurrent-map v0.1.4 h1:hdnbM8VE4b0KYJaGY5yJS2aNIW9TFFsUY
 github.com/multiversx/concurrent-map v0.1.4/go.mod h1:8cWFRJDOrWHOTNSqgYCUvwT7c7eFQ4U2vKMOp4A/9+o=
 github.com/multiversx/mx-chain-communication-go v1.0.15-0.20240508074652-e128a1c05c8e h1:Tsmwhu+UleE+l3buPuqXSKTqfu5FbPmzQ4MjMoUvCWA=
 github.com/multiversx/mx-chain-communication-go v1.0.15-0.20240508074652-e128a1c05c8e/go.mod h1:2yXl18wUbuV3cRZr7VHxM1xo73kTaC1WUcu2kx8R034=
-github.com/multiversx/mx-chain-core-go v1.2.21-0.20240508071047-fefea5737840 h1:2mCrTUmbbA+Xv4UifZY9xptrGjcJBcJ2wavSb4FwejU=
-github.com/multiversx/mx-chain-core-go v1.2.21-0.20240508071047-fefea5737840/go.mod h1:B5zU4MFyJezmEzCsAHE9YNULmGCm2zbPHvl9hazNxmE=
+github.com/multiversx/mx-chain-core-go v1.2.21-0.20240517102534-7befa5957b5d h1:Eu4VgqwCyqttR1L8u1SrqWdjec9FRwQ1ZDKC7br9a44=
+github.com/multiversx/mx-chain-core-go v1.2.21-0.20240517102534-7befa5957b5d/go.mod h1:B5zU4MFyJezmEzCsAHE9YNULmGCm2zbPHvl9hazNxmE=
 github.com/multiversx/mx-chain-crypto-go v1.2.12-0.20240508074452-cc21c1b505df h1:clihfi78bMEOWk/qw6WA4uQbCM2e2NGliqswLAvw19k=
 github.com/multiversx/mx-chain-crypto-go v1.2.12-0.20240508074452-cc21c1b505df/go.mod h1:gtJYB4rR21KBSqJlazn+2z6f9gFSqQP3KvAgL7Qgxw4=
 github.com/multiversx/mx-chain-es-indexer-go v1.7.2-0.20240514103357-929ece92ef86 h1:rw+u7qv0HO+7lRddCzfciqDcAWL9/fl2LQqU8AmVtdU=
@@ -399,8 +399,8 @@ github.com/multiversx/mx-chain-scenario-go v1.4.4-0.20240509103754-9e8129721f00
 github.com/multiversx/mx-chain-scenario-go v1.4.4-0.20240509103754-9e8129721f00/go.mod h1:pnIIfWopbDMQ1EW5Ddc6KDMqv8Qtx+hxbH9rorHpCyo=
 github.com/multiversx/mx-chain-storage-go v1.0.16-0.20240508073549-dcb8e6e0370f h1:yd/G8iPBGOEAwbaS8zndJpO6bQk7Tk72ZhmlqRasThI=
 github.com/multiversx/mx-chain-storage-go v1.0.16-0.20240508073549-dcb8e6e0370f/go.mod h1:E6nfj9EQzGxWDGM3Dn6eZWRC3qFy1G8IqOsYsBOcgWw=
-github.com/multiversx/mx-chain-vm-common-go v1.5.13-0.20240509103544-247ce5639c7a h1:7M+jXVlnl43zd2NuimL1KnAVAdpUr/QoHqG0TUKoyaM=
-github.com/multiversx/mx-chain-vm-common-go v1.5.13-0.20240509103544-247ce5639c7a/go.mod h1:RgGmPei0suQcFTHfO4cS5dxJSiokp2SM5lmNgp1icMo=
+github.com/multiversx/mx-chain-vm-common-go v1.5.13-0.20240528155322-7fceea304c01 h1:XRuuoYfKBo/7KpBL+tS1dO8n74Z3zeLWMGhSs8TOVo8=
+github.com/multiversx/mx-chain-vm-common-go v1.5.13-0.20240528155322-7fceea304c01/go.mod h1:SLOTnC9jwUQnJaDaLCpR5EfyLV+YizkzA6lGsba+Q1s=
 github.com/multiversx/mx-chain-vm-go v1.5.30-0.20240509104139-8b0eaa8a85d1 h1:5/h1i7Xd/JH9CiO3ZqvzAjdze+mAbar5sWkh2UqfLgI=
 github.com/multiversx/mx-chain-vm-go v1.5.30-0.20240509104139-8b0eaa8a85d1/go.mod h1:N3Oa8QeeHlSip4nbESQpVSLgi/WxtgIwvqfXIZm6gDs=
 github.com/multiversx/mx-chain-vm-v1_2-go v1.2.68-0.20240509103859-89de3c5da36b h1:puYO0lUyPGA5kZqsiDjGa+daDGQwj9xFs0S5urhZjU8=