Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
Geth-Modification
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张蕾
Geth-Modification
Commits
85d5f2c6
Unverified
Commit
85d5f2c6
authored
Mar 08, 2018
by
Péter Szilágyi
Committed by
GitHub
Mar 08, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #16285 from karalabe/fix-resend-optional-param
internal/ethapi: make resent gas params optional
parents
704840a8
28ef23f4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
api.go
internal/ethapi/api.go
+2
-2
No files found.
internal/ethapi/api.go
View file @
85d5f2c6
...
...
@@ -1337,10 +1337,10 @@ func (s *PublicTransactionPoolAPI) Resend(ctx context.Context, sendArgs SendTxAr
if
pFrom
,
err
:=
types
.
Sender
(
signer
,
p
);
err
==
nil
&&
pFrom
==
sendArgs
.
From
&&
signer
.
Hash
(
p
)
==
wantSigHash
{
// Match. Re-sign and send the transaction.
if
gasPrice
!=
nil
{
if
gasPrice
!=
nil
&&
(
*
big
.
Int
)(
gasPrice
)
.
Sign
()
!=
0
{
sendArgs
.
GasPrice
=
gasPrice
}
if
gasLimit
!=
nil
{
if
gasLimit
!=
nil
&&
*
gasLimit
!=
0
{
sendArgs
.
Gas
=
gasLimit
}
signedTx
,
err
:=
s
.
sign
(
sendArgs
.
From
,
sendArgs
.
toTransaction
())
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment