-
Notifications
You must be signed in to change notification settings - Fork 0
/
report.go
716 lines (629 loc) · 18 KB
/
report.go
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
package main
import (
"encoding/json"
"fmt"
"github.com/pkg/errors"
"io/ioutil"
"log"
"math"
"os"
"sort"
"strings"
"time"
"gitlab.com/wmlph/poloniex-api"
"gopkg.in/gomail.v2"
)
type price float64
type amount float64
type Order poloniex.WSOrder
func (p price) String() (s string) {
s = fmt.Sprintf("%0.8d", p)
return
}
func (a amount) String() (s string) {
s = fmt.Sprintf("%0.8d", a)
return
}
func (o Order) String() (s string) {
s = fmt.Sprintf("Type: %v Rate: %v Amount: %v", o.Type, o.Rate, o.Amount)
return
}
type MyOpenOrder struct {
poloniex.OpenOrder
CurrentRate float64
Proximity float64
Pair CurrencyPair
}
type MyOpenOrders []MyOpenOrder
type MyTradeEntry struct {
poloniex.PrivateTradeHistoryEntry
// CurrentRate float64
Pair CurrencyPair
TradeDate time.Time
}
type MyTradeHistory []MyTradeEntry
func (o MyOpenOrder) String() string {
return fmt.Sprintf("Prox.: %%%.0f %-4s Rate: %.9f Amount: %.9f Total: %.9f %s", o.Proximity, o.Type, o.Rate, o.Amount, o.Total, o.Pair.Base)
}
type CurrencyPair struct {
Base string
Trade string
}
func NewCurrencyPair(s string) CurrencyPair {
i := strings.Split(s, "_")
var p CurrencyPair
p.Base = i[0]
if len(i) > 1 {
p.Trade = i[1]
}
return p
}
func (p CurrencyPair) String() string {
return fmt.Sprintf("%-4s/%4s", p.Trade, p.Base)
}
func (p CurrencyPair) Poloniex() string {
return fmt.Sprintf("%s_%s", p.Base, p.Trade)
}
type Currency float64
func (c Currency) Length() int {
return len(c.String())
}
func (c Currency) String() (s string) {
i := strings.Split(fmt.Sprintf("%.9f", float64(c)), ".")
s = everyThird(reverseStr(i[0]), ",")
s = reverseStr(s) + "." + everyThird(i[1], " ")
return
}
func Comma(n float64) string {
i := strings.Split(fmt.Sprintf("%.2f", n), ".")
return reverseStr(everyThird(reverseStr(i[0]), ",")) + "." + i[1]
}
func everyThird(str, insert string) (s string) {
if str == "" {
return
}
for len(str) > 0 {
l := len(str)
if l > 3 {
if str[3] == '-' || str[3] == '+' {
l = 4
} else {
l = 3
}
}
s = s + str[:l]
str = str[l:]
if len(str) > 0 {
s += insert
}
}
return
}
func reverseStr(str string) (out string) {
for _, s := range str {
out = string(s) + out
}
return
}
type column struct {
title string
width int
widthr int // used for DOT
widthl int // used for DOT
align int
dot string "."
}
const (
LEFT = iota + 1
RIGHT
CENTRE
DOT
)
const poloniexTime = "2006-01-02 15:04:05"
type PrettyTable struct {
columns []column
rows [][]string
colsep string
rowsep string
padding string
html bool
footer int // 0 if none or row number the footer begins on
}
func NewPrettyTable() (t *PrettyTable) {
t = new(PrettyTable)
t.rowsep = "-"
t.colsep = "|"
t.html = false
t.padding = " "
return
}
func (t *PrettyTable) addColumn(c *column) *PrettyTable {
c.width = len(c.title) // in case title is wider than data
t.columns = append(t.columns, *c)
return t
}
func (t *PrettyTable) addRow(cols []string) *PrettyTable {
t.rows = append(t.rows, cols)
// get max width as we add columns in. Dot centred is harder to calc and need left and right of decimal point widths taken into consideration.
for i, c := range t.columns {
if i >= len(cols) {
break
} // skip empty columns
w := len(cols[i]) // current width of col in this row
if w < 2+len(c.dot) {
continue // must have enough chars to split
}
if c.align == DOT && strings.Contains(cols[i], c.dot) == true {
j := strings.Split(cols[i], c.dot)
if len(j) != 2 {
continue
} // must split only in two
t.columns[i].widthl = max(t.columns[i].widthl, len(j[0]))
t.columns[i].widthr = max(t.columns[i].widthr, len(j[1]))
w = t.columns[i].widthl + t.columns[i].widthr + len(c.dot)
}
t.columns[i].width = max(t.columns[i].width, w)
}
return t
}
func (t *PrettyTable) addFooter(cols []string) *PrettyTable {
tablelength := len(t.rows)
if t.footer == 0 {
t.footer = tablelength - 1
}
t.addRow(cols)
return t
}
func (t *PrettyTable) String() (s string) {
// print header
var txt string
pad := t.padding
nl := "\n"
// sep header sep
emph := true
for _, col := range t.columns {
if len(txt) > 0 {
txt += t.colsep
}
txt += pad + padcentre(col.title, col.width) + pad
}
if emph == true {
txt = strings.ToUpper(txt)
}
emph = false
bar := strings.Repeat(t.rowsep, len(txt)) + nl
s = bar + txt + nl + bar
// rows final sep
for j, row := range t.rows {
txt = ""
for i, col := range row {
if len(txt) > 0 {
txt += t.colsep
}
txt += pad + t.columns[i].aligntext(col) + pad
}
if emph == true {
txt = strings.ToUpper(txt)
} // if in footer or header
s += txt + nl
// if just before the footer...
if j == t.footer && j > 0 {
s += bar
emph = true
} // in footer now...
}
s += bar
if t.html {
s = "<pre>" + s + "</pre>"
}
return
}
func (c column) aligntext(text string) (s string) {
switch c.align {
case LEFT:
s = padl(text, c.width)
case RIGHT:
s = padr(text, c.width)
case CENTRE:
s = padcentre(text, c.width)
case DOT:
i := strings.Split(text, c.dot)
if len(i) != 2 {
s = padl(text, c.width)
return s
}
s = padl(i[0], c.widthl) + c.dot + padr(i[1], c.widthr)
default:
s = "unforseen error"
}
return s
}
func padl(text string, width int) string {
return spaces(width-len(text)) + text
}
func padr(text string, width int) string {
return text + spaces(width-len(text))
}
func padcentre(text string, width int) string {
add := spaces((len(text)%2 + width%2) % 2) // 1 if odd, 0 if even
lr := spaces((width - len(text)) / 2)
return lr + text + lr + add
}
func spaces(width int) string {
if width < 0 { //fmt.Println("width is less than 0")
width = 0
}
return strings.Repeat(" ", width)
}
func max(i, j int) int {
if i > j {
return i
}
return j
}
func heading(text string) string {
return strings.ToUpper(text) + "\n" + strings.Repeat("-", len(text))
}
type Report struct {
Emailto string
Emailfrom string
Smtpserver string
Reportname string
Port float64
Smtp_login string
Smtp_password string
Smtp_ssl bool
Subject string
Body string
Topmovers float64
Csv bool
}
type csv struct {
time string
btc float64
usd float64
}
// unmarshal only fills exported fields!!!
func NewReport(conf string) *Report {
r := &Report{}
// fmt.Println(r)
b, err := ioutil.ReadFile(conf)
if err != nil {
log.Fatalln(errors.Wrap(err, "reading "+conf+" failed."))
}
// fmt.Printf("%s\n",b)
err = json.Unmarshal(b, r)
if err != nil {
log.Fatalln(errors.Wrap(err, "unmarshalling json failed for "+conf))
}
// fmt.Println(r)
if r.Reportname == "" {
log.Fatalln("Error - no report name specified in config file " + conf)
}
// defaults
r.Subject = "Poloniex Activity Report for " + r.Reportname + " at " + time.Now().Format(poloniexTime)
if r.Topmovers == 0 {
r.Topmovers = 15
}
return r
}
func main() {
p := poloniex.New("config.json")
report := NewReport("reportconfig.json")
csv := csv{time: time.Now().Format(poloniexTime)}
report.Body = fmt.Sprintln(heading(report.Subject) + "\n\n")
// Three calls to poloniex api to get ticker data, mytrades and open orders
ticker, err := p.Ticker()
if err != nil {
log.Fatalln(errors.Wrap(err, "failed to get p.Ticker"))
}
// added a patch to poloniex api to provide the function below
mytrades, err := p.PrivateTradeHistoryAllWeek()
// commented out because poloniex api does not handle empty json gracefully. pthaw just errors. If there is an error we can safely omit this part of the report
// if err != nil {
// log.Fatalln(errors.Wrap(err, "failed to get p.PrivateTradeHistoryAllWeek"))
// }
openorders, err := p.OpenOrdersAll()
if err != nil {
log.Fatalln(errors.Wrap(err, "failed to get p.OpenOrdersAll"))
}
// KPC Patched this function...
balances, err := p.BalancesAll()
if err != nil {
log.Fatalln(errors.Wrap(err, "failed to get p.Balances"))
}
//fmt.Printf("%+v\n", ticker["USDT_BTC"]) == {Last:4192.58071046 Ask:4192.58071046 Bid:4186.2093 Change:0.03316429 BaseVolume:3.534202327390681e+07 QuoteVolume:8405.26739006 IsFrozen:0}
// All data fetched OK! Phew
/*
Prices
*/
report.Body += fmt.Sprintln(heading("Prices"))
USDT_BTC := ticker["USDT_BTC"].Last
report.Body += fmt.Sprintln("Last price of Bitcoin : $", Comma(USDT_BTC), fmt.Sprintf("(%+.0f%%)", ticker["USDT_BTC"].Change*100), "\n")
// list of certain prices I am following - could stick in json and fish out if I felt like improving...
var clist = []struct {
fn string
tn string
}{
{"Etherium", "ETH"},
{"Dogecoin", "DOGE"},
//{"Monero", "XMR"},
//{"Dash", "DASH"},
//{"Lisk", "LSK"},
{"Bat", "BAT"},
{"OM", "OM"},
{"OMG", "OMG"},
{"Stellar", "STR"},
{"StellarBull", "XLMBULL"},
{"Atom", "ATOM"},
{"Ripple", "XRP"},
{"RippleBull", "XRPBULL"},
{"CardanoBull", "ADABULL"},
//{"Factom", "FCT"},
//{"Next", "NXT"},
}
t := NewPrettyTable()
t.addColumn(&column{title: "Coin", align: LEFT})
t.addColumn(&column{title: "USDT", align: DOT, dot: "."})
t.addColumn(&column{title: "% Change", align: DOT, dot: "."})
t.addColumn(&column{title: "BTC", align: DOT, dot: "."})
t.addColumn(&column{title: "% Change", align: DOT, dot: "."})
for _, cr := range clist {
//fmt.Sprintln("Last price of",cr.fn,"$", Comma(ticker["USDT_"+cr.tn].Last), fmt.Sprintf("(%+.0f%%)", ticker["USDT_"+cr.tn].Change*100),fmt.Sprintf("%s BTC",Currency(ticker["BTC_"+cr.tn].Last)), fmt.Sprintf("(%+.0f%%)", ticker["BTC_"+cr.tn].Change*100))
usd := ticker["USDT_"+cr.tn].Last
if usd == 0 {
// no ticker so calculate
usd = ticker["BTC_"+cr.tn].Last * USDT_BTC
}
i := fmt.Sprintf("%s|%v|%+.0f|%v|%+.0f", cr.fn, Comma(usd), ticker["USDT_"+cr.tn].Change*100, Currency(ticker["BTC_"+cr.tn].Last), ticker["BTC_"+cr.tn].Change*100)
t.addRow(strings.Split(i, "|"))
}
report.Body += fmt.Sprintln(t)
/*
recent trades
*/
report.Body += fmt.Sprintln("\n" + heading("Recent Trades"))
var mytradehistory MyTradeHistory
for curr, trades := range mytrades {
for _, t := range trades {
td, _ := time.Parse(poloniexTime, t.Date)
mytradehistory = append(mytradehistory,
MyTradeEntry{
PrivateTradeHistoryEntry: t,
Pair: NewCurrencyPair(curr),
TradeDate: td,
},
)
}
}
sort.Slice(mytradehistory, func(i, j int) bool { return mytradehistory[i].Date > mytradehistory[j].Date })
t = NewPrettyTable()
// t.html=true
t.addColumn(&column{title: "24", align: RIGHT})
t.addColumn(&column{title: "Order", align: LEFT})
t.addColumn(&column{title: "Date", align: LEFT})
t.addColumn(&column{title: "Type", align: LEFT})
t.addColumn(&column{title: "Rate", align: DOT, dot: "."})
t.addColumn(&column{title: "Amount", align: DOT, dot: "."})
t.addColumn(&column{title: "Total", align: DOT, dot: "."})
t.addColumn(&column{title: "$ Value", align: DOT, dot: "."})
t.addColumn(&column{title: "24", align: LEFT})
gain := 0.0
p24h := ""
past24hours := time.Now().Add(time.Duration(-24) * time.Hour)
//pastweek := time.Now().Add(time.Duration(-24*7) * time.Hour)
for _, o := range mytradehistory {
//if o.TradeDate.Before(pastweek) { continue }
k := o.Total
if o.Pair.Base == "BTC" {
k = USDT_BTC * k
}
if o.Type == "buy" {
k = -k
}
gain += k
if o.TradeDate.Before(past24hours) {
p24h = " "
} else {
p24h = "*"
}
i := fmt.Sprintf("%s|%9s|%s|%-4s|%v|%v|%v|%v|%s", p24h, o.Pair, o.Date, o.Type, Currency(o.Rate), Currency(o.Amount), Currency(o.Total), Comma(k), p24h)
t.addRow(strings.Split(i, "|"))
}
t.addFooter([]string{"", "Net gain", "", "", "", "", "", Comma(gain) + " USDT", ""})
report.Body += fmt.Sprintln(t)
/*
Top Movers
*/
tm := int(report.Topmovers)
report.Body += fmt.Sprintln("\n" + heading(fmt.Sprintf("Top %v%% Movers", tm)))
t = NewPrettyTable()
// report.Body
type mover struct {
name CurrencyPair
rate float64
change int
}
var movers []mover
for c, i := range ticker {
if int(math.Abs(i.Change)*100) < tm {
continue
}
pair := NewCurrencyPair(c)
if pair.Base != "BTC" {
continue
}
movers = append(movers, mover{
name: pair,
rate: i.Last,
change: int(i.Change * 100)})
}
sort.Slice(movers, func(i, j int) bool { return movers[i].change < movers[j].change })
t.addColumn(&column{title: "Vested", align: RIGHT})
t.addColumn(&column{title: "Currency", align: RIGHT})
t.addColumn(&column{title: "Rate", align: DOT, dot: "."})
t.addColumn(&column{title: "Change", align: DOT, dot: "."})
for _, o := range movers {
v := " "
if len(openorders[o.name.Poloniex()]) != 0 {
v = "*"
}
i := fmt.Sprintf("%s|%s|%v|%v%%", v, o.name, Currency(o.rate), o.change)
t.addRow(strings.Split(i, "|"))
}
report.Body += fmt.Sprintln(t)
/*
OpenOrders
*/
report.Body += fmt.Sprintln("\n" + heading("My Open Orders"))
var myorders MyOpenOrders
for pair, orders := range openorders {
if len(orders) == 0 {
continue
}
for _, order := range orders {
myorder := MyOpenOrder{OpenOrder: order}
//if myorder.Type=="Sell"
myorder.Pair = NewCurrencyPair(pair)
myorder.CurrentRate = ticker[pair].Bid
diff := myorder.Rate - myorder.CurrentRate
myorder.Proximity = diff / myorder.CurrentRate * 100
myorders = append(myorders, myorder)
}
}
//Sort by absolute value of proximity percentage ascending
sort.Slice(myorders, func(i, j int) bool { return math.Abs(myorders[i].Proximity) < math.Abs(myorders[j].Proximity) })
t = NewPrettyTable()
t.addColumn(&column{title: "Order", align: LEFT})
t.addColumn(&column{title: "Prox", align: LEFT})
t.addColumn(&column{title: "24hrs", align: LEFT})
t.addColumn(&column{title: "Type", align: LEFT, dot: "."})
t.addColumn(&column{title: "Rate", align: DOT, dot: "."})
t.addColumn(&column{title: "Amount", align: DOT, dot: "."})
t.addColumn(&column{title: "Value", align: DOT, dot: "."})
t.addColumn(&column{title: "$ Gain", align: DOT, dot: "."})
gain = 0.0
asnow := 0.0
j := 0.0
for _, o := range myorders {
k := o.Total
if o.Pair.Base == "BTC" {
k = USDT_BTC * k
}
if o.Type == "buy" {
k = -k
}
gain += k
j = o.Amount
if o.Pair.Base == "BTC" {
j = j * ticker[o.Pair.Poloniex()].Last * USDT_BTC
}
asnow += j
//
i := fmt.Sprintf("%9s|%3.0f%%|%+.0f%%|%-4s|%v|%v|%v %s|%v", o.Pair, o.Proximity, ticker[o.Pair.Poloniex()].Change*100, o.Type, Currency(o.Rate), Currency(o.Amount), Currency(o.Total), o.Pair.Base, Comma(k))
t.addRow(strings.Split(i, "|"))
}
// and print the resulting table!
t.addFooter([]string{"If realised", "", "", "", "", "", "$" + Comma(gain), ""})
t.addFooter([]string{"As now", "", "", "", "", "", "$" + Comma(asnow), ""})
t.addFooter([]string{"Profit", "", "", "", "", "", "$" + Comma(gain-asnow), ""})
report.Body += fmt.Sprintln(t)
/*
Holdings - sorted by bitcoin equiv descending - total sum (and usd value)
*/
// report.Body="" //just for testing
report.Body += fmt.Sprintln("\n" + heading("My Balances"))
type MyBalance struct {
poloniex.Balance
curr string
}
var mybalances []MyBalance
for c, bal := range balances {
if bal.BTCValue > 0 {
mybalances = append(mybalances, MyBalance{bal, c})
}
}
sort.Slice(mybalances, func(i, j int) bool { return mybalances[i].BTCValue > mybalances[j].BTCValue })
t = NewPrettyTable()
t.addColumn(&column{title: "Curr", align: LEFT})
t.addColumn(&column{title: "$24h%", align: DOT, dot: "."})
t.addColumn(&column{title: "Available", align: DOT, dot: "."})
t.addColumn(&column{title: "On Orders", align: DOT, dot: "."})
t.addColumn(&column{title: "BTC", align: DOT, dot: "."})
t.addColumn(&column{title: "USD", align: DOT, dot: "."})
t.addColumn(&column{title: "Total", align: DOT, dot: "."})
total := 0.0
for _, b := range mybalances {
total += b.BTCValue
i := fmt.Sprintf("%9s|%v|%+.0f%%|%v|%v|%v|%v", b.curr, ticker["USDT_"+b.curr].Change*100, Currency(b.Available), Currency(b.OnOrders), Currency(b.BTCValue), Comma(b.BTCValue*USDT_BTC), Currency(total))
t.addRow(strings.Split(i, "|"))
}
t.addFooter([]string{"Total", "", "", "", "$" + Comma(float64(total)*USDT_BTC), ""})
// report.Body+=fmt.Sprintf("%#v\n",mybalances)
report.Body += fmt.Sprintln(t)
csv.usd = total * USDT_BTC
csv.btc = total
/////////////////////////////////////////////////////////////
/*
send report via email
*/
fmt.Println(report.Body)
report.Send()
////////////////////////////////////////////////////////////
/*
CSV file create to track BTC and USD
*/
if report.Csv {
s := fmt.Sprintf("%v,%.2f,%v\n", csv.time, csv.usd, Currency(csv.btc))
f, err := os.OpenFile("data.csv", os.O_APPEND|os.O_WRONLY, 0600)
if err != nil {
// might not be created. So create and write header...
f, err = os.OpenFile("data.csv", os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600)
if _, err = f.WriteString("time,usd,btc\n"); err != nil {
f.Close()
panic(err)
}
}
defer f.Close()
if _, err = f.WriteString(s); err != nil {
panic(err)
}
}
}
func (r *Report) Send() (e error) {
m := gomail.NewMessage()
m.SetHeader("From", r.Emailfrom)
m.SetHeader("To", r.Emailto)
m.SetHeader("Subject", r.Subject)
m.SetBody("text/html", "<pre>"+r.Body+"</pre>")
// fmt.Println(m)
d := gomail.NewDialer(r.Smtpserver, int(r.Port), r.Smtp_login, r.Smtp_password) // with or without auth
//d := gomail.Dialer{Host: "127.0.0.1", Port: 25, SSL: false, Auth: nil} // no auth
//if r.smtp_ssl {d.SSL=true}
if err := d.DialAndSend(m); err != nil {
panic(err)
}
return
}
/* intialise
* get price for btc/USDT_BTC
* get PrivateTradeHistoryAll (perhaps extend with seen field)
* are there any new trades?
* yes - print them
* email summary if requested
* cache any values needed?
*
* config has email address
* config has time between calls
* config has secret and id
*
* tradedata: map of USDT_BTC, lastchecked,seentrades(id's)
*
* backed by tradedata.json
*
* GetNewTrades accepts start(time.Now) and prev time returns a slice of trades
* commify
* btc2usd
* PurgeOldTrades acts on on tradedata and removes anything > 24hrs
* MergeNewTrades acts on PrivateTradeHistoryAll and adds only those not yet seen
*/