diff options
author | Gustav Simonsson <gustav.simonsson@gmail.com> | 2015-04-19 07:09:41 +0800 |
---|---|---|
committer | Gustav Simonsson <gustav.simonsson@gmail.com> | 2015-05-12 23:19:39 +0800 |
commit | 8754f2b768ba00d8507a7990dccca80e6cea1cc0 (patch) | |
tree | 093bba1ffd41f520058c57a0b709bc680ddee91d | |
parent | cd88295f5ac360aaaf63be94ae09f202a4b8630f (diff) | |
download | dexon-8754f2b768ba00d8507a7990dccca80e6cea1cc0.tar dexon-8754f2b768ba00d8507a7990dccca80e6cea1cc0.tar.gz dexon-8754f2b768ba00d8507a7990dccca80e6cea1cc0.tar.bz2 dexon-8754f2b768ba00d8507a7990dccca80e6cea1cc0.tar.lz dexon-8754f2b768ba00d8507a7990dccca80e6cea1cc0.tar.xz dexon-8754f2b768ba00d8507a7990dccca80e6cea1cc0.tar.zst dexon-8754f2b768ba00d8507a7990dccca80e6cea1cc0.zip |
Fix common.Address / []byte type conversions
-rw-r--r-- | eth/backend.go | 2 | ||||
-rw-r--r-- | 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)) |