Merge commit '1b8f9fdc3b44503890ed1bcb5da8bd5cb8dd83a5' into develop-evmcc

Conflicts:
	test/TestHelper.cpp

12 files changed, 124 insertions, 31 deletions

diff --git a/TestHelper.cpp b/TestHelper.cpp
index 6f7bf31d..d0100db6 100644
--- a/TestHelper.cpp
+++ b/TestHelper.cpp
@@ -110,9 +110,6 @@ void ImportTest::importState(json_spirit::mObject& _o, State& _state)
 
 		Address address = Address(i.first);
 
-		for (auto const& j: o["storage"].get_obj())
-			_state.setStorage(address, toInt(j.first), toInt(j.second));
-
 		bytes code = importCode(o);
 
 		if (code.size())
@@ -123,6 +120,9 @@ void ImportTest::importState(json_spirit::mObject& _o, State& _state)
 		else
 			_state.m_cache[address] = Account(toInt(o["balance"]), Account::NormalCreation);
 
+		for (auto const& j: o["storage"].get_obj())
+			_state.setStorage(address, toInt(j.first), toInt(j.second));
+
 		for(int i=0; i<toInt(o["nonce"]); ++i)
 			_state.noteSending(address);
 
@@ -330,12 +330,10 @@ void checkStorage(map<u256, u256> _expectedStore, map<u256, u256> _resultStore,
 			BOOST_CHECK_MESSAGE(expectedStoreValue == resultStoreValue, _expectedAddr << ": store[" << expectedStoreKey << "] = " << resultStoreValue << ", expected " << expectedStoreValue);
 		}
 	}
-
-    for (auto&& resultStorePair : _resultStore)
-    {
-        if (!_expectedStore.count(resultStorePair.first))
-            BOOST_ERROR("unexpected result store key " << resultStorePair.first);
-    }
+	BOOST_CHECK_EQUAL(_resultStore.size(), _expectedStore.size());
+	for (auto&& resultStorePair : _resultStore)
+		if (!_expectedStore.count(resultStorePair.first))
+			BOOST_ERROR(_expectedAddr << ": unexpected store key " << resultStorePair.first);
 }
 
 void checkLog(LogEntries _resultLogs, LogEntries _expectedLogs)
diff --git a/jsonrpc.cpp b/jsonrpc.cpp
index 20ffc6d5..970957b5 100644
--- a/jsonrpc.cpp
+++ b/jsonrpc.cpp
@@ -43,7 +43,7 @@ using namespace dev;
 using namespace dev::eth;
 namespace js = json_spirit;
 
-WebThreeDirect *web3;
+WebThreeDirect* web3;
 unique_ptr<WebThreeStubServer> jsonrpcServer;
 unique_ptr<WebThreeStubClient> jsonrpcClient;
 
diff --git a/solidityCompiler.cpp b/solidityCompiler.cpp
index 004740b5..eae8f314 100644
--- a/solidityCompiler.cpp
+++ b/solidityCompiler.cpp
@@ -87,7 +87,7 @@ BOOST_AUTO_TEST_CASE(smoke_test)
 							 "}\n";
 	bytes code = compileContract(sourceCode);
 
-	unsigned boilerplateSize = 42;
+	unsigned boilerplateSize = 40;
 	bytes expectation({byte(Instruction::JUMPDEST),
 					   byte(Instruction::PUSH1), 0x0, // initialize local variable x
 					   byte(Instruction::PUSH1), 0x2,
@@ -107,8 +107,8 @@ BOOST_AUTO_TEST_CASE(different_argument_numbers)
 							 "}\n";
 	bytes code = compileContract(sourceCode);
 
-	unsigned shift = 70;
-	unsigned boilerplateSize = 83;
+	unsigned shift = 68;
+	unsigned boilerplateSize = 81;
 	bytes expectation({byte(Instruction::JUMPDEST),
 					   byte(Instruction::PUSH1), 0x0, // initialize return variable d
 					   byte(Instruction::DUP3),
@@ -158,8 +158,8 @@ BOOST_AUTO_TEST_CASE(ifStatement)
 							 "}\n";
 	bytes code = compileContract(sourceCode);
 
-	unsigned shift = 29;
-	unsigned boilerplateSize = 42;
+	unsigned shift = 27;
+	unsigned boilerplateSize = 40;
 	bytes expectation({byte(Instruction::JUMPDEST),
 					   byte(Instruction::PUSH1), 0x0,
 					   byte(Instruction::DUP1),
@@ -200,8 +200,8 @@ BOOST_AUTO_TEST_CASE(loops)
 							 "}\n";
 	bytes code = compileContract(sourceCode);
 
-	unsigned shift = 29;
-	unsigned boilerplateSize = 42;
+	unsigned shift = 27;
+	unsigned boilerplateSize = 40;
 	bytes expectation({byte(Instruction::JUMPDEST),
 					   byte(Instruction::JUMPDEST),
 					   byte(Instruction::PUSH1), 0x1,
diff --git a/solidityEndToEndTest.cpp b/solidityEndToEndTest.cpp
index 3c77492a..af8b58ba 100644
--- a/solidityEndToEndTest.cpp
+++ b/solidityEndToEndTest.cpp
@@ -363,6 +363,48 @@ BOOST_AUTO_TEST_CASE(small_signed_types)
 	testSolidityAgainstCpp(0, small_signed_types_cpp);
 }
 
+BOOST_AUTO_TEST_CASE(strings)
+{
+	char const* sourceCode = "contract test {\n"
+							 "  function fixed() returns(string32 ret) {\n"
+							 "    return \"abc\\x00\\xff__\";\n"
+							 "  }\n"
+							 "  function pipeThrough(string2 small, bool one) returns(string16 large, bool oneRet) {\n"
+							 "    oneRet = one;\n"
+							 "    large = small;\n"
+							 "  }\n"
+							 "}\n";
+	compileAndRun(sourceCode);
+	bytes expectation(32, 0);
+	expectation[0] = byte('a');
+	expectation[1] = byte('b');
+	expectation[2] = byte('c');
+	expectation[3] = byte(0);
+	expectation[4] = byte(0xff);
+	expectation[5] = byte('_');
+	expectation[6] = byte('_');
+	BOOST_CHECK(callContractFunction(0, bytes()) == expectation);
+	expectation = bytes(17, 0);
+	expectation[0] = 0;
+	expectation[1] = 2;
+	expectation[16] = 1;
+	BOOST_CHECK(callContractFunction(1, bytes({0x00, 0x02, 0x01})) == expectation);
+}
+
+BOOST_AUTO_TEST_CASE(empty_string_on_stack)
+{
+	char const* sourceCode = "contract test {\n"
+							 "  function run(string0 empty, uint8 inp) returns(uint16 a, string0 b, string4 c) {\n"
+							 "    var x = \"abc\";\n"
+							 "    var y = \"\";\n"
+							 "    var z = inp;\n"
+							 "    a = z; b = y; c = x;"
+							 "  }\n"
+							 "}\n";
+	compileAndRun(sourceCode);
+	BOOST_CHECK(callContractFunction(0, bytes({0x02})) == bytes({0x00, 0x02, 'a', 'b', 'c', 0x00}));
+}
+
 BOOST_AUTO_TEST_CASE(state_smoke_test)
 {
 	char const* sourceCode = "contract test {\n"
@@ -941,6 +983,34 @@ BOOST_AUTO_TEST_CASE(inter_contract_calls_with_local_vars)
 	BOOST_REQUIRE(callContractFunction(0, a, b) == toBigEndian(a * b + 9));
 }
 
+BOOST_AUTO_TEST_CASE(strings_in_calls)
+{
+	char const* sourceCode = R"(
+		contract Helper {
+			function invoke(string3 x, bool stop) returns (string4 ret) {
+				return x;
+			}
+		}
+		contract Main {
+			Helper h;
+			function callHelper(string2 x, bool stop) returns (string5 ret) {
+				return h.invoke(x, stop);
+			}
+			function getHelper() returns (address addr) {
+				return address(h);
+			}
+			function setHelper(address addr) {
+				h = Helper(addr);
+			}
+		})";
+	compileAndRun(sourceCode, 0, "Helper");
+	u160 const helperAddress = m_contractAddress;
+	compileAndRun(sourceCode, 0, "Main");
+	BOOST_REQUIRE(callContractFunction(2, helperAddress) == bytes());
+	BOOST_REQUIRE(callContractFunction(1, helperAddress) == toBigEndian(helperAddress));
+	BOOST_CHECK(callContractFunction(0, bytes({0, 'a', 1})) == bytes({0, 'a', 0, 0, 0}));
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
 }
diff --git a/solidityExecutionFramework.h b/solidityExecutionFramework.h
index 9d40e8a4..91ee7ad6 100644
--- a/solidityExecutionFramework.h
+++ b/solidityExecutionFramework.h
@@ -117,7 +117,7 @@ private:
 	void sendMessage(bytes const& _data, bool _isCreation, u256 const& _value = 0)
 	{
 		m_state.addBalance(m_sender, _value); // just in case
-		eth::Executive executive(m_state);
+		eth::Executive executive(m_state, 0);
 		eth::Transaction t = _isCreation ? eth::Transaction(_value, m_gasPrice, m_gas, _data, 0, KeyPair::create().sec())
 										 : eth::Transaction(_value, m_gasPrice, m_gas, m_contractAddress, _data, 0, KeyPair::create().sec());
 		bytes transactionRLP = t.rlp();
@@ -137,7 +137,7 @@ private:
 		else
 		{
 			BOOST_REQUIRE(m_state.addressHasCode(m_contractAddress));
-			BOOST_REQUIRE(!executive.call(m_contractAddress, m_sender, _value, m_gasPrice, &_data, m_gas, m_sender));
+			BOOST_REQUIRE(!executive.call(m_contractAddress, m_contractAddress, m_sender, _value, m_gasPrice, &_data, m_gas, m_sender));
 		}
 		BOOST_REQUIRE(executive.go());
 		m_state.noteSending(m_sender);
diff --git a/solidityNameAndTypeResolution.cpp b/solidityNameAndTypeResolution.cpp
index 78397229..03eaebb3 100644
--- a/solidityNameAndTypeResolution.cpp
+++ b/solidityNameAndTypeResolution.cpp
@@ -226,6 +226,14 @@ BOOST_AUTO_TEST_CASE(type_inference_explicit_conversion)
 	BOOST_CHECK_NO_THROW(parseTextAndResolveNames(text));
 }
 
+BOOST_AUTO_TEST_CASE(large_string_literal)
+{
+	char const* text = "contract test {\n"
+					   "  function f() { var x = \"123456789012345678901234567890123\"; }"
+					   "}\n";
+	BOOST_CHECK_THROW(parseTextAndResolveNames(text), TypeError);
+}
+
 BOOST_AUTO_TEST_CASE(balance)
 {
 	char const* text = "contract test {\n"
diff --git a/solidityOptimizerTest.cpp b/solidityOptimizerTest.cpp
index b689fe54..388e0579 100644
--- a/solidityOptimizerTest.cpp
+++ b/solidityOptimizerTest.cpp
@@ -48,7 +48,7 @@ public:
 		m_optimize = true;
 		bytes optimizedBytecode = compileAndRun(_sourceCode, _value, _contractName);
 		int sizeDiff = nonOptimizedBytecode.size() - optimizedBytecode.size();
-		BOOST_CHECK_MESSAGE(sizeDiff >= (int)_expectedSizeDecrease, "Bytecode did only shrink by "
+		BOOST_CHECK_MESSAGE(sizeDiff == int(_expectedSizeDecrease), "Bytecode did only shrink by "
 							+ boost::lexical_cast<string>(sizeDiff) + " bytes, expected: "
 							+ boost::lexical_cast<string>(_expectedSizeDecrease));
 		m_optimizedContract = m_contractAddress;
@@ -106,7 +106,7 @@ BOOST_AUTO_TEST_CASE(invariants)
 				return (((a + (1 - 1)) ^ 0) | 0) & (uint(0) - 1);
 			}
 		})";
-	compileBothVersions(19, sourceCode);
+	compileBothVersions(28, sourceCode);
 	compareVersions(0, u256(0x12334664));
 }
 
@@ -124,6 +124,21 @@ BOOST_AUTO_TEST_CASE(unused_expressions)
 	compareVersions(0);
 }
 
+BOOST_AUTO_TEST_CASE(constant_folding_both_sides)
+{
+	// if constants involving the same associative and commutative operator are applied from both
+	// sides, the operator should be applied only once, because the expression compiler
+	// (even in non-optimized mode) pushes literals as late as possible
+	char const* sourceCode = R"(
+		contract test {
+			function f(uint x) returns (uint y) {
+				return 98 ^ (7 * ((1 | (x | 1000)) * 40) ^ 102);
+			}
+		})";
+	compileBothVersions(31, sourceCode);
+	compareVersions(0);
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
 }
diff --git a/state.cpp b/state.cpp
index 961f0f13..11ecf48c 100644
--- a/state.cpp
+++ b/state.cpp
@@ -47,7 +47,7 @@ void doStateTests(json_spirit::mValue& v, bool _fillin)
 
 	for (auto& i: v.get_obj())
 	{
-		cnote << i.first;
+		cerr << i.first << endl;
 		mObject& o = i.second.get_obj();
 
 		BOOST_REQUIRE(o.count("env") > 0);
diff --git a/trie.cpp b/trie.cpp
index 3f072a6d..0cf87c21 100644
--- a/trie.cpp
+++ b/trie.cpp
@@ -54,7 +54,6 @@ BOOST_AUTO_TEST_CASE(trie_tests)
 {
 	string testPath = test::getTestPath();
 
-
 	testPath += "/TrieTests";
 
 	cnote << "Testing Trie...";
@@ -245,6 +244,7 @@ BOOST_AUTO_TEST_CASE(moreTrieTests)
 BOOST_AUTO_TEST_CASE(trieLowerBound)
 {
 	cnote << "Stress-testing Trie.lower_bound...";
+	if (0)
 	{
 		MemoryDB dm;
 		EnforceRefs e(dm, true);
@@ -290,6 +290,7 @@ BOOST_AUTO_TEST_CASE(trieLowerBound)
 BOOST_AUTO_TEST_CASE(trieStess)
 {
 	cnote << "Stress-testing Trie...";
+	if (0)
 	{
 		MemoryDB m;
 		MemoryDB dm;
diff --git a/vm.cpp b/vm.cpp
index 075b3f2a..1e9d040d 100644
--- a/vm.cpp
+++ b/vm.cpp
@@ -35,18 +35,18 @@ using namespace dev::test;
 FakeExtVM::FakeExtVM(eth::BlockInfo const& _previousBlock, eth::BlockInfo const& _currentBlock, unsigned _depth):			/// TODO: XXX: remove the default argument & fix.
 	ExtVMFace(Address(), Address(), Address(), 0, 1, bytesConstRef(), bytes(), _previousBlock, _currentBlock, _depth) {}
 
-h160 FakeExtVM::create(u256 _endowment, u256* _gas, bytesConstRef _init, OnOpFunc const&)
+h160 FakeExtVM::create(u256 _endowment, u256& io_gas, bytesConstRef _init, OnOpFunc const&)
 {
 	Address na = right160(sha3(rlpList(myAddress, get<1>(addresses[myAddress]))));
 
-	Transaction t(_endowment, gasPrice, *_gas, _init.toBytes());
+	Transaction t(_endowment, gasPrice, io_gas, _init.toBytes());
 	callcreates.push_back(t);
 	return na;
 }
 
-bool FakeExtVM::call(Address _receiveAddress, u256 _value, bytesConstRef _data, u256* _gas, bytesRef _out, OnOpFunc const&, Address _myAddressOverride, Address _codeAddressOverride)
+bool FakeExtVM::call(Address _receiveAddress, u256 _value, bytesConstRef _data, u256& io_gas, bytesRef _out, OnOpFunc const&, Address _myAddressOverride, Address _codeAddressOverride)
 {
-	Transaction t(_value, gasPrice, *_gas, _receiveAddress, _data.toVector());
+	Transaction t(_value, gasPrice, io_gas, _receiveAddress, _data.toVector());
 	callcreates.push_back(t);
 	(void)_out;
 	(void)_myAddressOverride;
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);
diff --git a/whisperTopic.cpp b/whisperTopic.cpp
index c5e59332..79adf3d6 100644
--- a/whisperTopic.cpp
+++ b/whisperTopic.cpp
@@ -33,7 +33,8 @@ BOOST_AUTO_TEST_SUITE(whisper)
 BOOST_AUTO_TEST_CASE(topic)
 {
 	cnote << "Testing Whisper...";
-//	g_logVerbosity = 0;
+	auto oldLogVerbosity = g_logVerbosity;
+	g_logVerbosity = 0;
 
 	bool started = false;
 	unsigned result = 0;
@@ -81,7 +82,7 @@ BOOST_AUTO_TEST_CASE(topic)
 	}
 
 	listener.join();
-//	g_logVerbosity = 0;
+	g_logVerbosity = oldLogVerbosity;
 
 	BOOST_REQUIRE_EQUAL(result, 1 + 9 + 25 + 49 + 81);
 }