forked from cerc-io/plugeth
Merge pull request #1541 from bas-vk/issue1518
Improved error handling for NewTransactionFromBytes
This commit is contained in:
commit
a8b39b5cc0
@ -97,15 +97,6 @@ func NewTransaction(nonce uint64, to common.Address, amount, gasLimit, gasPrice
|
||||
return &Transaction{data: d}
|
||||
}
|
||||
|
||||
func NewTransactionFromBytes(data []byte) *Transaction {
|
||||
// TODO: remove this function if possible. callers would
|
||||
// much better off decoding into transaction directly.
|
||||
// it's not that hard.
|
||||
tx := new(Transaction)
|
||||
rlp.DecodeBytes(data, tx)
|
||||
return tx
|
||||
}
|
||||
|
||||
func (tx *Transaction) EncodeRLP(w io.Writer) error {
|
||||
return rlp.Encode(w, &tx.data)
|
||||
}
|
||||
|
17
xeth/xeth.go
17
xeth/xeth.go
@ -310,7 +310,12 @@ func (self *XEth) EthTransactionByHash(hash string) (tx *types.Transaction, blha
|
||||
// some chain, this probably needs to be refactored for more expressiveness
|
||||
data, _ := self.backend.ExtraDb().Get(common.FromHex(hash))
|
||||
if len(data) != 0 {
|
||||
tx = types.NewTransactionFromBytes(data)
|
||||
dtx := new(types.Transaction)
|
||||
if err := rlp.DecodeBytes(data, dtx); err != nil {
|
||||
glog.V(logger.Error).Infoln(err)
|
||||
return
|
||||
}
|
||||
tx = dtx
|
||||
} else { // check pending transactions
|
||||
tx = self.backend.TxPool().GetTransaction(common.HexToHash(hash))
|
||||
}
|
||||
@ -773,8 +778,14 @@ func (self *XEth) FromNumber(str string) string {
|
||||
}
|
||||
|
||||
func (self *XEth) PushTx(encodedTx string) (string, error) {
|
||||
tx := types.NewTransactionFromBytes(common.FromHex(encodedTx))
|
||||
err := self.backend.TxPool().Add(tx)
|
||||
tx := new(types.Transaction)
|
||||
err := rlp.DecodeBytes(common.FromHex(encodedTx), tx)
|
||||
if err != nil {
|
||||
glog.V(logger.Error).Infoln(err)
|
||||
return "", err
|
||||
}
|
||||
|
||||
err = self.backend.TxPool().Add(tx)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user