Remove redundant writes when a state object is reverted (#21)

* Remove redundant writes when a state object is reverted

* Change IsDirty to Transaction level

We don't want a reverted transaction to show up in written trace because it was touched by a previous transaction.

* Add storage read whenever there is a sstore

This fixes an issue when a storage slot is
* written but got reverted
* never read by sLoad opcode

When this happens, we still need to include the storage slot in the trace.

core/state/intra_block_state.go

@@ -426,6 +426,11 @@ func (sdb *IntraBlockState) SeenAccount(addr libcommon.Address) bool {
 	return ok
 }
 
+func (sdb *IntraBlockState) IsDirtyJournal(addr libcommon.Address) bool {
+	_, ok := sdb.journal.dirties[addr]
+	return ok
+}
+
 func (sdb *IntraBlockState) HasLiveState(addr libcommon.Address, key *libcommon.Hash) bool {
 	if stateObject := sdb.stateObjects[addr]; stateObject != nil {
 		if _, ok := stateObject.originStorage[*key]; ok {

core/vm/evmtypes/evmtypes.go

@@ -82,6 +82,7 @@ type IntraBlockState interface {
 	SetState(common.Address, *common.Hash, uint256.Int)
 	HasLiveAccount(addr common.Address) bool
 	SeenAccount(addr common.Address) bool
+	IsDirtyJournal(addr common.Address) bool
 	HasLiveState(addr common.Address, key *common.Hash) bool
 
 	GetTransientState(addr common.Address, key common.Hash) uint256.Int

eth/tracers/native/zero.go

@@ -220,7 +220,7 @@ func (t *zeroTracer) CaptureTxEnd(restGas uint64) {
 			trace.StorageRead = nil
 		}
 
-		if len(trace.StorageWritten) == 0 || !hasLiveAccount {
+		if len(trace.StorageWritten) == 0 || !hasLiveAccount || !t.env.IntraBlockState().IsDirtyJournal(addr) {
 			trace.StorageWritten = nil
 		} else {
 			// A slot write could be reverted if the transaction is reverted. We will need to read the value from the statedb again to get the correct value.
@@ -379,6 +379,7 @@ func (t *zeroTracer) addSLOADToAccount(addr libcommon.Address, key libcommon.Has
 
 func (t *zeroTracer) addSSTOREToAccount(addr libcommon.Address, key libcommon.Hash, value *uint256.Int) {
 	t.tx.Traces[addr].StorageWritten[key] = value
+	t.tx.Traces[addr].StorageReadMap[key] = struct{}{}
 	t.addOpCodeToAccount(addr, vm.SSTORE)
 }