Fix Layered World State issue (hyperledger#5076)

* Use the copy during prepareTrieLog instead of saveTrieLog * add final flag on BonsaiWorldStateUpdater * Use a copy of BonsaiInMemoryWorldState inside prepareTrieLog * add link to persisted worldstate storage * fix tests * Make a copy of the worldstate after committing changes to the trielog * spotless + remove maybeUnSubscribe in setNextWorldView * subscribe storage on layered worldstate * fix null issue * not close layered worldstate during getAccount * clean code * Add changelog entry --------- Signed-off-by: ahamlat <[email protected]> Signed-off-by: Karim TAAM <[email protected]> Co-authored-by: Karim TAAM <[email protected]>
jframe · Feb 17, 2023 · 9f7f26e · 9f7f26e
1 parent 46168f6
commit 9f7f26e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -31,7 +31,7 @@ tests are updated to use EC private keys instead of RSA keys.
 
 ### Bug Fixes
 - Mitigation fix for stale bonsai code storage leading to log rolling issues on contract recreates [#4906](https://github.com/hyperledger/besu/pull/4906)
-
+- Ensure latest cached layered worldstate is subscribed to storage, fix problem with RPC calls using 'latest' [#5076](https://github.com/hyperledger/besu/pull/5076)
 
 ## 23.1.0-RC1
 

diff --git a/.../hyperledger/besu/ethereum/eth/transactions/sorter/AbstractPendingTransactionsSorter.java b/.../hyperledger/besu/ethereum/eth/transactions/sorter/AbstractPendingTransactionsSorter.java
@@ -428,7 +428,11 @@ private TransactionAddedStatus addTransaction(
             LOG,
             "Transaction {} not added because nonce too far in the future for sender {}",
             transaction::toTraceLog,
-            maybeSenderAccount::toString);
+            () ->
+                maybeSenderAccount
+                    .map(Account::getAddress)
+                    .map(Address::toString)
+                    .orElse("unknown"));
         return NONCE_TOO_FAR_IN_FUTURE_FOR_SENDER;
       }