LOG instructions.

libethereum/State.cpp

@@ -1114,7 +1114,7 @@ u256 State::execute(bytesConstRef _rlp, bytes* o_output, bool _commit)
 	// TODO: CHECK TRIE after level DB flush to make sure exactly the same.
 
 	// Add to the user-originated transactions that we've executed.
-	m_transactions.push_back(TransactionReceipt(e.t(), rootHash(), startGasUsed + e.gasUsed(), ms));
+	m_transactions.push_back(TransactionReceipt(e.t(), rootHash(), startGasUsed + e.gasUsed(), ms, e.logs()));
 	m_transactionSet.insert(e.t().sha3());
 	return e.gasUsed();
 }

libethereum/State.h

@@ -54,7 +54,7 @@ struct StateDetail: public LogChannel { static const char* name() { return "/S/"
 
 struct TransactionReceipt
 {
-	TransactionReceipt(Transaction const& _t, h256 _root, u256 _gasUsed, Manifest const& _ms): transaction(_t), stateRoot(_root), gasUsed(_gasUsed), changes(_ms) {}
+	TransactionReceipt(Transaction const& _t, h256 _root, u256 _gasUsed, Manifest const& _ms, LogEntries const& _logs): transaction(_t), stateRoot(_root), gasUsed(_gasUsed), changes(_ms), logs(_logs) {}
 
 //	Manifest const& changes() const { return changes; }
 
@@ -69,6 +69,7 @@ struct TransactionReceipt
 	h256 stateRoot;
 	u256 gasUsed;
 	Manifest changes;
+	LogEntries logs;
 };
 
 struct PrecompiledAddress

libevm/ExtVMFace.h

@@ -36,8 +36,10 @@ namespace eth
 
 struct LogEntry
 {
+	LogEntry() {}
+	LogEntry(Address const& _f, h256s&& _ts, bytes&& _d): from(_f), topics(std::move(_ts)), data(std::move(_d)) {}
 	Address from;
-	h256 topics;
+	h256s topics;
 	bytes data;
 };
 
@@ -104,6 +106,9 @@ public:
 	/// Make a new message call.
 	virtual bool call(Address, u256, bytesConstRef, u256*, bytesRef, OnOpFunc const&, Address, Address) { return false; }
 
+	/// Revert any changes made (by any of the other calls).
+	virtual void log(h256s&& _topics, bytesConstRef _data) { sub.logs.push_back(LogEntry(myAddress, std::move(_topics), _data.toBytes())); }
+
 	/// Revert any changes made (by any of the other calls).
 	virtual void revert() {}
 

libevm/VM.h

@@ -172,6 +172,18 @@ template <class Ext> dev::bytesConstRef dev::eth::VM::go(Ext& _ext, OnOpFunc con
 			runGas = c_balanceGas;
 			break;
 
+		case Instruction::LOG0:
+		case Instruction::LOG1:
+		case Instruction::LOG2:
+		case Instruction::LOG3:
+		case Instruction::LOG4:
+		{
+			unsigned n = (unsigned)inst - (unsigned)Instruction::LOG0;
+			require(n + 2);
+			newTempSize = memNeed(m_stack[m_stack.size() - 1 - n], m_stack[m_stack.size() - 2 - n]);
+			break;
+		}
+
 		case Instruction::CALL:
 		case Instruction::CALLCODE:
 			require(7);
@@ -691,6 +703,21 @@ template <class Ext> dev::bytesConstRef dev::eth::VM::go(Ext& _ext, OnOpFunc con
 			break;
 		case Instruction::JUMPDEST:
 			break;
+		case Instruction::LOG0:
+			_ext.log({}, bytesConstRef(m_temp.data() + (unsigned)m_stack[m_stack.size() - 1], (unsigned)m_stack[m_stack.size() - 2]));
+			break;
+		case Instruction::LOG1:
+			_ext.log({m_stack[m_stack.size() - 1]}, bytesConstRef(m_temp.data() + (unsigned)m_stack[m_stack.size() - 2], (unsigned)m_stack[m_stack.size() - 3]));
+			break;
+		case Instruction::LOG2:
+			_ext.log({m_stack[m_stack.size() - 1], m_stack[m_stack.size() - 2]}, bytesConstRef(m_temp.data() + (unsigned)m_stack[m_stack.size() - 3], (unsigned)m_stack[m_stack.size() - 4]));
+			break;
+		case Instruction::LOG3:
+			_ext.log({m_stack[m_stack.size() - 1], m_stack[m_stack.size() - 2], m_stack[m_stack.size() - 3]}, bytesConstRef(m_temp.data() + (unsigned)m_stack[m_stack.size() - 4], (unsigned)m_stack[m_stack.size() - 5]));
+			break;
+		case Instruction::LOG4:
+			_ext.log({m_stack[m_stack.size() - 1], m_stack[m_stack.size() - 2], m_stack[m_stack.size() - 3], m_stack[m_stack.size() - 4]}, bytesConstRef(m_temp.data() + (unsigned)m_stack[m_stack.size() - 5], (unsigned)m_stack[m_stack.size() - 6]));
+			break;
 		case Instruction::CREATE:
 		{
 			u256 endowment = m_stack.back();

libevmface/Instruction.cpp

@@ -149,6 +149,11 @@ const std::map<std::string, Instruction> dev::eth::c_instructions =
 	{ "SWAP14", Instruction::SWAP14 },
 	{ "SWAP15", Instruction::SWAP15 },
 	{ "SWAP16", Instruction::SWAP16 },
+	{ "LOG0", Instruction::LOG0 },
+	{ "LOG1", Instruction::LOG1 },
+	{ "LOG2", Instruction::LOG2 },
+	{ "LOG3", Instruction::LOG3 },
+	{ "LOG4", Instruction::LOG4 },
 	{ "CREATE", Instruction::CREATE },
 	{ "CALL", Instruction::CALL },
 	{ "CALLCODE", Instruction::CALLCODE },
@@ -277,6 +282,11 @@ static const std::map<Instruction, InstructionInfo> c_instructionInfo =
 	{ Instruction::SWAP14,		{ "SWAP14",			0, 15, 15 } },
 	{ Instruction::SWAP15,		{ "SWAP15",			0, 16, 16 } },
 	{ Instruction::SWAP16,		{ "SWAP16",			0, 17, 17 } },
+	{ Instruction::LOG0,		{ "LOG0",			0, 1, 0 } },
+	{ Instruction::LOG1,		{ "LOG1",			0, 2, 0 } },
+	{ Instruction::LOG2,		{ "LOG2",			0, 3, 0 } },
+	{ Instruction::LOG3,		{ "LOG3",			0, 4, 0 } },
+	{ Instruction::LOG4,		{ "LOG4",			0, 5, 0 } },
 	{ Instruction::CREATE,		{ "CREATE",			0, 3, 1 } },
 	{ Instruction::CALL,		{ "CALL",			0, 7, 1 } },
 	{ Instruction::CALLCODE,	{ "CALLCODE",		0, 7, 1 } },

libevmface/Instruction.h

@@ -162,6 +162,12 @@ enum class Instruction: uint8_t
 	SWAP15,				///< swaps the highest and 16th highest value on the stack
 	SWAP16,				///< swaps the highest and 17th highest value on the stack
 
+	LOG0 = 0xa0,		///< Makes a log entry; no topics.
+	LOG1,				///< Makes a log entry; 1 topic.
+	LOG2,				///< Makes a log entry; 2 topics.
+	LOG3,				///< Makes a log entry; 3 topics.
+	LOG4,				///< Makes a log entry; 4 topics.
+
 	CREATE = 0xf0,		///< create a new account with associated code
 	CALL,				///< message-call into an account
 	RETURN,				///< halt execution returning output data