Merge pull request #322 from eosnetworkfoundation/elmato/merge-fix-ga…

…s-estimator-and-traces-to-main [1.0 -> main] Fix gas estimation and traces
eosnetworkfoundation · Nov 5, 2024 · ac8163e · ac8163e
2 parents 944b7bc + f7cef80
commit ac8163e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -20,7 +20,7 @@ include(cmake/conan.cmake)
 
 set(VERSION_MAJOR 1)
 set(VERSION_MINOR 0)
-set(VERSION_PATCH 1)
+set(VERSION_PATCH 2)
 #set(VERSION_SUFFIX rc4)
 
 if(VERSION_SUFFIX)

diff --git a/external/silkworm b/external/silkworm
+1 −1		CMakeLists.txt
+81 −28		silkworm/core/execution/evm.cpp
+3 −0		silkworm/core/execution/evm.hpp
+151 −1		silkworm/core/execution/evm_test.cpp
+40 −8		silkworm/core/execution/processor.cpp
+169 −78		silkworm/core/execution/processor_test.cpp
+5 −4		silkworm/silkrpc/core/evm_trace.cpp
+14 −14		silkworm/silkrpc/core/evm_trace_test.cpp
+1 −1		third_party/evmone