@1inch/fusion-sdk 0.1.10 → 0.1.12
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/api/fusion-api.d.ts +2 -0
- package/api/fusion-api.js +3 -0
- package/api/fusion-api.js.map +1 -1
- package/api/quoter/index.d.ts +1 -0
- package/api/quoter/index.js +1 -0
- package/api/quoter/index.js.map +1 -1
- package/api/quoter/quote/quote.d.ts +6 -1
- package/api/quoter/quote/quote.js +4 -1
- package/api/quoter/quote/quote.js.map +1 -1
- package/api/quoter/quoter-custom-preset.request.d.ts +10 -0
- package/api/quoter/quoter-custom-preset.request.js +66 -0
- package/api/quoter/quoter-custom-preset.request.js.map +1 -0
- package/api/quoter/quoter.api.d.ts +2 -0
- package/api/quoter/quoter.api.js +17 -0
- package/api/quoter/quoter.api.js.map +1 -1
- package/api/quoter/types.d.ts +16 -1
- package/api/quoter/types.js +1 -0
- package/api/quoter/types.js.map +1 -1
- package/constants.d.ts +2 -1
- package/constants.js +7 -3
- package/constants.js.map +1 -1
- package/package.json +2 -2
- package/sdk/sdk.d.ts +3 -1
- package/sdk/sdk.js +41 -8
- package/sdk/sdk.js.map +1 -1
- package/sdk/types.d.ts +5 -1
- package/api/orders/order-api.spec.d.ts +0 -1
- package/api/orders/order-api.spec.js +0 -431
- package/api/orders/order-api.spec.js.map +0 -1
- package/api/pagination.spec.d.ts +0 -1
- package/api/pagination.spec.js +0 -28
- package/api/pagination.spec.js.map +0 -1
- package/api/quoter/quoter.api.spec.d.ts +0 -1
- package/api/quoter/quoter.api.spec.js +0 -141
- package/api/quoter/quoter.api.spec.js.map +0 -1
- package/api/relayer/relayer.api.spec.d.ts +0 -1
- package/api/relayer/relayer.api.spec.js +0 -85
- package/api/relayer/relayer.api.spec.js.map +0 -1
- package/auction-calculator/auction-calculator.spec.d.ts +0 -1
- package/auction-calculator/auction-calculator.spec.js +0 -35
- package/auction-calculator/auction-calculator.spec.js.map +0 -1
- package/auction-salt/auction.salt.spec.d.ts +0 -1
- package/auction-salt/auction.salt.spec.js +0 -59
- package/auction-salt/auction.salt.spec.js.map +0 -1
- package/auction-suffix/auction-suffix.spec.d.ts +0 -1
- package/auction-suffix/auction-suffix.spec.js +0 -73
- package/auction-suffix/auction-suffix.spec.js.map +0 -1
- package/connector/blockchain/private-key-provider.connector.spec.d.ts +0 -1
- package/connector/blockchain/private-key-provider.connector.spec.js +0 -48
- package/connector/blockchain/private-key-provider.connector.spec.js.map +0 -1
- package/connector/blockchain/web3-provider.connector.spec.d.ts +0 -1
- package/connector/blockchain/web3-provider.connector.spec.js +0 -51
- package/connector/blockchain/web3-provider.connector.spec.js.map +0 -1
- package/connector/http/axios-provider.connector.spec.d.ts +0 -1
- package/connector/http/axios-provider.connector.spec.js +0 -37
- package/connector/http/axios-provider.connector.spec.js.map +0 -1
- package/fusion-order/fusion-order.spec.d.ts +0 -1
- package/fusion-order/fusion-order.spec.js +0 -54
- package/fusion-order/fusion-order.spec.js.map +0 -1
- package/limit-order/limit-order.spec.d.ts +0 -1
- package/limit-order/limit-order.spec.js +0 -196
- package/limit-order/limit-order.spec.js.map +0 -1
- package/limit-order/predicate-factory.spec.d.ts +0 -1
- package/limit-order/predicate-factory.spec.js +0 -35
- package/limit-order/predicate-factory.spec.js.map +0 -1
- package/nonce-manager/nonce-manager.spec.d.ts +0 -1
- package/nonce-manager/nonce-manager.spec.js +0 -20
- package/nonce-manager/nonce-manager.spec.js.map +0 -1
- package/sdk/sdk.spec.d.ts +0 -1
- package/sdk/sdk.spec.js +0 -85
- package/sdk/sdk.spec.js.map +0 -1
- package/settlement/settlement.spec.d.ts +0 -1
- package/settlement/settlement.spec.js +0 -67
- package/settlement/settlement.spec.js.map +0 -1
- package/ws-api/ws.spec.d.ts +0 -1
- package/ws-api/ws.spec.js +0 -644
- package/ws-api/ws.spec.js.map +0 -1
package/api/fusion-api.d.ts
CHANGED
|
@@ -3,6 +3,7 @@ import { QuoterRequest } from './quoter';
|
|
|
3
3
|
import { RelayerRequest } from './relayer';
|
|
4
4
|
import { Quote } from './quoter/quote/quote';
|
|
5
5
|
import { ActiveOrdersRequest, ActiveOrdersResponse, OrdersByMakerRequest, OrderStatusRequest, OrderStatusResponse, OrdersByMakerResponse } from './orders';
|
|
6
|
+
import { QuoterCustomPresetRequest } from './quoter/quoter-custom-preset.request';
|
|
6
7
|
export declare class FusionApi {
|
|
7
8
|
private readonly quoterApi;
|
|
8
9
|
private readonly relayerApi;
|
|
@@ -10,6 +11,7 @@ export declare class FusionApi {
|
|
|
10
11
|
constructor(config: FusionApiConfig);
|
|
11
12
|
static new(config: FusionApiConfig): FusionApi;
|
|
12
13
|
getQuote(params: QuoterRequest): Promise<Quote>;
|
|
14
|
+
getQuoteWithCustomPreset(params: QuoterRequest, body: QuoterCustomPresetRequest): Promise<Quote>;
|
|
13
15
|
getActiveOrders(params?: ActiveOrdersRequest): Promise<ActiveOrdersResponse>;
|
|
14
16
|
getOrderStatus(params: OrderStatusRequest): Promise<OrderStatusResponse>;
|
|
15
17
|
getOrdersByMaker(params: OrdersByMakerRequest): Promise<OrdersByMakerResponse>;
|
package/api/fusion-api.js
CHANGED
|
@@ -35,6 +35,9 @@ class FusionApi {
|
|
|
35
35
|
getQuote(params) {
|
|
36
36
|
return this.quoterApi.getQuote(params);
|
|
37
37
|
}
|
|
38
|
+
getQuoteWithCustomPreset(params, body) {
|
|
39
|
+
return this.quoterApi.getQuoteWithCustomPreset(params, body);
|
|
40
|
+
}
|
|
38
41
|
getActiveOrders(params = orders_1.ActiveOrdersRequest.new()) {
|
|
39
42
|
return this.ordersApi.getActiveOrders(params);
|
|
40
43
|
}
|
package/api/fusion-api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fusion-api.js","sourceRoot":"","sources":["../../src/api/fusion-api.ts"],"names":[],"mappings":";;;AACA,qCAAiD;AACjD,uCAAoD;AACpD,4CAAmD;AAEnD,qCAQiB;
|
|
1
|
+
{"version":3,"file":"fusion-api.js","sourceRoot":"","sources":["../../src/api/fusion-api.ts"],"names":[],"mappings":";;;AACA,qCAAiD;AACjD,uCAAoD;AACpD,4CAAmD;AAEnD,qCAQiB;AAGjB,MAAa,SAAS;IAOlB,YAAY,MAAuB;QAC/B,IAAI,CAAC,SAAS,GAAG,kBAAS,CAAC,GAAG,CAC1B;YACI,GAAG,EAAE,GAAG,MAAM,CAAC,GAAG,SAAS;YAC3B,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,OAAO,EAAE,MAAM,CAAC,OAAO;SAC1B,EACD,MAAM,CAAC,YAAY,CACtB,CAAA;QAED,IAAI,CAAC,UAAU,GAAG,oBAAU,CAAC,GAAG,CAC5B;YACI,GAAG,EAAE,GAAG,MAAM,CAAC,GAAG,UAAU;YAC5B,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,OAAO,EAAE,MAAM,CAAC,OAAO;SAC1B,EACD,MAAM,CAAC,YAAY,CACtB,CAAA;QAED,IAAI,CAAC,SAAS,GAAG,kBAAS,CAAC,GAAG,CAC1B;YACI,GAAG,EAAE,GAAG,MAAM,CAAC,GAAG,SAAS;YAC3B,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,OAAO,EAAE,MAAM,CAAC,OAAO;SAC1B,EACD,MAAM,CAAC,YAAY,CACtB,CAAA;IACL,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,MAAuB;QAC9B,OAAO,IAAI,SAAS,CAAC;YACjB,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,GAAG,EAAE,MAAM,CAAC,GAAG;YACf,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,YAAY,EACR,MAAM,CAAC,YAAY;gBACnB,IAAI,kCAAsB,CAAC,MAAM,CAAC,OAAO,CAAC;SACjD,CAAC,CAAA;IACN,CAAC;IAED,QAAQ,CAAC,MAAqB;QAC1B,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;IAC1C,CAAC;IAED,wBAAwB,CACpB,MAAqB,EACrB,IAA+B;QAE/B,OAAO,IAAI,CAAC,SAAS,CAAC,wBAAwB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IAChE,CAAC;IAED,eAAe,CACX,SAA8B,4BAAmB,CAAC,GAAG,EAAE;QAEvD,OAAO,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;IACjD,CAAC;IAED,cAAc,CAAC,MAA0B;QACrC,OAAO,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,CAAA;IAChD,CAAC;IAED,gBAAgB,CACZ,MAA4B;QAE5B,OAAO,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAA;IAClD,CAAC;IAED,WAAW,CAAC,MAAsB;QAC9B,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IACzC,CAAC;IAED,gBAAgB,CAAC,MAAwB;QACrC,OAAO,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;IAC9C,CAAC;CACJ;AAjFD,8BAiFC"}
|
package/api/quoter/index.d.ts
CHANGED
package/api/quoter/index.js
CHANGED
|
@@ -6,4 +6,5 @@ tslib_1.__exportStar(require("./quoter.request"), exports);
|
|
|
6
6
|
tslib_1.__exportStar(require("./quoter.api"), exports);
|
|
7
7
|
tslib_1.__exportStar(require("./types"), exports);
|
|
8
8
|
tslib_1.__exportStar(require("./preset"), exports);
|
|
9
|
+
tslib_1.__exportStar(require("./quoter-custom-preset.request"), exports);
|
|
9
10
|
//# sourceMappingURL=index.js.map
|
package/api/quoter/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/quoter/index.ts"],"names":[],"mappings":";;;AAAA,wDAA6B;AAC7B,2DAAgC;AAChC,uDAA4B;AAC5B,kDAAuB;AACvB,mDAAwB"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/quoter/index.ts"],"names":[],"mappings":";;;AAAA,wDAA6B;AAC7B,2DAAgC;AAChC,uDAA4B;AAC5B,kDAAuB;AACvB,mDAAwB;AACxB,yEAA8C"}
|
|
@@ -9,7 +9,12 @@ export declare class Quote {
|
|
|
9
9
|
private readonly params;
|
|
10
10
|
readonly fromTokenAmount: string;
|
|
11
11
|
readonly feeToken: string;
|
|
12
|
-
readonly presets:
|
|
12
|
+
readonly presets: {
|
|
13
|
+
[PresetEnum.fast]: Preset;
|
|
14
|
+
[PresetEnum.slow]: Preset;
|
|
15
|
+
[PresetEnum.medium]: Preset;
|
|
16
|
+
[PresetEnum.custom]?: Preset;
|
|
17
|
+
};
|
|
13
18
|
readonly recommendedPreset: PresetEnum;
|
|
14
19
|
readonly toTokenAmount: string;
|
|
15
20
|
readonly prices: Cost;
|
|
@@ -20,7 +20,10 @@ class Quote {
|
|
|
20
20
|
this.presets = {
|
|
21
21
|
[types_1.PresetEnum.fast]: new preset_1.Preset(response.presets.fast),
|
|
22
22
|
[types_1.PresetEnum.medium]: new preset_1.Preset(response.presets.medium),
|
|
23
|
-
[types_1.PresetEnum.slow]: new preset_1.Preset(response.presets.slow)
|
|
23
|
+
[types_1.PresetEnum.slow]: new preset_1.Preset(response.presets.slow),
|
|
24
|
+
[types_1.PresetEnum.custom]: response.presets.custom
|
|
25
|
+
? new preset_1.Preset(response.presets.custom)
|
|
26
|
+
: undefined
|
|
24
27
|
};
|
|
25
28
|
this.toTokenAmount = response.toTokenAmount;
|
|
26
29
|
this.prices = response.prices;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quote.js","sourceRoot":"","sources":["../../../../src/api/quoter/quote/quote.ts"],"names":[],"mappings":";;;AAAA,oCAAyD;AACzD,sCAAgC;AAChC,4DAAqD;AACrD,wDAAiD;AACjD,0CAA+C;AAC/C,kDAM2B;AAC3B,oFAA6E;AAE7E,iDAAgD;AAEhD,8EAAuE;AACvE,8CAAmD;AAEnD,MAAa,KAAK;
|
|
1
|
+
{"version":3,"file":"quote.js","sourceRoot":"","sources":["../../../../src/api/quoter/quote/quote.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { CustomPreset, QuoterCustomPresetRequestParams } from './types';
|
|
2
|
+
export declare class QuoterCustomPresetRequest {
|
|
3
|
+
readonly customPreset: CustomPreset;
|
|
4
|
+
constructor(params: QuoterCustomPresetRequestParams);
|
|
5
|
+
static new(params: QuoterCustomPresetRequestParams): QuoterCustomPresetRequest;
|
|
6
|
+
build(): CustomPreset;
|
|
7
|
+
validate(): string | null;
|
|
8
|
+
private validateAuctionDuration;
|
|
9
|
+
private validatePoints;
|
|
10
|
+
}
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.QuoterCustomPresetRequest = void 0;
|
|
4
|
+
const bignumber_1 = require("@ethersproject/bignumber");
|
|
5
|
+
const validations_1 = require("../../validations");
|
|
6
|
+
class QuoterCustomPresetRequest {
|
|
7
|
+
constructor(params) {
|
|
8
|
+
this.customPreset = params.customPreset;
|
|
9
|
+
}
|
|
10
|
+
static new(params) {
|
|
11
|
+
return new QuoterCustomPresetRequest(params);
|
|
12
|
+
}
|
|
13
|
+
build() {
|
|
14
|
+
return {
|
|
15
|
+
auctionDuration: this.customPreset.auctionDuration,
|
|
16
|
+
auctionEndAmount: this.customPreset.auctionEndAmount,
|
|
17
|
+
auctionStartAmount: this.customPreset.auctionStartAmount,
|
|
18
|
+
points: this.customPreset.points
|
|
19
|
+
};
|
|
20
|
+
}
|
|
21
|
+
validate() {
|
|
22
|
+
if (!(0, validations_1.isValidAmount)(this.customPreset.auctionStartAmount)) {
|
|
23
|
+
return 'Invalid auctionStartAmount';
|
|
24
|
+
}
|
|
25
|
+
if (!(0, validations_1.isValidAmount)(this.customPreset.auctionEndAmount)) {
|
|
26
|
+
return 'Invalid auctionEndAmount';
|
|
27
|
+
}
|
|
28
|
+
const durationErr = this.validateAuctionDuration(this.customPreset.auctionDuration);
|
|
29
|
+
if (durationErr) {
|
|
30
|
+
return durationErr;
|
|
31
|
+
}
|
|
32
|
+
const pointsErr = this.validatePoints(this.customPreset.points, this.customPreset.auctionStartAmount, this.customPreset.auctionEndAmount);
|
|
33
|
+
if (pointsErr) {
|
|
34
|
+
return pointsErr;
|
|
35
|
+
}
|
|
36
|
+
return null;
|
|
37
|
+
}
|
|
38
|
+
validateAuctionDuration(duration) {
|
|
39
|
+
if (typeof duration !== 'number' || isNaN(duration)) {
|
|
40
|
+
return 'auctionDuration should be integer';
|
|
41
|
+
}
|
|
42
|
+
if (!Number.isInteger(duration)) {
|
|
43
|
+
return 'auctionDuration should be integer (not float)';
|
|
44
|
+
}
|
|
45
|
+
return null;
|
|
46
|
+
}
|
|
47
|
+
validatePoints(points, auctionStartAmount, auctionEndAmount) {
|
|
48
|
+
if (!points) {
|
|
49
|
+
return null;
|
|
50
|
+
}
|
|
51
|
+
try {
|
|
52
|
+
const toTokenAmounts = points.map((p) => bignumber_1.BigNumber.from(p.toTokenAmount));
|
|
53
|
+
const isValid = toTokenAmounts.every((amount) => amount.lte(bignumber_1.BigNumber.from(auctionStartAmount)) &&
|
|
54
|
+
amount.gte(bignumber_1.BigNumber.from(auctionEndAmount)));
|
|
55
|
+
if (!isValid) {
|
|
56
|
+
return 'points should be in range of auction';
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
catch (e) {
|
|
60
|
+
return `points should be an array of valid amounts`;
|
|
61
|
+
}
|
|
62
|
+
return null;
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
exports.QuoterCustomPresetRequest = QuoterCustomPresetRequest;
|
|
66
|
+
//# sourceMappingURL=quoter-custom-preset.request.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"quoter-custom-preset.request.js","sourceRoot":"","sources":["../../../src/api/quoter/quoter-custom-preset.request.ts"],"names":[],"mappings":";;;AAAA,wDAAkD;AAClD,mDAA+C;AAO/C,MAAa,yBAAyB;IAGlC,YAAY,MAAuC;QAC/C,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAA;IAC3C,CAAC;IAED,MAAM,CAAC,GAAG,CACN,MAAuC;QAEvC,OAAO,IAAI,yBAAyB,CAAC,MAAM,CAAC,CAAA;IAChD,CAAC;IAED,KAAK;QACD,OAAO;YACH,eAAe,EAAE,IAAI,CAAC,YAAY,CAAC,eAAe;YAClD,gBAAgB,EAAE,IAAI,CAAC,YAAY,CAAC,gBAAgB;YACpD,kBAAkB,EAAE,IAAI,CAAC,YAAY,CAAC,kBAAkB;YACxD,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,MAAM;SACnC,CAAA;IACL,CAAC;IAED,QAAQ;QACJ,IAAI,CAAC,IAAA,2BAAa,EAAC,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,EAAE;YACtD,OAAO,4BAA4B,CAAA;SACtC;QAED,IAAI,CAAC,IAAA,2BAAa,EAAC,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,EAAE;YACpD,OAAO,0BAA0B,CAAA;SACpC;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,uBAAuB,CAC5C,IAAI,CAAC,YAAY,CAAC,eAAe,CACpC,CAAA;QAED,IAAI,WAAW,EAAE;YACb,OAAO,WAAW,CAAA;SACrB;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,CACjC,IAAI,CAAC,YAAY,CAAC,MAAM,EACxB,IAAI,CAAC,YAAY,CAAC,kBAAkB,EACpC,IAAI,CAAC,YAAY,CAAC,gBAAgB,CACrC,CAAA;QAED,IAAI,SAAS,EAAE;YACX,OAAO,SAAS,CAAA;SACnB;QAED,OAAO,IAAI,CAAA;IACf,CAAC;IAEO,uBAAuB,CAAC,QAAiB;QAC7C,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC,EAAE;YACjD,OAAO,mCAAmC,CAAA;SAC7C;QAED,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE;YAC7B,OAAO,+CAA+C,CAAA;SACzD;QAED,OAAO,IAAI,CAAA;IACf,CAAC;IAEO,cAAc,CAClB,MAA4B,EAC5B,kBAA2B,EAC3B,gBAAyB;QAEzB,IAAI,CAAC,MAAM,EAAE;YACT,OAAO,IAAI,CAAA;SACd;QAED,IAAI;YACA,MAAM,cAAc,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACpC,qBAAS,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC,CAClC,CAAA;YAED,MAAM,OAAO,GAAG,cAAc,CAAC,KAAK,CAChC,CAAC,MAAM,EAAE,EAAE,CACP,MAAM,CAAC,GAAG,CAAC,qBAAS,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;gBAC9C,MAAM,CAAC,GAAG,CAAC,qBAAS,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CACnD,CAAA;YAED,IAAI,CAAC,OAAO,EAAE;gBACV,OAAO,sCAAsC,CAAA;aAChD;SACJ;QAAC,OAAO,CAAC,EAAE;YACR,OAAO,4CAA4C,CAAA;SACtD;QAED,OAAO,IAAI,CAAA;IACf,CAAC;CACJ;AA7FD,8DA6FC"}
|
|
@@ -2,10 +2,12 @@ import { HttpProviderConnector } from '../../connector';
|
|
|
2
2
|
import { QuoterRequest } from './quoter.request';
|
|
3
3
|
import { QuoterApiConfig } from './types';
|
|
4
4
|
import { Quote } from './quote';
|
|
5
|
+
import { QuoterCustomPresetRequest } from './quoter-custom-preset.request';
|
|
5
6
|
export declare class QuoterApi {
|
|
6
7
|
private readonly config;
|
|
7
8
|
private readonly httpClient;
|
|
8
9
|
constructor(config: QuoterApiConfig, httpClient: HttpProviderConnector);
|
|
9
10
|
static new(config: QuoterApiConfig, httpClient?: HttpProviderConnector): QuoterApi;
|
|
10
11
|
getQuote(params: QuoterRequest): Promise<Quote>;
|
|
12
|
+
getQuoteWithCustomPreset(params: QuoterRequest, body: QuoterCustomPresetRequest): Promise<Quote>;
|
|
11
13
|
}
|
package/api/quoter/quoter.api.js
CHANGED
|
@@ -25,6 +25,23 @@ class QuoterApi {
|
|
|
25
25
|
return new quote_1.Quote(this.config.network, params, res);
|
|
26
26
|
});
|
|
27
27
|
}
|
|
28
|
+
getQuoteWithCustomPreset(params, body) {
|
|
29
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
30
|
+
const paramsErr = params.validate();
|
|
31
|
+
const bodyErr = body.validate();
|
|
32
|
+
if (paramsErr) {
|
|
33
|
+
throw new Error(paramsErr);
|
|
34
|
+
}
|
|
35
|
+
if (bodyErr) {
|
|
36
|
+
throw new Error(bodyErr);
|
|
37
|
+
}
|
|
38
|
+
const queryParams = (0, params_1.concatQueryParams)(params.build());
|
|
39
|
+
const bodyParams = body.build();
|
|
40
|
+
const url = `${this.config.url}/v1.0/${this.config.network}/quote/receive/${queryParams}`;
|
|
41
|
+
const res = yield this.httpClient.post(url, bodyParams);
|
|
42
|
+
return new quote_1.Quote(this.config.network, params, res);
|
|
43
|
+
});
|
|
44
|
+
}
|
|
28
45
|
}
|
|
29
46
|
exports.QuoterApi = QuoterApi;
|
|
30
47
|
//# sourceMappingURL=quoter.api.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quoter.api.js","sourceRoot":"","sources":["../../../src/api/quoter/quoter.api.ts"],"names":[],"mappings":";;;;AAAA,+CAA6E;AAG7E,sCAA2C;AAC3C,mCAA6B;
|
|
1
|
+
{"version":3,"file":"quoter.api.js","sourceRoot":"","sources":["../../../src/api/quoter/quoter.api.ts"],"names":[],"mappings":";;;;AAAA,+CAA6E;AAG7E,sCAA2C;AAC3C,mCAA6B;AAG7B,MAAa,SAAS;IAClB,YACqB,MAAuB,EACvB,UAAiC;QADjC,WAAM,GAAN,MAAM,CAAiB;QACvB,eAAU,GAAV,UAAU,CAAuB;IACnD,CAAC;IAEJ,MAAM,CAAC,GAAG,CACN,MAAuB,EACvB,aAAoC,IAAI,kCAAsB,CAC1D,MAAM,CAAC,OAAO,CACjB;QAED,OAAO,IAAI,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;IAC5C,CAAC;IAEK,QAAQ,CAAC,MAAqB;;YAChC,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAA;YAE7B,IAAI,GAAG,EAAE;gBACL,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAA;aACvB;YAED,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAA;YACrD,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,SAAS,IAAI,CAAC,MAAM,CAAC,OAAO,kBAAkB,WAAW,EAAE,CAAA;YAEzF,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAiB,GAAG,CAAC,CAAA;YAE1D,OAAO,IAAI,aAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,CAAA;QACtD,CAAC;KAAA;IAEK,wBAAwB,CAC1B,MAAqB,EACrB,IAA+B;;YAE/B,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAA;YACnC,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAA;YAE/B,IAAI,SAAS,EAAE;gBACX,MAAM,IAAI,KAAK,CAAC,SAAS,CAAC,CAAA;aAC7B;YAED,IAAI,OAAO,EAAE;gBACT,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAA;aAC3B;YAED,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAA;YACrD,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,EAAE,CAAA;YAC/B,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,SAAS,IAAI,CAAC,MAAM,CAAC,OAAO,kBAAkB,WAAW,EAAE,CAAA;YAEzF,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAiB,GAAG,EAAE,UAAU,CAAC,CAAA;YAEvE,OAAO,IAAI,aAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,CAAA;QACtD,CAAC;KAAA;CACJ;AArDD,8BAqDC"}
|
package/api/quoter/types.d.ts
CHANGED
|
@@ -9,6 +9,9 @@ export declare type QuoterRequestParams = {
|
|
|
9
9
|
fee?: number;
|
|
10
10
|
source?: string;
|
|
11
11
|
};
|
|
12
|
+
export declare type QuoterCustomPresetRequestParams = {
|
|
13
|
+
customPreset: CustomPreset;
|
|
14
|
+
};
|
|
12
15
|
export declare type QuoterApiConfig = {
|
|
13
16
|
network: NetworkEnum;
|
|
14
17
|
url: string;
|
|
@@ -30,6 +33,7 @@ export declare type QuoterPresets = {
|
|
|
30
33
|
fast: PresetData;
|
|
31
34
|
medium: PresetData;
|
|
32
35
|
slow: PresetData;
|
|
36
|
+
custom?: PresetData;
|
|
33
37
|
};
|
|
34
38
|
export declare type PresetData = {
|
|
35
39
|
auctionDuration: number;
|
|
@@ -54,5 +58,16 @@ export declare type Cost = {
|
|
|
54
58
|
export declare enum PresetEnum {
|
|
55
59
|
fast = "fast",
|
|
56
60
|
medium = "medium",
|
|
57
|
-
slow = "slow"
|
|
61
|
+
slow = "slow",
|
|
62
|
+
custom = "custom"
|
|
58
63
|
}
|
|
64
|
+
export declare type CustomPreset = {
|
|
65
|
+
auctionDuration: number;
|
|
66
|
+
auctionStartAmount: string;
|
|
67
|
+
auctionEndAmount: string;
|
|
68
|
+
points?: CustomPresetPoint[];
|
|
69
|
+
};
|
|
70
|
+
export declare type CustomPresetPoint = {
|
|
71
|
+
toTokenAmount: string;
|
|
72
|
+
delay: number;
|
|
73
|
+
};
|
package/api/quoter/types.js
CHANGED
package/api/quoter/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/api/quoter/types.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/api/quoter/types.ts"],"names":[],"mappings":";;;AAkEA,IAAY,UAKX;AALD,WAAY,UAAU;IAClB,2BAAa,CAAA;IACb,+BAAiB,CAAA;IACjB,2BAAa,CAAA;IACb,+BAAiB,CAAA;AACrB,CAAC,EALW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAKrB"}
|
package/constants.d.ts
CHANGED
|
@@ -10,7 +10,8 @@ export declare enum NetworkEnum {
|
|
|
10
10
|
AVALANCHE = 43114,
|
|
11
11
|
OPTIMISM = 10,
|
|
12
12
|
FANTOM = 250,
|
|
13
|
-
GNOSIS = 100
|
|
13
|
+
GNOSIS = 100,
|
|
14
|
+
COINBASE = 8453
|
|
14
15
|
}
|
|
15
16
|
export declare const WRAPPER_ADDRESS_MAP: Record<NetworkEnum, string>;
|
|
16
17
|
export declare const UNWRAPPER_CONTRACT_ADDRESS_MAP: Record<NetworkEnum, string>;
|
package/constants.js
CHANGED
|
@@ -15,6 +15,7 @@ var NetworkEnum;
|
|
|
15
15
|
NetworkEnum[NetworkEnum["OPTIMISM"] = 10] = "OPTIMISM";
|
|
16
16
|
NetworkEnum[NetworkEnum["FANTOM"] = 250] = "FANTOM";
|
|
17
17
|
NetworkEnum[NetworkEnum["GNOSIS"] = 100] = "GNOSIS";
|
|
18
|
+
NetworkEnum[NetworkEnum["COINBASE"] = 8453] = "COINBASE";
|
|
18
19
|
})(NetworkEnum = exports.NetworkEnum || (exports.NetworkEnum = {}));
|
|
19
20
|
exports.WRAPPER_ADDRESS_MAP = {
|
|
20
21
|
[NetworkEnum.ETHEREUM]: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
|
|
@@ -24,7 +25,8 @@ exports.WRAPPER_ADDRESS_MAP = {
|
|
|
24
25
|
[NetworkEnum.AVALANCHE]: '0xb31f66aa3c1e785363f0875a1b74e27b85fd66c7',
|
|
25
26
|
[NetworkEnum.OPTIMISM]: '0x4200000000000000000000000000000000000006',
|
|
26
27
|
[NetworkEnum.FANTOM]: '0x21be370d5312f44cb42ce377bc9b8a0cef1a4c83',
|
|
27
|
-
[NetworkEnum.GNOSIS]: '0xe91d153e0b41518a2ce8dd3d7944fa863463a97d'
|
|
28
|
+
[NetworkEnum.GNOSIS]: '0xe91d153e0b41518a2ce8dd3d7944fa863463a97d',
|
|
29
|
+
[NetworkEnum.COINBASE]: '0x4200000000000000000000000000000000000006'
|
|
28
30
|
};
|
|
29
31
|
exports.UNWRAPPER_CONTRACT_ADDRESS_MAP = {
|
|
30
32
|
[NetworkEnum.ETHEREUM]: '0x08b067ad41e45babe5bbb52fc2fe7f692f628b06',
|
|
@@ -34,7 +36,8 @@ exports.UNWRAPPER_CONTRACT_ADDRESS_MAP = {
|
|
|
34
36
|
[NetworkEnum.AVALANCHE]: '0x5d0ec1f843c1233d304b96dbde0cab9ec04d71ef',
|
|
35
37
|
[NetworkEnum.OPTIMISM]: '0xb33839e05ce9fc53236ae325324a27612f4d110d',
|
|
36
38
|
[NetworkEnum.FANTOM]: '0x94bc2a1c732bcad7343b25af48385fe76e08734f',
|
|
37
|
-
[NetworkEnum.GNOSIS]: '0xd41b24bba51fac0e4827b6f94c0d6ddeb183cd64'
|
|
39
|
+
[NetworkEnum.GNOSIS]: '0xd41b24bba51fac0e4827b6f94c0d6ddeb183cd64',
|
|
40
|
+
[NetworkEnum.COINBASE]: '0xb33839e05ce9fc53236ae325324a27612f4d110d'
|
|
38
41
|
};
|
|
39
42
|
exports.SETTLEMENT_CONTRACT_ADDRESS_MAP = {
|
|
40
43
|
[NetworkEnum.ETHEREUM]: '0xa88800cd213da5ae406ce248380802bd53b47647',
|
|
@@ -44,7 +47,8 @@ exports.SETTLEMENT_CONTRACT_ADDRESS_MAP = {
|
|
|
44
47
|
[NetworkEnum.AVALANCHE]: '0x7731f8df999a9441ae10519617c24568dc82f697',
|
|
45
48
|
[NetworkEnum.OPTIMISM]: '0xd89adc20c400b6c45086a7f6ab2dca19745b89c2',
|
|
46
49
|
[NetworkEnum.FANTOM]: '0xa218543cc21ee9388fa1e509f950fd127ca82155',
|
|
47
|
-
[NetworkEnum.GNOSIS]: '0xcbdb7490968d4dbf183c60fc899c2e9fbd445308'
|
|
50
|
+
[NetworkEnum.GNOSIS]: '0xcbdb7490968d4dbf183c60fc899c2e9fbd445308',
|
|
51
|
+
[NetworkEnum.COINBASE]: '0x7f069df72b7a39bce9806e3afaf579e54d8cf2b9'
|
|
48
52
|
};
|
|
49
53
|
exports.ONE_INCH_ROUTER_V5 = '0x1111111254eeb25477b68fb85ed929f73a960582';
|
|
50
54
|
//# sourceMappingURL=constants.js.map
|
package/constants.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,eAAe,GAAG,4CAA4C,CAAA;AAC9D,QAAA,YAAY,GAAG,4CAA4C,CAAA;AAC3D,QAAA,WAAW,GAAG,GAAG,CAAA;AACjB,QAAA,EAAE,GAAG,IAAI,CAAA;AAEtB,IAAY,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,eAAe,GAAG,4CAA4C,CAAA;AAC9D,QAAA,YAAY,GAAG,4CAA4C,CAAA;AAC3D,QAAA,WAAW,GAAG,GAAG,CAAA;AACjB,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,mBAAmB,GAAgC;IAC5D,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,4CAA4C;IACpE,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,4CAA4C;IACnE,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,4CAA4C;IACnE,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,4CAA4C;IACpE,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,4CAA4C;IACrE,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,4CAA4C;IACpE,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,4CAA4C;IAClE,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,4CAA4C;IAClE,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,4CAA4C;CACvE,CAAA;AAEY,QAAA,8BAA8B,GAAgC;IACvE,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,4CAA4C;IACpE,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,4CAA4C;IACnE,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,4CAA4C;IACnE,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,4CAA4C;IACpE,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,4CAA4C;IACrE,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,4CAA4C;IACpE,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,4CAA4C;IAClE,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,4CAA4C;IAClE,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,4CAA4C;CACvE,CAAA;AAEY,QAAA,+BAA+B,GAAgC;IACxE,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,4CAA4C;IACpE,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,4CAA4C;IACnE,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,4CAA4C;IACnE,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,4CAA4C;IACpE,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,4CAA4C;IACrE,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,4CAA4C;IACpE,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,4CAA4C;IAClE,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,4CAA4C;IAClE,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,4CAA4C;CACvE,CAAA;AAEY,QAAA,kBAAkB,GAAG,4CAA4C,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@1inch/fusion-sdk",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.12",
|
|
4
4
|
"description": "1inch Fusion Mode SDK",
|
|
5
5
|
"private": false,
|
|
6
6
|
"main": "index.js",
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
},
|
|
12
12
|
"scripts": {
|
|
13
13
|
"prebuild": "rm -rf dist && yarn run test:coverage",
|
|
14
|
-
"build": "tsc --module commonjs",
|
|
14
|
+
"build": "tsc --module commonjs -p tsconfig.build.json",
|
|
15
15
|
"postbuild": "cp package.json dist && cp README.md dist",
|
|
16
16
|
"lint": "eslint ./src --ext .js,.ts",
|
|
17
17
|
"release": "standard-version",
|
package/sdk/sdk.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { FusionApi, Quote } from '../api';
|
|
2
|
-
import { FusionSDKConfigParams, OrderInfo, OrderParams, PreparedOrder, QuoteParams } from './types';
|
|
2
|
+
import { FusionSDKConfigParams, OrderInfo, OrderParams, PreparedOrder, QuoteParams, QuoteCustomPresetParams } from './types';
|
|
3
3
|
import { ActiveOrdersRequestParams, ActiveOrdersResponse, OrdersByMakerParams, OrdersByMakerResponse, OrderStatusResponse } from '../api/orders';
|
|
4
4
|
import { FusionOrder } from '../fusion-order';
|
|
5
5
|
export declare class FusionSDK {
|
|
@@ -10,9 +10,11 @@ export declare class FusionSDK {
|
|
|
10
10
|
getOrderStatus(orderHash: string): Promise<OrderStatusResponse>;
|
|
11
11
|
getOrdersByMaker({ limit, page, address }: OrdersByMakerParams): Promise<OrdersByMakerResponse>;
|
|
12
12
|
getQuote(params: QuoteParams): Promise<Quote>;
|
|
13
|
+
getQuoteWithCustomPreset(params: QuoteParams, body: QuoteCustomPresetParams): Promise<Quote>;
|
|
13
14
|
createOrder(params: OrderParams): Promise<PreparedOrder>;
|
|
14
15
|
submitOrder(order: FusionOrder, quoteId: string): Promise<OrderInfo>;
|
|
15
16
|
placeOrder(params: OrderParams): Promise<OrderInfo>;
|
|
16
17
|
buildCancelOrderCallData(orderHash: string): Promise<string>;
|
|
18
|
+
private getQuoteResult;
|
|
17
19
|
private getNonce;
|
|
18
20
|
}
|
package/sdk/sdk.js
CHANGED
|
@@ -9,6 +9,7 @@ const orders_1 = require("../api/orders");
|
|
|
9
9
|
const nonce_manager_1 = require("../nonce-manager/nonce-manager");
|
|
10
10
|
const types_1 = require("../nonce-manager/types");
|
|
11
11
|
const encoders_1 = require("./encoders");
|
|
12
|
+
const quoter_custom_preset_request_1 = require("../api/quoter/quoter-custom-preset.request");
|
|
12
13
|
class FusionSDK {
|
|
13
14
|
constructor(config) {
|
|
14
15
|
this.config = config;
|
|
@@ -52,20 +53,28 @@ class FusionSDK {
|
|
|
52
53
|
return this.api.getQuote(request);
|
|
53
54
|
});
|
|
54
55
|
}
|
|
55
|
-
|
|
56
|
-
var _a, _b;
|
|
56
|
+
getQuoteWithCustomPreset(params, body) {
|
|
57
57
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
58
|
-
const
|
|
58
|
+
const paramsRequest = api_1.QuoterRequest.new({
|
|
59
59
|
fromTokenAddress: params.fromTokenAddress,
|
|
60
60
|
toTokenAddress: params.toTokenAddress,
|
|
61
61
|
amount: params.amount,
|
|
62
|
-
walletAddress:
|
|
62
|
+
walletAddress: constants_1.ZERO_ADDRESS,
|
|
63
63
|
permit: params.permit,
|
|
64
|
-
enableEstimate:
|
|
65
|
-
fee:
|
|
64
|
+
enableEstimate: false,
|
|
65
|
+
fee: params === null || params === void 0 ? void 0 : params.takingFeeBps,
|
|
66
66
|
source: params.source
|
|
67
67
|
});
|
|
68
|
-
const
|
|
68
|
+
const bodyRequest = quoter_custom_preset_request_1.QuoterCustomPresetRequest.new({
|
|
69
|
+
customPreset: body.customPreset
|
|
70
|
+
});
|
|
71
|
+
return this.api.getQuoteWithCustomPreset(paramsRequest, bodyRequest);
|
|
72
|
+
});
|
|
73
|
+
}
|
|
74
|
+
createOrder(params) {
|
|
75
|
+
var _a;
|
|
76
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
77
|
+
const quote = yield this.getQuoteResult(params);
|
|
69
78
|
if (!quote.quoteId) {
|
|
70
79
|
throw new Error('quoter has not returned quoteId');
|
|
71
80
|
}
|
|
@@ -75,7 +84,7 @@ class FusionSDK {
|
|
|
75
84
|
preset: params.preset,
|
|
76
85
|
nonce,
|
|
77
86
|
permit: params.permit,
|
|
78
|
-
takingFeeReceiver: (
|
|
87
|
+
takingFeeReceiver: (_a = params.fee) === null || _a === void 0 ? void 0 : _a.takingFeeReceiver
|
|
79
88
|
});
|
|
80
89
|
const domain = (0, limit_order_1.getLimitOrderV3Domain)(this.config.network);
|
|
81
90
|
const hash = order.getOrderHash(domain);
|
|
@@ -132,6 +141,30 @@ class FusionSDK {
|
|
|
132
141
|
});
|
|
133
142
|
});
|
|
134
143
|
}
|
|
144
|
+
getQuoteResult(params) {
|
|
145
|
+
var _a;
|
|
146
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
147
|
+
const quoterRequest = api_1.QuoterRequest.new({
|
|
148
|
+
fromTokenAddress: params.fromTokenAddress,
|
|
149
|
+
toTokenAddress: params.toTokenAddress,
|
|
150
|
+
amount: params.amount,
|
|
151
|
+
walletAddress: params.walletAddress,
|
|
152
|
+
permit: params.permit,
|
|
153
|
+
enableEstimate: true,
|
|
154
|
+
fee: (_a = params.fee) === null || _a === void 0 ? void 0 : _a.takingFeeBps,
|
|
155
|
+
source: params.source
|
|
156
|
+
});
|
|
157
|
+
if (!params.customPreset) {
|
|
158
|
+
const quote = yield this.api.getQuote(quoterRequest);
|
|
159
|
+
return quote;
|
|
160
|
+
}
|
|
161
|
+
const quoterWithCustomPresetBodyRequest = quoter_custom_preset_request_1.QuoterCustomPresetRequest.new({
|
|
162
|
+
customPreset: params.customPreset
|
|
163
|
+
});
|
|
164
|
+
const quote = yield this.api.getQuoteWithCustomPreset(quoterRequest, quoterWithCustomPresetBodyRequest);
|
|
165
|
+
return quote;
|
|
166
|
+
});
|
|
167
|
+
}
|
|
135
168
|
getNonce(walletAddress, nonce) {
|
|
136
169
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
137
170
|
if (!this.config.blockchainProvider) {
|
package/sdk/sdk.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sdk.js","sourceRoot":"","sources":["../../src/sdk/sdk.ts"],"names":[],"mappings":";;;;AAAA,gCAAsE;
|
|
1
|
+
{"version":3,"file":"sdk.js","sourceRoot":"","sources":["../../src/sdk/sdk.ts"],"names":[],"mappings":"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"}
|
package/sdk/types.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { BlockchainProviderConnector, HttpProviderConnector } from '../connector';
|
|
2
2
|
import { NetworkEnum } from '../constants';
|
|
3
3
|
import { LimitOrderV3Struct } from '../limit-order';
|
|
4
|
-
import { PresetEnum } from '../api';
|
|
4
|
+
import { CustomPreset, PresetEnum } from '../api';
|
|
5
5
|
import { OrderNonce } from '../nonce-manager/types';
|
|
6
6
|
import { FusionOrder } from '../fusion-order';
|
|
7
7
|
export declare type FusionSDKConfigParams = {
|
|
@@ -19,6 +19,9 @@ export declare type QuoteParams = {
|
|
|
19
19
|
takingFeeBps?: number;
|
|
20
20
|
source?: string;
|
|
21
21
|
};
|
|
22
|
+
export declare type QuoteCustomPresetParams = {
|
|
23
|
+
customPreset: CustomPreset;
|
|
24
|
+
};
|
|
22
25
|
export declare type OrderParams = {
|
|
23
26
|
fromTokenAddress: string;
|
|
24
27
|
toTokenAddress: string;
|
|
@@ -30,6 +33,7 @@ export declare type OrderParams = {
|
|
|
30
33
|
nonce?: OrderNonce | string | number;
|
|
31
34
|
fee?: TakingFeeInfo;
|
|
32
35
|
source?: string;
|
|
36
|
+
customPreset?: CustomPreset;
|
|
33
37
|
};
|
|
34
38
|
export declare type TakingFeeInfo = {
|
|
35
39
|
takingFeeBps: number;
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export {};
|