aboutsummaryrefslogtreecommitdiffstats
path: root/vm.h
diff options
context:
space:
mode:
authorGav Wood <i@gavwood.com>2014-12-12 20:33:42 +0800
committerGav Wood <i@gavwood.com>2014-12-12 22:53:57 +0800
commit6b44029adcf8389574ba198bf32382f4c5983d68 (patch)
tree52ac5c5537d948af224e2fabfa695107a417b649 /vm.h
parent696b5b3a493d7e9c8bee455bed24bdfcfe3a1fb0 (diff)
downloaddexon-solidity-6b44029adcf8389574ba198bf32382f4c5983d68.tar.gz
dexon-solidity-6b44029adcf8389574ba198bf32382f4c5983d68.tar.zst
dexon-solidity-6b44029adcf8389574ba198bf32382f4c5983d68.zip
Beginnings of cleaning up the Executive/State code.
Diffstat (limited to 'vm.h')
-rw-r--r--vm.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/vm.h b/vm.h
index 3d4b88d5..ff948cbf 100644
--- a/vm.h
+++ b/vm.h
@@ -55,8 +55,8 @@ public:
virtual u256 txCount(Address _a) override { return std::get<1>(addresses[_a]); }
virtual void suicide(Address _a) override { std::get<0>(addresses[_a]) += std::get<0>(addresses[myAddress]); addresses.erase(myAddress); }
virtual bytes const& codeAt(Address _a) override { return std::get<3>(addresses[_a]); }
- virtual h160 create(u256 _endowment, u256* _gas, bytesConstRef _init, eth::OnOpFunc const&) override;
- virtual bool call(Address _receiveAddress, u256 _value, bytesConstRef _data, u256* _gas, bytesRef _out, eth::OnOpFunc const&, Address, Address) override;
+ virtual h160 create(u256 _endowment, u256& io_gas, bytesConstRef _init, eth::OnOpFunc const&) override;
+ virtual bool call(Address _receiveAddress, u256 _value, bytesConstRef _data, u256& io_gas, bytesRef _out, eth::OnOpFunc const&, Address, Address) override;
void setTransaction(Address _caller, u256 _value, u256 _gasPrice, bytes const& _data);
void setContract(Address _myAddress, u256 _myBalance, u256 _myNonce, std::map<u256, u256> const& _storage, bytes const& _code);
void set(Address _a, u256 _myBalance, u256 _myNonce, std::map<u256, u256> const& _storage, bytes const& _code);