From 7d7a8893f6c302ac45c4e63690c39ce170b4e004 Mon Sep 17 00:00:00 2001 From: Andrei Maiboroda Date: Fri, 22 Nov 2019 14:56:07 +0100 Subject: [PATCH 1/2] Make depth and pc fields integer in standard trace JSON --- libethereum/StandardTrace.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libethereum/StandardTrace.cpp b/libethereum/StandardTrace.cpp index 2c8c1e9783c..0297bd57e48 100644 --- a/libethereum/StandardTrace.cpp +++ b/libethereum/StandardTrace.cpp @@ -96,10 +96,10 @@ void StandardTrace::operator()(uint64_t _steps, uint64_t PC, Instruction inst, b r["op"] = static_cast(inst); if (m_showMnemonics) r["opName"] = instructionInfo(inst).name; - r["pc"] = toString(PC); + r["pc"] = PC; r["gas"] = toString(gas); r["gasCost"] = toString(gasCost); - r["depth"] = toString(ext.depth + 1); // depth in standard trace is 1-based + r["depth"] = ext.depth + 1; // depth in standard trace is 1-based if (!!newMemSize) r["memexpand"] = toString(newMemSize); From 68365742bef7349ee8e654b344da9ca45b904608 Mon Sep 17 00:00:00 2001 From: Andrei Maiboroda Date: Fri, 22 Nov 2019 14:58:21 +0100 Subject: [PATCH 2/2] Add links to changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e1dc9a3f30e..8ef067184b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ - Changed: [#5801](https://github.com/ethereum/aleth/pull/5801) `testeth -t BlockchainTests` command now doesn't run the tests for the forks before Istanbul. To run those tests use a separate LegacyTests suite with command `testeth -t LegacyTests/Constantinople/BlockchainTests`. - Changed: [#5807](https://github.com/ethereum/aleth/pull/5807) Optimize selfdestruct opcode in LegacyVM by reducing state accesses in certain out-of-gas scenarios. - Changed: [#5806](https://github.com/ethereum/aleth/pull/5806) Optimize selfdestruct opcode in aleth-interpreter by reducing state accesses in certain out-of-gas scenarios. -- Changed: [#5837](https://github.com/ethereum/aleth/pull/5837) Output format of `testeth --jsontrace` command changed to better match output of geth's evm tool and to integrate with evmlab project. +- Changed: [#5837](https://github.com/ethereum/aleth/pull/5837) [#5839](https://github.com/ethereum/aleth/pull/5839) [#5845](https://github.com/ethereum/aleth/pull/5845) [#5846](https://github.com/ethereum/aleth/pull/5846) Output format of `testeth --jsontrace` command changed to better match output of geth's evm tool and to integrate with evmlab project. - Removed: [#5760](https://github.com/ethereum/aleth/pull/5760) Official support for Visual Studio 2015 has been dropped. Compilation with this compiler is expected to stop working after migration to C++14. - Fixed: [#5792](https://github.com/ethereum/aleth/pull/5792) Faster and cheaper execution of RPC functions which query blockchain state (e.g. getBalance). - Fixed: [#5811](https://github.com/ethereum/aleth/pull/5811) RPC methods querying transactions (`eth_getTransactionByHash`, `eth_getBlockByNumber`) return correct `v` value.