diff options
Diffstat (limited to 'rpc/api')
| -rw-r--r-- | rpc/api/eth.go | 4 | ||||
| -rw-r--r-- | rpc/api/parsing.go | 2 |
2 files changed, 3 insertions, 3 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)) } } diff --git a/rpc/api/parsing.go b/rpc/api/parsing.go index 7667616ff..21ece355e 100644 --- a/rpc/api/parsing.go +++ b/rpc/api/parsing.go @@ -349,7 +349,7 @@ func NewTransactionRes(tx *types.Transaction) *TransactionRes { // v.BlockHash = // v.BlockNumber = // v.TxIndex = - from, _ := tx.From() + from, _ := tx.FromFrontier() v.From = newHexData(from) v.To = newHexData(tx.To()) v.Value = newHexNum(tx.Value()) |