From 401a5eb0dfbeba280749c528624f68e6b452f556 Mon Sep 17 00:00:00 2001
From: Ryan Schneider <ryanleeschneider@gmail.com>
Date: Thu, 22 Aug 2024 08:35:18 -0700
Subject: [PATCH] fix: Compare local nonce w/ backend to detect invalidated
 cache (#153)

* fix: Compare local nonce w/ backend to detect invalidated cache

* fixup: Need to use hexutil to unmarshal backend count
---
 server/redisstate.go         |  5 +++++
 server/request_intercepts.go | 40 +++++++++++++++++++++++++++++++++---
 2 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/server/redisstate.go b/server/redisstate.go
index 59d0b2c..2021ecb 100644
--- a/server/redisstate.go
+++ b/server/redisstate.go
@@ -282,6 +282,11 @@ func (s *RedisState) GetSenderMaxNonce(txFrom string) (senderMaxNonce uint64, fo
 	return senderMaxNonce, true, nil
 }
 
+func (s *RedisState) DelSenderMaxNonce(txFrom string) error {
+	key := RedisKeySenderMaxNonce(txFrom)
+	return s.RedisClient.Del(context.Background(), key).Err()
+}
+
 // Block transactions, with a specific return value (eg. "nonce too low")
 func (s *RedisState) SetBlockedTxHash(txHash string, returnValue string) error {
 	key := RedisKeyBlockedTxHash(txHash)
diff --git a/server/request_intercepts.go b/server/request_intercepts.go
index 366d51d..ceda012 100644
--- a/server/request_intercepts.go
+++ b/server/request_intercepts.go
@@ -1,9 +1,12 @@
 package server
 
 import (
+	"encoding/json"
 	"fmt"
 	"strings"
 
+	"github.com/ethereum/go-ethereum/common/hexutil"
+
 	"github.com/flashbots/rpc-endpoint/types"
 )
 
@@ -179,7 +182,9 @@ func (r *RpcRequest) intercept_signed_eth_getTransactionCount() (requestFinished
 		return false
 	}
 
-	nonce, found, err := RState.GetSenderMaxNonce(addr)
+	// since it's possible that the user sent another tx via another provider, we need to check the nonce from
+	// both the backend and our cache, and return the greater of the two
+	cachedNonce, found, err := RState.GetSenderMaxNonce(addr)
 	if err != nil {
 		r.logger.Error("[eth_getTransactionCount] Redis:GetSenderMaxNonce error", "error", err)
 		return false
@@ -188,9 +193,38 @@ func (r *RpcRequest) intercept_signed_eth_getTransactionCount() (requestFinished
 		r.logger.Info("[eth_getTransactionCount] No nonce found")
 		return false
 	}
+	if !r.proxyRequestRead() {
+		r.logger.Info("[ProcessRequest] Proxy to node failed", "method", r.jsonReq.Method)
+		r.writeRpcError("internal server error", types.JsonRpcInternalError)
+		return true
+	}
+	r.logger.Info("[eth_getTransactionCount] intercept", "cachedNonce", cachedNonce, "addr", addr)
+
+	backendTxCount := uint64(0)
+	if r.jsonRes.Result != nil {
+		count := hexutil.Uint64(0)
+		if err := json.Unmarshal(r.jsonRes.Result, &count); err != nil {
+			r.logger.Info("[ProcessRequest] Unmarshal backend response failed", "method", r.jsonReq.Method)
+			r.writeRpcError("internal server error", types.JsonRpcInternalError)
+			return true
+		}
+		backendTxCount = uint64(count)
+		r.logger.Info("[eth_getTransactionCount] intercept", "backendTxCount", backendTxCount, "addr", addr)
+	}
+
+	// return either the cached nonce plus one, or the backend tx count
+	txCount := cachedNonce + 1
+	if backendTxCount > txCount {
+		txCount = backendTxCount
+		// since the cached value is invalid lets remove it from redis
+		r.logger.Info("[eth_getTransactionCount] intercept invalidated nonce", "addr", addr)
+		if err := RState.DelSenderMaxNonce(addr); err != nil {
+			// log the error but continue
+			r.logger.Error("[eth_getTransactionCount] Redis:DelSenderMaxNonce error", "error", err, "addr", addr)
+		}
+	}
 
-	r.logger.Info("[eth_getTransactionCount] intercept", "nonce", nonce)
-	resp := fmt.Sprintf("0x%x", nonce+1)
+	resp := fmt.Sprintf("0x%x", txCount)
 	r.writeRpcResult(resp)
 	return true
 }