Merge branch 'feat/chain-go-sdk' into data-codec-fix

multiversx · Oct 15, 2024 · 3a56f84 · 3a56f84
2 parents ee26706 + 50b54a9
commit 3a56f84
Show file tree

Hide file tree

Showing 13 changed files with 126 additions and 38 deletions.
diff --git a/cmd/sovereignnode/chainSimulator/sovereignChainSimulator.go b/cmd/sovereignnode/chainSimulator/sovereignChainSimulator.go
@@ -43,6 +43,7 @@ func NewSovereignChainSimulator(args ArgsSovereignChainSimulator) (chainSimulato
 		cfg.GeneralConfig.SovereignConfig = *configs.SovereignExtraConfig
 		cfg.GeneralConfig.VirtualMachine.Execution.WasmVMVersions = []config.WasmVMVersionByEpoch{{StartEpoch: 0, Version: "v1.5"}}
 		cfg.GeneralConfig.VirtualMachine.Querying.WasmVMVersions = []config.WasmVMVersionByEpoch{{StartEpoch: 0, Version: "v1.5"}}
+		cfg.SystemSCConfig.ESDTSystemSCConfig.ESDTPrefix = "sov"
 
 		if alterConfigs != nil {
 			alterConfigs(cfg)

diff --git a/cmd/sovereignnode/chainSimulator/tests/basic/basic_sc_adder_test.go b/cmd/sovereignnode/chainSimulator/tests/basic/basic_sc_adder_test.go
@@ -75,7 +75,7 @@ func TestSovereignChainSimulator_SmartContract_Adder(t *testing.T) {
 
 	addedSum := big.NewInt(10)
 	addTxData := "add@" + hex.EncodeToString(addedSum.Bytes())
-	chainSim.SendTransaction(t, cs, wallet.Bytes, &nonce, deployedContractAddress, chainSim.ZeroValue, addTxData, uint64(10000000))
+	chainSim.SendTransactionWithSuccess(t, cs, wallet.Bytes, &nonce, deployedContractAddress, chainSim.ZeroValue, addTxData, uint64(10000000))
 
 	res, _, err = nodeHandler.GetFacadeHandler().ExecuteSCQuery(&process.SCQuery{
 		ScAddress:  deployedContractAddress,

diff --git a/cmd/sovereignnode/chainSimulator/tests/bridge/bridge_test.go b/cmd/sovereignnode/chainSimulator/tests/bridge/bridge_test.go
@@ -96,7 +96,7 @@ func TestSovereignChainSimulator_DeployBridgeContractsThenIssueAndDeposit(t *tes
 	expectedESDTSafeAddressBytes, err := nodeHandler.GetCoreComponents().AddressPubKeyConverter().Decode(outGoingSubscribedAddress)
 	require.Nil(t, err)
 
-	bridgeData := DeploySovereignBridgeSetup(t, cs, wallet, esdtSafeWasmPath, feeMarketWasmPath)
+	bridgeData := deploySovereignBridgeSetup(t, cs, wallet, esdtSafeWasmPath, feeMarketWasmPath)
 	require.Equal(t, expectedESDTSafeAddressBytes, bridgeData.ESDTSafeAddress)
 
 	nonce := GetNonce(t, nodeHandler, wallet.Bech32)
@@ -116,7 +116,8 @@ func TestSovereignChainSimulator_DeployBridgeContractsThenIssueAndDeposit(t *tes
 		Amount:     amountToDeposit,
 	})
 
-	Deposit(t, cs, wallet.Bytes, &nonce, bridgeData.ESDTSafeAddress, depositTokens, wallet.Bytes, nil)
+	txResult := Deposit(t, cs, wallet.Bytes, &nonce, bridgeData.ESDTSafeAddress, depositTokens, wallet.Bytes, nil)
+	chainSim.RequireSuccessfulTransaction(t, txResult)
 
 	tokens, _, err := nodeHandler.GetFacadeHandler().GetAllESDTTokens(wallet.Bech32, coreAPI.AccountQueryOptions{})
 	require.Nil(t, err)

diff --git a/cmd/sovereignnode/chainSimulator/tests/bridge/common.go b/cmd/sovereignnode/chainSimulator/tests/bridge/common.go
@@ -4,15 +4,16 @@ import (
 	"encoding/hex"
 	"testing"
 
-	coreAPI "github.com/multiversx/mx-chain-core-go/data/api"
-	chainSim "github.com/multiversx/mx-chain-go/integrationTests/chainSimulator"
-	"github.com/multiversx/mx-chain-go/node/chainSimulator/dtos"
-	"github.com/multiversx/mx-chain-go/node/chainSimulator/process"
-
 	"github.com/multiversx/mx-chain-core-go/core"
+	coreAPI "github.com/multiversx/mx-chain-core-go/data/api"
 	"github.com/multiversx/mx-chain-core-go/data/sovereign"
+	"github.com/multiversx/mx-chain-core-go/data/transaction"
 	"github.com/multiversx/mx-sdk-abi-go/abi"
 	"github.com/stretchr/testify/require"
+
+	chainSim "github.com/multiversx/mx-chain-go/integrationTests/chainSimulator"
+	"github.com/multiversx/mx-chain-go/node/chainSimulator/dtos"
+	"github.com/multiversx/mx-chain-go/node/chainSimulator/process"
 )
 
 const (
@@ -29,14 +30,14 @@ type ArgsBridgeSetup struct {
 	FeeMarketAddress []byte
 }
 
-// DeploySovereignBridgeSetup will deploy all bridge contracts
+// deploySovereignBridgeSetup will deploy all bridge contracts
 // This function will:
 // - deploy esdt-safe contract
 // - deploy fee-market contract
 // - set the fee-market address inside esdt-safe contract
 // - disable fee in fee-market contract
 // - unpause esdt-safe contract so deposit operations can start
-func DeploySovereignBridgeSetup(
+func deploySovereignBridgeSetup(
 	t *testing.T,
 	cs chainSim.ChainSimulator,
 	wallet dtos.WalletAddress,
@@ -60,11 +61,11 @@ func DeploySovereignBridgeSetup(
 
 	setFeeMarketAddressData := "setFeeMarketAddress" +
 		"@" + hex.EncodeToString(feeMarketAddress)
-	chainSim.SendTransaction(t, cs, wallet.Bytes, &nonce, esdtSafeAddress, chainSim.ZeroValue, setFeeMarketAddressData, uint64(10000000))
+	chainSim.SendTransactionWithSuccess(t, cs, wallet.Bytes, &nonce, esdtSafeAddress, chainSim.ZeroValue, setFeeMarketAddressData, uint64(10000000))
 
-	chainSim.SendTransaction(t, cs, wallet.Bytes, &nonce, feeMarketAddress, chainSim.ZeroValue, "disableFee", uint64(10000000))
+	chainSim.SendTransactionWithSuccess(t, cs, wallet.Bytes, &nonce, feeMarketAddress, chainSim.ZeroValue, "disableFee", uint64(10000000))
 
-	chainSim.SendTransaction(t, cs, wallet.Bytes, &nonce, esdtSafeAddress, chainSim.ZeroValue, "unpause", uint64(10000000))
+	chainSim.SendTransactionWithSuccess(t, cs, wallet.Bytes, &nonce, esdtSafeAddress, chainSim.ZeroValue, "unpause", uint64(10000000))
 
 	return &ArgsBridgeSetup{
 		ESDTSafeAddress:  esdtSafeAddress,
@@ -90,7 +91,7 @@ func Deposit(
 	tokens []chainSim.ArgsDepositToken,
 	receiver []byte,
 	transferData *sovereign.TransferData,
-) {
+) *transaction.ApiTransactionResult {
 	require.True(t, len(tokens) > 0)
 
 	args := make([]any, 0)
@@ -110,7 +111,7 @@ func Deposit(
 	depositArgs := core.BuiltInFunctionMultiESDTNFTTransfer +
 		"@" + multiTransferArg
 
-	chainSim.SendTransaction(t, cs, sender, nonce, sender, chainSim.ZeroValue, depositArgs, uint64(20000000))
+	return chainSim.SendTransaction(t, cs, sender, nonce, sender, chainSim.ZeroValue, depositArgs, uint64(20000000))
 }
 
 func getTransferDataValue(transferData *sovereign.TransferData) any {

diff --git a/cmd/sovereignnode/chainSimulator/tests/delegation/delegation_test.go b/cmd/sovereignnode/chainSimulator/tests/delegation/delegation_test.go
@@ -63,6 +63,7 @@ func TestSovereignChainSimulator_NewDelegationSC(t *testing.T) {
 		"@64"
 	cost := big.NewInt(0).Mul(chainSim.OneEGLD, big.NewInt(1250))
 	txResult := chainSim.SendTransaction(t, cs, wallet.Bytes, &nonce, vm.DelegationManagerSCAddress, cost, txData, uint64(60000000))
+	chainSim.RequireSuccessfulTransaction(t, txResult)
 
 	secondDelegationSCAddress := txResult.Logs.Events[1].Topics[4]
 	secondDelegationSCAddressBech32, _ := nodeHandler.GetCoreComponents().AddressPubKeyConverter().Encode(secondDelegationSCAddress)

diff --git a/cmd/sovereignnode/chainSimulator/tests/epochChange/epochChange_test.go b/cmd/sovereignnode/chainSimulator/tests/epochChange/epochChange_test.go
@@ -10,17 +10,17 @@ import (
 	"github.com/multiversx/mx-chain-core-go/data"
 	apiData "github.com/multiversx/mx-chain-core-go/data/api"
 	"github.com/multiversx/mx-chain-core-go/data/block"
-	"github.com/multiversx/mx-chain-go/dataRetriever"
-	chainSim "github.com/multiversx/mx-chain-go/integrationTests/chainSimulator"
-	"github.com/multiversx/mx-chain-go/integrationTests/chainSimulator/staking"
-	"github.com/multiversx/mx-chain-go/node/chainSimulator/process"
-	"github.com/multiversx/mx-chain-go/process/headerCheck"
 	logger "github.com/multiversx/mx-chain-logger-go"
 	"github.com/stretchr/testify/require"
 
 	"github.com/multiversx/mx-chain-go/config"
+	"github.com/multiversx/mx-chain-go/dataRetriever"
+	chainSim "github.com/multiversx/mx-chain-go/integrationTests/chainSimulator"
+	"github.com/multiversx/mx-chain-go/integrationTests/chainSimulator/staking"
 	"github.com/multiversx/mx-chain-go/node/chainSimulator"
 	"github.com/multiversx/mx-chain-go/node/chainSimulator/components/api"
+	"github.com/multiversx/mx-chain-go/node/chainSimulator/process"
+	"github.com/multiversx/mx-chain-go/process/headerCheck"
 	sovereignChainSimulator "github.com/multiversx/mx-chain-go/sovereignnode/chainSimulator"
 )
 
@@ -132,7 +132,7 @@ func TestSovereignChainSimulator_EpochChange(t *testing.T) {
 		require.Len(t, qualified, 2)
 		require.Len(t, unqualified, 8)
 
-		chainSim.SendTransaction(t, cs, wallet.Bytes, &nonce, wallet.Bytes, chainSim.ZeroValue, "data", uint64(10000000))
+		chainSim.SendTransactionWithSuccess(t, cs, wallet.Bytes, &nonce, wallet.Bytes, chainSim.ZeroValue, "data", uint64(10000000))
 
 		accFeesInEpoch, devFeesInEpoch = getAllFeesInEpoch(nodeHandler)
 		require.NotEmpty(t, accFeesInEpoch)

diff --git a/cmd/sovereignnode/chainSimulator/tests/esdt/issueNft_test.go b/cmd/sovereignnode/chainSimulator/tests/esdt/issueNft_test.go
@@ -0,0 +1,82 @@
+package esdt
+
+import (
+	"math/big"
+	"testing"
+	"time"
+
+	"github.com/multiversx/mx-chain-core-go/core"
+	coreAPI "github.com/multiversx/mx-chain-core-go/data/api"
+	"github.com/stretchr/testify/require"
+
+	"github.com/multiversx/mx-chain-go/config"
+	chainSim "github.com/multiversx/mx-chain-go/integrationTests/chainSimulator"
+	"github.com/multiversx/mx-chain-go/node/chainSimulator"
+	"github.com/multiversx/mx-chain-go/node/chainSimulator/components/api"
+	sovereignChainSimulator "github.com/multiversx/mx-chain-go/sovereignnode/chainSimulator"
+)
+
+var nftV2Roles = []string{
+	core.ESDTRoleNFTCreate,
+	core.ESDTRoleNFTBurn,
+	core.ESDTRoleNFTUpdateAttributes,
+	core.ESDTRoleNFTAddURI,
+	core.ESDTRoleNFTRecreate,
+	core.ESDTRoleModifyCreator,
+	core.ESDTRoleModifyRoyalties,
+	core.ESDTRoleSetNewURI,
+	core.ESDTRoleNFTUpdate,
+}
+
+func TestSovereignChainSimulator_RegisterNftWithPrefix(t *testing.T) {
+	if testing.Short() {
+		t.Skip("this is not a short test")
+	}
+
+	cs, err := sovereignChainSimulator.NewSovereignChainSimulator(sovereignChainSimulator.ArgsSovereignChainSimulator{
+		SovereignConfigPath: sovereignConfigPath,
+		ArgsChainSimulator: &chainSimulator.ArgsChainSimulator{
+			BypassTxSignatureCheck: true,
+			TempDir:                t.TempDir(),
+			PathToInitialConfig:    defaultPathToInitialConfig,
+			GenesisTimestamp:       time.Now().Unix(),
+			RoundDurationInMillis:  uint64(6000),
+			RoundsPerEpoch:         core.OptionalUint64{},
+			ApiInterface:           api.NewNoApiInterface(),
+			MinNodesPerShard:       2,
+			AlterConfigsFunction: func(cfg *config.Configs) {
+				cfg.SystemSCConfig.ESDTSystemSCConfig.BaseIssuingCost = issuePrice
+			},
+		},
+	})
+	require.Nil(t, err)
+	require.NotNil(t, cs)
+
+	defer cs.Close()
+
+	nodeHandler := cs.GetNodeHandler(core.SovereignChainShardId)
+
+	wallet, err := cs.GenerateAndMintWalletAddress(core.SovereignChainShardId, chainSim.InitialAmount)
+	require.Nil(t, err)
+	nonce := uint64(0)
+
+	err = cs.GenerateBlocks(1)
+	require.Nil(t, err)
+
+	issueCost, _ := big.NewInt(0).SetString(issuePrice, 10)
+	nftName := "NFTNAME"
+	nftTicker := "NFTTICKER"
+	nftIdentifier := chainSim.RegisterAndSetAllRoles(t, cs, nodeHandler, wallet.Bytes, &nonce, issueCost, nftName, nftTicker, core.NonFungibleESDTv2, 0)
+
+	checkAllRoles(t, nodeHandler, wallet.Bech32, nftIdentifier, nftV2Roles)
+
+	initialSupply := big.NewInt(1)
+	createArgs := createNftArgs(nftIdentifier, initialSupply, "NFTNAME #1")
+	chainSim.SendTransactionWithSuccess(t, cs, wallet.Bytes, &nonce, wallet.Bytes, chainSim.ZeroValue, createArgs, uint64(60000000))
+
+	tokens, _, err := nodeHandler.GetFacadeHandler().GetAllESDTTokens(wallet.Bech32, coreAPI.AccountQueryOptions{})
+	require.Nil(t, err)
+	require.NotNil(t, tokens)
+	require.True(t, len(tokens) == 2)
+	require.Equal(t, initialSupply, tokens[nftIdentifier+"-01"].Value)
+}
diff --git a/cmd/sovereignnode/chainSimulator/tests/esdt/issueSc_test.go b/cmd/sovereignnode/chainSimulator/tests/esdt/issueSc_test.go
@@ -77,7 +77,7 @@ func TestSovereignChainSimulator_SmartContract_IssueToken(t *testing.T) {
 	require.Nil(t, err)
 
 	issueCost, _ := big.NewInt(0).SetString(issuePrice, 10)
-	chainSim.SendTransaction(t, cs, wallet.Bytes, &nonce, deployedContractAddress, issueCost, "issue", uint64(60000000))
+	chainSim.SendTransactionWithSuccess(t, cs, wallet.Bytes, &nonce, deployedContractAddress, issueCost, "issue", uint64(60000000))
 
 	account, _, err := nodeHandler.GetFacadeHandler().GetAccount(deployedContractAddressBech32, coreAPI.AccountQueryOptions{})
 	require.Nil(t, err)
@@ -90,15 +90,15 @@ func TestSovereignChainSimulator_SmartContract_IssueToken(t *testing.T) {
 	tokenIdentifier := issuedESDTs[0]
 
 	setRolesArgs := "setRoles@" + hex.EncodeToString([]byte(tokenIdentifier))
-	chainSim.SendTransaction(t, cs, wallet.Bytes, &nonce, deployedContractAddress, chainSim.ZeroValue, setRolesArgs, uint64(60000000))
+	chainSim.SendTransactionWithSuccess(t, cs, wallet.Bytes, &nonce, deployedContractAddress, chainSim.ZeroValue, setRolesArgs, uint64(60000000))
 
 	checkAllRoles(t, nodeHandler, deployedContractAddressBech32, tokenIdentifier, fungibleRoles)
 
 	expectedMintedAmount, _ := big.NewInt(0).SetString("123000000000000000000", 10)
 	mintTxArgs := "mint" +
 		"@" + hex.EncodeToString([]byte(tokenIdentifier)) +
 		"@" + hex.EncodeToString(expectedMintedAmount.Bytes())
-	chainSim.SendTransaction(t, cs, wallet.Bytes, &nonce, deployedContractAddress, chainSim.ZeroValue, mintTxArgs, uint64(20000000))
+	chainSim.SendTransactionWithSuccess(t, cs, wallet.Bytes, &nonce, deployedContractAddress, chainSim.ZeroValue, mintTxArgs, uint64(20000000))
 
 	account, _, err = nodeHandler.GetFacadeHandler().GetAccount(deployedContractAddressBech32, coreAPI.AccountQueryOptions{})
 	require.Nil(t, err)

diff --git a/cmd/sovereignnode/chainSimulator/tests/esdt/issueSft_test.go b/cmd/sovereignnode/chainSimulator/tests/esdt/issueSft_test.go
@@ -69,7 +69,7 @@ func TestSovereignChainSimulator_RegisterTwoSfts(t *testing.T) {
 
 	initialSupply := big.NewInt(111)
 	createArgs := createNftArgs(sftIdentifier, initialSupply, "SFTNAME #1")
-	chainSim.SendTransaction(t, cs, wallet.Bytes, &nonce, wallet.Bytes, chainSim.ZeroValue, createArgs, uint64(60000000))
+	chainSim.SendTransactionWithSuccess(t, cs, wallet.Bytes, &nonce, wallet.Bytes, chainSim.ZeroValue, createArgs, uint64(60000000))
 
 	tokens, _, err := nodeHandler.GetFacadeHandler().GetAllESDTTokens(wallet.Bech32, coreAPI.AccountQueryOptions{})
 	require.Nil(t, err)
@@ -85,7 +85,7 @@ func TestSovereignChainSimulator_RegisterTwoSfts(t *testing.T) {
 
 	initialSupply = big.NewInt(222)
 	createArgs = createNftArgs(sftIdentifier, initialSupply, "SFTNAME #2")
-	chainSim.SendTransaction(t, cs, wallet.Bytes, &nonce, wallet.Bytes, chainSim.ZeroValue, createArgs, uint64(60000000))
+	chainSim.SendTransactionWithSuccess(t, cs, wallet.Bytes, &nonce, wallet.Bytes, chainSim.ZeroValue, createArgs, uint64(60000000))
 
 	tokens, _, err = nodeHandler.GetFacadeHandler().GetAllESDTTokens(wallet.Bech32, coreAPI.AccountQueryOptions{})
 	require.Nil(t, err)
@@ -110,6 +110,9 @@ func TestSovereignChainSimulator_IssueTwoSfts(t *testing.T) {
 			RoundsPerEpoch:         core.OptionalUint64{},
 			ApiInterface:           api.NewNoApiInterface(),
 			MinNodesPerShard:       2,
+			AlterConfigsFunction: func(cfg *config.Configs) {
+				cfg.SystemSCConfig.ESDTSystemSCConfig.BaseIssuingCost = issuePrice
+			},
 		},
 	})
 	require.Nil(t, err)
@@ -132,13 +135,13 @@ func TestSovereignChainSimulator_IssueTwoSfts(t *testing.T) {
 	sftIdentifier := chainSim.IssueSemiFungible(t, cs, nodeHandler, wallet.Bytes, &nonce, issueCost, sftName, sftTicker)
 
 	setRolesArgs := setSpecialRole(sftIdentifier, wallet.Bytes, sftRoles)
-	chainSim.SendTransaction(t, cs, wallet.Bytes, &nonce, vm.ESDTSCAddress, chainSim.ZeroValue, setRolesArgs, uint64(60000000))
+	chainSim.SendTransactionWithSuccess(t, cs, wallet.Bytes, &nonce, vm.ESDTSCAddress, chainSim.ZeroValue, setRolesArgs, uint64(60000000))
 
 	checkAllRoles(t, nodeHandler, wallet.Bech32, sftIdentifier, sftRoles)
 
 	initialSupply := big.NewInt(100)
 	createArgs := createNftArgs(sftIdentifier, initialSupply, "SFTNAME #1")
-	chainSim.SendTransaction(t, cs, wallet.Bytes, &nonce, wallet.Bytes, chainSim.ZeroValue, createArgs, uint64(60000000))
+	chainSim.SendTransactionWithSuccess(t, cs, wallet.Bytes, &nonce, wallet.Bytes, chainSim.ZeroValue, createArgs, uint64(60000000))
 
 	tokens, _, err := nodeHandler.GetFacadeHandler().GetAllESDTTokens(wallet.Bech32, coreAPI.AccountQueryOptions{})
 	require.Nil(t, err)
@@ -151,13 +154,13 @@ func TestSovereignChainSimulator_IssueTwoSfts(t *testing.T) {
 	sftIdentifier = chainSim.IssueSemiFungible(t, cs, nodeHandler, wallet.Bytes, &nonce, issueCost, sftName, sftTicker)
 
 	setRolesArgs = setSpecialRole(sftIdentifier, wallet.Bytes, sftRoles)
-	chainSim.SendTransaction(t, cs, wallet.Bytes, &nonce, vm.ESDTSCAddress, chainSim.ZeroValue, setRolesArgs, uint64(60000000))
+	chainSim.SendTransactionWithSuccess(t, cs, wallet.Bytes, &nonce, vm.ESDTSCAddress, chainSim.ZeroValue, setRolesArgs, uint64(60000000))
 
 	checkAllRoles(t, nodeHandler, wallet.Bech32, sftIdentifier, sftRoles)
 
 	initialSupply = big.NewInt(200)
 	createArgs = createNftArgs(sftIdentifier, initialSupply, "SFTNAME2 #1")
-	chainSim.SendTransaction(t, cs, wallet.Bytes, &nonce, wallet.Bytes, chainSim.ZeroValue, createArgs, uint64(60000000))
+	chainSim.SendTransactionWithSuccess(t, cs, wallet.Bytes, &nonce, wallet.Bytes, chainSim.ZeroValue, createArgs, uint64(60000000))
 
 	tokens, _, err = nodeHandler.GetFacadeHandler().GetAllESDTTokens(wallet.Bech32, coreAPI.AccountQueryOptions{})
 	require.Nil(t, err)

diff --git a/cmd/sovereignnode/chainSimulator/tests/esdt/issue_test.go b/cmd/sovereignnode/chainSimulator/tests/esdt/issue_test.go
@@ -96,7 +96,7 @@ func TestSovereignChainSimulator_IssueFungible(t *testing.T) {
 	require.Equal(t, supply, esdtSupply)
 
 	setRolesArgs := setSpecialRole(tokenIdentifier, wallet.Bytes, fungibleRoles)
-	chainSim.SendTransaction(t, cs, wallet.Bytes, &nonce, vm.ESDTSCAddress, chainSim.ZeroValue, setRolesArgs, uint64(60000000))
+	chainSim.SendTransactionWithSuccess(t, cs, wallet.Bytes, &nonce, vm.ESDTSCAddress, chainSim.ZeroValue, setRolesArgs, uint64(60000000))
 
 	checkAllRoles(t, nodeHandler, wallet.Bech32, tokenIdentifier, fungibleRoles)
 }
diff --git a/integrationTests/chainSimulator/common.go b/integrationTests/chainSimulator/common.go
@@ -417,6 +417,7 @@ func getTokenRegisterType(tokenType string) string {
 	case core.FungibleESDT:
 		return "FNG"
 	case core.NonFungibleESDT:
+	case core.NonFungibleESDTv2:
 		return "NFT"
 	case core.SemiFungibleESDT:
 		return "SFT"

diff --git a/integrationTests/chainSimulator/staking/common.go b/integrationTests/chainSimulator/staking/common.go
@@ -8,13 +8,14 @@ import (
 
 	"github.com/multiversx/mx-chain-core-go/core"
 	"github.com/multiversx/mx-chain-core-go/data/transaction"
+	"github.com/stretchr/testify/require"
+
 	chainSimulatorIntegrationTests "github.com/multiversx/mx-chain-go/integrationTests/chainSimulator"
 	"github.com/multiversx/mx-chain-go/node/chainSimulator"
 	"github.com/multiversx/mx-chain-go/node/chainSimulator/dtos"
 	chainSimulatorProcess "github.com/multiversx/mx-chain-go/node/chainSimulator/process"
 	"github.com/multiversx/mx-chain-go/process"
 	"github.com/multiversx/mx-chain-go/vm"
-	"github.com/stretchr/testify/require"
 )
 
 const (
@@ -119,10 +120,6 @@ func StakeNodes(t *testing.T, cs chainSimulatorIntegrationTests.ChainSimulator,
 		stakedBlsKeys = append(stakedBlsKeys, blsKeyBytes)
 	}
 
-	// Set state from CreateStakeTransaction needs an extra generated block to save state
-	err := cs.GenerateBlocks(1)
-	require.Nil(t, err)
-
 	stakeTxs, err := cs.SendTxsAndGenerateBlocksTilAreExecuted(txs, MaxNumOfBlockToGenerateWhenExecutingTx)
 	require.Nil(t, err)
 	require.NotNil(t, stakeTxs)
@@ -147,6 +144,9 @@ func CreateStakeTransaction(t *testing.T, cs chainSimulatorIntegrationTests.Chai
 	validatorOwner, err := cs.GenerateAndMintWalletAddress(core.AllShardId, mintValue)
 	require.Nil(t, err)
 
+	err = cs.GenerateBlocks(1)
+	require.Nil(t, err)
+
 	txDataField := fmt.Sprintf("stake@01@%s@%s", blsKeys[0], MockBLSSignature)
 	return chainSimulatorIntegrationTests.GenerateTransaction(
 			validatorOwner.Bytes,

diff --git a/integrationTests/chainSimulator/staking/stake/stakeAndUnStake_test.go b/integrationTests/chainSimulator/staking/stake/stakeAndUnStake_test.go
@@ -2523,8 +2523,6 @@ func checkKeysNotInMap(t *testing.T, m map[uint32][][]byte, keys []string) {
 
 func stakeOneNode(t *testing.T, cs chainSimulatorIntegrationTests.ChainSimulator) {
 	txStake, _ := staking.CreateStakeTransaction(t, cs)
-	require.Nil(t, cs.GenerateBlocks(1))
-
 	stakeTx, err := cs.SendTxAndGenerateBlockTilTxIsExecuted(txStake, staking.MaxNumOfBlockToGenerateWhenExecutingTx)
 	require.Nil(t, err)
 	require.NotNil(t, stakeTx)