Decide biggest range and startup and address feedback

stellar · Apr 11, 2024 · 9f776c6 · 9f776c6
1 parent 1a74baa
commit 9f776c6
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 32 deletions.
diff --git a/cmd/soroban-rpc/internal/jsonrpc.go b/cmd/soroban-rpc/internal/jsonrpc.go
@@ -134,6 +134,13 @@ func NewJSONRPCHandler(cfg *config.Config, params HandlerParams) Handler {
 			Logger: func(text string) { params.Logger.Debug(text) },
 		},
 	}
+
+	// Get the largest history window
+	var ledgerRangeGetter methods.LedgerRangeGetter = params.EventStore
+	if cfg.TransactionLedgerRetentionWindow > cfg.EventLedgerRetentionWindow {
+		ledgerRangeGetter = params.TransactionStore
+	}
+
 	handlers := []struct {
 		methodName           string
 		underlyingHandler    jrpc2.Handler
@@ -143,7 +150,7 @@ func NewJSONRPCHandler(cfg *config.Config, params HandlerParams) Handler {
 	}{
 		{
 			methodName:           "getHealth",
-			underlyingHandler:    methods.NewHealthCheck(params.TransactionStore, params.EventStore, cfg.MaxHealthyLedgerLatency),
+			underlyingHandler:    methods.NewHealthCheck(ledgerRangeGetter, cfg.MaxHealthyLedgerLatency),
 			longName:             "get_health",
 			queueLimit:           cfg.RequestBacklogGetHealthQueueLimit,
 			requestDurationLimit: cfg.MaxGetHealthExecutionDuration,

diff --git a/cmd/soroban-rpc/internal/methods/get_transaction.go b/cmd/soroban-rpc/internal/methods/get_transaction.go
@@ -10,6 +10,7 @@ import (
 	"github.com/creachadair/jrpc2/handler"
 	"github.com/stellar/go/xdr"
 
+	"github.com/stellar/soroban-rpc/cmd/soroban-rpc/internal/ledgerbucketwindow"
 	"github.com/stellar/soroban-rpc/cmd/soroban-rpc/internal/transactions"
 )
 
@@ -67,7 +68,7 @@ type GetTransactionRequest struct {
 }
 
 type transactionGetter interface {
-	GetTransaction(hash xdr.Hash) (transactions.Transaction, bool, transactions.StoreRange)
+	GetTransaction(hash xdr.Hash) (transactions.Transaction, bool, ledgerbucketwindow.LedgerRange)
 }
 
 func GetTransaction(getter transactionGetter, request GetTransactionRequest) (GetTransactionResponse, error) {

diff --git a/cmd/soroban-rpc/internal/methods/health.go b/cmd/soroban-rpc/internal/methods/health.go
@@ -8,36 +8,31 @@ import (
 	"github.com/creachadair/jrpc2"
 	"github.com/creachadair/jrpc2/handler"
 
-	"github.com/stellar/soroban-rpc/cmd/soroban-rpc/internal/events"
-	"github.com/stellar/soroban-rpc/cmd/soroban-rpc/internal/transactions"
+	"github.com/stellar/soroban-rpc/cmd/soroban-rpc/internal/ledgerbucketwindow"
 )
 
 type HealthCheckResult struct {
 	Status       string `json:"status"`
 	LatestLedger uint32 `json:"latestLedger"`
-	FirstLedger  uint32 `json:"firstLedger"`
+	OldestLedger uint32 `json:"oldestLedger"`
+}
+
+type LedgerRangeGetter interface {
+	GetLedgerRange() ledgerbucketwindow.LedgerRange
 }
 
 // NewHealthCheck returns a health check json rpc handler
-func NewHealthCheck(txStore *transactions.MemoryStore, evStore *events.MemoryStore, maxHealthyLedgerLatency time.Duration) jrpc2.Handler {
+func NewHealthCheck(ledgerRangeGetter LedgerRangeGetter, maxHealthyLedgerLatency time.Duration) jrpc2.Handler {
 	return handler.New(func(ctx context.Context) (HealthCheckResult, error) {
-		txLedgerRange := txStore.GetLedgerRange()
-		evLedgerRange := evStore.GetLedgerRange()
-		if txLedgerRange.FirstLedger.Sequence < 1 || evLedgerRange.FirstLedger.Sequence < 1 {
+		ledgerRange := ledgerRangeGetter.GetLedgerRange()
+		if ledgerRange.LastLedger.Sequence < 1 {
 			return HealthCheckResult{}, jrpc2.Error{
 				Code:    jrpc2.InternalError,
 				Message: "data stores are not initialized",
 			}
 		}
-		mergedRange := evLedgerRange
-		if txLedgerRange.FirstLedger.Sequence < mergedRange.FirstLedger.Sequence {
-			mergedRange.FirstLedger = txLedgerRange.FirstLedger
-		}
-		if txLedgerRange.LastLedger.Sequence > mergedRange.LastLedger.Sequence {
-			mergedRange.LastLedger = txLedgerRange.LastLedger
-		}
 
-		lastKnownLedgerCloseTime := time.Unix(mergedRange.LastLedger.CloseTime, 0)
+		lastKnownLedgerCloseTime := time.Unix(ledgerRange.LastLedger.CloseTime, 0)
 		lastKnownLedgerLatency := time.Since(lastKnownLedgerCloseTime)
 		if lastKnownLedgerLatency > maxHealthyLedgerLatency {
 			roundedLatency := lastKnownLedgerLatency.Round(time.Second)
@@ -49,8 +44,8 @@ func NewHealthCheck(txStore *transactions.MemoryStore, evStore *events.MemorySto
 		}
 		result := HealthCheckResult{
 			Status:       "healthy",
-			LatestLedger: mergedRange.LastLedger.Sequence,
-			FirstLedger:  mergedRange.FirstLedger.Sequence,
+			LatestLedger: ledgerRange.LastLedger.Sequence,
+			OldestLedger: ledgerRange.FirstLedger.Sequence,
 		}
 		return result, nil
 	})

diff --git a/cmd/soroban-rpc/internal/methods/send_transaction.go b/cmd/soroban-rpc/internal/methods/send_transaction.go
@@ -12,7 +12,6 @@ import (
 	"github.com/stellar/go/xdr"
 
 	"github.com/stellar/soroban-rpc/cmd/soroban-rpc/internal/daemon/interfaces"
-	"github.com/stellar/soroban-rpc/cmd/soroban-rpc/internal/transactions"
 )
 
 // SendTransactionResponse represents the transaction submission response returned Soroban-RPC
@@ -45,14 +44,8 @@ type SendTransactionRequest struct {
 	Transaction string `json:"transaction"`
 }
 
-// LatestLedgerStore is a store which returns the latest ingested ledger.
-type LatestLedgerStore interface {
-	// GetLatestLedger returns the latest ingested ledger.
-	GetLatestLedger() transactions.LedgerInfo
-}
-
 // NewSendTransactionHandler returns a submit transaction json rpc handler
-func NewSendTransactionHandler(daemon interfaces.Daemon, logger *log.Entry, store LatestLedgerStore, passphrase string) jrpc2.Handler {
+func NewSendTransactionHandler(daemon interfaces.Daemon, logger *log.Entry, ledgerRangeGetter LedgerRangeGetter, passphrase string) jrpc2.Handler {
 	submitter := daemon.CoreClient()
 	return handler.New(func(ctx context.Context, request SendTransactionRequest) (SendTransactionResponse, error) {
 		var envelope xdr.TransactionEnvelope
@@ -74,7 +67,7 @@ func NewSendTransactionHandler(daemon interfaces.Daemon, logger *log.Entry, stor
 		}
 		txHash := hex.EncodeToString(hash[:])
 
-		ledgerInfo := store.GetLatestLedger()
+		latestLedgerInfo := ledgerRangeGetter.GetLedgerRange().LastLedger
 		resp, err := submitter.SubmitTransaction(ctx, request.Transaction)
 		if err != nil {
 			logger.WithError(err).
@@ -110,15 +103,15 @@ func NewSendTransactionHandler(daemon interfaces.Daemon, logger *log.Entry, stor
 				DiagnosticEventsXDR:   events,
 				Status:                resp.Status,
 				Hash:                  txHash,
-				LatestLedger:          ledgerInfo.Sequence,
-				LatestLedgerCloseTime: ledgerInfo.CloseTime,
+				LatestLedger:          latestLedgerInfo.Sequence,
+				LatestLedgerCloseTime: latestLedgerInfo.CloseTime,
 			}, nil
 		case proto.TXStatusPending, proto.TXStatusDuplicate, proto.TXStatusTryAgainLater:
 			return SendTransactionResponse{
 				Status:                resp.Status,
 				Hash:                  txHash,
-				LatestLedger:          ledgerInfo.Sequence,
-				LatestLedgerCloseTime: ledgerInfo.CloseTime,
+				LatestLedger:          latestLedgerInfo.Sequence,
+				LatestLedgerCloseTime: latestLedgerInfo.CloseTime,
 			}, nil
 		default:
 			logger.WithField("status", resp.Status).