From 3de70191cca9910b18837764c756181c4f246100 Mon Sep 17 00:00:00 2001
From: Nazaret Garcia <nazaret@iovlabs.org>
Date: Thu, 6 Oct 2022 22:36:08 -0300
Subject: [PATCH] Improving cache usage

---
 rskj-core/src/main/java/co/rsk/RskContext.java              | 2 +-
 .../main/java/co/rsk/net/handler/TxPendingValidator.java    | 4 +++-
 rskj-core/src/main/java/co/rsk/peg/BridgeSupport.java       | 6 ++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/rskj-core/src/main/java/co/rsk/RskContext.java b/rskj-core/src/main/java/co/rsk/RskContext.java
index c8a5fcbe65e..829843cd150 100644
--- a/rskj-core/src/main/java/co/rsk/RskContext.java
+++ b/rskj-core/src/main/java/co/rsk/RskContext.java
@@ -402,7 +402,7 @@ public TxQuotaChecker getTxQuotaChecker() {
         checkIfNotClosed();
 
         if (this.txQuotaChecker == null) {
-            this.txQuotaChecker = new TxQuotaChecker(System::currentTimeMillis, getBlockTxSignatureCache());
+            this.txQuotaChecker = new TxQuotaChecker(System::currentTimeMillis, getReceivedTxSignatureCache());
         }
         return txQuotaChecker;
     }
diff --git a/rskj-core/src/main/java/co/rsk/net/handler/TxPendingValidator.java b/rskj-core/src/main/java/co/rsk/net/handler/TxPendingValidator.java
index d7dd18ff540..74ab6e38636 100644
--- a/rskj-core/src/main/java/co/rsk/net/handler/TxPendingValidator.java
+++ b/rskj-core/src/main/java/co/rsk/net/handler/TxPendingValidator.java
@@ -75,7 +75,9 @@ public TransactionValidationResult isValid(Transaction tx, Block executionBlock,
         long basicTxCost = tx.transactionCost(constants, activationConfig.forBlock(bestBlockNumber), signatureCache);
 
         if (state == null && basicTxCost != 0) {
-            logger.trace("[tx={}, sender={}] account doesn't exist", tx.getHash(), tx.getSender(signatureCache));
+            if (logger.isTraceEnabled()) {
+                logger.trace("[tx={}, sender={}] account doesn't exist", tx.getHash(), tx.getSender(signatureCache));
+            }
             return TransactionValidationResult.withError("the sender account doesn't exist");
         }
 
diff --git a/rskj-core/src/main/java/co/rsk/peg/BridgeSupport.java b/rskj-core/src/main/java/co/rsk/peg/BridgeSupport.java
index 91da353a588..7771e928012 100644
--- a/rskj-core/src/main/java/co/rsk/peg/BridgeSupport.java
+++ b/rskj-core/src/main/java/co/rsk/peg/BridgeSupport.java
@@ -2670,10 +2670,12 @@ public BigInteger registerFlyoverBtcTransaction(
             return BigInteger.valueOf(FlyoverTxResponseCodes.UNPROCESSABLE_TX_NOT_CONTRACT_ERROR.value());
         }
 
-        if (!rskTx.getSender(signatureCache).equals(lbcAddress)) {
+        RskAddress sender = rskTx.getSender(signatureCache);
+
+        if (!sender.equals(lbcAddress)) {
             logger.debug(
                 "[registerFlyoverBtcTransaction] Expected sender to be the same as lbcAddress. (sender: {}) (lbcAddress:{})",
-                rskTx.getSender(signatureCache),
+                sender,
                 lbcAddress
             );
             return BigInteger.valueOf(FlyoverTxResponseCodes.UNPROCESSABLE_TX_INVALID_SENDER_ERROR.value());