Merge pull request ethereum#37 from OffchainLabs/caller-stack

Track Caller Stack

core/vm/evm_arbitrum.go

@@ -16,7 +16,44 @@
 
 package vm
 
+import "github.com/ethereum/go-ethereum/common"
+
 // Depth returns the current depth
 func (evm *EVM) Depth() int {
 	return evm.depth
 }
+
+type TxProcessingHook interface {
+	StartTxHook() bool
+	GasChargingHook(gasRemaining *uint64) error
+	EndTxHook(totalGasUsed uint64, success bool)
+	NonrefundableGas() uint64
+	PushCaller(addr common.Address)
+	PopCaller()
+}
+
+type DefaultTxProcessor struct{}
+
+func (p DefaultTxProcessor) StartTxHook() bool {
+	return false
+}
+
+func (p DefaultTxProcessor) GasChargingHook(gasRemaining *uint64) error {
+	return nil
+}
+
+func (p DefaultTxProcessor) EndTxHook(totalGasUsed uint64, success bool) {
+	return
+}
+
+func (p DefaultTxProcessor) NonrefundableGas() uint64 {
+	return 0
+}
+
+func (p DefaultTxProcessor) PushCaller(addr common.Address) {
+	return
+}
+
+func (p DefaultTxProcessor) PopCaller() {
+	return
+}

core/vm/interpreter.go

@@ -119,7 +119,9 @@ func (in *EVMInterpreter) Run(contract *Contract, input []byte, readOnly bool) (
 
 	// Increment the call depth which is restricted to 1024
 	in.evm.depth++
+	in.evm.ProcessingHook.PushCaller(contract.Caller())
 	defer func() { in.evm.depth-- }()
+	defer func() { in.evm.ProcessingHook.PopCaller() }()
 
 	// Make sure the readOnly is only set if we aren't in readOnly yet.
 	// This also makes sure that the readOnly flag isn't removed for child calls.