EIP658: Status code in receipt #4275

pirapira · 2017-07-19T13:22:07Z

codecov-io · 2017-07-19T15:27:12Z

Codecov Report

Merging #4275 into develop will increase coverage by <.01%.
The diff coverage is 65.9%.

@@             Coverage Diff             @@
##           develop    #4275      +/-   ##
===========================================
+ Coverage    67.48%   67.49%   +<.01%     
===========================================
  Files          306      306              
  Lines        23450    23472      +22     
===========================================
+ Hits         15826    15843      +17     
- Misses        7624     7629       +5

Impacted Files	Coverage Δ
libethereum/TransactionReceipt.h	`20% <ø> (-7.28%)`	⬇️
libethereum/Executive.h	`66.66% <ø> (ø)`	⬆️
libethcore/Exceptions.h	`76.74% <0%> (-1.83%)`	⬇️
libweb3jsonrpc/JsonHelper.cpp	`4.73% <0%> (-0.04%)`	⬇️
libethereum/State.cpp	`75.44% <100%> (-0.08%)`	⬇️
libethereum/Executive.cpp	`61.53% <100%> (ø)`	⬆️
libethereum/Block.cpp	`85.46% <50%> (-0.22%)`	⬇️
libethereum/TransactionReceipt.cpp	`62.5% <68.75%> (-5.07%)`	⬇️
libdevcore/RLP.h	`80.59% <0%> (-0.61%)`	⬇️
libp2p/Common.cpp	`52.8% <0%> (+0.79%)`	⬆️
... and 2 more

gumb0

We need also to modify Block::stateRootBeforeTx, so that it returns 0 when receipt doesn't have state root - this is what RPC methods that need intermediate state rely on.

gumb0 · 2017-07-19T16:25:57Z

libethereum/TransactionReceipt.h

@@ -52,7 +58,12 @@ class TransactionReceipt
 	bytes rlp() const { RLPStream s; streamRLP(s); return s.out(); }

 private:
-	h256 m_stateRoot;
+	bool m_hasStatusCode = false;
+	union


I'd suggest trying to use boost::variant for this, it kind of encapsulates union + type variable

gumb0 · 2017-07-19T16:37:50Z

Also toJson for receipt in libweb3jsonrpc/JsonHelper.cpp needs a fix

gumb0 · 2017-07-19T16:43:32Z

More exactly, dev::eth::createIntermediateState in State.cpp assumes that intermediate state root returned from Block::stateRootBeforeTx is either valid hash or 0 (then replays transactions) - we could also handle exception there instead of modifying Block::stateRootBeforeTx

pirapira · 2017-07-19T17:49:10Z

I started using boost::variant and changed the stateRoot() usage.

gumb0 · 2017-07-20T10:47:39Z

libethereum/TransactionReceipt.cpp

-		_s.appendList(3);
-
-	_s << m_gasUsed << m_bloom;
+	struct appenderVisitor : boost::static_visitor<void>


Wow, couldn't we just do something like

if (m_statusCodeOrStateRoot.which() == 0) _s << boost::get<uint8_t>(m_statusCodeOrStateRoot); else _s << boost::get<h256>(m_statusCodeOrStateRoot);

gumb0 · 2017-07-20T10:50:47Z

libethereum/TransactionReceipt.cpp

+{
+	try
+	{
+		return boost::get<h256>(m_statusCodeOrStateRoot);


In stateRoot you use different approach than in hasStatusCode & stateRoot, choose one for consistency (the one without visitor is easier).

I would actually prefer just

if (m_statusCodeOrStateRoot.which() == 1) return boost::get<h256>(m_statusCodeOrStateRoot); else BOOST_THROW_EXCEPTION(TransactionReceiptVersionError());

pirapira · 2017-07-20T12:10:35Z

I made everything into if (hasStatusCode()) ... else ....

gumb0 · 2017-07-20T12:13:19Z

libethereum/TransactionReceipt.cpp

@@ -22,54 +22,88 @@
 #include "TransactionReceipt.h"
 #include <libethcore/Exceptions.h>

+#include <boost/variant/static_visitor.hpp>


This one is not needed now

gumb0 · 2017-07-20T12:13:41Z

libethereum/Block.cpp

+	{
+		return (_i > 0 ? receipt(_i - 1).stateRoot() : m_previousBlock.stateRoot());
+	}
+	catch(TransactionReceiptVersionError const&)


space after catch

gumb0 · 2017-07-20T12:15:03Z

libethereum/TransactionReceipt.cpp

+	if (r[0].size() == 32)
+		m_statusCodeOrStateRoot = (h256)r[0];
+	else if (r[0].size() == 1)
+		m_statusCodeOrStateRoot = (uint8_t)r[0];


Probable add else BOOST_THROW_EXCEPTION(InvalidTransactionReceiptFormat());

gumb0 · 2017-07-20T12:16:37Z

libweb3jsonrpc/JsonHelper.cpp

@@ -185,7 +185,14 @@ Json::Value toJson(dev::eth::TransactionSkeleton const& _t)
 Json::Value toJson(dev::eth::TransactionReceipt const& _t)
 {
 	Json::Value res;
-	res["stateRoot"] = toJS(_t.stateRoot());
+	try


Maybe somewhat simpler would be to use hasStatusCode() instead of try/catch

gumb0 · 2017-07-20T12:17:16Z

libethereum/TransactionReceipt.h

+	/// @returns true if the receipt has a status code.  Otherwise the receipt has a state root (pre-EIP658).
+	bool hasStatusCode() const;
+	/// @returns the state root.
+	/// @throw TransactionReceiptVersionError when m_hasStatusCode is true.


Fix comment, there's no m_hasStatusCode anymore

pirapira requested review from gumb0 and chfast and removed request for gumb0 July 19, 2017 15:37

gumb0 suggested changes Jul 19, 2017

View reviewed changes

pirapira added 3 commits July 19, 2017 19:47

add status code in transaction receipts after Metropolis EIP658

a0895ae

Update tests

643eaa6

Use boost::variant

0ddd07a

pirapira force-pushed the status_code_in_receipt branch from 183ce75 to 0ddd07a Compare July 19, 2017 17:47

gumb0 reviewed Jul 20, 2017

View reviewed changes

pirapira force-pushed the status_code_in_receipt branch from ee46ab2 to eca4fbf Compare July 20, 2017 12:26

read variants in a simpler way

c9d14fc

pirapira force-pushed the status_code_in_receipt branch from eca4fbf to c9d14fc Compare July 20, 2017 12:29

gumb0 approved these changes Jul 20, 2017

View reviewed changes

pirapira merged commit b352d83 into develop Jul 20, 2017

pirapira deleted the status_code_in_receipt branch July 20, 2017 15:24

This was referenced Jul 20, 2017

EIP658: Fill tests after changing the receipt format ethereum/tests#236

Merged

[META] Byzantium implementation progress #4050

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

EIP658: Status code in receipt #4275

EIP658: Status code in receipt #4275

pirapira commented Jul 19, 2017

codecov-io commented Jul 19, 2017 •

edited

Loading

gumb0 left a comment

gumb0 Jul 19, 2017

gumb0 commented Jul 19, 2017

gumb0 commented Jul 19, 2017 •

edited

Loading

pirapira commented Jul 19, 2017

gumb0 Jul 20, 2017

gumb0 Jul 20, 2017

pirapira commented Jul 20, 2017

gumb0 Jul 20, 2017

gumb0 Jul 20, 2017

gumb0 Jul 20, 2017

gumb0 Jul 20, 2017

gumb0 Jul 20, 2017

EIP658: Status code in receipt #4275

EIP658: Status code in receipt #4275

Conversation

pirapira commented Jul 19, 2017

codecov-io commented Jul 19, 2017 • edited Loading

Codecov Report

gumb0 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gumb0 commented Jul 19, 2017

gumb0 commented Jul 19, 2017 • edited Loading

pirapira commented Jul 19, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pirapira commented Jul 20, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov-io commented Jul 19, 2017 •

edited

Loading

gumb0 commented Jul 19, 2017 •

edited

Loading