core/vm, core/state: added storage to structured vm logging

2 files changed, 16 insertions, 8 deletions

diff --git a/core/vm/environment.go b/core/vm/environment.go
index 31d5d5ea6..25bd2515e 100644
--- a/core/vm/environment.go
+++ b/core/vm/environment.go
@@ -34,11 +34,12 @@ type Environment interface {
 }
 
 type StructLog struct {
-	Pc     uint64
-	Op     OpCode
-	Gas    *big.Int
-	Memory []byte
-	Stack  []*big.Int
+	Pc      uint64
+	Op      OpCode
+	Gas     *big.Int
+	Memory  []byte
+	Stack   []*big.Int
+	Storage map[common.Hash][]byte
 }
 
 type Account interface {
diff --git a/core/vm/vm.go b/core/vm/vm.go
index 7c4a7ce6d..e4f6e9268 100644
--- a/core/vm/vm.go
+++ b/core/vm/vm.go
@@ -95,7 +95,7 @@ func (self *Vm) Run(context *Context, callData []byte) (ret []byte, err error) {
 		// Get the memory location of pc
 		op = context.GetOp(pc)
 
-		self.log(pc, op, context.Gas, mem, stack)
+		self.log(pc, op, context.Gas, mem, stack, context)
 
 		newMemSize, gas, err := self.calculateGasAndSize(context, caller, op, statedb, mem, stack)
 		if err != nil {
@@ -778,13 +778,20 @@ func (self *Vm) RunPrecompiled(p *PrecompiledAccount, callData []byte, context *
 	}
 }
 
-func (self *Vm) log(pc uint64, op OpCode, gas *big.Int, memory *Memory, stack *Stack) {
+func (self *Vm) log(pc uint64, op OpCode, gas *big.Int, memory *Memory, stack *Stack, context *Context) {
 	if Debug {
 		mem := make([]byte, len(memory.Data()))
 		copy(mem, memory.Data())
 		stck := make([]*big.Int, len(stack.Data()))
 		copy(stck, stack.Data())
-		self.env.AddStructLog(StructLog{pc, op, new(big.Int).Set(gas), mem, stck})
+
+		object := context.self.(*state.StateObject)
+		storage := make(map[common.Hash][]byte)
+		object.EachStorage(func(k, v []byte) {
+			storage[common.BytesToHash(k)] = v
+		})
+
+		self.env.AddStructLog(StructLog{pc, op, new(big.Int).Set(gas), mem, stck, storage})
 	}
 }