bugfix, pending transaction was resend with new gas price/limit but not removed from transaction pool

This commit is contained in:
Bas van Kervel
2015-07-10 11:35:15 +02:00
parent 5a810758db
commit 7e31df3987
4 changed files with 23 additions and 10 deletions

View File

@ -888,6 +888,7 @@ type tx struct {
Data string
GasLimit string
GasPrice string
Hash string
}
func newTx(t *types.Transaction) *tx {
@ -906,6 +907,7 @@ func newTx(t *types.Transaction) *tx {
Data: "0x" + common.Bytes2Hex(t.Data()),
GasLimit: t.Gas().String(),
GasPrice: t.GasPrice().String(),
Hash: t.Hash().Hex(),
}
}
@ -931,6 +933,12 @@ func (tx *tx) UnmarshalJSON(b []byte) (err error) {
contractCreation = true
)
if val, found := fields["Hash"]; found {
if hashVal, ok := val.(string); ok {
tx.Hash = hashVal
}
}
if val, found := fields["To"]; found {
if strVal, ok := val.(string); ok && len(strVal) > 0 {
tx.To = strVal