@1inch/fusion-sdk 1.0.1-rc.6 → 1.0.1-rc.8
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/dist/api/orders/order-api.spec.js +1 -0
- package/dist/api/orders/order-api.spec.js.map +1 -1
- package/dist/api/quoter/quote/quote.d.ts +4 -0
- package/dist/api/quoter/quote/quote.js +3 -2
- package/dist/api/quoter/quote/quote.js.map +1 -1
- package/dist/api/quoter/quote/types.d.ts +4 -0
- package/dist/auction-calculator/auction-calculator.d.ts +14 -0
- package/dist/auction-calculator/auction-calculator.js +10 -2
- package/dist/auction-calculator/auction-calculator.js.map +1 -1
- package/dist/auction-calculator/auction-calculator.spec.js +7 -5
- package/dist/auction-calculator/auction-calculator.spec.js.map +1 -1
- package/dist/auction-calculator/calc.d.ts +8 -0
- package/dist/auction-calculator/calc.js +8 -0
- package/dist/auction-calculator/calc.js.map +1 -1
- package/dist/auction-calculator/constants.js +1 -1
- package/dist/auction-calculator/constants.js.map +1 -1
- package/dist/connector/blockchain/private-key-provider.connector.js +2 -0
- package/dist/connector/blockchain/private-key-provider.connector.js.map +1 -1
- package/dist/connector/ws/websocket-client.connector.js +2 -0
- package/dist/connector/ws/websocket-client.connector.js.map +1 -1
- package/dist/constants.d.ts +1 -0
- package/dist/constants.js +2 -1
- package/dist/constants.js.map +1 -1
- package/dist/fusion-order/auction-details/auction-details.d.ts +27 -0
- package/dist/fusion-order/auction-details/auction-details.js +18 -0
- package/dist/fusion-order/auction-details/auction-details.js.map +1 -1
- package/dist/fusion-order/auction-details/types.d.ts +12 -0
- package/dist/fusion-order/fusion-order.d.ts +44 -1
- package/dist/fusion-order/fusion-order.js +38 -3
- package/dist/fusion-order/fusion-order.js.map +1 -1
- package/dist/fusion-order/fusion-order.spec.js +5 -4
- package/dist/fusion-order/fusion-order.spec.js.map +1 -1
- package/dist/fusion-order/settlement-post-interaction-data/settlement-post-interaction-data.d.ts +34 -1
- package/dist/fusion-order/settlement-post-interaction-data/settlement-post-interaction-data.js +89 -21
- package/dist/fusion-order/settlement-post-interaction-data/settlement-post-interaction-data.js.map +1 -1
- package/dist/fusion-order/settlement-post-interaction-data/settlement-post-interaction-data.spec.js +56 -4
- package/dist/fusion-order/settlement-post-interaction-data/settlement-post-interaction-data.spec.js.map +1 -1
- package/dist/fusion-order/settlement-post-interaction-data/types.d.ts +11 -3
- package/dist/index.d.ts +1 -0
- package/dist/index.js +8 -1
- package/dist/index.js.map +1 -1
- package/dist/sdk/types.d.ts +11 -0
- package/dist/utils/amounts.d.ts +16 -0
- package/dist/utils/amounts.js +16 -0
- package/dist/utils/amounts.js.map +1 -1
- package/dist/utils/time.d.ts +1 -0
- package/dist/utils/time.js +8 -0
- package/dist/utils/time.js.map +1 -0
- package/dist/validations.d.ts +4 -0
- package/dist/validations.js +4 -0
- package/dist/validations.js.map +1 -1
- package/dist/ws-api/ws.spec.js +1 -0
- package/dist/ws-api/ws.spec.js.map +1 -1
- package/package.json +2 -2
|
@@ -13,8 +13,14 @@ const auction_calculator_1 = require("../auction-calculator");
|
|
|
13
13
|
const utils_1 = require("../utils");
|
|
14
14
|
const constants_1 = require("../constants");
|
|
15
15
|
const amounts_1 = require("../utils/amounts");
|
|
16
|
+
const time_1 = require("../utils/time");
|
|
16
17
|
class FusionOrder {
|
|
17
|
-
constructor(
|
|
18
|
+
constructor(
|
|
19
|
+
/**
|
|
20
|
+
* Fusion extension address
|
|
21
|
+
* @see https://github.com/1inch/limit-order-settlement
|
|
22
|
+
*/
|
|
23
|
+
extensionContract, orderInfo, auctionDetails, postInteractionData, extra = FusionOrder.defaultExtra) {
|
|
18
24
|
const { allowPartialFills, allowMultipleFills, unwrapWETH, enablePermit2, orderExpirationDelay, nonce, permit } = {
|
|
19
25
|
...FusionOrder.defaultExtra,
|
|
20
26
|
...extra
|
|
@@ -70,17 +76,29 @@ class FusionOrder {
|
|
|
70
76
|
get receiver() {
|
|
71
77
|
return this.inner.receiver;
|
|
72
78
|
}
|
|
79
|
+
/**
|
|
80
|
+
* Timestamp in sec
|
|
81
|
+
*/
|
|
73
82
|
get deadline() {
|
|
74
83
|
return this.inner.makerTraits.expiration() || 0n;
|
|
75
84
|
}
|
|
76
|
-
static new(
|
|
85
|
+
static new(
|
|
86
|
+
/**
|
|
87
|
+
* Fusion extension address
|
|
88
|
+
* @see https://github.com/1inch/limit-order-settlement
|
|
89
|
+
*/
|
|
90
|
+
settlementExtension, orderInfo, details, extra) {
|
|
77
91
|
return new FusionOrder(settlementExtension, orderInfo, details.auction, settlement_post_interaction_data_1.SettlementPostInteractionData.new({
|
|
78
92
|
bankFee: details.fees?.bankFee || 0n,
|
|
79
93
|
integratorFee: details.fees?.integratorFee,
|
|
80
94
|
whitelist: details.whitelist,
|
|
81
|
-
|
|
95
|
+
resolvingStartTime: details.resolvingStartTime ?? (0, time_1.now)()
|
|
82
96
|
}), extra);
|
|
83
97
|
}
|
|
98
|
+
/**
|
|
99
|
+
* Create FusionOrder from order data and extension
|
|
100
|
+
*
|
|
101
|
+
*/
|
|
84
102
|
static fromDataAndExtension(order, extension) {
|
|
85
103
|
const settlementContract = limit_order_sdk_1.Address.fromFirstBytes(extension.makingAmountData);
|
|
86
104
|
(0, assert_1.default)(limit_order_sdk_1.Address.fromFirstBytes(extension.takingAmountData).equal(settlementContract) &&
|
|
@@ -93,6 +111,7 @@ class FusionOrder {
|
|
|
93
111
|
? undefined
|
|
94
112
|
: deadline - auctionDetails.startTime - auctionDetails.duration;
|
|
95
113
|
return new FusionOrder(settlementContract, {
|
|
114
|
+
// shift because of how LimitOrder.buildSalt works
|
|
96
115
|
salt: BigInt(order.salt) >> 160n,
|
|
97
116
|
maker: new limit_order_sdk_1.Address(order.maker),
|
|
98
117
|
receiver: new limit_order_sdk_1.Address(order.receiver),
|
|
@@ -124,12 +143,28 @@ class FusionOrder {
|
|
|
124
143
|
getCalculator() {
|
|
125
144
|
return auction_calculator_1.AuctionCalculator.fromAuctionData(this.fusionExtension.postInteractionData, this.fusionExtension.details);
|
|
126
145
|
}
|
|
146
|
+
/**
|
|
147
|
+
* Calculates required taking amount for passed `makingAmount` at block time `time`
|
|
148
|
+
*
|
|
149
|
+
* @param makingAmount maker swap amount
|
|
150
|
+
* @param time execution time in sec
|
|
151
|
+
* @param blockBaseFee block fee in wei.
|
|
152
|
+
* */
|
|
127
153
|
calcTakingAmount(makingAmount, time, blockBaseFee = 0n) {
|
|
128
154
|
const takingAmount = (0, amounts_1.calcTakingAmount)(makingAmount, this.makingAmount, this.takingAmount);
|
|
129
155
|
const calculator = this.getCalculator();
|
|
130
156
|
const bump = calculator.calcRateBump(time, blockBaseFee);
|
|
131
157
|
return calculator.calcAuctionTakingAmount(takingAmount, bump);
|
|
132
158
|
}
|
|
159
|
+
/**
|
|
160
|
+
* Check whether address allowed to execute order at the given time
|
|
161
|
+
*
|
|
162
|
+
* @param executor address of executor
|
|
163
|
+
* @param executionTime timestamp in sec at which order planning to execute
|
|
164
|
+
*/
|
|
165
|
+
canExecuteAt(executor, executionTime) {
|
|
166
|
+
return this.fusionExtension.postInteractionData.canExecuteAt(executor, executionTime);
|
|
167
|
+
}
|
|
133
168
|
}
|
|
134
169
|
exports.FusionOrder = FusionOrder;
|
|
135
170
|
FusionOrder.defaultExtra = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fusion-order.js","sourceRoot":"","sources":["../../src/fusion-order/fusion-order.ts"],"names":[],"mappings":";;;;;;AAAA,4DAS+B;AAC/B,oDAA2B;AAC3B,yDAAkD;AAClD,uDAAgD;AAChD,yFAI2C;AAC3C,8DAAuD;AACvD,oCAA8B;AAC9B,4CAA+B;AAC/B,8CAAiD;
|
|
1
|
+
{"version":3,"file":"fusion-order.js","sourceRoot":"","sources":["../../src/fusion-order/fusion-order.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,9 +28,10 @@ describe('Fusion Order', () => {
|
|
|
28
28
|
whitelist: [
|
|
29
29
|
{
|
|
30
30
|
address: new limit_order_sdk_1.Address('0x00000000219ab540356cbb839cbe05303d7705fa'),
|
|
31
|
-
|
|
31
|
+
allowFrom: 0n
|
|
32
32
|
}
|
|
33
|
-
]
|
|
33
|
+
],
|
|
34
|
+
resolvingStartTime: 1673548139n
|
|
34
35
|
});
|
|
35
36
|
const builtOrder = order.build();
|
|
36
37
|
expect(builtOrder).toStrictEqual({
|
|
@@ -41,7 +42,7 @@ describe('Fusion Order', () => {
|
|
|
41
42
|
takerAsset: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
|
|
42
43
|
takingAmount: '1420000000',
|
|
43
44
|
makerTraits: '29852648006495581632639394572552351243421169944806257724550573036760110989312',
|
|
44
|
-
salt: '
|
|
45
|
+
salt: '14969955465678758833706505435513058355190519874774'
|
|
45
46
|
});
|
|
46
47
|
const makerTraits = new limit_order_sdk_1.MakerTraits(BigInt(builtOrder.makerTraits));
|
|
47
48
|
expect(makerTraits.isNativeUnwrapEnabled()).toEqual(false);
|
|
@@ -72,7 +73,7 @@ describe('Fusion Order', () => {
|
|
|
72
73
|
whitelist: [
|
|
73
74
|
{
|
|
74
75
|
address: new limit_order_sdk_1.Address('0x00000000219ab540356cbb839cbe05303d7705fa'),
|
|
75
|
-
|
|
76
|
+
allowFrom: 0n
|
|
76
77
|
}
|
|
77
78
|
]
|
|
78
79
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fusion-order.spec.js","sourceRoot":"","sources":["../../src/fusion-order/fusion-order.spec.ts"],"names":[],"mappings":";;AAAA,4DAA2D;AAC3D,iDAA0C;AAC1C,uDAAgD;AAEhD,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC1B,EAAE,CAAC,4BAA4B,EAAE,GAAG,EAAE;QAClC,MAAM,iBAAiB,GAAG,IAAI,yBAAO,CACjC,4CAA4C,CAC/C,CAAA;QAED,MAAM,KAAK,GAAG,0BAAW,CAAC,GAAG,CACzB,iBAAiB,EACjB;YACI,UAAU,EAAE,IAAI,yBAAO,CACnB,4CAA4C,CAC/C;YACD,UAAU,EAAE,IAAI,yBAAO,CACnB,4CAA4C,CAC/C;YACD,YAAY,EAAE,oBAAoB;YAClC,YAAY,EAAE,WAAW;YACzB,KAAK,EAAE,IAAI,yBAAO,CACd,4CAA4C,CAC/C;YACD,IAAI,EAAE,GAAG;SACZ,EACD;YACI,OAAO,EAAE,IAAI,gCAAc,CAAC;gBACxB,QAAQ,EAAE,IAAI;gBACd,SAAS,EAAE,WAAW;gBACtB,eAAe,EAAE,KAAK;gBACtB,MAAM,EAAE;oBACJ;wBACI,WAAW,EAAE,KAAK;wBAClB,KAAK,EAAE,EAAE;qBACZ;iBACJ;aACJ,CAAC;YACF,SAAS,EAAE;gBACP;oBACI,OAAO,EAAE,IAAI,yBAAO,CAChB,4CAA4C,CAC/C;oBACD,
|
|
1
|
+
{"version":3,"file":"fusion-order.spec.js","sourceRoot":"","sources":["../../src/fusion-order/fusion-order.spec.ts"],"names":[],"mappings":"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"}
|
package/dist/fusion-order/settlement-post-interaction-data/settlement-post-interaction-data.d.ts
CHANGED
|
@@ -1,16 +1,49 @@
|
|
|
1
|
+
import { Address } from '@1inch/limit-order-sdk';
|
|
1
2
|
import { IntegratorFee, SettlementSuffixData } from './types';
|
|
2
3
|
export declare class SettlementPostInteractionData {
|
|
3
4
|
readonly whitelist: WhitelistItem[];
|
|
4
5
|
readonly integratorFee?: IntegratorFee;
|
|
5
6
|
readonly bankFee: bigint;
|
|
6
|
-
readonly
|
|
7
|
+
readonly resolvingStartTime: bigint;
|
|
7
8
|
private constructor();
|
|
8
9
|
static new(data: SettlementSuffixData): SettlementPostInteractionData;
|
|
10
|
+
/**
|
|
11
|
+
* Construct `SettlementPostInteractionData` from bytes
|
|
12
|
+
* @param data bytes with 0x prefix in next format:
|
|
13
|
+
* - [uint32 feeBank] only when first bit of `bitMask` enabled
|
|
14
|
+
* - [uint160 integratorFeeReceiver, uint32 integratorFeeRation] only when second bit of `bitMask` enabled
|
|
15
|
+
* - uint32 auctionStartTime
|
|
16
|
+
* - (bytes10 last10bytesOfAddress, uint16 auctionDelay) * N whitelist info
|
|
17
|
+
* - uint8 bitMask:
|
|
18
|
+
* 0b0000_0001 - fee bank mask
|
|
19
|
+
* 0b0000_0010 - integrator fee mask
|
|
20
|
+
* 0b1111_1000 - resolvers count mask
|
|
21
|
+
*
|
|
22
|
+
* All data is tight packed
|
|
23
|
+
* @see SettlementPostInteractionData.encode
|
|
24
|
+
*/
|
|
9
25
|
static decode(data: string): SettlementPostInteractionData;
|
|
26
|
+
/**
|
|
27
|
+
* Serialize post-interaction data to bytes
|
|
28
|
+
*/
|
|
10
29
|
encode(): string;
|
|
30
|
+
/**
|
|
31
|
+
* Check whether address allowed to execute order at the given time
|
|
32
|
+
*
|
|
33
|
+
* @param executor address of executor
|
|
34
|
+
* @param executionTime timestamp in sec at which order planning to execute
|
|
35
|
+
*/
|
|
36
|
+
canExecuteAt(executor: Address, executionTime: bigint): boolean;
|
|
11
37
|
}
|
|
12
38
|
type WhitelistItem = {
|
|
39
|
+
/**
|
|
40
|
+
* last 10 bytes of address, no 0x prefix
|
|
41
|
+
*/
|
|
13
42
|
addressHalf: string;
|
|
43
|
+
/**
|
|
44
|
+
* Delay from previous resolver in seconds
|
|
45
|
+
* For first resolver delay from `resolvingStartTime`
|
|
46
|
+
*/
|
|
14
47
|
delay: bigint;
|
|
15
48
|
};
|
|
16
49
|
export {};
|
package/dist/fusion-order/settlement-post-interaction-data/settlement-post-interaction-data.js
CHANGED
|
@@ -10,32 +10,67 @@ const byte_utils_1 = require("@1inch/byte-utils");
|
|
|
10
10
|
const assert_1 = __importDefault(require("assert"));
|
|
11
11
|
const validations_1 = require("../../validations");
|
|
12
12
|
const utils_1 = require("../../utils");
|
|
13
|
+
const constants_1 = require("../../constants");
|
|
13
14
|
class SettlementPostInteractionData {
|
|
14
15
|
constructor(data) {
|
|
15
16
|
this.whitelist = data.whitelist;
|
|
16
17
|
this.integratorFee = data?.integratorFee;
|
|
17
|
-
this.bankFee = data.bankFee;
|
|
18
|
-
this.
|
|
18
|
+
this.bankFee = data.bankFee || 0n;
|
|
19
|
+
this.resolvingStartTime = data.resolvingStartTime;
|
|
19
20
|
}
|
|
20
21
|
static new(data) {
|
|
22
|
+
(0, assert_1.default)(data.whitelist.length, 'Whitelist can not be empty');
|
|
23
|
+
// transform timestamps to cumulative delays
|
|
24
|
+
let sumDelay = 0n;
|
|
25
|
+
const whitelist = data.whitelist
|
|
26
|
+
.map((d) => ({
|
|
27
|
+
addressHalf: d.address.toString().slice(-20),
|
|
28
|
+
allowFrom: d.allowFrom < data.resolvingStartTime
|
|
29
|
+
? data.resolvingStartTime
|
|
30
|
+
: d.allowFrom
|
|
31
|
+
}))
|
|
32
|
+
.sort((a, b) => Number(a.allowFrom - b.allowFrom)) // ASC
|
|
33
|
+
.map((val) => {
|
|
34
|
+
const delay = val.allowFrom - data.resolvingStartTime - sumDelay;
|
|
35
|
+
sumDelay += delay;
|
|
36
|
+
(0, assert_1.default)(delay < constants_1.UINT_16_MAX, 'Too big diff between timestamps');
|
|
37
|
+
return {
|
|
38
|
+
delay,
|
|
39
|
+
addressHalf: val.addressHalf
|
|
40
|
+
};
|
|
41
|
+
});
|
|
21
42
|
return new SettlementPostInteractionData({
|
|
22
43
|
...data,
|
|
23
|
-
whitelist
|
|
24
|
-
addressHalf: d.address.toString().slice(-20),
|
|
25
|
-
delay: d.delay
|
|
26
|
-
}))
|
|
44
|
+
whitelist
|
|
27
45
|
});
|
|
28
46
|
}
|
|
47
|
+
/**
|
|
48
|
+
* Construct `SettlementPostInteractionData` from bytes
|
|
49
|
+
* @param data bytes with 0x prefix in next format:
|
|
50
|
+
* - [uint32 feeBank] only when first bit of `bitMask` enabled
|
|
51
|
+
* - [uint160 integratorFeeReceiver, uint32 integratorFeeRation] only when second bit of `bitMask` enabled
|
|
52
|
+
* - uint32 auctionStartTime
|
|
53
|
+
* - (bytes10 last10bytesOfAddress, uint16 auctionDelay) * N whitelist info
|
|
54
|
+
* - uint8 bitMask:
|
|
55
|
+
* 0b0000_0001 - fee bank mask
|
|
56
|
+
* 0b0000_0010 - integrator fee mask
|
|
57
|
+
* 0b1111_1000 - resolvers count mask
|
|
58
|
+
*
|
|
59
|
+
* All data is tight packed
|
|
60
|
+
* @see SettlementPostInteractionData.encode
|
|
61
|
+
*/
|
|
29
62
|
static decode(data) {
|
|
30
63
|
(0, assert_1.default)((0, validations_1.isHexBytes)(data), 'Post interaction data must be valid bytes string');
|
|
31
64
|
const iter = byte_utils_1.BytesIter.BigInt(data);
|
|
32
|
-
const
|
|
65
|
+
const extra = iter.nextByte(byte_utils_1.BytesIter.SIDE.Back);
|
|
33
66
|
let bankFee = 0n;
|
|
34
67
|
let integratorFee;
|
|
35
|
-
|
|
68
|
+
// fee bank presented
|
|
69
|
+
if ((extra & 1n) === 1n) {
|
|
36
70
|
bankFee = iter.nextUint32();
|
|
37
71
|
}
|
|
38
|
-
|
|
72
|
+
// integrator fee presented
|
|
73
|
+
if ((extra & 2n) === 2n) {
|
|
39
74
|
const integratorAddress = iter.nextUint160();
|
|
40
75
|
const integratorFeeRatio = iter.nextUint32();
|
|
41
76
|
integratorFee = {
|
|
@@ -43,41 +78,48 @@ class SettlementPostInteractionData {
|
|
|
43
78
|
receiver: limit_order_sdk_1.Address.fromBigInt(integratorAddress)
|
|
44
79
|
};
|
|
45
80
|
}
|
|
46
|
-
const
|
|
81
|
+
const resolvingStartTime = iter.nextUint32();
|
|
47
82
|
const whitelist = [];
|
|
48
83
|
while (!iter.isEmpty()) {
|
|
49
84
|
const addressHalf = iter
|
|
50
85
|
.nextBytes(10)
|
|
51
86
|
.toString(16)
|
|
52
87
|
.padStart(20, '0');
|
|
53
|
-
const
|
|
88
|
+
const delay = iter.nextUint16();
|
|
54
89
|
whitelist.push({
|
|
55
90
|
addressHalf,
|
|
56
|
-
delay
|
|
91
|
+
delay
|
|
57
92
|
});
|
|
58
93
|
}
|
|
59
94
|
return new SettlementPostInteractionData({
|
|
60
95
|
integratorFee,
|
|
61
96
|
bankFee,
|
|
62
|
-
|
|
97
|
+
resolvingStartTime,
|
|
63
98
|
whitelist
|
|
64
99
|
});
|
|
65
100
|
}
|
|
101
|
+
/**
|
|
102
|
+
* Serialize post-interaction data to bytes
|
|
103
|
+
*/
|
|
66
104
|
encode() {
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
105
|
+
/**
|
|
106
|
+
* 0b0000_0001 - fee bank mask
|
|
107
|
+
* 0b0000_0010 - integrator fee mask
|
|
108
|
+
* 0b1111_1000 - resolvers count mask
|
|
109
|
+
*/
|
|
110
|
+
let bitMask = new byte_utils_1.BN(0n);
|
|
111
|
+
const data = [];
|
|
112
|
+
// Add bank fee if exists
|
|
72
113
|
if (this.bankFee) {
|
|
73
|
-
|
|
114
|
+
bitMask = bitMask.setBit(0n, 1);
|
|
74
115
|
data.push({
|
|
75
116
|
type: 'uint32',
|
|
76
117
|
value: ethers_1.ethers.solidityPacked(['uint32'], [this.bankFee])
|
|
77
118
|
});
|
|
78
119
|
}
|
|
120
|
+
// add integrator fee if exists
|
|
79
121
|
if (this.integratorFee?.ratio) {
|
|
80
|
-
|
|
122
|
+
bitMask = bitMask.setBit(1n, 1);
|
|
81
123
|
data.push({
|
|
82
124
|
type: 'uint160',
|
|
83
125
|
value: ethers_1.ethers.solidityPacked(['uint160'], [this.integratorFee.receiver.toString()])
|
|
@@ -88,8 +130,9 @@ class SettlementPostInteractionData {
|
|
|
88
130
|
}
|
|
89
131
|
data.push({
|
|
90
132
|
type: 'uint32',
|
|
91
|
-
value: this.
|
|
133
|
+
value: this.resolvingStartTime
|
|
92
134
|
});
|
|
135
|
+
// whitelist data
|
|
93
136
|
for (const wl of this.whitelist) {
|
|
94
137
|
data.push({
|
|
95
138
|
type: 'bytes10',
|
|
@@ -99,8 +142,33 @@ class SettlementPostInteractionData {
|
|
|
99
142
|
value: BigInt(wl.delay)
|
|
100
143
|
});
|
|
101
144
|
}
|
|
145
|
+
bitMask = bitMask.setMask(new byte_utils_1.BitMask(3n, 8n), BigInt(this.whitelist.length));
|
|
146
|
+
data.push({
|
|
147
|
+
type: 'uint8',
|
|
148
|
+
value: bitMask.value
|
|
149
|
+
});
|
|
102
150
|
return ethers_1.ethers.solidityPacked(data.map((d) => d.type), data.map((d) => d.value));
|
|
103
151
|
}
|
|
152
|
+
/**
|
|
153
|
+
* Check whether address allowed to execute order at the given time
|
|
154
|
+
*
|
|
155
|
+
* @param executor address of executor
|
|
156
|
+
* @param executionTime timestamp in sec at which order planning to execute
|
|
157
|
+
*/
|
|
158
|
+
canExecuteAt(executor, executionTime) {
|
|
159
|
+
const addressHalf = executor.toString().slice(-20);
|
|
160
|
+
let allowedFrom = this.resolvingStartTime;
|
|
161
|
+
for (const whitelist of this.whitelist) {
|
|
162
|
+
allowedFrom += whitelist.delay;
|
|
163
|
+
if (addressHalf === whitelist.addressHalf) {
|
|
164
|
+
return executionTime >= allowedFrom;
|
|
165
|
+
}
|
|
166
|
+
else if (executionTime < allowedFrom) {
|
|
167
|
+
return false;
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
return false;
|
|
171
|
+
}
|
|
104
172
|
}
|
|
105
173
|
exports.SettlementPostInteractionData = SettlementPostInteractionData;
|
|
106
174
|
//# sourceMappingURL=settlement-post-interaction-data.js.map
|
package/dist/fusion-order/settlement-post-interaction-data/settlement-post-interaction-data.js.map
CHANGED
|
@@ -1 +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":";;;;;;AAAA,mCAA6B;AAC7B,4DAA8C;AAC9C,
|
|
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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"}
|
package/dist/fusion-order/settlement-post-interaction-data/settlement-post-interaction-data.spec.js
CHANGED
|
@@ -7,19 +7,24 @@ describe('PostInteractionData', () => {
|
|
|
7
7
|
it('Should encode/decode with no fees and whitelist', () => {
|
|
8
8
|
const data = settlement_post_interaction_data_1.SettlementPostInteractionData.new({
|
|
9
9
|
bankFee: 0n,
|
|
10
|
-
|
|
11
|
-
whitelist: [
|
|
10
|
+
resolvingStartTime: 1708117482n,
|
|
11
|
+
whitelist: [
|
|
12
|
+
{
|
|
13
|
+
address: limit_order_sdk_1.Address.ZERO_ADDRESS,
|
|
14
|
+
allowFrom: 0n
|
|
15
|
+
}
|
|
16
|
+
]
|
|
12
17
|
});
|
|
13
18
|
expect(settlement_post_interaction_data_1.SettlementPostInteractionData.decode(data.encode())).toStrictEqual(data);
|
|
14
19
|
});
|
|
15
20
|
it('Should encode/decode with fees and whitelist', () => {
|
|
16
21
|
const data = settlement_post_interaction_data_1.SettlementPostInteractionData.new({
|
|
17
22
|
bankFee: 0n,
|
|
18
|
-
|
|
23
|
+
resolvingStartTime: 1708117482n,
|
|
19
24
|
whitelist: [
|
|
20
25
|
{
|
|
21
26
|
address: limit_order_sdk_1.Address.ZERO_ADDRESS,
|
|
22
|
-
|
|
27
|
+
allowFrom: 0n
|
|
23
28
|
}
|
|
24
29
|
],
|
|
25
30
|
integratorFee: {
|
|
@@ -29,5 +34,52 @@ describe('PostInteractionData', () => {
|
|
|
29
34
|
});
|
|
30
35
|
expect(settlement_post_interaction_data_1.SettlementPostInteractionData.decode(data.encode())).toStrictEqual(data);
|
|
31
36
|
});
|
|
37
|
+
it('Should generate correct whitelist', () => {
|
|
38
|
+
const start = 1708117482n;
|
|
39
|
+
const data = settlement_post_interaction_data_1.SettlementPostInteractionData.new({
|
|
40
|
+
resolvingStartTime: start,
|
|
41
|
+
whitelist: [
|
|
42
|
+
{
|
|
43
|
+
address: limit_order_sdk_1.Address.fromBigInt(2n),
|
|
44
|
+
allowFrom: start + 1000n
|
|
45
|
+
},
|
|
46
|
+
{
|
|
47
|
+
address: limit_order_sdk_1.Address.ZERO_ADDRESS,
|
|
48
|
+
allowFrom: start - 10n // should be set to start
|
|
49
|
+
},
|
|
50
|
+
{
|
|
51
|
+
address: limit_order_sdk_1.Address.fromBigInt(1n),
|
|
52
|
+
allowFrom: start + 10n
|
|
53
|
+
},
|
|
54
|
+
{
|
|
55
|
+
address: limit_order_sdk_1.Address.fromBigInt(3n),
|
|
56
|
+
allowFrom: start + 10n
|
|
57
|
+
}
|
|
58
|
+
]
|
|
59
|
+
});
|
|
60
|
+
expect(data.whitelist).toStrictEqual([
|
|
61
|
+
{
|
|
62
|
+
addressHalf: limit_order_sdk_1.Address.ZERO_ADDRESS.toString().slice(-20),
|
|
63
|
+
delay: 0n
|
|
64
|
+
},
|
|
65
|
+
{
|
|
66
|
+
addressHalf: limit_order_sdk_1.Address.fromBigInt(1n).toString().slice(-20),
|
|
67
|
+
delay: 10n
|
|
68
|
+
},
|
|
69
|
+
{
|
|
70
|
+
addressHalf: limit_order_sdk_1.Address.fromBigInt(3n).toString().slice(-20),
|
|
71
|
+
delay: 0n
|
|
72
|
+
},
|
|
73
|
+
{
|
|
74
|
+
addressHalf: limit_order_sdk_1.Address.fromBigInt(2n).toString().slice(-20),
|
|
75
|
+
delay: 990n
|
|
76
|
+
}
|
|
77
|
+
]);
|
|
78
|
+
expect(data.canExecuteAt(limit_order_sdk_1.Address.fromBigInt(1n), start + 10n)).toEqual(true);
|
|
79
|
+
expect(data.canExecuteAt(limit_order_sdk_1.Address.fromBigInt(1n), start + 9n)).toEqual(false);
|
|
80
|
+
expect(data.canExecuteAt(limit_order_sdk_1.Address.fromBigInt(3n), start + 10n)).toEqual(true);
|
|
81
|
+
expect(data.canExecuteAt(limit_order_sdk_1.Address.fromBigInt(3n), start + 9n)).toEqual(false);
|
|
82
|
+
expect(data.canExecuteAt(limit_order_sdk_1.Address.fromBigInt(2n), start + 50n)).toEqual(false);
|
|
83
|
+
});
|
|
32
84
|
});
|
|
33
85
|
//# sourceMappingURL=settlement-post-interaction-data.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settlement-post-interaction-data.spec.js","sourceRoot":"","sources":["../../../src/fusion-order/settlement-post-interaction-data/settlement-post-interaction-data.spec.ts"],"names":[],"mappings":";;AAAA,4DAA8C;AAC9C,yFAAgF;AAChF,2CAAgD;AAEhD,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IACjC,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;QACvD,MAAM,IAAI,GAAG,gEAA6B,CAAC,GAAG,CAAC;YAC3C,OAAO,EAAE,EAAE;YACX,
|
|
1
|
+
{"version":3,"file":"settlement-post-interaction-data.spec.js","sourceRoot":"","sources":["../../../src/fusion-order/settlement-post-interaction-data/settlement-post-interaction-data.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,23 @@
|
|
|
1
1
|
import { Address } from '@1inch/limit-order-sdk';
|
|
2
2
|
export type AuctionWhitelistItem = {
|
|
3
3
|
address: Address;
|
|
4
|
-
|
|
4
|
+
/**
|
|
5
|
+
* Timestamp in sec at which address can start resolving
|
|
6
|
+
*/
|
|
7
|
+
allowFrom: bigint;
|
|
5
8
|
};
|
|
6
9
|
export type SettlementSuffixData = {
|
|
7
10
|
whitelist: AuctionWhitelistItem[];
|
|
8
11
|
integratorFee?: IntegratorFee;
|
|
9
|
-
bankFee
|
|
10
|
-
|
|
12
|
+
bankFee?: bigint;
|
|
13
|
+
resolvingStartTime: bigint;
|
|
11
14
|
};
|
|
12
15
|
export type IntegratorFee = {
|
|
16
|
+
/**
|
|
17
|
+
* In pbs multiplied by precision
|
|
18
|
+
*
|
|
19
|
+
* @see bpsToRatioFormat
|
|
20
|
+
*/
|
|
13
21
|
ratio: bigint;
|
|
14
22
|
receiver: Address;
|
|
15
23
|
};
|
package/dist/index.d.ts
CHANGED
package/dist/index.js
CHANGED
|
@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.LimitOrderContract = exports.getLimitOrderV4Domain = exports.AmountMode = exports.ExtensionBuilder = exports.TakerTraits = exports.Interaction = exports.getLimitOrderContract = exports.randBigInt = exports.Extension = exports.Address = void 0;
|
|
17
|
+
exports.Quote = exports.Preset = exports.PresetEnum = exports.QuoterCustomPresetRequest = exports.RelayerRequest = exports.QuoterRequest = exports.LimitOrderContract = exports.getLimitOrderV4Domain = exports.AmountMode = exports.ExtensionBuilder = exports.TakerTraits = exports.Interaction = exports.getLimitOrderContract = exports.randBigInt = exports.Extension = exports.Address = void 0;
|
|
18
18
|
var limit_order_sdk_1 = require("@1inch/limit-order-sdk");
|
|
19
19
|
Object.defineProperty(exports, "Address", { enumerable: true, get: function () { return limit_order_sdk_1.Address; } });
|
|
20
20
|
Object.defineProperty(exports, "Extension", { enumerable: true, get: function () { return limit_order_sdk_1.Extension; } });
|
|
@@ -36,4 +36,11 @@ __exportStar(require("./utils/amounts"), exports);
|
|
|
36
36
|
__exportStar(require("./validations"), exports);
|
|
37
37
|
__exportStar(require("./ws-api"), exports);
|
|
38
38
|
__exportStar(require("./errors"), exports);
|
|
39
|
+
var api_1 = require("./api");
|
|
40
|
+
Object.defineProperty(exports, "QuoterRequest", { enumerable: true, get: function () { return api_1.QuoterRequest; } });
|
|
41
|
+
Object.defineProperty(exports, "RelayerRequest", { enumerable: true, get: function () { return api_1.RelayerRequest; } });
|
|
42
|
+
Object.defineProperty(exports, "QuoterCustomPresetRequest", { enumerable: true, get: function () { return api_1.QuoterCustomPresetRequest; } });
|
|
43
|
+
Object.defineProperty(exports, "PresetEnum", { enumerable: true, get: function () { return api_1.PresetEnum; } });
|
|
44
|
+
Object.defineProperty(exports, "Preset", { enumerable: true, get: function () { return api_1.Preset; } });
|
|
45
|
+
Object.defineProperty(exports, "Quote", { enumerable: true, get: function () { return api_1.Quote; } });
|
|
39
46
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,0DAY+B;AAX3B,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;AAEtB,uDAAoC;AACpC,6DAA0C;AAC1C,oDAAiC;AACjC,8CAA2B;AAC3B,8CAA2B;AAC3B,0CAAuB;AACvB,kDAA+B;AAC/B,gDAA6B;AAC7B,2CAAwB;AACxB,2CAAwB"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,0DAY+B;AAX3B,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;AAEtB,uDAAoC;AACpC,6DAA0C;AAC1C,oDAAiC;AACjC,8CAA2B;AAC3B,8CAA2B;AAC3B,0CAAuB;AACvB,kDAA+B;AAC/B,gDAA6B;AAC7B,2CAAwB;AACxB,2CAAwB;AACxB,6BAOc;AANV,oGAAA,aAAa,OAAA;AACb,qGAAA,cAAc,OAAA;AACd,gHAAA,yBAAyB,OAAA;AACzB,iGAAA,UAAU,OAAA;AACV,6FAAA,MAAM,OAAA;AACN,4FAAA,KAAK,OAAA"}
|
package/dist/sdk/types.d.ts
CHANGED
|
@@ -29,11 +29,22 @@ export type OrderParams = {
|
|
|
29
29
|
permit?: string;
|
|
30
30
|
receiver?: string;
|
|
31
31
|
preset?: PresetEnum;
|
|
32
|
+
/**
|
|
33
|
+
* Unique for `walletAddress` can be serial or random generated
|
|
34
|
+
*
|
|
35
|
+
* @see randBigInt
|
|
36
|
+
*/
|
|
32
37
|
nonce?: bigint;
|
|
33
38
|
fee?: TakingFeeInfo;
|
|
34
39
|
source?: string;
|
|
35
40
|
customPreset?: CustomPreset;
|
|
41
|
+
/**
|
|
42
|
+
* true by default
|
|
43
|
+
*/
|
|
36
44
|
allowPartialFills?: boolean;
|
|
45
|
+
/**
|
|
46
|
+
* true by default
|
|
47
|
+
*/
|
|
37
48
|
allowMultipleFills?: boolean;
|
|
38
49
|
};
|
|
39
50
|
export type TakingFeeInfo = {
|
package/dist/utils/amounts.d.ts
CHANGED
|
@@ -1,2 +1,18 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Calculates taker amount by linear proportion
|
|
3
|
+
* Note: use for minReturn only, because other amounts calculated based on auction curve
|
|
4
|
+
*
|
|
5
|
+
* @see AuctionCalculator
|
|
6
|
+
* @return Ceiled taker amount
|
|
7
|
+
* @see https://github.com/1inch/limit-order-protocol/blob/23d655844191dea7960a186652307604a1ed480a/contracts/libraries/AmountCalculatorLib.sol#L6
|
|
8
|
+
*/
|
|
1
9
|
export declare function calcTakingAmount(swapMakerAmount: bigint, orderMakerAmount: bigint, orderTakerAmount: bigint): bigint;
|
|
10
|
+
/**
|
|
11
|
+
* Calculates maker amount by linear proportion
|
|
12
|
+
* Note: use for minReturn only, because other amounts calculated based on auction curve
|
|
13
|
+
*
|
|
14
|
+
* @see AuctionCalculator
|
|
15
|
+
* @return Floored maker amount
|
|
16
|
+
* @see https://github.com/1inch/limit-order-protocol/blob/23d655844191dea7960a186652307604a1ed480a/contracts/libraries/AmountCalculatorLib.sol#L6
|
|
17
|
+
*/
|
|
2
18
|
export declare function calMakingAmount(swapTakerAmount: bigint, orderMakerAmount: bigint, orderTakerAmount: bigint): bigint;
|
package/dist/utils/amounts.js
CHANGED
|
@@ -1,11 +1,27 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.calMakingAmount = exports.calcTakingAmount = void 0;
|
|
4
|
+
/**
|
|
5
|
+
* Calculates taker amount by linear proportion
|
|
6
|
+
* Note: use for minReturn only, because other amounts calculated based on auction curve
|
|
7
|
+
*
|
|
8
|
+
* @see AuctionCalculator
|
|
9
|
+
* @return Ceiled taker amount
|
|
10
|
+
* @see https://github.com/1inch/limit-order-protocol/blob/23d655844191dea7960a186652307604a1ed480a/contracts/libraries/AmountCalculatorLib.sol#L6
|
|
11
|
+
*/
|
|
4
12
|
function calcTakingAmount(swapMakerAmount, orderMakerAmount, orderTakerAmount) {
|
|
5
13
|
return ((swapMakerAmount * orderTakerAmount + orderMakerAmount - 1n) /
|
|
6
14
|
orderMakerAmount);
|
|
7
15
|
}
|
|
8
16
|
exports.calcTakingAmount = calcTakingAmount;
|
|
17
|
+
/**
|
|
18
|
+
* Calculates maker amount by linear proportion
|
|
19
|
+
* Note: use for minReturn only, because other amounts calculated based on auction curve
|
|
20
|
+
*
|
|
21
|
+
* @see AuctionCalculator
|
|
22
|
+
* @return Floored maker amount
|
|
23
|
+
* @see https://github.com/1inch/limit-order-protocol/blob/23d655844191dea7960a186652307604a1ed480a/contracts/libraries/AmountCalculatorLib.sol#L6
|
|
24
|
+
*/
|
|
9
25
|
function calMakingAmount(swapTakerAmount, orderMakerAmount, orderTakerAmount) {
|
|
10
26
|
return (swapTakerAmount * orderMakerAmount) / orderTakerAmount;
|
|
11
27
|
}
|
|
@@ -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":";;;AAAA;;;;;;;GAOG;AACH,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;AATD,4CASC;AAED;;;;;;;GAOG;AACH,SAAgB,eAAe,CAC3B,eAAuB,EACvB,gBAAwB,EACxB,gBAAwB;IAExB,OAAO,CAAC,eAAe,GAAG,gBAAgB,CAAC,GAAG,gBAAgB,CAAA;AAClE,CAAC;AAND,0CAMC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function now(): bigint;
|