#1751 case where no contract is called

skalenetwork · Jan 17, 2024 · 64f4b5b · 64f4b5b
1 parent 5843bc4
commit 64f4b5b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/libhistoric/PrestateTracePrinter.cpp b/libhistoric/PrestateTracePrinter.cpp
@@ -40,11 +40,7 @@ void PrestateTracePrinter::printPre( Json::Value& _jsonTrace, const HistoricStat
         printAllAccessedAccountPreValues( _jsonTrace, _statePre, item );
     };
 
-
-    if ( !m_trace.isCall() )
-        return;
-
-    // when in call trace geth always prints the balance of block miner balance
+    // geth always prints the balance of block miner balance
 
     auto minerAddress = m_trace.getBlockAuthor();
     auto minerBalance = _statePre.balance( minerAddress );
@@ -56,6 +52,7 @@ void PrestateTracePrinter::printPre( Json::Value& _jsonTrace, const HistoricStat
 
     _jsonTrace[toHexPrefixed( minerAddress )]["balance"] =
         AlethStandardTrace::toGethCompatibleCompactHexPrefixed( minerBalance );
+    std::cerr << _jsonTrace << "!!!" << std::endl;
 }
 
 

diff --git a/test/historicstate/hardhat/scripts/trace.ts b/test/historicstate/hardhat/scripts/trace.ts
@@ -442,6 +442,14 @@ async function verifyPrestateTransferTraceAgainstGethTrace(_fileName: string) {
                     return;
                 }
             }
+
+            if (difference.kind == "E" && difference.path!.length == 2) {
+                let address = difference.path![0];
+                if (address == ZERO_ADDRESS && difference.path![1] == "balance") {
+                    return;
+                }
+            }
+
             foundDiffs = true;
         });
     }
@@ -612,10 +620,9 @@ async function main(): Promise<void> {
 
     const transferHash: string = await callTestContractRun(deployedContract);
 
+    await getAndPrintCommittedTransactionTrace(transferHash, PRESTATE_TRACER, TEST_TRANSFER_PRESTATETRACER_FILE_NAME);
     await getAndPrintCommittedTransactionTrace(transferHash, CALL_TRACER, TEST_TRANSFER_CALLTRACER_FILE_NAME);
     await getAndPrintCommittedTransactionTrace(transferHash, DEFAULT_TRACER, TEST_TRANSFER_DEFAULTTRACER_FILE_NAME);
-    await getAndPrintCommittedTransactionTrace(transferHash, PRESTATE_TRACER, TEST_TRANSFER_PRESTATETRACER_FILE_NAME);
-
 
     await callDebugTraceCall(deployedContract, DEFAULT_TRACER, TEST_CONTRACT_CALL_DEFAULTTRACER_FILE_NAME);
     await callDebugTraceCall(deployedContract, CALL_TRACER, TEST_CONTRACT_CALL_CALLTRACER_FILE_NAME);
@@ -629,11 +636,10 @@ async function main(): Promise<void> {
         await callDebugTraceCall(deployedContract, REPLAY_TRACER, TEST_CONTRACT_CALL_REPLAYTRACER_FILE_NAME);
     }
 
+    await verifyPrestateTransferTraceAgainstGethTrace(TEST_TRANSFER_PRESTATETRACER_FILE_NAME);
 
     await verifyTransferTraceAgainstGethTrace(TEST_TRANSFER_DEFAULTTRACER_FILE_NAME);
     await verifyTransferTraceAgainstGethTrace(TEST_TRANSFER_CALLTRACER_FILE_NAME);
-    await verifyPrestateTransferTraceAgainstGethTrace(TEST_TRANSFER_PRESTATETRACER_FILE_NAME);
-
 
     await verifyDefaultTraceAgainstGethTrace(TEST_CONTRACT_DEPLOY_FILE_NAME);
     await verifyDefaultTraceAgainstGethTrace(TEST_CONTRACT_RUN_FILE_NAME);
@@ -642,8 +648,6 @@ async function main(): Promise<void> {
     await verifyFourByteTraceAgainstGethTrace(TEST_CONTRACT_CALL_FOURBYTETRACER_FILE_NAME);
     await verifyPrestateTraceAgainstGethTrace(TEST_CONTRACT_CALL_PRESTATETRACER_FILE_NAME);
     await verifyPrestateDiffTraceAgainstGethTrace(TEST_CONTRACT_CALL_PRESTATEDIFFTRACER_FILE_NAME);
-
-
 }