@paraswap/dex-lib 2.42.33-back-1411-rfq-dynamic-taker.0 → 2.43.0
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 +2 -2
- package/build/dex/generic-rfq/fetch-mm-api.js.map +1 -1
- package/build/dex/generic-rfq/validators.js +2 -2
- package/build/dex/generic-rfq/validators.js.map +1 -1
- package/package.json +1 -1
- package/src/dex/generic-rfq/fetch-mm-api.ts +2 -2
- package/src/dex/generic-rfq/validators.ts +2 -2
|
@@ -17,7 +17,7 @@ const multi_v2_json_1 = __importDefault(require("../../abi/multi-v2.json"));
|
|
|
17
17
|
const utils_1 = require("./utils");
|
|
18
18
|
const validators_2 = require("../../lib/validators");
|
|
19
19
|
const network = 1;
|
|
20
|
-
const
|
|
20
|
+
const AugustusAddress = {
|
|
21
21
|
1: '0xdef171fe48cf0115b1d80b88dc8eab59176fee57',
|
|
22
22
|
};
|
|
23
23
|
const getEnv = (envName) => {
|
|
@@ -185,7 +185,7 @@ const mainFirm = async () => {
|
|
|
185
185
|
try {
|
|
186
186
|
const res = await requestWrapper.request(payload);
|
|
187
187
|
const firmRateResp = (0, validators_2.validateAndCast)(res, validators_1.firmRateResponseValidator);
|
|
188
|
-
await (0, utils_1.checkOrder)(network, config.multicallV2Address, multiWrapper,
|
|
188
|
+
await (0, utils_1.checkOrder)(network, config.multicallV2Address, multiWrapper, AugustusAddress[network], firmRateResp.order);
|
|
189
189
|
logger.info(res.data);
|
|
190
190
|
}
|
|
191
191
|
catch (e) {
|
|
@@ -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,uDAAoD;AACpD,6CAA6C;AAC7C,2DAAuD;AACvD,yCAAgD;AAShD,6CAMsB;AACtB,4EAAiD;AAEjD,mCAAqC;AACrC,qDAAuD;AAEvD,MAAM,OAAO,GAAG,CAAC,CAAC;AAElB,MAAM,
|
|
1
|
+
{"version":3,"file":"fetch-mm-api.js","sourceRoot":"","sources":["../../../src/dex/generic-rfq/fetch-mm-api.ts"],"names":[],"mappings":"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"}
|
|
@@ -135,7 +135,7 @@ const stringStartWithHex0x = (value, helpers) => {
|
|
|
135
135
|
}
|
|
136
136
|
return value;
|
|
137
137
|
};
|
|
138
|
-
const
|
|
138
|
+
const mustBeAllowedTaker = (value, helpers) => {
|
|
139
139
|
const allowedTakers = [
|
|
140
140
|
'0xDEF171Fe48CF0115B1d80b88dc8eAB59176FEe57'.toLowerCase(),
|
|
141
141
|
];
|
|
@@ -150,7 +150,7 @@ exports.orderWithSignatureValidator = joi_1.default
|
|
|
150
150
|
nonceAndMeta: joi_1.default.string().custom(stringPositiveBigIntValidator),
|
|
151
151
|
expiry: joi_1.default.number().min(0),
|
|
152
152
|
maker: exports.addressSchema.required(),
|
|
153
|
-
taker: exports.addressSchema.required().custom(
|
|
153
|
+
taker: exports.addressSchema.required().custom(mustBeAllowedTaker),
|
|
154
154
|
makerAsset: exports.addressSchema.required(),
|
|
155
155
|
takerAsset: exports.addressSchema.required(),
|
|
156
156
|
makerAmount: joi_1.default
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../../src/dex/generic-rfq/validators.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../../src/dex/generic-rfq/validators.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -31,7 +31,7 @@ import { validateAndCast } from '../../lib/validators';
|
|
|
31
31
|
|
|
32
32
|
const network = 1;
|
|
33
33
|
|
|
34
|
-
const
|
|
34
|
+
const AugustusAddress = {
|
|
35
35
|
1: '0xdef171fe48cf0115b1d80b88dc8eab59176fee57',
|
|
36
36
|
};
|
|
37
37
|
|
|
@@ -273,7 +273,7 @@ const mainFirm = async () => {
|
|
|
273
273
|
network,
|
|
274
274
|
config.multicallV2Address,
|
|
275
275
|
multiWrapper,
|
|
276
|
-
|
|
276
|
+
AugustusAddress[network],
|
|
277
277
|
firmRateResp.order,
|
|
278
278
|
);
|
|
279
279
|
|
|
@@ -149,7 +149,7 @@ const stringStartWithHex0x = (
|
|
|
149
149
|
return value;
|
|
150
150
|
};
|
|
151
151
|
|
|
152
|
-
const
|
|
152
|
+
const mustBeAllowedTaker = (
|
|
153
153
|
value: string,
|
|
154
154
|
helpers: CustomHelpers,
|
|
155
155
|
): string | ErrorReport => {
|
|
@@ -168,7 +168,7 @@ export const orderWithSignatureValidator = joi
|
|
|
168
168
|
nonceAndMeta: joi.string().custom(stringPositiveBigIntValidator),
|
|
169
169
|
expiry: joi.number().min(0),
|
|
170
170
|
maker: addressSchema.required(),
|
|
171
|
-
taker: addressSchema.required().custom(
|
|
171
|
+
taker: addressSchema.required().custom(mustBeAllowedTaker),
|
|
172
172
|
makerAsset: addressSchema.required(),
|
|
173
173
|
takerAsset: addressSchema.required(),
|
|
174
174
|
makerAmount: joi
|