diff options
Diffstat (limited to 'eth')
| -rw-r--r-- | eth/api.go | 18 | ||||
| -rw-r--r-- | eth/downloader/downloader.go | 30 |
2 files changed, 37 insertions, 11 deletions
diff --git a/eth/api.go b/eth/api.go index b4815caae..cfbafd79f 100644 --- a/eth/api.go +++ b/eth/api.go @@ -762,7 +762,7 @@ type RPCTransaction struct { // newRPCPendingTransaction returns a pending transaction that will serialize to the RPC representation func newRPCPendingTransaction(tx *types.Transaction) *RPCTransaction { - from, _ := tx.From() + from, _ := tx.FromFrontier() return &RPCTransaction{ From: from, @@ -780,7 +780,7 @@ func newRPCPendingTransaction(tx *types.Transaction) *RPCTransaction { func newRPCTransactionFromBlockIndex(b *types.Block, txIndex int) (*RPCTransaction, error) { if txIndex >= 0 && txIndex < len(b.Transactions()) { tx := b.Transactions()[txIndex] - from, err := tx.From() + from, err := tx.FromFrontier() if err != nil { return nil, err } @@ -970,7 +970,7 @@ func (s *PublicTransactionPoolAPI) GetTransactionReceipt(txHash common.Hash) (ma return nil, nil } - from, err := tx.From() + from, err := tx.FromFrontier() if err != nil { glog.V(logger.Debug).Infof("%v\n", err) return nil, nil @@ -1084,7 +1084,7 @@ func (s *PublicTransactionPoolAPI) SendRawTransaction(encodedTx string) (string, } if tx.To() == nil { - from, err := tx.From() + from, err := tx.FromFrontier() if err != nil { return "", err } @@ -1190,7 +1190,7 @@ type SignTransactionResult struct { } func newTx(t *types.Transaction) *Tx { - from, _ := t.From() + from, _ := t.FromFrontier() return &Tx{ tx: t, To: t.To(), @@ -1263,7 +1263,7 @@ func (s *PublicTransactionPoolAPI) PendingTransactions() ([]*RPCTransaction, err pending := s.txPool.GetTransactions() transactions := make([]*RPCTransaction, 0) for _, tx := range pending { - if from, _ := tx.From(); accountSet.Has(from) { + if from, _ := tx.FromFrontier(); accountSet.Has(from) { transactions = append(transactions, newRPCPendingTransaction(tx)) } } @@ -1298,7 +1298,7 @@ func (s *PublicTransactionPoolAPI) NewPendingTransactions() (rpc.Subscription, e } tx := transaction.(core.TxPreEvent) - if from, err := tx.Tx.From(); err == nil { + if from, err := tx.Tx.FromFrontier(); err == nil { if accountSet.Has(from) { return tx.Tx.Hash() } @@ -1315,7 +1315,7 @@ func (s *PublicTransactionPoolAPI) Resend(tx *Tx, gasPrice, gasLimit *rpc.HexNum pending := s.txPool.GetTransactions() for _, p := range pending { - if pFrom, err := p.From(); err == nil && pFrom == tx.From && p.SigHash() == tx.tx.SigHash() { + if pFrom, err := p.FromFrontier(); err == nil && pFrom == tx.From && p.SigHash() == tx.tx.SigHash() { if gasPrice == nil { gasPrice = rpc.NewHexNumber(tx.tx.GasPrice()) } @@ -1589,7 +1589,7 @@ func (s *PrivateDebugAPI) doReplayTransaction(txHash common.Hash) ([]vm.StructLo return nil, nil, nil, err } - txFrom, err := tx.From() + txFrom, err := tx.FromFrontier() if err != nil { return nil, nil, nil, fmt.Errorf("Unable to create transaction sender") diff --git a/eth/downloader/downloader.go b/eth/downloader/downloader.go index 6dad6a2cd..de54bd859 100644 --- a/eth/downloader/downloader.go +++ b/eth/downloader/downloader.go @@ -571,8 +571,14 @@ func (d *Downloader) findAncestor61(p *peer) (uint64, error) { // Check if a common ancestor was found finished = true for i := len(hashes) - 1; i >= 0; i-- { + // Skip any headers that underflow/overflow our requested set + header := d.getHeader(hashes[i]) + if header == nil || header.Number.Int64() < from || header.Number.Uint64() > head { + continue + } + // Otherwise check if we already know the header or not if d.hasBlockAndState(hashes[i]) { - number, hash = uint64(from)+uint64(i), hashes[i] + number, hash = header.Number.Uint64(), header.Hash() break } } @@ -990,12 +996,28 @@ func (d *Downloader) findAncestor(p *peer) (uint64, error) { // Make sure the peer actually gave something valid headers := packet.(*headerPack).headers if len(headers) == 0 { - glog.V(logger.Debug).Infof("%v: empty head header set", p) + glog.V(logger.Warn).Infof("%v: empty head header set", p) return 0, errEmptyHeaderSet } + // Make sure the peer's reply conforms to the request + for i := 0; i < len(headers); i++ { + if number := headers[i].Number.Int64(); number != from+int64(i) { + glog.V(logger.Warn).Infof("%v: head header set (item %d) broke chain ordering: requested %d, got %d", p, i, from+int64(i), number) + return 0, errInvalidChain + } + if i > 0 && headers[i-1].Hash() != headers[i].ParentHash { + glog.V(logger.Warn).Infof("%v: head header set (item %d) broke chain ancestry: expected [%x], got [%x]", p, i, headers[i-1].Hash().Bytes()[:4], headers[i].ParentHash[:4]) + return 0, errInvalidChain + } + } // Check if a common ancestor was found finished = true for i := len(headers) - 1; i >= 0; i-- { + // Skip any headers that underflow/overflow our requested set + if headers[i].Number.Int64() < from || headers[i].Number.Uint64() > head { + continue + } + // Otherwise check if we already know the header or not if (d.mode != LightSync && d.hasBlockAndState(headers[i].Hash())) || (d.mode == LightSync && d.hasHeader(headers[i].Hash())) { number, hash = headers[i].Number.Uint64(), headers[i].Hash() break @@ -1206,6 +1228,10 @@ func (d *Downloader) fetchHeaders(p *peer, td *big.Int, from uint64) error { frequency = 1 } if n, err := d.insertHeaders(headers, frequency); err != nil { + // If some headers were inserted, add them too to the rollback list + if n > 0 { + rollback = append(rollback, headers[:n]...) + } glog.V(logger.Debug).Infof("%v: invalid header #%d [%x…]: %v", p, headers[n].Number, headers[n].Hash().Bytes()[:4], err) return errInvalidChain } |