fix(rosetta): network status return the last committed block height

axelarnetwork · Feb 17, 2023 · 6a0c8cb · 6a0c8cb
1 parent ccd4625
commit 6a0c8cb
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/server/rosetta/converter.go b/server/rosetta/converter.go
@@ -609,14 +609,17 @@ func (c converter) HashToTxType(hashBytes []byte) (txType TransactionType, realH
 func (c converter) SyncStatus(status *tmcoretypes.ResultStatus) *rosettatypes.SyncStatus {
 	// determine sync status
 	stage := StatusPeerSynced
+	synced := true
 	if status.SyncInfo.CatchingUp {
 		stage = StatusPeerSyncing
+		synced = false
 	}
 
 	return &rosettatypes.SyncStatus{
 		CurrentIndex: &status.SyncInfo.LatestBlockHeight,
 		TargetIndex:  nil, // sync info does not allow us to get target height
 		Stage:        &stage,
+		Synced:       &synced,
 	}
 }
 

diff --git a/server/rosetta/lib/internal/service/data.go b/server/rosetta/lib/internal/service/data.go
@@ -177,17 +177,25 @@ func (on OnlineNetwork) NetworkOptions(_ context.Context, _ *types.NetworkReques
 }
 
 func (on OnlineNetwork) NetworkStatus(ctx context.Context, _ *types.NetworkRequest) (*types.NetworkStatusResponse, *types.Error) {
-	block, err := on.client.BlockByHeight(ctx, nil)
+	peers, err := on.client.Peers(ctx)
 	if err != nil {
 		return nil, errors.ToRosetta(err)
 	}
 
-	peers, err := on.client.Peers(ctx)
+	syncStatus, err := on.client.Status(ctx)
 	if err != nil {
 		return nil, errors.ToRosetta(err)
 	}
 
-	syncStatus, err := on.client.Status(ctx)
+	lastBlockHeight := *syncStatus.CurrentIndex
+	if *syncStatus.Synced {
+		lastBlockHeight, err = on.client.LastBlockHeight(ctx)
+		if err != nil {
+			return nil, errors.ToRosetta(err)
+		}
+	}
+
+	block, err := on.client.BlockByHeight(ctx, &lastBlockHeight)
 	if err != nil {
 		return nil, errors.ToRosetta(err)
 	}