gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[release/1.3.4] eth: fixed homestead tx check

Browse Source 
When a block is queried for retrieval we should add a check whether the
block falls within the frontier rules. If we'd always use `From`
retrieving transaction might fail. This PR temporarily changes
everything to `FromFrontier` (safe!).

This is a backport of c616391df2dda2c21b0a8eed03531a7d44669421
This commit is contained in:
Jeffrey Wilcke 2016-02-28 23:36:00 +01:00
parent 5570b11398
commit 7f83e68b13
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rpc/api/eth.go
View File

@ -661,7 +661,7 @@ func (self *ethApi) Resend(req *shared.Request) (interface{}, error) {
pending := self.ethereum.TxPool().GetTransactions() pending := self.ethereum.TxPool().GetTransactions()
for _, p := range pending { 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)) 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) 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 var ltxs []*tx
for _, tx := range txs { for _, tx := range txs {
if from, _ := tx.From(); accountSet.Has(from) { if from, _ := tx.FromFrontier(); accountSet.Has(from) {
ltxs = append(ltxs, newTx(tx)) ltxs = append(ltxs, newTx(tx))
} }
} }

2
rpc/api/parsing.go
View File

@ -349,7 +349,7 @@ func NewTransactionRes(tx *types.Transaction) *TransactionRes {
// v.BlockHash = // v.BlockHash =
// v.BlockNumber = // v.BlockNumber =
// v.TxIndex = // v.TxIndex =
from, _ := tx.From() from, _ := tx.FromFrontier()
v.From = newHexData(from) v.From = newHexData(from)
v.To = newHexData(tx.To()) v.To = newHexData(tx.To())
v.Value = newHexNum(tx.Value()) v.Value = newHexNum(tx.Value())