@1inch/fusion-sdk 1.0.1-rc.5 → 1.0.1-rc.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/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/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 +12 -5
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
/* eslint-disable max-lines-per-function */
|
|
3
4
|
const ts_mockito_1 = require("ts-mockito");
|
|
4
5
|
const connector_1 = require("../../connector");
|
|
5
6
|
const constants_1 = require("../../constants");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order-api.spec.js","sourceRoot":"","sources":["../../../src/api/orders/order-api.spec.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"order-api.spec.js","sourceRoot":"","sources":["../../../src/api/orders/order-api.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,10 @@ import { FusionOrder } from '../../../fusion-order';
|
|
|
6
6
|
import { QuoterRequest } from '../quoter.request';
|
|
7
7
|
export declare class Quote {
|
|
8
8
|
private readonly params;
|
|
9
|
+
/**
|
|
10
|
+
* Fusion extension address
|
|
11
|
+
* @see https://github.com/1inch/limit-order-settlement
|
|
12
|
+
*/
|
|
9
13
|
readonly settlementAddress: Address;
|
|
10
14
|
readonly fromTokenAmount: bigint;
|
|
11
15
|
readonly feeToken: string;
|
|
@@ -7,6 +7,7 @@ const types_1 = require("../types");
|
|
|
7
7
|
const preset_1 = require("../preset");
|
|
8
8
|
const fusion_order_1 = require("../../../fusion-order");
|
|
9
9
|
const sdk_1 = require("../../../sdk");
|
|
10
|
+
const time_1 = require("../../../utils/time");
|
|
10
11
|
class Quote {
|
|
11
12
|
constructor(params, response) {
|
|
12
13
|
this.params = params;
|
|
@@ -76,13 +77,13 @@ class Quote {
|
|
|
76
77
|
const isExclusive = resolver.equal(exclusiveResolver);
|
|
77
78
|
return {
|
|
78
79
|
address: resolver,
|
|
79
|
-
|
|
80
|
+
allowFrom: isExclusive ? (0, time_1.now)() : auctionStartTime
|
|
80
81
|
};
|
|
81
82
|
});
|
|
82
83
|
}
|
|
83
84
|
return this.whitelist.map((resolver) => ({
|
|
84
85
|
address: resolver,
|
|
85
|
-
|
|
86
|
+
allowFrom: 0n
|
|
86
87
|
}));
|
|
87
88
|
}
|
|
88
89
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quote.js","sourceRoot":"","sources":["../../../../src/api/quoter/quote/quote.ts"],"names":[],"mappings":";;;AAAA,4DAA8C;AAC9C,iDAAgD;AAEhD,oCAAyD;AACzD,sCAAgC;AAChC,wDAAuE;AAEvE,sCAA6C;
|
|
1
|
+
{"version":3,"file":"quote.js","sourceRoot":"","sources":["../../../../src/api/quoter/quote/quote.ts"],"names":[],"mappings":";;;AAAA,4DAA8C;AAC9C,iDAAgD;AAEhD,oCAAyD;AACzD,sCAAgC;AAChC,wDAAuE;AAEvE,sCAA6C;AAC7C,8CAAuC;AAEvC,MAAa,KAAK;IA8Bd,YACqB,MAAqB,EACtC,QAAwB;QADP,WAAM,GAAN,MAAM,CAAe;QAGtC,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAA;QACvD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAA;QACjC,IAAI,CAAC,OAAO,GAAG;YACX,CAAC,kBAAU,CAAC,IAAI,CAAC,EAAE,IAAI,eAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC;YACpD,CAAC,kBAAU,CAAC,MAAM,CAAC,EAAE,IAAI,eAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC;YACxD,CAAC,kBAAU,CAAC,IAAI,CAAC,EAAE,IAAI,eAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC;YACpD,CAAC,kBAAU,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,MAAM;gBACxC,CAAC,CAAC,IAAI,eAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC;gBACrC,CAAC,CAAC,SAAS;SAClB,CAAA;QACD,IAAI,CAAC,aAAa,GAAG,QAAQ,CAAC,aAAa,CAAA;QAC3C,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAA;QAC7B,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAA;QAC7B,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAA;QAC/B,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,yBAAO,CAAC,CAAC,CAAC,CAAC,CAAA;QAC9D,IAAI,CAAC,iBAAiB,GAAG,QAAQ,CAAC,kBAAkB,CAAA;QACpD,IAAI,CAAC,iBAAiB,GAAG,IAAI,yBAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAA;IACpE,CAAC;IAED,iBAAiB,CAAC,UAAiC;QAC/C,MAAM,MAAM,GAAG,gCAAiB,CAAC,GAAG,CAAC;YACjC,MAAM,EAAE,UAAU,EAAE,MAAM,IAAI,IAAI,CAAC,iBAAiB;YACpD,QAAQ,EAAE,UAAU,EAAE,QAAQ;YAC9B,MAAM,EAAE,UAAU,EAAE,MAAM;YAC1B,KAAK,EAAE,UAAU,EAAE,KAAK;SAC3B,CAAC,CAAA;QAEF,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAE5C,MAAM,cAAc,GAAG,MAAM,CAAC,oBAAoB,CAC9C,MAAM,CAAC,uBAAuB,CACjC,CAAA;QAED,OAAO,0BAAW,CAAC,GAAG,CAClB,IAAI,CAAC,iBAAiB,EACtB;YACI,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,gBAAgB;YACxC,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,cAAc;YACtC,YAAY,EAAE,IAAI,CAAC,eAAe;YAClC,YAAY,EAAE,MAAM,CAAC,gBAAgB;YACrC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa;YAChC,QAAQ,EAAE,MAAM,CAAC,QAAQ;SAC5B,EACD;YACI,OAAO,EAAE,cAAc;YACvB,IAAI,EAAE;gBACF,aAAa,EAAE;oBACX,KAAK,EAAE,IAAA,sBAAgB,EAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE;oBAC9C,QAAQ,EAAE,UAAU,EAAE,iBAAiB;wBACnC,CAAC,CAAC,IAAI,yBAAO,CAAC,UAAU,EAAE,iBAAiB,CAAC;wBAC5C,CAAC,CAAC,yBAAO,CAAC,YAAY;iBAC7B;gBACD,OAAO,EAAE,MAAM,CAAC,OAAO;aAC1B;YACD,SAAS,EAAE,IAAI,CAAC,YAAY,CACxB,cAAc,CAAC,SAAS,EACxB,MAAM,CAAC,iBAAiB,CAC3B;SACJ,EACD;YACI,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE;YACjD,MAAM,EAAE,MAAM,CAAC,MAAM;gBACjB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;gBAC3D,CAAC,CAAC,SAAS;YACf,iBAAiB,EACb,UAAU,EAAE,iBAAiB,IAAI,MAAM,CAAC,iBAAiB;YAC7D,kBAAkB,EACd,UAAU,EAAE,kBAAkB,IAAI,MAAM,CAAC,kBAAkB;YAC/D,oBAAoB,EAAE,UAAU,EAAE,oBAAoB;SACzD,CACJ,CAAA;IACL,CAAC;IAED,SAAS,CAAC,IAAI,GAAG,kBAAU,CAAC,IAAI;QAC5B,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAW,CAAA;IACvC,CAAC;IAEO,YAAY,CAChB,gBAAwB,EACxB,iBAA2B;QAE3B,IAAI,iBAAiB,EAAE;YACnB,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;gBACnC,MAAM,WAAW,GAAG,QAAQ,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAA;gBAErD,OAAO;oBACH,OAAO,EAAE,QAAQ;oBACjB,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,IAAA,UAAG,GAAE,CAAC,CAAC,CAAC,gBAAgB;iBACpD,CAAA;YACL,CAAC,CAAC,CAAA;SACL;QAED,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YACrC,OAAO,EAAE,QAAQ;YACjB,SAAS,EAAE,EAAE;SAChB,CAAC,CAAC,CAAA;IACP,CAAC;CACJ;AApID,sBAoIC"}
|
|
@@ -9,5 +9,9 @@ export type FusionOrderParamsData = {
|
|
|
9
9
|
allowPartialFills?: boolean;
|
|
10
10
|
allowMultipleFills?: boolean;
|
|
11
11
|
delayAuctionStartTimeBy?: bigint;
|
|
12
|
+
/**
|
|
13
|
+
* Order will expire in `orderExpirationDelay` after auction ends
|
|
14
|
+
* Default 12s
|
|
15
|
+
*/
|
|
12
16
|
orderExpirationDelay?: bigint;
|
|
13
17
|
};
|
|
@@ -8,11 +8,25 @@ export declare class AuctionCalculator {
|
|
|
8
8
|
private readonly gasCost;
|
|
9
9
|
private static GAS_PRICE_BASE;
|
|
10
10
|
constructor(startTime: bigint, duration: bigint, initialRateBump: bigint, points: AuctionPoint[], takerFeeRatio: bigint, gasCost?: {
|
|
11
|
+
/**
|
|
12
|
+
* Rate bump to cover gas price. 10_000_000 means 100%
|
|
13
|
+
*/
|
|
11
14
|
gasBumpEstimate: bigint;
|
|
15
|
+
/**
|
|
16
|
+
* Gas price at estimation time. 1000 means 1 Gwei
|
|
17
|
+
*/
|
|
12
18
|
gasPriceEstimate: bigint;
|
|
13
19
|
});
|
|
14
20
|
static fromAuctionData(data: SettlementPostInteractionData, details: AuctionDetails): AuctionCalculator;
|
|
21
|
+
/**
|
|
22
|
+
* @see https://github.com/1inch/limit-order-settlement/blob/1b6757eecb2574953b543821db6f7bbff5afee48/contracts/extensions/BaseExtension.sol#L56
|
|
23
|
+
*/
|
|
15
24
|
calcAuctionTakingAmount(takingAmount: bigint, rate: number): bigint;
|
|
25
|
+
/**
|
|
26
|
+
* @see https://github.com/1inch/limit-order-settlement/blob/273defdf7b0f1867299dcbc306f32f035579310f/contracts/extensions/BaseExtension.sol#L121
|
|
27
|
+
* @param time auction timestamp in seconds
|
|
28
|
+
* @param blockBaseFee blockBaseFee in Wei, if passed, then rate will be calculated as if order executed in block with `blockBaseFee`
|
|
29
|
+
*/
|
|
16
30
|
calcRateBump(time: bigint, blockBaseFee?: bigint): number;
|
|
17
31
|
private getGasPriceBump;
|
|
18
32
|
private getAuctionBump;
|
|
@@ -14,8 +14,11 @@ class AuctionCalculator {
|
|
|
14
14
|
this.gasCost = gasCost;
|
|
15
15
|
}
|
|
16
16
|
static fromAuctionData(data, details) {
|
|
17
|
-
return new AuctionCalculator(data.
|
|
17
|
+
return new AuctionCalculator(data.resolvingStartTime, details.duration, details.initialRateBump, details.points, data.integratorFee?.ratio || 0n, details.gasCost);
|
|
18
18
|
}
|
|
19
|
+
/**
|
|
20
|
+
* @see https://github.com/1inch/limit-order-settlement/blob/1b6757eecb2574953b543821db6f7bbff5afee48/contracts/extensions/BaseExtension.sol#L56
|
|
21
|
+
*/
|
|
19
22
|
calcAuctionTakingAmount(takingAmount, rate) {
|
|
20
23
|
const auctionTakingAmount = (BigInt(takingAmount) * (BigInt(rate) + constants_1.RATE_BUMP_DENOMINATOR)) /
|
|
21
24
|
constants_1.RATE_BUMP_DENOMINATOR;
|
|
@@ -24,6 +27,11 @@ class AuctionCalculator {
|
|
|
24
27
|
}
|
|
25
28
|
return (0, sdk_1.addRatioToAmount)(auctionTakingAmount, this.takerFeeRatio);
|
|
26
29
|
}
|
|
30
|
+
/**
|
|
31
|
+
* @see https://github.com/1inch/limit-order-settlement/blob/273defdf7b0f1867299dcbc306f32f035579310f/contracts/extensions/BaseExtension.sol#L121
|
|
32
|
+
* @param time auction timestamp in seconds
|
|
33
|
+
* @param blockBaseFee blockBaseFee in Wei, if passed, then rate will be calculated as if order executed in block with `blockBaseFee`
|
|
34
|
+
*/
|
|
27
35
|
calcRateBump(time, blockBaseFee = 0n) {
|
|
28
36
|
const gasBump = this.getGasPriceBump(blockBaseFee);
|
|
29
37
|
const auctionBump = this.getAuctionBump(time);
|
|
@@ -67,5 +75,5 @@ class AuctionCalculator {
|
|
|
67
75
|
}
|
|
68
76
|
}
|
|
69
77
|
exports.AuctionCalculator = AuctionCalculator;
|
|
70
|
-
AuctionCalculator.GAS_PRICE_BASE = 1000000n;
|
|
78
|
+
AuctionCalculator.GAS_PRICE_BASE = 1000000n; // 1000 means 1 Gwei
|
|
71
79
|
//# sourceMappingURL=auction-calculator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auction-calculator.js","sourceRoot":"","sources":["../../src/auction-calculator/auction-calculator.ts"],"names":[],"mappings":";;;AAAA,iCAA0C;AAC1C,2CAAiD;AAMjD,gCAAuC;AAEvC,MAAa,iBAAiB;IAG1B,YACqB,SAAiB,EACjB,QAAgB,EAChB,eAAuB,EACvB,MAAsB,EACtB,aAAqB,EACrB,UASb,EAAC,eAAe,EAAE,EAAE,EAAE,gBAAgB,EAAE,EAAE,EAAC;QAd9B,cAAS,GAAT,SAAS,CAAQ;QACjB,aAAQ,GAAR,QAAQ,CAAQ;QAChB,oBAAe,GAAf,eAAe,CAAQ;QACvB,WAAM,GAAN,MAAM,CAAgB;QACtB,kBAAa,GAAb,aAAa,CAAQ;QACrB,YAAO,GAAP,OAAO,CASuB;IAChD,CAAC;IAEJ,MAAM,CAAC,eAAe,CAClB,IAAmC,EACnC,OAAuB;QAEvB,OAAO,IAAI,iBAAiB,CACxB,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"auction-calculator.js","sourceRoot":"","sources":["../../src/auction-calculator/auction-calculator.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,8 +14,10 @@ describe('Auction Calculator', () => {
|
|
|
14
14
|
receiver: limit_order_sdk_1.Address.fromBigInt(1n)
|
|
15
15
|
},
|
|
16
16
|
bankFee: 0n,
|
|
17
|
-
auctionStartTime,
|
|
18
|
-
whitelist: [
|
|
17
|
+
resolvingStartTime: auctionStartTime,
|
|
18
|
+
whitelist: [
|
|
19
|
+
{ address: limit_order_sdk_1.Address.ZERO_ADDRESS, allowFrom: auctionStartTime }
|
|
20
|
+
]
|
|
19
21
|
});
|
|
20
22
|
const auctionDetails = new fusion_order_1.AuctionDetails({
|
|
21
23
|
startTime: auctionStartTime,
|
|
@@ -27,15 +29,15 @@ describe('Auction Calculator', () => {
|
|
|
27
29
|
const rate = calculator.calcRateBump(auctionStartTime + 60n);
|
|
28
30
|
const auctionTakingAmount = calculator.calcAuctionTakingAmount(1420000000n, rate);
|
|
29
31
|
expect(rate).toBe(25000);
|
|
30
|
-
expect(auctionTakingAmount).toBe(1423692355n);
|
|
32
|
+
expect(auctionTakingAmount).toBe(1423692355n); // 1423550000 from rate + 142355 (1bps) integrator fee
|
|
31
33
|
});
|
|
32
34
|
describe('Gas bump', () => {
|
|
33
35
|
const now = BigInt(Math.floor(Date.now() / 1000));
|
|
34
|
-
const duration = 1800n;
|
|
36
|
+
const duration = 1800n; // 30m
|
|
35
37
|
const takingAmount = (0, ethers_1.parseEther)('1');
|
|
36
38
|
const calculator = new auction_calculator_1.AuctionCalculator(now - 60n, duration, 1000000n, [{ delay: 60, coefficient: 500000 }], 0n, {
|
|
37
39
|
gasBumpEstimate: 10000n,
|
|
38
|
-
gasPriceEstimate: 1000n
|
|
40
|
+
gasPriceEstimate: 1000n // 1gwei
|
|
39
41
|
});
|
|
40
42
|
it('0 gwei = no gas fee', () => {
|
|
41
43
|
const bump = calculator.calcRateBump(now);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auction-calculator.spec.js","sourceRoot":"","sources":["../../src/auction-calculator/auction-calculator.spec.ts"],"names":[],"mappings":";;AAAA,4DAA8C;AAC9C,mCAA6C;AAC7C,6DAAsD;AACtD,kDAA6E;AAC7E,gCAAuC;AAEvC,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAChC,EAAE,CAAC,qDAAqD,EAAE,GAAG,EAAE;QAC3D,MAAM,gBAAgB,GAAG,WAAW,CAAA;QAEpC,MAAM,eAAe,GAAG,4CAA6B,CAAC,GAAG,CAAC;YACtD,aAAa,EAAE;gBACX,KAAK,EAAE,IAAA,sBAAgB,EAAC,CAAC,CAAC;gBAC1B,QAAQ,EAAE,yBAAO,CAAC,UAAU,CAAC,EAAE,CAAC;aACnC;YACD,OAAO,EAAE,EAAE;YACX,gBAAgB;
|
|
1
|
+
{"version":3,"file":"auction-calculator.spec.js","sourceRoot":"","sources":["../../src/auction-calculator/auction-calculator.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1,9 @@
|
|
|
1
|
+
/**
|
|
2
|
+
*
|
|
3
|
+
* v2(t-t1) + v1(t2-t)
|
|
4
|
+
* v = ---------------------
|
|
5
|
+
* t2-t1
|
|
6
|
+
*
|
|
7
|
+
* @see https://github.com/1inch/limit-order-settlement/blob/3c7cf9eacbaf7a60624d7a6f069c59d809f2204a/contracts/libraries/OrderSuffix.sol#L94
|
|
8
|
+
*/
|
|
1
9
|
export declare function linearInterpolation(t1: bigint, t2: bigint, v1: bigint, v2: bigint, t: bigint): bigint;
|
|
@@ -1,6 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.linearInterpolation = void 0;
|
|
4
|
+
/**
|
|
5
|
+
*
|
|
6
|
+
* v2(t-t1) + v1(t2-t)
|
|
7
|
+
* v = ---------------------
|
|
8
|
+
* t2-t1
|
|
9
|
+
*
|
|
10
|
+
* @see https://github.com/1inch/limit-order-settlement/blob/3c7cf9eacbaf7a60624d7a6f069c59d809f2204a/contracts/libraries/OrderSuffix.sol#L94
|
|
11
|
+
*/
|
|
4
12
|
function linearInterpolation(t1, t2, v1, v2, t) {
|
|
5
13
|
const timePassedFromNow = t - t1;
|
|
6
14
|
const timeLeft = t2 - t;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"calc.js","sourceRoot":"","sources":["../../src/auction-calculator/calc.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"calc.js","sourceRoot":"","sources":["../../src/auction-calculator/calc.ts"],"names":[],"mappings":";;;AAAA;;;;;;;GAOG;AACH,SAAgB,mBAAmB,CAC/B,EAAU,EACV,EAAU,EACV,EAAU,EACV,EAAU,EACV,CAAS;IAET,MAAM,iBAAiB,GAAG,CAAC,GAAG,EAAE,CAAA;IAChC,MAAM,QAAQ,GAAG,EAAE,GAAG,CAAC,CAAA;IAEvB,MAAM,kBAAkB,GAAG,EAAE,GAAG,iBAAiB,CAAA;IACjD,MAAM,sBAAsB,GAAG,EAAE,GAAG,QAAQ,CAAA;IAE5C,MAAM,WAAW,GAAG,kBAAkB,GAAG,sBAAsB,CAAA;IAE/D,MAAM,cAAc,GAAG,EAAE,GAAG,EAAE,CAAA;IAE9B,OAAO,WAAW,GAAG,cAAc,CAAA;AACvC,CAAC;AAlBD,kDAkBC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/auction-calculator/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,qBAAqB,GAAG,SAAW,CAAA"}
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/auction-calculator/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,qBAAqB,GAAG,SAAW,CAAA,CAAC,OAAO"}
|
|
@@ -11,6 +11,8 @@ class PrivateKeyProviderConnector {
|
|
|
11
11
|
signTypedData(_walletAddress, typedData) {
|
|
12
12
|
const result = (0, eth_sig_util_1.signTypedData)({
|
|
13
13
|
privateKey: this.privateKeyBuffer,
|
|
14
|
+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
15
|
+
// @ts-ignore
|
|
14
16
|
data: typedData,
|
|
15
17
|
version: eth_sig_util_1.SignTypedDataVersion.V4
|
|
16
18
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"private-key-provider.connector.js","sourceRoot":"","sources":["../../../src/connector/blockchain/private-key-provider.connector.ts"],"names":[],"mappings":";;;AAAA,yDAA0E;AAK1E,MAAa,2BAA2B;IAKpC,YACa,UAAkB,EACR,YAAsB;QADhC,eAAU,GAAV,UAAU,CAAQ;QACR,iBAAY,GAAZ,YAAY,CAAU;QAEzC,IAAI,CAAC,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,CAAA;IAC5E,CAAC;IAED,aAAa,CACT,cAAsB,EACtB,SAA0B;QAE1B,MAAM,MAAM,GAAG,IAAA,4BAAa,EAAC;YACzB,UAAU,EAAE,IAAI,CAAC,gBAAgB;
|
|
1
|
+
{"version":3,"file":"private-key-provider.connector.js","sourceRoot":"","sources":["../../../src/connector/blockchain/private-key-provider.connector.ts"],"names":[],"mappings":";;;AAAA,yDAA0E;AAK1E,MAAa,2BAA2B;IAKpC,YACa,UAAkB,EACR,YAAsB;QADhC,eAAU,GAAV,UAAU,CAAQ;QACR,iBAAY,GAAZ,YAAY,CAAU;QAEzC,IAAI,CAAC,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,CAAA;IAC5E,CAAC;IAED,aAAa,CACT,cAAsB,EACtB,SAA0B;QAE1B,MAAM,MAAM,GAAG,IAAA,4BAAa,EAAC;YACzB,UAAU,EAAE,IAAI,CAAC,gBAAgB;YACjC,6DAA6D;YAC7D,aAAa;YACb,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,mCAAoB,CAAC,EAAE;SACnC,CAAC,CAAA;QAEF,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IAClC,CAAC;IAED,OAAO,CAAC,eAAuB,EAAE,QAAgB;QAC7C,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC;YAC9B,EAAE,EAAE,eAAe;YACnB,IAAI,EAAE,QAAQ;SACjB,CAAC,CAAA;IACN,CAAC;CACJ;AAjCD,kEAiCC"}
|
|
@@ -27,7 +27,9 @@ class WebsocketClient {
|
|
|
27
27
|
if (this.initialized) {
|
|
28
28
|
throw new Error('WebSocket is already initialized');
|
|
29
29
|
}
|
|
30
|
+
// @ts-expect-error hack for readonly property
|
|
30
31
|
this.initialized = true;
|
|
32
|
+
// @ts-expect-error hack for readonly property
|
|
31
33
|
this.ws = new ws_1.default(this.url, this.authKey
|
|
32
34
|
? {
|
|
33
35
|
headers: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-client.connector.js","sourceRoot":"","sources":["../../../src/connector/ws/websocket-client.connector.ts"],"names":[],"mappings":";;;;;;AAAA,4CAA0B;AAS1B,MAAa,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;YACX,IAAI,CAAC,WAAW,GAAG,IAAI,CAAA;YACvB,IAAI,CAAC,EAAE,GAAG,IAAI,YAAS,CACnB,IAAI,CAAC,GAAG,EACR,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,OAAM;SACT;QAED,IAAI,CAAC,WAAW,GAAG,KAAK,CAAA;IAC5B,CAAC;IAED,IAAI;QACA,IAAI,IAAI,CAAC,WAAW,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAA;SACtD;
|
|
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/constants.d.ts
CHANGED
|
@@ -12,6 +12,7 @@ export declare enum NetworkEnum {
|
|
|
12
12
|
}
|
|
13
13
|
export declare const ONE_INCH_LIMIT_ORDER_V4 = "0x111111125421ca6dc452d289314280a0f8842a65";
|
|
14
14
|
export declare const UINT_160_MAX: bigint;
|
|
15
|
+
export declare const UINT_16_MAX: bigint;
|
|
15
16
|
export declare const UINT_80_MAX: bigint;
|
|
16
17
|
export declare const UINT_40_MAX: bigint;
|
|
17
18
|
export declare const UINT_32_MAX: bigint;
|
package/dist/constants.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.UINT_256_MAX = exports.UINT_24_MAX = exports.UINT_32_MAX = exports.UINT_40_MAX = exports.UINT_80_MAX = exports.UINT_160_MAX = exports.ONE_INCH_LIMIT_ORDER_V4 = exports.NetworkEnum = exports.ZX = void 0;
|
|
3
|
+
exports.UINT_256_MAX = exports.UINT_24_MAX = exports.UINT_32_MAX = exports.UINT_40_MAX = exports.UINT_80_MAX = exports.UINT_16_MAX = exports.UINT_160_MAX = exports.ONE_INCH_LIMIT_ORDER_V4 = exports.NetworkEnum = exports.ZX = void 0;
|
|
4
4
|
exports.ZX = '0x';
|
|
5
5
|
var NetworkEnum;
|
|
6
6
|
(function (NetworkEnum) {
|
|
@@ -16,6 +16,7 @@ var NetworkEnum;
|
|
|
16
16
|
})(NetworkEnum = exports.NetworkEnum || (exports.NetworkEnum = {}));
|
|
17
17
|
exports.ONE_INCH_LIMIT_ORDER_V4 = '0x111111125421ca6dc452d289314280a0f8842a65';
|
|
18
18
|
exports.UINT_160_MAX = (1n << 160n) - 1n;
|
|
19
|
+
exports.UINT_16_MAX = (1n << 16n) - 1n;
|
|
19
20
|
exports.UINT_80_MAX = (1n << 80n) - 1n;
|
|
20
21
|
exports.UINT_40_MAX = (1n << 40n) - 1n;
|
|
21
22
|
exports.UINT_32_MAX = (1n << 32n) - 1n;
|
package/dist/constants.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,EAAE,GAAG,IAAI,CAAA;AAEtB,IAAY,WAUX;AAVD,WAAY,WAAW;IACnB,qDAAY,CAAA;IACZ,qDAAa,CAAA;IACb,oDAAY,CAAA;IACZ,yDAAgB,CAAA;IAChB,2DAAiB,CAAA;IACjB,sDAAa,CAAA;IACb,mDAAY,CAAA;IACZ,mDAAY,CAAA;IACZ,wDAAe,CAAA;AACnB,CAAC,EAVW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAUtB;AAEY,QAAA,uBAAuB,GAChC,4CAA4C,CAAA;AAEnC,QAAA,YAAY,GAAG,CAAC,EAAE,IAAI,IAAI,CAAC,GAAG,EAAE,CAAA;AAChC,QAAA,WAAW,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,CAAA;AAC9B,QAAA,WAAW,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,CAAA;AAC9B,QAAA,WAAW,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,CAAA;AAC9B,QAAA,WAAW,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,CAAA;AAC9B,QAAA,YAAY,GAAG,CAAC,EAAE,IAAI,IAAI,CAAC,GAAG,EAAE,CAAA"}
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,EAAE,GAAG,IAAI,CAAA;AAEtB,IAAY,WAUX;AAVD,WAAY,WAAW;IACnB,qDAAY,CAAA;IACZ,qDAAa,CAAA;IACb,oDAAY,CAAA;IACZ,yDAAgB,CAAA;IAChB,2DAAiB,CAAA;IACjB,sDAAa,CAAA;IACb,mDAAY,CAAA;IACZ,mDAAY,CAAA;IACZ,wDAAe,CAAA;AACnB,CAAC,EAVW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAUtB;AAEY,QAAA,uBAAuB,GAChC,4CAA4C,CAAA;AAEnC,QAAA,YAAY,GAAG,CAAC,EAAE,IAAI,IAAI,CAAC,GAAG,EAAE,CAAA;AAChC,QAAA,WAAW,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,CAAA;AAC9B,QAAA,WAAW,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,CAAA;AAC9B,QAAA,WAAW,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,CAAA;AAC9B,QAAA,WAAW,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,CAAA;AAC9B,QAAA,WAAW,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,CAAA;AAC9B,QAAA,YAAY,GAAG,CAAC,EAAE,IAAI,IAAI,CAAC,GAAG,EAAE,CAAA"}
|
|
@@ -5,7 +5,13 @@ export declare class AuctionDetails {
|
|
|
5
5
|
readonly initialRateBump: bigint;
|
|
6
6
|
readonly points: AuctionPoint[];
|
|
7
7
|
readonly gasCost: {
|
|
8
|
+
/**
|
|
9
|
+
* Rate bump to cover gas price. 10_000_000 means 100%
|
|
10
|
+
*/
|
|
8
11
|
gasBumpEstimate: bigint;
|
|
12
|
+
/**
|
|
13
|
+
* Gas price at estimation time. 1000 means 1 Gwei
|
|
14
|
+
*/
|
|
9
15
|
gasPriceEstimate: bigint;
|
|
10
16
|
};
|
|
11
17
|
constructor(auction: {
|
|
@@ -13,8 +19,29 @@ export declare class AuctionDetails {
|
|
|
13
19
|
initialRateBump: number;
|
|
14
20
|
duration: bigint;
|
|
15
21
|
points: AuctionPoint[];
|
|
22
|
+
/**
|
|
23
|
+
* Allows to scale estimate gas costs to actual gas costs
|
|
24
|
+
*/
|
|
16
25
|
gasCost?: AuctionGasCostInfo;
|
|
17
26
|
});
|
|
27
|
+
/**
|
|
28
|
+
* Construct `AuctionDetails` from bytes
|
|
29
|
+
*
|
|
30
|
+
* @param data bytes with 0x prefix in next format:
|
|
31
|
+
* - uint24 gasBumpEstimate
|
|
32
|
+
* - uint32 gasPriceEstimate
|
|
33
|
+
* - uint32 startTime
|
|
34
|
+
* - uint24 duration
|
|
35
|
+
* - uint24 initialRateBump
|
|
36
|
+
* - [uint24 rate, uint16 delay] * N points
|
|
37
|
+
*
|
|
38
|
+
* All data is tight packed
|
|
39
|
+
*
|
|
40
|
+
* @see AuctionDetails.encode
|
|
41
|
+
*/
|
|
18
42
|
static decode(data: string): AuctionDetails;
|
|
43
|
+
/**
|
|
44
|
+
* Serialize auction data to bytes
|
|
45
|
+
*/
|
|
19
46
|
encode(): string;
|
|
20
47
|
}
|
|
@@ -26,6 +26,21 @@ class AuctionDetails {
|
|
|
26
26
|
(0, assert_1.default)(this.duration <= constants_1.UINT_24_MAX);
|
|
27
27
|
(0, assert_1.default)(this.initialRateBump <= constants_1.UINT_24_MAX);
|
|
28
28
|
}
|
|
29
|
+
/**
|
|
30
|
+
* Construct `AuctionDetails` from bytes
|
|
31
|
+
*
|
|
32
|
+
* @param data bytes with 0x prefix in next format:
|
|
33
|
+
* - uint24 gasBumpEstimate
|
|
34
|
+
* - uint32 gasPriceEstimate
|
|
35
|
+
* - uint32 startTime
|
|
36
|
+
* - uint24 duration
|
|
37
|
+
* - uint24 initialRateBump
|
|
38
|
+
* - [uint24 rate, uint16 delay] * N points
|
|
39
|
+
*
|
|
40
|
+
* All data is tight packed
|
|
41
|
+
*
|
|
42
|
+
* @see AuctionDetails.encode
|
|
43
|
+
*/
|
|
29
44
|
static decode(data) {
|
|
30
45
|
(0, assert_1.default)((0, validations_1.isHexBytes)(data), 'Invalid auction details data');
|
|
31
46
|
const iter = byte_utils_1.BytesIter.BigInt(data);
|
|
@@ -52,6 +67,9 @@ class AuctionDetails {
|
|
|
52
67
|
}
|
|
53
68
|
});
|
|
54
69
|
}
|
|
70
|
+
/**
|
|
71
|
+
* Serialize auction data to bytes
|
|
72
|
+
*/
|
|
55
73
|
encode() {
|
|
56
74
|
let details = ethers_1.ethers.solidityPacked(['uint24', 'uint32', 'uint32', 'uint24', 'uint24'], [
|
|
57
75
|
this.gasCost.gasBumpEstimate,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auction-details.js","sourceRoot":"","sources":["../../../src/fusion-order/auction-details/auction-details.ts"],"names":[],"mappings":";;;;;;AAAA,mCAA6B;AAC7B,kDAA2C;AAC3C,oDAA2B;AAE3B,mDAA4C;AAC5C,uCAAkC;AAClC,+CAAwD;AAExD,MAAa,cAAc;IAoBvB,YAAY,OASX;QACG,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;QAC1C,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAA;QACtD,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAA;QAChC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAA;QAC5B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI;YAC9B,eAAe,EAAE,EAAE;YACnB,gBAAgB,EAAE,EAAE;SACvB,CAAA;QAED,IAAA,gBAAM,EAAC,IAAI,CAAC,OAAO,CAAC,eAAe,IAAI,uBAAW,CAAC,CAAA;QACnD,IAAA,gBAAM,EAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,IAAI,uBAAW,CAAC,CAAA;QACpD,IAAA,gBAAM,EAAC,IAAI,CAAC,SAAS,IAAI,uBAAW,CAAC,CAAA;QACrC,IAAA,gBAAM,EAAC,IAAI,CAAC,QAAQ,IAAI,uBAAW,CAAC,CAAA;QACpC,IAAA,gBAAM,EAAC,IAAI,CAAC,eAAe,IAAI,uBAAW,CAAC,CAAA;IAC/C,CAAC;
|
|
1
|
+
{"version":3,"file":"auction-details.js","sourceRoot":"","sources":["../../../src/fusion-order/auction-details/auction-details.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,20 @@
|
|
|
1
1
|
export type AuctionPoint = {
|
|
2
|
+
/**
|
|
3
|
+
* point in time of this point relatively to previous point
|
|
4
|
+
*/
|
|
2
5
|
delay: number;
|
|
6
|
+
/**
|
|
7
|
+
* coefficient rate bump from the end of an auction
|
|
8
|
+
*/
|
|
3
9
|
coefficient: number;
|
|
4
10
|
};
|
|
5
11
|
export type AuctionGasCostInfo = {
|
|
12
|
+
/**
|
|
13
|
+
* Rate bump to cover gas price. 10_000_000 means 100%
|
|
14
|
+
*/
|
|
6
15
|
gasBumpEstimate: bigint;
|
|
16
|
+
/**
|
|
17
|
+
* Gas price at estimation time. 1000 means 1 Gwei
|
|
18
|
+
*/
|
|
7
19
|
gasPriceEstimate: bigint;
|
|
8
20
|
};
|
|
@@ -15,27 +15,70 @@ export declare class FusionOrder {
|
|
|
15
15
|
get takingAmount(): bigint;
|
|
16
16
|
get makingAmount(): bigint;
|
|
17
17
|
get receiver(): Address;
|
|
18
|
+
/**
|
|
19
|
+
* Timestamp in sec
|
|
20
|
+
*/
|
|
18
21
|
get deadline(): bigint;
|
|
19
|
-
static new(
|
|
22
|
+
static new(
|
|
23
|
+
/**
|
|
24
|
+
* Fusion extension address
|
|
25
|
+
* @see https://github.com/1inch/limit-order-settlement
|
|
26
|
+
*/
|
|
27
|
+
settlementExtension: Address, orderInfo: OrderInfoData, details: {
|
|
20
28
|
auction: AuctionDetails;
|
|
21
29
|
fees?: {
|
|
22
30
|
integratorFee?: IntegratorFee;
|
|
23
31
|
bankFee?: bigint;
|
|
24
32
|
};
|
|
25
33
|
whitelist: AuctionWhitelistItem[];
|
|
34
|
+
/**
|
|
35
|
+
* Time from which order can be executed
|
|
36
|
+
*/
|
|
37
|
+
resolvingStartTime?: bigint;
|
|
26
38
|
}, extra?: {
|
|
27
39
|
unwrapWETH?: boolean;
|
|
40
|
+
/**
|
|
41
|
+
* Required if `allowPartialFills` is false
|
|
42
|
+
*/
|
|
28
43
|
nonce?: bigint;
|
|
29
44
|
permit?: string;
|
|
45
|
+
/**
|
|
46
|
+
* Default is true
|
|
47
|
+
*/
|
|
30
48
|
allowPartialFills?: boolean;
|
|
49
|
+
/**
|
|
50
|
+
* Default is true
|
|
51
|
+
*/
|
|
31
52
|
allowMultipleFills?: boolean;
|
|
53
|
+
/**
|
|
54
|
+
* Order will expire in `orderExpirationDelay` after auction ends
|
|
55
|
+
* Default 12s
|
|
56
|
+
*/
|
|
32
57
|
orderExpirationDelay?: bigint;
|
|
33
58
|
enablePermit2?: boolean;
|
|
34
59
|
}): FusionOrder;
|
|
60
|
+
/**
|
|
61
|
+
* Create FusionOrder from order data and extension
|
|
62
|
+
*
|
|
63
|
+
*/
|
|
35
64
|
static fromDataAndExtension(order: LimitOrderV4Struct, extension: Extension): FusionOrder;
|
|
36
65
|
build(): LimitOrderV4Struct;
|
|
37
66
|
getOrderHash(domain?: import("@1inch/limit-order-sdk").EIP712DomainType): string;
|
|
38
67
|
getTypedData(domain?: import("@1inch/limit-order-sdk").EIP712DomainType): EIP712TypedData;
|
|
39
68
|
getCalculator(): AuctionCalculator;
|
|
69
|
+
/**
|
|
70
|
+
* Calculates required taking amount for passed `makingAmount` at block time `time`
|
|
71
|
+
*
|
|
72
|
+
* @param makingAmount maker swap amount
|
|
73
|
+
* @param time execution time in sec
|
|
74
|
+
* @param blockBaseFee block fee in wei.
|
|
75
|
+
* */
|
|
40
76
|
calcTakingAmount(makingAmount: bigint, time: bigint, blockBaseFee?: bigint): bigint;
|
|
77
|
+
/**
|
|
78
|
+
* Check whether address allowed to execute order at the given time
|
|
79
|
+
*
|
|
80
|
+
* @param executor address of executor
|
|
81
|
+
* @param executionTime timestamp in sec at which order planning to execute
|
|
82
|
+
*/
|
|
83
|
+
canExecuteAt(executor: Address, executionTime: bigint): boolean;
|
|
41
84
|
}
|