dequanto 0.1.33 → 0.1.36
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/cjs/clients/handlers/RateLimitGuard.js +1 -1
- package/lib/cjs/clients/handlers/RateLimitGuard.js.map +1 -1
- package/lib/cjs/tokens/TokenPriceService.js +2 -2
- package/lib/cjs/tokens/TokenPriceService.js.map +1 -1
- package/lib/esm/clients/handlers/RateLimitGuard.js.map +1 -1
- package/lib/esm/clients/handlers/RateLimitGuard.mjs +1 -1
- package/lib/esm/tokens/TokenPriceService.js.map +1 -1
- package/lib/esm/tokens/TokenPriceService.mjs +2 -2
- package/package.json +3 -2
- package/src/clients/handlers/RateLimitGuard.ts +1 -1
- package/src/tokens/TokenPriceService.ts +3 -3
|
@@ -62,7 +62,7 @@ class RateLimitGuard {
|
|
|
62
62
|
let message = error.message;
|
|
63
63
|
let hasMatches = rateLimitRgx.checks.some(checkRgxMix => {
|
|
64
64
|
if (Array.isArray(checkRgxMix)) {
|
|
65
|
-
return checkRgxMix.
|
|
65
|
+
return checkRgxMix.some(rgx => rgx.test(message));
|
|
66
66
|
}
|
|
67
67
|
return checkRgxMix.test(message);
|
|
68
68
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RateLimitGuard.js","sourceRoot":"","sources":["../../../../src/clients/handlers/RateLimitGuard.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iDAA8C;AAC9C,qDAA4C;AAC5C,uDAAoD;AACpD,gDAAwB;AACxB,gDAAwB;AAExB,IAAI,YAAY,GAAG;IACf,MAAM,EAAE;QACJ,sDAAsD;QACtD,cAAc;QACd,qBAAqB;QACrB,kBAAkB;QAClB,aAAa;QACb,gBAAgB;QAChB,UAAU;QACV,CAAC,WAAW,EAAE,wBAAwB,CAAC;KAC1C;IACD,QAAQ,EAAE;QACN,mBAAmB;QACnB,0EAA0E;KAC7E;IACD,WAAW,EAAE;QACT,WAAW,CAAE,GAAW;YACpB,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;YAClB,OAAO;gBACH,MAAM,EAAE,GAAG,GAAG,IAAI;gBAClB,SAAS,EAAE,GAAG;aACjB,CAAC;QACN,CAAC;KACJ;CACJ,CAAA;AACD,IAAI,aAAa,GAAG;IAChB,QAAQ,EAAE;QACN,qCAAqC;KACxC;CACJ,CAAA;AASD,MAAa,cAAc;IAEvB,MAAM,CAAC,YAAY,CAAC,KAAY;QAC5B,OAAO,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IACnE,CAAC;IACD,MAAM,CAAC,0BAA0B,CAAE,KAAY;QAC3C,KAAK,IAAI,GAAG,IAAI,aAAa,CAAC,QAAQ,EAAE;YACpC,IAAI,GAAG,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC;YACtD,IAAI,GAAG,IAAI,IAAI,EAAE;gBACb,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;aACtB;SACJ;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,CAAC,aAAa,CAAE,KAAsB;QACxC,IAAI,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;QAC5B,IAAI,UAAU,GAAG,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;YACpD,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;gBAC5B,OAAO,WAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"RateLimitGuard.js","sourceRoot":"","sources":["../../../../src/clients/handlers/RateLimitGuard.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,6 @@ const a_di_1 = __importDefault(require("a-di"));
|
|
|
8
8
|
const TokenUtils_1 = require("./utils/TokenUtils.js");
|
|
9
9
|
const TokensService_1 = require("./TokensService.js");
|
|
10
10
|
const _address_1 = require("../utils/$address.js");
|
|
11
|
-
const AmmV2PriceQuote_1 = require("./TokenExchanges/AmmV2PriceQuote.js");
|
|
12
11
|
const _logger_1 = require("../utils/$logger.js");
|
|
13
12
|
const _require_1 = require("../utils/$require.js");
|
|
14
13
|
const ChainlinkOracle_1 = require("./TokenOracles/chainlink/ChainlinkOracle.js");
|
|
@@ -21,7 +20,8 @@ class TokenPriceService {
|
|
|
21
20
|
this.oracles = [
|
|
22
21
|
{ provider: `chainlink`, oracle: new ChainlinkOracle_1.ChainlinkOracle([client]) },
|
|
23
22
|
{ provider: `1inchAggregator-${client.network}`, oracle: new SpotPriceAggregator_1.SpotPriceAggregator() },
|
|
24
|
-
|
|
23
|
+
// AMMs are covered already by 1inchAggregator, so no need to add them here
|
|
24
|
+
// { provider: `ammV2`, oracle: new AmmV2PriceQuote(this.client, this.explorer) },
|
|
25
25
|
];
|
|
26
26
|
}
|
|
27
27
|
async getPrice(mix, opts) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TokenPriceService.js","sourceRoot":"","sources":["../../../src/tokens/TokenPriceService.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAsB;AAKtB,mDAAgD;AAChD,mDAAgD;AAChD,uDAAoD;AAGpD,
|
|
1
|
+
{"version":3,"file":"TokenPriceService.js","sourceRoot":"","sources":["../../../src/tokens/TokenPriceService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RateLimitGuard.js","sourceRoot":"","sources":["../../../../src/clients/handlers/RateLimitGuard.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iDAA8C;AAC9C,qDAA4C;AAC5C,uDAAoD;AACpD,gDAAwB;AACxB,gDAAwB;AAExB,IAAI,YAAY,GAAG;IACf,MAAM,EAAE;QACJ,sDAAsD;QACtD,cAAc;QACd,qBAAqB;QACrB,kBAAkB;QAClB,aAAa;QACb,gBAAgB;QAChB,UAAU;QACV,CAAC,WAAW,EAAE,wBAAwB,CAAC;KAC1C;IACD,QAAQ,EAAE;QACN,mBAAmB;QACnB,0EAA0E;KAC7E;IACD,WAAW,EAAE;QACT,WAAW,CAAE,GAAW;YACpB,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;YAClB,OAAO;gBACH,MAAM,EAAE,GAAG,GAAG,IAAI;gBAClB,SAAS,EAAE,GAAG;aACjB,CAAC;QACN,CAAC;KACJ;CACJ,CAAA;AACD,IAAI,aAAa,GAAG;IAChB,QAAQ,EAAE;QACN,qCAAqC;KACxC;CACJ,CAAA;AASD,MAAa,cAAc;IAEvB,MAAM,CAAC,YAAY,CAAC,KAAY;QAC5B,OAAO,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IACnE,CAAC;IACD,MAAM,CAAC,0BAA0B,CAAE,KAAY;QAC3C,KAAK,IAAI,GAAG,IAAI,aAAa,CAAC,QAAQ,EAAE;YACpC,IAAI,GAAG,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC;YACtD,IAAI,GAAG,IAAI,IAAI,EAAE;gBACb,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;aACtB;SACJ;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,CAAC,aAAa,CAAE,KAAsB;QACxC,IAAI,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;QAC5B,IAAI,UAAU,GAAG,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;YACpD,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;gBAC5B,OAAO,WAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"RateLimitGuard.js","sourceRoot":"","sources":["../../../../src/clients/handlers/RateLimitGuard.ts"],"names":[],"mappings":"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"}
|
|
@@ -56,7 +56,7 @@ export class RateLimitGuard {
|
|
|
56
56
|
let message = error.message;
|
|
57
57
|
let hasMatches = rateLimitRgx.checks.some(checkRgxMix => {
|
|
58
58
|
if (Array.isArray(checkRgxMix)) {
|
|
59
|
-
return checkRgxMix.
|
|
59
|
+
return checkRgxMix.some(rgx => rgx.test(message));
|
|
60
60
|
}
|
|
61
61
|
return checkRgxMix.test(message);
|
|
62
62
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TokenPriceService.js","sourceRoot":"","sources":["../../../src/tokens/TokenPriceService.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAsB;AAKtB,mDAAgD;AAChD,mDAAgD;AAChD,uDAAoD;AAGpD,
|
|
1
|
+
{"version":3,"file":"TokenPriceService.js","sourceRoot":"","sources":["../../../src/tokens/TokenPriceService.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAsB;AAKtB,mDAAgD;AAChD,mDAAgD;AAChD,uDAAoD;AAGpD,qDAAkD;AAClD,uDAAoD;AAEpD,8EAA2E;AAC3E,gGAA6F;AAuB7F,MAAa,iBAAiB;IAK1B,YAAoB,MAAkB,EAAU,QAA6B;QAAzD,WAAM,GAAN,MAAM,CAAY;QAAU,aAAQ,GAAR,QAAQ,CAAqB;QACzE,IAAI,CAAC,MAAM,GAAG,cAAE,CAAC,OAAO,CAAC,6BAAa,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAA;QAC3E,IAAI,CAAC,OAAO,GAAG;YACX,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,iCAAe,CAAC,CAAE,MAAM,CAAE,CAAC,EAAE;YAClE,EAAE,QAAQ,EAAE,mBAAmB,MAAM,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,IAAI,yCAAmB,EAAE,EAAE;YAEpF,2EAA2E;YAC3E,kFAAkF;SACrF,CAAC;IACN,CAAC;IAKD,KAAK,CAAC,QAAQ,CAAE,GAA+B,EAAE,IAAyB;QAEtE,IAAI,KAAa,CAAC;QAElB,IAAI;YACA,KAAK,GAAG,OAAO,GAAG,KAAK,QAAQ;gBAC3B,CAAC,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC;gBACtC,CAAC,CAAC,GAAG,CAAC;SACb;QAAC,OAAO,KAAK,EAAE,GAAE;QAElB,mBAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,SAAS,GAAG,YAAY,CAAC,CAAC;QAClD,mBAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,yBAAyB,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;QAEzE,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,KAAK,IAAI,UAAU,IAAI,IAAI,CAAC,OAAO,EAAE;YACjC,IAAI,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;YAC/B,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;YAC3D,IAAI,KAAK,EAAE;gBACP,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACnB,SAAS;aACZ;YACD,IAAI,MAAM,CAAC,KAAK,IAAI,IAAI,IAAI,MAAM,CAAC,KAAK,KAAK,CAAC,EAAE;gBAC5C,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;gBACnC,SAAS;aACZ;YACD,OAAO;gBACH,QAAQ,EAAE,UAAU,CAAC,QAAQ;gBAC7B,GAAG,MAAM;aACZ,CAAC;SACL;QACD,IAAI,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpD,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;IAC7B,CAAC;CACJ;AApDD,8CAoDC;AAGD,MAAa,0BAA0B;IAKnC,YAAqB,OAA0B;QAA1B,YAAO,GAAP,OAAO,CAAmB;QAHvC,UAAK,GAAG,IAAI,GAAG,EAAqD,CAAA;QACpE,aAAQ,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;IAIjC,CAAC;IAMD,KAAK,CAAC,QAAQ,CAAE,GAA+B,EAAE,IAAyB;QAEtE,IAAI,GAAG,GAAW,OAAO,GAAG,KAAK,QAAQ;YACrC,CAAC,CAAC,GAAG;YACL,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC;QAElB,IAAI,OAAO,GAAW,IAAI,CAAC;QAC3B,IAAI,MAAM,GAAS,IAAI,CAAC;QAExB,IAAI,IAAI,EAAE,KAAK,IAAI,IAAI,EAAE;YACrB,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC;YACrB,GAAG,IAAI,GAAG,GAAG,CAAC,OAAO,GAAG,OAAO,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC;SAE9C;aAAM;YACH,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,IAAI,CAAC;YAE9B,MAAM,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC;YACrB,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;YAC1B,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YAErB,IAAI,OAAO,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;YAClC,OAAO,IAAI,OAAO,GAAG,CAAC,CAAC;YAEvB,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAE3B,GAAG,IAAI,GAAG,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC;SACrC;QAED,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YACrB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;SAC9B;QAED,IAAI,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAO,GAAG,EAAE;YAC3C,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;YACf,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,OAAO;SACjB,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC7B,OAAO,OAAO,CAAC;IACnB,CAAC;CACJ;AArDD,gEAqDC;AAGD,IAAU,UAAU,CAoHnB;AApHD,WAAU,UAAU;IAGT,KAAK,UAAU,UAAU,CAAE,SAAiB,EAAE,UAAkB,EAAE,KAAkB,EAAE,YAA2B;QACpH,IAAI,KAAe,CAAC;QACpB,IAAI,UAAU,GAAG,SAAS,CAAC;QAC3B,IAAI,WAAW,GAAG,UAAU,CAAC;QAC7B,IAAI,MAAM,GAAG,EAAgB,CAAC;QAE9B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACnC,KAAK,GAAG,MAAM,QAAQ,CAAC,UAAU,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC;YAExE,WAAW,GAAG,KAAK,CAAC,QAAQ,CAAC;YAC7B,UAAU,GAAG,KAAK,CAAC,EAAE,CAAC;YACtB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SACtB;QAED,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAEzB,IAAI,UAAU,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QAC3B,yDAAyD;QACzD,OAAO;YACH,QAAQ,EAAE,KAAK,CAAC,EAAE;YAClB,SAAS,EAAE,KAAK,CAAC,QAAQ;YACzB,MAAM,EAAE,KAAK,CAAC,KAAK;YACnB,WAAW,EAAE,KAAK,CAAC,OAAO;YAE1B,OAAO,EAAE,UAAU,CAAC,IAAI;YACxB,QAAQ,EAAE,UAAU,CAAC,UAAU;YAC/B,KAAK,EAAE,UAAU,CAAC,OAAO;YACzB,UAAU,EAAE,UAAU,CAAC,SAAS;YAEhC,KAAK,EAAE,MAAM;SAChB,CAAC;IACN,CAAC;IA/BqB,qBAAU,aA+B/B,CAAA;IAED,SAAS,gBAAgB,CAAE,KAAiB;QACxC,IAAI,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,IAAI,IAAI,IAAI,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC;QACrE,IAAI,QAAQ,IAAI,IAAI,EAAE;YAClB,OAAO;SACV;QACD,IAAI,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACxC,KAAK,IAAI,CAAC,GAAG,SAAS,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACrC,IAAI,UAAU,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAC9B,IAAI,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YAEpB,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC,OAAO,CAAC;YAChC,IAAI,CAAC,OAAO,GAAG,uBAAU,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;YACxE,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC;YAC1B,IAAI,CAAC,SAAS,GAAG,uBAAU,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;SACnF;QACD,KAAK,IAAI,CAAC,GAAG,SAAS,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC/C,IAAI,UAAU,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAC9B,IAAI,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YAEpB,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC,KAAK,CAAC;YAChC,IAAI,CAAC,SAAS,GAAG,uBAAU,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YAChF,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC;YAC1B,IAAI,CAAC,OAAO,GAAG,uBAAU,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;SAC3E;IACL,CAAC;IAEM,KAAK,UAAU,UAAU,CAAE,OAAiB;IAEnD,CAAC;IAFqB,qBAAU,aAE/B,CAAA;IAEM,KAAK,UAAU,QAAQ,CAAE,SAAiB,EAAE,UAAkB,EAAE,EAAa,EAAE,YAA2B;QAE7G,IAAI,gBAAgB,GAAa,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC;QACjD,IAAI,cAAc,GAAa,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC;QAE7C,IAAI,mBAAQ,CAAC,EAAE,CAAC,gBAAgB,EAAE,SAAS,CAAC,OAAO,CAAC,KAAK,KAAK,EAAE;YAC5D,MAAM,IAAI,KAAK,CAAC,iCAAiC,gBAAgB,OAAO,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;SAChG;QAED,IAAI,CAAE,KAAK,EAAE,GAAG,CAAE,GAAG,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAE1F,IAAI,OAAO,GAAG,EAAE,CAAC,EAAE,CAAC;QACpB,IAAI,WAAW,GAAW,EAAE,CAAC,QAAQ,CAAC,WAAW,KAAK,EAAE,CAAC,CAAC;QAC1D,IAAI,SAAS,GAAW,EAAE,CAAC,QAAQ,CAAC,WAAW,GAAG,EAAE,CAAC,CAAC;QAEtD,IAAI,CAAC,GAAG,WAAW,GAAG,SAAS,CAAC;QAChC,IAAI,gBAAgB,GAAG,WAAW,GAAG,UAAU,CAAC;QAChD,IAAI,cAAc,GAAG,CAAC,GAAG,gBAAgB,CAAC;QAC1C,IAAI,YAAY,GAAG,SAAS,GAAG,cAAc,CAAC;QAC9C,IAAI,OAAO,GAAG,uBAAU,CAAC,eAAe,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QAChE,IAAI,KAAK,GAAG,uBAAU,CAAC,eAAe,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAE9D,IAAI,SAAS,GAAG,uBAAU,CAAC,SAAS,CAAC,UAAU,EAAE,SAAS,EAAE,OAAO,IAAI,KAAK,CAAC,CAAC;QAC9E,IAAI,OAAO,GAAG,uBAAU,CAAC,SAAS,CAAC,YAAY,EAAE,OAAO,EAAE,KAAK,IAAI,OAAO,CAAC,CAAC;QAE5E,4EAA4E;QAC5E,iBAAO,CAAC,GAAG,CAAC,SAAS,SAAS,CAAC,MAAM,IAAI,UAAU,KAAK,OAAO,QAAQ,OAAO,CAAC,MAAM,KAAK,YAAY,KAAK,KAAK,aAAa,SAAS,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC,CAAC;QAE/J,OAAkB;YACd,IAAI,EAAE,EAAE,CAAC,IAAI;YACb,UAAU,EAAE,UAAU;YACtB,OAAO,EAAE,OAAO,IAAI,KAAK;YACzB,SAAS;YAET,EAAE,EAAE,EAAE,CAAC,EAAE;YACT,QAAQ,EAAE,YAAY;YACtB,KAAK,EAAE,KAAK,IAAI,OAAO;YACvB,OAAO;YAEP,GAAG,EAAE,CAAC;YAEN,IAAI,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAAC;YAE9D,IAAI,EAAE;gBACF,OAAO,EAAE,EAAE,CAAC,OAAO;gBACnB,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,SAAS;gBAC/B,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,SAAS;aAClC;SACJ,CAAC;IACN,CAAC;IAjDqB,mBAAQ,WAiD7B,CAAA;AACL,CAAC,EApHS,UAAU,KAAV,UAAU,QAoHnB"}
|
|
@@ -2,7 +2,6 @@ import di from 'a-di';
|
|
|
2
2
|
import { TokenUtils } from './utils/TokenUtils.mjs';
|
|
3
3
|
import { TokensService } from './TokensService.mjs';
|
|
4
4
|
import { $address } from '../utils/$address.mjs';
|
|
5
|
-
import { AmmV2PriceQuote } from './TokenExchanges/AmmV2PriceQuote.mjs';
|
|
6
5
|
import { $logger } from '../utils/$logger.mjs';
|
|
7
6
|
import { $require } from '../utils/$require.mjs';
|
|
8
7
|
import { ChainlinkOracle } from './TokenOracles/chainlink/ChainlinkOracle.mjs';
|
|
@@ -15,7 +14,8 @@ export class TokenPriceService {
|
|
|
15
14
|
this.oracles = [
|
|
16
15
|
{ provider: `chainlink`, oracle: new ChainlinkOracle([client]) },
|
|
17
16
|
{ provider: `1inchAggregator-${client.network}`, oracle: new SpotPriceAggregator() },
|
|
18
|
-
|
|
17
|
+
// AMMs are covered already by 1inchAggregator, so no need to add them here
|
|
18
|
+
// { provider: `ammV2`, oracle: new AmmV2PriceQuote(this.client, this.explorer) },
|
|
19
19
|
];
|
|
20
20
|
}
|
|
21
21
|
async getPrice(mix, opts) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dequanto",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.36",
|
|
4
4
|
"author": {
|
|
5
5
|
"name": "Alex Kit",
|
|
6
6
|
"email": "alex.kit@atmajs.com"
|
|
@@ -48,6 +48,7 @@
|
|
|
48
48
|
"atma-utest": "^0.21.30",
|
|
49
49
|
"dts-bundle": "^0.7.3",
|
|
50
50
|
"ethers": "^5.5.1",
|
|
51
|
+
"includejs": "^0.17.6",
|
|
51
52
|
"hardhat": "^2.19.2",
|
|
52
53
|
"shellbee": "^0.5.29",
|
|
53
54
|
"ts-nameof": "^5.0.0",
|
|
@@ -65,9 +66,9 @@
|
|
|
65
66
|
"alot": "^0.3.12",
|
|
66
67
|
"appcfg": "^0.5.4",
|
|
67
68
|
"atma-io": "^1.3.7",
|
|
69
|
+
"atma-io-middleware-yml": "^1.1.25",
|
|
68
70
|
"atma-utils": "^0.2.65",
|
|
69
71
|
"class-json": "^0.4.1",
|
|
70
|
-
"includejs": "^0.17.6",
|
|
71
72
|
"memd": "^0.3.16",
|
|
72
73
|
"ws": "^8.16.0"
|
|
73
74
|
},
|
|
@@ -61,7 +61,7 @@ export class RateLimitGuard {
|
|
|
61
61
|
let message = error.message;
|
|
62
62
|
let hasMatches = rateLimitRgx.checks.some(checkRgxMix => {
|
|
63
63
|
if (Array.isArray(checkRgxMix)) {
|
|
64
|
-
return checkRgxMix.
|
|
64
|
+
return checkRgxMix.some(rgx => rgx.test(message));
|
|
65
65
|
}
|
|
66
66
|
return checkRgxMix.test(message);
|
|
67
67
|
});
|
|
@@ -8,8 +8,6 @@ import { TokensService } from './TokensService';
|
|
|
8
8
|
import { $address } from '@dequanto/utils/$address';
|
|
9
9
|
import { TResultAsync } from '@dequanto/models/TResult';
|
|
10
10
|
import { ISwapped, ISwapPool, ISwapRouted } from './TokenExchanges/AmmBase/V2/AmmPairV2Service';
|
|
11
|
-
import { AmmV2PriceQuote } from './TokenExchanges/AmmV2PriceQuote';
|
|
12
|
-
import { $bigint } from '@dequanto/utils/$bigint';
|
|
13
11
|
import { $logger } from '@dequanto/utils/$logger';
|
|
14
12
|
import { $require } from '@dequanto/utils/$require';
|
|
15
13
|
import { IOracle } from './TokenOracles/IOracle';
|
|
@@ -47,7 +45,9 @@ export class TokenPriceService {
|
|
|
47
45
|
this.oracles = [
|
|
48
46
|
{ provider: `chainlink`, oracle: new ChainlinkOracle([ client ]) },
|
|
49
47
|
{ provider: `1inchAggregator-${client.network}`, oracle: new SpotPriceAggregator() },
|
|
50
|
-
|
|
48
|
+
|
|
49
|
+
// AMMs are covered already by 1inchAggregator, so no need to add them here
|
|
50
|
+
// { provider: `ammV2`, oracle: new AmmV2PriceQuote(this.client, this.explorer) },
|
|
51
51
|
];
|
|
52
52
|
}
|
|
53
53
|
|