diff --git a/Client/package-lock.json b/Client/package-lock.json index 618d94891..60e30b133 100644 --- a/Client/package-lock.json +++ b/Client/package-lock.json @@ -915,9 +915,9 @@ "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" }, "ccxt": { - "version": "1.51.61", - "resolved": "https://registry.npmjs.org/ccxt/-/ccxt-1.51.61.tgz", - "integrity": "sha512-ywz04QrqU4qW07i1mzhlF1yv6p2hs37ndYqYG9R5Fln1FUHXfxiwnCbBK3LOdYeal7fdT8lGUCqL6LCEXgtjcQ==" + "version": "1.51.91", + "resolved": "https://registry.npmjs.org/ccxt/-/ccxt-1.51.91.tgz", + "integrity": "sha512-pomtW3aDy7oSOm+Y9XP4WAkPPx9oZNGjhzwPEXyMrNKsVrc7+deVq07rIS+m5UHUkRel6a4U2hUwnWHOxAQMuQ==" }, "child_process": { "version": "1.0.2", diff --git a/Client/package.json b/Client/package.json index 6bc30f8eb..913d92435 100644 --- a/Client/package.json +++ b/Client/package.json @@ -8,7 +8,7 @@ }, "dependencies": { "@octokit/rest": "^18.0.12", - "ccxt": "^1.51.61", + "ccxt": "^1.51.91", "child_process": "^1.0.2", "open": "^6.4.0", "rimraf": "^3.0.2", diff --git a/Projects/Foundations/Icons-SVG-Sources/exchanges/lykke.svg b/Projects/Foundations/Icons-SVG-Sources/exchanges/lykke.svg new file mode 100644 index 000000000..4ba2ddd8a --- /dev/null +++ b/Projects/Foundations/Icons-SVG-Sources/exchanges/lykke.svg @@ -0,0 +1,202 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Projects/Foundations/Icons/Crypto-Exchanges/lykke.png b/Projects/Foundations/Icons/Crypto-Exchanges/lykke.png new file mode 100644 index 000000000..fa64ccfb7 Binary files /dev/null and b/Projects/Foundations/Icons/Crypto-Exchanges/lykke.png differ diff --git a/Projects/Foundations/Schemas/App-Schema/crypto-exchange.json b/Projects/Foundations/Schemas/App-Schema/crypto-exchange.json index 8ab740157..103c66930 100644 --- a/Projects/Foundations/Schemas/App-Schema/crypto-exchange.json +++ b/Projects/Foundations/Schemas/App-Schema/crypto-exchange.json @@ -76,10 +76,6 @@ } ], "alternativeIcons": [ - { - "codeName": "bitfinex", - "iconName": "bitfinex" - }, { "codeName": "binance", "iconName": "binance" @@ -89,45 +85,49 @@ "iconName": "binanceus" }, { - "codeName": "coinbasepro", - "iconName": "coinbasepro" - }, - { - "codeName": "kucoin", - "iconName": "kucoin" - }, - { - "codeName": "bittrex", - "iconName": "bittrex" - }, - { - "codeName": "kraken", - "iconName": "kraken" - }, - { - "codeName": "poloniex", - "iconName": "poloniex" - }, - { - "codeName": "upbit", - "iconName": "upbit" + "codeName": "bitfinex", + "iconName": "bitfinex" }, { "codeName": "bitmex", "iconName": "bitmex" }, { - "codeName": "liquid", - "iconName": "liquid" + "codeName": "bittrex", + "iconName": "bittrex" + }, + { + "codeName": "coinbasepro", + "iconName": "coinbasepro" + }, + { + "codeName": "ftx", + "iconName": "ftx" }, { "codeName": "hitbtc", "iconName": "hitbtc" }, + { + "codeName": "kraken", + "iconName": "kraken" + }, + { + "codeName": "kucoin", + "iconName": "kucoin" + }, + { + "codeName": "liquid", + "iconName": "liquid" + }, { "codeName": "luno", "iconName": "luno" }, + { + "codeName": "lykke", + "iconName": "lykke" + }, { "codeName": "okex", "iconName": "okex" @@ -137,8 +137,12 @@ "iconName": "okex" }, { - "codeName": "ftx", - "iconName": "ftx" + "codeName": "poloniex", + "iconName": "poloniex" + }, + { + "codeName": "upbit", + "iconName": "upbit" } ] } \ No newline at end of file diff --git a/Projects/Foundations/TS/Bot-Modules/Sensor-Bot/Exchange-Raw-Data/HistoricOHLCVs.js b/Projects/Foundations/TS/Bot-Modules/Sensor-Bot/Exchange-Raw-Data/HistoricOHLCVs.js index 9feb26e82..a1f6f0253 100644 --- a/Projects/Foundations/TS/Bot-Modules/Sensor-Bot/Exchange-Raw-Data/HistoricOHLCVs.js +++ b/Projects/Foundations/TS/Bot-Modules/Sensor-Bot/Exchange-Raw-Data/HistoricOHLCVs.js @@ -418,18 +418,21 @@ await exchange.fetchOHLCV(symbol, '1m', since, limit, params) - if (OHLCVs.length === 0) { + if (OHLCVs.length === 0 && new Date(since).valueOf() !== (new Date).setSeconds(0,0)) { + /* - If OHLCVs is empty we might be dealing with extended maintenance longer than our OHLCV limit. + If OHLCVs is empty and we're not at the current minute we might + be dealing with extended maintenance longer than our OHLCV limit. If this is the case jump forward to the next valid OHLCV record. */ + since = await findNextValidOHLCV() } /* CCXT for certain Exchanges will return an empty or partial array if the since date is too far in the past if this occurs this function will recursively step backwards in the Exchange - and Market in 1D intervals until it finds the earliest date with values. + and Market in 1D intervals until it finds the earliest date with values. */ async function findMarketStart() { diff --git a/Projects/Foundations/TS/Bot-Modules/Sensor-Bot/Exchange-Raw-Data/package-lock.json b/Projects/Foundations/TS/Bot-Modules/Sensor-Bot/Exchange-Raw-Data/package-lock.json index 7c43a4b64..c92c4f8d6 100644 --- a/Projects/Foundations/TS/Bot-Modules/Sensor-Bot/Exchange-Raw-Data/package-lock.json +++ b/Projects/Foundations/TS/Bot-Modules/Sensor-Bot/Exchange-Raw-Data/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "ccxt": { - "version": "1.51.61", - "resolved": "https://registry.npmjs.org/ccxt/-/ccxt-1.51.61.tgz", - "integrity": "sha512-ywz04QrqU4qW07i1mzhlF1yv6p2hs37ndYqYG9R5Fln1FUHXfxiwnCbBK3LOdYeal7fdT8lGUCqL6LCEXgtjcQ==" + "version": "1.51.91", + "resolved": "https://registry.npmjs.org/ccxt/-/ccxt-1.51.91.tgz", + "integrity": "sha512-pomtW3aDy7oSOm+Y9XP4WAkPPx9oZNGjhzwPEXyMrNKsVrc7+deVq07rIS+m5UHUkRel6a4U2hUwnWHOxAQMuQ==" } } } diff --git a/Projects/Foundations/TS/Bot-Modules/Sensor-Bot/Exchange-Raw-Data/package.json b/Projects/Foundations/TS/Bot-Modules/Sensor-Bot/Exchange-Raw-Data/package.json index 0d7450775..5649ee9be 100644 --- a/Projects/Foundations/TS/Bot-Modules/Sensor-Bot/Exchange-Raw-Data/package.json +++ b/Projects/Foundations/TS/Bot-Modules/Sensor-Bot/Exchange-Raw-Data/package.json @@ -7,6 +7,6 @@ "name": "Luis-Fernando-Molina" }, "dependencies": { - "ccxt": "^1.51.61" + "ccxt": "^1.51.91" } }