diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2016-02-29 22:05:37 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2016-02-29 22:05:37 +0800 |
| commit | 4044a8cea44cd4cee3a8ddaf51a76b71c9d22042 (patch) | |
| tree | 1aa3776381e8e117b66e4a8ed1bf83e29d966ff1 /rpc/api/eth.go | |
| parent | c541b38fb36587d23c60f5e2f2b9b3c8700ec489 (diff) | |
| parent | 61be63bb9b8527bb3e2357ad35a0f4ef29304da1 (diff) | |
| download | go-tangerine-1.3.4.tar go-tangerine-1.3.4.tar.gz go-tangerine-1.3.4.tar.bz2 go-tangerine-1.3.4.tar.lz go-tangerine-1.3.4.tar.xz go-tangerine-1.3.4.tar.zst go-tangerine-1.3.4.zip | |
Merge pull request #2258 from obscuren/release/1.3.4v1.3.4
Homestead Release Candidate
Diffstat (limited to 'rpc/api/eth.go')
| -rw-r--r-- | rpc/api/eth.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rpc/api/eth.go b/rpc/api/eth.go index db7a643d8..a78e492ff 100644 --- a/rpc/api/eth.go +++ b/rpc/api/eth.go @@ -661,7 +661,7 @@ func (self *ethApi) Resend(req *shared.Request) (interface{}, error) { pending := self.ethereum.TxPool().GetTransactions() for _, p := range pending { - if pFrom, err := p.From(); err == nil && pFrom == from && p.SigHash() == args.Tx.tx.SigHash() { + if pFrom, err := p.FromFrontier(); err == nil && pFrom == from && p.SigHash() == args.Tx.tx.SigHash() { self.ethereum.TxPool().RemoveTx(common.HexToHash(args.Tx.Hash)) return self.xeth.Transact(args.Tx.From, args.Tx.To, args.Tx.Nonce, args.Tx.Value, args.GasLimit, args.GasPrice, args.Tx.Data) } @@ -688,7 +688,7 @@ func (self *ethApi) PendingTransactions(req *shared.Request) (interface{}, error var ltxs []*tx for _, tx := range txs { - if from, _ := tx.From(); accountSet.Has(from) { + if from, _ := tx.FromFrontier(); accountSet.Has(from) { ltxs = append(ltxs, newTx(tx)) } } |