diff --git a/Makefile b/Makefile index feb63f151..15c09e8f6 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ K ?= K.sh MAJOR = 0 MINOR = 7 PATCH = 0 -BUILD = 33 +BUILD = 34 OBLIGATORY = DISCLAIMER: This is strict non-violent software: \n$\ if you hurt other living creatures, please stop; \n$\ diff --git a/src/bin/+portfolios/+portfolios.client/Orders.ts b/src/bin/+portfolios/+portfolios.client/Orders.ts index 53a25c7a3..19e7f1444 100644 --- a/src/bin/+portfolios/+portfolios.client/Orders.ts +++ b/src/bin/+portfolios/+portfolios.client/Orders.ts @@ -102,9 +102,9 @@ export class OrdersComponent { 'buy': 'data.side == "Bid"' }, cellRenderer: (params) => ( - params.data.pong - ? '⥄' - : '➜' + params.value == "Ask" + ? '' + : '' ) + params.value }, { width: 74, @@ -206,7 +206,7 @@ export class OrdersComponent { value: (Math.round(o.quantity * o.price * 100) / 100), //.toFixed(this.product.tickPrice) type: Models.OrderType[o.type], tif: Models.TimeInForce[o.timeInForce], - lat: o.latency ? o.latency + 'ms' : 'loaded', + lat: o.latency < 0 ? 'loaded' : o.latency + 'ms', quantity: o.quantity, //.toFixed(this.product.tickSize) pong: o.isPong, time: o.time diff --git a/src/lib/Krypto.ninja-bots.h b/src/lib/Krypto.ninja-bots.h index 44034d416..340b9cc5e 100644 --- a/src/lib/Krypto.ninja-bots.h +++ b/src/lib/Krypto.ninja-bots.h @@ -268,7 +268,7 @@ namespace ₿ { }; private: string lines(string reason) const { - string::size_type n = 0; + size_t n = 0; while ((n = reason.find(ANSI_NEW_LINE, n + 2)) != string::npos) reason.insert(n + 2, ANSI_HIGH_RED); return ANSI_HIGH_RED + reason; @@ -282,7 +282,7 @@ namespace ₿ { clog << puke; #endif if (display.terminal) { - string::size_type n = 0; + size_t n = 0; while ((n = puke.find(ANSI_NEW_LINE)) != string::npos) { clogs.emplace_back(puke.begin(), puke.begin() + n); puke.erase(0, n + 2); @@ -502,7 +502,7 @@ namespace ₿ { args["base"] = arg("currency").substr(0, arg("currency").find("/")); args["quote"] = arg("currency").substr(1+ arg("currency").find("/")); if (arg("secret").find("EC PRIVATE KEY") != string::npos and arg("secret").find(ANSI_NEW_LINE) == string::npos) { - string::size_type n = 0; + size_t n = 0; while ((n = arg("secret").find("\\r", n)) != string::npos) args["secret"] = string(arg("secret")).erase(n, 2); n = 0; @@ -600,7 +600,7 @@ namespace ₿ { << it.name << string((11 - it.name.length()) / 2, ' ') << " █▓▒░"; else { - string::size_type n = 0; + size_t n = 0; while ((n = usage.find(ANSI_NEW_LINE, n + 2)) != string::npos) usage.insert(n + 2, 28, ' '); const string example = "--" + it.name + (it.default_value ? "=" + it.defined_value : ""); @@ -1450,7 +1450,8 @@ namespace ₿ { Order *found = find(raw.orderId); if (!found and withExternal and raw.status == Status::Working) { Order external = raw; - external.status = Status::Waiting; + external.status = Status::Waiting; + external.latency = -1; found = findsert(external); } return found; diff --git a/src/lib/Krypto.ninja-client/Makefile b/src/lib/Krypto.ninja-client/Makefile index dc520e98d..cb36790bc 100644 --- a/src/lib/Krypto.ninja-client/Makefile +++ b/src/lib/Krypto.ninja-client/Makefile @@ -75,8 +75,8 @@ export define PACKAGE_JSON "@angular/platform-browser-dynamic": "^18.2.7", "@angular/router": "^18.2.7", "@types/node": "^22.7.4", - "ag-grid-angular": "^32.2.1", - "ag-grid-community": "^32.2.1", + "ag-grid-angular": "^32.2.2", + "ag-grid-community": "^32.2.2", "esbuild": "^0.24.0", "highcharts": "^11.4.8", "highcharts-angular": "^4.0.1", diff --git a/src/lib/Krypto.ninja-data.h b/src/lib/Krypto.ninja-data.h index 81a9294f7..55ce6af26 100644 --- a/src/lib/Krypto.ninja-data.h +++ b/src/lib/Krypto.ninja-data.h @@ -761,7 +761,7 @@ namespace ₿ { BIO_get_mem_ptr(bio.get(), &buf); string output(buf->data, buf->length); if (urlsafe) { - string::size_type n = 0; + size_t n = 0; while ((n = output.find("+")) != string::npos) output.replace(n, 1, "-"); while ((n = output.find("/")) != string::npos) @@ -774,7 +774,7 @@ namespace ₿ { static string B64_decode(const string &input, const bool &urlsafe = false) { if (urlsafe) { string output = input; - string::size_type n = 0; + size_t n = 0; while ((n = output.find("-")) != string::npos) output.replace(n, 1, "+"); while ((n = output.find("_")) != string::npos) @@ -1392,7 +1392,7 @@ namespace ₿ { class Files { public: static bool mkdirs(const string &file) { - string::size_type has_dir = file.find_last_of("/\\"); + size_t has_dir = file.find_last_of("/\\"); if (has_dir != string::npos) { string dir = file.substr(0, has_dir); if (access(dir.data(), R_OK) == -1) {