From 9bebb9adefa6475c94b3f8e8901d26daa8fcf0fd Mon Sep 17 00:00:00 2001
From: Viktor <vtet32@gmail.com>
Date: Mon, 13 Nov 2017 20:29:02 +0300
Subject: [PATCH] expect []byte instead of common.Address in ethapi tracer

---
 internal/ethapi/tracer.go | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/internal/ethapi/tracer.go b/internal/ethapi/tracer.go
index f90400eecb..fc742e6c44 100644
--- a/internal/ethapi/tracer.go
+++ b/internal/ethapi/tracer.go
@@ -130,33 +130,28 @@ type dbWrapper struct {
 }
 
 // getBalance retrieves an account's balance
-func (dw *dbWrapper) getBalance(addr common.Address) *big.Int {
-	return dw.db.GetBalance(addr)
-}
-
-// getBalance retrieves an account's balance
-func (dw *dbWrapper) getBalanceFromJs(addr []byte) *big.Int {
+func (dw *dbWrapper) getBalance(addr []byte) *big.Int {
 	return dw.db.GetBalance(common.BytesToAddress(addr))
 }
 
 // getNonce retrieves an account's nonce
-func (dw *dbWrapper) getNonce(addr common.Address) uint64 {
-	return dw.db.GetNonce(addr)
+func (dw *dbWrapper) getNonce(addr []byte) uint64 {
+	return dw.db.GetNonce(common.BytesToAddress(addr))
 }
 
 // getCode retrieves an account's code
-func (dw *dbWrapper) getCode(addr common.Address) []byte {
-	return dw.db.GetCode(addr)
+func (dw *dbWrapper) getCode(addr []byte) []byte {
+	return dw.db.GetCode(common.BytesToAddress(addr))
 }
 
 // getState retrieves an account's state data for the given hash
-func (dw *dbWrapper) getState(addr common.Address, hash common.Hash) common.Hash {
-	return dw.db.GetState(addr, hash)
+func (dw *dbWrapper) getState(addr []byte, hash common.Hash) common.Hash {
+	return dw.db.GetState(common.BytesToAddress(addr), hash)
 }
 
 // exists returns true iff the account exists
-func (dw *dbWrapper) exists(addr common.Address) bool {
-	return dw.db.Exist(addr)
+func (dw *dbWrapper) exists(addr []byte) bool {
+	return dw.db.Exist(common.BytesToAddress(addr))
 }
 
 // toValue returns an otto.Value for the dbWrapper
@@ -164,7 +159,6 @@ func (dw *dbWrapper) toValue(vm *otto.Otto) otto.Value {
 	value, _ := vm.ToValue(dw)
 	obj := value.Object()
 	obj.Set("getBalance", dw.getBalance)
-	obj.Set("getBalanceFromJs", dw.getBalanceFromJs)
 	obj.Set("getNonce", dw.getNonce)
 	obj.Set("getCode", dw.getCode)
 	obj.Set("getState", dw.getState)