Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into develop

mix/ContractCallDataEncoder.cpp

@@ -36,6 +36,14 @@ using namespace dev::mix;
 bytes ContractCallDataEncoder::encodedData()
 {
 	bytes r(m_encodedData);
+	size_t headerSize = m_encodedData.size() & ~0x1fUL; //ignore any prefix that is not 32-byte aligned
+	//apply offsets
+	for (auto const& p: m_offsetMap)
+	{
+		vector_ref<byte> offsetRef(r.data() + p.first, 32);
+		toBigEndian<size_t, vector_ref<byte>>(p.second + headerSize, offsetRef); //add header size minus signature hash
+	}
+
 	r.insert(r.end(), m_dynamicData.begin(), m_dynamicData.end());
 	return r;
 }
@@ -64,6 +72,9 @@ void ContractCallDataEncoder::encode(QVariant const& _data, SolidityType const&
 
 	if (_type.dynamicSize)
 	{
+		bytes empty(32);
+		size_t sizePos = m_dynamicData.size();
+		m_dynamicData += empty; //reserve space for count
 		if (_type.type == SolidityType::Type::Bytes)
 			count = encodeSingleItem(_data.toString(), _type, m_dynamicData);
 		else
@@ -72,9 +83,10 @@ void ContractCallDataEncoder::encode(QVariant const& _data, SolidityType const&
 			for (auto const& item: strList)
 				encodeSingleItem(item, _type, m_dynamicData);
 		}
-		bytes sizeEnc(32);
-		toBigEndian(count, sizeEnc);
-		m_encodedData.insert(m_encodedData.end(), sizeEnc.begin(), sizeEnc.end());
+		vector_ref<byte> sizeRef(m_dynamicData.data() + sizePos, 32);
+		toBigEndian(count, sizeRef);
+		m_offsetMap.push_back(std::make_pair(m_encodedData.size(), sizePos));
+		m_encodedData += empty; //reserve space for offset
 	}
 	else
 	{

mix/ContractCallDataEncoder.h

@@ -73,6 +73,7 @@ private:
 private:
 	bytes m_encodedData;
 	bytes m_dynamicData;
+	std::vector<std::pair<size_t, size_t>> m_offsetMap;
 };
 
 }

mix/MixClient.cpp

@@ -98,22 +98,30 @@ void MixClient::resetState(std::unordered_map<Address, Account> const& _accounts
 	m_executions.clear();
 }
 
-Transaction MixClient::replaceGas(Transaction const& _t, u256 const& _gas)
+Transaction MixClient::replaceGas(Transaction const& _t, u256 const& _gas, Secret const& _secret)
 {
 	Transaction ret;
-	if (_t.isCreation())
-		ret = Transaction(_t.value(), _t.gasPrice(), _gas, _t.data(), _t.nonce());
+	if (_secret)
+	{
+		if (_t.isCreation())
+			ret = Transaction(_t.value(), _t.gasPrice(), _gas, _t.data(), _t.nonce(), _secret);
+		else
+			ret = Transaction(_t.value(), _t.gasPrice(), _gas, _t.receiveAddress(), _t.data(), _t.nonce(), _secret);
+	}
 	else
-		ret = Transaction(_t.value(), _t.gasPrice(), _gas, _t.receiveAddress(), _t.data(), _t.nonce());
-	ret.forceSender(_t.safeSender());
+	{
+		if (_t.isCreation())
+			ret = Transaction(_t.value(), _t.gasPrice(), _gas, _t.data(), _t.nonce());
+		else
+			ret = Transaction(_t.value(), _t.gasPrice(), _gas, _t.receiveAddress(), _t.data(), _t.nonce());
+		ret.forceSender(_t.safeSender());
+	}
 	return ret;
 }
 
-void MixClient::executeTransaction(Transaction const& _t, State& _state, bool _call, bool _gasAuto)
+void MixClient::executeTransaction(Transaction const& _t, State& _state, bool _call, bool _gasAuto, Secret const& _secret)
 {
 	Transaction t = _gasAuto ? replaceGas(_t, m_state.gasLimitRemaining()) : _t;
-	bytes rlp = t.rlp();
-
 	// do debugging run first
 	LastHashes lastHashes(256);
 	lastHashes[0] = bc().numberHash(bc().number());
@@ -123,7 +131,7 @@ void MixClient::executeTransaction(Transaction const& _t, State& _state, bool _c
 	State execState = _state;
 	execState.addBalance(t.sender(), t.gas() * t.gasPrice()); //give it enough balance for gas estimation
 	Executive execution(execState, lastHashes, 0);
-	execution.initialize(&rlp);
+	execution.initialize(t);
 	execution.execute();
 	std::vector<MachineState> machineStates;
 	std::vector<unsigned> levels;
@@ -222,7 +230,7 @@ void MixClient::executeTransaction(Transaction const& _t, State& _state, bool _c
 	// execute on a state
 	if (!_call)
 	{
-		t = _gasAuto ? replaceGas(_t, d.gasUsed) : _t;
+		t = _gasAuto ? replaceGas(_t, d.gasUsed, _secret) : _t;
 		er =_state.execute(lastHashes, t);
 		if (t.isCreation() && _state.code(d.contractAddress).empty())
 			BOOST_THROW_EXCEPTION(OutOfGas() << errinfo_comment("Not enough gas for contract deployment"));
@@ -285,7 +293,7 @@ void MixClient::submitTransaction(Secret _secret, u256 _value, Address _dest, by
 	WriteGuard l(x_state);
 	u256 n = m_state.transactionsFrom(toAddress(_secret));
 	Transaction t(_value, _gasPrice, _gas, _dest, _data, n, _secret);
-	executeTransaction(t, m_state, false, _gasAuto);
+	executeTransaction(t, m_state, false, _gasAuto, _secret);
 }
 
 Address MixClient::submitTransaction(Secret _secret, u256 _endowment, bytes const& _init, u256 _gas, u256 _gasPrice, bool _gasAuto)
@@ -293,7 +301,7 @@ Address MixClient::submitTransaction(Secret _secret, u256 _endowment, bytes cons
 	WriteGuard l(x_state);
 	u256 n = m_state.transactionsFrom(toAddress(_secret));
 	eth::Transaction t(_endowment, _gasPrice, _gas, _init, n, _secret);
-	executeTransaction(t, m_state, false, _gasAuto);
+	executeTransaction(t, m_state, false, _gasAuto, _secret);
 	Address address = right160(sha3(rlpList(t.sender(), t.nonce())));
 	return address;
 }
@@ -307,7 +315,6 @@ dev::eth::ExecutionResult MixClient::call(Address const& _from, u256 _value, Add
 	t.forceSender(_from);
 	if (_ff == FudgeFactor::Lenient)
 		temp.addBalance(_from, (u256)(t.gasRequired() * t.gasPrice() + t.value()));
-	bytes rlp = t.rlp();
 	WriteGuard lw(x_state); //TODO: lock is required only for last execution state
 	executeTransaction(t, temp, true, _gasAuto);
 	return lastExecution().result;

mix/MixClient.h

@@ -87,9 +87,9 @@ protected:
 	virtual void prepareForTransaction() override {}
 
 private:
-	void executeTransaction(dev::eth::Transaction const& _t, eth::State& _state, bool _call, bool _gasAuto);
+	void executeTransaction(dev::eth::Transaction const& _t, eth::State& _state, bool _call, bool _gasAuto, dev::Secret const& _secret = dev::Secret());
 	void noteChanged(h256Set const& _filters);
-	dev::eth::Transaction replaceGas(dev::eth::Transaction const& _t, dev::u256 const& _gas);
+	dev::eth::Transaction replaceGas(dev::eth::Transaction const& _t, dev::u256 const& _gas, dev::Secret const& _secret = dev::Secret());
 
 	eth::State m_state;
 	eth::State m_startState;