Skip to content

Commit 05cde07

Browse files
authored
Merge pull request #261 from VaultaFoundation/kayan_2.0_to_master
[2.0 -> master] print inline evm tx error in hex
2 parents 1fa270b + 134991f commit 05cde07

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

silkworm/core/execution/processor.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,12 @@ ExecutionProcessor::ExecutionProcessor(const Block& block, protocol::IRuleSet& r
3131
: state_{state}, rule_set_{rule_set}, evm_{block, state_, config}, gas_prices_{gas_prices} {
3232
evm_.beneficiary = rule_set.get_beneficiary(block.header);
3333
}
34-
3534
ExecutionResult ExecutionProcessor::execute_transaction(const Transaction& txn, Receipt& receipt, const evmone::gas_parameters& gas_params) noexcept {
35+
CallResult rc;
36+
return execute_transaction(txn, receipt, gas_params, rc);
37+
}
38+
39+
ExecutionResult ExecutionProcessor::execute_transaction(const Transaction& txn, Receipt& receipt, const evmone::gas_parameters& gas_params, CallResult &rc) noexcept {
3640
assert(protocol::validate_transaction(txn, state_, available_gas()) == ValidationResult::kOk);
3741

3842
ExecutionResult res;
@@ -121,6 +125,7 @@ ExecutionResult ExecutionProcessor::execute_transaction(const Transaction& txn,
121125
receipt.cumulative_gas_used = cumulative_gas_used_;
122126
receipt.bloom = logs_bloom(state_.logs());
123127
std::swap(receipt.logs, state_.logs());
128+
rc = std::move(vm_res);
124129
return res;
125130
}
126131

silkworm/core/execution/processor.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ class ExecutionProcessor {
4141
* Precondition: transaction must be valid.
4242
*/
4343
ExecutionResult execute_transaction(const Transaction& txn, Receipt& receipt, const evmone::gas_parameters& gas_params) noexcept;
44+
ExecutionResult execute_transaction(const Transaction& txn, Receipt& receipt, const evmone::gas_parameters& gas_params, CallResult &rc) noexcept;
4445

4546
//! \brief Execute the block and write the result to the DB.
4647
//! \remarks Warning: This method does not verify state root; pre-Byzantium receipt root isn't validated either.

0 commit comments

Comments
 (0)