From 12f82ab2ff71e1d93610a40cf206f3e3d3faa70d Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Thu, 14 May 2015 11:57:29 -0500 Subject: Check for error on DB fetch of tx --- xeth/xeth.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'xeth') diff --git a/xeth/xeth.go b/xeth/xeth.go index 0fe68d175..0d16393c2 100644 --- a/xeth/xeth.go +++ b/xeth/xeth.go @@ -318,7 +318,11 @@ func (self *XEth) EthTransactionByHash(hash string) (tx *types.Transaction, blha Index uint64 } - v, _ := self.backend.ExtraDb().Get(append(common.FromHex(hash), 0x0001)) + v, dberr := self.backend.ExtraDb().Get(append(common.FromHex(hash), 0x0001)) + // TODO check specifically for ErrNotFound + if dberr != nil { + return + } r := bytes.NewReader(v) err := rlp.Decode(r, &txExtra) if err == nil { -- cgit v1.2.3 From 79fa05867f78a159f4c229c21c12f0e4679b5b2e Mon Sep 17 00:00:00 2001 From: obscuren Date: Fri, 15 May 2015 23:52:57 +0200 Subject: xeth: set balance max balance to from in call. Closes #951 --- xeth/xeth.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'xeth') diff --git a/xeth/xeth.go b/xeth/xeth.go index 0d16393c2..88cd30afc 100644 --- a/xeth/xeth.go +++ b/xeth/xeth.go @@ -778,7 +778,7 @@ func (self *XEth) PushTx(encodedTx string) (string, error) { } func (self *XEth) Call(fromStr, toStr, valueStr, gasStr, gasPriceStr, dataStr string) (string, string, error) { - statedb := self.State().State() //self.eth.ChainManager().TransState() + statedb := self.State().State().Copy() //self.eth.ChainManager().TransState() var from *state.StateObject if len(fromStr) == 0 { accounts, err := self.backend.AccountManager().Accounts() @@ -791,6 +791,7 @@ func (self *XEth) Call(fromStr, toStr, valueStr, gasStr, gasPriceStr, dataStr st from = statedb.GetOrNewStateObject(common.HexToAddress(fromStr)) } + from.SetBalance(common.MaxBig) from.SetGasPool(self.backend.ChainManager().GasLimit()) msg := callmsg{ from: from, -- cgit v1.2.3