@1inch/fusion-sdk 2.1.11-rc.1 → 2.1.11-rc.3
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 -0
- package/dist/cjs/api/orders/orders.api.js +3 -4
- 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 +5 -8
- 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 +39 -27
- 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 +3 -6
- 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/{amount-calculator/auction-calculator → auction-calculator}/auction-calculator.js +10 -14
- package/dist/cjs/auction-calculator/auction-calculator.js.map +1 -0
- package/dist/cjs/auction-calculator/constants.js +5 -0
- package/dist/cjs/auction-calculator/constants.js.map +1 -0
- package/dist/cjs/{amount-calculator/auction-calculator → auction-calculator}/index.js +1 -0
- package/dist/cjs/auction-calculator/index.js.map +1 -0
- package/dist/cjs/auction-calculator/utils.js +17 -0
- package/dist/cjs/auction-calculator/utils.js.map +1 -0
- 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 +3 -1
- package/dist/cjs/constants.js.map +1 -1
- package/dist/cjs/fusion-order/auction-details/auction-details.js +10 -18
- package/dist/cjs/fusion-order/auction-details/auction-details.js.map +1 -1
- package/dist/cjs/fusion-order/cancellation-auction.js +20 -0
- package/dist/cjs/fusion-order/cancellation-auction.js.map +1 -0
- package/dist/cjs/fusion-order/constants.js +3 -1
- package/dist/cjs/fusion-order/constants.js.map +1 -1
- package/dist/cjs/fusion-order/fusion-extension.js +18 -137
- package/dist/cjs/fusion-order/fusion-extension.js.map +1 -1
- package/dist/cjs/fusion-order/fusion-order.js +64 -53
- package/dist/cjs/fusion-order/fusion-order.js.map +1 -1
- package/dist/cjs/fusion-order/index.js +3 -4
- package/dist/cjs/fusion-order/index.js.map +1 -1
- package/dist/cjs/fusion-order/settlement-post-interaction-data/index.js +6 -0
- package/dist/cjs/fusion-order/settlement-post-interaction-data/index.js.map +1 -0
- package/dist/cjs/fusion-order/settlement-post-interaction-data/settlement-post-interaction-data.js +153 -0
- package/dist/cjs/fusion-order/settlement-post-interaction-data/settlement-post-interaction-data.js.map +1 -0
- package/dist/cjs/fusion-order/settlement-post-interaction-data/types.js.map +1 -0
- package/dist/cjs/fusion-order/source-track.js +2 -1
- package/dist/cjs/fusion-order/source-track.js.map +1 -1
- package/dist/cjs/{utils → fusion-order}/types.js.map +1 -1
- package/dist/cjs/index.js +5 -2
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/sdk/encoders/cancel-order.encoder.js +2 -1
- package/dist/cjs/sdk/encoders/cancel-order.encoder.js.map +1 -1
- package/dist/cjs/sdk/sdk.js +34 -25
- package/dist/cjs/sdk/sdk.js.map +1 -1
- package/dist/cjs/sdk/utils.js +3 -2
- package/dist/cjs/sdk/utils.js.map +1 -1
- package/dist/cjs/tsconfig.cjs.tsbuildinfo +1 -1
- package/dist/cjs/utils/amounts.js +3 -2
- package/dist/cjs/utils/amounts.js.map +1 -1
- package/dist/cjs/utils/time.js +2 -1
- package/dist/cjs/utils/time.js.map +1 -1
- package/dist/cjs/utils.js +3 -2
- package/dist/cjs/utils.js.map +1 -1
- package/dist/cjs/validations.js +6 -5
- 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 +2 -1
- package/dist/cjs/ws-api/url.js.map +1 -1
- package/dist/cjs/ws-api/ws-api.js.map +1 -1
- package/dist/esm/api/orders/orders.api.js +3 -4
- 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 +3 -7
- 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 +40 -29
- 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 +3 -6
- package/dist/esm/api/quoter/quoter.request.js.map +1 -1
- package/dist/esm/api/quoter/types.js.map +1 -1
- package/dist/esm/{amount-calculator/auction-calculator → auction-calculator}/auction-calculator.js +10 -14
- package/dist/esm/auction-calculator/auction-calculator.js.map +1 -0
- package/dist/esm/auction-calculator/constants.js +2 -0
- package/dist/esm/auction-calculator/constants.js.map +1 -0
- package/dist/esm/auction-calculator/index.js +3 -0
- package/dist/esm/auction-calculator/index.js.map +1 -0
- package/dist/esm/auction-calculator/utils.js +13 -0
- package/dist/esm/auction-calculator/utils.js.map +1 -0
- 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 +2 -0
- package/dist/esm/constants.js.map +1 -1
- package/dist/esm/fusion-order/auction-details/auction-details.js +11 -19
- package/dist/esm/fusion-order/auction-details/auction-details.js.map +1 -1
- package/dist/esm/fusion-order/cancellation-auction.js +15 -0
- package/dist/esm/fusion-order/cancellation-auction.js.map +1 -0
- package/dist/esm/fusion-order/constants.js +3 -1
- package/dist/esm/fusion-order/constants.js.map +1 -1
- package/dist/esm/fusion-order/fusion-extension.js +19 -138
- package/dist/esm/fusion-order/fusion-extension.js.map +1 -1
- package/dist/esm/fusion-order/fusion-order.js +64 -53
- package/dist/esm/fusion-order/fusion-order.js.map +1 -1
- package/dist/esm/fusion-order/index.js +2 -2
- package/dist/esm/fusion-order/index.js.map +1 -1
- package/dist/esm/fusion-order/settlement-post-interaction-data/index.js +3 -0
- package/dist/esm/fusion-order/settlement-post-interaction-data/index.js.map +1 -0
- package/dist/esm/fusion-order/settlement-post-interaction-data/settlement-post-interaction-data.js +148 -0
- package/dist/esm/fusion-order/settlement-post-interaction-data/settlement-post-interaction-data.js.map +1 -0
- package/dist/esm/fusion-order/settlement-post-interaction-data/types.js.map +1 -0
- package/dist/esm/fusion-order/source-track.js.map +1 -1
- package/dist/esm/{utils → fusion-order}/types.js.map +1 -1
- package/dist/esm/index.js +2 -2
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/sdk/sdk.js +34 -25
- 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.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/api/orders/types.d.ts +0 -1
- package/dist/types/src/api/params.d.ts +1 -1
- package/dist/types/src/api/quoter/quote/quote.d.ts +6 -4
- package/dist/types/src/api/quoter/quote/types.d.ts +2 -11
- package/dist/types/src/api/quoter/quoter.request.d.ts +3 -4
- package/dist/types/src/api/quoter/types.d.ts +4 -11
- package/dist/types/src/{amount-calculator/auction-calculator → auction-calculator}/auction-calculator.d.ts +5 -5
- package/dist/types/src/auction-calculator/constants.d.ts +1 -0
- package/dist/types/src/{amount-calculator/auction-calculator → auction-calculator}/index.d.ts +1 -0
- package/dist/types/src/auction-calculator/utils.d.ts +5 -0
- package/dist/types/src/constants.d.ts +3 -1
- package/dist/types/src/fusion-order/auction-details/auction-details.d.ts +0 -3
- package/dist/types/src/fusion-order/cancellation-auction.d.ts +7 -0
- package/dist/types/src/fusion-order/constants.d.ts +2 -0
- package/dist/types/src/fusion-order/fusion-extension.d.ts +6 -18
- package/dist/types/src/fusion-order/fusion-order.d.ts +15 -39
- package/dist/types/src/fusion-order/index.d.ts +2 -2
- package/dist/types/src/fusion-order/settlement-post-interaction-data/index.d.ts +2 -0
- package/dist/types/src/fusion-order/settlement-post-interaction-data/settlement-post-interaction-data.d.ts +22 -0
- package/dist/types/src/fusion-order/settlement-post-interaction-data/types.d.ts +16 -0
- package/dist/types/src/fusion-order/types.d.ts +22 -0
- package/dist/types/src/index.d.ts +2 -2
- package/dist/types/src/sdk/sdk.d.ts +3 -0
- package/dist/types/src/sdk/types.d.ts +9 -4
- package/dist/types/tsconfig.types.tsbuildinfo +1 -1
- package/package.json +22 -23
- package/dist/cjs/amount-calculator/amount-calculator.js +0 -66
- package/dist/cjs/amount-calculator/amount-calculator.js.map +0 -1
- package/dist/cjs/amount-calculator/auction-calculator/auction-calculator.js.map +0 -1
- package/dist/cjs/amount-calculator/auction-calculator/index.js.map +0 -1
- package/dist/cjs/amount-calculator/index.js +0 -10
- package/dist/cjs/amount-calculator/index.js.map +0 -1
- package/dist/cjs/api/version.js +0 -5
- package/dist/cjs/api/version.js.map +0 -1
- package/dist/cjs/fusion-order/whitelist/index.js +0 -5
- package/dist/cjs/fusion-order/whitelist/index.js.map +0 -1
- package/dist/cjs/fusion-order/whitelist/types.js.map +0 -1
- package/dist/cjs/fusion-order/whitelist/whitelist.js +0 -121
- package/dist/cjs/fusion-order/whitelist/whitelist.js.map +0 -1
- package/dist/esm/amount-calculator/amount-calculator.js +0 -62
- package/dist/esm/amount-calculator/amount-calculator.js.map +0 -1
- package/dist/esm/amount-calculator/auction-calculator/auction-calculator.js.map +0 -1
- package/dist/esm/amount-calculator/auction-calculator/index.js +0 -2
- package/dist/esm/amount-calculator/auction-calculator/index.js.map +0 -1
- package/dist/esm/amount-calculator/index.js +0 -4
- package/dist/esm/amount-calculator/index.js.map +0 -1
- package/dist/esm/api/version.js +0 -2
- package/dist/esm/api/version.js.map +0 -1
- package/dist/esm/fusion-order/whitelist/index.js +0 -2
- package/dist/esm/fusion-order/whitelist/index.js.map +0 -1
- package/dist/esm/fusion-order/whitelist/types.js.map +0 -1
- package/dist/esm/fusion-order/whitelist/whitelist.js +0 -116
- package/dist/esm/fusion-order/whitelist/whitelist.js.map +0 -1
- package/dist/types/src/amount-calculator/amount-calculator.d.ts +0 -21
- package/dist/types/src/amount-calculator/index.d.ts +0 -3
- package/dist/types/src/api/version.d.ts +0 -1
- package/dist/types/src/fusion-order/whitelist/index.d.ts +0 -1
- package/dist/types/src/fusion-order/whitelist/types.d.ts +0 -4
- package/dist/types/src/fusion-order/whitelist/whitelist.d.ts +0 -26
- package/dist/types/src/utils/types.d.ts +0 -3
- /package/dist/cjs/fusion-order/{whitelist → settlement-post-interaction-data}/types.js +0 -0
- /package/dist/cjs/{utils → fusion-order}/types.js +0 -0
- /package/dist/esm/fusion-order/{whitelist → settlement-post-interaction-data}/types.js +0 -0
- /package/dist/esm/{utils → fusion-order}/types.js +0 -0
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
tslib_1.__exportStar(require("./settlement-post-interaction-data"), exports);
|
|
5
|
+
tslib_1.__exportStar(require("./types"), exports);
|
|
6
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/fusion-order/settlement-post-interaction-data/index.ts"],"names":[],"mappings":";;;AAAA,6EAAkD;AAClD,kDAAuB"}
|
package/dist/cjs/fusion-order/settlement-post-interaction-data/settlement-post-interaction-data.js
ADDED
|
@@ -0,0 +1,153 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.SettlementPostInteractionData = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const limit_order_sdk_1 = require("@1inch/limit-order-sdk");
|
|
6
|
+
const byte_utils_1 = require("@1inch/byte-utils");
|
|
7
|
+
const assert_1 = tslib_1.__importDefault(require("assert"));
|
|
8
|
+
const validations_1 = require("../../validations");
|
|
9
|
+
const utils_1 = require("../../utils");
|
|
10
|
+
const constants_1 = require("../../constants");
|
|
11
|
+
const time_1 = require("../../utils/time");
|
|
12
|
+
class SettlementPostInteractionData {
|
|
13
|
+
constructor(data) {
|
|
14
|
+
this.whitelist = data.whitelist;
|
|
15
|
+
this.integratorFee = data?.integratorFee;
|
|
16
|
+
this.bankFee = data.bankFee || 0n;
|
|
17
|
+
this.resolvingStartTime = data.resolvingStartTime;
|
|
18
|
+
this.customReceiver = data.customReceiver;
|
|
19
|
+
if (this.integratorFee?.ratio) {
|
|
20
|
+
(0, assert_1.default)(!this.integratorFee.receiver.isZero(), 'Fee receiver can not be zero when fee set');
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
static new(data) {
|
|
24
|
+
(0, assert_1.default)(data.whitelist.length, 'Whitelist can not be empty');
|
|
25
|
+
let sumDelay = 0n;
|
|
26
|
+
const whitelist = data.whitelist
|
|
27
|
+
.map((d) => ({
|
|
28
|
+
addressHalf: d.address.toString().slice(-20),
|
|
29
|
+
allowFrom: d.allowFrom < data.resolvingStartTime
|
|
30
|
+
? data.resolvingStartTime
|
|
31
|
+
: d.allowFrom
|
|
32
|
+
}))
|
|
33
|
+
.sort((a, b) => Number(a.allowFrom - b.allowFrom))
|
|
34
|
+
.map((val) => {
|
|
35
|
+
const delay = val.allowFrom - data.resolvingStartTime - sumDelay;
|
|
36
|
+
sumDelay += delay;
|
|
37
|
+
(0, assert_1.default)(delay < constants_1.UINT_16_MAX, 'Too big diff between timestamps');
|
|
38
|
+
return {
|
|
39
|
+
delay,
|
|
40
|
+
addressHalf: val.addressHalf
|
|
41
|
+
};
|
|
42
|
+
});
|
|
43
|
+
return new SettlementPostInteractionData({
|
|
44
|
+
...data,
|
|
45
|
+
whitelist
|
|
46
|
+
});
|
|
47
|
+
}
|
|
48
|
+
static decode(data) {
|
|
49
|
+
(0, assert_1.default)((0, validations_1.isHexBytes)(data), 'Post interaction data must be valid bytes string');
|
|
50
|
+
const iter = byte_utils_1.BytesIter.BigInt(data);
|
|
51
|
+
const flags = new byte_utils_1.BN(iter.nextByte(byte_utils_1.BytesIter.SIDE.Back));
|
|
52
|
+
let bankFee = 0n;
|
|
53
|
+
let integratorFee;
|
|
54
|
+
let customReceiver;
|
|
55
|
+
if (flags.getBit(0n)) {
|
|
56
|
+
bankFee = iter.nextUint32();
|
|
57
|
+
}
|
|
58
|
+
if (flags.getBit(1n)) {
|
|
59
|
+
const integratorFeeRatio = iter.nextUint16();
|
|
60
|
+
const integratorAddress = iter.nextUint160();
|
|
61
|
+
integratorFee = {
|
|
62
|
+
ratio: integratorFeeRatio,
|
|
63
|
+
receiver: limit_order_sdk_1.Address.fromBigInt(integratorAddress)
|
|
64
|
+
};
|
|
65
|
+
if (flags.getBit(2n)) {
|
|
66
|
+
customReceiver = limit_order_sdk_1.Address.fromBigInt(iter.nextUint160());
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
const resolvingStartTime = iter.nextUint32();
|
|
70
|
+
const whitelist = [];
|
|
71
|
+
while (!iter.isEmpty()) {
|
|
72
|
+
const addressHalf = iter
|
|
73
|
+
.nextBytes(10)
|
|
74
|
+
.toString(16)
|
|
75
|
+
.padStart(20, '0');
|
|
76
|
+
const delay = iter.nextUint16();
|
|
77
|
+
whitelist.push({
|
|
78
|
+
addressHalf,
|
|
79
|
+
delay
|
|
80
|
+
});
|
|
81
|
+
}
|
|
82
|
+
return new SettlementPostInteractionData({
|
|
83
|
+
integratorFee,
|
|
84
|
+
bankFee,
|
|
85
|
+
resolvingStartTime,
|
|
86
|
+
whitelist,
|
|
87
|
+
customReceiver
|
|
88
|
+
});
|
|
89
|
+
}
|
|
90
|
+
static fromExtension(extension) {
|
|
91
|
+
return SettlementPostInteractionData.decode((0, utils_1.add0x)(extension.postInteraction.slice(42)));
|
|
92
|
+
}
|
|
93
|
+
encode() {
|
|
94
|
+
let bitMask = new byte_utils_1.BN(0n);
|
|
95
|
+
const bytes = new byte_utils_1.BytesBuilder();
|
|
96
|
+
if (this.bankFee) {
|
|
97
|
+
bitMask = bitMask.setBit(0n, 1);
|
|
98
|
+
bytes.addUint32(this.bankFee);
|
|
99
|
+
}
|
|
100
|
+
if (this.integratorFee?.ratio) {
|
|
101
|
+
bitMask = bitMask.setBit(1n, 1);
|
|
102
|
+
bytes
|
|
103
|
+
.addUint16(this.integratorFee.ratio)
|
|
104
|
+
.addAddress(this.integratorFee.receiver.toString());
|
|
105
|
+
if (this.customReceiver && !this.customReceiver.isZero()) {
|
|
106
|
+
bitMask = bitMask.setBit(2n, 1);
|
|
107
|
+
bytes.addAddress(this.customReceiver.toString());
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
bytes.addUint32(this.resolvingStartTime);
|
|
111
|
+
for (const wl of this.whitelist) {
|
|
112
|
+
bytes.addBytes((0, utils_1.add0x)(wl.addressHalf)).addUint16(wl.delay);
|
|
113
|
+
}
|
|
114
|
+
bitMask = bitMask.setMask(new byte_utils_1.BitMask(3n, 8n), BigInt(this.whitelist.length));
|
|
115
|
+
bytes.addUint8(bitMask.value);
|
|
116
|
+
return bytes.asHex();
|
|
117
|
+
}
|
|
118
|
+
canExecuteAt(executor, executionTime) {
|
|
119
|
+
const addressHalf = executor.toString().slice(-20);
|
|
120
|
+
let allowedFrom = this.resolvingStartTime;
|
|
121
|
+
for (const whitelist of this.whitelist) {
|
|
122
|
+
allowedFrom += whitelist.delay;
|
|
123
|
+
if (addressHalf === whitelist.addressHalf) {
|
|
124
|
+
return executionTime >= allowedFrom;
|
|
125
|
+
}
|
|
126
|
+
else if (executionTime < allowedFrom) {
|
|
127
|
+
return false;
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
return false;
|
|
131
|
+
}
|
|
132
|
+
isExclusivityPeriod(time = (0, time_1.now)()) {
|
|
133
|
+
if (this.whitelist.length === 1) {
|
|
134
|
+
return true;
|
|
135
|
+
}
|
|
136
|
+
if (this.whitelist[0].delay === this.whitelist[1].delay) {
|
|
137
|
+
return false;
|
|
138
|
+
}
|
|
139
|
+
return time <= this.resolvingStartTime + this.whitelist[1].delay;
|
|
140
|
+
}
|
|
141
|
+
isExclusiveResolver(wallet) {
|
|
142
|
+
const addressHalf = wallet.toString().slice(-20);
|
|
143
|
+
if (this.whitelist.length === 1) {
|
|
144
|
+
return addressHalf === this.whitelist[0].addressHalf;
|
|
145
|
+
}
|
|
146
|
+
if (this.whitelist[0].delay === this.whitelist[1].delay) {
|
|
147
|
+
return false;
|
|
148
|
+
}
|
|
149
|
+
return addressHalf === this.whitelist[0].addressHalf;
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
exports.SettlementPostInteractionData = SettlementPostInteractionData;
|
|
153
|
+
//# sourceMappingURL=settlement-post-interaction-data.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"settlement-post-interaction-data.js","sourceRoot":"","sources":["../../../../src/fusion-order/settlement-post-interaction-data/settlement-post-interaction-data.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/fusion-order/settlement-post-interaction-data/types.ts"],"names":[],"mappings":""}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.injectTrackCode =
|
|
3
|
+
exports.injectTrackCode = void 0;
|
|
4
4
|
const byte_utils_1 = require("@1inch/byte-utils");
|
|
5
5
|
const ethers_1 = require("ethers");
|
|
6
6
|
const utils_1 = require("../utils");
|
|
@@ -25,4 +25,5 @@ function injectTrackCode(salt, source) {
|
|
|
25
25
|
const track = source ? getTrackCodeForSource(source) : 0n;
|
|
26
26
|
return new byte_utils_1.BN(salt).setMask(TRACK_CODE_MASK, track).value;
|
|
27
27
|
}
|
|
28
|
+
exports.injectTrackCode = injectTrackCode;
|
|
28
29
|
//# sourceMappingURL=source-track.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"source-track.js","sourceRoot":"","sources":["../../../src/fusion-order/source-track.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"source-track.js","sourceRoot":"","sources":["../../../src/fusion-order/source-track.ts"],"names":[],"mappings":";;;AAAA,kDAA6C;AAC7C,mCAAyB;AACzB,oCAA8B;AAC9B,gDAA0C;AAE1C,MAAM,eAAe,GAAG,IAAI,oBAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;AAE/C,SAAS,qBAAqB,CAAC,MAAc;IACzC,IAAI,CAAC,IAAA,yBAAW,EAAC,MAAM,CAAC,EAAE;QACtB,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAA;KAC1B;IAED,IAAI,MAAM,CAAC,MAAM,KAAK,EAAE,EAAE;QACtB,OAAO,MAAM,CAAC,MAAM,CAAC,CAAA;KACxB;IAED,IAAI,MAAM,CAAC,MAAM,KAAK,EAAE,EAAE;QACtB,OAAO,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA;KACzC;IAED,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAA;AAC3B,CAAC;AAED,SAAS,QAAQ,CAAC,MAAc;IAC5B,OAAO,MAAM,CAAC,IAAA,aAAK,EAAC,IAAA,WAAE,EAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;AACjD,CAAC;AAED,SAAgB,eAAe,CAAC,IAAY,EAAE,MAAe;IACzD,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IAEzD,OAAO,IAAI,eAAE,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC,KAAK,CAAA;AAC7D,CAAC;AAJD,0CAIC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/fusion-order/types.ts"],"names":[],"mappings":""}
|
package/dist/cjs/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.OrderStatus = exports.Quote = exports.Preset = exports.PresetEnum = exports.QuoterCustomPresetRequest = exports.RelayerRequest = exports.QuoterRequest = exports.MakerTraits = exports.LimitOrderContract = exports.getLimitOrderV4Domain = exports.AmountMode = exports.ExtensionBuilder = exports.TakerTraits = exports.Interaction = exports.getLimitOrderContract = exports.randBigInt = exports.Extension = exports.Address = void 0;
|
|
3
|
+
exports.OrderStatus = exports.Quote = exports.Preset = exports.PresetEnum = exports.QuoterCustomPresetRequest = exports.RelayerRequest = exports.QuoterRequest = exports.NativeOrdersImpl = exports.NativeOrdersFactory = exports.ProxyFactory = exports.MakerTraits = exports.LimitOrderContract = exports.getLimitOrderV4Domain = exports.AmountMode = exports.ExtensionBuilder = exports.TakerTraits = exports.Interaction = exports.getLimitOrderContract = exports.randBigInt = exports.Extension = exports.Address = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
var limit_order_sdk_1 = require("@1inch/limit-order-sdk");
|
|
6
6
|
Object.defineProperty(exports, "Address", { enumerable: true, get: function () { return limit_order_sdk_1.Address; } });
|
|
@@ -14,8 +14,11 @@ Object.defineProperty(exports, "AmountMode", { enumerable: true, get: function (
|
|
|
14
14
|
Object.defineProperty(exports, "getLimitOrderV4Domain", { enumerable: true, get: function () { return limit_order_sdk_1.getLimitOrderV4Domain; } });
|
|
15
15
|
Object.defineProperty(exports, "LimitOrderContract", { enumerable: true, get: function () { return limit_order_sdk_1.LimitOrderContract; } });
|
|
16
16
|
Object.defineProperty(exports, "MakerTraits", { enumerable: true, get: function () { return limit_order_sdk_1.MakerTraits; } });
|
|
17
|
+
Object.defineProperty(exports, "ProxyFactory", { enumerable: true, get: function () { return limit_order_sdk_1.ProxyFactory; } });
|
|
18
|
+
Object.defineProperty(exports, "NativeOrdersFactory", { enumerable: true, get: function () { return limit_order_sdk_1.NativeOrdersFactory; } });
|
|
19
|
+
Object.defineProperty(exports, "NativeOrdersImpl", { enumerable: true, get: function () { return limit_order_sdk_1.NativeOrdersImpl; } });
|
|
17
20
|
tslib_1.__exportStar(require("./fusion-order/index"), exports);
|
|
18
|
-
tslib_1.__exportStar(require("./
|
|
21
|
+
tslib_1.__exportStar(require("./auction-calculator/index"), exports);
|
|
19
22
|
tslib_1.__exportStar(require("./connector/index"), exports);
|
|
20
23
|
tslib_1.__exportStar(require("./sdk/index"), exports);
|
|
21
24
|
tslib_1.__exportStar(require("./constants"), exports);
|
package/dist/cjs/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;AAAA,0DAkB+B;AAjB3B,0GAAA,OAAO,OAAA;AAEP,4GAAA,SAAS,OAAA;AACT,6GAAA,UAAU,OAAA;AACV,wHAAA,qBAAqB,OAAA;AACrB,8GAAA,WAAW,OAAA;AACX,8GAAA,WAAW,OAAA;AACX,mHAAA,gBAAgB,OAAA;AAChB,6GAAA,UAAU,OAAA;AACV,wHAAA,qBAAqB,OAAA;AACrB,qHAAA,kBAAkB,OAAA;AAGlB,8GAAA,WAAW,OAAA;AACX,+GAAA,YAAY,OAAA;AACZ,sHAAA,mBAAmB,OAAA;AACnB,mHAAA,gBAAgB,OAAA;AAEpB,+DAAoC;AACpC,qEAA0C;AAC1C,4DAAiC;AACjC,sDAA2B;AAC3B,sDAA2B;AAC3B,kDAAuB;AACvB,0DAA+B;AAC/B,uDAA4B;AAC5B,wDAA6B;AAC7B,mDAAwB;AACxB,mDAAwB;AACxB,6BAUc;AATV,oGAAA,aAAa,OAAA;AAEb,qGAAA,cAAc,OAAA;AACd,gHAAA,yBAAyB,OAAA;AACzB,iGAAA,UAAU,OAAA;AACV,6FAAA,MAAM,OAAA;AACN,4FAAA,KAAK,OAAA;AAEL,kGAAA,WAAW,OAAA"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.encodeCancelOrder =
|
|
3
|
+
exports.encodeCancelOrder = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const ethers_1 = require("ethers");
|
|
6
6
|
const assert_1 = tslib_1.__importDefault(require("assert"));
|
|
@@ -14,4 +14,5 @@ function encodeCancelOrder(hash, makerTraits) {
|
|
|
14
14
|
hash
|
|
15
15
|
]);
|
|
16
16
|
}
|
|
17
|
+
exports.encodeCancelOrder = encodeCancelOrder;
|
|
17
18
|
//# sourceMappingURL=cancel-order.encoder.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cancel-order.encoder.js","sourceRoot":"","sources":["../../../../src/sdk/encoders/cancel-order.encoder.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cancel-order.encoder.js","sourceRoot":"","sources":["../../../../src/sdk/encoders/cancel-order.encoder.ts"],"names":[],"mappings":";;;;AAAA,mCAAgC;AAEhC,4DAA2B;AAC3B,kHAAkE;AAClE,mDAA4C;AAE5C,MAAM,MAAM,GAAG,IAAI,kBAAS,CAAC,sCAAa,CAAC,CAAA;AAE3C,SAAgB,iBAAiB,CAC7B,IAAY,EACZ,WAAwB;IAExB,IAAA,gBAAM,EAAC,IAAA,wBAAU,EAAC,IAAI,CAAC,EAAE,oBAAoB,CAAC,CAAA;IAE9C,OAAO,MAAM,CAAC,kBAAkB,CAAC,aAAa,EAAE;QAC5C,WAAW,CAAC,QAAQ,EAAE;QACtB,IAAI;KACP,CAAC,CAAA;AACN,CAAC;AAVD,8CAUC"}
|
package/dist/cjs/sdk/sdk.js
CHANGED
|
@@ -35,9 +35,9 @@ class FusionSDK {
|
|
|
35
35
|
walletAddress: params.walletAddress || limit_order_sdk_1.Address.ZERO_ADDRESS.toString(),
|
|
36
36
|
permit: params.permit,
|
|
37
37
|
enableEstimate: !!params.enableEstimate,
|
|
38
|
+
fee: params?.takingFeeBps,
|
|
38
39
|
source: params.source,
|
|
39
|
-
isPermit2: params.isPermit2
|
|
40
|
-
integratorFee: params.integratorFee
|
|
40
|
+
isPermit2: params.isPermit2
|
|
41
41
|
});
|
|
42
42
|
return this.api.getQuote(request);
|
|
43
43
|
}
|
|
@@ -49,7 +49,7 @@ class FusionSDK {
|
|
|
49
49
|
walletAddress: params.walletAddress || limit_order_sdk_1.Address.ZERO_ADDRESS.toString(),
|
|
50
50
|
permit: params.permit,
|
|
51
51
|
enableEstimate: !!params.enableEstimate,
|
|
52
|
-
|
|
52
|
+
fee: params?.takingFeeBps,
|
|
53
53
|
source: params.source,
|
|
54
54
|
isPermit2: params.isPermit2
|
|
55
55
|
});
|
|
@@ -69,35 +69,24 @@ class FusionSDK {
|
|
|
69
69
|
: undefined,
|
|
70
70
|
preset: params.preset,
|
|
71
71
|
nonce: params.nonce,
|
|
72
|
+
takingFeeReceiver: params.fee?.takingFeeReceiver,
|
|
72
73
|
allowPartialFills: params.allowPartialFills,
|
|
73
74
|
allowMultipleFills: params.allowMultipleFills,
|
|
74
75
|
orderExpirationDelay: params.orderExpirationDelay,
|
|
75
76
|
network: this.config.network
|
|
76
77
|
});
|
|
77
78
|
const hash = order.getOrderHash(this.config.network);
|
|
78
|
-
return { order, hash, quoteId: quote.quoteId };
|
|
79
|
-
}
|
|
80
|
-
async submitOrder(order, quoteId) {
|
|
81
|
-
if (!this.config.blockchainProvider) {
|
|
82
|
-
throw new Error('blockchainProvider has not set to config');
|
|
83
|
-
}
|
|
84
|
-
const orderStruct = order.build();
|
|
85
|
-
const signature = await this.config.blockchainProvider.signTypedData(orderStruct.maker, order.getTypedData(this.config.network));
|
|
86
|
-
const relayerRequest = api_1.RelayerRequest.new({
|
|
87
|
-
order: orderStruct,
|
|
88
|
-
signature,
|
|
89
|
-
quoteId,
|
|
90
|
-
extension: order.extension.encode()
|
|
91
|
-
});
|
|
92
|
-
await this.api.submitOrder(relayerRequest);
|
|
93
79
|
return {
|
|
94
|
-
order
|
|
95
|
-
|
|
96
|
-
quoteId,
|
|
97
|
-
|
|
98
|
-
extension: relayerRequest.extension
|
|
80
|
+
order,
|
|
81
|
+
hash,
|
|
82
|
+
quoteId: quote.quoteId,
|
|
83
|
+
nativeOrderFactory: quote.nativeOrderFactory?.factory
|
|
99
84
|
};
|
|
100
85
|
}
|
|
86
|
+
async submitOrder(order, quoteId) {
|
|
87
|
+
const signature = await this.signOrder(order);
|
|
88
|
+
return this._submitOrder(order, quoteId, signature);
|
|
89
|
+
}
|
|
101
90
|
async placeOrder(params) {
|
|
102
91
|
const { order, quoteId } = await this.createOrder(params);
|
|
103
92
|
return this.submitOrder(order, quoteId);
|
|
@@ -119,6 +108,26 @@ class FusionSDK {
|
|
|
119
108
|
const data = order.getTypedData(this.config.network);
|
|
120
109
|
return this.config.blockchainProvider.signTypedData(orderStruct.maker, data);
|
|
121
110
|
}
|
|
111
|
+
signNativeOrder(order, maker) {
|
|
112
|
+
return order.nativeSignature(maker);
|
|
113
|
+
}
|
|
114
|
+
async _submitOrder(order, quoteId, signature) {
|
|
115
|
+
const orderStruct = order.build();
|
|
116
|
+
const relayerRequest = api_1.RelayerRequest.new({
|
|
117
|
+
order: orderStruct,
|
|
118
|
+
signature,
|
|
119
|
+
quoteId,
|
|
120
|
+
extension: order.extension.encode()
|
|
121
|
+
});
|
|
122
|
+
await this.api.submitOrder(relayerRequest);
|
|
123
|
+
return {
|
|
124
|
+
order: orderStruct,
|
|
125
|
+
signature,
|
|
126
|
+
quoteId,
|
|
127
|
+
orderHash: order.getOrderHash(this.config.network),
|
|
128
|
+
extension: relayerRequest.extension
|
|
129
|
+
};
|
|
130
|
+
}
|
|
122
131
|
async getQuoteResult(params) {
|
|
123
132
|
const quoterRequest = api_1.QuoterRequest.new({
|
|
124
133
|
fromTokenAddress: params.fromTokenAddress,
|
|
@@ -127,9 +136,9 @@ class FusionSDK {
|
|
|
127
136
|
walletAddress: params.walletAddress,
|
|
128
137
|
permit: params.permit,
|
|
129
138
|
enableEstimate: true,
|
|
139
|
+
fee: params.fee?.takingFeeBps,
|
|
130
140
|
source: params.source,
|
|
131
|
-
isPermit2: params.isPermit2
|
|
132
|
-
integratorFee: params?.integratorFee
|
|
141
|
+
isPermit2: params.isPermit2
|
|
133
142
|
});
|
|
134
143
|
if (!params.customPreset) {
|
|
135
144
|
return this.api.getQuote(quoterRequest);
|
package/dist/cjs/sdk/sdk.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sdk.js","sourceRoot":"","sources":["../../../src/sdk/sdk.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"sdk.js","sourceRoot":"","sources":["../../../src/sdk/sdk.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/sdk/utils.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.bpsToRatioFormat =
|
|
4
|
-
exports.addRatioToAmount = addRatioToAmount;
|
|
3
|
+
exports.addRatioToAmount = exports.bpsToRatioFormat = void 0;
|
|
5
4
|
const FEE_BASE = 100000n;
|
|
6
5
|
const BPS_BASE = 10000n;
|
|
7
6
|
const BPS_TO_RATIO_NUMERATOR = FEE_BASE / BPS_BASE;
|
|
@@ -11,7 +10,9 @@ function bpsToRatioFormat(bps) {
|
|
|
11
10
|
}
|
|
12
11
|
return BigInt(bps) * BPS_TO_RATIO_NUMERATOR;
|
|
13
12
|
}
|
|
13
|
+
exports.bpsToRatioFormat = bpsToRatioFormat;
|
|
14
14
|
function addRatioToAmount(amount, ratio) {
|
|
15
15
|
return amount + (amount * ratio) / FEE_BASE;
|
|
16
16
|
}
|
|
17
|
+
exports.addRatioToAmount = addRatioToAmount;
|
|
17
18
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/sdk/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/sdk/utils.ts"],"names":[],"mappings":";;;AAAA,MAAM,QAAQ,GAAG,OAAQ,CAAA;AACzB,MAAM,QAAQ,GAAG,MAAO,CAAA;AACxB,MAAM,sBAAsB,GAAG,QAAQ,GAAG,QAAQ,CAAA;AAElD,SAAgB,gBAAgB,CAAC,GAAY;IACzC,IAAI,CAAC,GAAG,EAAE;QACN,OAAO,EAAE,CAAA;KACZ;IAED,OAAO,MAAM,CAAC,GAAG,CAAC,GAAG,sBAAsB,CAAA;AAC/C,CAAC;AAND,4CAMC;AAED,SAAgB,gBAAgB,CAAC,MAAc,EAAE,KAAa;IAC1D,OAAO,MAAM,GAAG,CAAC,MAAM,GAAG,KAAK,CAAC,GAAG,QAAQ,CAAA;AAC/C,CAAC;AAFD,4CAEC"}
|