cerc-io/solidity
15
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

API cleanups and some renaming.

Browse Source
This commit is contained in:
Gav Wood 2014-04-04 15:24:38 -04:00
parent cae6132e35
commit dcb8b533bb
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
vm.cpp
View File

@ -40,7 +40,7 @@ public:
FakeExtVM() FakeExtVM()
{} {}
FakeExtVM(BlockInfo const& _previousBlock, BlockInfo const& _currentBlock, uint _currentNumber): FakeExtVM(BlockInfo const& _previousBlock, BlockInfo const& _currentBlock, uint _currentNumber):
ExtVMFace(Address(), Address(), 0, 1, bytesConstRef(), bytesConstRef(), _previousBlock, _currentBlock, _currentNumber) ExtVMFace(Address(), Address(), Address(), 0, 1, bytesConstRef(), bytesConstRef(), _previousBlock, _currentBlock, _currentNumber)
{} {}
u256 store(u256 _n) u256 store(u256 _n)
@ -81,24 +81,24 @@ public:
return right160(t.sha3(false)); return right160(t.sha3(false));
} }
bool call(Address _receiveAddress, u256 _txValue, bytesConstRef _txData, u256* _gas, bytesRef _txOut) bool call(Address _receiveAddress, u256 _value, bytesConstRef _data, u256* _gas, bytesRef _out)
{ {
Transaction t; Transaction t;
t.value = _txValue; t.value = _value;
t.gasPrice = gasPrice; t.gasPrice = gasPrice;
t.gas = *_gas; t.gas = *_gas;
t.data = _txData.toVector(); t.data = _data.toVector();
t.receiveAddress = _receiveAddress; t.receiveAddress = _receiveAddress;
txs.push_back(t); txs.push_back(t);
(void)_txOut; (void)_out;
return true; return true;
} }
void setTransaction(Address _txSender, u256 _txValue, u256 _gasPrice, bytes const& _txData) void setTransaction(Address _caller, u256 _value, u256 _gasPrice, bytes const& _data)
{ {
txSender = _txSender; caller = origin = _caller;
txValue = _txValue; value = _value;
txData = &_txData; data = &_data;
gasPrice = _gasPrice; gasPrice = _gasPrice;
} }
void setContract(Address _myAddress, u256 _myBalance, u256 _myNonce, bytes const& _code, map<u256, u256> const& _storage) void setContract(Address _myAddress, u256 _myBalance, u256 _myNonce, bytes const& _code, map<u256, u256> const& _storage)
@ -251,11 +251,12 @@ public:
{ {
mObject ret; mObject ret;
ret["address"] = toString(myAddress); ret["address"] = toString(myAddress);
ret["sender"] = toString(txSender); ret["caller"] = toString(caller);
push(ret, "value", txValue); ret["origin"] = toString(origin);
push(ret, "value", value);
push(ret, "gasPrice", gasPrice); push(ret, "gasPrice", gasPrice);
mArray d; mArray d;
for (auto const& i: txData) for (auto const& i: data)
push(d, i); push(d, i);
ret["data"] = d; ret["data"] = d;
return ret; return ret;
@ -264,13 +265,14 @@ public:
void importExec(mObject& _o) void importExec(mObject& _o)
{ {
myAddress = Address(_o["address"].get_str()); myAddress = Address(_o["address"].get_str());
txSender = Address(_o["sender"].get_str()); caller = Address(_o["caller"].get_str());
txValue = toInt(_o["value"]); origin = Address(_o["origin"].get_str());
value = toInt(_o["value"]);
gasPrice = toInt(_o["gasPrice"]); gasPrice = toInt(_o["gasPrice"]);
thisTxData.clear(); thisTxData.clear();
for (auto const& j: _o["data"].get_array()) for (auto const& j: _o["data"].get_array())
thisTxData.push_back(toByte(j)); thisTxData.push_back(toByte(j));
txData = &thisTxData; data = &thisTxData;
} }
mArray exportTxs() mArray exportTxs()