@1inch/fusion-sdk 2.1.8-rc.0 → 2.1.9
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/README.md +2 -2
- package/dist/cjs/amount-calculator/amount-calculator.js +42 -0
- package/dist/cjs/amount-calculator/amount-calculator.js.map +1 -0
- package/dist/cjs/{auction-calculator → amount-calculator/auction-calculator}/auction-calculator.js +16 -17
- package/dist/cjs/amount-calculator/auction-calculator/auction-calculator.js.map +1 -0
- package/dist/cjs/{auction-calculator → amount-calculator/auction-calculator}/index.js +0 -1
- package/dist/cjs/amount-calculator/auction-calculator/index.js.map +1 -0
- package/dist/cjs/api/orders/orders.api.js.map +1 -1
- package/dist/cjs/api/orders/orders.request.js.map +1 -1
- package/dist/cjs/api/orders/types.js +1 -1
- package/dist/cjs/api/orders/types.js.map +1 -1
- package/dist/cjs/api/pagination.js.map +1 -1
- package/dist/cjs/api/params.js +1 -2
- package/dist/cjs/api/params.js.map +1 -1
- package/dist/cjs/api/quoter/quote/order-params.js.map +1 -1
- package/dist/cjs/api/quoter/quote/quote.js +8 -17
- package/dist/cjs/api/quoter/quote/quote.js.map +1 -1
- package/dist/cjs/api/quoter/quoter-custom-preset.request.js +1 -1
- package/dist/cjs/api/quoter/quoter-custom-preset.request.js.map +1 -1
- package/dist/cjs/api/quoter/quoter.api.js.map +1 -1
- package/dist/cjs/api/quoter/quoter.request.js.map +1 -1
- package/dist/cjs/api/quoter/types.js +1 -1
- package/dist/cjs/api/quoter/types.js.map +1 -1
- package/dist/cjs/connector/http/axios-provider.connector.js.map +1 -1
- package/dist/cjs/connector/ws/websocket-client.connector.js.map +1 -1
- package/dist/cjs/constants.js +1 -2
- package/dist/cjs/constants.js.map +1 -1
- package/dist/cjs/fusion-order/auction-details/auction-details.js +18 -10
- package/dist/cjs/fusion-order/auction-details/auction-details.js.map +1 -1
- package/dist/cjs/fusion-order/constants.js +1 -2
- package/dist/cjs/fusion-order/constants.js.map +1 -1
- package/dist/cjs/fusion-order/fusion-extension.js +114 -18
- package/dist/cjs/fusion-order/fusion-extension.js.map +1 -1
- package/dist/cjs/fusion-order/fusion-order.js +42 -34
- package/dist/cjs/fusion-order/fusion-order.js.map +1 -1
- package/dist/cjs/fusion-order/index.js +4 -2
- package/dist/cjs/fusion-order/index.js.map +1 -1
- package/dist/cjs/fusion-order/source-track.js +1 -2
- package/dist/cjs/fusion-order/source-track.js.map +1 -1
- package/dist/cjs/fusion-order/whitelist/index.js +5 -0
- package/dist/cjs/fusion-order/whitelist/index.js.map +1 -0
- package/dist/cjs/fusion-order/whitelist/types.js.map +1 -0
- package/dist/cjs/fusion-order/whitelist/whitelist.js +118 -0
- package/dist/cjs/fusion-order/whitelist/whitelist.js.map +1 -0
- package/dist/cjs/index.js +1 -1
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/sdk/encoders/cancel-order.encoder.js +1 -2
- package/dist/cjs/sdk/encoders/cancel-order.encoder.js.map +1 -1
- package/dist/cjs/sdk/sdk.js.map +1 -1
- package/dist/cjs/sdk/utils.js +2 -3
- package/dist/cjs/sdk/utils.js.map +1 -1
- package/dist/cjs/tsconfig.cjs.tsbuildinfo +1 -1
- package/dist/cjs/utils/amounts.js +2 -3
- package/dist/cjs/utils/amounts.js.map +1 -1
- package/dist/cjs/utils/time.js +1 -2
- package/dist/cjs/utils/time.js.map +1 -1
- package/dist/cjs/utils/types.js +3 -0
- package/dist/cjs/utils/types.js.map +1 -0
- package/dist/cjs/utils.js +2 -3
- package/dist/cjs/utils.js.map +1 -1
- package/dist/cjs/validations.js +5 -6
- package/dist/cjs/validations.js.map +1 -1
- package/dist/cjs/ws-api/active-websocket-orders-api.js.map +1 -1
- package/dist/cjs/ws-api/rpc-websocket-api.js.map +1 -1
- package/dist/cjs/ws-api/url.js +1 -2
- package/dist/cjs/ws-api/url.js.map +1 -1
- package/dist/cjs/ws-api/ws-api.js.map +1 -1
- package/dist/esm/amount-calculator/amount-calculator.js +38 -0
- package/dist/esm/amount-calculator/amount-calculator.js.map +1 -0
- package/dist/esm/{auction-calculator → amount-calculator/auction-calculator}/auction-calculator.js +16 -17
- package/dist/esm/amount-calculator/auction-calculator/auction-calculator.js.map +1 -0
- package/dist/esm/amount-calculator/auction-calculator/index.js +2 -0
- package/dist/esm/amount-calculator/auction-calculator/index.js.map +1 -0
- package/dist/esm/api/orders/orders.api.js.map +1 -1
- package/dist/esm/api/orders/orders.request.js.map +1 -1
- package/dist/esm/api/pagination.js.map +1 -1
- package/dist/esm/api/params.js.map +1 -1
- package/dist/esm/api/quoter/quote/order-params.js.map +1 -1
- package/dist/esm/api/quoter/quote/quote.js +9 -18
- package/dist/esm/api/quoter/quote/quote.js.map +1 -1
- package/dist/esm/api/quoter/quoter-custom-preset.request.js +1 -1
- package/dist/esm/api/quoter/quoter-custom-preset.request.js.map +1 -1
- package/dist/esm/api/quoter/quoter.api.js.map +1 -1
- package/dist/esm/api/quoter/quoter.request.js.map +1 -1
- package/dist/esm/connector/http/axios-provider.connector.js.map +1 -1
- package/dist/esm/connector/ws/websocket-client.connector.js.map +1 -1
- package/dist/esm/constants.js +0 -1
- package/dist/esm/constants.js.map +1 -1
- package/dist/esm/fusion-order/auction-details/auction-details.js +19 -11
- package/dist/esm/fusion-order/auction-details/auction-details.js.map +1 -1
- package/dist/esm/fusion-order/constants.js +1 -2
- package/dist/esm/fusion-order/constants.js.map +1 -1
- package/dist/esm/fusion-order/fusion-extension.js +115 -19
- package/dist/esm/fusion-order/fusion-extension.js.map +1 -1
- package/dist/esm/fusion-order/fusion-order.js +42 -34
- package/dist/esm/fusion-order/fusion-order.js.map +1 -1
- package/dist/esm/fusion-order/index.js +2 -1
- package/dist/esm/fusion-order/index.js.map +1 -1
- package/dist/esm/fusion-order/source-track.js.map +1 -1
- package/dist/esm/fusion-order/whitelist/index.js +2 -0
- package/dist/esm/fusion-order/whitelist/index.js.map +1 -0
- package/dist/esm/fusion-order/whitelist/types.js.map +1 -0
- package/dist/esm/fusion-order/whitelist/whitelist.js +113 -0
- package/dist/esm/fusion-order/whitelist/whitelist.js.map +1 -0
- package/dist/esm/index.js +1 -1
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/sdk/sdk.js.map +1 -1
- package/dist/esm/sdk/utils.js.map +1 -1
- package/dist/esm/tsconfig.esm.tsbuildinfo +1 -1
- package/dist/esm/utils/types.js +2 -0
- package/dist/esm/utils/types.js.map +1 -0
- package/dist/esm/utils.js.map +1 -1
- package/dist/esm/validations.js +1 -1
- package/dist/esm/validations.js.map +1 -1
- package/dist/esm/ws-api/active-websocket-orders-api.js.map +1 -1
- package/dist/esm/ws-api/rpc-websocket-api.js.map +1 -1
- package/dist/esm/ws-api/url.js.map +1 -1
- package/dist/esm/ws-api/ws-api.js.map +1 -1
- package/dist/types/src/amount-calculator/amount-calculator.d.ts +16 -0
- package/dist/types/src/{auction-calculator → amount-calculator/auction-calculator}/auction-calculator.d.ts +6 -6
- package/dist/types/src/{auction-calculator → amount-calculator/auction-calculator}/index.d.ts +0 -1
- package/dist/types/src/api/quoter/quote/quote.d.ts +1 -1
- package/dist/types/src/constants.d.ts +1 -2
- package/dist/types/src/fusion-order/auction-details/auction-details.d.ts +3 -0
- package/dist/types/src/fusion-order/constants.d.ts +0 -1
- package/dist/types/src/fusion-order/fusion-extension.d.ts +18 -6
- package/dist/types/src/fusion-order/fusion-order.d.ts +14 -12
- package/dist/types/src/fusion-order/index.d.ts +2 -1
- package/dist/types/src/fusion-order/whitelist/index.d.ts +1 -0
- package/dist/types/src/fusion-order/whitelist/types.d.ts +4 -0
- package/dist/types/src/fusion-order/whitelist/whitelist.d.ts +25 -0
- package/dist/types/src/index.d.ts +1 -1
- package/dist/types/src/utils/types.d.ts +3 -0
- package/dist/types/tsconfig.types.tsbuildinfo +1 -1
- package/package.json +28 -26
- package/dist/cjs/auction-calculator/auction-calculator.js.map +0 -1
- package/dist/cjs/auction-calculator/constants.js +0 -5
- package/dist/cjs/auction-calculator/constants.js.map +0 -1
- package/dist/cjs/auction-calculator/index.js.map +0 -1
- package/dist/cjs/fusion-order/settlement-post-interaction-data/index.js +0 -6
- package/dist/cjs/fusion-order/settlement-post-interaction-data/index.js.map +0 -1
- package/dist/cjs/fusion-order/settlement-post-interaction-data/settlement-post-interaction-data.js +0 -153
- package/dist/cjs/fusion-order/settlement-post-interaction-data/settlement-post-interaction-data.js.map +0 -1
- package/dist/cjs/fusion-order/settlement-post-interaction-data/types.js.map +0 -1
- package/dist/esm/auction-calculator/auction-calculator.js.map +0 -1
- package/dist/esm/auction-calculator/constants.js +0 -2
- package/dist/esm/auction-calculator/constants.js.map +0 -1
- package/dist/esm/auction-calculator/index.js +0 -3
- package/dist/esm/auction-calculator/index.js.map +0 -1
- package/dist/esm/fusion-order/settlement-post-interaction-data/index.js +0 -3
- package/dist/esm/fusion-order/settlement-post-interaction-data/index.js.map +0 -1
- package/dist/esm/fusion-order/settlement-post-interaction-data/settlement-post-interaction-data.js +0 -148
- package/dist/esm/fusion-order/settlement-post-interaction-data/settlement-post-interaction-data.js.map +0 -1
- package/dist/esm/fusion-order/settlement-post-interaction-data/types.js.map +0 -1
- package/dist/types/src/auction-calculator/constants.d.ts +0 -1
- package/dist/types/src/fusion-order/settlement-post-interaction-data/index.d.ts +0 -2
- package/dist/types/src/fusion-order/settlement-post-interaction-data/settlement-post-interaction-data.d.ts +0 -22
- package/dist/types/src/fusion-order/settlement-post-interaction-data/types.d.ts +0 -16
- /package/dist/cjs/fusion-order/{settlement-post-interaction-data → whitelist}/types.js +0 -0
- /package/dist/esm/fusion-order/{settlement-post-interaction-data → whitelist}/types.js +0 -0
|
@@ -1,13 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.calcTakingAmount = calcTakingAmount;
|
|
4
|
+
exports.calcMakingAmount = calcMakingAmount;
|
|
4
5
|
function calcTakingAmount(swapMakerAmount, orderMakerAmount, orderTakerAmount) {
|
|
5
6
|
return ((swapMakerAmount * orderTakerAmount + orderMakerAmount - 1n) /
|
|
6
7
|
orderMakerAmount);
|
|
7
8
|
}
|
|
8
|
-
exports.calcTakingAmount = calcTakingAmount;
|
|
9
9
|
function calcMakingAmount(swapTakerAmount, orderMakerAmount, orderTakerAmount) {
|
|
10
10
|
return (swapTakerAmount * orderMakerAmount) / orderTakerAmount;
|
|
11
11
|
}
|
|
12
|
-
exports.calcMakingAmount = calcMakingAmount;
|
|
13
12
|
//# sourceMappingURL=amounts.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"amounts.js","sourceRoot":"","sources":["../../../src/utils/amounts.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"amounts.js","sourceRoot":"","sources":["../../../src/utils/amounts.ts"],"names":[],"mappings":";;AAQA,4CASC;AAUD,4CAMC;AAzBD,SAAgB,gBAAgB,CAC5B,eAAuB,EACvB,gBAAwB,EACxB,gBAAwB;IAExB,OAAO,CACH,CAAC,eAAe,GAAG,gBAAgB,GAAG,gBAAgB,GAAG,EAAE,CAAC;QAC5D,gBAAgB,CACnB,CAAA;AACL,CAAC;AAUD,SAAgB,gBAAgB,CAC5B,eAAuB,EACvB,gBAAwB,EACxB,gBAAwB;IAExB,OAAO,CAAC,eAAe,GAAG,gBAAgB,CAAC,GAAG,gBAAgB,CAAA;AAClE,CAAC"}
|
package/dist/cjs/utils/time.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"time.js","sourceRoot":"","sources":["../../../src/utils/time.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"time.js","sourceRoot":"","sources":["../../../src/utils/time.ts"],"names":[],"mappings":";;AAAA,kBAEC;AAFD,SAAgB,GAAG;IACf,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,CAAA;AAChD,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/utils/types.ts"],"names":[],"mappings":""}
|
package/dist/cjs/utils.js
CHANGED
|
@@ -1,18 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.trim0x = trim0x;
|
|
4
|
+
exports.add0x = add0x;
|
|
4
5
|
function trim0x(data) {
|
|
5
6
|
if (data.startsWith('0x')) {
|
|
6
7
|
return data.substring(2);
|
|
7
8
|
}
|
|
8
9
|
return data;
|
|
9
10
|
}
|
|
10
|
-
exports.trim0x = trim0x;
|
|
11
11
|
function add0x(data) {
|
|
12
12
|
if (data.includes('0x')) {
|
|
13
13
|
return data;
|
|
14
14
|
}
|
|
15
15
|
return '0x' + data;
|
|
16
16
|
}
|
|
17
|
-
exports.add0x = add0x;
|
|
18
17
|
//# sourceMappingURL=utils.js.map
|
package/dist/cjs/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":";;AAAA,wBAMC;AAED,sBAMC;AAdD,SAAgB,MAAM,CAAC,IAAY;IAC/B,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QACxB,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;IAC5B,CAAC;IAED,OAAO,IAAI,CAAA;AACf,CAAC;AAED,SAAgB,KAAK,CAAC,IAAY;IAC9B,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACtB,OAAO,IAAI,CAAA;IACf,CAAC;IAED,OAAO,IAAI,GAAG,IAAI,CAAA;AACtB,CAAC"}
|
package/dist/cjs/validations.js
CHANGED
|
@@ -1,28 +1,27 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.isValidAddress = isValidAddress;
|
|
4
|
+
exports.isValidAmount = isValidAmount;
|
|
5
|
+
exports.isHexString = isHexString;
|
|
6
|
+
exports.isHexBytes = isHexBytes;
|
|
4
7
|
const ethers_1 = require("ethers");
|
|
5
8
|
function isValidAddress(address) {
|
|
6
9
|
return (0, ethers_1.isAddress)(address);
|
|
7
10
|
}
|
|
8
|
-
exports.isValidAddress = isValidAddress;
|
|
9
11
|
function isValidAmount(value) {
|
|
10
12
|
try {
|
|
11
13
|
const amount = BigInt(value);
|
|
12
14
|
return amount >= 0n;
|
|
13
15
|
}
|
|
14
|
-
catch
|
|
16
|
+
catch {
|
|
15
17
|
return false;
|
|
16
18
|
}
|
|
17
19
|
}
|
|
18
|
-
exports.isValidAmount = isValidAmount;
|
|
19
20
|
const HEX_REGEX = /^(0x)[0-9a-f]+$/i;
|
|
20
21
|
function isHexString(val) {
|
|
21
22
|
return HEX_REGEX.test(val.toLowerCase());
|
|
22
23
|
}
|
|
23
|
-
exports.isHexString = isHexString;
|
|
24
24
|
function isHexBytes(val) {
|
|
25
25
|
return isHexString(val) && val.length % 2 === 0;
|
|
26
26
|
}
|
|
27
|
-
exports.isHexBytes = isHexBytes;
|
|
28
27
|
//# sourceMappingURL=validations.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validations.js","sourceRoot":"","sources":["../../src/validations.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"validations.js","sourceRoot":"","sources":["../../src/validations.ts"],"names":[],"mappings":";;AAEA,wCAEC;AAED,sCAQC;AAGD,kCAEC;AAMD,gCAEC;AA3BD,mCAAgC;AAEhC,SAAgB,cAAc,CAAC,OAAe;IAC1C,OAAO,IAAA,kBAAS,EAAC,OAAO,CAAC,CAAA;AAC7B,CAAC;AAED,SAAgB,aAAa,CAAC,KAAsB;IAChD,IAAI,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAA;QAE5B,OAAO,MAAM,IAAI,EAAE,CAAA;IACvB,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,KAAK,CAAA;IAChB,CAAC;AACL,CAAC;AAED,MAAM,SAAS,GAAG,kBAAkB,CAAA;AACpC,SAAgB,WAAW,CAAC,GAAW;IACnC,OAAO,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAA;AAC5C,CAAC;AAMD,SAAgB,UAAU,CAAC,GAAW;IAClC,OAAO,WAAW,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,CAAA;AACnD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"active-websocket-orders-api.js","sourceRoot":"","sources":["../../../src/ws-api/active-websocket-orders-api.ts"],"names":[],"mappings":";;;AAAA,2CAAuC;AAavC,MAAa,wBAAwB;IAGjC,YAAY,QAA6B;QACrC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC5B,CAAC;IAED,OAAO,CAAC,EAAa;QACjB,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,IAAoB,EAAE,EAAE;YAC7C,IAAI,uBAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"active-websocket-orders-api.js","sourceRoot":"","sources":["../../../src/ws-api/active-websocket-orders-api.ts"],"names":[],"mappings":";;;AAAA,2CAAuC;AAavC,MAAa,wBAAwB;IAGjC,YAAY,QAA6B;QACrC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC5B,CAAC;IAED,OAAO,CAAC,EAAa;QACjB,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,IAAoB,EAAE,EAAE;YAC7C,IAAI,uBAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;gBACnC,EAAE,CAAC,IAAI,CAAC,CAAA;YACZ,CAAC;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAED,cAAc,CAAC,EAAoB;QAC/B,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,IAAoB,EAAE,EAAE;YAC7C,IAAI,IAAI,CAAC,KAAK,KAAK,eAAe,EAAE,CAAC;gBACjC,EAAE,CAAC,IAAI,CAAC,CAAA;YACZ,CAAC;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAED,cAAc,CAAC,EAAoB;QAC/B,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,IAAoB,EAAE,EAAE;YAC7C,IAAI,IAAI,CAAC,KAAK,KAAK,eAAe,EAAE,CAAC;gBACjC,EAAE,CAAC,IAAI,CAAC,CAAA;YACZ,CAAC;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAED,+BAA+B,CAC3B,EAAwC;QAExC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,IAAoB,EAAE,EAAE;YAC7C,IAAI,IAAI,CAAC,KAAK,KAAK,mCAAmC,EAAE,CAAC;gBACrD,EAAE,CAAC,IAAI,CAAC,CAAA;YACZ,CAAC;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAED,aAAa,CAAC,EAAmB;QAC7B,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,IAAoB,EAAE,EAAE;YAC7C,IAAI,IAAI,CAAC,KAAK,KAAK,cAAc,EAAE,CAAC;gBAChC,EAAE,CAAC,IAAI,CAAC,CAAA;YACZ,CAAC;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAED,gBAAgB,CAAC,EAAsB;QACnC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,IAAoB,EAAE,EAAE;YAC7C,IAAI,IAAI,CAAC,KAAK,KAAK,iBAAiB,EAAE,CAAC;gBACnC,EAAE,CAAC,IAAI,CAAC,CAAA;YACZ,CAAC;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAED,sBAAsB,CAAC,EAA4B;QAC/C,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,IAAoB,EAAE,EAAE;YAC7C,IAAI,IAAI,CAAC,KAAK,KAAK,wBAAwB,EAAE,CAAC;gBAC1C,EAAE,CAAC,IAAI,CAAC,CAAA;YACZ,CAAC;QACL,CAAC,CAAC,CAAA;IACN,CAAC;CACJ;AAhED,4DAgEC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc-websocket-api.js","sourceRoot":"","sources":["../../../src/ws-api/rpc-websocket-api.ts"],"names":[],"mappings":";;;AAMA,kDAAqE;AAGrE,MAAa,eAAe;IAGxB,YAAY,QAA6B;QACrC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC5B,CAAC;IAED,MAAM,CAAC,EAAY;QACf,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,IAAkB,EAAE,EAAE;YAC3C,IAAI,IAAI,CAAC,MAAM,KAAK,MAAM,EAAE;
|
|
1
|
+
{"version":3,"file":"rpc-websocket-api.js","sourceRoot":"","sources":["../../../src/ws-api/rpc-websocket-api.ts"],"names":[],"mappings":";;;AAMA,kDAAqE;AAGrE,MAAa,eAAe;IAGxB,YAAY,QAA6B;QACrC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC5B,CAAC;IAED,MAAM,CAAC,EAAY;QACf,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,IAAkB,EAAE,EAAE;YAC3C,IAAI,IAAI,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;gBACzB,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YACnB,CAAC;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAED,IAAI;QACA,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAC,MAAM,EAAE,MAAM,EAAC,CAAC,CAAA;IACxC,CAAC;IAED,eAAe,CAAC,EAAC,KAAK,EAAE,IAAI,KAAsB,EAAE;QAChD,MAAM,iBAAiB,GAAG,IAAI,8BAAiB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;QAC5D,MAAM,GAAG,GAAG,iBAAiB,CAAC,QAAQ,EAAE,CAAA;QAExC,IAAI,GAAG,EAAE,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAA;QACxB,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAC,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,EAAC,KAAK,EAAE,IAAI,EAAC,EAAC,CAAC,CAAA;IACzE,CAAC;IAED,iBAAiB,CAAC,EAAuB;QACrC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,IAAkB,EAAE,EAAE;YAC3C,IAAI,IAAI,CAAC,MAAM,KAAK,iBAAiB,EAAE,CAAC;gBACpC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YACnB,CAAC;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAED,iBAAiB;QACb,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAC,MAAM,EAAE,mBAAmB,EAAC,CAAC,CAAA;IACrD,CAAC;IAED,mBAAmB,CAAC,EAAyB;QACzC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,IAAkB,EAAE,EAAE;YAC3C,IAAI,IAAI,CAAC,MAAM,KAAK,mBAAmB,EAAE,CAAC;gBACtC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YACnB,CAAC;QACL,CAAC,CAAC,CAAA;IACN,CAAC;CACJ;AAjDD,0CAiDC"}
|
package/dist/cjs/ws-api/url.js
CHANGED
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.castUrl =
|
|
3
|
+
exports.castUrl = castUrl;
|
|
4
4
|
function castUrl(url) {
|
|
5
5
|
if (url.startsWith('http')) {
|
|
6
6
|
return url.replace('http', 'ws');
|
|
7
7
|
}
|
|
8
8
|
return url;
|
|
9
9
|
}
|
|
10
|
-
exports.castUrl = castUrl;
|
|
11
10
|
//# sourceMappingURL=url.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"url.js","sourceRoot":"","sources":["../../../src/ws-api/url.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"url.js","sourceRoot":"","sources":["../../../src/ws-api/url.ts"],"names":[],"mappings":";;AAAA,0BAMC;AAND,SAAgB,OAAO,CAAC,GAAW;IAC/B,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QACzB,OAAO,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACpC,CAAC;IAED,OAAO,GAAG,CAAA;AACd,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ws-api.js","sourceRoot":"","sources":["../../../src/ws-api/ws-api.ts"],"names":[],"mappings":";;;AAAA,+EAAsE;AACtE,2DAAmD;AAEnD,+BAA6B;AAC7B,wCAMwB;AAExB,MAAa,YAAY;IASrB,YACI,gBAA8D;QAE9D,IAAI,gCAAgC,CAAC,gBAAgB,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"ws-api.js","sourceRoot":"","sources":["../../../src/ws-api/ws-api.ts"],"names":[],"mappings":";;;AAAA,+EAAsE;AACtE,2DAAmD;AAEnD,+BAA6B;AAC7B,wCAMwB;AAExB,MAAa,YAAY;IASrB,YACI,gBAA8D;QAE9D,IAAI,gCAAgC,CAAC,gBAAgB,CAAC,EAAE,CAAC;YACrD,MAAM,GAAG,GAAG,IAAA,aAAO,EAAC,gBAAgB,CAAC,GAAG,CAAC,CAAA;YACzC,MAAM,cAAc,GAAG,GAAG,GAAG,IAAI,YAAY,CAAC,OAAO,IAAI,gBAAgB,CAAC,OAAO,EAAE,CAAA;YACnF,MAAM,aAAa,GAAG,EAAC,GAAG,gBAAgB,EAAE,GAAG,EAAE,cAAc,EAAC,CAAA;YAChE,MAAM,QAAQ,GAAG,IAAI,oBAAe,CAAC,aAAa,CAAC,CAAA;YAEnD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;YACxB,IAAI,CAAC,GAAG,GAAG,IAAI,mCAAe,CAAC,QAAQ,CAAC,CAAA;YACxC,IAAI,CAAC,KAAK,GAAG,IAAI,sDAAwB,CAAC,QAAQ,CAAC,CAAA;YAEnD,OAAM;QACV,CAAC;QAED,IAAI,CAAC,QAAQ,GAAG,gBAAgB,CAAA;QAChC,IAAI,CAAC,GAAG,GAAG,IAAI,mCAAe,CAAC,gBAAgB,CAAC,CAAA;QAChD,IAAI,CAAC,KAAK,GAAG,IAAI,sDAAwB,CAAC,gBAAgB,CAAC,CAAA;IAC/D,CAAC;IAED,MAAM,CAAC,GAAG,CACN,gBAA8D;QAE9D,OAAO,IAAI,YAAY,CAAC,gBAAgB,CAAC,CAAA;IAC7C,CAAC;IAED,IAAI;QACA,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAA;IACxB,CAAC;IAED,EAAE,CAAC,KAAa,EAAE,EAAuB;QACrC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;IAC/B,CAAC;IAED,GAAG,CAAC,KAAa,EAAE,EAAuB;QACtC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;IAChC,CAAC;IAED,MAAM,CAAC,EAAuB;QAC1B,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IAC5B,CAAC;IAED,IAAI,CAAI,OAAU;QACd,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAC/B,CAAC;IAED,KAAK;QACD,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAA;IACzB,CAAC;IAED,SAAS,CAAC,EAAe;QACrB,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;IAC/B,CAAC;IAED,OAAO,CAAC,EAAe;QACnB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAC7B,CAAC;IAED,OAAO,CAAC,EAAe;QACnB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAC7B,CAAC;;AAtEL,oCAuEC;AAtEkB,oBAAO,GAAG,MAAM,CAAA;AAwEnC,SAAS,gCAAgC,CACrC,GAAiD;IAEjD,OAAO,KAAK,IAAI,GAAG,IAAI,SAAS,IAAI,GAAG,CAAA;AAC3C,CAAC"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import { FeeTakerExt } from '@1inch/limit-order-sdk';
|
|
2
|
+
import { AuctionCalculator } from './auction-calculator';
|
|
3
|
+
export class AmountCalculator {
|
|
4
|
+
constructor(auctionCalculator, feeCalculator) {
|
|
5
|
+
this.auctionCalculator = auctionCalculator;
|
|
6
|
+
this.feeCalculator = feeCalculator;
|
|
7
|
+
}
|
|
8
|
+
static fromExtension(ext) {
|
|
9
|
+
return new AmountCalculator(AuctionCalculator.fromAuctionData(ext.auctionDetails), ext.extra?.fees
|
|
10
|
+
? new FeeTakerExt.FeeCalculator(ext.extra?.fees, ext.whitelist)
|
|
11
|
+
: undefined);
|
|
12
|
+
}
|
|
13
|
+
getTakingAmount(taker, takingAmount, time, blockBaseFee = 0n) {
|
|
14
|
+
const withFee = this.feeCalculator?.getTakingAmount(taker, takingAmount) ??
|
|
15
|
+
takingAmount;
|
|
16
|
+
const rateBump = this.auctionCalculator.calcRateBump(time, blockBaseFee);
|
|
17
|
+
return AuctionCalculator.calcAuctionTakingAmount(withFee, rateBump);
|
|
18
|
+
}
|
|
19
|
+
getMakingAmount(taker, makingAmount, time, blockBaseFee = 0n) {
|
|
20
|
+
const withFee = this.feeCalculator?.getMakingAmount(taker, makingAmount) ??
|
|
21
|
+
makingAmount;
|
|
22
|
+
const rateBump = this.auctionCalculator.calcRateBump(time, blockBaseFee);
|
|
23
|
+
return AuctionCalculator.calcAuctionMakingAmount(withFee, rateBump);
|
|
24
|
+
}
|
|
25
|
+
getResolverFee(taker, takingAmount) {
|
|
26
|
+
return this.feeCalculator?.getResolverFee(taker, takingAmount) ?? 0n;
|
|
27
|
+
}
|
|
28
|
+
getIntegratorFee(taker, takingAmount) {
|
|
29
|
+
return this.feeCalculator?.getIntegratorFee(taker, takingAmount) ?? 0n;
|
|
30
|
+
}
|
|
31
|
+
getProtocolShareOfIntegratorFee(taker, takingAmount) {
|
|
32
|
+
return (this.feeCalculator?.getProtocolShareOfIntegratorFee(taker, takingAmount) ?? 0n);
|
|
33
|
+
}
|
|
34
|
+
getProtocolFee(taker, takingAmount) {
|
|
35
|
+
return this.feeCalculator?.getProtocolFee(taker, takingAmount) ?? 0n;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
//# sourceMappingURL=amount-calculator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"amount-calculator.js","sourceRoot":"","sources":["../../../src/amount-calculator/amount-calculator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAE3D,OAAO,EAAC,iBAAiB,EAAC,MAAM,sBAAsB,CAAA;AAGtD,MAAM,OAAO,gBAAgB;IACzB,YACqB,iBAAoC,EACpC,aAA6B;QAD7B,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,kBAAa,GAAb,aAAa,CAAgB;IAC/C,CAAC;IAEJ,MAAM,CAAC,aAAa,CAAC,GAAoB;QACrC,OAAO,IAAI,gBAAgB,CACvB,iBAAiB,CAAC,eAAe,CAAC,GAAG,CAAC,cAAc,CAAC,EACrD,GAAG,CAAC,KAAK,EAAE,IAAI;YACX,CAAC,CAAC,IAAI,WAAW,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,SAAS,CAAC;YAC/D,CAAC,CAAC,SAAS,CAClB,CAAA;IACL,CAAC;IAUM,eAAe,CAClB,KAAc,EACd,YAAoB,EACpB,IAAY,EACZ,YAAY,GAAG,EAAE;QAEjB,MAAM,OAAO,GACT,IAAI,CAAC,aAAa,EAAE,eAAe,CAAC,KAAK,EAAE,YAAY,CAAC;YACxD,YAAY,CAAA;QAEhB,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,IAAI,EAAE,YAAY,CAAC,CAAA;QAExE,OAAO,iBAAiB,CAAC,uBAAuB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IACvE,CAAC;IAUM,eAAe,CAClB,KAAc,EACd,YAAoB,EACpB,IAAY,EACZ,YAAY,GAAG,EAAE;QAEjB,MAAM,OAAO,GACT,IAAI,CAAC,aAAa,EAAE,eAAe,CAAC,KAAK,EAAE,YAAY,CAAC;YACxD,YAAY,CAAA;QAEhB,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,IAAI,EAAE,YAAY,CAAC,CAAA;QAExE,OAAO,iBAAiB,CAAC,uBAAuB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IACvE,CAAC;IAQM,cAAc,CAAC,KAAc,EAAE,YAAoB;QACtD,OAAO,IAAI,CAAC,aAAa,EAAE,cAAc,CAAC,KAAK,EAAE,YAAY,CAAC,IAAI,EAAE,CAAA;IACxE,CAAC;IAQM,gBAAgB,CAAC,KAAc,EAAE,YAAoB;QACxD,OAAO,IAAI,CAAC,aAAa,EAAE,gBAAgB,CAAC,KAAK,EAAE,YAAY,CAAC,IAAI,EAAE,CAAA;IAC1E,CAAC;IAQM,+BAA+B,CAClC,KAAc,EACd,YAAoB;QAEpB,OAAO,CACH,IAAI,CAAC,aAAa,EAAE,+BAA+B,CAC/C,KAAK,EACL,YAAY,CACf,IAAI,EAAE,CACV,CAAA;IACL,CAAC;IASM,cAAc,CAAC,KAAc,EAAE,YAAoB;QACtD,OAAO,IAAI,CAAC,aAAa,EAAE,cAAc,CAAC,KAAK,EAAE,YAAY,CAAC,IAAI,EAAE,CAAA;IACxE,CAAC;CACJ"}
|
package/dist/esm/{auction-calculator → amount-calculator/auction-calculator}/auction-calculator.js
RENAMED
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { addRatioToAmount } from '../sdk';
|
|
1
|
+
import { mulDiv, Rounding } from '@1inch/limit-order-sdk';
|
|
3
2
|
export class AuctionCalculator {
|
|
4
|
-
constructor(startTime, duration, initialRateBump, points,
|
|
3
|
+
constructor(startTime, duration, initialRateBump, points, gasCost = {
|
|
5
4
|
gasBumpEstimate: 0n,
|
|
6
5
|
gasPriceEstimate: 0n
|
|
7
6
|
}) {
|
|
@@ -9,36 +8,35 @@ export class AuctionCalculator {
|
|
|
9
8
|
this.duration = duration;
|
|
10
9
|
this.initialRateBump = initialRateBump;
|
|
11
10
|
this.points = points;
|
|
12
|
-
this.takerFeeRatio = takerFeeRatio;
|
|
13
11
|
this.gasCost = gasCost;
|
|
14
12
|
}
|
|
15
13
|
get finishTime() {
|
|
16
14
|
return this.startTime + this.duration;
|
|
17
15
|
}
|
|
18
|
-
static fromAuctionData(
|
|
19
|
-
return new AuctionCalculator(details.startTime, details.duration, details.initialRateBump, details.points,
|
|
16
|
+
static fromAuctionData(details) {
|
|
17
|
+
return new AuctionCalculator(details.startTime, details.duration, details.initialRateBump, details.points, details.gasCost);
|
|
20
18
|
}
|
|
21
19
|
static calcInitialRateBump(startAmount, endAmount) {
|
|
22
|
-
const bump = (RATE_BUMP_DENOMINATOR * startAmount) /
|
|
23
|
-
|
|
20
|
+
const bump = (AuctionCalculator.RATE_BUMP_DENOMINATOR * startAmount) /
|
|
21
|
+
endAmount -
|
|
22
|
+
AuctionCalculator.RATE_BUMP_DENOMINATOR;
|
|
24
23
|
return Number(bump);
|
|
25
24
|
}
|
|
26
|
-
static calcAuctionTakingAmount(takingAmount, rate
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
}
|
|
32
|
-
return addRatioToAmount(auctionTakingAmount, takerFeeRatio);
|
|
25
|
+
static calcAuctionTakingAmount(takingAmount, rate) {
|
|
26
|
+
return mulDiv(takingAmount, BigInt(rate) + AuctionCalculator.RATE_BUMP_DENOMINATOR, AuctionCalculator.RATE_BUMP_DENOMINATOR, Rounding.Ceil);
|
|
27
|
+
}
|
|
28
|
+
static calcAuctionMakingAmount(makingAmount, rate) {
|
|
29
|
+
return mulDiv(makingAmount, AuctionCalculator.RATE_BUMP_DENOMINATOR, BigInt(rate) + AuctionCalculator.RATE_BUMP_DENOMINATOR);
|
|
33
30
|
}
|
|
34
31
|
static baseFeeToGasPriceEstimate(baseFee) {
|
|
35
32
|
return baseFee / AuctionCalculator.GAS_PRICE_BASE;
|
|
36
33
|
}
|
|
37
34
|
static calcGasBumpEstimate(endTakingAmount, gasCostInToToken) {
|
|
38
|
-
return (gasCostInToToken * RATE_BUMP_DENOMINATOR) /
|
|
35
|
+
return ((gasCostInToToken * AuctionCalculator.RATE_BUMP_DENOMINATOR) /
|
|
36
|
+
endTakingAmount);
|
|
39
37
|
}
|
|
40
38
|
calcAuctionTakingAmount(takingAmount, rate) {
|
|
41
|
-
return AuctionCalculator.calcAuctionTakingAmount(takingAmount, rate
|
|
39
|
+
return AuctionCalculator.calcAuctionTakingAmount(takingAmount, rate);
|
|
42
40
|
}
|
|
43
41
|
calcRateBump(time, blockBaseFee = 0n) {
|
|
44
42
|
const gasBump = this.getGasPriceBump(blockBaseFee);
|
|
@@ -80,5 +78,6 @@ export class AuctionCalculator {
|
|
|
80
78
|
(auctionFinishTime - currentPointTime));
|
|
81
79
|
}
|
|
82
80
|
}
|
|
81
|
+
AuctionCalculator.RATE_BUMP_DENOMINATOR = 10000000n;
|
|
83
82
|
AuctionCalculator.GAS_PRICE_BASE = 1000000n;
|
|
84
83
|
//# sourceMappingURL=auction-calculator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auction-calculator.js","sourceRoot":"","sources":["../../../../src/amount-calculator/auction-calculator/auction-calculator.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/amount-calculator/auction-calculator/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orders.api.js","sourceRoot":"","sources":["../../../../src/api/orders/orders.api.ts"],"names":[],"mappings":"AAWA,OAAO,EAAC,sBAAsB,EAAwB,MAAM,iBAAiB,CAAA;AAC7E,OAAO,EAAC,iBAAiB,EAAC,MAAM,WAAW,CAAA;AAE3C,MAAM,OAAO,SAAS;IAGlB,YACqB,MAAuB,EACvB,UAAiC;QADjC,WAAM,GAAN,MAAM,CAAiB;QACvB,eAAU,GAAV,UAAU,CAAuB;IACnD,CAAC;IAEJ,MAAM,CAAC,GAAG,CACN,MAAuB,EACvB,aAAoC,IAAI,sBAAsB,CAC1D,MAAM,CAAC,OAAO,CACjB;QAED,OAAO,IAAI,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;IAC5C,CAAC;IAED,KAAK,CAAC,eAAe,CACjB,MAA2B;QAE3B,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAA;QAE7B,IAAI,GAAG,EAAE;
|
|
1
|
+
{"version":3,"file":"orders.api.js","sourceRoot":"","sources":["../../../../src/api/orders/orders.api.ts"],"names":[],"mappings":"AAWA,OAAO,EAAC,sBAAsB,EAAwB,MAAM,iBAAiB,CAAA;AAC7E,OAAO,EAAC,iBAAiB,EAAC,MAAM,WAAW,CAAA;AAE3C,MAAM,OAAO,SAAS;IAGlB,YACqB,MAAuB,EACvB,UAAiC;QADjC,WAAM,GAAN,MAAM,CAAiB;QACvB,eAAU,GAAV,UAAU,CAAuB;IACnD,CAAC;IAEJ,MAAM,CAAC,GAAG,CACN,MAAuB,EACvB,aAAoC,IAAI,sBAAsB,CAC1D,MAAM,CAAC,OAAO,CACjB;QAED,OAAO,IAAI,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;IAC5C,CAAC;IAED,KAAK,CAAC,eAAe,CACjB,MAA2B;QAE3B,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAA;QAE7B,IAAI,GAAG,EAAE,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAA;QACxB,CAAC;QAED,MAAM,WAAW,GAAG,iBAAiB,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAA;QACrD,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,SAAS,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,iBAAiB,WAAW,EAAE,CAAA;QAExG,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAuB,GAAG,CAAC,CAAA;IACzD,CAAC;IAED,KAAK,CAAC,cAAc,CAChB,MAA0B;QAE1B,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAA;QAE7B,IAAI,GAAG,EAAE,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAA;QACxB,CAAC;QAED,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,SAAS,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,iBAAiB,MAAM,CAAC,SAAS,EAAE,CAAA;QAE7G,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAsB,GAAG,CAAC,CAAA;IACxD,CAAC;IAED,KAAK,CAAC,gBAAgB,CAClB,MAA4B;QAE5B,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAA;QAE7B,IAAI,GAAG,EAAE,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAA;QACxB,CAAC;QAED,MAAM,EAAE,GAAG,iBAAiB,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,CAAA;QACvD,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,SAAS,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,gBAAgB,MAAM,CAAC,OAAO,IAAI,EAAE,EAAE,CAAA;QAEhH,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IACnC,CAAC;;AA1Dc,iBAAO,GAAG,MAAM,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orders.request.js","sourceRoot":"","sources":["../../../../src/api/orders/orders.request.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,WAAW,EAAE,cAAc,EAAC,MAAM,mBAAmB,CAAA;AAC7D,OAAO,EAAmB,iBAAiB,EAAC,MAAM,eAAe,CAAA;AAEjE,MAAM,OAAO,mBAAmB;IAG5B,YAAY,SAAoC,EAAE;QAC9C,IAAI,CAAC,UAAU,GAAG,IAAI,iBAAiB,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,CAAA;IACtE,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,MAAkC;QACzC,OAAO,IAAI,mBAAmB,CAAC,MAAM,CAAC,CAAA;IAC1C,CAAC;IAED,QAAQ;QACJ,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAA;QAEtC,IAAI,GAAG,EAAE;
|
|
1
|
+
{"version":3,"file":"orders.request.js","sourceRoot":"","sources":["../../../../src/api/orders/orders.request.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,WAAW,EAAE,cAAc,EAAC,MAAM,mBAAmB,CAAA;AAC7D,OAAO,EAAmB,iBAAiB,EAAC,MAAM,eAAe,CAAA;AAEjE,MAAM,OAAO,mBAAmB;IAG5B,YAAY,SAAoC,EAAE;QAC9C,IAAI,CAAC,UAAU,GAAG,IAAI,iBAAiB,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,CAAA;IACtE,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,MAAkC;QACzC,OAAO,IAAI,mBAAmB,CAAC,MAAM,CAAC,CAAA;IAC1C,CAAC;IAED,QAAQ;QACJ,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAA;QAEtC,IAAI,GAAG,EAAE,CAAC;YACN,OAAO,GAAG,CAAA;QACd,CAAC;QAED,OAAO,IAAI,CAAA;IACf,CAAC;IAED,KAAK;QACD,OAAO;YACH,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI;YAC1B,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,KAAK;SAC/B,CAAA;IACL,CAAC;CACJ;AAED,MAAM,OAAO,kBAAkB;IAG3B,YAAY,MAAyB;QACjC,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAA;IACrC,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,MAAyB;QAChC,OAAO,IAAI,kBAAkB,CAAC,MAAM,CAAC,CAAA;IACzC,CAAC;IAED,QAAQ;QACJ,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,EAAE,EAAE,CAAC;YAC/B,OAAO,sCAAsC,CAAA;QACjD,CAAC;QAED,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;YAC/B,OAAO,0BAA0B,CAAA;QACrC,CAAC;QAED,OAAO,IAAI,CAAA;IACf,CAAC;IAED,KAAK;QACD,OAAO;YACH,SAAS,EAAE,IAAI,CAAC,SAAS;SAC5B,CAAA;IACL,CAAC;CACJ;AAED,MAAM,OAAO,oBAAoB;IAK7B,YAAY,MAA2B;QACnC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAA;QAC7B,IAAI,CAAC,UAAU,GAAG,IAAI,iBAAiB,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,CAAA;IACtE,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,MAA2B;QAClC,OAAO,IAAI,oBAAoB,CAAC,MAAM,CAAC,CAAA;IAC3C,CAAC;IAED,QAAQ;QACJ,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAA;QAEtC,IAAI,GAAG,EAAE,CAAC;YACN,OAAO,GAAG,CAAA;QACd,CAAC;QAED,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YAChC,OAAO,GAAG,IAAI,CAAC,OAAO,qBAAqB,CAAA;QAC/C,CAAC;QAED,OAAO,IAAI,CAAA;IACf,CAAC;IAED,gBAAgB;QACZ,OAAO;YACH,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,KAAK;YAC5B,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI;SAC7B,CAAA;IACL,CAAC;CACJ"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pagination.js","sourceRoot":"","sources":["../../../src/api/pagination.ts"],"names":[],"mappings":"AAKA,MAAM,OAAO,iBAAiB;IAK1B,YAAY,IAAwB,EAAE,KAAyB;QAC3D,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;IACtB,CAAC;IAED,QAAQ;QACJ,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,IAAI,IAAI,CAAC,KAAK,GAAG,GAAG,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"pagination.js","sourceRoot":"","sources":["../../../src/api/pagination.ts"],"names":[],"mappings":"AAKA,MAAM,OAAO,iBAAiB;IAK1B,YAAY,IAAwB,EAAE,KAAyB;QAC3D,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;IACtB,CAAC;IAED,QAAQ;QACJ,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,IAAI,IAAI,CAAC,KAAK,GAAG,GAAG,CAAC,EAAE,CAAC;YAC7D,OAAO,4CAA4C,CAAA;QACvD,CAAC;QAED,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;YACrC,OAAO,qBAAqB,CAAA;QAChC,CAAC;QAED,OAAO,IAAI,CAAA;IACf,CAAC;CACJ"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"params.js","sourceRoot":"","sources":["../../../src/api/params.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,iBAAiB,CAE/B,MAAS;IACP,IAAI,CAAC,MAAM,EAAE;
|
|
1
|
+
{"version":3,"file":"params.js","sourceRoot":"","sources":["../../../src/api/params.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,iBAAiB,CAE/B,MAAS;IACP,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,OAAO,EAAE,CAAA;IACb,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAEhC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACpB,OAAO,EAAE,CAAA;IACb,CAAC;IAED,OAAO,CACH,GAAG;QACH,IAAI;aACC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACb,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;gBACb,OAAO,CAAC,CAAA;YACZ,CAAC;YAED,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;YACvB,CAAC,CAAC,IAAI,CACF,CAAC;gBACG,GAAG;gBACH,kBAAkB,CACd,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CACjD,CACR,CAAA;YAED,OAAO,CAAC,CAAA;QACZ,CAAC,EAAE,EAAc,CAAC;aACjB,IAAI,CAAC,GAAG,CAAC,CACjB,CAAA;AACL,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order-params.js","sourceRoot":"","sources":["../../../../../src/api/quoter/quote/order-params.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,wBAAwB,CAAA;AAE9C,OAAO,EAAC,UAAU,EAAC,MAAM,UAAU,CAAA;AAEnC,MAAM,OAAO,iBAAiB;IAa1B,YAAY,MAA6B;QAZzB,WAAM,GAAe,UAAU,CAAC,IAAI,CAAA;QAEpC,aAAQ,GAAY,OAAO,CAAC,YAAY,CAAA;QAWpD,IAAI,MAAM,CAAC,MAAM,EAAE;
|
|
1
|
+
{"version":3,"file":"order-params.js","sourceRoot":"","sources":["../../../../../src/api/quoter/quote/order-params.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,wBAAwB,CAAA;AAE9C,OAAO,EAAC,UAAU,EAAC,MAAM,UAAU,CAAA;AAEnC,MAAM,OAAO,iBAAiB;IAa1B,YAAY,MAA6B;QAZzB,WAAM,GAAe,UAAU,CAAC,IAAI,CAAA;QAEpC,aAAQ,GAAY,OAAO,CAAC,YAAY,CAAA;QAWpD,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAA;QAC/B,CAAC;QAED,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YAClB,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAA;QACnC,CAAC;QAED,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAA;QACjC,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAA;QACzB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAA;QAC3B,IAAI,CAAC,uBAAuB,GAAG,MAAM,CAAC,uBAAuB,IAAI,EAAE,CAAA;IACvE,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,MAA6B;QACpC,OAAO,IAAI,iBAAiB,CAAC,MAAM,CAAC,CAAA;IACxC,CAAC;CACJ"}
|
|
@@ -3,8 +3,7 @@ import { UINT_40_MAX } from '@1inch/byte-utils';
|
|
|
3
3
|
import { FusionOrderParams } from './order-params';
|
|
4
4
|
import { PresetEnum } from '../types';
|
|
5
5
|
import { Preset } from '../preset';
|
|
6
|
-
import { FusionOrder } from '../../../fusion-order';
|
|
7
|
-
import { bpsToRatioFormat } from '../../../sdk';
|
|
6
|
+
import { FusionOrder, Whitelist } from '../../../fusion-order';
|
|
8
7
|
import { CHAIN_TO_WRAPPER } from '../../../fusion-order/constants';
|
|
9
8
|
export class Quote {
|
|
10
9
|
constructor(params, response) {
|
|
@@ -25,7 +24,7 @@ export class Quote {
|
|
|
25
24
|
this.quoteId = response.quoteId;
|
|
26
25
|
this.whitelist = response.whitelist.map((a) => new Address(a));
|
|
27
26
|
this.recommendedPreset = response.recommended_preset;
|
|
28
|
-
this.
|
|
27
|
+
this.slippage = response.autoK;
|
|
29
28
|
this.settlementAddress = new Address(response.settlementAddress);
|
|
30
29
|
}
|
|
31
30
|
createFusionOrder(paramsData) {
|
|
@@ -43,7 +42,7 @@ export class Quote {
|
|
|
43
42
|
const allowMultipleFills = paramsData?.allowMultipleFills ?? preset.allowMultipleFills;
|
|
44
43
|
const isNonceRequired = !allowPartialFills || !allowMultipleFills;
|
|
45
44
|
const nonce = isNonceRequired
|
|
46
|
-
? params.nonce ?? randBigInt(UINT_40_MAX)
|
|
45
|
+
? (params.nonce ?? randBigInt(UINT_40_MAX))
|
|
47
46
|
: params.nonce;
|
|
48
47
|
const takerAsset = this.params.toTokenAddress.isNative()
|
|
49
48
|
? CHAIN_TO_WRAPPER[paramsData.network]
|
|
@@ -57,15 +56,6 @@ export class Quote {
|
|
|
57
56
|
receiver: params.receiver
|
|
58
57
|
}, {
|
|
59
58
|
auction: auctionDetails,
|
|
60
|
-
fees: {
|
|
61
|
-
integratorFee: {
|
|
62
|
-
ratio: bpsToRatioFormat(this.params.fee) || 0n,
|
|
63
|
-
receiver: paramsData?.takingFeeReceiver
|
|
64
|
-
? new Address(paramsData?.takingFeeReceiver)
|
|
65
|
-
: Address.ZERO_ADDRESS
|
|
66
|
-
},
|
|
67
|
-
bankFee: preset.bankFee
|
|
68
|
-
},
|
|
69
59
|
whitelist: this.getWhitelist(auctionDetails.startTime, preset.exclusiveResolver)
|
|
70
60
|
}, {
|
|
71
61
|
nonce,
|
|
@@ -75,7 +65,8 @@ export class Quote {
|
|
|
75
65
|
allowMultipleFills,
|
|
76
66
|
orderExpirationDelay: paramsData?.orderExpirationDelay,
|
|
77
67
|
source: this.params.source,
|
|
78
|
-
enablePermit2: params.isPermit2
|
|
68
|
+
enablePermit2: params.isPermit2,
|
|
69
|
+
fees: undefined
|
|
79
70
|
});
|
|
80
71
|
}
|
|
81
72
|
getPreset(type = PresetEnum.fast) {
|
|
@@ -83,18 +74,18 @@ export class Quote {
|
|
|
83
74
|
}
|
|
84
75
|
getWhitelist(auctionStartTime, exclusiveResolver) {
|
|
85
76
|
if (exclusiveResolver) {
|
|
86
|
-
return this.whitelist.map((resolver) => {
|
|
77
|
+
return Whitelist.fromNow(this.whitelist.map((resolver) => {
|
|
87
78
|
const isExclusive = resolver.equal(exclusiveResolver);
|
|
88
79
|
return {
|
|
89
80
|
address: resolver,
|
|
90
81
|
allowFrom: isExclusive ? 0n : auctionStartTime
|
|
91
82
|
};
|
|
92
|
-
});
|
|
83
|
+
}));
|
|
93
84
|
}
|
|
94
|
-
return this.whitelist.map((resolver) => ({
|
|
85
|
+
return Whitelist.fromNow(this.whitelist.map((resolver) => ({
|
|
95
86
|
address: resolver,
|
|
96
87
|
allowFrom: 0n
|
|
97
|
-
}));
|
|
88
|
+
})));
|
|
98
89
|
}
|
|
99
90
|
}
|
|
100
91
|
//# sourceMappingURL=quote.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quote.js","sourceRoot":"","sources":["../../../../../src/api/quoter/quote/quote.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,UAAU,EAAC,MAAM,wBAAwB,CAAA;AAC1D,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,iBAAiB,EAAC,MAAM,gBAAgB,CAAA;AAEhD,OAAO,EAAO,UAAU,EAAiB,MAAM,UAAU,CAAA;AACzD,OAAO,EAAC,MAAM,EAAC,MAAM,WAAW,CAAA;AAChC,OAAO,
|
|
1
|
+
{"version":3,"file":"quote.js","sourceRoot":"","sources":["../../../../../src/api/quoter/quote/quote.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quoter-custom-preset.request.js","sourceRoot":"","sources":["../../../../src/api/quoter/quoter-custom-preset.request.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,aAAa,EAAC,MAAM,mBAAmB,CAAA;AAE/C,MAAM,OAAO,yBAAyB;IAGlC,YAAY,MAAuC;QAC/C,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAA;IAC3C,CAAC;IAED,MAAM,CAAC,GAAG,CACN,MAAuC;QAEvC,OAAO,IAAI,yBAAyB,CAAC,MAAM,CAAC,CAAA;IAChD,CAAC;IAED,KAAK;QACD,OAAO;YACH,eAAe,EAAE,IAAI,CAAC,YAAY,CAAC,eAAe;YAClD,gBAAgB,EAAE,IAAI,CAAC,YAAY,CAAC,gBAAgB;YACpD,kBAAkB,EAAE,IAAI,CAAC,YAAY,CAAC,kBAAkB;YACxD,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,MAAM;SACnC,CAAA;IACL,CAAC;IAED,QAAQ;QACJ,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"quoter-custom-preset.request.js","sourceRoot":"","sources":["../../../../src/api/quoter/quoter-custom-preset.request.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,aAAa,EAAC,MAAM,mBAAmB,CAAA;AAE/C,MAAM,OAAO,yBAAyB;IAGlC,YAAY,MAAuC;QAC/C,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAA;IAC3C,CAAC;IAED,MAAM,CAAC,GAAG,CACN,MAAuC;QAEvC,OAAO,IAAI,yBAAyB,CAAC,MAAM,CAAC,CAAA;IAChD,CAAC;IAED,KAAK;QACD,OAAO;YACH,eAAe,EAAE,IAAI,CAAC,YAAY,CAAC,eAAe;YAClD,gBAAgB,EAAE,IAAI,CAAC,YAAY,CAAC,gBAAgB;YACpD,kBAAkB,EAAE,IAAI,CAAC,YAAY,CAAC,kBAAkB;YACxD,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,MAAM;SACnC,CAAA;IACL,CAAC;IAED,QAAQ;QACJ,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,EAAE,CAAC;YACvD,OAAO,4BAA4B,CAAA;QACvC,CAAC;QAED,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,EAAE,CAAC;YACrD,OAAO,0BAA0B,CAAA;QACrC,CAAC;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,uBAAuB,CAC5C,IAAI,CAAC,YAAY,CAAC,eAAe,CACpC,CAAA;QAED,IAAI,WAAW,EAAE,CAAC;YACd,OAAO,WAAW,CAAA;QACtB,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,CACjC,IAAI,CAAC,YAAY,CAAC,MAAM,EACxB,IAAI,CAAC,YAAY,CAAC,kBAAkB,EACpC,IAAI,CAAC,YAAY,CAAC,gBAAgB,CACrC,CAAA;QAED,IAAI,SAAS,EAAE,CAAC;YACZ,OAAO,SAAS,CAAA;QACpB,CAAC;QAED,OAAO,IAAI,CAAA;IACf,CAAC;IAEO,uBAAuB,CAAC,QAAiB;QAC7C,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;YAClD,OAAO,mCAAmC,CAAA;QAC9C,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC9B,OAAO,+CAA+C,CAAA;QAC1D,CAAC;QAED,OAAO,IAAI,CAAA;IACf,CAAC;IAEO,cAAc,CAClB,SAA8B,EAAE,EAChC,kBAA0B,EAC1B,gBAAwB;QAExB,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,OAAO,IAAI,CAAA;QACf,CAAC;QAED,IAAI,CAAC;YACD,MAAM,cAAc,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAA;YAEjE,MAAM,OAAO,GAAG,cAAc,CAAC,KAAK,CAChC,CAAC,MAAM,EAAE,EAAE,CACP,MAAM,IAAI,MAAM,CAAC,kBAAkB,CAAC;gBACpC,MAAM,IAAI,MAAM,CAAC,gBAAgB,CAAC,CACzC,CAAA;YAED,IAAI,CAAC,OAAO,EAAE,CAAC;gBACX,OAAO,sCAAsC,CAAA;YACjD,CAAC;QACL,CAAC;QAAC,MAAM,CAAC;YACL,OAAO,4CAA4C,CAAA;QACvD,CAAC;QAED,OAAO,IAAI,CAAA;IACf,CAAC;CACJ"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quoter.api.js","sourceRoot":"","sources":["../../../../src/api/quoter/quoter.api.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,KAAK,EAAC,MAAM,SAAS,CAAA;AAE7B,OAAO,EAAC,iBAAiB,EAAC,MAAM,WAAW,CAAA;AAC3C,OAAO,EAAC,sBAAsB,EAAwB,MAAM,iBAAiB,CAAA;AAE7E,MAAM,OAAO,SAAS;IAGlB,YACqB,MAAuB,EACvB,UAAiC;QADjC,WAAM,GAAN,MAAM,CAAiB;QACvB,eAAU,GAAV,UAAU,CAAuB;IACnD,CAAC;IAEJ,MAAM,CAAC,GAAG,CACN,MAAuB,EACvB,aAAoC,IAAI,sBAAsB,CAC1D,MAAM,CAAC,OAAO,CACjB;QAED,OAAO,IAAI,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;IAC5C,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,MAAqB;QAChC,MAAM,WAAW,GAAG,iBAAiB,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAA;QACrD,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,SAAS,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,kBAAkB,WAAW,EAAE,CAAA;QAEzG,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAiB,GAAG,CAAC,CAAA;QAE1D,OAAO,IAAI,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACjC,CAAC;IAED,KAAK,CAAC,wBAAwB,CAC1B,MAAqB,EACrB,IAA+B;QAE/B,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAA;QAE/B,IAAI,OAAO,EAAE;
|
|
1
|
+
{"version":3,"file":"quoter.api.js","sourceRoot":"","sources":["../../../../src/api/quoter/quoter.api.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,KAAK,EAAC,MAAM,SAAS,CAAA;AAE7B,OAAO,EAAC,iBAAiB,EAAC,MAAM,WAAW,CAAA;AAC3C,OAAO,EAAC,sBAAsB,EAAwB,MAAM,iBAAiB,CAAA;AAE7E,MAAM,OAAO,SAAS;IAGlB,YACqB,MAAuB,EACvB,UAAiC;QADjC,WAAM,GAAN,MAAM,CAAiB;QACvB,eAAU,GAAV,UAAU,CAAuB;IACnD,CAAC;IAEJ,MAAM,CAAC,GAAG,CACN,MAAuB,EACvB,aAAoC,IAAI,sBAAsB,CAC1D,MAAM,CAAC,OAAO,CACjB;QAED,OAAO,IAAI,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;IAC5C,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,MAAqB;QAChC,MAAM,WAAW,GAAG,iBAAiB,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAA;QACrD,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,SAAS,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,kBAAkB,WAAW,EAAE,CAAA;QAEzG,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAiB,GAAG,CAAC,CAAA;QAE1D,OAAO,IAAI,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACjC,CAAC;IAED,KAAK,CAAC,wBAAwB,CAC1B,MAAqB,EACrB,IAA+B;QAE/B,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAA;QAE/B,IAAI,OAAO,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAA;QAC5B,CAAC;QAED,MAAM,WAAW,GAAG,iBAAiB,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAA;QACrD,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,EAAE,CAAA;QAC/B,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,SAAS,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,kBAAkB,WAAW,EAAE,CAAA;QAEzG,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAiB,GAAG,EAAE,UAAU,CAAC,CAAA;QAEvE,OAAO,IAAI,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACjC,CAAC;;AA1Cc,iBAAO,GAAG,MAAM,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quoter.request.js","sourceRoot":"","sources":["../../../../src/api/quoter/quoter.request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,wBAAwB,CAAA;AAE9C,OAAO,EAAC,aAAa,EAAC,MAAM,mBAAmB,CAAA;AAE/C,MAAM,OAAO,aAAa;IAmBtB,YAAY,MAA2B;QACnC,IAAI,CAAC,gBAAgB,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAA;QAC5D,IAAI,CAAC,cAAc,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,CAAA;QACxD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAA;QAC3B,IAAI,CAAC,aAAa,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;QACtD,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,IAAI,KAAK,CAAA;QACpD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAA;QAC3B,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAA;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,KAAK,CAAA;QACpC,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,IAAI,KAAK,CAAA;QAE1C,IAAI,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"quoter.request.js","sourceRoot":"","sources":["../../../../src/api/quoter/quoter.request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,wBAAwB,CAAA;AAE9C,OAAO,EAAC,aAAa,EAAC,MAAM,mBAAmB,CAAA;AAE/C,MAAM,OAAO,aAAa;IAmBtB,YAAY,MAA2B;QACnC,IAAI,CAAC,gBAAgB,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAA;QAC5D,IAAI,CAAC,cAAc,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,CAAA;QACxD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAA;QAC3B,IAAI,CAAC,aAAa,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;QACtD,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,IAAI,KAAK,CAAA;QACpD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAA;QAC3B,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAA;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,KAAK,CAAA;QACpC,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,IAAI,KAAK,CAAA;QAE1C,IAAI,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CACX,eAAe,OAAO,CAAC,eAAe,6CAA6C,CACtF,CAAA;QACL,CAAC;QAED,IAAI,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,EAAE,CAAC;YACjE,MAAM,IAAI,KAAK,CACX,WAAW,OAAO,CAAC,YAAY,SAAS,OAAO,CAAC,eAAe,EAAE,CACpE,CAAA;QACL,CAAC;QAED,IAAI,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC;YACnD,MAAM,IAAI,KAAK,CACX,yDAAyD,CAC5D,CAAA;QACL,CAAC;QAED,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,GAAG,IAAI,CAAC,MAAM,oBAAoB,CAAC,CAAA;QACvD,CAAC;QAED,IAAI,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;YACpC,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAA;QACpD,CAAC;IACL,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,MAA2B;QAClC,OAAO,IAAI,aAAa,CAAC,MAAM,CAAC,CAAA;IACpC,CAAC;IAED,KAAK;QACD,OAAO;YACH,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE;YAClD,cAAc,EAAE,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE;YAC9C,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,aAAa,EAAE,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE;YAC5C,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,SAAS,EAAE,IAAI,CAAC,SAAS;SAC5B,CAAA;IACL,CAAC;CACJ"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"axios-provider.connector.js","sourceRoot":"","sources":["../../../../src/connector/http/axios-provider.connector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAC,YAAY,EAAC,MAAM,OAAO,CAAA;AAEzC,OAAO,EAAC,SAAS,EAAC,MAAM,cAAc,CAAA;AAEtC,MAAM,OAAO,sBAAsB;IAC/B,YAA6B,OAAgB;QAAhB,YAAO,GAAP,OAAO,CAAS;IAAG,CAAC;IAEjD,KAAK,CAAC,GAAG,CAAI,GAAW;QACpB,IAAI;
|
|
1
|
+
{"version":3,"file":"axios-provider.connector.js","sourceRoot":"","sources":["../../../../src/connector/http/axios-provider.connector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAC,YAAY,EAAC,MAAM,OAAO,CAAA;AAEzC,OAAO,EAAC,SAAS,EAAC,MAAM,cAAc,CAAA;AAEtC,MAAM,OAAO,sBAAsB;IAC/B,YAA6B,OAAgB;QAAhB,YAAO,GAAP,OAAO,CAAS;IAAG,CAAC;IAEjD,KAAK,CAAC,GAAG,CAAI,GAAW;QACpB,IAAI,CAAC;YACD,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,CACvB,GAAG,EACH,IAAI,CAAC,OAAO;gBACR,CAAC,CAAC;oBACI,OAAO,EAAE;wBACL,aAAa,EAAE,UAAU,IAAI,CAAC,OAAO,EAAE;qBAC1C;iBACJ;gBACH,CAAC,CAAC,SAAS,CAClB,CAAA;YAED,OAAO,GAAG,CAAC,IAAI,CAAA;QACnB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,IAAI,YAAY,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,QAAQ,EAAE,MAAM,KAAK,GAAG,EAAE,CAAC;gBACxD,MAAM,IAAI,SAAS,EAAE,CAAA;YACzB,CAAC;YAED,MAAM,KAAK,CAAA;QACf,CAAC;IACL,CAAC;IAED,KAAK,CAAC,IAAI,CAAI,GAAW,EAAE,IAAa;QACpC,IAAI,CAAC;YACD,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,IAAI,CACxB,GAAG,EACH,IAAI,EACJ,IAAI,CAAC,OAAO;gBACR,CAAC,CAAC;oBACI,OAAO,EAAE;wBACL,aAAa,EAAE,UAAU,IAAI,CAAC,OAAO,EAAE;qBAC1C;iBACJ;gBACH,CAAC,CAAC,SAAS,CAClB,CAAA;YAED,OAAO,GAAG,CAAC,IAAI,CAAA;QACnB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,IAAI,YAAY,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,QAAQ,EAAE,MAAM,KAAK,GAAG,EAAE,CAAC;gBACxD,MAAM,IAAI,SAAS,EAAE,CAAA;YACzB,CAAC;YAED,MAAM,KAAK,CAAA;QACf,CAAC;IACL,CAAC;CACJ"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-client.connector.js","sourceRoot":"","sources":["../../../../src/connector/ws/websocket-client.connector.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,IAAI,CAAA;AAS1B,MAAM,OAAO,eAAe;IASxB,YAAY,MAAmB;QAC3B,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAA;QACrB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAA;QAE7B,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,KAAK,CAAA;QAEzC,IAAI,CAAC,QAAQ,EAAE;
|
|
1
|
+
{"version":3,"file":"websocket-client.connector.js","sourceRoot":"","sources":["../../../../src/connector/ws/websocket-client.connector.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/constants.js
CHANGED
|
@@ -11,7 +11,6 @@ export var NetworkEnum;
|
|
|
11
11
|
NetworkEnum[NetworkEnum["FANTOM"] = 250] = "FANTOM";
|
|
12
12
|
NetworkEnum[NetworkEnum["GNOSIS"] = 100] = "GNOSIS";
|
|
13
13
|
NetworkEnum[NetworkEnum["COINBASE"] = 8453] = "COINBASE";
|
|
14
|
-
NetworkEnum[NetworkEnum["LINEA"] = 59144] = "LINEA";
|
|
15
14
|
})(NetworkEnum || (NetworkEnum = {}));
|
|
16
15
|
export const ONE_INCH_LIMIT_ORDER_V4 = '0x111111125421ca6dc452d289314280a0f8842a65';
|
|
17
16
|
export const UINT_160_MAX = (1n << 160n) - 1n;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,EAAE,GAAG,IAAI,CAAA;AAEtB,MAAM,CAAN,IAAY,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,EAAE,GAAG,IAAI,CAAA;AAEtB,MAAM,CAAN,IAAY,WAWX;AAXD,WAAY,WAAW;IACnB,qDAAY,CAAA;IACZ,qDAAa,CAAA;IACb,mDAAY,CAAA;IACZ,oDAAY,CAAA;IACZ,yDAAgB,CAAA;IAChB,2DAAiB,CAAA;IACjB,sDAAa,CAAA;IACb,mDAAY,CAAA;IACZ,mDAAY,CAAA;IACZ,wDAAe,CAAA;AACnB,CAAC,EAXW,WAAW,KAAX,WAAW,QAWtB;AAED,MAAM,CAAC,MAAM,uBAAuB,GAChC,4CAA4C,CAAA;AAEhD,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,EAAE,IAAI,IAAI,CAAC,GAAG,EAAE,CAAA;AAC7C,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,CAAA;AAC3C,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,CAAA;AAC3C,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,CAAA;AAC3C,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,CAAA;AAC3C,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,CAAA;AAC3C,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,EAAE,IAAI,IAAI,CAAC,GAAG,EAAE,CAAA"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ethers } from 'ethers';
|
|
2
|
-
import { BytesIter } from '@1inch/byte-utils';
|
|
2
|
+
import { BytesBuilder, BytesIter } from '@1inch/byte-utils';
|
|
3
3
|
import assert from 'assert';
|
|
4
4
|
import { isHexBytes } from '../../validations';
|
|
5
5
|
import { add0x, trim0x } from '../../utils';
|
|
@@ -20,47 +20,55 @@ export class AuctionDetails {
|
|
|
20
20
|
assert(this.duration <= UINT_24_MAX);
|
|
21
21
|
assert(this.initialRateBump <= UINT_24_MAX);
|
|
22
22
|
}
|
|
23
|
-
static
|
|
24
|
-
assert(isHexBytes(data), 'Invalid auction details data');
|
|
25
|
-
const iter = BytesIter.BigInt(data);
|
|
23
|
+
static decodeFrom(iter) {
|
|
26
24
|
const gasBumpEstimate = iter.nextUint24();
|
|
27
25
|
const gasPriceEstimate = iter.nextUint32();
|
|
28
26
|
const start = iter.nextUint32();
|
|
29
27
|
const duration = iter.nextUint24();
|
|
30
28
|
const rateBump = Number(iter.nextUint24());
|
|
31
29
|
const points = [];
|
|
32
|
-
|
|
30
|
+
let pointsLen = BigInt(iter.nextUint8());
|
|
31
|
+
while (pointsLen--) {
|
|
33
32
|
points.push({
|
|
34
33
|
coefficient: Number(iter.nextUint24()),
|
|
35
34
|
delay: Number(iter.nextUint16())
|
|
36
35
|
});
|
|
37
36
|
}
|
|
38
37
|
return new AuctionDetails({
|
|
39
|
-
startTime: start,
|
|
40
|
-
duration: duration,
|
|
38
|
+
startTime: BigInt(start),
|
|
39
|
+
duration: BigInt(duration),
|
|
41
40
|
initialRateBump: rateBump,
|
|
42
41
|
points,
|
|
43
42
|
gasCost: {
|
|
44
|
-
gasBumpEstimate,
|
|
45
|
-
gasPriceEstimate
|
|
43
|
+
gasBumpEstimate: BigInt(gasBumpEstimate),
|
|
44
|
+
gasPriceEstimate: BigInt(gasPriceEstimate)
|
|
46
45
|
}
|
|
47
46
|
});
|
|
48
47
|
}
|
|
48
|
+
static decode(data) {
|
|
49
|
+
assert(isHexBytes(data), 'Invalid auction details data');
|
|
50
|
+
const iter = BytesIter.BigInt(data);
|
|
51
|
+
return AuctionDetails.decodeFrom(iter);
|
|
52
|
+
}
|
|
49
53
|
static fromExtension(extension) {
|
|
50
54
|
return AuctionDetails.decode(add0x(extension.makingAmountData.slice(42)));
|
|
51
55
|
}
|
|
52
56
|
encode() {
|
|
53
|
-
let details = ethers.solidityPacked(['uint24', 'uint32', 'uint32', 'uint24', 'uint24'], [
|
|
57
|
+
let details = ethers.solidityPacked(['uint24', 'uint32', 'uint32', 'uint24', 'uint24', 'uint8'], [
|
|
54
58
|
this.gasCost.gasBumpEstimate,
|
|
55
59
|
this.gasCost.gasPriceEstimate,
|
|
56
60
|
this.startTime,
|
|
57
61
|
this.duration,
|
|
58
|
-
this.initialRateBump
|
|
62
|
+
this.initialRateBump,
|
|
63
|
+
this.points.length
|
|
59
64
|
]);
|
|
60
65
|
for (let i = 0; i < this.points.length; i++) {
|
|
61
66
|
details += trim0x(ethers.solidityPacked(['uint24', 'uint16'], [this.points[i].coefficient, this.points[i].delay]));
|
|
62
67
|
}
|
|
63
68
|
return details;
|
|
64
69
|
}
|
|
70
|
+
encodeInto(builder = new BytesBuilder()) {
|
|
71
|
+
return builder.addBytes(this.encode());
|
|
72
|
+
}
|
|
65
73
|
}
|
|
66
74
|
//# sourceMappingURL=auction-details.js.map
|