Improving cache usage

rsksmart · Nov 22, 2022 · 3de7019 · 3de7019
1 parent 3f6e667
commit 3de7019
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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());