Fix invalid result during EVM test (hyperledger#2135)

Fix invalid result during EVM test. The sender's account was not deleted when empty Signed-off-by: Karim TAAM <karim.t2am@gmail.com>
manojmamidyala · Apr 14, 2021 · aabd5d3 · aabd5d3
1 parent 6fe29e5
commit aabd5d3
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/StateTestSubCommand.java b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/StateTestSubCommand.java
@@ -201,9 +201,15 @@ private void traceTestSpecs(final String test, final List<GeneralStateTestCaseEi
               TransactionValidationParams.processingBlock(),
               tracer);
       timer.stop();
-      final Account coinbase = worldStateUpdater.getOrCreate(spec.getBlockHeader().getCoinbase());
-      if (coinbase != null && coinbase.isEmpty() && shouldClearEmptyAccounts(spec.getFork())) {
-        worldStateUpdater.deleteAccount(coinbase.getAddress());
+      if (shouldClearEmptyAccounts(spec.getFork())) {
+        final Account coinbase = worldStateUpdater.getOrCreate(spec.getBlockHeader().getCoinbase());
+        if (coinbase != null && coinbase.isEmpty()) {
+          worldStateUpdater.deleteAccount(coinbase.getAddress());
+        }
+        final Account sender = worldStateUpdater.getOrCreateSenderAccount(transaction.getSender());
+        if (sender != null && sender.isEmpty()) {
+          worldStateUpdater.deleteAccount(sender.getAddress());
+        }
       }
       worldStateUpdater.commit();