Fix passing of CLI params, add test config params.

multiversx · Aug 22, 2024 · 619eea4 · 619eea4
1 parent 406b3fc
commit 619eea4
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git a/cmd/rosetta/cli.go b/cmd/rosetta/cli.go
@@ -170,7 +170,7 @@ VERSION:
 	}
 
 	cliFlagActivationEpochSirius = cli.UintFlag{
-		Name:     "activation-epoch-spica",
+		Name:     "activation-epoch-sirius",
 		Usage:    "Specifies the activation epoch for Sirius release.",
 		Required: false,
 		Value:    1265,

diff --git a/cmd/rosetta/main.go b/cmd/rosetta/main.go
@@ -82,7 +82,7 @@ func startRosetta(ctx *cli.Context) error {
 		FirstHistoricalEpoch:        cliFlags.firstHistoricalEpoch,
 		NumHistoricalEpochs:         cliFlags.numHistoricalEpochs,
 		ShouldHandleContracts:       cliFlags.shouldHandleContracts,
-		ActivationEpochSirius:       cliFlags.activationEpochSpica,
+		ActivationEpochSirius:       cliFlags.activationEpochSirius,
 		ActivationEpochSpica:        cliFlags.activationEpochSpica,
 	})
 	if err != nil {

diff --git a/server/provider/networkProvider.go b/server/provider/networkProvider.go
@@ -470,7 +470,7 @@ func (provider *networkProvider) ComputeTransactionFeeForMoveBalance(tx *transac
 
 // IsReleaseSiriusActive returns whether the Sirius release is active in the provided epoch
 func (provider *networkProvider) IsReleaseSiriusActive(epoch uint32) bool {
-	return epoch < provider.activationEpochSpica
+	return epoch >= provider.activationEpochSirius
 }
 
 // IsReleaseSpicaActive returns whether the Spica release is active in the provided epoch

diff --git a/systemtests/check_with_mesh_cli.py b/systemtests/check_with_mesh_cli.py
@@ -70,6 +70,8 @@ def run_rosetta(configuration: Configuration):
         f"--config-custom-currencies={configuration.config_file_custom_currencies}",
         f"--first-historical-epoch={current_epoch}",
         f"--num-historical-epochs={configuration.num_historical_epochs}",
+        f"--activation-epoch-sirius={configuration.activation_epoch_sirius}",
+        f"--activation-epoch-spica={configuration.activation_epoch_spica}",
     ]
 
     return subprocess.Popen(command)

diff --git a/systemtests/config.py b/systemtests/config.py
@@ -13,6 +13,8 @@ class Configuration:
     num_historical_epochs: int
     observer_url: str
     proxy_url: str
+    activation_epoch_sirius: int
+    activation_epoch_spica: int
     check_construction_native_configuration_file: str
     check_construction_custom_configuration_file: str
     check_data_configuration_file: str
@@ -33,6 +35,8 @@ class Configuration:
         num_historical_epochs=2,
         observer_url="",
         proxy_url="https://gateway.multiversx.com",
+        activation_epoch_sirius=1265,
+        activation_epoch_spica=4294967295,
         check_construction_native_configuration_file="",
         check_construction_custom_configuration_file="",
         check_data_configuration_file="systemtests/mesh_cli_config/check-data.json",
@@ -50,6 +54,8 @@ class Configuration:
         num_historical_epochs=2,
         observer_url="",
         proxy_url="https://devnet-gateway.multiversx.com",
+        activation_epoch_sirius=629,
+        activation_epoch_spica=4294967295,
         check_construction_native_configuration_file="systemtests/mesh_cli_config/devnet-construction-native.json",
         check_construction_custom_configuration_file="systemtests/mesh_cli_config/devnet-construction-custom.json",
         check_data_configuration_file="systemtests/mesh_cli_config/check-data.json",
@@ -70,6 +76,8 @@ class Configuration:
         num_historical_epochs=1,
         observer_url="",
         proxy_url="https://testnet-gateway.multiversx.com",
+        activation_epoch_sirius=1,
+        activation_epoch_spica=4294967295,
         check_construction_native_configuration_file="systemtests/mesh_cli_config/testnet-construction-native.json",
         check_construction_custom_configuration_file="systemtests/mesh_cli_config/testnet-construction-custom.json",
         check_data_configuration_file="systemtests/mesh_cli_config/check-data.json",
@@ -90,6 +98,8 @@ class Configuration:
         num_historical_epochs=2,
         observer_url="",
         proxy_url="http://localhost:7950",
+        activation_epoch_sirius=1,
+        activation_epoch_spica=4294967295,
         check_construction_native_configuration_file="systemtests/mesh_cli_config/localnet-construction-native.json",
         check_construction_custom_configuration_file="systemtests/mesh_cli_config/localnet-construction-custom.json",
         check_data_configuration_file="systemtests/mesh_cli_config/check-data.json",