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
5f0e79ef
Commit
5f0e79ef
authored
Jan 28, 2019
by
linj
Committed by
vipwzw
Jan 29, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix exec error: check input sell/buy id
parent
a4761d16
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
2 deletions
+11
-2
tradedb.go
plugin/dapp/trade/executor/tradedb.go
+11
-2
No files found.
plugin/dapp/trade/executor/tradedb.go
View file @
5f0e79ef
...
@@ -9,6 +9,7 @@ import (
...
@@ -9,6 +9,7 @@ import (
"errors"
"errors"
"fmt"
"fmt"
"strconv"
"strconv"
"strings"
"github.com/33cn/chain33/account"
"github.com/33cn/chain33/account"
"github.com/33cn/chain33/client"
"github.com/33cn/chain33/client"
...
@@ -305,7 +306,7 @@ func (action *tradeAction) tradeSell(sell *pty.TradeForSell) (*types.Receipt, er
...
@@ -305,7 +306,7 @@ func (action *tradeAction) tradeSell(sell *pty.TradeForSell) (*types.Receipt, er
}
}
func
(
action
*
tradeAction
)
tradeBuy
(
buyOrder
*
pty
.
TradeForBuy
)
(
*
types
.
Receipt
,
error
)
{
func
(
action
*
tradeAction
)
tradeBuy
(
buyOrder
*
pty
.
TradeForBuy
)
(
*
types
.
Receipt
,
error
)
{
if
buyOrder
.
BoardlotCnt
<
0
{
if
buyOrder
.
BoardlotCnt
<
0
||
!
strings
.
HasPrefix
(
buyOrder
.
SellID
,
sellIDPrefix
)
{
return
nil
,
types
.
ErrInvalidParam
return
nil
,
types
.
ErrInvalidParam
}
}
...
@@ -375,6 +376,9 @@ func (action *tradeAction) tradeBuy(buyOrder *pty.TradeForBuy) (*types.Receipt,
...
@@ -375,6 +376,9 @@ func (action *tradeAction) tradeBuy(buyOrder *pty.TradeForBuy) (*types.Receipt,
}
}
func
(
action
*
tradeAction
)
tradeRevokeSell
(
revoke
*
pty
.
TradeForRevokeSell
)
(
*
types
.
Receipt
,
error
)
{
func
(
action
*
tradeAction
)
tradeRevokeSell
(
revoke
*
pty
.
TradeForRevokeSell
)
(
*
types
.
Receipt
,
error
)
{
if
!
strings
.
HasPrefix
(
revoke
.
SellID
,
sellIDPrefix
)
{
return
nil
,
types
.
ErrInvalidParam
}
sellidByte
:=
[]
byte
(
revoke
.
SellID
)
sellidByte
:=
[]
byte
(
revoke
.
SellID
)
sellOrder
,
err
:=
getSellOrderFromID
(
sellidByte
,
action
.
db
)
sellOrder
,
err
:=
getSellOrderFromID
(
sellidByte
,
action
.
db
)
if
err
!=
nil
{
if
err
!=
nil
{
...
@@ -486,13 +490,14 @@ func (action *tradeAction) tradeBuyLimit(buy *pty.TradeForBuyLimit) (*types.Rece
...
@@ -486,13 +490,14 @@ func (action *tradeAction) tradeBuyLimit(buy *pty.TradeForBuyLimit) (*types.Rece
}
}
func
(
action
*
tradeAction
)
tradeSellMarket
(
sellOrder
*
pty
.
TradeForSellMarket
)
(
*
types
.
Receipt
,
error
)
{
func
(
action
*
tradeAction
)
tradeSellMarket
(
sellOrder
*
pty
.
TradeForSellMarket
)
(
*
types
.
Receipt
,
error
)
{
if
sellOrder
.
BoardlotCnt
<
0
{
if
sellOrder
.
BoardlotCnt
<
0
||
!
strings
.
HasPrefix
(
sellOrder
.
BuyID
,
buyIDPrefix
)
{
return
nil
,
types
.
ErrInvalidParam
return
nil
,
types
.
ErrInvalidParam
}
}
idByte
:=
[]
byte
(
sellOrder
.
BuyID
)
idByte
:=
[]
byte
(
sellOrder
.
BuyID
)
buyOrder
,
err
:=
getBuyOrderFromID
(
idByte
,
action
.
db
)
buyOrder
,
err
:=
getBuyOrderFromID
(
idByte
,
action
.
db
)
if
err
!=
nil
{
if
err
!=
nil
{
tradelog
.
Error
(
"getBuyOrderFromID failed"
,
"err"
,
err
)
return
nil
,
pty
.
ErrTBuyOrderNotExist
return
nil
,
pty
.
ErrTBuyOrderNotExist
}
}
...
@@ -509,6 +514,7 @@ func (action *tradeAction) tradeSellMarket(sellOrder *pty.TradeForSellMarket) (*
...
@@ -509,6 +514,7 @@ func (action *tradeAction) tradeSellMarket(sellOrder *pty.TradeForSellMarket) (*
// 打token
// 打token
accDB
,
err
:=
createAccountDB
(
action
.
height
,
action
.
db
,
buyOrder
.
AssetExec
,
buyOrder
.
TokenSymbol
)
accDB
,
err
:=
createAccountDB
(
action
.
height
,
action
.
db
,
buyOrder
.
AssetExec
,
buyOrder
.
TokenSymbol
)
if
err
!=
nil
{
if
err
!=
nil
{
tradelog
.
Error
(
"createAccountDB failed"
,
"err"
,
err
,
"order"
,
buyOrder
)
return
nil
,
err
return
nil
,
err
}
}
amountToken
:=
sellOrder
.
BoardlotCnt
*
buyOrder
.
AmountPerBoardlot
amountToken
:=
sellOrder
.
BoardlotCnt
*
buyOrder
.
AmountPerBoardlot
...
@@ -556,6 +562,9 @@ func (action *tradeAction) tradeSellMarket(sellOrder *pty.TradeForSellMarket) (*
...
@@ -556,6 +562,9 @@ func (action *tradeAction) tradeSellMarket(sellOrder *pty.TradeForSellMarket) (*
}
}
func
(
action
*
tradeAction
)
tradeRevokeBuyLimit
(
revoke
*
pty
.
TradeForRevokeBuy
)
(
*
types
.
Receipt
,
error
)
{
func
(
action
*
tradeAction
)
tradeRevokeBuyLimit
(
revoke
*
pty
.
TradeForRevokeBuy
)
(
*
types
.
Receipt
,
error
)
{
if
!
strings
.
HasPrefix
(
revoke
.
BuyID
,
buyIDPrefix
)
{
return
nil
,
types
.
ErrInvalidParam
}
buyIDByte
:=
[]
byte
(
revoke
.
BuyID
)
buyIDByte
:=
[]
byte
(
revoke
.
BuyID
)
buyOrder
,
err
:=
getBuyOrderFromID
(
buyIDByte
,
action
.
db
)
buyOrder
,
err
:=
getBuyOrderFromID
(
buyIDByte
,
action
.
db
)
if
err
!=
nil
{
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