mirror of https://github.com/status-im/op-geth.git
improved error detection and handling for NewTransactionFromBytes
integrated review comments
This commit is contained in:
parent
a281df783d
commit
81e2124ea2
|
@ -97,15 +97,6 @@ func NewTransaction(nonce uint64, to common.Address, amount, gasLimit, gasPrice
|
||||||
return &Transaction{data: d}
|
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 {
|
func (tx *Transaction) EncodeRLP(w io.Writer) error {
|
||||||
return rlp.Encode(w, &tx.data)
|
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
|
// some chain, this probably needs to be refactored for more expressiveness
|
||||||
data, _ := self.backend.ExtraDb().Get(common.FromHex(hash))
|
data, _ := self.backend.ExtraDb().Get(common.FromHex(hash))
|
||||||
if len(data) != 0 {
|
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
|
} else { // check pending transactions
|
||||||
tx = self.backend.TxPool().GetTransaction(common.HexToHash(hash))
|
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) {
|
func (self *XEth) PushTx(encodedTx string) (string, error) {
|
||||||
tx := types.NewTransactionFromBytes(common.FromHex(encodedTx))
|
tx := new(types.Transaction)
|
||||||
err := self.backend.TxPool().Add(tx)
|
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 {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue