Cleanup: remove legacy logic around the pre-Sirius era.

andreibancioiu · andreibancioiu · commit 921d984f686c · 2025-07-09T11:10:45.000+03:00
diff --git a/cmd/rosetta/cli.go b/cmd/rosetta/cli.go
@@ -175,9 +175,9 @@ VERSION:
 
 	cliFlagActivationEpochSirius = cli.UintFlag{
 		Name:     "activation-epoch-sirius",
-		Usage:    "Specifies the activation epoch for Sirius release.",
+		Usage:    "Deprecated (not used anymore).",
 		Required: false,
-		Value:    1265,
+		Value:    0,
 	}
 
 	cliFlagActivationEpochSpica = cli.UintFlag{
@@ -253,7 +253,6 @@ type parsedCliFlags struct {
 	numHistoricalEpochs         uint32
 	shouldHandleContracts       bool
 	configFileCustomCurrencies  string
-	activationEpochSirius       uint32
 	activationEpochSpica        uint32
 	shouldEnablePprofEndpoints  bool
 }
@@ -286,7 +285,6 @@ func getParsedCliFlags(ctx *cli.Context) parsedCliFlags {
 		numHistoricalEpochs:         uint32(ctx.GlobalUint(cliFlagNumHistoricalEpochs.Name)),
 		shouldHandleContracts:       ctx.GlobalBool(cliFlagShouldHandleContracts.Name),
 		configFileCustomCurrencies:  ctx.GlobalString(cliFlagConfigFileCustomCurrencies.Name),
-		activationEpochSirius:       uint32(ctx.GlobalUint(cliFlagActivationEpochSirius.Name)),
 		activationEpochSpica:        uint32(ctx.GlobalUint(cliFlagActivationEpochSpica.Name)),
 		shouldEnablePprofEndpoints:  ctx.GlobalBool(cliFlagShouldEnablePprofEndpoints.Name),
 	}
diff --git a/cmd/rosetta/main.go b/cmd/rosetta/main.go
@@ -83,7 +83,6 @@ func startRosetta(ctx *cli.Context) error {
 		FirstHistoricalEpoch:        cliFlags.firstHistoricalEpoch,
 		NumHistoricalEpochs:         cliFlags.numHistoricalEpochs,
 		ShouldHandleContracts:       cliFlags.shouldHandleContracts,
-		ActivationEpochSirius:       cliFlags.activationEpochSirius,
 		ActivationEpochSpica:        cliFlags.activationEpochSpica,
 	})
 	if err != nil {
diff --git a/server/factory/interface.go b/server/factory/interface.go
@@ -35,7 +35,6 @@ type NetworkProvider interface {
 	ComputeReceiptHash(apiReceipt *transaction.ApiReceipt) (string, error)
 	ComputeTransactionFeeForMoveBalance(tx *transaction.ApiTransactionResult) *big.Int
 	GetMempoolTransactionByHash(hash string) (*transaction.ApiTransactionResult, error)
-	IsReleaseSiriusActive(epoch uint32) bool
 	IsReleaseSpicaActive(epoch uint32) bool
 	LogDescription()
 }
diff --git a/server/factory/provider.go b/server/factory/provider.go
@@ -50,7 +50,6 @@ type ArgsCreateNetworkProvider struct {
 	FirstHistoricalEpoch        uint32
 	NumHistoricalEpochs         uint32
 	ShouldHandleContracts       bool
-	ActivationEpochSirius       uint32
 	ActivationEpochSpica        uint32
 }
 
@@ -149,7 +148,6 @@ func CreateNetworkProvider(args ArgsCreateNetworkProvider) (NetworkProvider, err
 		FirstHistoricalEpoch:        args.FirstHistoricalEpoch,
 		NumHistoricalEpochs:         args.NumHistoricalEpochs,
 		ShouldHandleContracts:       args.ShouldHandleContracts,
-		ActivationEpochSirius:       args.ActivationEpochSirius,
 		ActivationEpochSpica:        args.ActivationEpochSpica,
 
 		ObserverFacade: &components.ObserverFacade{
diff --git a/server/provider/networkProvider.go b/server/provider/networkProvider.go
@@ -43,7 +43,6 @@ type ArgsNewNetworkProvider struct {
 	FirstHistoricalEpoch        uint32
 	NumHistoricalEpochs         uint32
 	ShouldHandleContracts       bool
-	ActivationEpochSirius       uint32
 	ActivationEpochSpica        uint32
 
 	ObserverFacade observerFacade
@@ -67,7 +66,6 @@ type networkProvider struct {
 	firstHistoricalEpoch        uint32
 	numHistoricalEpochs         uint32
 	shouldHandleContracts       bool
-	activationEpochSirius       uint32
 	activationEpochSpica        uint32
 
 	observerFacade observerFacade
@@ -109,7 +107,6 @@ func NewNetworkProvider(args ArgsNewNetworkProvider) (*networkProvider, error) {
 		firstHistoricalEpoch:        args.FirstHistoricalEpoch,
 		numHistoricalEpochs:         args.NumHistoricalEpochs,
 		shouldHandleContracts:       args.ShouldHandleContracts,
-		activationEpochSirius:       args.ActivationEpochSirius,
 		activationEpochSpica:        args.ActivationEpochSpica,
 
 		observerFacade: args.ObserverFacade,
@@ -476,11 +473,6 @@ func (provider *networkProvider) ComputeTransactionFeeForMoveBalance(tx *transac
 	return fee
 }
 
-// IsReleaseSiriusActive returns whether the Sirius release is active in the provided epoch
-func (provider *networkProvider) IsReleaseSiriusActive(epoch uint32) bool {
-	return epoch >= provider.activationEpochSirius
-}
-
 // IsReleaseSpicaActive returns whether the Spica release is active in the provided epoch
 func (provider *networkProvider) IsReleaseSpicaActive(epoch uint32) bool {
 	return epoch >= provider.activationEpochSpica
@@ -499,7 +491,6 @@ func (provider *networkProvider) LogDescription() {
 		"firstHistoricalEpoch", provider.firstHistoricalEpoch,
 		"numHistoricalEpochs", provider.numHistoricalEpochs,
 		"shouldHandleContracts", provider.shouldHandleContracts,
-		"activationEpochSirius", provider.activationEpochSirius,
 		"activationEpochSpica", provider.activationEpochSpica,
 		"nativeCurrency", provider.GetNativeCurrency().Symbol,
 		"customCurrencies", provider.GetCustomCurrenciesSymbols(),
diff --git a/server/services/interface.go b/server/services/interface.go
@@ -34,6 +34,5 @@ type NetworkProvider interface {
 	ComputeReceiptHash(apiReceipt *transaction.ApiReceipt) (string, error)
 	ComputeTransactionFeeForMoveBalance(tx *transaction.ApiTransactionResult) *big.Int
 	GetMempoolTransactionByHash(hash string) (*transaction.ApiTransactionResult, error)
-	IsReleaseSiriusActive(epoch uint32) bool
 	IsReleaseSpicaActive(epoch uint32) bool
 }
diff --git a/server/services/transactionEventsController.go b/server/services/transactionEventsController.go
@@ -45,10 +45,6 @@ func (controller *transactionEventsController) extractEventSCDeploy(tx *transact
 }
 
 func (controller *transactionEventsController) extractEventTransferValueOnly(tx *transaction.ApiTransactionResult) ([]*eventTransferValueOnly, error) {
-	if !controller.provider.IsReleaseSiriusActive(tx.Epoch) {
-		return make([]*eventTransferValueOnly, 0), nil
-	}
-
 	rawEvents := controller.findManyEventsByIdentifier(tx, transactionEventTransferValueOnly)
 	typedEvents := make([]*eventTransferValueOnly, 0)
 
diff --git a/server/services/transactionEventsController_test.go b/server/services/transactionEventsController_test.go
@@ -206,33 +206,6 @@ func TestTransactionEventsController_ExtractEvents(t *testing.T) {
 		require.Equal(t, "erd1tn62hjp72rznp8vq0lplva5csav6rccpqqdungpxtqz0g2hcq6uq9k4cc6", events[0].deployerAddress)
 	})
 
-	t.Run("transferValueOnly, before Sirius (not handled at all)", func(t *testing.T) {
-		topic0 := testscommon.TestContractFooShard0.PubKey
-		topic1 := testscommon.TestContractBarShard0.PubKey
-		topic2 := big.NewInt(100).Bytes()
-
-		tx := &transaction.ApiTransactionResult{
-			Epoch: 41,
-			Logs: &transaction.ApiLogs{
-				Events: []*transaction.Events{
-					{
-						Identifier: "transferValueOnly",
-						Address:    "erd1qqqqqqqqqqqqqpgqmmud45gkr78scw8numnn290dsyzc7z6kq6uqw2jcza",
-						Topics: [][]byte{
-							topic0,
-							topic1,
-							topic2,
-						},
-					},
-				},
-			},
-		}
-
-		events, err := controller.extractEventTransferValueOnly(tx)
-		require.NoError(t, err)
-		require.Len(t, events, 0)
-	})
-
 	t.Run("transferValueOnly, after Sirius, effective (intra-shard ExecuteOnDestContext)", func(t *testing.T) {
 		topic0 := big.NewInt(100).Bytes()
 		topic1 := testscommon.TestContractBarShard0.PubKey
diff --git a/server/services/transactionsTransformer.go b/server/services/transactionsTransformer.go
@@ -200,14 +200,12 @@ func (transformer *transactionsTransformer) normalTxToRosetta(tx *transaction.Ap
 
 	transfersValue := isNonZeroAmount(tx.Value)
 
-	if transformer.provider.IsReleaseSiriusActive(tx.Epoch) {
-		// Special handling of:
-		// - intra-shard contract calls, bearing value, which fail with signal error
-		// - direct contract deployments, bearing value, which fail with signal error
-		// For these, the protocol does not generate an explicit SCR with the value refund (before Sirius, in some cases, it did).
-		// However, since the value remains at the sender, we don't emit any operations in these circumstances.
-		transfersValue = transfersValue && !transformer.featuresDetector.isContractDeploymentWithSignalErrorOrIntrashardContractCallWithSignalError(tx)
-	}
+	// Special handling of:
+	// - intra-shard contract calls, bearing value, which fail with signal error
+	// - direct contract deployments, bearing value, which fail with signal error
+	// For these, the protocol does not generate an explicit SCR with the value refund (before Sirius, in some cases, it did).
+	// However, since the value remains at the sender, we don't emit any operations in these circumstances.
+	transfersValue = transfersValue && !transformer.featuresDetector.isContractDeploymentWithSignalErrorOrIntrashardContractCallWithSignalError(tx)
 
 	if transfersValue {
 		operations = append(operations, &types.Operation{
diff --git a/systemtests/check_with_mesh_cli.py b/systemtests/check_with_mesh_cli.py
@@ -75,7 +75,6 @@ def run_rosetta(configuration: Configuration, shard: int):
         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}",
         "--handle-contracts",
         "--pprof"
diff --git a/systemtests/config.py b/systemtests/config.py
@@ -29,7 +29,6 @@ class Configuration:
     proxy_url: str
     proxy_adapter_port: int
     rosetta_port: int
-    activation_epoch_sirius: int
     activation_epoch_spica: int
     activation_epoch_relayed_v3: int
     check_construction_native_configuration_file: str
@@ -57,7 +56,6 @@ class Configuration:
         proxy_url=ENV_MAINNET_PROXY_URL or DEFAULT_MAINNET_PROXY_URL,
         proxy_adapter_port=10001,
         rosetta_port=7091,
-        activation_epoch_sirius=1265,
         activation_epoch_spica=1538,
         activation_epoch_relayed_v3=4294967295,
         check_construction_native_configuration_file="",
@@ -77,7 +75,6 @@ class Configuration:
         proxy_url=ENV_DEVNET_PROXY_URL or DEFAULT_DEVNET_PROXY_URL,
         proxy_adapter_port=10002,
         rosetta_port=7092,
-        activation_epoch_sirius=629,
         activation_epoch_spica=2327,
         activation_epoch_relayed_v3=1,
         check_construction_native_configuration_file="systemtests/mesh_cli_config/devnet-construction-native.json",
@@ -99,7 +96,6 @@ class Configuration:
         proxy_url=ENV_TESTNET_PROXY_URL or DEFAULT_TESTNET_PROXY_URL,
         proxy_adapter_port=10003,
         rosetta_port=7093,
-        activation_epoch_sirius=1,
         activation_epoch_spica=1,
         activation_epoch_relayed_v3=1,
         check_construction_native_configuration_file="systemtests/mesh_cli_config/testnet-construction-native.json",
@@ -120,7 +116,6 @@ class Configuration:
         proxy_url="http://localhost:7950",
         proxy_adapter_port=10004,
         rosetta_port=7094,
-        activation_epoch_sirius=1,
         activation_epoch_spica=1,
         activation_epoch_relayed_v3=1,
         check_construction_native_configuration_file="systemtests/mesh_cli_config/localnet-construction-native.json",
@@ -142,7 +137,6 @@ class Configuration:
         proxy_url=os.environ.get("INTERNAL_TESTNET_PROXY_URL", ""),
         proxy_adapter_port=10005,
         rosetta_port=7095,
-        activation_epoch_sirius=1,
         activation_epoch_spica=1,
         activation_epoch_relayed_v3=1,
         check_construction_native_configuration_file="systemtests/mesh_cli_config/internal-construction-native.json",
diff --git a/systemtests/generate_testdata_on_network.py b/systemtests/generate_testdata_on_network.py
@@ -69,8 +69,6 @@ def do_setup(args: Any):
 
     memento.clear()
 
-    controller.wait_until_epoch(configuration.activation_epoch_sirius)
-
     print("Do airdrops for native currency...")
     controller.do_airdrops_for_native_currency()
 
diff --git a/version/constants.go b/version/constants.go
@@ -7,5 +7,5 @@ const (
 
 var (
 	// RosettaMiddlewareVersion is the version of this package (application)
-	RosettaMiddlewareVersion = "v0.6.3"
+	RosettaMiddlewareVersion = "v0.7.0"
 )

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,6 @@ type NetworkProvider interface {`
`35`	`35`	`ComputeReceiptHash(apiReceipt *transaction.ApiReceipt) (string, error)`
`36`	`36`	`ComputeTransactionFeeForMoveBalance(tx transaction.ApiTransactionResult) big.Int`
`37`	`37`	`GetMempoolTransactionByHash(hash string) (*transaction.ApiTransactionResult, error)`
`38`		`- IsReleaseSiriusActive(epoch uint32) bool`
`39`	`38`	`IsReleaseSpicaActive(epoch uint32) bool`
`40`	`39`	`LogDescription()`
`41`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,5 @@ type NetworkProvider interface {`
`34`	`34`	`ComputeReceiptHash(apiReceipt *transaction.ApiReceipt) (string, error)`
`35`	`35`	`ComputeTransactionFeeForMoveBalance(tx transaction.ApiTransactionResult) big.Int`
`36`	`36`	`GetMempoolTransactionByHash(hash string) (*transaction.ApiTransactionResult, error)`
`37`		`- IsReleaseSiriusActive(epoch uint32) bool`
`38`	`37`	`IsReleaseSpicaActive(epoch uint32) bool`
`39`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,10 +45,6 @@ func (controller transactionEventsController) extractEventSCDeploy(tx transact`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`func (controller transactionEventsController) extractEventTransferValueOnly(tx transaction.ApiTransactionResult) ([]*eventTransferValueOnly, error) {`
`48`		`- if !controller.provider.IsReleaseSiriusActive(tx.Epoch) {`
`49`		`- return make([]*eventTransferValueOnly, 0), nil`
`50`		`- }`
`51`		`-`
`52`	`48`	`rawEvents := controller.findManyEventsByIdentifier(tx, transactionEventTransferValueOnly)`
`53`	`49`	`typedEvents := make([]*eventTransferValueOnly, 0)`
`54`	`50`