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
0d1099a0
Commit
0d1099a0
authored
Nov 02, 2018
by
linj
Committed by
linj
Nov 26, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
can build ; add TODO
parent
cc5ede4c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
18 deletions
+17
-18
action.go
executor/action.go
+13
-9
types.go
types/types.go
+4
-9
No files found.
executor/action.go
View file @
0d1099a0
...
...
@@ -33,7 +33,7 @@ func newAction(u *Unfreeze, tx *types.Transaction, index int32) *action {
func
(
a
*
action
)
UnfreezeCreate
(
create
*
uf
.
UnfreezeCreate
)
(
*
types
.
Receipt
,
error
)
{
//构造ID - txHash
var
unfreezeID
string
=
"unfreezeID_"
+
common
.
ToHex
(
a
.
txhash
)
tokenAccDB
,
err
:=
account
.
NewAccountDB
(
"token"
,
create
.
TokenName
,
a
.
db
)
tokenAccDB
,
err
:=
account
.
NewAccountDB
(
create
.
AssetExec
,
create
.
AssetSymbol
,
a
.
db
)
if
err
!=
nil
{
return
nil
,
err
}
...
...
@@ -49,14 +49,15 @@ func (a *action) UnfreezeCreate(create *uf.UnfreezeCreate) (*types.Receipt, erro
unfreeze
:=
&
uf
.
Unfreeze
{
UnfreezeID
:
unfreezeID
,
StartTime
:
create
.
StartTime
,
TokenName
:
create
.
TokenName
,
AssetExec
:
create
.
AssetExec
,
AssetSymbol
:
create
.
AssetSymbol
,
TotalCount
:
create
.
TotalCount
,
Initiator
:
a
.
fromaddr
,
Beneficiary
:
create
.
Beneficiary
,
Period
:
create
.
Period
,
Means
:
create
.
Means
,
Amount
:
create
.
Amount
,
// TODO set option
}
a
.
saveStateDB
(
unfreeze
)
k
:=
[]
byte
(
unfreezeID
)
v
:=
types
.
Encode
(
unfreeze
)
...
...
@@ -81,13 +82,13 @@ func (a *action) UnfreezeWithdraw(withdraw *uf.UnfreezeWithdraw) (*types.Receipt
}
var
logs
[]
*
types
.
ReceiptLog
var
kv
[]
*
types
.
KeyValue
reaTimes
,
available
,
err
:=
getWithdrawAvailable
(
unfreeze
,
a
.
blocktime
)
_
,
available
,
err
:=
getWithdrawAvailable
(
unfreeze
,
a
.
blocktime
)
if
err
!=
nil
{
uflog
.
Error
(
"unfreeze withdraw "
,
"execaddr"
,
a
.
execaddr
,
"err"
,
err
)
return
nil
,
err
}
tokenAccDB
,
err
:=
account
.
NewAccountDB
(
"token"
,
unfreeze
.
TokenName
,
a
.
db
)
tokenAccDB
,
err
:=
account
.
NewAccountDB
(
unfreeze
.
AssetExec
,
unfreeze
.
AssetSymbol
,
a
.
db
)
if
err
!=
nil
{
return
nil
,
err
}
...
...
@@ -100,7 +101,7 @@ func (a *action) UnfreezeWithdraw(withdraw *uf.UnfreezeWithdraw) (*types.Receipt
logs
=
append
(
logs
,
receipt
.
Logs
...
)
kv
=
append
(
kv
,
receipt
.
KV
...
)
unfreeze
.
WithdrawTimes
+=
int32
(
reaTimes
)
//
unfreeze.WithdrawTimes += int32(reaTimes)
unfreeze
.
Remaining
-=
available
a
.
saveStateDB
(
&
unfreeze
)
receiptLog
:=
a
.
getUnfreezeLog
(
&
unfreeze
)
...
...
@@ -132,7 +133,7 @@ func (a *action) UnfreezeTerminate(terminate *uf.UnfreezeTerminate) (*types.Rece
uflog
.
Error
(
"unfreeze terminate "
,
"execaddr"
,
a
.
execaddr
,
"err"
,
uf
.
ErrUnfreezeEmptied
)
return
nil
,
uf
.
ErrUnfreezeEmptied
}
tokenAccDB
,
err
:=
account
.
NewAccountDB
(
"token"
,
unfreeze
.
TokenName
,
a
.
db
)
tokenAccDB
,
err
:=
account
.
NewAccountDB
(
unfreeze
.
AssetExec
,
unfreeze
.
AssetSymbol
,
a
.
db
)
if
err
!=
nil
{
return
nil
,
err
}
...
...
@@ -172,7 +173,7 @@ func (a *action) getUnfreezeLog(unfreeze *uf.Unfreeze) *types.ReceiptLog {
r
.
UnfreezeID
=
unfreeze
.
UnfreezeID
r
.
Initiator
=
unfreeze
.
Initiator
r
.
Beneficiary
=
unfreeze
.
Beneficiary
r
.
TokenName
=
unfreeze
.
TokenName
r
.
TokenName
=
unfreeze
.
AssetSymbol
// TODO exec
log
.
Log
=
types
.
Encode
(
r
)
return
log
}
...
...
@@ -205,6 +206,8 @@ func QueryUnfreezeWithdraw(stateDB dbm.KV, param *uf.QueryUnfreezeWithdraw) (typ
}
func
getWithdrawAvailable
(
unfreeze
uf
.
Unfreeze
,
calcTime
int64
)
(
int64
,
int64
,
error
)
{
return
1
,
1
,
nil
// TODO impl
/*
expectTimes := (calcTime + unfreeze.Period - unfreeze.StartTime) / unfreeze.Period
reaTimes := expectTimes - int64(unfreeze.WithdrawTimes)
if reaTimes <= 0 {
...
...
@@ -237,4 +240,5 @@ func getWithdrawAvailable(unfreeze uf.Unfreeze, calcTime int64) (int64, int64, e
return 0, 0, uf.ErrUnfreezeMeans
}
return reaTimes, available, nil
*/
}
types/types.go
View file @
0d1099a0
...
...
@@ -95,18 +95,13 @@ func CreateUnfreezeCreateTx(parm *UnfreezeCreate) (*types.Transaction, error) {
tlog
.
Error
(
"CreateUnfreezeCreateTx"
,
"parm"
,
parm
)
return
nil
,
types
.
ErrInvalidParam
}
v
:=
&
UnfreezeCreate
{
StartTime
:
parm
.
StartTime
,
TokenName
:
parm
.
TokenName
,
TotalCount
:
parm
.
TotalCount
,
Beneficiary
:
parm
.
Beneficiary
,
Period
:
parm
.
Period
,
Means
:
parm
.
Means
,
Amount
:
parm
.
Amount
,
if
parm
.
AssetExec
==
""
||
parm
.
AssetSymbol
==
""
||
parm
.
TotalCount
<=
0
||
parm
.
Means
==
""
{
tlog
.
Error
(
"CreateUnfreezeCreateTx"
,
"parm"
,
parm
)
return
nil
,
types
.
ErrInvalidParam
}
create
:=
&
UnfreezeAction
{
Ty
:
UnfreezeActionCreate
,
Value
:
&
UnfreezeAction_Create
{
v
},
Value
:
&
UnfreezeAction_Create
{
parm
},
}
tx
:=
&
types
.
Transaction
{
Execer
:
[]
byte
(
getRealExecName
(
types
.
GetParaName
())),
...
...
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