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
7029765a
Commit
7029765a
authored
Dec 07, 2018
by
heyubin
Committed by
vipwzw
Dec 07, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add by hyb for issues109
parent
96f56d71
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
ticket.go
plugin/consensus/ticket/ticket.go
+2
-2
ticket.go
plugin/dapp/ticket/wallet/ticket.go
+5
-0
No files found.
plugin/consensus/ticket/ticket.go
View file @
7029765a
...
...
@@ -212,8 +212,8 @@ func (client *Client) setTicket(tlist *ty.ReplyTicketList, privmap map[string]cr
func
(
client
*
Client
)
flushTicket
()
error
{
//list accounts
tickets
,
privs
,
err
:=
client
.
getTickets
()
if
err
==
types
.
ErrMinerNotStared
{
tlog
.
Error
(
"flushTicket error"
,
"err"
,
"wallet miner not start"
)
if
err
==
types
.
ErrMinerNotStared
||
err
==
types
.
ErrWalletIsLocked
{
tlog
.
Error
(
"flushTicket error"
,
"err"
,
"wallet miner not start
or wallet ss locked
"
)
client
.
setTicket
(
nil
,
nil
)
return
nil
}
...
...
plugin/dapp/ticket/wallet/ticket.go
View file @
7029765a
...
...
@@ -221,6 +221,7 @@ func (policy *ticketPolicy) SignTransaction(key crypto.PrivKey, req *types.ReqSi
func
(
policy
*
ticketPolicy
)
OnWalletLocked
()
{
// 钱包锁住时,不允许挖矿
atomic
.
CompareAndSwapInt32
(
&
policy
.
isTicketLocked
,
0
,
1
)
FlushTicket
(
policy
.
getAPI
())
}
//解锁超时处理,需要区分整个钱包的解锁或者只挖矿的解锁
...
...
@@ -392,10 +393,14 @@ func (policy *ticketPolicy) getTicketsByStatus(status int32) ([]*ty.Ticket, [][]
}
operater
.
GetMutex
()
.
Lock
()
defer
operater
.
GetMutex
()
.
Unlock
()
ok
,
err
:=
operater
.
CheckWalletStatus
()
if
!
ok
&&
err
!=
types
.
ErrOnlyTicketUnLocked
{
return
nil
,
nil
,
err
}
if
!
policy
.
IsAutoMining
()
{
return
nil
,
nil
,
types
.
ErrMinerNotStared
}
//循环遍历所有的账户-->保证钱包已经解锁
var
tickets
[]
*
ty
.
Ticket
var
privs
[][]
byte
...
...
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