speedup staking requests

Author: mr-tron

pkg/api/interfaces.go

@@ -52,7 +52,7 @@ type storage interface {
 	GetWhalesPoolMemberInfo(ctx context.Context, pool, member tongo.AccountID) (core.Nominator, error)
 	GetWhalesPoolInfo(ctx context.Context, id tongo.AccountID) (abi.GetParams_WhalesNominatorResult, abi.GetStakingStatusResult, int, uint64, error)
 	GetParticipatingInTfPools(ctx context.Context, member tongo.AccountID) ([]core.Nominator, error)
-	GetTFPools(ctx context.Context, onlyVerified bool) ([]core.TFPool, error)
+	GetTFPools(ctx context.Context, onlyVerified bool, availableFor *tongo.AccountID) ([]core.TFPool, error)
 	GetTFPool(ctx context.Context, pool tongo.AccountID) (core.TFPool, error)
 	GetLiquidPool(ctx context.Context, pool tongo.AccountID) (core.LiquidPool, error)
 	GetParticipatingInLiquidPools(ctx context.Context, member tongo.AccountID) ([]core.Nominator, error)

pkg/api/staking_handlers.go

@@ -89,11 +89,6 @@ func (h *Handler) GetStakingPoolInfo(ctx context.Context, params oas.GetStakingP
 
 func (h *Handler) GetStakingPools(ctx context.Context, params oas.GetStakingPoolsParams) (*oas.GetStakingPoolsOK, error) {
 	var result oas.GetStakingPoolsOK
-	tfPools, err := h.storage.GetTFPools(ctx, !params.IncludeUnverified.Value)
-	if err != nil {
-		return nil, toError(http.StatusInternalServerError, err)
-	}
-	var minTF, minWhales int64
 	var availableFor *tongo.AccountID
 	var participatePools []tongo.AccountID
 	if params.AvailableFor.IsSet() {
@@ -110,13 +105,12 @@ func (h *Handler) GetStakingPools(ctx context.Context, params oas.GetStakingPool
 			participatePools = append(participatePools, p.Pool)
 		}
 	}
+	tfPools, err := h.storage.GetTFPools(ctx, !params.IncludeUnverified.Value, availableFor)
+	if err != nil {
+		return nil, toError(http.StatusInternalServerError, err)
+	}
+	var minTF, minWhales int64
 	for _, p := range tfPools {
-		if availableFor != nil && !slices.Contains(participatePools, p.Address) &&
-			(p.Nominators >= p.MaxNominators || //hide nominators without slots
-				p.ValidatorShare < 4000 || //hide validators which take less than 40%
-				p.MinNominatorStake < 10_000_000_000_000) { //hide nominators with unsafe minimal stake
-			continue
-		}
 		info, _ := h.addressBook.GetTFPoolInfo(p.Address)
 		pool := convertStakingTFPool(p, info, h.state.GetAPY())
 		if minTF == 0 || pool.MinStake < minTF {
@@ -147,7 +141,6 @@ func (h *Handler) GetStakingPools(ctx context.Context, params oas.GetStakingPool
 		}
 		result.Pools = append(result.Pools, pool)
 	}
-
 	liquidPools, err := h.storage.GetLiquidPools(ctx, !params.IncludeUnverified.Value)
 	if err != nil {
 		return nil, toError(http.StatusInternalServerError, err)
@@ -171,7 +164,6 @@ func (h *Handler) GetStakingPools(ctx context.Context, params oas.GetStakingPool
 		p.Name = info.Name
 		result.Pools = append(result.Pools, convertLiquidStaking(p, cycleStart, cycleEnd))
 	}
-
 	slices.SortFunc(result.Pools, func(a, b oas.PoolInfo) int {
 		if a.Apy == b.Apy {
 			return 0
@@ -202,7 +194,6 @@ func (h *Handler) GetStakingPools(ctx context.Context, params oas.GetStakingPool
 			Socials:     references.TonstakersSocialLinks,
 		},
 	})
-
 	return &result, nil
 }
 

pkg/litestorage/config.go

@@ -2,7 +2,9 @@ package litestorage
 
 import (
 	"context"
+	"time"
 
+	cache "github.com/Code-Hex/go-generics-cache"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/tonkeeper/opentonapi/pkg/core"
 	"github.com/tonkeeper/tongo/tlb"
@@ -14,7 +16,17 @@ func (c *LiteStorage) GetLastConfig(ctx context.Context) (tlb.ConfigParams, erro
 		storageTimeHistogramVec.WithLabelValues("get_last_config").Observe(v)
 	}))
 	defer timer.ObserveDuration()
-	return c.client.GetConfigAll(ctx, 0)
+	config, prs := c.configCache.Get(1)
+	if prs {
+		return config, nil
+
+	}
+	config, err := c.client.GetConfigAll(ctx, 0)
+	if err != nil {
+		return tlb.ConfigParams{}, err
+	}
+	c.configCache.Set(1, config, cache.WithExpiration(time.Second*1)) //todo: remove
+	return config, err
 }
 
 func (c *LiteStorage) GetConfigFromBlock(ctx context.Context, id ton.BlockID) (tlb.ConfigParams, error) {

pkg/litestorage/litestorage.go

@@ -88,6 +88,7 @@ type LiteStorage struct {
 	// trackingAccounts is a list of accounts we track. Defined with ACCOUNTS env variable.
 	trackingAccounts  map[tongo.AccountID]struct{}
 	pubKeyByAccountID *xsync.MapOf[tongo.AccountID, ed25519.PublicKey]
+	configCache       cache.Cache[int, tlb.ConfigParams]
 
 	stopCh chan struct{}
 	// mu protects trimmedConfigBase64.
@@ -168,6 +169,7 @@ func NewLiteStorage(log *zap.Logger, cli *liteapi.Client, opts ...Option) (*Lite
 		accountInterfacesCache:  xsync.NewTypedMapOf[tongo.AccountID, []abi.ContractInterface](hashAccountID),
 		pubKeyByAccountID:       xsync.NewTypedMapOf[tongo.AccountID, ed25519.PublicKey](hashAccountID),
 		tvmLibraryCache:         cache.NewLRUCache[string, boc.Cell](10000, "tvm_libraries"),
+		configCache:             cache.NewLRUCache[int, tlb.ConfigParams](4, "config"),
 	}
 	storage.knownAccounts["tf_pools"] = o.tfPools
 	storage.knownAccounts["jettons"] = o.jettons

pkg/litestorage/stacking.go

@@ -7,6 +7,7 @@ import (
 	"math/big"
 
 	"github.com/tonkeeper/tongo/tlb"
+	"github.com/tonkeeper/tongo/ton"
 
 	"github.com/prometheus/client_golang/prometheus"
 
@@ -159,13 +160,21 @@ func (s *LiteStorage) GetTFPool(ctx context.Context, pool tongo.AccountID) (core
 		VerifiedSources:   bytes.Equal(hash, references.TFPoolCodeHash[:]),
 	}, nil
 }
-func (s *LiteStorage) GetTFPools(ctx context.Context, onlyVerified bool) ([]core.TFPool, error) {
+func (s *LiteStorage) GetTFPools(ctx context.Context, onlyVerified bool, availableFor *ton.AccountID) ([]core.TFPool, error) {
 	var result []core.TFPool
 	for _, a := range s.knownAccounts["tf_pools"] {
 		p, err := s.GetTFPool(ctx, a)
 		if err != nil {
 			continue
 		}
+		if availableFor != nil {
+			var i big.Int
+			i.SetBytes(availableFor.Address[:])
+			_, _, err := abi.GetNominatorData(ctx, s.executor, a, tlb.Int257(i))
+			if err != nil && p.Nominators >= p.MaxNominators {
+				continue
+			}
+		}
 		result = append(result, p)
 	}
 	return result, nil