Skip to content

Commit 90c1f96

Browse files
author
Ekliptor
committed
updated WebPack
1 parent 9b11b43 commit 90c1f96

File tree

12 files changed

+1592
-135
lines changed

12 files changed

+1592
-135
lines changed

‎config/FishingNet.json

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
{
22
"data": [
33
{
4-
"exchanges": ["BitMEX"],
4+
"exchanges": [
5+
"BitMEX"
6+
],
57
"marginTrading": true,
6-
"tradeTotalBtc": 500.0,
8+
"tradeTotalBtc": 500,
79
"warmUpMin": 0,
810
"strategies": {
911
"FishingNet": {
1012
"fishingMode": "trend",
11-
"percentage": 15.0,
13+
"percentage": 15,
1214
"maxPosIncreases": 7,
1315
"tradingAmountIncreaseFactor": 1.1,
1416
"profitPercent": 4.1,
@@ -29,10 +31,12 @@
2931
"K": 2,
3032
"MAType": 0,
3133
"feed": "BitmexMarketData",
32-
"currencyPairs": ["USD_BTC"],
34+
"currencyPairs": [
35+
"USD_BTC"
36+
],
3337
"supportLines": [],
3438
"resistanceLines": [],
35-
"expirationPercent": 3.0,
39+
"expirationPercent": 3,
3640
"pair": "USD_BTC",
3741
"candleSize": 30,
3842
"tradeStrategy": "RSIScalpOrderer",
@@ -48,8 +52,8 @@
4852
},
4953
"StopLossTurn": {
5054
"order": "closeLong",
51-
"stop": 0.0,
52-
"stopLong": 0.0,
55+
"stop": 0,
56+
"stopLong": 0,
5357
"setback": 5.5,
5458
"setbackLong": 5.5,
5559
"time": 300,
@@ -77,4 +81,4 @@
7781
}
7882
}
7983
]
80-
}
84+
}

‎config/WaveSurferFutures.json

Lines changed: 82 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,86 @@
11
{
2-
"data": [
3-
{
4-
"exchanges": ["OKEX"],
5-
"marginTrading": true,
6-
"tradeTotalBtc": 0.06,
7-
"warmUpMin": 0,
8-
"strategies": {
9-
"WaveSurferLeverage": {
10-
"minSurfCandles": 6,
11-
"pair": "USD_BTC",
12-
"candleSize": 126,
13-
"enableLog": true
2+
"data": [
3+
{
4+
"exchanges": [
5+
"OKEX"
6+
],
7+
"marginTrading": true,
8+
"tradeTotalBtc": 0.06,
9+
"warmUpMin": 0,
10+
"strategies": {
11+
"WaveSurferLeverage": {
12+
"minSurfCandles": 6,
13+
"pair": "USD_BTC",
14+
"candleSize": 126,
15+
"enableLog": true
16+
},
17+
"StopLossTurn": {
18+
"order": "closeLong",
19+
"setback": 3.1,
20+
"time": 900,
21+
"candleSize": 6,
22+
"pair": "USD_BTC",
23+
"enableLog": false
24+
},
25+
"TakeProfit": {
26+
"order": "closeLong",
27+
"profit": 3.4,
28+
"time": 5028,
29+
"candleSize": 12,
30+
"pair": "USD_BTC",
31+
"enableLog": false
32+
},
33+
"TakeProfitPartial": {
34+
"order": "closeLong",
35+
"profit": 3,
36+
"percentage": 41,
37+
"time": 1411,
38+
"candleSize": 12,
39+
"pair": "USD_BTC",
40+
"enableLog": false
41+
}
42+
}
1443
},
15-
"StopLossTurn": {
16-
"order": "closeLong",
17-
"setback": 3.1,
18-
"time": 900,
19-
"candleSize": 6,
20-
"pair": "USD_BTC",
21-
"enableLog": false
22-
},
23-
"TakeProfit": {
24-
"order": "closeLong",
25-
"profit": 3.4,
26-
"time": 5028,
27-
"candleSize": 12,
28-
"pair": "USD_BTC",
29-
"enableLog": false
30-
},
31-
"TakeProfitPartial": {
32-
"order": "closeLong",
33-
"profit": 3,
34-
"percentage": 41,
35-
"time": 1411,
36-
"candleSize": 12,
37-
"pair": "USD_BTC",
38-
"enableLog": false
39-
}
40-
}
41-
},
42-
{
43-
"exchanges": ["OKEX"],
44-
"marginTrading": true,
45-
"tradeTotalBtc": 1.5,
46-
"warmUpMin": 0,
47-
"strategies": {
48-
"WaveSurferLeverage": {
49-
"minSurfCandles": 6,
50-
"pair": "USD_LTC",
51-
"candleSize": 133,
52-
"enableLog": true
53-
},
54-
"StopLossTurn": {
55-
"order": "closeLong",
56-
"setback": 2.2,
57-
"time": 900,
58-
"candleSize": 6,
59-
"pair": "USD_LTC",
60-
"enableLog": false
61-
},
62-
"TakeProfit": {
63-
"order": "closeLong",
64-
"profit": 9,
65-
"time": 3604,
66-
"candleSize": 9,
67-
"pair": "USD_LTC",
68-
"enableLog": false
69-
},
70-
"TakeProfitPartial": {
71-
"order": "closeLong",
72-
"profit": 5.5,
73-
"percentage": 40,
74-
"time": 1032,
75-
"candleSize": 5,
76-
"pair": "USD_LTC",
77-
"enableLog": false
44+
{
45+
"exchanges": [
46+
"OKEX"
47+
],
48+
"marginTrading": true,
49+
"tradeTotalBtc": 1.5,
50+
"warmUpMin": 0,
51+
"strategies": {
52+
"WaveSurferLeverage": {
53+
"minSurfCandles": 6,
54+
"pair": "USD_LTC",
55+
"candleSize": 133,
56+
"enableLog": true
57+
},
58+
"StopLossTurn": {
59+
"order": "closeLong",
60+
"setback": 2.2,
61+
"time": 900,
62+
"candleSize": 6,
63+
"pair": "USD_LTC",
64+
"enableLog": false
65+
},
66+
"TakeProfit": {
67+
"order": "closeLong",
68+
"profit": 9,
69+
"time": 3604,
70+
"candleSize": 9,
71+
"pair": "USD_LTC",
72+
"enableLog": false
73+
},
74+
"TakeProfitPartial": {
75+
"order": "closeLong",
76+
"profit": 5.5,
77+
"percentage": 40,
78+
"time": 1032,
79+
"candleSize": 5,
80+
"pair": "USD_LTC",
81+
"enableLog": false
82+
}
83+
}
7884
}
79-
}
80-
}
81-
]
85+
]
8286
}

‎package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"author": "Ekliptor",
88
"license": "AGPL",
99
"scripts": {
10-
"watch": "webpack --progress --colors --watch"
10+
"watch": "./node_modules/.bin/webpack --progress --colors --watch"
1111
},
1212
"homepage": "https://wolfbot.org",
1313
"repository": "https://github.com/Ekliptor/WolfBot.git",
@@ -95,7 +95,9 @@
9595
"gulp-typedoc": "^2.2.0",
9696
"source-map-loader": "^0.2.3",
9797
"typedoc": "^0.11.1",
98-
"typescript": "4.0.3"
98+
"typescript": "4.0.3",
99+
"webpack": "4.44.2",
100+
"webpack-cli": "3.3.12"
99101
},
100102
"workspaces": [
101103
"packages/*"

0 commit comments

Comments
 (0)