fixes after review

multiversx · Apr 29, 2024 · 82b6666 · 82b6666
1 parent e26260c
commit 82b6666
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 24 deletions.
diff --git a/cmd/node/config/enableEpochs.toml b/cmd/node/config/enableEpochs.toml
@@ -311,8 +311,8 @@
     # EGLDInMultiTransferEnableEpoch represents the epoch when EGLD in multitransfer is enabled
     EGLDInMultiTransferEnableEpoch = 4
 
-    # CryptoAPIV2EnableEpoch represents the epoch when BLSMultiSig, Secp256r1 and other opcodes are enabled
-    CryptoAPIV2EnableEpoch = 4
+    # CryptoOpcodesV2EnableEpoch represents the epoch when BLSMultiSig, Secp256r1 and other opcodes are enabled
+    CryptoOpcodesV2EnableEpoch = 4
 
     # BLSMultiSignerEnableEpoch represents the activation epoch for different types of BLS multi-signers
     BLSMultiSignerEnableEpoch = [

diff --git a/common/constants.go b/common/constants.go
@@ -1016,6 +1016,6 @@ const (
 	AlwaysMergeContextsInEEIFlag                       core.EnableEpochFlag = "AlwaysMergeContextsInEEIFlag"
 	DynamicESDTFlag                                    core.EnableEpochFlag = "DynamicEsdtFlag"
 	EGLDInESDTMultiTransferFlag                        core.EnableEpochFlag = "EGLDInESDTMultiTransferFlag"
-	CryptoAPIV2Flag                                    core.EnableEpochFlag = "CryptoAPIV2Flag"
+	CryptoOpcodesV2Flag                                core.EnableEpochFlag = "CryptoOpcodesV2Flag"
 	// all new flags must be added to createAllFlagsMap method, as part of enableEpochsHandler allFlagsDefined
 )
diff --git a/common/enablers/enableEpochsHandler.go b/common/enablers/enableEpochsHandler.go
@@ -743,11 +743,11 @@ func (handler *enableEpochsHandler) createAllFlagsMap() {
 			},
 			activationEpoch: handler.enableEpochsConfig.EGLDInMultiTransferEnableEpoch,
 		},
-		common.CryptoAPIV2Flag: {
+		common.CryptoOpcodesV2Flag: {
 			isActiveInEpoch: func(epoch uint32) bool {
-				return epoch >= handler.enableEpochsConfig.CryptoAPIV2EnableEpoch
+				return epoch >= handler.enableEpochsConfig.CryptoOpcodesV2EnableEpoch
 			},
-			activationEpoch: handler.enableEpochsConfig.CryptoAPIV2EnableEpoch,
+			activationEpoch: handler.enableEpochsConfig.CryptoOpcodesV2EnableEpoch,
 		},
 	}
 }

diff --git a/common/enablers/enableEpochsHandler_test.go b/common/enablers/enableEpochsHandler_test.go
@@ -116,7 +116,7 @@ func createEnableEpochsConfig() config.EnableEpochs {
 		AlwaysMergeContextsInEEIEnableEpoch:                      100,
 		DynamicESDTEnableEpoch:                                   101,
 		EGLDInMultiTransferEnableEpoch:                           102,
-		CryptoAPIV2EnableEpoch:                                   103,
+		CryptoOpcodesV2EnableEpoch:                               103,
 	}
 }
 
@@ -443,7 +443,7 @@ func TestEnableEpochsHandler_GetActivationEpoch(t *testing.T) {
 	require.Equal(t, cfg.AlwaysMergeContextsInEEIEnableEpoch, handler.GetActivationEpoch(common.AlwaysMergeContextsInEEIFlag))
 	require.Equal(t, cfg.DynamicESDTEnableEpoch, handler.GetActivationEpoch(common.DynamicESDTFlag))
 	require.Equal(t, cfg.EGLDInMultiTransferEnableEpoch, handler.GetActivationEpoch(common.EGLDInESDTMultiTransferFlag))
-	require.Equal(t, cfg.CryptoAPIV2EnableEpoch, handler.GetActivationEpoch(common.CryptoAPIV2Flag))
+	require.Equal(t, cfg.CryptoOpcodesV2EnableEpoch, handler.GetActivationEpoch(common.CryptoOpcodesV2Flag))
 }
 
 func TestEnableEpochsHandler_IsInterfaceNil(t *testing.T) {

diff --git a/config/epochConfig.go b/config/epochConfig.go
@@ -115,7 +115,7 @@ type EnableEpochs struct {
 	AlwaysMergeContextsInEEIEnableEpoch                      uint32
 	DynamicESDTEnableEpoch                                   uint32
 	EGLDInMultiTransferEnableEpoch                           uint32
-	CryptoAPIV2EnableEpoch                                   uint32
+	CryptoOpcodesV2EnableEpoch                               uint32
 	BLSMultiSignerEnableEpoch                                []MultiSignerConfig
 }
 

diff --git a/config/tomlConfig_test.go b/config/tomlConfig_test.go
@@ -203,7 +203,7 @@ func TestTomlParser(t *testing.T) {
             { StartEpoch = 12, Version = "v0.3" },
             { StartEpoch = 88, Version = "v1.2" },
         ]
-		TransferAndExecuteByUserAddresses = [ # TODO: set real contract addresses
+		TransferAndExecuteByUserAddresses = [
 			"erd1qqqqqqqqqqqqqpgqr46jrxr6r2unaqh75ugd308dwx5vgnhwh47qtvepe0", #shard 0
 			"erd1qqqqqqqqqqqqqpgqr46jrxr6r2unaqh75ugd308dwx5vgnhwh47qtvepe1", #shard 1
 			"erd1qqqqqqqqqqqqqpgqr46jrxr6r2unaqh75ugd308dwx5vgnhwh47qtvepe2", #shard 2
@@ -865,8 +865,8 @@ func TestEnableEpochConfig(t *testing.T) {
     # EGLDInMultiTransferEnableEpoch represents the epoch when EGLD in MultiTransfer is enabled
     EGLDInMultiTransferEnableEpoch = 96
 
-    # CryptoAPIV2EnableEpoch represents the epoch when BLSMultiSig, Secp256r1 and other opcodes are enabled
-    CryptoAPIV2EnableEpoch = 97
+    # CryptoOpcodesV2EnableEpoch represents the epoch when BLSMultiSig, Secp256r1 and other opcodes are enabled
+    CryptoOpcodesV2EnableEpoch = 97
 
     # MaxNodesChangeEnableEpoch holds configuration for changing the maximum number of nodes and the enabling epoch
     MaxNodesChangeEnableEpoch = [
@@ -982,7 +982,7 @@ func TestEnableEpochConfig(t *testing.T) {
 			AlwaysMergeContextsInEEIEnableEpoch:                      94,
 			DynamicESDTEnableEpoch:                                   95,
 			EGLDInMultiTransferEnableEpoch:                           96,
-			CryptoAPIV2EnableEpoch:                                   97,
+			CryptoOpcodesV2EnableEpoch:                               97,
 			MaxNodesChangeEnableEpoch: []MaxNodesChangeConfig{
 				{
 					EpochEnable:            44,

diff --git a/factory/api/apiResolverFactory_test.go b/factory/api/apiResolverFactory_test.go
@@ -186,7 +186,6 @@ func TestCreateApiResolver(t *testing.T) {
 		failingStepsInstance.addressPublicKeyConverterFailingStep = 3
 		apiResolver, err := api.CreateApiResolver(failingArgs)
 		require.NotNil(t, err)
-		fmt.Println(err.Error())
 		require.True(t, strings.Contains(strings.ToLower(err.Error()), "key converter"))
 		require.True(t, check.IfNil(apiResolver))
 	})

diff --git a/go.mod b/go.mod
@@ -22,7 +22,7 @@ require (
 	github.com/multiversx/mx-chain-scenario-go v1.4.3-0.20240212160120-cc32d1580157
 	github.com/multiversx/mx-chain-storage-go v1.0.15-0.20240321150623-3974ec1d6474
 	github.com/multiversx/mx-chain-vm-common-go v1.5.12-0.20240424111748-6dfa8aa14813
-	github.com/multiversx/mx-chain-vm-go v1.5.28-0.20240424134454-27f4efb28f47
+	github.com/multiversx/mx-chain-vm-go v1.5.28-0.20240429094120-31dea4df3221
 	github.com/multiversx/mx-chain-vm-v1_2-go v1.2.66-0.20240424112443-1a66307bc44e
 	github.com/multiversx/mx-chain-vm-v1_3-go v1.3.67-0.20240424112610-ab7b9e5829bd
 	github.com/multiversx/mx-chain-vm-v1_4-go v1.4.96-0.20240424113019-3a7d2b215137

diff --git a/go.sum b/go.sum
@@ -401,8 +401,8 @@ github.com/multiversx/mx-chain-storage-go v1.0.15-0.20240321150623-3974ec1d6474
 github.com/multiversx/mx-chain-storage-go v1.0.15-0.20240321150623-3974ec1d6474/go.mod h1:hnc6H4D5Ge1haRAQ6QHTXhyh+CT2DRiNJ0U0HQYI3DY=
 github.com/multiversx/mx-chain-vm-common-go v1.5.12-0.20240424111748-6dfa8aa14813 h1:pjknvxvRG1fQ6Dc0ZjFkWBwDLfPn2DbtACIwTBwYIA8=
 github.com/multiversx/mx-chain-vm-common-go v1.5.12-0.20240424111748-6dfa8aa14813/go.mod h1:G6daPJC6bFsvAw45RPMCRi2rP+8LjFxa8G+3alHuJow=
-github.com/multiversx/mx-chain-vm-go v1.5.28-0.20240424134454-27f4efb28f47 h1:RGW/1czsPJtU10ojsOGWMpWLWENbbL6ruJ7kUZkT0Zo=
-github.com/multiversx/mx-chain-vm-go v1.5.28-0.20240424134454-27f4efb28f47/go.mod h1:DyMusfHXRXyVYQmH2umBTZD5gm6p136EJNC6YI2l+kU=
+github.com/multiversx/mx-chain-vm-go v1.5.28-0.20240429094120-31dea4df3221 h1:lTJ26YdhQoANfWSfAX/fyZj6rv0vHcLUyxtZbpQn3nk=
+github.com/multiversx/mx-chain-vm-go v1.5.28-0.20240429094120-31dea4df3221/go.mod h1:DyMusfHXRXyVYQmH2umBTZD5gm6p136EJNC6YI2l+kU=
 github.com/multiversx/mx-chain-vm-v1_2-go v1.2.66-0.20240424112443-1a66307bc44e h1:Yg5Bx9iuMBpe+MTbL+VTdINlQeqjqDFIAOE4A8sWamc=
 github.com/multiversx/mx-chain-vm-v1_2-go v1.2.66-0.20240424112443-1a66307bc44e/go.mod h1:0hoqSWVXkNvg0iYWDpYQcLyCBwz0DPIrTVf3kAtXHwU=
 github.com/multiversx/mx-chain-vm-v1_3-go v1.3.67-0.20240424112610-ab7b9e5829bd h1:uM2FFSLvdWT7V8xRCaP01roTINT3rfTXAaiWQ1yFhag=

diff --git a/integrationTests/vm/txsFee/apiTransactionEvaluator_test.go b/integrationTests/vm/txsFee/apiTransactionEvaluator_test.go
@@ -2,7 +2,6 @@ package txsFee
 
 import (
 	"encoding/hex"
-	"fmt"
 	"math/big"
 	"testing"
 
@@ -48,7 +47,6 @@ func TestSCCallCostTransactionCost(t *testing.T) {
 
 	res, err := testContext.TxCostHandler.ComputeTransactionGasLimit(tx)
 	require.Nil(t, err)
-	fmt.Println(res.GasUnits)
 	require.Equal(t, uint64(15704), res.GasUnits)
 }
 
@@ -194,6 +192,5 @@ func TestAsyncESDTTransfer(t *testing.T) {
 
 	res, err := testContext.TxCostHandler.ComputeTransactionGasLimit(tx)
 	require.Nil(t, err)
-	fmt.Println(res.GasUnits)
 	require.Equal(t, uint64(177653), res.GasUnits)
 }
diff --git a/process/errors.go b/process/errors.go
@@ -1227,5 +1227,5 @@ var ErrInvalidAsyncArguments = errors.New("invalid arguments to process async/ca
 // ErrNilSentSignatureTracker defines the error for setting a nil SentSignatureTracker
 var ErrNilSentSignatureTracker = errors.New("nil sent signature tracker")
 
-// ErrTransferAndExecuteByUserAddressesIsNil signals that transfer and execute by user addresses are nil
-var ErrTransferAndExecuteByUserAddressesIsNil = errors.New("transfer and execute by user addresses are nil")
+// ErrTransferAndExecuteByUserAddressesAreNil signals that transfer and execute by user addresses are nil
+var ErrTransferAndExecuteByUserAddressesAreNil = errors.New("transfer and execute by user addresses are nil")
diff --git a/process/factory/shard/vmContainerFactory.go b/process/factory/shard/vmContainerFactory.go
@@ -134,7 +134,7 @@ func (vmf *vmContainerFactory) createMapOpCodeAddressIsAllowed() error {
 
 	transferAndExecuteByUserAddresses := vmf.config.TransferAndExecuteByUserAddresses
 	if len(transferAndExecuteByUserAddresses) == 0 {
-		return process.ErrTransferAndExecuteByUserAddressesIsNil
+		return process.ErrTransferAndExecuteByUserAddressesAreNil
 	}
 
 	vmf.mapOpcodeAddressIsAllowed[managedMultiTransferESDTNFTExecuteByUser] = make(map[string]struct{})

diff --git a/process/factory/shard/vmContainerFactory_test.go b/process/factory/shard/vmContainerFactory_test.go
@@ -154,7 +154,7 @@ func TestNewVMContainerFactory_EmptyOpcodeAddressListErr(t *testing.T) {
 	vmf, err := NewVMContainerFactory(args)
 
 	assert.Nil(t, vmf)
-	assert.Equal(t, process.ErrTransferAndExecuteByUserAddressesIsNil, err)
+	assert.Equal(t, process.ErrTransferAndExecuteByUserAddressesAreNil, err)
 }
 
 func TestNewVMContainerFactory_WrongAddressErr(t *testing.T) {