Merge pull request #7096 from multiversx/fix-get-balance-opcode

sstanculeanu · web-flow · commit 31e0beac17c0 · 2025-07-08T17:54:12.000+03:00
fix get balance opcode
diff --git a/cmd/node/config/enableEpochs.toml b/cmd/node/config/enableEpochs.toml
@@ -363,6 +363,9 @@
     # BarnardOpcodesEnableEpoch represents the epoch when Barnard opcodes will be enabled
     BarnardOpcodesEnableEpoch = 2
 
+    # FixGetBalanceEnableEpoch represents the epoch when Barnard opcodes will be enabled
+    FixGetBalanceEnableEpoch = 2
+
     # AutomaticActivationOfNodesDisableEpoch represents the epoch when automatic activation of nodes for validators is disabled
     AutomaticActivationOfNodesDisableEpoch = 2
 
diff --git a/common/constants.go b/common/constants.go
@@ -761,6 +761,9 @@ const (
 	// MetricBarnardOpcodesEnableEpoch represents the epoch when Barnard opcodes will be enabled
 	MetricBarnardOpcodesEnableEpoch = "erd_barnard_opcodes_enable_epoch"
 
+	// MetricFixGetBalanceEnableEpoch represents the epoch when get balance opcode fix is enabled
+	MetricFixGetBalanceEnableEpoch = "erd_fix_get_balance_enable_epoch"
+
 	// MetricValidationOnGobDecodeEnableEpoch represents the epoch when validation on GobDecode will be taken into account
 	MetricValidationOnGobDecodeEnableEpoch = "erd_validation_on_gobdecode_enable_epoch"
 
@@ -1171,8 +1174,8 @@ const (
 	ESDTFlag                                            core.EnableEpochFlag = "ESDTFlag"
 	ESDTFlagInSpecificEpochOnly                         core.EnableEpochFlag = "ESDTFlagInSpecificEpochOnly"
 	GovernanceFlag                                      core.EnableEpochFlag = "GovernanceFlag"
-	GovernanceDisableProposeFlag                       core.EnableEpochFlag = "GovernanceDisableProposeFlag"
-	GovernanceFixesFlag                                core.EnableEpochFlag = "GovernanceFixesFlag"
+	GovernanceDisableProposeFlag                        core.EnableEpochFlag = "GovernanceDisableProposeFlag"
+	GovernanceFixesFlag                                 core.EnableEpochFlag = "GovernanceFixesFlag"
 	GovernanceFlagInSpecificEpochOnly                   core.EnableEpochFlag = "GovernanceFlagInSpecificEpochOnly"
 	DelegationManagerFlag                               core.EnableEpochFlag = "DelegationManagerFlag"
 	DelegationSmartContractFlag                         core.EnableEpochFlag = "DelegationSmartContractFlag"
@@ -1282,5 +1285,6 @@ const (
 	ValidationOnGobDecodeFlag                           core.EnableEpochFlag = "ValidationOnGobDecodeFlag"
 	BarnardOpcodesFlag                                  core.EnableEpochFlag = "BarnardOpcodesFlag"
 	AutomaticActivationOfNodesDisableFlag               core.EnableEpochFlag = "AutomaticActivationOfNodesDisableFlag"
+	FixGetBalanceFlag                                   core.EnableEpochFlag = "FixGetBalanceFlag"
 	// 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
@@ -847,6 +847,12 @@ func (handler *enableEpochsHandler) createAllFlagsMap() {
 			},
 			activationEpoch: handler.enableEpochsConfig.BarnardOpcodesEnableEpoch,
 		},
+		common.FixGetBalanceFlag: {
+			isActiveInEpoch: func(epoch uint32) bool {
+				return epoch >= handler.enableEpochsConfig.FixGetBalanceEnableEpoch
+			},
+			activationEpoch: handler.enableEpochsConfig.FixGetBalanceEnableEpoch,
+		},
 	}
 }
 
diff --git a/common/enablers/enableEpochsHandler_test.go b/common/enablers/enableEpochsHandler_test.go
@@ -474,6 +474,7 @@ func TestEnableEpochsHandler_GetActivationEpoch(t *testing.T) {
 	require.Equal(t, cfg.ValidationOnGobDecodeEnableEpoch, handler.GetActivationEpoch(common.ValidationOnGobDecodeFlag))
 	require.Equal(t, cfg.BarnardOpcodesEnableEpoch, handler.GetActivationEpoch(common.BarnardOpcodesFlag))
 	require.Equal(t, cfg.AutomaticActivationOfNodesDisableEpoch, handler.GetActivationEpoch(common.AutomaticActivationOfNodesDisableFlag))
+	require.Equal(t, cfg.FixGetBalanceEnableEpoch, handler.GetActivationEpoch(common.FixGetBalanceFlag))
 }
 
 func TestEnableEpochsHandler_IsInterfaceNil(t *testing.T) {
diff --git a/config/epochConfig.go b/config/epochConfig.go
@@ -132,6 +132,7 @@ type EnableEpochs struct {
 	FixBackTransferOPCODEEnableEpoch                         uint32
 	ValidationOnGobDecodeEnableEpoch                         uint32
 	BarnardOpcodesEnableEpoch                                uint32
+	FixGetBalanceEnableEpoch                                 uint32
 	AutomaticActivationOfNodesDisableEpoch                   uint32
 	BLSMultiSignerEnableEpoch                                []MultiSignerConfig
 }
diff --git a/config/tomlConfig_test.go b/config/tomlConfig_test.go
@@ -938,6 +938,9 @@ func TestEnableEpochConfig(t *testing.T) {
     # AutomaticActivationOfNodesDisableEpoch represents the epoch when automatic activation of nodes for validators is disabled
     AutomaticActivationOfNodesDisableEpoch = 111
 
+    # FixGetBalanceEnableEpoch represents the epoch when Barnard opcodes will be enabled
+    FixGetBalanceEnableEpoch = 112
+
     # MaxNodesChangeEnableEpoch holds configuration for changing the maximum number of nodes and the enabling epoch
     MaxNodesChangeEnableEpoch = [
         { EpochEnable = 44, MaxNumNodes = 2169, NodesToShufflePerShard = 80 },
@@ -1069,6 +1072,7 @@ func TestEnableEpochConfig(t *testing.T) {
 			ValidationOnGobDecodeEnableEpoch:                         109,
 			BarnardOpcodesEnableEpoch:                                110,
 			AutomaticActivationOfNodesDisableEpoch:                   111,
+			FixGetBalanceEnableEpoch:                                 112,
 			MaxNodesChangeEnableEpoch: []MaxNodesChangeConfig{
 				{
 					EpochEnable:            44,
diff --git a/go.mod b/go.mod
@@ -24,7 +24,7 @@ require (
 	github.com/multiversx/mx-chain-scenario-go v1.6.0
 	github.com/multiversx/mx-chain-storage-go v1.1.0
 	github.com/multiversx/mx-chain-vm-common-go v1.6.0
-	github.com/multiversx/mx-chain-vm-go v1.5.41
+	github.com/multiversx/mx-chain-vm-go v1.6.1-0.20250707105646-d7048a2657c2
 	github.com/multiversx/mx-chain-vm-v1_2-go v1.2.69
 	github.com/multiversx/mx-chain-vm-v1_3-go v1.3.70
 	github.com/multiversx/mx-chain-vm-v1_4-go v1.4.99
diff --git a/go.sum b/go.sum
@@ -415,8 +415,8 @@ github.com/multiversx/mx-chain-storage-go v1.1.0 h1:M1Y9DqMrJ62s7Zw31+cyuqsnPIvl
 github.com/multiversx/mx-chain-storage-go v1.1.0/go.mod h1:o6Jm7cjfPmcc6XpyihYWrd6sx3sgqwurrunw3ZrfyxI=
 github.com/multiversx/mx-chain-vm-common-go v1.6.0 h1:M2zmf/ptEINciWxYCPLIkwOMTvvzWjELYYB+0MMQ5Gw=
 github.com/multiversx/mx-chain-vm-common-go v1.6.0/go.mod h1:Lc7r4VDPYRDS0CVIaWAoLtf3YQn6PZEYHv4QtaOE2Z0=
-github.com/multiversx/mx-chain-vm-go v1.5.41 h1:FeIFZnmatgT3eQ8gp6Bbvu+FOvd+d/imfVlHhtVxmk0=
-github.com/multiversx/mx-chain-vm-go v1.5.41/go.mod h1:Qc2Sckw+EfQwnapkzghFfhuUAOGv29oSZgvj8LJ+xWQ=
+github.com/multiversx/mx-chain-vm-go v1.6.1-0.20250707105646-d7048a2657c2 h1:mWerES8Wk3a9NJVgsjG7d39o3IHtT5AX4uR3Znbzd8k=
+github.com/multiversx/mx-chain-vm-go v1.6.1-0.20250707105646-d7048a2657c2/go.mod h1:Qc2Sckw+EfQwnapkzghFfhuUAOGv29oSZgvj8LJ+xWQ=
 github.com/multiversx/mx-chain-vm-v1_2-go v1.2.69 h1:5gSR3IMw1mcp/v5oO+vZ5YOyWO8w7O2qKhCKNPwsWNE=
 github.com/multiversx/mx-chain-vm-v1_2-go v1.2.69/go.mod h1:Qqn+B6IBlOi5huybKlvqNYDMsAHognVI6a6uiSZvaj0=
 github.com/multiversx/mx-chain-vm-v1_3-go v1.3.70 h1:UnTw+KJcLLqkqTR6EoZksqiM8PP4/BI6RcJlx25H9hc=
diff --git a/node/metrics/metrics.go b/node/metrics/metrics.go
@@ -211,6 +211,7 @@ func InitConfigMetrics(
 	appStatusHandler.SetUInt64Value(common.MetricValidationOnGobDecodeEnableEpoch, uint64(enableEpochs.ValidationOnGobDecodeEnableEpoch))
 	appStatusHandler.SetUInt64Value(common.MetricBarnardOpcodesEnableEpoch, uint64(enableEpochs.BarnardOpcodesEnableEpoch))
 	appStatusHandler.SetUInt64Value(common.MetricAutomaticActivationOfNodesDisableEpoch, uint64(enableEpochs.AutomaticActivationOfNodesDisableEpoch))
+	appStatusHandler.SetUInt64Value(common.MetricFixGetBalanceEnableEpoch, uint64(enableEpochs.FixGetBalanceEnableEpoch))
 
 	for i, nodesChangeConfig := range enableEpochs.MaxNodesChangeEnableEpoch {
 		epochEnable := fmt.Sprintf("%s%d%s", common.MetricMaxNodesChangeEnableEpoch, i, common.EpochEnableSuffix)
diff --git a/node/metrics/metrics_test.go b/node/metrics/metrics_test.go
@@ -220,6 +220,7 @@ func TestInitConfigMetrics(t *testing.T) {
 			ValidationOnGobDecodeEnableEpoch:                         112,
 			BarnardOpcodesEnableEpoch:                                113,
 			AutomaticActivationOfNodesDisableEpoch:                   114,
+			FixGetBalanceEnableEpoch:                                 115,
 			MaxNodesChangeEnableEpoch: []config.MaxNodesChangeConfig{
 				{
 					EpochEnable:            0,
@@ -349,6 +350,7 @@ func TestInitConfigMetrics(t *testing.T) {
 		"erd_validation_on_gobdecode_enable_epoch":                             uint32(112),
 		"erd_barnard_opcodes_enable_epoch":                                     uint32(113),
 		"erd_automatic_activation_of_nodes_disable_epoch":                      uint32(114),
+		"erd_fix_get_balance_enable_epoch":                                     uint32(115),
 		"erd_max_nodes_change_enable_epoch":                                    nil,
 		"erd_total_supply":                                                     "12345",
 		"erd_hysteresis":                                                       "0.100000",
diff --git a/statusHandler/statusMetricsProvider.go b/statusHandler/statusMetricsProvider.go
@@ -388,6 +388,7 @@ func (sm *statusMetrics) EnableEpochsMetrics() (map[string]interface{}, error) {
 	enableEpochsMetrics[common.MetricValidationOnGobDecodeEnableEpoch] = sm.uint64Metrics[common.MetricValidationOnGobDecodeEnableEpoch]
 	enableEpochsMetrics[common.MetricBarnardOpcodesEnableEpoch] = sm.uint64Metrics[common.MetricBarnardOpcodesEnableEpoch]
 	enableEpochsMetrics[common.MetricAutomaticActivationOfNodesDisableEpoch] = sm.uint64Metrics[common.MetricAutomaticActivationOfNodesDisableEpoch]
+	enableEpochsMetrics[common.MetricFixGetBalanceEnableEpoch] = sm.uint64Metrics[common.MetricFixGetBalanceEnableEpoch]
 
 	numNodesChangeConfig := sm.uint64Metrics[common.MetricMaxNodesChangeEnableEpoch+"_count"]
 
diff --git a/statusHandler/statusMetricsProvider_test.go b/statusHandler/statusMetricsProvider_test.go
@@ -415,6 +415,7 @@ func TestStatusMetrics_EnableEpochMetrics(t *testing.T) {
 	sm.SetUInt64Value(common.MetricValidationOnGobDecodeEnableEpoch, uint64(4))
 	sm.SetUInt64Value(common.MetricBarnardOpcodesEnableEpoch, uint64(4))
 	sm.SetUInt64Value(common.MetricAutomaticActivationOfNodesDisableEpoch, uint64(4))
+	sm.SetUInt64Value(common.MetricFixGetBalanceEnableEpoch, uint64(4))
 
 	maxNodesChangeConfig := []map[string]uint64{
 		{
@@ -554,6 +555,7 @@ func TestStatusMetrics_EnableEpochMetrics(t *testing.T) {
 		common.MetricValidationOnGobDecodeEnableEpoch:                         uint64(4),
 		common.MetricBarnardOpcodesEnableEpoch:                                uint64(4),
 		common.MetricAutomaticActivationOfNodesDisableEpoch:                   uint64(4),
+		common.MetricFixGetBalanceEnableEpoch:                                 uint64(4),
 		common.MetricMaxNodesChangeEnableEpoch: []map[string]interface{}{
 			{
 				common.MetricEpochEnable:            uint64(0),

Original file line number	Diff line number	Diff line change
`@@ -847,6 +847,12 @@ func (handler *enableEpochsHandler) createAllFlagsMap() {`
`847`	`847`	`},`
`848`	`848`	`activationEpoch: handler.enableEpochsConfig.BarnardOpcodesEnableEpoch,`
`849`	`849`	`},`
	`850`	`+ common.FixGetBalanceFlag: {`
	`851`	`+ isActiveInEpoch: func(epoch uint32) bool {`
	`852`	`+ return epoch >= handler.enableEpochsConfig.FixGetBalanceEnableEpoch`
	`853`	`+ },`
	`854`	`+ activationEpoch: handler.enableEpochsConfig.FixGetBalanceEnableEpoch,`
	`855`	`+ },`
`850`	`856`	`}`
`851`	`857`	`}`
`852`	`858`
Original file line number	Diff line number	Diff line change
`@@ -474,6 +474,7 @@ func TestEnableEpochsHandler_GetActivationEpoch(t *testing.T) {`
`474`	`474`	`require.Equal(t, cfg.ValidationOnGobDecodeEnableEpoch, handler.GetActivationEpoch(common.ValidationOnGobDecodeFlag))`
`475`	`475`	`require.Equal(t, cfg.BarnardOpcodesEnableEpoch, handler.GetActivationEpoch(common.BarnardOpcodesFlag))`
`476`	`476`	`require.Equal(t, cfg.AutomaticActivationOfNodesDisableEpoch, handler.GetActivationEpoch(common.AutomaticActivationOfNodesDisableFlag))`
	`477`	`+ require.Equal(t, cfg.FixGetBalanceEnableEpoch, handler.GetActivationEpoch(common.FixGetBalanceFlag))`
`477`	`478`	`}`
`478`	`479`
`479`	`480`	`func TestEnableEpochsHandler_IsInterfaceNil(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,7 @@ type EnableEpochs struct {`
`132`	`132`	`FixBackTransferOPCODEEnableEpoch uint32`
`133`	`133`	`ValidationOnGobDecodeEnableEpoch uint32`
`134`	`134`	`BarnardOpcodesEnableEpoch uint32`
	`135`	`+ FixGetBalanceEnableEpoch uint32`
`135`	`136`	`AutomaticActivationOfNodesDisableEpoch uint32`
`136`	`137`	`BLSMultiSignerEnableEpoch []MultiSignerConfig`
`137`	`138`	`}`