@1inch/fusion-sdk 1.0.1-rc.30 → 1.0.1-rc.32

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.
Files changed (37) hide show
  1. package/dist/api/orders/order-api.spec.js +5 -5
  2. package/dist/api/orders/orders.api.d.ts +1 -0
  3. package/dist/api/orders/orders.api.js +4 -3
  4. package/dist/api/orders/orders.api.js.map +1 -1
  5. package/dist/api/orders/types.d.ts +2 -0
  6. package/dist/api/orders/types.js.map +1 -1
  7. package/dist/api/quoter/quote/quote.js +10 -3
  8. package/dist/api/quoter/quote/quote.js.map +1 -1
  9. package/dist/api/quoter/quoter.api.d.ts +1 -0
  10. package/dist/api/quoter/quoter.api.js +3 -2
  11. package/dist/api/quoter/quoter.api.js.map +1 -1
  12. package/dist/api/quoter/quoter.api.spec.js +3 -3
  13. package/dist/api/relayer/relayer.api.d.ts +1 -0
  14. package/dist/api/relayer/relayer.api.js +3 -2
  15. package/dist/api/relayer/relayer.api.js.map +1 -1
  16. package/dist/api/relayer/relayer.api.spec.js +8 -5
  17. package/dist/api/relayer/relayer.api.spec.js.map +1 -1
  18. package/dist/api/relayer/relayer.request.d.ts +1 -0
  19. package/dist/api/relayer/relayer.request.js +3 -1
  20. package/dist/api/relayer/relayer.request.js.map +1 -1
  21. package/dist/api/relayer/types.d.ts +1 -0
  22. package/dist/fusion-order/fusion-extension.d.ts +10 -2
  23. package/dist/fusion-order/fusion-extension.js +31 -6
  24. package/dist/fusion-order/fusion-extension.js.map +1 -1
  25. package/dist/fusion-order/fusion-extension.spec.d.ts +1 -0
  26. package/dist/fusion-order/fusion-extension.spec.js +41 -0
  27. package/dist/fusion-order/fusion-extension.spec.js.map +1 -0
  28. package/dist/fusion-order/fusion-order.d.ts +2 -1
  29. package/dist/fusion-order/fusion-order.js.map +1 -1
  30. package/dist/sdk/sdk.js +4 -2
  31. package/dist/sdk/sdk.js.map +1 -1
  32. package/dist/sdk/types.d.ts +1 -0
  33. package/dist/ws-api/ws-api.d.ts +1 -0
  34. package/dist/ws-api/ws-api.js +2 -1
  35. package/dist/ws-api/ws-api.js.map +1 -1
  36. package/dist/ws-api/ws.spec.js +8 -8
  37. package/package.json +3 -3
@@ -80,7 +80,7 @@ describe(__filename, () => {
80
80
  });
81
81
  const response = await sdk.getActiveOrders({ page: 1, limit: 2 });
82
82
  expect(response).toEqual(expected);
83
- expect(httpProvider.get).toHaveBeenLastCalledWith(`${url}/orders/v1.0/1/order/active/?page=1&limit=2`);
83
+ expect(httpProvider.get).toHaveBeenLastCalledWith(`${url}/orders/v2.0/1/order/active/?page=1&limit=2`);
84
84
  });
85
85
  it('passes without providing args', async () => {
86
86
  const expected = {
@@ -137,7 +137,7 @@ describe(__filename, () => {
137
137
  });
138
138
  const response = await sdk.getActiveOrders();
139
139
  expect(response).toEqual(expected);
140
- expect(httpProvider.get).toHaveBeenLastCalledWith(`${url}/orders/v1.0/1/order/active/?`);
140
+ expect(httpProvider.get).toHaveBeenLastCalledWith(`${url}/orders/v2.0/1/order/active/?`);
141
141
  });
142
142
  });
143
143
  describe('getOrderStatus', () => {
@@ -181,7 +181,7 @@ describe(__filename, () => {
181
181
  const orderHash = `0x1beee023ab933cf5446c298eadadb61c05705f2156ef5b2db36c160b36f31ce4`;
182
182
  const response = await sdk.getOrderStatus(orderHash);
183
183
  expect(response).toEqual(expected);
184
- expect(httpProvider.get).toHaveBeenLastCalledWith(`${url}/orders/v1.0/1/order/status/${orderHash}`);
184
+ expect(httpProvider.get).toHaveBeenLastCalledWith(`${url}/orders/v2.0/1/order/status/${orderHash}`);
185
185
  });
186
186
  it('throws an error when the string is not hexadecimal', async () => {
187
187
  const url = 'https://test.com';
@@ -313,7 +313,7 @@ describe(__filename, () => {
313
313
  page: 1
314
314
  });
315
315
  expect(response).toEqual(expected);
316
- expect(httpProvider.get).toHaveBeenLastCalledWith(`${url}/orders/v1.0/1/order/maker/${address}/?limit=1&page=1`);
316
+ expect(httpProvider.get).toHaveBeenLastCalledWith(`${url}/orders/v2.0/1/order/maker/${address}/?limit=1&page=1`);
317
317
  });
318
318
  it('handles the case when no pagination params was passed', async () => {
319
319
  const url = 'https://test.com';
@@ -359,7 +359,7 @@ describe(__filename, () => {
359
359
  address
360
360
  });
361
361
  expect(response).toEqual(expected);
362
- expect(httpProvider.get).toHaveBeenLastCalledWith(`${url}/orders/v1.0/1/order/maker/${address}/?`);
362
+ expect(httpProvider.get).toHaveBeenLastCalledWith(`${url}/orders/v2.0/1/order/maker/${address}/?`);
363
363
  });
364
364
  it('throws an error with invalid address', async () => {
365
365
  const url = 'https://test.com';
@@ -4,6 +4,7 @@ import { HttpProviderConnector } from '../../connector';
4
4
  export declare class OrdersApi {
5
5
  private readonly config;
6
6
  private readonly httpClient;
7
+ private static Version;
7
8
  constructor(config: OrdersApiConfig, httpClient: HttpProviderConnector);
8
9
  static new(config: OrdersApiConfig, httpClient?: HttpProviderConnector): OrdersApi;
9
10
  getActiveOrders(params: ActiveOrdersRequest): Promise<ActiveOrdersResponse>;
@@ -17,7 +17,7 @@ class OrdersApi {
17
17
  throw new Error(err);
18
18
  }
19
19
  const queryParams = (0, params_1.concatQueryParams)(params.build());
20
- const url = `${this.config.url}/v1.0/${this.config.network}/order/active/${queryParams}`;
20
+ const url = `${this.config.url}/${OrdersApi.Version}/${this.config.network}/order/active/${queryParams}`;
21
21
  return this.httpClient.get(url);
22
22
  }
23
23
  async getOrderStatus(params) {
@@ -25,7 +25,7 @@ class OrdersApi {
25
25
  if (err) {
26
26
  throw new Error(err);
27
27
  }
28
- const url = `${this.config.url}/v1.0/${this.config.network}/order/status/${params.orderHash}`;
28
+ const url = `${this.config.url}/${OrdersApi.Version}/${this.config.network}/order/status/${params.orderHash}`;
29
29
  return this.httpClient.get(url);
30
30
  }
31
31
  async getOrdersByMaker(params) {
@@ -34,9 +34,10 @@ class OrdersApi {
34
34
  throw new Error(err);
35
35
  }
36
36
  const queryParams = (0, params_1.concatQueryParams)(params.buildQueryParams());
37
- const url = `${this.config.url}/v1.0/${this.config.network}/order/maker/${params.address}/${queryParams}`;
37
+ const url = `${this.config.url}/${OrdersApi.Version}/${this.config.network}/order/maker/${params.address}/${queryParams}`;
38
38
  return this.httpClient.get(url);
39
39
  }
40
40
  }
41
41
  exports.OrdersApi = OrdersApi;
42
+ OrdersApi.Version = 'v2.0';
42
43
  //# sourceMappingURL=orders.api.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"orders.api.js","sourceRoot":"","sources":["../../../src/api/orders/orders.api.ts"],"names":[],"mappings":";;;AAWA,+CAA6E;AAC7E,sCAA2C;AAE3C,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;IAED,KAAK,CAAC,eAAe,CACjB,MAA2B;QAE3B,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAA;QAE7B,IAAI,GAAG,EAAE;YACL,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAA;SACvB;QAED,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAA;QACrD,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,SAAS,IAAI,CAAC,MAAM,CAAC,OAAO,iBAAiB,WAAW,EAAE,CAAA;QAExF,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAuB,GAAG,CAAC,CAAA;IACzD,CAAC;IAED,KAAK,CAAC,cAAc,CAChB,MAA0B;QAE1B,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAA;QAE7B,IAAI,GAAG,EAAE;YACL,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAA;SACvB;QAED,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,SAAS,IAAI,CAAC,MAAM,CAAC,OAAO,iBAAiB,MAAM,CAAC,SAAS,EAAE,CAAA;QAE7F,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAsB,GAAG,CAAC,CAAA;IACxD,CAAC;IAED,KAAK,CAAC,gBAAgB,CAClB,MAA4B;QAE5B,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAA;QAE7B,IAAI,GAAG,EAAE;YACL,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAA;SACvB;QAED,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,CAAA;QAChE,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,SAAS,IAAI,CAAC,MAAM,CAAC,OAAO,gBAAgB,MAAM,CAAC,OAAO,IAAI,WAAW,EAAE,CAAA;QAEzG,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IACnC,CAAC;CACJ;AA1DD,8BA0DC"}
1
+ {"version":3,"file":"orders.api.js","sourceRoot":"","sources":["../../../src/api/orders/orders.api.ts"],"names":[],"mappings":";;;AAWA,+CAA6E;AAC7E,sCAA2C;AAE3C,MAAa,SAAS;IAGlB,YACqB,MAAuB,EACvB,UAAiC;QADjC,WAAM,GAAN,MAAM,CAAiB;QACvB,eAAU,GAAV,UAAU,CAAuB;IACnD,CAAC;IAEJ,MAAM,CAAC,GAAG,CACN,MAAuB,EACvB,aAAoC,IAAI,kCAAsB,CAC1D,MAAM,CAAC,OAAO,CACjB;QAED,OAAO,IAAI,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;IAC5C,CAAC;IAED,KAAK,CAAC,eAAe,CACjB,MAA2B;QAE3B,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAA;QAE7B,IAAI,GAAG,EAAE;YACL,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAA;SACvB;QAED,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAA;QACrD,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,SAAS,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,iBAAiB,WAAW,EAAE,CAAA;QAExG,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAuB,GAAG,CAAC,CAAA;IACzD,CAAC;IAED,KAAK,CAAC,cAAc,CAChB,MAA0B;QAE1B,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAA;QAE7B,IAAI,GAAG,EAAE;YACL,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAA;SACvB;QAED,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,SAAS,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,iBAAiB,MAAM,CAAC,SAAS,EAAE,CAAA;QAE7G,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAsB,GAAG,CAAC,CAAA;IACxD,CAAC;IAED,KAAK,CAAC,gBAAgB,CAClB,MAA4B;QAE5B,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAA;QAE7B,IAAI,GAAG,EAAE;YACL,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAA;SACvB;QAED,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,CAAA;QAChE,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,SAAS,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,gBAAgB,MAAM,CAAC,OAAO,IAAI,WAAW,EAAE,CAAA;QAEzH,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IACnC,CAAC;;AA3DL,8BA4DC;AA3DkB,iBAAO,GAAG,MAAM,CAAA"}
@@ -18,6 +18,7 @@ export type ActiveOrder = {
18
18
  auctionEndDate: string;
19
19
  remainingMakerAmount: string;
20
20
  order: LimitOrderV4Struct;
21
+ extension: string;
21
22
  };
22
23
  export type ActiveOrdersResponse = PaginationOutput<ActiveOrder>;
23
24
  export type OrderStatusParams = {
@@ -42,6 +43,7 @@ export type Fill = {
42
43
  export type OrderStatusResponse = {
43
44
  status: OrderStatus;
44
45
  order: LimitOrderV4Struct;
46
+ extension: string;
45
47
  points: AuctionPoint[] | null;
46
48
  fills: Fill[];
47
49
  auctionStartDate: number;
@@ -1 +1 @@
1
- {"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/api/orders/types.ts"],"names":[],"mappings":";;;AA+BA,IAAY,WAUX;AAVD,WAAY,WAAW;IACnB,kCAAmB,CAAA;IACnB,gCAAiB,CAAA;IACjB,iDAAkC,CAAA;IAClC,8EAA+D,CAAA;IAC/D,kCAAmB,CAAA;IACnB,mDAAoC,CAAA;IACpC,2CAA4B,CAAA;IAC5B,sCAAuB,CAAA;IACvB,qDAAsC,CAAA;AAC1C,CAAC,EAVW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAUtB"}
1
+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/api/orders/types.ts"],"names":[],"mappings":";;;AAgCA,IAAY,WAUX;AAVD,WAAY,WAAW;IACnB,kCAAmB,CAAA;IACnB,gCAAiB,CAAA;IACjB,iDAAkC,CAAA;IAClC,8EAA+D,CAAA;IAC/D,kCAAmB,CAAA;IACnB,mDAAoC,CAAA;IACpC,2CAA4B,CAAA;IAC5B,sCAAuB,CAAA;IACvB,qDAAsC,CAAA;AAC1C,CAAC,EAVW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAUtB"}
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.Quote = void 0;
4
4
  const limit_order_sdk_1 = require("@1inch/limit-order-sdk");
5
+ const byte_utils_1 = require("@1inch/byte-utils");
5
6
  const order_params_1 = require("./order-params");
6
7
  const types_1 = require("../types");
7
8
  const preset_1 = require("../preset");
@@ -37,6 +38,12 @@ class Quote {
37
38
  });
38
39
  const preset = this.getPreset(params.preset);
39
40
  const auctionDetails = preset.createAuctionDetails(params.delayAuctionStartTimeBy);
41
+ const allowPartialFills = paramsData?.allowPartialFills ?? preset.allowPartialFills;
42
+ const allowMultipleFills = paramsData?.allowMultipleFills ?? preset.allowMultipleFills;
43
+ const isNonceRequired = !allowPartialFills || !allowMultipleFills;
44
+ const nonce = isNonceRequired
45
+ ? params.nonce ?? (0, limit_order_sdk_1.randBigInt)(byte_utils_1.UINT_40_MAX)
46
+ : params.nonce;
40
47
  return fusion_order_1.FusionOrder.new(this.settlementAddress, {
41
48
  makerAsset: this.params.fromTokenAddress,
42
49
  takerAsset: this.params.toTokenAddress,
@@ -57,13 +64,13 @@ class Quote {
57
64
  },
58
65
  whitelist: this.getWhitelist(auctionDetails.startTime, preset.exclusiveResolver)
59
66
  }, {
60
- nonce: params.nonce,
67
+ nonce,
61
68
  unwrapWETH: this.params.toTokenAddress.isNative(),
62
69
  permit: params.permit
63
70
  ? this.params.fromTokenAddress + params.permit.substring(2)
64
71
  : undefined,
65
- allowPartialFills: paramsData?.allowPartialFills ?? preset.allowPartialFills,
66
- allowMultipleFills: paramsData?.allowMultipleFills ?? preset.allowMultipleFills,
72
+ allowPartialFills,
73
+ allowMultipleFills,
67
74
  orderExpirationDelay: paramsData?.orderExpirationDelay
68
75
  });
69
76
  }
@@ -1 +1 @@
1
- {"version":3,"file":"quote.js","sourceRoot":"","sources":["../../../../src/api/quoter/quote/quote.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"quote.js","sourceRoot":"","sources":["../../../../src/api/quoter/quote/quote.ts"],"names":[],"mappings":"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"}
@@ -6,6 +6,7 @@ import { HttpProviderConnector } from '../../connector';
6
6
  export declare class QuoterApi {
7
7
  private readonly config;
8
8
  private readonly httpClient;
9
+ private static Version;
9
10
  constructor(config: QuoterApiConfig, httpClient: HttpProviderConnector);
10
11
  static new(config: QuoterApiConfig, httpClient?: HttpProviderConnector): QuoterApi;
11
12
  getQuote(params: QuoterRequest): Promise<Quote>;
@@ -14,7 +14,7 @@ class QuoterApi {
14
14
  }
15
15
  async getQuote(params) {
16
16
  const queryParams = (0, params_1.concatQueryParams)(params.build());
17
- const url = `${this.config.url}/v1.0/${this.config.network}/quote/receive/${queryParams}`;
17
+ const url = `${this.config.url}/${QuoterApi.Version}/${this.config.network}/quote/receive/${queryParams}`;
18
18
  const res = await this.httpClient.get(url);
19
19
  return new quote_1.Quote(params, res);
20
20
  }
@@ -25,10 +25,11 @@ class QuoterApi {
25
25
  }
26
26
  const queryParams = (0, params_1.concatQueryParams)(params.build());
27
27
  const bodyParams = body.build();
28
- const url = `${this.config.url}/v1.0/${this.config.network}/quote/receive/${queryParams}`;
28
+ const url = `${this.config.url}/${QuoterApi.Version}/${this.config.network}/quote/receive/${queryParams}`;
29
29
  const res = await this.httpClient.post(url, bodyParams);
30
30
  return new quote_1.Quote(params, res);
31
31
  }
32
32
  }
33
33
  exports.QuoterApi = QuoterApi;
34
+ QuoterApi.Version = 'v2.0';
34
35
  //# sourceMappingURL=quoter.api.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"quoter.api.js","sourceRoot":"","sources":["../../../src/api/quoter/quoter.api.ts"],"names":[],"mappings":";;;AAEA,mCAA6B;AAE7B,sCAA2C;AAC3C,+CAA6E;AAE7E,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;IAED,KAAK,CAAC,QAAQ,CAAC,MAAqB;QAChC,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAA;QACrD,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,SAAS,IAAI,CAAC,MAAM,CAAC,OAAO,kBAAkB,WAAW,EAAE,CAAA;QAEzF,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAiB,GAAG,CAAC,CAAA;QAE1D,OAAO,IAAI,aAAK,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACjC,CAAC;IAED,KAAK,CAAC,wBAAwB,CAC1B,MAAqB,EACrB,IAA+B;QAE/B,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAA;QAE/B,IAAI,OAAO,EAAE;YACT,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAA;SAC3B;QAED,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAA;QACrD,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,EAAE,CAAA;QAC/B,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,SAAS,IAAI,CAAC,MAAM,CAAC,OAAO,kBAAkB,WAAW,EAAE,CAAA;QAEzF,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAiB,GAAG,EAAE,UAAU,CAAC,CAAA;QAEvE,OAAO,IAAI,aAAK,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACjC,CAAC;CACJ;AA1CD,8BA0CC"}
1
+ {"version":3,"file":"quoter.api.js","sourceRoot":"","sources":["../../../src/api/quoter/quoter.api.ts"],"names":[],"mappings":";;;AAEA,mCAA6B;AAE7B,sCAA2C;AAC3C,+CAA6E;AAE7E,MAAa,SAAS;IAGlB,YACqB,MAAuB,EACvB,UAAiC;QADjC,WAAM,GAAN,MAAM,CAAiB;QACvB,eAAU,GAAV,UAAU,CAAuB;IACnD,CAAC;IAEJ,MAAM,CAAC,GAAG,CACN,MAAuB,EACvB,aAAoC,IAAI,kCAAsB,CAC1D,MAAM,CAAC,OAAO,CACjB;QAED,OAAO,IAAI,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;IAC5C,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,MAAqB;QAChC,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAA;QACrD,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,SAAS,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,kBAAkB,WAAW,EAAE,CAAA;QAEzG,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAiB,GAAG,CAAC,CAAA;QAE1D,OAAO,IAAI,aAAK,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACjC,CAAC;IAED,KAAK,CAAC,wBAAwB,CAC1B,MAAqB,EACrB,IAA+B;QAE/B,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAA;QAE/B,IAAI,OAAO,EAAE;YACT,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAA;SAC3B;QAED,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAA;QACrD,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,EAAE,CAAA;QAC/B,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,SAAS,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,kBAAkB,WAAW,EAAE,CAAA;QAEzG,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAiB,GAAG,EAAE,UAAU,CAAC,CAAA;QAEvE,OAAO,IAAI,aAAK,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACjC,CAAC;;AA3CL,8BA4CC;AA3CkB,iBAAO,GAAG,MAAM,CAAA"}
@@ -124,7 +124,7 @@ describe('Quoter API', () => {
124
124
  }, httpProvider);
125
125
  const res = await quoter.getQuote(params);
126
126
  expect(res).toStrictEqual(QuoterResponseMock);
127
- expect(httpProvider.get).toHaveBeenCalledWith('https://test.com/quoter/v1.0/1/quote/receive/?fromTokenAddress=0x6b175474e89094c44da98b954eedeac495271d0f&toTokenAddress=0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2&amount=1000000000000000000000&walletAddress=0x00000000219ab540356cbb839cbe05303d7705fa&source=sdk');
127
+ expect(httpProvider.get).toHaveBeenCalledWith('https://test.com/quoter/v2.0/1/quote/receive/?fromTokenAddress=0x6b175474e89094c44da98b954eedeac495271d0f&toTokenAddress=0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2&amount=1000000000000000000000&walletAddress=0x00000000219ab540356cbb839cbe05303d7705fa&source=sdk');
128
128
  });
129
129
  it('should not throw error with fee and source added', async () => {
130
130
  const quoter = quoter_api_1.QuoterApi.new({
@@ -142,7 +142,7 @@ describe('Quoter API', () => {
142
142
  const QuoterResponseMock = new quote_1.Quote(params, ResponseMock);
143
143
  const res = await quoter.getQuote(params);
144
144
  expect(res).toStrictEqual(QuoterResponseMock);
145
- expect(httpProvider.get).toHaveBeenCalledWith('https://test.com/quoter/v1.0/1/quote/receive/?fromTokenAddress=0x6b175474e89094c44da98b954eedeac495271d0f&toTokenAddress=0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2&amount=1000000000000000000000&walletAddress=0x00000000219ab540356cbb839cbe05303d7705fa&fee=1&source=0x6b175474e89094c44da98b954eedeac495271d0f');
145
+ expect(httpProvider.get).toHaveBeenCalledWith('https://test.com/quoter/v2.0/1/quote/receive/?fromTokenAddress=0x6b175474e89094c44da98b954eedeac495271d0f&toTokenAddress=0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2&amount=1000000000000000000000&walletAddress=0x00000000219ab540356cbb839cbe05303d7705fa&fee=1&source=0x6b175474e89094c44da98b954eedeac495271d0f');
146
146
  });
147
147
  it('getQuoteWithCustomPreset', async () => {
148
148
  const quoter = quoter_api_1.QuoterApi.new({
@@ -171,7 +171,7 @@ describe('Quoter API', () => {
171
171
  const QuoterResponseMock = new quote_1.Quote(params, ResponseMock);
172
172
  const res = await quoter.getQuoteWithCustomPreset(params, body);
173
173
  expect(res).toStrictEqual(QuoterResponseMock);
174
- expect(httpProvider.post).toHaveBeenCalledWith('https://test.com/quoter/v1.0/1/quote/receive/?fromTokenAddress=0x6b175474e89094c44da98b954eedeac495271d0f&toTokenAddress=0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2&amount=1000000000000000000000&walletAddress=0x00000000219ab540356cbb839cbe05303d7705fa&fee=1&source=0x6b175474e89094c44da98b954eedeac495271d0f', body.build());
174
+ expect(httpProvider.post).toHaveBeenCalledWith('https://test.com/quoter/v2.0/1/quote/receive/?fromTokenAddress=0x6b175474e89094c44da98b954eedeac495271d0f&toTokenAddress=0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2&amount=1000000000000000000000&walletAddress=0x00000000219ab540356cbb839cbe05303d7705fa&fee=1&source=0x6b175474e89094c44da98b954eedeac495271d0f', body.build());
175
175
  });
176
176
  });
177
177
  //# sourceMappingURL=quoter.api.spec.js.map
@@ -4,6 +4,7 @@ import { HttpProviderConnector } from '../../connector';
4
4
  export declare class RelayerApi {
5
5
  private readonly config;
6
6
  private readonly httpClient;
7
+ private static Version;
7
8
  constructor(config: RelayerApiConfig, httpClient: HttpProviderConnector);
8
9
  static new(config: RelayerApiConfig, httpClient?: HttpProviderConnector): RelayerApi;
9
10
  submit(params: RelayerRequest): Promise<void>;
@@ -11,13 +11,14 @@ class RelayerApi {
11
11
  return new RelayerApi(config, httpClient);
12
12
  }
13
13
  submit(params) {
14
- const url = `${this.config.url}/v1.0/${this.config.network}/order/submit`;
14
+ const url = `${this.config.url}/${RelayerApi.Version}/${this.config.network}/order/submit`;
15
15
  return this.httpClient.post(url, params);
16
16
  }
17
17
  submitBatch(params) {
18
- const url = `${this.config.url}/v1.0/${this.config.network}/order/submit/many`;
18
+ const url = `${this.config.url}/${RelayerApi.Version}/${this.config.network}/order/submit/many`;
19
19
  return this.httpClient.post(url, params);
20
20
  }
21
21
  }
22
22
  exports.RelayerApi = RelayerApi;
23
+ RelayerApi.Version = 'v2.0';
23
24
  //# sourceMappingURL=relayer.api.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"relayer.api.js","sourceRoot":"","sources":["../../../src/api/relayer/relayer.api.ts"],"names":[],"mappings":";;;AAEA,+CAA6E;AAE7E,MAAa,UAAU;IACnB,YACqB,MAAwB,EACxB,UAAiC;QADjC,WAAM,GAAN,MAAM,CAAkB;QACxB,eAAU,GAAV,UAAU,CAAuB;IACnD,CAAC;IAEJ,MAAM,CAAC,GAAG,CACN,MAAwB,EACxB,aAAoC,IAAI,kCAAsB,CAC1D,MAAM,CAAC,OAAO,CACjB;QAED,OAAO,IAAI,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;IAC7C,CAAC;IAED,MAAM,CAAC,MAAsB;QACzB,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,SAAS,IAAI,CAAC,MAAM,CAAC,OAAO,eAAe,CAAA;QAEzE,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;IAC5C,CAAC;IAED,WAAW,CAAC,MAAwB;QAChC,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,SAAS,IAAI,CAAC,MAAM,CAAC,OAAO,oBAAoB,CAAA;QAE9E,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;IAC5C,CAAC;CACJ;AA1BD,gCA0BC"}
1
+ {"version":3,"file":"relayer.api.js","sourceRoot":"","sources":["../../../src/api/relayer/relayer.api.ts"],"names":[],"mappings":";;;AAEA,+CAA6E;AAE7E,MAAa,UAAU;IAGnB,YACqB,MAAwB,EACxB,UAAiC;QADjC,WAAM,GAAN,MAAM,CAAkB;QACxB,eAAU,GAAV,UAAU,CAAuB;IACnD,CAAC;IAEJ,MAAM,CAAC,GAAG,CACN,MAAwB,EACxB,aAAoC,IAAI,kCAAsB,CAC1D,MAAM,CAAC,OAAO,CACjB;QAED,OAAO,IAAI,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;IAC7C,CAAC;IAED,MAAM,CAAC,MAAsB;QACzB,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,UAAU,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,eAAe,CAAA;QAE1F,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;IAC5C,CAAC;IAED,WAAW,CAAC,MAAwB;QAChC,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,UAAU,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,oBAAoB,CAAA;QAE/F,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;IAC5C,CAAC;;AA3BL,gCA4BC;AA3BkB,kBAAO,GAAG,MAAM,CAAA"}
@@ -28,11 +28,12 @@ describe('Relayer API', () => {
28
28
  makerTraits: '0'
29
29
  },
30
30
  signature: '0x123signature-here789',
31
- quoteId: '9a43c86d-f3d7-45b9-8cb6-803d2bdfa08b'
31
+ quoteId: '9a43c86d-f3d7-45b9-8cb6-803d2bdfa08b',
32
+ extension: '0x'
32
33
  };
33
34
  const params = relayer_request_1.RelayerRequest.new(orderData);
34
35
  await quoter.submit(params);
35
- expect(httpProvider.post).toHaveBeenCalledWith('https://test.com/relayer/v1.0/1/order/submit', orderData);
36
+ expect(httpProvider.post).toHaveBeenCalledWith('https://test.com/relayer/v2.0/1/order/submit', orderData);
36
37
  });
37
38
  it('should submit two orders order', async () => {
38
39
  const quoter = relayer_api_1.RelayerApi.new({
@@ -51,7 +52,8 @@ describe('Relayer API', () => {
51
52
  makerTraits: '0'
52
53
  },
53
54
  signature: '0x123signature-here789',
54
- quoteId: '9a43c86d-f3d7-45b9-8cb6-803d2bdfa08b'
55
+ quoteId: '9a43c86d-f3d7-45b9-8cb6-803d2bdfa08b',
56
+ extension: '0x'
55
57
  };
56
58
  const orderData2 = {
57
59
  order: {
@@ -65,14 +67,15 @@ describe('Relayer API', () => {
65
67
  makerTraits: '0'
66
68
  },
67
69
  signature: '0x123signature-2-here789',
68
- quoteId: '1a36c861-ffd7-45b9-1cb6-403d3bdfa084'
70
+ quoteId: '1a36c861-ffd7-45b9-1cb6-403d3bdfa084',
71
+ extension: '0x'
69
72
  };
70
73
  const params = [
71
74
  relayer_request_1.RelayerRequest.new(orderData1),
72
75
  relayer_request_1.RelayerRequest.new(orderData2)
73
76
  ];
74
77
  await quoter.submitBatch(params);
75
- expect(httpProvider.post).toHaveBeenCalledWith('https://test.com/relayer/v1.0/1/order/submit/many', params);
78
+ expect(httpProvider.post).toHaveBeenCalledWith('https://test.com/relayer/v2.0/1/order/submit/many', params);
76
79
  });
77
80
  });
78
81
  //# sourceMappingURL=relayer.api.spec.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"relayer.api.spec.js","sourceRoot":"","sources":["../../../src/api/relayer/relayer.api.spec.ts"],"names":[],"mappings":";;AAAA,+CAAwC;AACxC,uDAAgD;AAIhD,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IACzB,MAAM,YAAY,GAA0B;QACxC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,sBAAsB,CAAC,GAAG,EAAE;YACvC,OAAO,OAAO,CAAC,OAAO,EAAE,CAAA;QAC5B,CAAC,CAAC;QACF,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,GAAG,EAAE;YACpC,OAAO,OAAO,CAAC,OAAO,EAAE,CAAA;QAC5B,CAAC,CAAC;KACL,CAAA;IAED,EAAE,CAAC,yBAAyB,EAAE,KAAK,IAAI,EAAE;QACrC,MAAM,MAAM,GAAG,wBAAU,CAAC,GAAG,CACzB;YACI,GAAG,EAAE,0BAA0B;YAC/B,OAAO,EAAE,CAAC;SACb,EACD,YAAY,CACf,CAAA;QAED,MAAM,SAAS,GAAyB;YACpC,KAAK,EAAE;gBACH,KAAK,EAAE,4CAA4C;gBACnD,UAAU,EAAE,4CAA4C;gBACxD,YAAY,EAAE,qBAAqB;gBACnC,QAAQ,EAAE,4CAA4C;gBACtD,IAAI,EAAE,+EAA+E;gBACrF,UAAU,EAAE,4CAA4C;gBACxD,YAAY,EAAE,YAAY;gBAC1B,WAAW,EAAE,GAAG;aACnB;YACD,SAAS,EAAE,wBAAwB;YACnC,OAAO,EAAE,sCAAsC;SAClD,CAAA;QAED,MAAM,MAAM,GAAG,gCAAc,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;QAE5C,MAAM,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAE3B,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,oBAAoB,CAC1C,8CAA8C,EAC9C,SAAS,CACZ,CAAA;IACL,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,gCAAgC,EAAE,KAAK,IAAI,EAAE;QAC5C,MAAM,MAAM,GAAG,wBAAU,CAAC,GAAG,CACzB;YACI,GAAG,EAAE,0BAA0B;YAC/B,OAAO,EAAE,CAAC;SACb,EACD,YAAY,CACf,CAAA;QAED,MAAM,UAAU,GAAyB;YACrC,KAAK,EAAE;gBACH,KAAK,EAAE,4CAA4C;gBACnD,UAAU,EAAE,4CAA4C;gBACxD,YAAY,EAAE,qBAAqB;gBACnC,QAAQ,EAAE,4CAA4C;gBACtD,IAAI,EAAE,+EAA+E;gBACrF,UAAU,EAAE,4CAA4C;gBACxD,YAAY,EAAE,YAAY;gBAC1B,WAAW,EAAE,GAAG;aACnB;YACD,SAAS,EAAE,wBAAwB;YACnC,OAAO,EAAE,sCAAsC;SAClD,CAAA;QAED,MAAM,UAAU,GAAyB;YACrC,KAAK,EAAE;gBACH,KAAK,EAAE,4CAA4C;gBACnD,UAAU,EAAE,4CAA4C;gBACxD,YAAY,EAAE,qBAAqB;gBACnC,QAAQ,EAAE,4CAA4C;gBACtD,IAAI,EAAE,+EAA+E;gBACrF,UAAU,EAAE,4CAA4C;gBACxD,YAAY,EAAE,YAAY;gBAC1B,WAAW,EAAE,GAAG;aACnB;YACD,SAAS,EAAE,0BAA0B;YACrC,OAAO,EAAE,sCAAsC;SAClD,CAAA;QAED,MAAM,MAAM,GAAG;YACX,gCAAc,CAAC,GAAG,CAAC,UAAU,CAAC;YAC9B,gCAAc,CAAC,GAAG,CAAC,UAAU,CAAC;SACjC,CAAA;QAED,MAAM,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;QAEhC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,oBAAoB,CAC1C,mDAAmD,EACnD,MAAM,CACT,CAAA;IACL,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAA"}
1
+ {"version":3,"file":"relayer.api.spec.js","sourceRoot":"","sources":["../../../src/api/relayer/relayer.api.spec.ts"],"names":[],"mappings":";;AAAA,+CAAwC;AACxC,uDAAgD;AAIhD,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IACzB,MAAM,YAAY,GAA0B;QACxC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,sBAAsB,CAAC,GAAG,EAAE;YACvC,OAAO,OAAO,CAAC,OAAO,EAAE,CAAA;QAC5B,CAAC,CAAC;QACF,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,GAAG,EAAE;YACpC,OAAO,OAAO,CAAC,OAAO,EAAE,CAAA;QAC5B,CAAC,CAAC;KACL,CAAA;IAED,EAAE,CAAC,yBAAyB,EAAE,KAAK,IAAI,EAAE;QACrC,MAAM,MAAM,GAAG,wBAAU,CAAC,GAAG,CACzB;YACI,GAAG,EAAE,0BAA0B;YAC/B,OAAO,EAAE,CAAC;SACb,EACD,YAAY,CACf,CAAA;QAED,MAAM,SAAS,GAAyB;YACpC,KAAK,EAAE;gBACH,KAAK,EAAE,4CAA4C;gBACnD,UAAU,EAAE,4CAA4C;gBACxD,YAAY,EAAE,qBAAqB;gBACnC,QAAQ,EAAE,4CAA4C;gBACtD,IAAI,EAAE,+EAA+E;gBACrF,UAAU,EAAE,4CAA4C;gBACxD,YAAY,EAAE,YAAY;gBAC1B,WAAW,EAAE,GAAG;aACnB;YACD,SAAS,EAAE,wBAAwB;YACnC,OAAO,EAAE,sCAAsC;YAC/C,SAAS,EAAE,IAAI;SAClB,CAAA;QAED,MAAM,MAAM,GAAG,gCAAc,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;QAE5C,MAAM,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAE3B,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,oBAAoB,CAC1C,8CAA8C,EAC9C,SAAS,CACZ,CAAA;IACL,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,gCAAgC,EAAE,KAAK,IAAI,EAAE;QAC5C,MAAM,MAAM,GAAG,wBAAU,CAAC,GAAG,CACzB;YACI,GAAG,EAAE,0BAA0B;YAC/B,OAAO,EAAE,CAAC;SACb,EACD,YAAY,CACf,CAAA;QAED,MAAM,UAAU,GAAyB;YACrC,KAAK,EAAE;gBACH,KAAK,EAAE,4CAA4C;gBACnD,UAAU,EAAE,4CAA4C;gBACxD,YAAY,EAAE,qBAAqB;gBACnC,QAAQ,EAAE,4CAA4C;gBACtD,IAAI,EAAE,+EAA+E;gBACrF,UAAU,EAAE,4CAA4C;gBACxD,YAAY,EAAE,YAAY;gBAC1B,WAAW,EAAE,GAAG;aACnB;YACD,SAAS,EAAE,wBAAwB;YACnC,OAAO,EAAE,sCAAsC;YAC/C,SAAS,EAAE,IAAI;SAClB,CAAA;QAED,MAAM,UAAU,GAAyB;YACrC,KAAK,EAAE;gBACH,KAAK,EAAE,4CAA4C;gBACnD,UAAU,EAAE,4CAA4C;gBACxD,YAAY,EAAE,qBAAqB;gBACnC,QAAQ,EAAE,4CAA4C;gBACtD,IAAI,EAAE,+EAA+E;gBACrF,UAAU,EAAE,4CAA4C;gBACxD,YAAY,EAAE,YAAY;gBAC1B,WAAW,EAAE,GAAG;aACnB;YACD,SAAS,EAAE,0BAA0B;YACrC,OAAO,EAAE,sCAAsC;YAC/C,SAAS,EAAE,IAAI;SAClB,CAAA;QAED,MAAM,MAAM,GAAG;YACX,gCAAc,CAAC,GAAG,CAAC,UAAU,CAAC;YAC9B,gCAAc,CAAC,GAAG,CAAC,UAAU,CAAC;SACjC,CAAA;QAED,MAAM,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;QAEhC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,oBAAoB,CAC1C,mDAAmD,EACnD,MAAM,CACT,CAAA;IACL,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAA"}
@@ -4,6 +4,7 @@ export declare class RelayerRequest {
4
4
  readonly order: LimitOrderV4Struct;
5
5
  readonly signature: string;
6
6
  readonly quoteId: string;
7
+ readonly extension: string;
7
8
  constructor(params: RelayerRequestParams);
8
9
  static new(params: RelayerRequestParams): RelayerRequest;
9
10
  build(): RelayerRequestParams;
@@ -6,6 +6,7 @@ class RelayerRequest {
6
6
  this.order = params.order;
7
7
  this.signature = params.signature;
8
8
  this.quoteId = params.quoteId;
9
+ this.extension = params.extension;
9
10
  }
10
11
  static new(params) {
11
12
  return new RelayerRequest(params);
@@ -14,7 +15,8 @@ class RelayerRequest {
14
15
  return {
15
16
  order: this.order,
16
17
  signature: this.signature,
17
- quoteId: this.quoteId
18
+ quoteId: this.quoteId,
19
+ extension: this.extension
18
20
  };
19
21
  }
20
22
  }
@@ -1 +1 @@
1
- {"version":3,"file":"relayer.request.js","sourceRoot":"","sources":["../../../src/api/relayer/relayer.request.ts"],"names":[],"mappings":";;;AAGA,MAAa,cAAc;IAOvB,YAAY,MAA4B;QACpC,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAA;QACzB,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAA;QACjC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAA;IACjC,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,MAA4B;QACnC,OAAO,IAAI,cAAc,CAAC,MAAM,CAAC,CAAA;IACrC,CAAC;IAED,KAAK;QACD,OAAO;YACH,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,OAAO,EAAE,IAAI,CAAC,OAAO;SACxB,CAAA;IACL,CAAC;CACJ;AAxBD,wCAwBC"}
1
+ {"version":3,"file":"relayer.request.js","sourceRoot":"","sources":["../../../src/api/relayer/relayer.request.ts"],"names":[],"mappings":";;;AAGA,MAAa,cAAc;IASvB,YAAY,MAA4B;QACpC,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAA;QACzB,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAA;QACjC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAA;QAC7B,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAA;IACrC,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,MAA4B;QACnC,OAAO,IAAI,cAAc,CAAC,MAAM,CAAC,CAAA;IACrC,CAAC;IAED,KAAK;QACD,OAAO;YACH,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,SAAS,EAAE,IAAI,CAAC,SAAS;SAC5B,CAAA;IACL,CAAC;CACJ;AA5BD,wCA4BC"}
@@ -4,6 +4,7 @@ export type RelayerRequestParams = {
4
4
  order: LimitOrderV4Struct;
5
5
  signature: string;
6
6
  quoteId: string;
7
+ extension: string;
7
8
  };
8
9
  export type RelayerApiConfig = {
9
10
  network: NetworkEnum;
@@ -1,10 +1,18 @@
1
- import { Address, Extension, ExtensionBuilder } from '@1inch/limit-order-sdk';
1
+ import { Address, Extension } from '@1inch/limit-order-sdk';
2
2
  import { AuctionDetails } from './auction-details';
3
3
  import { SettlementPostInteractionData } from './settlement-post-interaction-data';
4
- export declare class FusionExtension extends ExtensionBuilder {
4
+ export declare class FusionExtension {
5
5
  readonly address: Address;
6
6
  readonly auctionDetails: AuctionDetails;
7
7
  readonly postInteractionData: SettlementPostInteractionData;
8
+ private readonly builder;
8
9
  constructor(address: Address, auctionDetails: AuctionDetails, postInteractionData: SettlementPostInteractionData);
10
+ /**
11
+ * Create `FusionExtension` from bytes
12
+ *
13
+ * @param bytes 0x prefixed bytes
14
+ */
15
+ static decode(bytes: string): FusionExtension;
16
+ withMakerPermit(tokenFrom: Address, permitData: string): this;
9
17
  build(): Extension;
10
18
  }
@@ -1,20 +1,45 @@
1
1
  "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
2
5
  Object.defineProperty(exports, "__esModule", { value: true });
3
6
  exports.FusionExtension = void 0;
4
7
  const limit_order_sdk_1 = require("@1inch/limit-order-sdk");
5
- class FusionExtension extends limit_order_sdk_1.ExtensionBuilder {
8
+ const assert_1 = __importDefault(require("assert"));
9
+ const auction_details_1 = require("./auction-details");
10
+ const settlement_post_interaction_data_1 = require("./settlement-post-interaction-data");
11
+ class FusionExtension {
6
12
  constructor(address, auctionDetails, postInteractionData) {
7
- super();
8
13
  this.address = address;
9
14
  this.auctionDetails = auctionDetails;
10
15
  this.postInteractionData = postInteractionData;
11
- }
12
- build() {
16
+ this.builder = new limit_order_sdk_1.ExtensionBuilder();
13
17
  const detailsBytes = this.auctionDetails.encode();
14
- this.withMakingAmountData(this.address, detailsBytes)
18
+ this.builder
19
+ .withMakingAmountData(this.address, detailsBytes)
15
20
  .withTakingAmountData(this.address, detailsBytes)
16
21
  .withPostInteraction(new limit_order_sdk_1.Interaction(this.address, this.postInteractionData.encode()));
17
- return super.build();
22
+ }
23
+ /**
24
+ * Create `FusionExtension` from bytes
25
+ *
26
+ * @param bytes 0x prefixed bytes
27
+ */
28
+ static decode(bytes) {
29
+ const extension = limit_order_sdk_1.Extension.decode(bytes);
30
+ const settlementContract = limit_order_sdk_1.Address.fromFirstBytes(extension.makingAmountData);
31
+ (0, assert_1.default)(limit_order_sdk_1.Address.fromFirstBytes(extension.takingAmountData).equal(settlementContract) &&
32
+ limit_order_sdk_1.Address.fromFirstBytes(extension.postInteraction).equal(settlementContract), 'Invalid extension, all calls should be to the same address');
33
+ const auctionDetails = auction_details_1.AuctionDetails.fromExtension(extension);
34
+ const postInteractionData = settlement_post_interaction_data_1.SettlementPostInteractionData.fromExtension(extension);
35
+ return new FusionExtension(settlementContract, auctionDetails, postInteractionData);
36
+ }
37
+ withMakerPermit(tokenFrom, permitData) {
38
+ this.builder.withMakerPermit(tokenFrom, permitData);
39
+ return this;
40
+ }
41
+ build() {
42
+ return this.builder.build();
18
43
  }
19
44
  }
20
45
  exports.FusionExtension = FusionExtension;
@@ -1 +1 @@
1
- {"version":3,"file":"fusion-extension.js","sourceRoot":"","sources":["../../src/fusion-order/fusion-extension.ts"],"names":[],"mappings":";;;AAAA,4DAK+B;AAI/B,MAAa,eAAgB,SAAQ,kCAAgB;IACjD,YACoB,OAAgB,EAChB,cAA8B,EAC9B,mBAAkD;QAElE,KAAK,EAAE,CAAA;QAJS,YAAO,GAAP,OAAO,CAAS;QAChB,mBAAc,GAAd,cAAc,CAAgB;QAC9B,wBAAmB,GAAnB,mBAAmB,CAA+B;IAGtE,CAAC;IAEM,KAAK;QACR,MAAM,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAA;QAEjD,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC;aAChD,oBAAoB,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC;aAChD,mBAAmB,CAChB,IAAI,6BAAW,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,CAAC,CACnE,CAAA;QAEL,OAAO,KAAK,CAAC,KAAK,EAAE,CAAA;IACxB,CAAC;CACJ;AApBD,0CAoBC"}
1
+ {"version":3,"file":"fusion-extension.js","sourceRoot":"","sources":["../../src/fusion-order/fusion-extension.ts"],"names":[],"mappings":";;;;;;AAAA,4DAK+B;AAC/B,oDAA2B;AAE3B,uDAAgD;AAChD,yFAAgF;AAEhF,MAAa,eAAe;IAGxB,YACoB,OAAgB,EAChB,cAA8B,EAC9B,mBAAkD;QAFlD,YAAO,GAAP,OAAO,CAAS;QAChB,mBAAc,GAAd,cAAc,CAAgB;QAC9B,wBAAmB,GAAnB,mBAAmB,CAA+B;QALrD,YAAO,GAAG,IAAI,kCAAgB,EAAE,CAAA;QAO7C,MAAM,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAA;QAEjD,IAAI,CAAC,OAAO;aACP,oBAAoB,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC;aAChD,oBAAoB,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC;aAChD,mBAAmB,CAChB,IAAI,6BAAW,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,CAAC,CACnE,CAAA;IACT,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,MAAM,CAAC,KAAa;QAC9B,MAAM,SAAS,GAAG,2BAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAEzC,MAAM,kBAAkB,GAAG,yBAAO,CAAC,cAAc,CAC7C,SAAS,CAAC,gBAAgB,CAC7B,CAAA;QAED,IAAA,gBAAM,EACF,yBAAO,CAAC,cAAc,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC,KAAK,CACpD,kBAAkB,CACrB;YACG,yBAAO,CAAC,cAAc,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC,KAAK,CACnD,kBAAkB,CACrB,EACL,4DAA4D,CAC/D,CAAA;QAED,MAAM,cAAc,GAAG,gCAAc,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;QAE9D,MAAM,mBAAmB,GACrB,gEAA6B,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;QAE1D,OAAO,IAAI,eAAe,CACtB,kBAAkB,EAClB,cAAc,EACd,mBAAmB,CACtB,CAAA;IACL,CAAC;IAED,eAAe,CAAC,SAAkB,EAAE,UAAkB;QAClD,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,SAAS,EAAE,UAAU,CAAC,CAAA;QAEnD,OAAO,IAAI,CAAA;IACf,CAAC;IAEM,KAAK;QACR,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAA;IAC/B,CAAC;CACJ;AA7DD,0CA6DC"}
@@ -0,0 +1 @@
1
+ export {};
@@ -0,0 +1,41 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const limit_order_sdk_1 = require("@1inch/limit-order-sdk");
4
+ const fusion_order_1 = require("./fusion-order");
5
+ const auction_details_1 = require("./auction-details");
6
+ const fusion_extension_1 = require("./fusion-extension");
7
+ describe('FusionExtension', () => {
8
+ it('should decode', () => {
9
+ const extensionContract = new limit_order_sdk_1.Address('0x8273f37417da37c4a6c3995e82cf442f87a25d9c');
10
+ const order = fusion_order_1.FusionOrder.new(extensionContract, {
11
+ makerAsset: new limit_order_sdk_1.Address('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'),
12
+ takerAsset: new limit_order_sdk_1.Address('0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48'),
13
+ makingAmount: 1000000000000000000n,
14
+ takingAmount: 1420000000n,
15
+ maker: new limit_order_sdk_1.Address('0x00000000219ab540356cbb839cbe05303d7705fa'),
16
+ salt: 10n
17
+ }, {
18
+ auction: new auction_details_1.AuctionDetails({
19
+ duration: 180n,
20
+ startTime: 1673548149n,
21
+ initialRateBump: 50000,
22
+ points: [
23
+ {
24
+ coefficient: 20000,
25
+ delay: 12
26
+ }
27
+ ]
28
+ }),
29
+ whitelist: [
30
+ {
31
+ address: new limit_order_sdk_1.Address('0x00000000219ab540356cbb839cbe05303d7705fa'),
32
+ allowFrom: 0n
33
+ }
34
+ ],
35
+ resolvingStartTime: 1673548139n
36
+ });
37
+ const fusionExtension = fusion_extension_1.FusionExtension.decode(order.extension.encode());
38
+ expect(fusionExtension).toStrictEqual(order.fusionExtension);
39
+ });
40
+ });
41
+ //# sourceMappingURL=fusion-extension.spec.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"fusion-extension.spec.js","sourceRoot":"","sources":["../../src/fusion-order/fusion-extension.spec.ts"],"names":[],"mappings":";;AAAA,4DAA8C;AAC9C,iDAA0C;AAC1C,uDAAgD;AAChD,yDAAkD;AAElD,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC7B,EAAE,CAAC,eAAe,EAAE,GAAG,EAAE;QACrB,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,SAAS,EAAE,EAAE;iBAChB;aACJ;YACD,kBAAkB,EAAE,WAAW;SAClC,CACJ,CAAA;QACD,MAAM,eAAe,GAAG,kCAAe,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAA;QACxE,MAAM,CAAC,eAAe,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,eAAe,CAAC,CAAA;IAChE,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAA"}
@@ -54,7 +54,8 @@ export declare class FusionOrder {
54
54
  }, extra?: {
55
55
  unwrapWETH?: boolean;
56
56
  /**
57
- * Required if `allowPartialFills` is false
57
+ * Required if `allowPartialFills` or `allowMultipleFills` is false
58
+ * Max size is 40bit
58
59
  */
59
60
  nonce?: bigint;
60
61
  permit?: string;
@@ -1 +1 @@
1
- {"version":3,"file":"fusion-order.js","sourceRoot":"","sources":["../../src/fusion-order/fusion-order.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"fusion-order.js","sourceRoot":"","sources":["../../src/fusion-order/fusion-order.ts"],"names":[],"mappings":"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"}
package/dist/sdk/sdk.js CHANGED
@@ -83,14 +83,16 @@ class FusionSDK {
83
83
  const relayerRequest = api_1.RelayerRequest.new({
84
84
  order: orderStruct,
85
85
  signature,
86
- quoteId
86
+ quoteId,
87
+ extension: order.extension.encode()
87
88
  });
88
89
  await this.api.submitOrder(relayerRequest);
89
90
  return {
90
91
  order: orderStruct,
91
92
  signature,
92
93
  quoteId,
93
- orderHash: order.getOrderHash(this.config.network)
94
+ orderHash: order.getOrderHash(this.config.network),
95
+ extension: relayerRequest.extension
94
96
  };
95
97
  }
96
98
  async placeOrder(params) {
@@ -1 +1 @@
1
- {"version":3,"file":"sdk.js","sourceRoot":"","sources":["../../src/sdk/sdk.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sdk.js","sourceRoot":"","sources":["../../src/sdk/sdk.ts"],"names":[],"mappings":"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"}
@@ -56,6 +56,7 @@ export type OrderInfo = {
56
56
  signature: string;
57
57
  quoteId: string;
58
58
  orderHash: string;
59
+ extension: string;
59
60
  };
60
61
  export type PreparedOrder = {
61
62
  order: FusionOrder;
@@ -3,6 +3,7 @@ import { RpcWebsocketApi } from './rpc-websocket-api';
3
3
  import { WsApiConfigWithNetwork } from './types';
4
4
  import { AnyFunction, AnyFunctionWithThis, OnMessageCb, WsProviderConnector } from '../connector/ws';
5
5
  export declare class WebSocketApi {
6
+ private static Version;
6
7
  readonly rpc: RpcWebsocketApi;
7
8
  readonly order: ActiveOrdersWebSocketApi;
8
9
  readonly provider: WsProviderConnector;
@@ -9,7 +9,7 @@ class WebSocketApi {
9
9
  constructor(configOrProvider) {
10
10
  if (instanceOfWsApiConfigWithNetwork(configOrProvider)) {
11
11
  const url = (0, url_1.castUrl)(configOrProvider.url);
12
- const urlWithNetwork = `${url}/v1.0/${configOrProvider.network}`;
12
+ const urlWithNetwork = `${url}/${WebSocketApi.Version}/${configOrProvider.network}`;
13
13
  const configWithUrl = { ...configOrProvider, url: urlWithNetwork };
14
14
  const provider = new ws_1.WebsocketClient(configWithUrl);
15
15
  this.provider = provider;
@@ -53,6 +53,7 @@ class WebSocketApi {
53
53
  }
54
54
  }
55
55
  exports.WebSocketApi = WebSocketApi;
56
+ WebSocketApi.Version = 'v2.0';
56
57
  function instanceOfWsApiConfigWithNetwork(val) {
57
58
  return 'url' in val && 'network' in val;
58
59
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ws-api.js","sourceRoot":"","sources":["../../src/ws-api/ws-api.ts"],"names":[],"mappings":";;;AAAA,+EAAsE;AACtE,2DAAmD;AAEnD,+BAA6B;AAC7B,wCAMwB;AAExB,MAAa,YAAY;IAOrB,YACI,gBAA8D;QAE9D,IAAI,gCAAgC,CAAC,gBAAgB,CAAC,EAAE;YACpD,MAAM,GAAG,GAAG,IAAA,aAAO,EAAC,gBAAgB,CAAC,GAAG,CAAC,CAAA;YACzC,MAAM,cAAc,GAAG,GAAG,GAAG,SAAS,gBAAgB,CAAC,OAAO,EAAE,CAAA;YAChE,MAAM,aAAa,GAAG,EAAC,GAAG,gBAAgB,EAAE,GAAG,EAAE,cAAc,EAAC,CAAA;YAChE,MAAM,QAAQ,GAAG,IAAI,oBAAe,CAAC,aAAa,CAAC,CAAA;YAEnD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;YACxB,IAAI,CAAC,GAAG,GAAG,IAAI,mCAAe,CAAC,QAAQ,CAAC,CAAA;YACxC,IAAI,CAAC,KAAK,GAAG,IAAI,sDAAwB,CAAC,QAAQ,CAAC,CAAA;YAEnD,OAAM;SACT;QAED,IAAI,CAAC,QAAQ,GAAG,gBAAgB,CAAA;QAChC,IAAI,CAAC,GAAG,GAAG,IAAI,mCAAe,CAAC,gBAAgB,CAAC,CAAA;QAChD,IAAI,CAAC,KAAK,GAAG,IAAI,sDAAwB,CAAC,gBAAgB,CAAC,CAAA;IAC/D,CAAC;IAED,MAAM,CAAC,GAAG,CACN,gBAA8D;QAE9D,OAAO,IAAI,YAAY,CAAC,gBAAgB,CAAC,CAAA;IAC7C,CAAC;IAED,IAAI;QACA,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAA;IACxB,CAAC;IAED,EAAE,CAAC,KAAa,EAAE,EAAuB;QACrC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;IAC/B,CAAC;IAED,GAAG,CAAC,KAAa,EAAE,EAAuB;QACtC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;IAChC,CAAC;IAED,MAAM,CAAC,EAAuB;QAC1B,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IAC5B,CAAC;IAED,IAAI,CAAI,OAAU;QACd,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAC/B,CAAC;IAED,KAAK;QACD,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAA;IACzB,CAAC;IAED,SAAS,CAAC,EAAe;QACrB,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;IAC/B,CAAC;IAED,OAAO,CAAC,EAAe;QACnB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAC7B,CAAC;IAED,OAAO,CAAC,EAAe;QACnB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAC7B,CAAC;CACJ;AArED,oCAqEC;AAED,SAAS,gCAAgC,CACrC,GAAiD;IAEjD,OAAO,KAAK,IAAI,GAAG,IAAI,SAAS,IAAI,GAAG,CAAA;AAC3C,CAAC"}
1
+ {"version":3,"file":"ws-api.js","sourceRoot":"","sources":["../../src/ws-api/ws-api.ts"],"names":[],"mappings":";;;AAAA,+EAAsE;AACtE,2DAAmD;AAEnD,+BAA6B;AAC7B,wCAMwB;AAExB,MAAa,YAAY;IASrB,YACI,gBAA8D;QAE9D,IAAI,gCAAgC,CAAC,gBAAgB,CAAC,EAAE;YACpD,MAAM,GAAG,GAAG,IAAA,aAAO,EAAC,gBAAgB,CAAC,GAAG,CAAC,CAAA;YACzC,MAAM,cAAc,GAAG,GAAG,GAAG,IAAI,YAAY,CAAC,OAAO,IAAI,gBAAgB,CAAC,OAAO,EAAE,CAAA;YACnF,MAAM,aAAa,GAAG,EAAC,GAAG,gBAAgB,EAAE,GAAG,EAAE,cAAc,EAAC,CAAA;YAChE,MAAM,QAAQ,GAAG,IAAI,oBAAe,CAAC,aAAa,CAAC,CAAA;YAEnD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;YACxB,IAAI,CAAC,GAAG,GAAG,IAAI,mCAAe,CAAC,QAAQ,CAAC,CAAA;YACxC,IAAI,CAAC,KAAK,GAAG,IAAI,sDAAwB,CAAC,QAAQ,CAAC,CAAA;YAEnD,OAAM;SACT;QAED,IAAI,CAAC,QAAQ,GAAG,gBAAgB,CAAA;QAChC,IAAI,CAAC,GAAG,GAAG,IAAI,mCAAe,CAAC,gBAAgB,CAAC,CAAA;QAChD,IAAI,CAAC,KAAK,GAAG,IAAI,sDAAwB,CAAC,gBAAgB,CAAC,CAAA;IAC/D,CAAC;IAED,MAAM,CAAC,GAAG,CACN,gBAA8D;QAE9D,OAAO,IAAI,YAAY,CAAC,gBAAgB,CAAC,CAAA;IAC7C,CAAC;IAED,IAAI;QACA,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAA;IACxB,CAAC;IAED,EAAE,CAAC,KAAa,EAAE,EAAuB;QACrC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;IAC/B,CAAC;IAED,GAAG,CAAC,KAAa,EAAE,EAAuB;QACtC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;IAChC,CAAC;IAED,MAAM,CAAC,EAAuB;QAC1B,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IAC5B,CAAC;IAED,IAAI,CAAI,OAAU;QACd,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAC/B,CAAC;IAED,KAAK;QACD,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAA;IACzB,CAAC;IAED,SAAS,CAAC,EAAe;QACrB,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;IAC/B,CAAC;IAED,OAAO,CAAC,EAAe;QACnB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAC7B,CAAC;IAED,OAAO,CAAC,EAAe;QACnB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAC7B,CAAC;;AAtEL,oCAuEC;AAtEkB,oBAAO,GAAG,MAAM,CAAA;AAwEnC,SAAS,gCAAgC,CACrC,GAAiD;IAEjD,OAAO,KAAK,IAAI,GAAG,IAAI,SAAS,IAAI,GAAG,CAAA;AAC3C,CAAC"}
@@ -68,7 +68,7 @@ describe(__filename, () => {
68
68
  const message = { id: 1 };
69
69
  const port = 8080;
70
70
  const url = `ws://localhost:${port}/ws`;
71
- const wss = new ws_1.WebSocketServer({ port, path: '/ws/v1.0/1' });
71
+ const wss = new ws_1.WebSocketServer({ port, path: '/ws/v2.0/1' });
72
72
  wss.on('connection', (ws) => {
73
73
  for (const m of [message]) {
74
74
  ws.send(JSON.stringify(m));
@@ -102,7 +102,7 @@ describe(__filename, () => {
102
102
  const message = { id: 1 };
103
103
  const port = 8080;
104
104
  const url = `ws://localhost:${port}/ws`;
105
- const wss = new ws_1.WebSocketServer({ port, path: '/ws/v1.0/1' });
105
+ const wss = new ws_1.WebSocketServer({ port, path: '/ws/v2.0/1' });
106
106
  wss.on('connection', (ws) => {
107
107
  for (const m of [message]) {
108
108
  ws.send(JSON.stringify(m));
@@ -125,14 +125,14 @@ describe(__filename, () => {
125
125
  const message = { id: 1 };
126
126
  const port = 8080;
127
127
  const url = `ws://localhost:${port}/ws`;
128
- const wss = new ws_1.WebSocketServer({ port, path: '/ws/v1.0/1' });
128
+ const wss = new ws_1.WebSocketServer({ port, path: '/ws/v2.0/1' });
129
129
  wss.on('connection', (ws) => {
130
130
  for (const m of [message]) {
131
131
  ws.send(JSON.stringify(m));
132
132
  }
133
133
  });
134
134
  const castedUrl = (0, url_1.castUrl)(url);
135
- const urlWithNetwork = `${castedUrl}/v1.0/1`;
135
+ const urlWithNetwork = `${castedUrl}/v2.0/1`;
136
136
  const provider = new connector_1.WebsocketClient({ url: urlWithNetwork });
137
137
  const wsSdk = new ws_api_1.WebSocketApi(provider);
138
138
  expect(wsSdk.rpc).toBeDefined();
@@ -149,14 +149,14 @@ describe(__filename, () => {
149
149
  const message = { id: 1 };
150
150
  const port = 8080;
151
151
  const url = `ws://localhost:${port}/ws`;
152
- const wss = new ws_1.WebSocketServer({ port, path: '/ws/v1.0/1' });
152
+ const wss = new ws_1.WebSocketServer({ port, path: '/ws/v2.0/1' });
153
153
  wss.on('connection', (ws) => {
154
154
  for (const m of [message]) {
155
155
  ws.send(JSON.stringify(m));
156
156
  }
157
157
  });
158
158
  const castedUrl = (0, url_1.castUrl)(url);
159
- const urlWithNetwork = `${castedUrl}/v1.0/1`;
159
+ const urlWithNetwork = `${castedUrl}/v2.0/1`;
160
160
  const provider = new connector_1.WebsocketClient({
161
161
  url: urlWithNetwork,
162
162
  authKey: ''
@@ -668,7 +668,7 @@ describe(__filename, () => {
668
668
  function createWebsocketRpcServerMock(cb) {
669
669
  const port = 8080;
670
670
  const returnUrl = `ws://localhost:${port}/ws`;
671
- const wss = new ws_1.WebSocketServer({ port, path: '/ws/v1.0/1' });
671
+ const wss = new ws_1.WebSocketServer({ port, path: '/ws/v2.0/1' });
672
672
  wss.on('connection', (ws) => {
673
673
  ws.on('message', (data) => cb(ws, data));
674
674
  });
@@ -677,7 +677,7 @@ function createWebsocketRpcServerMock(cb) {
677
677
  function createWebsocketServerMock(messages) {
678
678
  const port = 8080;
679
679
  const returnUrl = `ws://localhost:${port}/ws`;
680
- const wss = new ws_1.WebSocketServer({ port, path: '/ws/v1.0/1' });
680
+ const wss = new ws_1.WebSocketServer({ port, path: '/ws/v2.0/1' });
681
681
  wss.on('connection', (ws) => {
682
682
  for (const message of messages) {
683
683
  ws.send(JSON.stringify(message));
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@1inch/fusion-sdk",
3
- "version": "1.0.1-rc.30",
3
+ "version": "1.0.1-rc.32",
4
4
  "description": "1inch Fusion Mode SDK",
5
5
  "author": "@1inch",
6
6
  "private": false,
@@ -17,8 +17,8 @@
17
17
  "url": "ssh://git@github.com:1inch/fusion-sdk.git"
18
18
  },
19
19
  "dependencies": {
20
- "@1inch/byte-utils": "2.2.0",
21
- "@1inch/limit-order-sdk": "^4.8.2",
20
+ "@1inch/byte-utils": "2.2.1",
21
+ "@1inch/limit-order-sdk": "^4.8.3",
22
22
  "@metamask/eth-sig-util": "^5.1.0",
23
23
  "bn.js": "^5.2.1",
24
24
  "ethers": "6.11.0",