@paraswap/dex-lib 2.14.7-hashflow-state-polling-dex.6 → 2.14.7-hashflow-state-polling-dex.7
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/build/dex/generic-rfq/fetch-mm-api.js +5 -5
- package/build/dex/generic-rfq/fetch-mm-api.js.map +1 -1
- package/build/dex/generic-rfq/rate-fetcher.js +5 -5
- package/build/dex/generic-rfq/rate-fetcher.js.map +1 -1
- package/build/dex/hashflow/rate-fetcher.js +4 -8
- package/build/dex/hashflow/rate-fetcher.js.map +1 -1
- package/build/lib/fetcher/fetcher.d.ts +7 -3
- package/build/lib/fetcher/fetcher.js +18 -3
- package/build/lib/fetcher/fetcher.js.map +1 -1
- package/package.json +1 -1
- package/src/dex/generic-rfq/fetch-mm-api.ts +1 -1
- package/src/dex/generic-rfq/rate-fetcher.ts +1 -1
- package/src/dex/hashflow/rate-fetcher.ts +4 -3
- package/src/lib/fetcher/fetcher.ts +23 -5
|
@@ -8,7 +8,7 @@ dotenv_1.default.config();
|
|
|
8
8
|
const web3_1 = __importDefault(require("web3"));
|
|
9
9
|
const config_1 = require("../../config");
|
|
10
10
|
const dummy_dex_helper_1 = require("../../dex-helper/dummy-dex-helper");
|
|
11
|
-
const fetcher_1 =
|
|
11
|
+
const fetcher_1 = require("../../lib/fetcher/fetcher");
|
|
12
12
|
const log4js_1 = require("../../lib/log4js");
|
|
13
13
|
const multi_wrapper_1 = require("../../lib/multi-wrapper");
|
|
14
14
|
const security_1 = require("./security");
|
|
@@ -47,7 +47,7 @@ const debug = true;
|
|
|
47
47
|
const requestWrapper = new dummy_dex_helper_1.DummyRequestWrapper();
|
|
48
48
|
const mainTokens = async () => {
|
|
49
49
|
const logger = (0, log4js_1.getLogger)('tokens');
|
|
50
|
-
const fetcher = new fetcher_1.
|
|
50
|
+
const fetcher = new fetcher_1.Fetcher(requestWrapper, {
|
|
51
51
|
info: {
|
|
52
52
|
requestOptions: configTokens.reqParams,
|
|
53
53
|
caster: (data) => {
|
|
@@ -75,7 +75,7 @@ const configPairs = {
|
|
|
75
75
|
};
|
|
76
76
|
const mainPairs = async () => {
|
|
77
77
|
const logger = (0, log4js_1.getLogger)('pairs');
|
|
78
|
-
const fetcher = new fetcher_1.
|
|
78
|
+
const fetcher = new fetcher_1.Fetcher(requestWrapper, {
|
|
79
79
|
info: {
|
|
80
80
|
requestOptions: configPairs.reqParams,
|
|
81
81
|
caster: (data) => {
|
|
@@ -103,7 +103,7 @@ const configPrices = {
|
|
|
103
103
|
};
|
|
104
104
|
const mainPrices = async () => {
|
|
105
105
|
const logger = (0, log4js_1.getLogger)('prices');
|
|
106
|
-
const fetcher = new fetcher_1.
|
|
106
|
+
const fetcher = new fetcher_1.Fetcher(requestWrapper, {
|
|
107
107
|
info: {
|
|
108
108
|
requestOptions: configPrices.reqParams,
|
|
109
109
|
caster: (data) => {
|
|
@@ -136,7 +136,7 @@ const configBlacklist = {
|
|
|
136
136
|
};
|
|
137
137
|
const mainBlacklist = async () => {
|
|
138
138
|
const logger = (0, log4js_1.getLogger)('blacklist');
|
|
139
|
-
const fetcher = new fetcher_1.
|
|
139
|
+
const fetcher = new fetcher_1.Fetcher(requestWrapper, {
|
|
140
140
|
info: {
|
|
141
141
|
requestOptions: configBlacklist.reqParams,
|
|
142
142
|
caster: (data) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch-mm-api.js","sourceRoot":"","sources":["../../../src/dex/generic-rfq/fetch-mm-api.ts"],"names":[],"mappings":";;;;;AAAA,oDAA4B;AAC5B,gBAAM,CAAC,MAAM,EAAE,CAAC;AAEhB,gDAAwB;AACxB,yCAA8C;AAC9C,wEAAwE;AAExE,
|
|
1
|
+
{"version":3,"file":"fetch-mm-api.js","sourceRoot":"","sources":["../../../src/dex/generic-rfq/fetch-mm-api.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ exports.RateFetcher = exports.reversePrice = void 0;
|
|
|
7
7
|
const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
8
8
|
const core_1 = require("@paraswap/core");
|
|
9
9
|
const bignumber_constants_1 = require("../../bignumber-constants");
|
|
10
|
-
const fetcher_1 =
|
|
10
|
+
const fetcher_1 = require("../../lib/fetcher/fetcher");
|
|
11
11
|
const utils_1 = require("./utils");
|
|
12
12
|
const validators_1 = require("./validators");
|
|
13
13
|
const security_1 = require("./security");
|
|
@@ -30,7 +30,7 @@ class RateFetcher {
|
|
|
30
30
|
this.addressToTokenMap = {};
|
|
31
31
|
this.pairs = {};
|
|
32
32
|
this.authHttp = (0, security_1.genericRFQAuthHttp)(config.pathToRemove);
|
|
33
|
-
this.tokensFetcher = new fetcher_1.
|
|
33
|
+
this.tokensFetcher = new fetcher_1.Fetcher(dexHelper.httpRequest, {
|
|
34
34
|
info: {
|
|
35
35
|
requestOptions: config.tokensConfig.reqParams,
|
|
36
36
|
caster: (data) => {
|
|
@@ -40,7 +40,7 @@ class RateFetcher {
|
|
|
40
40
|
},
|
|
41
41
|
handler: this.handleTokensResponse.bind(this),
|
|
42
42
|
}, config.tokensConfig.intervalMs, this.logger);
|
|
43
|
-
this.pairsFetcher = new fetcher_1.
|
|
43
|
+
this.pairsFetcher = new fetcher_1.Fetcher(dexHelper.httpRequest, {
|
|
44
44
|
info: {
|
|
45
45
|
requestOptions: config.pairsConfig.reqParams,
|
|
46
46
|
caster: (data) => {
|
|
@@ -50,7 +50,7 @@ class RateFetcher {
|
|
|
50
50
|
},
|
|
51
51
|
handler: this.handlePairsResponse.bind(this),
|
|
52
52
|
}, config.pairsConfig.intervalMs, this.logger);
|
|
53
|
-
this.rateFetcher = new fetcher_1.
|
|
53
|
+
this.rateFetcher = new fetcher_1.Fetcher(dexHelper.httpRequest, {
|
|
54
54
|
info: {
|
|
55
55
|
requestOptions: config.rateConfig.reqParams,
|
|
56
56
|
caster: (data) => {
|
|
@@ -61,7 +61,7 @@ class RateFetcher {
|
|
|
61
61
|
handler: this.handleRatesResponse.bind(this),
|
|
62
62
|
}, config.rateConfig.intervalMs, logger);
|
|
63
63
|
if (config.blacklistConfig) {
|
|
64
|
-
this.blackListFetcher = new fetcher_1.
|
|
64
|
+
this.blackListFetcher = new fetcher_1.Fetcher(dexHelper.httpRequest, {
|
|
65
65
|
info: {
|
|
66
66
|
requestOptions: config.blacklistConfig.reqParams,
|
|
67
67
|
caster: (data) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rate-fetcher.js","sourceRoot":"","sources":["../../../src/dex/generic-rfq/rate-fetcher.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,yCAA0C;AAC1C,mEAAiD;AAGjD,wEAAgD;AAkBhD,mCAAqC;AACrC,6CAMsB;AACtB,yCAAgD;AAChD,qDAAuD;AACvD,2DAGiC;AACjC,uCAAgD;AAEhD,MAAM,wBAAwB,GAAG,IAAI,CAAC;AAC/B,MAAM,YAAY,GAAG,CAAC,KAA8B,EAAE,EAAE,CAC7D;IACE,0BAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACxB,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;CACE,CAAC;AAJlB,QAAA,YAAY,gBAIM;AAE/B,MAAa,WAAW;IAoBtB,YACU,SAAqB,EACrB,MAAiB,EACjB,MAAc,EACd,MAAc;QAHd,cAAS,GAAT,SAAS,CAAY;QACrB,WAAM,GAAN,MAAM,CAAW;QACjB,WAAM,GAAN,MAAM,CAAQ;QACd,WAAM,GAAN,MAAM,CAAQ;QAlBhB,WAAM,GAAkC,EAAE,CAAC;QAC3C,sBAAiB,GAAkC,EAAE,CAAC;QACtD,UAAK,GAAY,EAAE,CAAC;QAkB1B,IAAI,CAAC,QAAQ,GAAG,IAAA,6BAAkB,EAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QACxD,IAAI,CAAC,aAAa,GAAG,IAAI,iBAAO,CAC9B,SAAS,CAAC,WAAW,EACrB;YACE,IAAI,EAAE;gBACJ,cAAc,EAAE,MAAM,CAAC,YAAY,CAAC,SAAS;gBAC7C,MAAM,EAAE,CAAC,IAAa,EAAE,EAAE;oBACxB,OAAO,IAAA,4BAAe,EACpB,IAAI,EACJ,oCAAuB,CACxB,CAAC;gBACJ,CAAC;gBACD,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC;aACxD;YACD,OAAO,EAAE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC;SAC9C,EACD,MAAM,CAAC,YAAY,CAAC,UAAU,EAC9B,IAAI,CAAC,MAAM,CACZ,CAAC;QAEF,IAAI,CAAC,YAAY,GAAG,IAAI,iBAAO,CAC7B,SAAS,CAAC,WAAW,EACrB;YACE,IAAI,EAAE;gBACJ,cAAc,EAAE,MAAM,CAAC,WAAW,CAAC,SAAS;gBAC5C,MAAM,EAAE,CAAC,IAAa,EAAE,EAAE;oBACxB,OAAO,IAAA,4BAAe,EAAgB,IAAI,EAAE,mCAAsB,CAAC,CAAC;gBACtE,CAAC;gBACD,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC;aACvD;YACD,OAAO,EAAE,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC;SAC7C,EACD,MAAM,CAAC,WAAW,CAAC,UAAU,EAC7B,IAAI,CAAC,MAAM,CACZ,CAAC;QAEF,IAAI,CAAC,WAAW,GAAG,IAAI,iBAAO,CAC5B,SAAS,CAAC,WAAW,EACrB;YACE,IAAI,EAAE;gBACJ,cAAc,EAAE,MAAM,CAAC,UAAU,CAAC,SAAS;gBAC3C,MAAM,EAAE,CAAC,IAAa,EAAE,EAAE;oBACxB,OAAO,IAAA,4BAAe,EAAgB,IAAI,EAAE,2BAAc,CAAC,CAAC;gBAC9D,CAAC;gBACD,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC;aACtD;YACD,OAAO,EAAE,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC;SAC7C,EACD,MAAM,CAAC,UAAU,CAAC,UAAU,EAC5B,MAAM,CACP,CAAC;QAEF,IAAI,MAAM,CAAC,eAAe,EAAE;YAC1B,IAAI,CAAC,gBAAgB,GAAG,IAAI,iBAAO,CACjC,SAAS,CAAC,WAAW,EACrB;gBACE,IAAI,EAAE;oBACJ,cAAc,EAAE,MAAM,CAAC,eAAe,CAAC,SAAS;oBAChD,MAAM,EAAE,CAAC,IAAa,EAAE,EAAE;wBACxB,OAAO,IAAA,4BAAe,EACpB,IAAI,EACJ,uCAA0B,CAC3B,CAAC;oBACJ,CAAC;oBACD,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC;iBACtD;gBACD,OAAO,EAAE,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC;aACjD,EACD,MAAM,CAAC,eAAe,CAAC,UAAU,EACjC,MAAM,CACP,CAAC;SACH;QAED,IAAI,CAAC,iBAAiB,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,YAAY,CAAC;QAC1F,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE;YACrC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;SACtE;IACH,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,UAAU,GAAG,MAAM,IAAA,yBAAiB,EACxC,IAAI,CAAC,SAAS,CAAC,YAAY,EAC3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAClB,CAAC;QACF,IAAI,UAAU,EAAE;YACd,IAAI,CAAC,gBAAgB,GAAG,IAAA,qCAAqB,EAC3C,IAAI,CAAC,SAAS,CAAC,YAAY,EAC3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAClB,CAAC;SACH;IACH,CAAC;IAED,KAAK;QACH,IAAI,CAAC,aAAa,CAAC,YAAY,EAAE,CAAC;QAClC,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC;QACjC,IAAI,IAAI,CAAC,gBAAgB,EAAE;YACzB,IAAI,CAAC,gBAAgB,CAAC,YAAY,EAAE,CAAC;SACtC;IACH,CAAC;IAED,IAAI;QACF,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC;QACjC,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;QAChC,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC;QAE/B,IAAI,IAAI,CAAC,gBAAgB,EAAE;YACzB,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE,CAAC;SACrC;IACH,CAAC;IAEO,oBAAoB,CAAC,IAAoB;QAC/C,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YAChD,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACrC,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;YAC5C,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC;SAChC;QAED,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YACpE,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC7B,IAAI,CAAC,GAAG,EAAE;gBACR,OAAO,GAAG,CAAC;aACZ;YACD,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,GAAG,GAAG,CAAC;YACrC,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,EAAmC,CAAC,CAAC;IAC1C,CAAC;IAEO,mBAAmB,CAAC,IAAmB;QAC7C,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;QAEhB,IAAI,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,EAAE;YAChC,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC;SAChC;QAED,MAAM,KAAK,GAAY,EAAE,CAAC;QAC1B,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;YAC9C,KAAK,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;SACxC;QAED,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC;IAClC,CAAC;IAEO,uBAAuB,CAAC,IAAuB;QACrD,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,SAAS,EAAE;YACpC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;SAC1E;IACH,CAAC;IAEM,aAAa,CAAC,WAAmB;QACtC,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,SAAS,CACnC,IAAI,CAAC,iBAAiB,EACtB,WAAW,CAAC,WAAW,EAAE,CAC1B,CAAC;IACJ,CAAC;IAEO,mBAAmB,CAAC,IAAmB;QAC7C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACzB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YAC1C,MAAM,IAAI,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC;YAC7B,IAAI,CAAC,IAAI,EAAE;gBACT,OAAO;aACR;YACD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAErC,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE;gBAChC,OAAO;aACR;YAED,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACzC,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAE3C,IAAI,CAAC,SAAS,IAAI,CAAC,UAAU,EAAE;gBAC7B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;gBAChD,OAAO;aACR;YAED,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE;gBACtB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CACxB,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAClC,GAAG,SAAS,CAAC,OAAO,IAAI,UAAU,CAAC,OAAO,OAAO,EACjD,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,EAC/B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAC5B,CAAC;aACH;YAED,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE;gBACtB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CACxB,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAClC,GAAG,SAAS,CAAC,OAAO,IAAI,UAAU,CAAC,OAAO,OAAO,EACjD,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,EAC/B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAC5B,CAAC;aACH;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,WAAW;QACT,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,IAAI,CAChD,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,kBAAkB,CAC1B,CAAC;IACJ,CAAC;IAEM,iBAAiB,CAAC,YAAoB;QAC3C,MAAM,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;QAEnD,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1C,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAExC,OAAO,KAAK;aACT,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAO,CAAC,CAAC;aAC9D,GAAG,CAAC,CAAC,CAAC,EAAE;YACP,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YACtC,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YACxC,IAAI,cAAiC,CAAC;YACtC,IAAI,SAAS,CAAC,OAAO,KAAK,YAAY,EAAE;gBACtC,cAAc,GAAG;oBACf,OAAO,EAAE,SAAS,CAAC,OAAO;oBAC1B,QAAQ,EAAE,SAAS,CAAC,QAAQ;iBAC7B,CAAC;aACH;iBAAM;gBACL,cAAc,GAAG;oBACf,OAAO,EAAE,UAAU,CAAC,OAAO;oBAC3B,QAAQ,EAAE,UAAU,CAAC,QAAQ;iBAC9B,CAAC;aACH;YACD,OAAO;gBACL,eAAe,EAAE,CAAC,cAAc,CAAC;gBACjC,YAAY,EAAE,CAAC,CAAC,YAAY;aAC7B,CAAC;QACJ,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,KAAK,CAAC,aAAa,CACxB,QAAe,EACf,SAAgB,EAChB,IAAc;QAEd,IAAI,QAAQ,GAAG,KAAK,CAAC;QAErB,IAAI,cAAc,GAAkB,IAAI,CAAC;QACzC,IAAI,IAAI,KAAK,eAAQ,CAAC,IAAI,EAAE;YAC1B,cAAc,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAC7C,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAClC,GAAG,QAAQ,CAAC,OAAO,IAAI,SAAS,CAAC,OAAO,OAAO,CAChD,CAAC;YAEF,IAAI,CAAC,cAAc,EAAE;gBACnB,cAAc,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAC7C,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAClC,GAAG,SAAS,CAAC,OAAO,IAAI,QAAQ,CAAC,OAAO,OAAO,CAChD,CAAC;gBACF,QAAQ,GAAG,IAAI,CAAC;aACjB;SACF;aAAM;YACL,cAAc,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAC7C,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAClC,GAAG,SAAS,CAAC,OAAO,IAAI,QAAQ,CAAC,OAAO,OAAO,CAChD,CAAC;YAEF,IAAI,CAAC,cAAc,EAAE;gBACnB,cAAc,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAC7C,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAClC,GAAG,QAAQ,CAAC,OAAO,IAAI,SAAS,CAAC,OAAO,OAAO,CAChD,CAAC;gBACF,QAAQ,GAAG,IAAI,CAAC;aACjB;SACF;QAED,IAAI,CAAC,cAAc,EAAE;YACnB,OAAO,IAAI,CAAC;SACb;QAED,MAAM,mBAAmB,GAAqB,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QACzE,IAAI,CAAC,mBAAmB,EAAE;YACxB,OAAO,IAAI,CAAC;SACb;QAED,IAAI,WAAW,GAAG,mBAAmB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YACjD,IAAI,sBAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACvB,IAAI,sBAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SACxB,CAAC,CAAC;QAEH,IAAI,QAAQ,EAAE;YACZ,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CACpC,IAAA,oBAAY,EAAC,KAAgC,CAAC,CAC/C,CAAC;SACH;QAED,OAAO,WAAwC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,WAAW,CACf,SAAgB,EAChB,UAAiB,EACjB,SAAiB,EACjB,IAAc,EACd,WAAoB;QAEpB,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC1D,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAE5D,IAAI,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,EAAE;YAC5B,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;SAC3D;QAED,MAAM,QAAQ,GAAe;YAC3B,UAAU,EAAE,SAAS,CAAC,OAAO;YAC7B,UAAU,EAAE,QAAQ,CAAC,OAAO;YAC5B,WAAW,EAAE,IAAI,KAAK,eAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;YAC1D,WAAW,EAAE,IAAI,KAAK,eAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;YAC3D,WAAW;SACZ,CAAC;QAEF,IAAI;YACF,IAAI,OAAO,GAAG;gBACZ,IAAI,EAAE,QAAQ;gBACd,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc;gBAC7B,OAAO,EAAE,wBAAwB;aAClC,CAAC;YAEF,IAAI,IAAI,CAAC,YAAY,EAAE;gBACrB,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gBAC3B,OAAO,OAAO,CAAC,MAAM,CAAC;aACvB;YAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;YAC/C,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,OAAO,CACvD,OAAO,CACR,CAAC;YACF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qBAAqB,EAAE,IAAI,CAAC,CAAC;YAE9C,MAAM,YAAY,GAAG,IAAA,4BAAe,EAClC,IAAI,EACJ,sCAAyB,CAC1B,CAAC;YAEF,MAAM,IAAA,kBAAU,EACd,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAClC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,EAC7C,IAAI,CAAC,SAAS,CAAC,YAAY,EAC3B,YAAY,CAAC,KAAK,EAClB,IAAI,CAAC,gBAAgB,CACtB,CAAC;YAEF,OAAO;gBACL,KAAK,EAAE;oBACL,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC,KAAK;oBAC/B,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC,KAAK;oBAC/B,MAAM,EAAE,YAAY,CAAC,KAAK,CAAC,MAAM;oBACjC,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC,YAAY;oBAC7C,UAAU,EAAE,YAAY,CAAC,KAAK,CAAC,UAAU;oBACzC,UAAU,EAAE,YAAY,CAAC,KAAK,CAAC,UAAU;oBACzC,WAAW,EAAE,YAAY,CAAC,KAAK,CAAC,WAAW;oBAC3C,WAAW,EAAE,YAAY,CAAC,KAAK,CAAC,WAAW;iBAC5C;gBACD,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC,SAAS;gBACvC,oBAAoB,EAAE,YAAY,CAAC,KAAK,CAAC,WAAW;gBACpD,gBAAgB,EAAE,IAAI;gBACtB,gBAAgB,EAAE,IAAI;aACvB,CAAC;SACH;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACrB,MAAM,CAAC,CAAC;SACT;IACH,CAAC;CACF;AA9YD,kCA8YC"}
|
|
1
|
+
{"version":3,"file":"rate-fetcher.js","sourceRoot":"","sources":["../../../src/dex/generic-rfq/rate-fetcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.RateFetcher = void 0;
|
|
7
|
-
const fetcher_1 =
|
|
4
|
+
const fetcher_1 = require("../../lib/fetcher/fetcher");
|
|
8
5
|
const validators_1 = require("../../lib/validators");
|
|
9
6
|
const validators_2 = require("./validators");
|
|
10
7
|
class RateFetcher {
|
|
@@ -17,7 +14,7 @@ class RateFetcher {
|
|
|
17
14
|
this.pricesCacheTTL = config.rateConfig.pricesCacheTTLSecs;
|
|
18
15
|
this.marketMakersCacheKey = config.rateConfig.marketMakersCacheKey;
|
|
19
16
|
this.marketMakersCacheTTL = config.rateConfig.marketMakersCacheTTLSecs;
|
|
20
|
-
this.marketMakersFetcher = new fetcher_1.
|
|
17
|
+
this.marketMakersFetcher = new fetcher_1.Fetcher(dexHelper.httpRequest, {
|
|
21
18
|
info: {
|
|
22
19
|
requestOptions: config.rateConfig.marketMakersReqParams,
|
|
23
20
|
caster: (data) => {
|
|
@@ -26,7 +23,7 @@ class RateFetcher {
|
|
|
26
23
|
},
|
|
27
24
|
handler: this.handleMarketMakersResponse.bind(this),
|
|
28
25
|
}, config.rateConfig.markerMakersIntervalMs, logger);
|
|
29
|
-
this.rateFetcher = new fetcher_1.
|
|
26
|
+
this.rateFetcher = new fetcher_1.Fetcher(dexHelper.httpRequest, {
|
|
30
27
|
info: {
|
|
31
28
|
requestOptions: config.rateConfig.pricesReqParams,
|
|
32
29
|
requestFunc: async (options) => {
|
|
@@ -34,8 +31,7 @@ class RateFetcher {
|
|
|
34
31
|
const cachedMarketMakers = (await getCachedMarketMakers()) || [];
|
|
35
32
|
const filteredMarketMakers = await filterMarketMakers(cachedMarketMakers);
|
|
36
33
|
if (filteredMarketMakers.length === 0) {
|
|
37
|
-
|
|
38
|
-
return;
|
|
34
|
+
return new fetcher_1.SkippingRequest(`${dexKey}-${network}: got ${filteredMarketMakers.length} market makers.`);
|
|
39
35
|
}
|
|
40
36
|
const prices = await dexHelper.httpRequest.request({
|
|
41
37
|
...options,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rate-fetcher.js","sourceRoot":"","sources":["../../../src/dex/hashflow/rate-fetcher.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"rate-fetcher.js","sourceRoot":"","sources":["../../../src/dex/hashflow/rate-fetcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,12 @@
|
|
|
1
1
|
import { IRequestWrapper } from '../../dex-helper';
|
|
2
2
|
import { Logger } from 'log4js';
|
|
3
|
-
import { RequestConfig } from '../../dex-helper/irequest-wrapper';
|
|
3
|
+
import { RequestConfig, Response } from '../../dex-helper/irequest-wrapper';
|
|
4
|
+
export declare class SkippingRequest {
|
|
5
|
+
message: string;
|
|
6
|
+
constructor(message?: string);
|
|
7
|
+
}
|
|
4
8
|
export declare type RequestInfo<T> = {
|
|
5
|
-
requestFunc?: (options: RequestConfig) => Promise<
|
|
9
|
+
requestFunc?: (options: RequestConfig) => Promise<Response<T> | SkippingRequest>;
|
|
6
10
|
requestOptions: RequestConfig;
|
|
7
11
|
caster: (data: unknown) => T;
|
|
8
12
|
authenticate?: (options: RequestConfig) => RequestConfig;
|
|
@@ -12,7 +16,7 @@ export declare type RequestInfoWithHandler<T> = {
|
|
|
12
16
|
info: RequestInfo<T>;
|
|
13
17
|
handler: (data: T) => void;
|
|
14
18
|
};
|
|
15
|
-
export
|
|
19
|
+
export declare class Fetcher<T> {
|
|
16
20
|
private requestWrapper;
|
|
17
21
|
private pollIntervalMs;
|
|
18
22
|
private logger;
|
|
@@ -1,9 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.Fetcher = exports.SkippingRequest = void 0;
|
|
3
4
|
const lodash_1 = require("lodash");
|
|
4
5
|
const FETCH_TIMEOUT_MS = 10 * 1000;
|
|
5
6
|
const FETCH_FAIL_MAX_ATTEMPT = 5;
|
|
6
7
|
const FETCH_FAIL_RETRY_TIMEOUT_MS = 60 * 1000;
|
|
8
|
+
class SkippingRequest {
|
|
9
|
+
constructor(message = '') {
|
|
10
|
+
this.message = message;
|
|
11
|
+
}
|
|
12
|
+
}
|
|
13
|
+
exports.SkippingRequest = SkippingRequest;
|
|
14
|
+
;
|
|
7
15
|
class Fetcher {
|
|
8
16
|
constructor(requestWrapper, requestsInfo, pollIntervalMs, logger) {
|
|
9
17
|
this.requestWrapper = requestWrapper;
|
|
@@ -61,13 +69,20 @@ class Fetcher {
|
|
|
61
69
|
const failures = results
|
|
62
70
|
.map((_, i) => i)
|
|
63
71
|
.filter(i => results[i] instanceof Error);
|
|
72
|
+
const skipped = results
|
|
73
|
+
.map((_, i) => i)
|
|
74
|
+
.filter(i => results[i] instanceof SkippingRequest);
|
|
64
75
|
results.map(result => {
|
|
65
|
-
if (!(result instanceof Error)) {
|
|
76
|
+
if (!(result instanceof Error || result instanceof SkippingRequest)) {
|
|
66
77
|
this.logger.info('Results Data:', JSON.stringify(result.data)
|
|
67
78
|
.replace(/(?:\r\n|\r|\n)/g, ' ')
|
|
68
79
|
.substring(0, 1000));
|
|
69
80
|
}
|
|
70
81
|
});
|
|
82
|
+
skipped.forEach(i => {
|
|
83
|
+
const skippedRes = results[i];
|
|
84
|
+
this.logger.warn(`skipped request ${this.requests[i].info.requestOptions.url} ${skippedRes.message}`);
|
|
85
|
+
});
|
|
71
86
|
failures.forEach(i => {
|
|
72
87
|
this.logger.warn(`failed polling ${this.requests[i].info.requestOptions.url} ${results[i]}`);
|
|
73
88
|
});
|
|
@@ -80,7 +95,7 @@ class Fetcher {
|
|
|
80
95
|
}
|
|
81
96
|
results
|
|
82
97
|
.map((_, i) => i)
|
|
83
|
-
.filter(i => !(results[i] instanceof Error))
|
|
98
|
+
.filter(i => !(results[i] instanceof Error || results[i] instanceof SkippingRequest))
|
|
84
99
|
.forEach(i => {
|
|
85
100
|
const response = results[i];
|
|
86
101
|
const reqInfo = this.requests[i];
|
|
@@ -115,5 +130,5 @@ class Fetcher {
|
|
|
115
130
|
return !this.stop;
|
|
116
131
|
}
|
|
117
132
|
}
|
|
118
|
-
exports.
|
|
133
|
+
exports.Fetcher = Fetcher;
|
|
119
134
|
//# sourceMappingURL=fetcher.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetcher.js","sourceRoot":"","sources":["../../../src/lib/fetcher/fetcher.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"fetcher.js","sourceRoot":"","sources":["../../../src/lib/fetcher/fetcher.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -5,7 +5,7 @@ import Web3 from 'web3';
|
|
|
5
5
|
import { generateConfig } from '../../config';
|
|
6
6
|
import { DummyRequestWrapper } from '../../dex-helper/dummy-dex-helper';
|
|
7
7
|
import { RequestConfig } from '../../dex-helper/irequest-wrapper';
|
|
8
|
-
import Fetcher from '../../lib/fetcher/fetcher';
|
|
8
|
+
import { Fetcher } from '../../lib/fetcher/fetcher';
|
|
9
9
|
import { getLogger } from '../../lib/log4js';
|
|
10
10
|
import { MultiWrapper } from '../../lib/multi-wrapper';
|
|
11
11
|
import { genericRFQAuthHttp } from './security';
|
|
@@ -3,7 +3,7 @@ import { SwapSide } from '@paraswap/core';
|
|
|
3
3
|
import { BN_1 } from '../../bignumber-constants';
|
|
4
4
|
import { IDexHelper } from '../../dex-helper';
|
|
5
5
|
import { RequestConfig } from '../../dex-helper/irequest-wrapper';
|
|
6
|
-
import Fetcher from '../../lib/fetcher/fetcher';
|
|
6
|
+
import { Fetcher } from '../../lib/fetcher/fetcher';
|
|
7
7
|
|
|
8
8
|
import { Logger, Address, Token } from '../../types';
|
|
9
9
|
import { OrderInfo } from '../paraswap-limit-orders/types';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { IDexHelper } from '../../dex-helper';
|
|
2
|
-
import Fetcher from '../../lib/fetcher/fetcher';
|
|
2
|
+
import { Fetcher, SkippingRequest } from '../../lib/fetcher/fetcher';
|
|
3
3
|
import { validateAndCast } from '../../lib/validators';
|
|
4
4
|
import { Logger } from '../../types';
|
|
5
5
|
import {
|
|
@@ -64,8 +64,9 @@ export class RateFetcher {
|
|
|
64
64
|
);
|
|
65
65
|
|
|
66
66
|
if (filteredMarketMakers.length === 0) {
|
|
67
|
-
|
|
68
|
-
|
|
67
|
+
return new SkippingRequest(
|
|
68
|
+
`${dexKey}-${network}: got ${filteredMarketMakers.length} market makers.`,
|
|
69
|
+
);
|
|
69
70
|
}
|
|
70
71
|
|
|
71
72
|
const prices = await dexHelper.httpRequest.request({
|
|
@@ -7,8 +7,14 @@ const FETCH_TIMEOUT_MS = 10 * 1000;
|
|
|
7
7
|
const FETCH_FAIL_MAX_ATTEMPT = 5;
|
|
8
8
|
const FETCH_FAIL_RETRY_TIMEOUT_MS = 60 * 1000;
|
|
9
9
|
|
|
10
|
+
export class SkippingRequest {
|
|
11
|
+
constructor(
|
|
12
|
+
public message = '',
|
|
13
|
+
) {}
|
|
14
|
+
};
|
|
15
|
+
|
|
10
16
|
export type RequestInfo<T> = {
|
|
11
|
-
requestFunc?: (options: RequestConfig) => Promise<
|
|
17
|
+
requestFunc?: (options: RequestConfig) => Promise<Response<T> | SkippingRequest>;
|
|
12
18
|
requestOptions: RequestConfig;
|
|
13
19
|
caster: (data: unknown) => T;
|
|
14
20
|
authenticate?: (options: RequestConfig) => RequestConfig;
|
|
@@ -20,7 +26,7 @@ export type RequestInfoWithHandler<T> = {
|
|
|
20
26
|
handler: (data: T) => void;
|
|
21
27
|
};
|
|
22
28
|
|
|
23
|
-
export
|
|
29
|
+
export class Fetcher<T> {
|
|
24
30
|
private requests: RequestInfoWithHandler<T>[];
|
|
25
31
|
public lastFetchSucceeded: boolean = false;
|
|
26
32
|
private failedCount = 0;
|
|
@@ -54,7 +60,7 @@ export default class Fetcher<T> {
|
|
|
54
60
|
return;
|
|
55
61
|
}
|
|
56
62
|
|
|
57
|
-
const promises = this.requests.map<Promise<Error | Response<T
|
|
63
|
+
const promises = this.requests.map<Promise<Error | Response<T> | SkippingRequest>>(
|
|
58
64
|
async (reqInfo: RequestInfoWithHandler<T>) => {
|
|
59
65
|
const info = reqInfo.info;
|
|
60
66
|
let options = info.requestOptions;
|
|
@@ -88,8 +94,12 @@ export default class Fetcher<T> {
|
|
|
88
94
|
.map((_, i) => i)
|
|
89
95
|
.filter(i => results[i] instanceof Error);
|
|
90
96
|
|
|
97
|
+
const skipped = results
|
|
98
|
+
.map((_, i) => i)
|
|
99
|
+
.filter(i => results[i] instanceof SkippingRequest);
|
|
100
|
+
|
|
91
101
|
results.map(result => {
|
|
92
|
-
if(!(result instanceof Error)) {
|
|
102
|
+
if(!(result instanceof Error || result instanceof SkippingRequest)) {
|
|
93
103
|
this.logger.info(
|
|
94
104
|
'Results Data:',
|
|
95
105
|
JSON.stringify((result as any).data)
|
|
@@ -98,6 +108,14 @@ export default class Fetcher<T> {
|
|
|
98
108
|
);
|
|
99
109
|
}
|
|
100
110
|
});
|
|
111
|
+
|
|
112
|
+
skipped.forEach(i => {
|
|
113
|
+
const skippedRes = results[i] as SkippingRequest;
|
|
114
|
+
this.logger.warn(
|
|
115
|
+
`skipped request ${this.requests[i].info.requestOptions.url} ${skippedRes.message}`,
|
|
116
|
+
);
|
|
117
|
+
});
|
|
118
|
+
|
|
101
119
|
failures.forEach(i => {
|
|
102
120
|
this.logger.warn(
|
|
103
121
|
`failed polling ${this.requests[i].info.requestOptions.url} ${results[i]}`,
|
|
@@ -113,7 +131,7 @@ export default class Fetcher<T> {
|
|
|
113
131
|
|
|
114
132
|
results
|
|
115
133
|
.map((_, i) => i)
|
|
116
|
-
.filter(i => !(results[i] instanceof Error))
|
|
134
|
+
.filter(i => !(results[i] instanceof Error || results[i] instanceof SkippingRequest))
|
|
117
135
|
.forEach(i => {
|
|
118
136
|
const response = results[i] as Response<T>;
|
|
119
137
|
const reqInfo = this.requests[i];
|