@1inch/fusion-sdk 2.1.7 → 2.1.9-rc.1

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 (152) hide show
  1. package/README.md +1 -1
  2. package/dist/cjs/amount-calculator/amount-calculator.js +42 -0
  3. package/dist/cjs/amount-calculator/amount-calculator.js.map +1 -0
  4. package/dist/cjs/{auction-calculator → amount-calculator/auction-calculator}/auction-calculator.js +16 -17
  5. package/dist/cjs/amount-calculator/auction-calculator/auction-calculator.js.map +1 -0
  6. package/dist/cjs/{auction-calculator → amount-calculator/auction-calculator}/index.js +0 -1
  7. package/dist/cjs/amount-calculator/auction-calculator/index.js.map +1 -0
  8. package/dist/cjs/api/orders/orders.api.js.map +1 -1
  9. package/dist/cjs/api/orders/orders.request.js.map +1 -1
  10. package/dist/cjs/api/orders/types.js +1 -1
  11. package/dist/cjs/api/orders/types.js.map +1 -1
  12. package/dist/cjs/api/pagination.js.map +1 -1
  13. package/dist/cjs/api/params.js +1 -2
  14. package/dist/cjs/api/params.js.map +1 -1
  15. package/dist/cjs/api/quoter/quote/order-params.js.map +1 -1
  16. package/dist/cjs/api/quoter/quote/quote.js +8 -17
  17. package/dist/cjs/api/quoter/quote/quote.js.map +1 -1
  18. package/dist/cjs/api/quoter/quoter-custom-preset.request.js +1 -1
  19. package/dist/cjs/api/quoter/quoter-custom-preset.request.js.map +1 -1
  20. package/dist/cjs/api/quoter/quoter.api.js.map +1 -1
  21. package/dist/cjs/api/quoter/quoter.request.js.map +1 -1
  22. package/dist/cjs/api/quoter/types.js +1 -1
  23. package/dist/cjs/api/quoter/types.js.map +1 -1
  24. package/dist/cjs/connector/http/axios-provider.connector.js.map +1 -1
  25. package/dist/cjs/connector/ws/websocket-client.connector.js.map +1 -1
  26. package/dist/cjs/constants.js +1 -1
  27. package/dist/cjs/constants.js.map +1 -1
  28. package/dist/cjs/fusion-order/auction-details/auction-details.js +18 -10
  29. package/dist/cjs/fusion-order/auction-details/auction-details.js.map +1 -1
  30. package/dist/cjs/fusion-order/fusion-extension.js +115 -18
  31. package/dist/cjs/fusion-order/fusion-extension.js.map +1 -1
  32. package/dist/cjs/fusion-order/fusion-order.js +42 -34
  33. package/dist/cjs/fusion-order/fusion-order.js.map +1 -1
  34. package/dist/cjs/fusion-order/index.js +4 -2
  35. package/dist/cjs/fusion-order/index.js.map +1 -1
  36. package/dist/cjs/fusion-order/source-track.js +1 -2
  37. package/dist/cjs/fusion-order/source-track.js.map +1 -1
  38. package/dist/cjs/fusion-order/whitelist/index.js +5 -0
  39. package/dist/cjs/fusion-order/whitelist/index.js.map +1 -0
  40. package/dist/cjs/fusion-order/whitelist/types.js.map +1 -0
  41. package/dist/cjs/fusion-order/whitelist/whitelist.js +118 -0
  42. package/dist/cjs/fusion-order/whitelist/whitelist.js.map +1 -0
  43. package/dist/cjs/index.js +1 -1
  44. package/dist/cjs/index.js.map +1 -1
  45. package/dist/cjs/sdk/encoders/cancel-order.encoder.js +1 -2
  46. package/dist/cjs/sdk/encoders/cancel-order.encoder.js.map +1 -1
  47. package/dist/cjs/sdk/sdk.js.map +1 -1
  48. package/dist/cjs/sdk/utils.js +2 -3
  49. package/dist/cjs/sdk/utils.js.map +1 -1
  50. package/dist/cjs/tsconfig.cjs.tsbuildinfo +1 -1
  51. package/dist/cjs/utils/amounts.js +2 -3
  52. package/dist/cjs/utils/amounts.js.map +1 -1
  53. package/dist/cjs/utils/time.js +1 -2
  54. package/dist/cjs/utils/time.js.map +1 -1
  55. package/dist/cjs/utils/types.js +3 -0
  56. package/dist/cjs/utils/types.js.map +1 -0
  57. package/dist/cjs/utils.js +2 -3
  58. package/dist/cjs/utils.js.map +1 -1
  59. package/dist/cjs/validations.js +5 -6
  60. package/dist/cjs/validations.js.map +1 -1
  61. package/dist/cjs/ws-api/active-websocket-orders-api.js.map +1 -1
  62. package/dist/cjs/ws-api/rpc-websocket-api.js.map +1 -1
  63. package/dist/cjs/ws-api/url.js +1 -2
  64. package/dist/cjs/ws-api/url.js.map +1 -1
  65. package/dist/cjs/ws-api/ws-api.js.map +1 -1
  66. package/dist/esm/amount-calculator/amount-calculator.js +38 -0
  67. package/dist/esm/amount-calculator/amount-calculator.js.map +1 -0
  68. package/dist/esm/{auction-calculator → amount-calculator/auction-calculator}/auction-calculator.js +16 -17
  69. package/dist/esm/amount-calculator/auction-calculator/auction-calculator.js.map +1 -0
  70. package/dist/esm/amount-calculator/auction-calculator/index.js +2 -0
  71. package/dist/esm/amount-calculator/auction-calculator/index.js.map +1 -0
  72. package/dist/esm/api/orders/orders.api.js.map +1 -1
  73. package/dist/esm/api/orders/orders.request.js.map +1 -1
  74. package/dist/esm/api/pagination.js.map +1 -1
  75. package/dist/esm/api/params.js.map +1 -1
  76. package/dist/esm/api/quoter/quote/order-params.js.map +1 -1
  77. package/dist/esm/api/quoter/quote/quote.js +9 -18
  78. package/dist/esm/api/quoter/quote/quote.js.map +1 -1
  79. package/dist/esm/api/quoter/quoter-custom-preset.request.js +1 -1
  80. package/dist/esm/api/quoter/quoter-custom-preset.request.js.map +1 -1
  81. package/dist/esm/api/quoter/quoter.api.js.map +1 -1
  82. package/dist/esm/api/quoter/quoter.request.js.map +1 -1
  83. package/dist/esm/connector/http/axios-provider.connector.js.map +1 -1
  84. package/dist/esm/connector/ws/websocket-client.connector.js.map +1 -1
  85. package/dist/esm/fusion-order/auction-details/auction-details.js +19 -11
  86. package/dist/esm/fusion-order/auction-details/auction-details.js.map +1 -1
  87. package/dist/esm/fusion-order/fusion-extension.js +116 -19
  88. package/dist/esm/fusion-order/fusion-extension.js.map +1 -1
  89. package/dist/esm/fusion-order/fusion-order.js +42 -34
  90. package/dist/esm/fusion-order/fusion-order.js.map +1 -1
  91. package/dist/esm/fusion-order/index.js +2 -1
  92. package/dist/esm/fusion-order/index.js.map +1 -1
  93. package/dist/esm/fusion-order/source-track.js.map +1 -1
  94. package/dist/esm/fusion-order/whitelist/index.js +2 -0
  95. package/dist/esm/fusion-order/whitelist/index.js.map +1 -0
  96. package/dist/esm/fusion-order/whitelist/types.js.map +1 -0
  97. package/dist/esm/fusion-order/whitelist/whitelist.js +113 -0
  98. package/dist/esm/fusion-order/whitelist/whitelist.js.map +1 -0
  99. package/dist/esm/index.js +1 -1
  100. package/dist/esm/index.js.map +1 -1
  101. package/dist/esm/sdk/sdk.js.map +1 -1
  102. package/dist/esm/sdk/utils.js.map +1 -1
  103. package/dist/esm/tsconfig.esm.tsbuildinfo +1 -1
  104. package/dist/esm/utils/types.js +2 -0
  105. package/dist/esm/utils/types.js.map +1 -0
  106. package/dist/esm/utils.js.map +1 -1
  107. package/dist/esm/validations.js +1 -1
  108. package/dist/esm/validations.js.map +1 -1
  109. package/dist/esm/ws-api/active-websocket-orders-api.js.map +1 -1
  110. package/dist/esm/ws-api/rpc-websocket-api.js.map +1 -1
  111. package/dist/esm/ws-api/url.js.map +1 -1
  112. package/dist/esm/ws-api/ws-api.js.map +1 -1
  113. package/dist/types/src/amount-calculator/amount-calculator.d.ts +15 -0
  114. package/dist/types/src/{auction-calculator → amount-calculator/auction-calculator}/auction-calculator.d.ts +6 -6
  115. package/dist/types/src/{auction-calculator → amount-calculator/auction-calculator}/index.d.ts +0 -1
  116. package/dist/types/src/api/quoter/quote/quote.d.ts +1 -1
  117. package/dist/types/src/fusion-order/auction-details/auction-details.d.ts +3 -0
  118. package/dist/types/src/fusion-order/fusion-extension.d.ts +18 -6
  119. package/dist/types/src/fusion-order/fusion-order.d.ts +14 -13
  120. package/dist/types/src/fusion-order/index.d.ts +2 -1
  121. package/dist/types/src/fusion-order/whitelist/index.d.ts +1 -0
  122. package/dist/types/src/fusion-order/whitelist/types.d.ts +4 -0
  123. package/dist/types/src/fusion-order/whitelist/whitelist.d.ts +25 -0
  124. package/dist/types/src/index.d.ts +1 -1
  125. package/dist/types/src/utils/types.d.ts +3 -0
  126. package/dist/types/tsconfig.types.tsbuildinfo +1 -1
  127. package/package.json +27 -25
  128. package/dist/cjs/auction-calculator/auction-calculator.js.map +0 -1
  129. package/dist/cjs/auction-calculator/constants.js +0 -5
  130. package/dist/cjs/auction-calculator/constants.js.map +0 -1
  131. package/dist/cjs/auction-calculator/index.js.map +0 -1
  132. package/dist/cjs/fusion-order/settlement-post-interaction-data/index.js +0 -6
  133. package/dist/cjs/fusion-order/settlement-post-interaction-data/index.js.map +0 -1
  134. package/dist/cjs/fusion-order/settlement-post-interaction-data/settlement-post-interaction-data.js +0 -153
  135. package/dist/cjs/fusion-order/settlement-post-interaction-data/settlement-post-interaction-data.js.map +0 -1
  136. package/dist/cjs/fusion-order/settlement-post-interaction-data/types.js.map +0 -1
  137. package/dist/esm/auction-calculator/auction-calculator.js.map +0 -1
  138. package/dist/esm/auction-calculator/constants.js +0 -2
  139. package/dist/esm/auction-calculator/constants.js.map +0 -1
  140. package/dist/esm/auction-calculator/index.js +0 -3
  141. package/dist/esm/auction-calculator/index.js.map +0 -1
  142. package/dist/esm/fusion-order/settlement-post-interaction-data/index.js +0 -3
  143. package/dist/esm/fusion-order/settlement-post-interaction-data/index.js.map +0 -1
  144. package/dist/esm/fusion-order/settlement-post-interaction-data/settlement-post-interaction-data.js +0 -148
  145. package/dist/esm/fusion-order/settlement-post-interaction-data/settlement-post-interaction-data.js.map +0 -1
  146. package/dist/esm/fusion-order/settlement-post-interaction-data/types.js.map +0 -1
  147. package/dist/types/src/auction-calculator/constants.d.ts +0 -1
  148. package/dist/types/src/fusion-order/settlement-post-interaction-data/index.d.ts +0 -2
  149. package/dist/types/src/fusion-order/settlement-post-interaction-data/settlement-post-interaction-data.d.ts +0 -22
  150. package/dist/types/src/fusion-order/settlement-post-interaction-data/types.d.ts +0 -16
  151. /package/dist/cjs/fusion-order/{settlement-post-interaction-data → whitelist}/types.js +0 -0
  152. /package/dist/esm/fusion-order/{settlement-post-interaction-data → whitelist}/types.js +0 -0
@@ -1,22 +1,14 @@
1
- import { Address, Extension, ExtensionBuilder, Interaction } from '@1inch/limit-order-sdk';
1
+ import { Address, Extension, ExtensionBuilder, Interaction, Bps, mulDiv, Rounding, FeeTakerExt } from '@1inch/limit-order-sdk';
2
+ import { BN, BytesBuilder, BytesIter } from '@1inch/byte-utils';
2
3
  import assert from 'assert';
3
4
  import { AuctionDetails } from './auction-details';
4
- import { SettlementPostInteractionData } from './settlement-post-interaction-data';
5
+ import { Whitelist } from './whitelist/whitelist';
5
6
  export class FusionExtension {
6
- constructor(address, auctionDetails, postInteractionData, makerPermit) {
7
+ constructor(address, auctionDetails, whitelist, extra) {
7
8
  this.address = address;
8
9
  this.auctionDetails = auctionDetails;
9
- this.postInteractionData = postInteractionData;
10
- this.makerPermit = makerPermit;
11
- this.builder = new ExtensionBuilder();
12
- const detailsBytes = this.auctionDetails.encode();
13
- this.builder
14
- .withMakingAmountData(this.address, detailsBytes)
15
- .withTakingAmountData(this.address, detailsBytes)
16
- .withPostInteraction(new Interaction(this.address, this.postInteractionData.encode()));
17
- if (makerPermit) {
18
- this.builder.withMakerPermit(makerPermit.target, makerPermit.data);
19
- }
10
+ this.whitelist = whitelist;
11
+ this.extra = extra;
20
12
  }
21
13
  static decode(bytes) {
22
14
  const extension = Extension.decode(bytes);
@@ -26,15 +18,120 @@ export class FusionExtension {
26
18
  const settlementContract = Address.fromFirstBytes(extension.makingAmountData);
27
19
  assert(Address.fromFirstBytes(extension.takingAmountData).equal(settlementContract) &&
28
20
  Address.fromFirstBytes(extension.postInteraction).equal(settlementContract), 'Invalid extension, all calls should be to the same address');
29
- const auctionDetails = AuctionDetails.fromExtension(extension);
30
- const postInteractionData = SettlementPostInteractionData.fromExtension(extension);
31
- const permit = extension.hasMakerPermit
21
+ assert(extension.takingAmountData == extension.makingAmountData, 'Invalid extension, taking amount data must be equal to making amount data');
22
+ const interactionBytes = BytesIter.HexString(extension.postInteraction);
23
+ interactionBytes.nextUint160();
24
+ const flags = BN.fromHex(interactionBytes.nextUint8());
25
+ const integratorFeeRecipient = new Address(interactionBytes.nextUint160());
26
+ const protocolFeeRecipient = new Address(interactionBytes.nextUint160());
27
+ const customReceiver = flags.getBit(FusionExtension.CUSTOM_RECEIVER_FLAG_BIT)
28
+ ? new Address(interactionBytes.nextUint160())
29
+ : undefined;
30
+ const interactionData = parseAmountData(interactionBytes);
31
+ const amountBytes = BytesIter.HexString(extension.makingAmountData);
32
+ amountBytes.nextUint160();
33
+ const auctionDetails = AuctionDetails.decodeFrom(amountBytes);
34
+ const amountData = parseAmountData(amountBytes);
35
+ const makerPermit = extension.hasMakerPermit
32
36
  ? Interaction.decode(extension.makerPermit)
33
37
  : undefined;
34
- return new FusionExtension(settlementContract, auctionDetails, postInteractionData, permit);
38
+ assert(amountData.fees.integratorFee.value ===
39
+ interactionData.fees.integratorFee.value, `invalid extension: integrator fee must be same in interaction data and in amount data`);
40
+ assert(amountData.fees.resolverFee.value ===
41
+ interactionData.fees.resolverFee.value, `invalid extension: resolver fee must be same in interaction data and in amount data`);
42
+ assert(amountData.fees.whitelistDiscount.equal(interactionData.fees.whitelistDiscount), `invalid extension: whitelistDiscount must be same in interaction data and in amount data`);
43
+ assert(amountData.fees.integratorShare.value ===
44
+ interactionData.fees.integratorShare.value, `invalid extension: integrator share must be same in interaction data and in amount data`);
45
+ assert(interactionData.whitelist.equal(amountData.whitelist), 'whitelist must be same in interaction data and in amount data');
46
+ const hasFees = !integratorFeeRecipient.isZero() || !protocolFeeRecipient.isZero();
47
+ const fees = hasFees
48
+ ? new FeeTakerExt.Fees(new FeeTakerExt.ResolverFee(protocolFeeRecipient, interactionData.fees.resolverFee, interactionData.fees.whitelistDiscount), new FeeTakerExt.IntegratorFee(integratorFeeRecipient, protocolFeeRecipient, interactionData.fees.integratorFee, interactionData.fees.integratorShare))
49
+ : undefined;
50
+ return new FusionExtension(settlementContract, auctionDetails, interactionData.whitelist, {
51
+ makerPermit,
52
+ fees,
53
+ customReceiver
54
+ });
35
55
  }
36
56
  build() {
37
- return this.builder.build();
57
+ const amountData = this.buildAmountGetterData(true);
58
+ const builder = new ExtensionBuilder()
59
+ .withMakingAmountData(this.address, amountData)
60
+ .withTakingAmountData(this.address, amountData)
61
+ .withPostInteraction(new Interaction(this.address, this.buildInteractionData()));
62
+ if (this.extra?.makerPermit) {
63
+ builder.withMakerPermit(this.extra?.makerPermit.target, this.extra?.makerPermit.data);
64
+ }
65
+ return builder.build();
66
+ }
67
+ buildInteractionData() {
68
+ const customReceiver = this.extra?.customReceiver || Address.ZERO_ADDRESS;
69
+ const flags = new BN(0n).setBit(FusionExtension.CUSTOM_RECEIVER_FLAG_BIT, Boolean(!customReceiver.isZero()));
70
+ const integratorReceiver = this.extra?.fees?.integrator.integrator || Address.ZERO_ADDRESS;
71
+ const protocolReceiver = this.extra?.fees?.protocol || Address.ZERO_ADDRESS;
72
+ const builder = new BytesBuilder()
73
+ .addUint8(flags)
74
+ .addAddress(integratorReceiver.toString())
75
+ .addAddress(protocolReceiver.toString());
76
+ if (!customReceiver.isZero()) {
77
+ builder.addAddress(customReceiver.toString());
78
+ }
79
+ builder.addBytes(this.buildAmountGetterData(false));
80
+ return builder.asHex();
38
81
  }
82
+ buildAmountGetterData(withAuction) {
83
+ const builder = new BytesBuilder();
84
+ if (withAuction) {
85
+ this.auctionDetails.encodeInto(builder);
86
+ }
87
+ const integrator = {
88
+ fee: this.extra?.fees?.integrator.fee.toFraction(FeeTakerExt.Fees.BASE_1E5) || 0,
89
+ share: this.extra?.fees?.integrator.share.toFraction(FeeTakerExt.Fees.BASE_1E2) ||
90
+ 0
91
+ };
92
+ const resolverFee = this.extra?.fees?.resolver.fee.toFraction(FeeTakerExt.Fees.BASE_1E5) || 0;
93
+ const whitelistDiscount = this.extra?.fees?.resolver.whitelistDiscount || Bps.ZERO;
94
+ builder
95
+ .addUint16(BigInt(integrator.fee))
96
+ .addUint8(BigInt(integrator.share))
97
+ .addUint16(BigInt(resolverFee))
98
+ .addUint8(BigInt(Number(FeeTakerExt.Fees.BASE_1E2) -
99
+ whitelistDiscount.toFraction(FeeTakerExt.Fees.BASE_1E2)));
100
+ this.whitelist.encodeInto(builder);
101
+ return builder.asHex();
102
+ }
103
+ getFeesForTaker(taker) {
104
+ const whitelistDiscount = this.extra?.fees?.resolver.whitelistDiscount.toFraction(FeeTakerExt.Fees.BASE_1E2) || 0;
105
+ const discountNumerator = this.whitelist.isWhitelisted(taker)
106
+ ? (Number(FeeTakerExt.Fees.BASE_1E2) - whitelistDiscount) /
107
+ Number(FeeTakerExt.Fees.BASE_1E2)
108
+ : 1;
109
+ const resolverFee = discountNumerator *
110
+ (this.extra?.fees?.resolver.fee.toFraction(FeeTakerExt.Fees.BASE_1E5) || 0);
111
+ const resolverFeeBN = BigInt(resolverFee);
112
+ const integratorFeeBN = BigInt(this.extra?.fees?.integrator.fee.toFraction(FeeTakerExt.Fees.BASE_1E5) || 0);
113
+ return {
114
+ resolverFee: resolverFeeBN,
115
+ integratorFee: integratorFeeBN
116
+ };
117
+ }
118
+ getTakingAmountWithFee(taker, orderTakingAmount) {
119
+ const fees = this.getFeesForTaker(taker);
120
+ return mulDiv(orderTakingAmount, FeeTakerExt.Fees.BASE_1E5 + fees.resolverFee + fees.integratorFee, FeeTakerExt.Fees.BASE_1E5, Rounding.Ceil);
121
+ }
122
+ }
123
+ FusionExtension.CUSTOM_RECEIVER_FLAG_BIT = 0n;
124
+ function parseAmountData(iter) {
125
+ const fees = {
126
+ integratorFee: Bps.fromFraction(Number(iter.nextUint16()), FeeTakerExt.Fees.BASE_1E5),
127
+ integratorShare: Bps.fromFraction(Number(iter.nextUint8()), FeeTakerExt.Fees.BASE_1E2),
128
+ resolverFee: Bps.fromFraction(Number(iter.nextUint16()), FeeTakerExt.Fees.BASE_1E5),
129
+ whitelistDiscount: Bps.fromFraction(Number(FeeTakerExt.Fees.BASE_1E2) - Number(iter.nextUint8()), FeeTakerExt.Fees.BASE_1E2)
130
+ };
131
+ const whitelist = Whitelist.decodeFrom(iter);
132
+ return {
133
+ fees,
134
+ whitelist
135
+ };
39
136
  }
40
137
  //# sourceMappingURL=fusion-extension.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"fusion-extension.js","sourceRoot":"","sources":["../../../src/fusion-order/fusion-extension.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,OAAO,EACP,SAAS,EACT,gBAAgB,EAChB,WAAW,EACd,MAAM,wBAAwB,CAAA;AAC/B,OAAO,MAAM,MAAM,QAAQ,CAAA;AAE3B,OAAO,EAAC,cAAc,EAAC,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAC,6BAA6B,EAAC,MAAM,oCAAoC,CAAA;AAEhF,MAAM,OAAO,eAAe;IAGxB,YACoB,OAAgB,EAChB,cAA8B,EAC9B,mBAAkD,EAClD,WAAyB;QAHzB,YAAO,GAAP,OAAO,CAAS;QAChB,mBAAc,GAAd,cAAc,CAAgB;QAC9B,wBAAmB,GAAnB,mBAAmB,CAA+B;QAClD,gBAAW,GAAX,WAAW,CAAc;QAN5B,YAAO,GAAG,IAAI,gBAAgB,EAAE,CAAA;QAQ7C,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,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,CAAC,CACnE,CAAA;QAEL,IAAI,WAAW,EAAE;YACb,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC,CAAA;SACrE;IACL,CAAC;IAOM,MAAM,CAAC,MAAM,CAAC,KAAa;QAC9B,MAAM,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAEzC,OAAO,eAAe,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;IACnD,CAAC;IAKM,MAAM,CAAC,aAAa,CAAC,SAAoB;QAC5C,MAAM,kBAAkB,GAAG,OAAO,CAAC,cAAc,CAC7C,SAAS,CAAC,gBAAgB,CAC7B,CAAA;QAED,MAAM,CACF,OAAO,CAAC,cAAc,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC,KAAK,CACpD,kBAAkB,CACrB;YACG,OAAO,CAAC,cAAc,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC,KAAK,CACnD,kBAAkB,CACrB,EACL,4DAA4D,CAC/D,CAAA;QAED,MAAM,cAAc,GAAG,cAAc,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;QAE9D,MAAM,mBAAmB,GACrB,6BAA6B,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;QAE1D,MAAM,MAAM,GAAG,SAAS,CAAC,cAAc;YACnC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC;YAC3C,CAAC,CAAC,SAAS,CAAA;QAEf,OAAO,IAAI,eAAe,CACtB,kBAAkB,EAClB,cAAc,EACd,mBAAmB,EACnB,MAAM,CACT,CAAA;IACL,CAAC;IAEM,KAAK;QACR,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAA;IAC/B,CAAC;CACJ"}
1
+ {"version":3,"file":"fusion-extension.js","sourceRoot":"","sources":["../../../src/fusion-order/fusion-extension.ts"],"names":[],"mappings":"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"}
@@ -1,17 +1,20 @@
1
1
  import { Address, Interaction, LimitOrder, MakerTraits } from '@1inch/limit-order-sdk';
2
2
  import assert from 'assert';
3
3
  import { FusionExtension } from './fusion-extension';
4
- import { AuctionDetails } from './auction-details';
5
- import { SettlementPostInteractionData } from './settlement-post-interaction-data';
6
4
  import { injectTrackCode } from './source-track';
7
- import { AuctionCalculator } from '../auction-calculator';
5
+ import { AuctionCalculator } from '../amount-calculator/auction-calculator';
8
6
  import { ZX } from '../constants';
9
7
  import { calcTakingAmount } from '../utils/amounts';
10
8
  import { now } from '../utils/time';
9
+ import { AmountCalculator } from '../amount-calculator/amount-calculator';
11
10
  export class FusionOrder {
12
- constructor(settlementExtensionContract, orderInfo, auctionDetails, postInteractionData, extra = FusionOrder.defaultExtra, extension = new FusionExtension(settlementExtensionContract, auctionDetails, postInteractionData, extra.permit
13
- ? new Interaction(orderInfo.makerAsset, extra.permit)
14
- : undefined)) {
11
+ constructor(settlementExtensionContract, orderInfo, auctionDetails, whitelist, extra = FusionOrder.defaultExtra, extension = new FusionExtension(settlementExtensionContract, auctionDetails, whitelist, {
12
+ makerPermit: extra.permit
13
+ ? new Interaction(orderInfo.makerAsset, extra.permit)
14
+ : undefined,
15
+ customReceiver: orderInfo.receiver,
16
+ fees: extra?.fees
17
+ })) {
15
18
  this.settlementExtensionContract = settlementExtensionContract;
16
19
  const allowPartialFills = extra.allowPartialFills ??
17
20
  FusionOrder.defaultExtra.allowPartialFills;
@@ -41,7 +44,7 @@ export class FusionOrder {
41
44
  if (extra.nonce !== undefined) {
42
45
  makerTraits.withNonce(extra.nonce);
43
46
  }
44
- const receiver = postInteractionData.integratorFee?.ratio
47
+ const receiver = extra.fees
45
48
  ? settlementExtensionContract
46
49
  : orderInfo.receiver;
47
50
  const builtExtension = extension.build();
@@ -103,13 +106,7 @@ export class FusionOrder {
103
106
  return this.inner.salt;
104
107
  }
105
108
  static new(settlementExtension, orderInfo, details, extra) {
106
- return new FusionOrder(settlementExtension, orderInfo, details.auction, SettlementPostInteractionData.new({
107
- bankFee: details.fees?.bankFee || 0n,
108
- integratorFee: details.fees?.integratorFee,
109
- whitelist: details.whitelist,
110
- resolvingStartTime: details.resolvingStartTime ?? now(),
111
- customReceiver: orderInfo.receiver
112
- }), extra);
109
+ return new FusionOrder(settlementExtension, orderInfo, details.auction, details.whitelist, extra);
113
110
  }
114
111
  static fromDataAndExtension(order, extension) {
115
112
  const settlementContract = Address.fromFirstBytes(extension.makingAmountData);
@@ -118,8 +115,7 @@ export class FusionOrder {
118
115
  const makerTraits = new MakerTraits(BigInt(order.makerTraits));
119
116
  assert(!makerTraits.isPrivate(), 'fusion order can not be private');
120
117
  assert(makerTraits.hasPostInteraction(), 'post-interaction must be enabled');
121
- const auctionDetails = AuctionDetails.fromExtension(extension);
122
- const postInteractionData = SettlementPostInteractionData.fromExtension(extension);
118
+ const { auctionDetails, whitelist, extra } = FusionExtension.fromExtension(extension);
123
119
  const deadline = makerTraits.expiration();
124
120
  const orderExpirationDelay = deadline === null
125
121
  ? undefined
@@ -127,12 +123,12 @@ export class FusionOrder {
127
123
  return new FusionOrder(settlementContract, {
128
124
  salt: BigInt(order.salt) >> 160n,
129
125
  maker: new Address(order.maker),
130
- receiver: new Address(order.receiver),
126
+ receiver: extra?.customReceiver,
131
127
  makerAsset: new Address(order.makerAsset),
132
128
  takerAsset: new Address(order.takerAsset),
133
129
  makingAmount: BigInt(order.makingAmount),
134
130
  takingAmount: BigInt(order.takingAmount)
135
- }, auctionDetails, postInteractionData, {
131
+ }, auctionDetails, whitelist, {
136
132
  allowMultipleFills: makerTraits.isMultipleFillsAllowed(),
137
133
  allowPartialFills: makerTraits.isPartialFillAllowed(),
138
134
  enablePermit2: makerTraits.isPermit2(),
@@ -141,7 +137,8 @@ export class FusionOrder {
141
137
  ? undefined
142
138
  : Interaction.decode(extension.makerPermit).data,
143
139
  unwrapWETH: makerTraits.isNativeUnwrapEnabled(),
144
- orderExpirationDelay
140
+ orderExpirationDelay,
141
+ fees: extra?.fees
145
142
  });
146
143
  }
147
144
  build() {
@@ -154,34 +151,45 @@ export class FusionOrder {
154
151
  return this.inner.getTypedData(chainId);
155
152
  }
156
153
  getCalculator() {
157
- return AuctionCalculator.fromAuctionData(this.fusionExtension.postInteractionData, this.fusionExtension.auctionDetails);
154
+ return AuctionCalculator.fromAuctionData(this.fusionExtension.auctionDetails);
158
155
  }
159
- calcTakingAmount(makingAmount, time, blockBaseFee = 0n) {
156
+ calcTakingAmount(taker, makingAmount, time, blockBaseFee = 0n) {
160
157
  const takingAmount = calcTakingAmount(makingAmount, this.makingAmount, this.takingAmount);
161
- const calculator = this.getCalculator();
162
- const bump = calculator.calcRateBump(time, blockBaseFee);
163
- return calculator.calcAuctionTakingAmount(takingAmount, bump);
158
+ return this.getAmountCalculator().getTakingAmount(taker, takingAmount, time, blockBaseFee);
159
+ }
160
+ getResolverFee(taker, makingAmount = this.makingAmount) {
161
+ const takingAmount = calcTakingAmount(makingAmount, this.makingAmount, this.takingAmount);
162
+ return (this.getAmountCalculator().getResolverFee(taker, takingAmount) ?? 0n);
163
+ }
164
+ getIntegratorFee(taker, makingAmount = this.makingAmount) {
165
+ const takingAmount = calcTakingAmount(makingAmount, this.makingAmount, this.takingAmount);
166
+ return (this.getAmountCalculator().getIntegratorFee(taker, takingAmount) ??
167
+ 0n);
168
+ }
169
+ getProtocolShareOfIntegratorFee(taker, makingAmount = this.makingAmount) {
170
+ const takingAmount = calcTakingAmount(makingAmount, this.makingAmount, this.takingAmount);
171
+ return (this.getAmountCalculator().getProtocolShareOfIntegratorFee(taker, takingAmount) ?? 0n);
172
+ }
173
+ getProtocolFee(taker, makingAmount = this.makingAmount) {
174
+ const takingAmount = calcTakingAmount(makingAmount, this.makingAmount, this.takingAmount);
175
+ return (this.getAmountCalculator().getProtocolFee(taker, takingAmount) ?? 0n);
164
176
  }
165
177
  canExecuteAt(executor, executionTime) {
166
- return this.fusionExtension.postInteractionData.canExecuteAt(executor, executionTime);
178
+ return this.fusionExtension.whitelist.canExecuteAt(executor, executionTime);
167
179
  }
168
180
  isExpiredAt(time) {
169
181
  return time > this.deadline;
170
182
  }
171
- getResolverFee(filledMakingAmount) {
172
- return ((this.fusionExtension.postInteractionData.bankFee *
173
- FusionOrder._ORDER_FEE_BASE_POINTS *
174
- filledMakingAmount) /
175
- this.makingAmount);
176
- }
177
183
  isExclusiveResolver(wallet) {
178
- return this.fusionExtension.postInteractionData.isExclusiveResolver(wallet);
184
+ return this.fusionExtension.whitelist.isExclusiveResolver(wallet);
179
185
  }
180
186
  isExclusivityPeriod(time = now()) {
181
- return this.fusionExtension.postInteractionData.isExclusivityPeriod(time);
187
+ return this.fusionExtension.whitelist.isExclusivityPeriod(time);
188
+ }
189
+ getAmountCalculator() {
190
+ return AmountCalculator.fromExtension(this.fusionExtension);
182
191
  }
183
192
  }
184
- FusionOrder._ORDER_FEE_BASE_POINTS = 10n ** 15n;
185
193
  FusionOrder.defaultExtra = {
186
194
  allowPartialFills: true,
187
195
  allowMultipleFills: true,
@@ -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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"}
@@ -1,6 +1,7 @@
1
1
  export * from './fusion-order';
2
2
  export * from './auction-details';
3
- export * from './settlement-post-interaction-data';
3
+ export * from './whitelist';
4
4
  export * from './fusion-extension';
5
5
  export { CHAIN_TO_WRAPPER } from './constants';
6
+ export { FeeTakerExt } from '@1inch/limit-order-sdk';
6
7
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/fusion-order/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA;AAC9B,cAAc,mBAAmB,CAAA;AACjC,cAAc,oCAAoC,CAAA;AAClD,cAAc,oBAAoB,CAAA;AAClC,OAAO,EAAC,gBAAgB,EAAC,MAAM,aAAa,CAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/fusion-order/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA;AAC9B,cAAc,mBAAmB,CAAA;AACjC,cAAc,aAAa,CAAA;AAC3B,cAAc,oBAAoB,CAAA;AAClC,OAAO,EAAC,gBAAgB,EAAC,MAAM,aAAa,CAAA;AAC5C,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA"}
@@ -1 +1 @@
1
- {"version":3,"file":"source-track.js","sourceRoot":"","sources":["../../../src/fusion-order/source-track.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,EAAE,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,EAAE,EAAC,MAAM,QAAQ,CAAA;AACzB,OAAO,EAAC,KAAK,EAAC,MAAM,UAAU,CAAA;AAC9B,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAA;AAE1C,MAAM,eAAe,GAAG,IAAI,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;AAE/C,SAAS,qBAAqB,CAAC,MAAc;IACzC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE;QACtB,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAA;KAC1B;IAED,IAAI,MAAM,CAAC,MAAM,KAAK,EAAE,EAAE;QACtB,OAAO,MAAM,CAAC,MAAM,CAAC,CAAA;KACxB;IAED,IAAI,MAAM,CAAC,MAAM,KAAK,EAAE,EAAE;QACtB,OAAO,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA;KACzC;IAED,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAA;AAC3B,CAAC;AAED,SAAS,QAAQ,CAAC,MAAc;IAC5B,OAAO,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;AACjD,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,IAAY,EAAE,MAAe;IACzD,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IAEzD,OAAO,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC,KAAK,CAAA;AAC7D,CAAC"}
1
+ {"version":3,"file":"source-track.js","sourceRoot":"","sources":["../../../src/fusion-order/source-track.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,EAAE,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,EAAE,EAAC,MAAM,QAAQ,CAAA;AACzB,OAAO,EAAC,KAAK,EAAC,MAAM,UAAU,CAAA;AAC9B,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAA;AAE1C,MAAM,eAAe,GAAG,IAAI,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;AAE/C,SAAS,qBAAqB,CAAC,MAAc;IACzC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC;QACvB,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAA;IAC3B,CAAC;IAED,IAAI,MAAM,CAAC,MAAM,KAAK,EAAE,EAAE,CAAC;QACvB,OAAO,MAAM,CAAC,MAAM,CAAC,CAAA;IACzB,CAAC;IAED,IAAI,MAAM,CAAC,MAAM,KAAK,EAAE,EAAE,CAAC;QACvB,OAAO,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA;IAC1C,CAAC;IAED,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAA;AAC3B,CAAC;AAED,SAAS,QAAQ,CAAC,MAAc;IAC5B,OAAO,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;AACjD,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,IAAY,EAAE,MAAe;IACzD,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IAEzD,OAAO,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC,KAAK,CAAA;AAC7D,CAAC"}
@@ -0,0 +1,2 @@
1
+ export * from './whitelist';
2
+ //# sourceMappingURL=index.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/fusion-order/whitelist/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA"}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/fusion-order/whitelist/types.ts"],"names":[],"mappings":""}
@@ -0,0 +1,113 @@
1
+ import { BytesBuilder, BytesIter } from '@1inch/byte-utils';
2
+ import assert from 'assert';
3
+ import { UINT_16_MAX } from '../../constants';
4
+ import { now } from '../../utils/time';
5
+ import { add0x } from '../../utils';
6
+ export class Whitelist {
7
+ constructor(resolvingStartTime, whitelist) {
8
+ this.resolvingStartTime = resolvingStartTime;
9
+ this.whitelist = whitelist;
10
+ assert(whitelist.length, 'whitelist can not be empty');
11
+ whitelist.forEach((w) => {
12
+ assert(w.delay < UINT_16_MAX, 'too big diff between timestamps');
13
+ assert(w.delay >= 0n, 'delay can not be negative');
14
+ });
15
+ }
16
+ static decodeFrom(bytes) {
17
+ const whitelist = [];
18
+ const resolvingStartTime = BigInt(bytes.nextUint32());
19
+ const size = BigInt(bytes.nextUint8());
20
+ for (let i = 0; i < size; i++) {
21
+ const addressHalf = BigInt(bytes.nextBytes(10))
22
+ .toString(16)
23
+ .padStart(20, '0');
24
+ const delay = BigInt(bytes.nextUint16());
25
+ whitelist.push({
26
+ addressHalf,
27
+ delay
28
+ });
29
+ }
30
+ return new Whitelist(resolvingStartTime, whitelist);
31
+ }
32
+ static decode(bytes) {
33
+ return Whitelist.decodeFrom(BytesIter.HexString(bytes));
34
+ }
35
+ static new(resolvingStartTime, whitelist) {
36
+ let sumDelay = 0n;
37
+ const _whitelist = whitelist
38
+ .map((d) => ({
39
+ addressHalf: d.address.toString().slice(-20),
40
+ allowFrom: d.allowFrom < resolvingStartTime
41
+ ? resolvingStartTime
42
+ : d.allowFrom
43
+ }))
44
+ .sort((a, b) => Number(a.allowFrom - b.allowFrom))
45
+ .map((val) => {
46
+ const delay = val.allowFrom - resolvingStartTime - sumDelay;
47
+ sumDelay += delay;
48
+ return {
49
+ delay,
50
+ addressHalf: val.addressHalf
51
+ };
52
+ });
53
+ return new Whitelist(resolvingStartTime, _whitelist);
54
+ }
55
+ static fromNow(whitelist) {
56
+ return Whitelist.new(now(), whitelist);
57
+ }
58
+ canExecuteAt(executor, executionTime) {
59
+ const addressHalf = executor.toString().slice(-20);
60
+ let allowedFrom = this.resolvingStartTime;
61
+ for (const whitelist of this.whitelist) {
62
+ allowedFrom += whitelist.delay;
63
+ if (addressHalf === whitelist.addressHalf) {
64
+ return executionTime >= allowedFrom;
65
+ }
66
+ else if (executionTime < allowedFrom) {
67
+ return false;
68
+ }
69
+ }
70
+ return false;
71
+ }
72
+ isExclusivityPeriod(time = now()) {
73
+ if (this.whitelist.length === 1) {
74
+ return true;
75
+ }
76
+ if (this.whitelist[0].delay === this.whitelist[1].delay) {
77
+ return false;
78
+ }
79
+ return time <= this.resolvingStartTime + this.whitelist[1].delay;
80
+ }
81
+ isExclusiveResolver(wallet) {
82
+ const addressHalf = wallet.toString().slice(-20);
83
+ if (this.whitelist.length === 1) {
84
+ return addressHalf === this.whitelist[0].addressHalf;
85
+ }
86
+ if (this.whitelist[0].delay === this.whitelist[1].delay) {
87
+ return false;
88
+ }
89
+ return addressHalf === this.whitelist[0].addressHalf;
90
+ }
91
+ isWhitelisted(address) {
92
+ const half = address.lastHalf();
93
+ return this.whitelist.some((w) => w.addressHalf === half);
94
+ }
95
+ encodeInto(builder = new BytesBuilder()) {
96
+ builder
97
+ .addUint32(this.resolvingStartTime)
98
+ .addUint8(BigInt(this.whitelist.length));
99
+ for (const wl of this.whitelist) {
100
+ builder.addBytes(add0x(wl.addressHalf)).addUint16(wl.delay);
101
+ }
102
+ return builder;
103
+ }
104
+ encode() {
105
+ return this.encodeInto().asHex();
106
+ }
107
+ equal(other) {
108
+ return (this.whitelist.length === other.whitelist.length &&
109
+ this.whitelist.every((val, i) => other.whitelist[i].delay === val.delay &&
110
+ other.whitelist[i].addressHalf === val.addressHalf));
111
+ }
112
+ }
113
+ //# sourceMappingURL=whitelist.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"whitelist.js","sourceRoot":"","sources":["../../../../src/fusion-order/whitelist/whitelist.ts"],"names":[],"mappings":"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"}
package/dist/esm/index.js CHANGED
@@ -1,6 +1,6 @@
1
1
  export { Address, Extension, randBigInt, getLimitOrderContract, Interaction, TakerTraits, ExtensionBuilder, AmountMode, getLimitOrderV4Domain, LimitOrderContract, MakerTraits } from '@1inch/limit-order-sdk';
2
2
  export * from './fusion-order/index';
3
- export * from './auction-calculator/index';
3
+ export * from './amount-calculator/auction-calculator/index';
4
4
  export * from './connector/index';
5
5
  export * from './sdk/index';
6
6
  export * from './constants';
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,OAAO,EAEP,SAAS,EACT,UAAU,EACV,qBAAqB,EACrB,WAAW,EACX,WAAW,EACX,gBAAgB,EAChB,UAAU,EACV,qBAAqB,EACrB,kBAAkB,EAGlB,WAAW,EACd,MAAM,wBAAwB,CAAA;AAC/B,cAAc,sBAAsB,CAAA;AACpC,cAAc,4BAA4B,CAAA;AAC1C,cAAc,mBAAmB,CAAA;AACjC,cAAc,aAAa,CAAA;AAC3B,cAAc,aAAa,CAAA;AAC3B,cAAc,SAAS,CAAA;AACvB,cAAc,iBAAiB,CAAA;AAC/B,cAAc,cAAc,CAAA;AAC5B,cAAc,eAAe,CAAA;AAC7B,cAAc,UAAU,CAAA;AACxB,cAAc,UAAU,CAAA;AACxB,OAAO,EACH,aAAa,EAEb,cAAc,EACd,yBAAyB,EACzB,UAAU,EACV,MAAM,EACN,KAAK,EAEL,WAAW,EACd,MAAM,OAAO,CAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,OAAO,EAEP,SAAS,EACT,UAAU,EACV,qBAAqB,EACrB,WAAW,EACX,WAAW,EACX,gBAAgB,EAChB,UAAU,EACV,qBAAqB,EACrB,kBAAkB,EAGlB,WAAW,EACd,MAAM,wBAAwB,CAAA;AAC/B,cAAc,sBAAsB,CAAA;AACpC,cAAc,8CAA8C,CAAA;AAC5D,cAAc,mBAAmB,CAAA;AACjC,cAAc,aAAa,CAAA;AAC3B,cAAc,aAAa,CAAA;AAC3B,cAAc,SAAS,CAAA;AACvB,cAAc,iBAAiB,CAAA;AAC/B,cAAc,cAAc,CAAA;AAC5B,cAAc,eAAe,CAAA;AAC7B,cAAc,UAAU,CAAA;AACxB,cAAc,UAAU,CAAA;AACxB,OAAO,EACH,aAAa,EAEb,cAAc,EACd,yBAAyB,EACzB,UAAU,EACV,MAAM,EACN,KAAK,EAEL,WAAW,EACd,MAAM,OAAO,CAAA"}
@@ -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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"}
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/sdk/utils.ts"],"names":[],"mappings":"AAAA,MAAM,QAAQ,GAAG,OAAQ,CAAA;AACzB,MAAM,QAAQ,GAAG,MAAO,CAAA;AACxB,MAAM,sBAAsB,GAAG,QAAQ,GAAG,QAAQ,CAAA;AAElD,MAAM,UAAU,gBAAgB,CAAC,GAAY;IACzC,IAAI,CAAC,GAAG,EAAE;QACN,OAAO,EAAE,CAAA;KACZ;IAED,OAAO,MAAM,CAAC,GAAG,CAAC,GAAG,sBAAsB,CAAA;AAC/C,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,MAAc,EAAE,KAAa;IAC1D,OAAO,MAAM,GAAG,CAAC,MAAM,GAAG,KAAK,CAAC,GAAG,QAAQ,CAAA;AAC/C,CAAC"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/sdk/utils.ts"],"names":[],"mappings":"AAAA,MAAM,QAAQ,GAAG,OAAQ,CAAA;AACzB,MAAM,QAAQ,GAAG,MAAO,CAAA;AACxB,MAAM,sBAAsB,GAAG,QAAQ,GAAG,QAAQ,CAAA;AAElD,MAAM,UAAU,gBAAgB,CAAC,GAAY;IACzC,IAAI,CAAC,GAAG,EAAE,CAAC;QACP,OAAO,EAAE,CAAA;IACb,CAAC;IAED,OAAO,MAAM,CAAC,GAAG,CAAC,GAAG,sBAAsB,CAAA;AAC/C,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,MAAc,EAAE,KAAa;IAC1D,OAAO,MAAM,GAAG,CAAC,MAAM,GAAG,KAAK,CAAC,GAAG,QAAQ,CAAA;AAC/C,CAAC"}