ChainID is passed to EVMC as a part of tx context

ethereum · Jul 31, 2019 · 4c4be07 · 4c4be07
1 parent 7351dbc
commit 4c4be07
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git a/evmc b/evmc
diff --git a/libaleth-interpreter/VM.cpp b/libaleth-interpreter/VM.cpp
@@ -1164,7 +1164,7 @@ void VM::interpretCases()
 
             updateIOGas();
 
-            m_SPP[0] = fromEvmC(m_context->host->get_chain_id(m_context));
+            m_SPP[0] = fromEvmC(getTxContext().chain_id);
         }
         NEXT
 

diff --git a/libevm/ExtVMFace.cpp b/libevm/ExtVMFace.cpp
@@ -142,11 +142,14 @@ evmc_tx_context EvmCHost::get_tx_context() noexcept
     evmc_tx_context result = {};
     result.tx_gas_price = toEvmC(m_extVM.gasPrice);
     result.tx_origin = toEvmC(m_extVM.origin);
-    result.block_coinbase = toEvmC(m_extVM.envInfo().author());
-    result.block_number = m_extVM.envInfo().number();
-    result.block_timestamp = m_extVM.envInfo().timestamp();
-    result.block_gas_limit = static_cast<int64_t>(m_extVM.envInfo().gasLimit());
-    result.block_difficulty = toEvmC(m_extVM.envInfo().difficulty());
+
+    auto const& envInfo = m_extVM.envInfo();
+    result.block_coinbase = toEvmC(envInfo.author());
+    result.block_number = envInfo.number();
+    result.block_timestamp = envInfo.timestamp();
+    result.block_gas_limit = static_cast<int64_t>(envInfo.gasLimit());
+    result.block_difficulty = toEvmC(envInfo.difficulty());
+    result.chain_id = toEvmC(envInfo.chainID());
     return result;
 }
 
@@ -155,11 +158,6 @@ evmc_bytes32 EvmCHost::get_block_hash(int64_t _number) noexcept
     return toEvmC(m_extVM.blockHash(_number));
 }
 
-evmc_bytes32 EvmCHost::get_chain_id() noexcept
-{
-    return toEvmC(m_extVM.envInfo().chainID());
-}
-
 evmc::result EvmCHost::create(evmc_message const& _msg) noexcept
 {
     u256 gas = _msg.gas;

diff --git a/libevm/ExtVMFace.h b/libevm/ExtVMFace.h
@@ -314,8 +314,6 @@ class EvmCHost : public evmc::Host
 
     evmc_bytes32 get_block_hash(int64_t _blockNumber) noexcept override;
 
-    evmc_bytes32 get_chain_id() noexcept override;
-
     void emit_log(const evmc_address& _addr, const uint8_t* _data, size_t _dataSize,
         const evmc_bytes32 _topics[], size_t _numTopics) noexcept override;
+1 −1		.bumpversion.cfg
+4 −0		CHANGELOG.md
+1 −1		CMakeLists.txt
+2 −0		bindings/go/evmc/host.go
+1 −1		bindings/rust/evmc-declare-tests/Cargo.toml
+1 −1		bindings/rust/evmc-declare/Cargo.toml
+1 −1		bindings/rust/evmc-sys/Cargo.toml
+1 −1		bindings/rust/evmc-vm/Cargo.toml
+1 −0		bindings/rust/evmc-vm/src/container.rs
+1 −0		bindings/rust/evmc-vm/src/lib.rs
+1 −1		docs/EVMC.md
+0 −2		examples/example_host.cpp
+1 −13		include/evmc/evmc.h
+2 −13		include/evmc/evmc.hpp
+16 −2		test/unittests/test_instructions.cpp
-Original file line number
+Diff line change
@@ Expand Up / @@ -1164,7 +1164,7 @@ void VM::interpretCases() @@
                 updateIOGas();
-                m_SPP[0] = fromEvmC(m_context->host->get_chain_id(m_context));
+                m_SPP[0] = fromEvmC(getTxContext().chain_id);
             }
             NEXT
@@ Expand Down @@