Skip to content
This repository was archived by the owner on Mar 18, 2019. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions gateway/gateway.go
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,14 @@ func (f *BaseFilter) filter(o *types.Order) (bool, error) {
return false, fmt.Errorf("protocol and Delegate are not matched")
}

if o.OrderType == types.ORDER_TYPE_MARKET && o.AuthPrivateKey.Address() != o.AuthAddr {
return false, fmt.Errorf("market order auth private key not correct")
if o.OrderType == types.ORDER_TYPE_MARKET {
authPriAddress := o.AuthPrivateKey.Address()
if authPriAddress == common.StringToAddress("0x0") {
return false, fmt.Errorf("very bad! market type but no pri key")
}
if authPriAddress != o.AuthAddr {
return false, fmt.Errorf("market order auth private key not correct")
}
}

if o.TokenB != util.AliasToAddress("LRC") {
Expand Down
12 changes: 6 additions & 6 deletions market/trendmanager.go
Original file line number Diff line number Diff line change
Expand Up @@ -904,8 +904,8 @@ func (t *TrendManager) GetTicker() (tickers []Ticker, err error) {
for _, v := range tickerMap {
v.Amount, _ = strconv.ParseFloat(fmt.Sprintf("%0.8f", v.Amount), 64)
v.Vol, _ = strconv.ParseFloat(fmt.Sprintf("%0.8f", v.Vol), 64)
v.Buy, _ = strconv.ParseFloat(fmt.Sprintf("%0.8f", v.Last), 64)
v.Sell, _ = strconv.ParseFloat(fmt.Sprintf("%0.8f", v.Last), 64)
v.Buy, _ = strconv.ParseFloat(fmt.Sprintf("%0.8f", v.Buy), 64)
v.Sell, _ = strconv.ParseFloat(fmt.Sprintf("%0.8f", v.Sell), 64)
v.Open, _ = strconv.ParseFloat(fmt.Sprintf("%0.8f", v.Open), 64)
v.Close, _ = strconv.ParseFloat(fmt.Sprintf("%0.8f", v.Close), 64)
v.Last, _ = strconv.ParseFloat(fmt.Sprintf("%0.8f", v.Last), 64)
Expand Down Expand Up @@ -957,8 +957,8 @@ func (t *TrendManager) GetTickerByMarket(mkt string) (ticker Ticker, err error)
tickerMap := localCacheValue.(map[string]Ticker)
for k, v := range tickerMap {
if k == mkt {
v.Buy, _ = strconv.ParseFloat(fmt.Sprintf("%0.8f", v.Last), 64)
v.Sell, _ = strconv.ParseFloat(fmt.Sprintf("%0.8f", v.Last), 64)
v.Buy, _ = strconv.ParseFloat(fmt.Sprintf("%0.8f", v.Buy), 64)
v.Sell, _ = strconv.ParseFloat(fmt.Sprintf("%0.8f", v.Sell), 64)
return v, err
}
}
Expand All @@ -972,8 +972,8 @@ func (t *TrendManager) GetTickerByMarket(mkt string) (ticker Ticker, err error)
t.localCache.Set(localCacheTicker, tickerMap, 5*time.Second)
for k, v := range tickerMap {
if k == mkt {
v.Buy, _ = strconv.ParseFloat(fmt.Sprintf("%0.8f", v.Last), 64)
v.Sell, _ = strconv.ParseFloat(fmt.Sprintf("%0.8f", v.Last), 64)
v.Buy, _ = strconv.ParseFloat(fmt.Sprintf("%0.8f", v.Buy), 64)
v.Sell, _ = strconv.ParseFloat(fmt.Sprintf("%0.8f", v.Sell), 64)
return v, err
}
}
Expand Down
3 changes: 3 additions & 0 deletions vendor/github.com/Loopring/relay-lib/crypto/crypto.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.