improve cache

tools/walletextension/cache/RistrettoCache.go

@@ -49,12 +49,12 @@ func (c *ristrettoCache) EvictShortLiving() {
 	c.lastEviction = time.Now()
 }
 
-func (c *ristrettoCache) IsEvicted(key any) bool {
+func (c *ristrettoCache) IsEvicted(key any, ttl time.Duration) bool {
 	remainingTTL, notExpired := c.cache.GetTTL(key)
 	if !notExpired {
 		return true
 	}
-	cachedTime := time.Now().Add(-remainingTTL)
+	cachedTime := time.Now().Add(remainingTTL).Add(-ttl)
 	// ... LE...Cached...Now - Valid
 	// ... Cached...LE...Now - Evicted
 	return c.lastEviction.After(cachedTime)

tools/walletextension/cache/cache.go

@@ -8,7 +8,7 @@ import (
 
 type Cache interface {
 	EvictShortLiving()
-	IsEvicted(key any) bool
+	IsEvicted(key any, ttl time.Duration) bool
 	Set(key []byte, value any, ttl time.Duration) bool
 	Get(key []byte) (value any, ok bool)
 	Remove(key []byte)

tools/walletextension/rpcapi/utils.go

@@ -213,7 +213,7 @@ func withCache[R any](cache cache.Cache, cfg *CacheCfg, cacheKey []byte, onCache
 	}
 
 	cachedValue, foundInCache := cache.Get(cacheKey)
-	if foundInCache && !cache.IsEvicted(cacheKey) {
+	if foundInCache && !cache.IsEvicted(cacheKey, ttl) {
 		returnValue, ok := cachedValue.(*R)
 		if !ok {
 			return nil, fmt.Errorf("unexpected error. Invalid format cached. %v", cachedValue)

tools/walletextension/rpcapi/wallet_extension.go

@@ -9,7 +9,7 @@ import (
 
 	subscriptioncommon "github.com/ten-protocol/go-ten/go/common/subscription"
 
-	common2 "github.com/ten-protocol/go-ten/go/common"
+	tencommon "github.com/ten-protocol/go-ten/go/common"
 	"github.com/ten-protocol/go-ten/go/rpc"
 
 	"github.com/ten-protocol/go-ten/go/obsclient"
@@ -50,7 +50,7 @@ type Services struct {
 }
 
 type NewHeadNotifier interface {
-	onNewHead(header *common2.BatchHeader)
+	onNewHead(header *tencommon.BatchHeader)
 }
 
 func NewServices(hostAddrHTTP string, hostAddrWS string, storage storage.Storage, stopControl *stopcontrol.StopControl, version string, logger gethlog.Logger, config *common.Config) *Services {
@@ -110,14 +110,14 @@ func NewServices(hostAddrHTTP string, hostAddrWS string, storage storage.Storage
 	}
 
 	rpcClient := connectionObj.(rpc.Client)
-	ch := make(chan *common2.BatchHeader)
+	ch := make(chan *tencommon.BatchHeader)
 	clientSubscription, err := rpcClient.Subscribe(context.Background(), rpc.SubscribeNamespace, ch, rpc.SubscriptionTypeNewHeads)
 	if err != nil {
 		panic(fmt.Errorf("cannot subscribe to new heads to the backend %w", err))
 	}
 
 	services.backendNewHeadsSubscription = clientSubscription
-	services.NewHeadsService = subscriptioncommon.NewNewHeadsService(ch, true, logger, func(newHead *common2.BatchHeader) error {
+	services.NewHeadsService = subscriptioncommon.NewNewHeadsService(ch, true, logger, func(newHead *tencommon.BatchHeader) error {
 		services.Cache.EvictShortLiving()
 		return nil
 	})