PoC-3.5. ish.

This commit is contained in:
Gav Wood 2014-03-19 18:29:40 -07:00
parent 07e1b513ba
commit 182d7daac4

6
vm.cpp
View File

@ -39,7 +39,7 @@ class FakeExtVM: public ExtVMFace
public: public:
FakeExtVM() FakeExtVM()
{} {}
FakeExtVM(FeeStructure const& _fees, BlockInfo const& _previousBlock, BlockInfo const& _currentBlock, uint _currentNumber): FakeExtVM(BlockInfo const& _previousBlock, BlockInfo const& _currentBlock, uint _currentNumber):
ExtVMFace(Address(), Address(), 0, u256s(), _fees, _previousBlock, _currentBlock, _currentNumber) ExtVMFace(Address(), Address(), 0, u256s(), _fees, _previousBlock, _currentBlock, _currentNumber)
{} {}
@ -51,7 +51,7 @@ public:
{ {
get<3>(addresses[myAddress])[_n] = _v; get<3>(addresses[myAddress])[_n] = _v;
} }
void mktx(Transaction& _t) void transact(Transaction& _t)
{ {
if (get<0>(addresses[myAddress]) >= _t.value) if (get<0>(addresses[myAddress]) >= _t.value)
{ {
@ -359,8 +359,6 @@ public:
cb.difficulty = 256; cb.difficulty = 256;
cb.timestamp = 1; cb.timestamp = 1;
cb.coinbaseAddress = toAddress(sha3("coinbase")); cb.coinbaseAddress = toAddress(sha3("coinbase"));
FeeStructure fees;
fees.setMultiplier(1);
FakeExtVM fev(fees, pb, cb, 0); FakeExtVM fev(fees, pb, cb, 0);
fev.setContract(toAddress(sha3("contract")), ether, 0, compileLisp("(suicide (txsender))")); fev.setContract(toAddress(sha3("contract")), ether, 0, compileLisp("(suicide (txsender))"));
o["env"] = fev.exportEnv(); o["env"] = fev.exportEnv();