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
ce862ee7
Commit
ce862ee7
authored
Mar 21, 2015
by
obscuren
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed some comments
parent
4300f2a0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
worker.go
miner/worker.go
+2
-1
xeth.go
xeth/xeth.go
+1
-2
No files found.
miner/worker.go
View file @
ce862ee7
...
...
@@ -211,7 +211,8 @@ gasLimit:
from
,
_
:=
tx
.
From
()
self
.
chain
.
TxState
()
.
RemoveNonce
(
from
,
tx
.
Nonce
())
remove
=
append
(
remove
,
tx
)
minerlogger
.
Infof
(
"TX (%x) failed. Transaction will be removed
\n
"
,
tx
.
Hash
()
.
Bytes
()[
:
4
])
minerlogger
.
Infof
(
"TX (%x) failed, will be removed: %v
\n
"
,
tx
.
Hash
()
.
Bytes
()[
:
4
],
err
)
minerlogger
.
Infoln
(
tx
)
case
state
.
IsGasLimitErr
(
err
)
:
minerlogger
.
Infof
(
"Gas limit reached for block. %d TXs included in this block
\n
"
,
i
)
// Break on gas limit
...
...
xeth/xeth.go
View file @
ce862ee7
...
...
@@ -611,7 +611,7 @@ func (self *XEth) Transact(fromStr, toStr, valueStr, gasStr, gasPriceStr, codeSt
}
state
:=
self
.
chainManager
.
TxState
()
nonce
:=
state
.
NewNonce
(
from
)
//state.GetNonce(from)
nonce
:=
state
.
NewNonce
(
from
)
tx
.
SetNonce
(
nonce
)
if
err
:=
self
.
sign
(
tx
,
from
,
false
);
err
!=
nil
{
...
...
@@ -620,7 +620,6 @@ func (self *XEth) Transact(fromStr, toStr, valueStr, gasStr, gasPriceStr, codeSt
if
err
:=
self
.
eth
.
TxPool
()
.
Add
(
tx
);
err
!=
nil
{
return
""
,
err
}
//state.IncrementNonce(from)
if
contractCreation
{
addr
:=
core
.
AddressFromMessage
(
tx
)
...
...
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