Fix getOldestNonceWithHistoricalStateGivenNodeStatus(). Accept new CL…

…I parameter: --num-historical-blocks.
multiversx · Aug 23, 2022 · 881645c · 881645c
1 parent 8702a97
commit 881645c
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 16 deletions.
diff --git a/cmd/rosetta/cli.go b/cmd/rosetta/cli.go
@@ -121,6 +121,12 @@ VERSION:
 		Usage: "Specifies the symbol of the native currency (must be EGLD for mainnet, XeGLD for testnet and devnet).",
 		Value: "EGLD",
 	}
+
+	cliFlagNumHistoricalBlocks = cli.Uint64Flag{
+		Name:  "num-historical-blocks",
+		Usage: "Specifies the (approximate) number of available historical blocks. Usually, correlated with observer's `NumEpochsToKeep`.",
+		Value: 1500,
+	}
 )
 
 func getAllCliFlags() []cli.Flag {
@@ -141,6 +147,7 @@ func getAllCliFlags() []cli.Flag {
 		cliFlagMinGasLimit,
 		cliFlagGasPerDataByte,
 		cliFlagNativeCurrencySymbol,
+		cliFlagNumHistoricalBlocks,
 	}
 }
 
@@ -162,6 +169,7 @@ type parsedCliFlags struct {
 	minGasLimit                 uint64
 	gasPerDataByte              uint64
 	nativeCurrencySymbol        string
+	numHistoricalBlocks         uint64
 }
 
 func getParsedCliFlags(ctx *cli.Context) parsedCliFlags {
@@ -183,5 +191,6 @@ func getParsedCliFlags(ctx *cli.Context) parsedCliFlags {
 		minGasLimit:                 ctx.GlobalUint64(cliFlagMinGasLimit.Name),
 		gasPerDataByte:              ctx.GlobalUint64(cliFlagGasPerDataByte.Name),
 		nativeCurrencySymbol:        ctx.GlobalString(cliFlagNativeCurrencySymbol.Name),
+		numHistoricalBlocks:         ctx.GlobalUint64(cliFlagNumHistoricalBlocks.Name),
 	}
 }
diff --git a/server/factory/provider.go b/server/factory/provider.go
@@ -39,6 +39,7 @@ type ArgsCreateNetworkProvider struct {
 	NativeCurrencySymbol        string
 	GenesisBlockHash            string
 	GenesisTimestamp            int64
+	NumHistoricalBlocks         uint64
 }
 
 // CreateNetworkProvider creates a network provider
@@ -121,6 +122,7 @@ func CreateNetworkProvider(args ArgsCreateNetworkProvider) (networkProvider, err
 		NativeCurrencySymbol:        args.NativeCurrencySymbol,
 		GenesisBlockHash:            args.GenesisBlockHash,
 		GenesisTimestamp:            args.GenesisTimestamp,
+		NumHistoricalBlocks:         args.NumHistoricalBlocks,
 
 		ObserverFacade: &components.ObserverFacade{
 			Processor:            baseProcessor,

diff --git a/server/provider/networkProvider.go b/server/provider/networkProvider.go
@@ -32,6 +32,7 @@ type ArgsNewNetworkProvider struct {
 	NativeCurrencySymbol        string
 	GenesisBlockHash            string
 	GenesisTimestamp            int64
+	NumHistoricalBlocks         uint64
 
 	ObserverFacade observerFacade
 
@@ -50,6 +51,7 @@ type networkProvider struct {
 	nativeCurrencySymbol        string
 	genesisBlockHash            string
 	genesisTimestamp            int64
+	numHistoricalBlocks         uint64
 
 	observerFacade observerFacade
 
@@ -72,6 +74,7 @@ func NewNetworkProvider(args ArgsNewNetworkProvider) (*networkProvider, error) {
 		nativeCurrencySymbol:        args.NativeCurrencySymbol,
 		genesisBlockHash:            args.GenesisBlockHash,
 		genesisTimestamp:            args.GenesisTimestamp,
+		numHistoricalBlocks:         args.NumHistoricalBlocks,
 
 		observerFacade: args.ObserverFacade,
 

diff --git a/server/provider/networkProvider_test.go b/server/provider/networkProvider_test.go
@@ -69,5 +69,6 @@ func createDefaultArgsNewNetworkProvider() ArgsNewNetworkProvider {
 		Hasher:                      testscommon.RealWorldBlake2bHasher,
 		MarshalizerForHashing:       testscommon.MarshalizerForHashing,
 		PubKeyConverter:             testscommon.RealWorldBech32PubkeyConverter,
+		NumHistoricalBlocks:         10000,
 	}
 }
diff --git a/server/provider/nodeStatus.go b/server/provider/nodeStatus.go
@@ -18,7 +18,7 @@ func (provider *networkProvider) GetNodeStatus() (*resources.AggregatedNodeStatu
 		return nil, err
 	}
 
-	oldestNonceWithHistoricalState := getOldestNonceWithHistoricalStateGivenNodeStatus(plainNodeStatus)
+	oldestNonceWithHistoricalState := provider.getOldestNonceWithHistoricalStateGivenNodeStatus(plainNodeStatus)
 	oldestBlockWithHistoricalState, err := provider.getBlockSummaryByNonce(oldestNonceWithHistoricalState)
 	if err != nil {
 		return nil, err
@@ -59,9 +59,11 @@ func getLatestNonceGivenHighestFinalNonce(highestFinalNonce uint64) uint64 {
 	return highestFinalNonce - 1
 }
 
-func getOldestNonceWithHistoricalStateGivenNodeStatus(status *resources.NodeStatus) uint64 {
-	if status.NonceAtEpochStart == 0 {
+func (provider *networkProvider) getOldestNonceWithHistoricalStateGivenNodeStatus(status *resources.NodeStatus) uint64 {
+	oldest := int64(status.HighestFinalNonce) - int64(provider.numHistoricalBlocks)
+	if oldest < int64(oldestPossibleNonceWithHistoricalState) {
 		return oldestPossibleNonceWithHistoricalState
 	}
-	return status.NonceAtEpochStart
+
+	return uint64(oldest)
 }
diff --git a/server/provider/nodeStatus_test.go b/server/provider/nodeStatus_test.go
@@ -27,8 +27,6 @@ func TestNetworkProvider_GetNodeStatusWithSuccess(t *testing.T) {
 					IsSyncing:         1,
 					HighestNonce:      7,
 					HighestFinalNonce: 5,
-					NonceAtEpochStart: 0,
-					RoundsPerEpoch:    100,
 				},
 			}
 		}
@@ -52,7 +50,6 @@ func TestNetworkProvider_GetNodeStatusWithSuccess(t *testing.T) {
 		}
 
 		// Oldest nonce with historical state (as considered by Rosetta)
-		// max(1, NonceAtEpochStart - RoundsPerEpoch)
 		if nonce == 1 {
 			return &data.BlockApiResponse{
 				Data: data.BlockApiResponsePayload{
@@ -109,15 +106,21 @@ func TestNetworkProvider_GetNodeStatusWithError(t *testing.T) {
 }
 
 func TestGetOldestNonceWithHistoricalStateGivenNodeStatus(t *testing.T) {
-	oldestNonce := getOldestNonceWithHistoricalStateGivenNodeStatus(&resources.NodeStatus{
-		NonceAtEpochStart: 0,
+	args := createDefaultArgsNewNetworkProvider()
+	args.NumHistoricalBlocks = 42
+	provider, err := NewNetworkProvider(args)
+	require.Nil(t, err)
+	require.NotNil(t, provider)
+
+	oldestNonce := provider.getOldestNonceWithHistoricalStateGivenNodeStatus(&resources.NodeStatus{
+		HighestFinalNonce: 50,
 	})
 
-	require.Equal(t, uint64(1), oldestNonce)
+	require.Equal(t, uint64(8), oldestNonce)
 
-	oldestNonce = getOldestNonceWithHistoricalStateGivenNodeStatus(&resources.NodeStatus{
-		NonceAtEpochStart: 50000,
+	oldestNonce = provider.getOldestNonceWithHistoricalStateGivenNodeStatus(&resources.NodeStatus{
+		HighestFinalNonce: 40,
 	})
 
-	require.Equal(t, uint64(50000), oldestNonce)
+	require.Equal(t, uint64(1), oldestNonce)
 }
diff --git a/server/resources/network.go b/server/resources/network.go
@@ -24,8 +24,6 @@ type NodeStatus struct {
 	IsSyncing         int    `json:"erd_is_syncing"`
 	HighestNonce      uint64 `json:"erd_nonce"`
 	HighestFinalNonce uint64 `json:"erd_highest_final_nonce"`
-	NonceAtEpochStart uint64 `json:"erd_nonce_at_epoch_start"`
-	RoundsPerEpoch    uint32 `json:"erd_rounds_per_epoch"`
 }
 
 // AggregatedNodeStatus is an aggregated resource

diff --git a/version/constants.go b/version/constants.go
@@ -5,7 +5,7 @@ const (
 	RosettaVersion = "v1.4.12"
 
 	// RosettaMiddlewareVersion is the version of this package (application)
-	RosettaMiddlewareVersion = "v0.1.9"
+	RosettaMiddlewareVersion = "v0.2.0"
 
 	// NodeVersion is the canonical version of the node runtime
 	NodeVersion = "rc/2022-july"