roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Merge pull request #2234 from obscuren/tx-rpc-fix

Browse Source 
eth: fixed homestead tx check
This commit is contained in:
Péter Szilágyi 2016-02-23 10:29:25 +02:00
commit b57a3f154f
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
eth/api.go
View File

@ -762,7 +762,7 @@ type RPCTransaction struct {
// newRPCPendingTransaction returns a pending transaction that will serialize to the RPC representation // newRPCPendingTransaction returns a pending transaction that will serialize to the RPC representation
func newRPCPendingTransaction(tx *types.Transaction) *RPCTransaction { func newRPCPendingTransaction(tx *types.Transaction) *RPCTransaction {
from, _ := tx.From() from, _ := tx.FromFrontier()
return &RPCTransaction{ return &RPCTransaction{
From: from, From: from,
@ -780,7 +780,7 @@ func newRPCPendingTransaction(tx *types.Transaction) *RPCTransaction {
func newRPCTransactionFromBlockIndex(b *types.Block, txIndex int) (*RPCTransaction, error) { func newRPCTransactionFromBlockIndex(b *types.Block, txIndex int) (*RPCTransaction, error) {
if txIndex >= 0 && txIndex < len(b.Transactions()) { if txIndex >= 0 && txIndex < len(b.Transactions()) {
tx := b.Transactions()[txIndex] tx := b.Transactions()[txIndex]
from, err := tx.From() from, err := tx.FromFrontier()
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -970,7 +970,7 @@ func (s *PublicTransactionPoolAPI) GetTransactionReceipt(txHash common.Hash) (ma
return nil, nil return nil, nil
} }
from, err := tx.From() from, err := tx.FromFrontier()
if err != nil { if err != nil {
glog.V(logger.Debug).Infof("%v\n", err) glog.V(logger.Debug).Infof("%v\n", err)
return nil, nil return nil, nil
@ -1084,7 +1084,7 @@ func (s *PublicTransactionPoolAPI) SendRawTransaction(encodedTx string) (string,
} }
if tx.To() == nil { if tx.To() == nil {
from, err := tx.From() from, err := tx.FromFrontier()
if err != nil { if err != nil {
return "", err return "", err
} }
@ -1190,7 +1190,7 @@ type SignTransactionResult struct {
} }
func newTx(t *types.Transaction) *Tx { func newTx(t *types.Transaction) *Tx {
from, _ := t.From() from, _ := t.FromFrontier()
return &Tx{ return &Tx{
tx: t, tx: t,
To: t.To(), To: t.To(),
@ -1263,7 +1263,7 @@ func (s *PublicTransactionPoolAPI) PendingTransactions() ([]*RPCTransaction, err
pending := s.txPool.GetTransactions() pending := s.txPool.GetTransactions()
transactions := make([]*RPCTransaction, 0) transactions := make([]*RPCTransaction, 0)
for _, tx := range pending { for _, tx := range pending {
if from, _ := tx.From(); accountSet.Has(from) { if from, _ := tx.FromFrontier(); accountSet.Has(from) {
transactions = append(transactions, newRPCPendingTransaction(tx)) transactions = append(transactions, newRPCPendingTransaction(tx))
} }
} }
@ -1298,7 +1298,7 @@ func (s *PublicTransactionPoolAPI) NewPendingTransactions() (rpc.Subscription, e
} }
tx := transaction.(core.TxPreEvent) tx := transaction.(core.TxPreEvent)
if from, err := tx.Tx.From(); err == nil { if from, err := tx.Tx.FromFrontier(); err == nil {
if accountSet.Has(from) { if accountSet.Has(from) {
return tx.Tx.Hash() return tx.Tx.Hash()
} }
@ -1315,7 +1315,7 @@ func (s *PublicTransactionPoolAPI) Resend(tx *Tx, gasPrice, gasLimit *rpc.HexNum
pending := s.txPool.GetTransactions() pending := s.txPool.GetTransactions()
for _, p := range pending { 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 { if gasPrice == nil {
gasPrice = rpc.NewHexNumber(tx.tx.GasPrice()) gasPrice = rpc.NewHexNumber(tx.tx.GasPrice())
} }
@ -1589,7 +1589,7 @@ func (s *PrivateDebugAPI) doReplayTransaction(txHash common.Hash) ([]vm.StructLo
return nil, nil, nil, err return nil, nil, nil, err
} }
txFrom, err := tx.From() txFrom, err := tx.FromFrontier()
if err != nil { if err != nil {
return nil, nil, nil, fmt.Errorf("Unable to create transaction sender") return nil, nil, nil, fmt.Errorf("Unable to create transaction sender")