From 8754f2b768ba00d8507a7990dccca80e6cea1cc0 Mon Sep 17 00:00:00 2001 From: Gustav Simonsson Date: Sun, 19 Apr 2015 01:09:41 +0200 Subject: Fix common.Address / []byte type conversions --- eth/backend.go | 2 +- xeth/xeth.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eth/backend.go b/eth/backend.go index 65b096d49..362a7eab7 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -545,7 +545,7 @@ func (self *Ethereum) syncAccounts(tx *types.Transaction) { return } - if self.accountManager.HasAccount(from.Bytes()) { + if self.accountManager.HasAccount(from) { if self.chainManager.TxState().GetNonce(from) < tx.Nonce() { self.chainManager.TxState().SetNonce(from, tx.Nonce()) } diff --git a/xeth/xeth.go b/xeth/xeth.go index 7e6a2c184..3b29eb3f7 100644 --- a/xeth/xeth.go +++ b/xeth/xeth.go @@ -781,7 +781,7 @@ func (self *XEth) Call(fromStr, toStr, valueStr, gasStr, gasPriceStr, dataStr st if err != nil || len(accounts) == 0 { from = statedb.GetOrNewStateObject(common.Address{}) } else { - from = statedb.GetOrNewStateObject(common.BytesToAddress(accounts[0].Address)) + from = statedb.GetOrNewStateObject(accounts[0].Address) } } else { from = statedb.GetOrNewStateObject(common.HexToAddress(fromStr)) -- cgit