From 182d7daac4b791c29809e8282d421c5fe13e3b34 Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Wed, 19 Mar 2014 18:29:40 -0700 Subject: [PATCH] PoC-3.5. ish. --- vm.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/vm.cpp b/vm.cpp index f22dcaa55..246f26acf 100644 --- a/vm.cpp +++ b/vm.cpp @@ -39,7 +39,7 @@ class FakeExtVM: public ExtVMFace public: 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) {} @@ -51,7 +51,7 @@ public: { get<3>(addresses[myAddress])[_n] = _v; } - void mktx(Transaction& _t) + void transact(Transaction& _t) { if (get<0>(addresses[myAddress]) >= _t.value) { @@ -359,8 +359,6 @@ public: cb.difficulty = 256; cb.timestamp = 1; cb.coinbaseAddress = toAddress(sha3("coinbase")); - FeeStructure fees; - fees.setMultiplier(1); FakeExtVM fev(fees, pb, cb, 0); fev.setContract(toAddress(sha3("contract")), ether, 0, compileLisp("(suicide (txsender))")); o["env"] = fev.exportEnv();