diff options
| author | Bas van Kervel <basvankervel@gmail.com> | 2016-10-05 20:20:23 +0800 |
|---|---|---|
| committer | Bas van Kervel <basvankervel@gmail.com> | 2016-10-05 20:21:03 +0800 |
| commit | 6c959207db13866c4935d9434aef13c595024aaf (patch) | |
| tree | ce61f1b62a7fe0eda7eca6edfc456dbbd00a89f8 /internal | |
| parent | a7cc3248fe3ecb3439d0b69f5823f294b2854886 (diff) | |
| download | dexon-6c959207db13866c4935d9434aef13c595024aaf.tar dexon-6c959207db13866c4935d9434aef13c595024aaf.tar.gz dexon-6c959207db13866c4935d9434aef13c595024aaf.tar.bz2 dexon-6c959207db13866c4935d9434aef13c595024aaf.tar.lz dexon-6c959207db13866c4935d9434aef13c595024aaf.tar.xz dexon-6c959207db13866c4935d9434aef13c595024aaf.tar.zst dexon-6c959207db13866c4935d9434aef13c595024aaf.zip | |
internal/ethapi: bugfix gas price and limit swapped in eth_resend
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/ethapi/api.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index 9a97be25f..333c39965 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -1170,8 +1170,7 @@ func (s *PublicTransactionPoolAPI) PendingTransactions() []*RPCTransaction { // Resend accepts an existing transaction and a new gas price and limit. It will remove the given transaction from the // pool and reinsert it with the new gas price and limit. -func (s *PublicTransactionPoolAPI) Resend(ctx context.Context, tx *Tx, gasPrice, gasLimit *rpc.HexNumber) (common.Hash, error) { - +func (s *PublicTransactionPoolAPI) Resend(ctx context.Context, tx Tx, gasPrice, gasLimit *rpc.HexNumber) (common.Hash, error) { pending := s.b.GetPoolTransactions() for _, p := range pending { if pFrom, err := p.FromFrontier(); err == nil && pFrom == tx.From && p.SigHash() == tx.tx.SigHash() { @@ -1184,9 +1183,9 @@ func (s *PublicTransactionPoolAPI) Resend(ctx context.Context, tx *Tx, gasPrice, var newTx *types.Transaction if tx.tx.To() == nil { - newTx = types.NewContractCreation(tx.tx.Nonce(), tx.tx.Value(), gasPrice.BigInt(), gasLimit.BigInt(), tx.tx.Data()) + newTx = types.NewContractCreation(tx.tx.Nonce(), tx.tx.Value(), gasLimit.BigInt(), gasPrice.BigInt(), tx.tx.Data()) } else { - newTx = types.NewTransaction(tx.tx.Nonce(), *tx.tx.To(), tx.tx.Value(), gasPrice.BigInt(), gasLimit.BigInt(), tx.tx.Data()) + newTx = types.NewTransaction(tx.tx.Nonce(), *tx.tx.To(), tx.tx.Value(), gasLimit.BigInt(), gasPrice.BigInt(), tx.tx.Data()) } signedTx, err := s.sign(tx.From, newTx) |