Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
plugin
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
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
link33
plugin
Commits
e08ea8c4
Commit
e08ea8c4
authored
Dec 12, 2019
by
vipwzw
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
auto ci
parent
66372814
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
paracommitmsg.go
plugin/consensus/para/paracommitmsg.go
+3
-3
paracreate.go
plugin/consensus/para/paracreate.go
+2
-2
No files found.
plugin/consensus/para/paracommitmsg.go
View file @
e08ea8c4
...
...
@@ -207,8 +207,8 @@ func (client *commitMsgClient) verifyTx(curTx *types.Transaction, verifyTxs map[
return
true
}
//当前addType是回滚,则不计数,如果有累计则撤销上次累计次数,重新计数
if
addType
!=
types
.
AddBlock
{
if
client
.
checkTxCommitTimes
>
0
{
if
addType
!=
types
.
AddBlock
{
if
client
.
checkTxCommitTimes
>
0
{
client
.
checkTxCommitTimes
--
}
return
false
...
...
@@ -259,7 +259,7 @@ func (client *commitMsgClient) checkCommitTxSuccess(block *types.ParaTxDetail) b
return
false
}
return
client
.
verifyTx
(
curTx
,
txMap
,
block
.
Type
)
return
client
.
verifyTx
(
curTx
,
txMap
,
block
.
Type
)
}
//如果共识高度一直没有追上发送高度,且当前发送高度已经上链,说明共识一直没达成,安全起见,超过停止次数后,重发
...
...
plugin/consensus/para/paracreate.go
View file @
e08ea8c4
...
...
@@ -341,7 +341,7 @@ func (client *client) requestTxsFromBlock(currSeq int64, preMainBlockHash []byte
func
(
client
*
client
)
requestFilterParaTxs
(
currSeq
int64
,
count
int64
,
preMainBlockHash
[]
byte
)
(
*
types
.
ParaTxDetails
,
error
)
{
cfg
:=
client
.
GetAPI
()
.
GetConfig
()
req
:=
&
types
.
ReqParaTxByTitle
{
IsSeq
:
true
,
Start
:
currSeq
,
End
:
currSeq
+
count
-
1
,
Title
:
cfg
.
GetTitle
()}
req
:=
&
types
.
ReqParaTxByTitle
{
IsSeq
:
true
,
Start
:
currSeq
,
End
:
currSeq
+
count
-
1
,
Title
:
cfg
.
GetTitle
()}
details
,
err
:=
client
.
GetParaTxByTitle
(
req
)
if
err
!=
nil
{
return
nil
,
err
...
...
@@ -354,7 +354,7 @@ func (client *client) requestFilterParaTxs(currSeq int64, count int64, preMainBl
return
nil
,
err
}
//至少应该返回1个
if
len
(
details
.
Items
)
==
0
{
if
len
(
details
.
Items
)
==
0
{
plog
.
Error
(
"requestFilterParaTxs ret nil"
,
"curSeq"
,
currSeq
,
"count"
,
count
,
"preMainBlockHash"
,
hex
.
EncodeToString
(
preMainBlockHash
))
return
nil
,
types
.
ErrNotFound
}
...
...
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