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
12e3205e
Commit
12e3205e
authored
Sep 03, 2019
by
mdj33
Committed by
vipwzw
Sep 03, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
commit tx notify
parent
9214dcb2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
paracommitmsg.go
plugin/consensus/para/paracommitmsg.go
+1
-1
paracreate.go
plugin/consensus/para/paracreate.go
+4
-1
No files found.
plugin/consensus/para/paracommitmsg.go
View file @
12e3205e
...
...
@@ -223,8 +223,8 @@ func (client *commitMsgClient) checkCommitTxSuccess(txs []*types.TxDetail) bool
txMap
[
string
(
tx
.
Tx
.
Hash
())]
=
true
}
}
// committx是主链交易,需要向主链查询
}
else
{
// committx是主链交易,需要向主链查询,平行链获取到的只是过滤了的平行链交易
//如果正在追赶,则暂时不去主链查找,减少耗时
if
!
client
.
paraClient
.
isCaughtUp
()
{
return
false
...
...
plugin/consensus/para/paracreate.go
View file @
12e3205e
...
...
@@ -51,7 +51,6 @@ func (client *client) createLocalBlock(lastBlock *pt.ParaLocalDbBlock, txs []*ty
if
err
!=
nil
{
return
err
}
client
.
commitMsgClient
.
commitTxCheckNotify
(
mainBlock
.
TxDetails
)
return
err
}
...
...
@@ -553,6 +552,10 @@ out:
plog
.
Debug
(
"para CreateBlock count not match"
,
"count"
,
count
,
"items"
,
len
(
paraTxs
.
Items
))
count
=
int64
(
len
(
paraTxs
.
Items
))
}
//如果超过1个block,则认为当前正在追赶,暂不处理
if
client
.
authAccount
!=
""
&&
len
(
paraTxs
.
Items
)
==
1
{
client
.
commitMsgClient
.
commitTxCheckNotify
(
paraTxs
.
Items
[
0
]
.
TxDetails
)
}
err
=
client
.
procLocalBlocks
(
paraTxs
)
if
err
!=
nil
{
...
...
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