Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
chain33-pai
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
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
szh
chain33-pai
Commits
99e5f960
Commit
99e5f960
authored
Apr 02, 2020
by
szh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
自动购票判断 防止更新设置失效
parent
6ef2d2c9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
40 additions
and
3 deletions
+40
-3
process.go
pkg/app/process.go
+39
-1
client.go
pkg/chain33/client.go
+1
-2
No files found.
pkg/app/process.go
View file @
99e5f960
...
@@ -151,6 +151,17 @@ func CornProcessJob(ticker *time.Ticker){
...
@@ -151,6 +151,17 @@ func CornProcessJob(ticker *time.Ticker){
err
:=
Unlock
()
err
:=
Unlock
()
if
err
!=
nil
{
if
err
!=
nil
{
tlog
.
Error
(
"unlock wallet"
,
"err"
,
err
)
tlog
.
Error
(
"unlock wallet"
,
"err"
,
err
)
}
else
{
status
,
err
:=
GetWalletStatus
()
if
err
!=
nil
{
tlog
.
Error
(
"GetWalletStatus"
,
"err"
,
err
)
}
else
if
!
status
.
IsAutoMining
{
err
:=
AutoOpenTicket
()
if
err
!=
nil
{
tlog
.
Error
(
"AutoOpenTicket"
,
"err"
,
err
)
}
}
}
}
}
}
//升级6.4.0bityuan
//升级6.4.0bityuan
...
@@ -487,10 +498,37 @@ func Unlock() error{
...
@@ -487,10 +498,37 @@ func Unlock() error{
}
}
func
AutoOpenTicket
()
error
{
func
AutoOpenTicket
()
error
{
params
:=
`{"jsonrpc":"2.0","id":1,"method":"ticket.SetAutoMining","params":[{"flag":1}]}`
data
,
err
:=
json
.
Marshal
(
params
)
if
err
!=
nil
{
tlog
.
Error
(
"uploadVersion"
,
"marshal"
,
err
)
return
err
}
client
:=
&
http
.
Client
{}
req
,
err
:=
http
.
NewRequest
(
"POST"
,
setting
.
Chain33Pai
.
UploadVersionUrl
,
bytes
.
NewReader
(
data
))
if
err
!=
nil
{
tlog
.
Error
(
"uploadVersion"
,
"NewRequest"
,
err
)
return
err
}
resp
,
err
:=
client
.
Do
(
req
)
if
err
!=
nil
{
tlog
.
Error
(
"uploadVersion"
,
"NewRequest do"
,
err
)
return
err
}
body
,
err
:=
ioutil
.
ReadAll
(
resp
.
Body
)
if
err
!=
nil
{
tlog
.
Error
(
"uploadVersion"
,
"read"
,
err
)
return
err
}
tlog
.
Info
(
"AutoOpenTicket"
,
"err"
,
string
(
body
))
return
nil
return
nil
}
}
func
GetWalletStatus
()
(
*
types
.
WalletStatus
,
error
)
{
var
p
chain33
.
PaiClient
return
p
.
GetWalletStatus
()
}
func
AutoUpdate
(
tick
*
time
.
Ticker
)
{
func
AutoUpdate
(
tick
*
time
.
Ticker
)
{
for
{
for
{
select
{
select
{
...
...
pkg/chain33/client.go
View file @
99e5f960
...
@@ -55,4 +55,4 @@ func (p *PaiClient) Unlock(lock *types.WalletUnLock)(*types.Reply,error){
...
@@ -55,4 +55,4 @@ func (p *PaiClient) Unlock(lock *types.WalletUnLock)(*types.Reply,error){
func
(
p
*
PaiClient
)
IsSync
()
(
*
types
.
Reply
,
error
)
{
func
(
p
*
PaiClient
)
IsSync
()
(
*
types
.
Reply
,
error
)
{
return
paiClient
.
IsSync
(
context
.
Background
(),
&
types
.
ReqNil
{})
return
paiClient
.
IsSync
(
context
.
Background
(),
&
types
.
ReqNil
{})
}
}
\ No newline at end of file
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