@1inch/fusion-sdk 1.0.1-rc.9 → 2.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/api/orders/order-api.spec.js +230 -144
- package/dist/api/orders/order-api.spec.js.map +1 -1
- package/dist/api/orders/orders.api.d.ts +1 -0
- package/dist/api/orders/orders.api.js +4 -3
- package/dist/api/orders/orders.api.js.map +1 -1
- package/dist/api/orders/types.d.ts +8 -0
- package/dist/api/orders/types.js.map +1 -1
- package/dist/api/quoter/quote/order-params.d.ts +1 -0
- package/dist/api/quoter/quote/order-params.js +1 -0
- package/dist/api/quoter/quote/order-params.js.map +1 -1
- package/dist/api/quoter/quote/quote.d.ts +1 -1
- package/dist/api/quoter/quote/quote.js +17 -10
- package/dist/api/quoter/quote/quote.js.map +1 -1
- package/dist/api/quoter/quote/types.d.ts +1 -0
- package/dist/api/quoter/quoter.api.d.ts +1 -0
- package/dist/api/quoter/quoter.api.js +3 -2
- package/dist/api/quoter/quoter.api.js.map +1 -1
- package/dist/api/quoter/quoter.api.spec.js +21 -6
- package/dist/api/quoter/quoter.api.spec.js.map +1 -1
- package/dist/api/quoter/quoter.request.d.ts +1 -0
- package/dist/api/quoter/quoter.request.js +3 -1
- package/dist/api/quoter/quoter.request.js.map +1 -1
- package/dist/api/quoter/types.d.ts +4 -3
- package/dist/api/quoter/types.js.map +1 -1
- package/dist/api/relayer/relayer.api.d.ts +1 -0
- package/dist/api/relayer/relayer.api.js +3 -2
- package/dist/api/relayer/relayer.api.js.map +1 -1
- package/dist/api/relayer/relayer.api.spec.js +8 -5
- package/dist/api/relayer/relayer.api.spec.js.map +1 -1
- package/dist/api/relayer/relayer.request.d.ts +1 -0
- package/dist/api/relayer/relayer.request.js +3 -1
- package/dist/api/relayer/relayer.request.js.map +1 -1
- package/dist/api/relayer/types.d.ts +1 -0
- package/dist/auction-calculator/auction-calculator.d.ts +20 -11
- package/dist/auction-calculator/auction-calculator.js +54 -25
- package/dist/auction-calculator/auction-calculator.js.map +1 -1
- package/dist/auction-calculator/index.d.ts +0 -1
- package/dist/auction-calculator/index.js +0 -1
- package/dist/auction-calculator/index.js.map +1 -1
- package/dist/fusion-order/auction-details/auction-details.d.ts +2 -0
- package/dist/fusion-order/auction-details/auction-details.js +3 -0
- package/dist/fusion-order/auction-details/auction-details.js.map +1 -1
- package/dist/fusion-order/auction-details/auction-details.spec.js +3 -3
- package/dist/fusion-order/auction-details/auction-details.spec.js.map +1 -1
- package/dist/fusion-order/fusion-extension.d.ts +12 -4
- package/dist/fusion-order/fusion-extension.js +37 -9
- package/dist/fusion-order/fusion-extension.js.map +1 -1
- package/dist/fusion-order/fusion-extension.spec.d.ts +1 -0
- package/dist/fusion-order/fusion-extension.spec.js +75 -0
- package/dist/fusion-order/fusion-extension.spec.js.map +1 -0
- package/dist/fusion-order/fusion-order.d.ts +42 -3
- package/dist/fusion-order/fusion-order.js +93 -21
- package/dist/fusion-order/fusion-order.js.map +1 -1
- package/dist/fusion-order/fusion-order.spec.js +79 -1
- package/dist/fusion-order/fusion-order.spec.js.map +1 -1
- package/dist/fusion-order/index.d.ts +1 -0
- package/dist/fusion-order/index.js +1 -0
- package/dist/fusion-order/index.js.map +1 -1
- package/dist/fusion-order/settlement-post-interaction-data/settlement-post-interaction-data.d.ts +6 -2
- package/dist/fusion-order/settlement-post-interaction-data/settlement-post-interaction-data.js +39 -8
- package/dist/fusion-order/settlement-post-interaction-data/settlement-post-interaction-data.js.map +1 -1
- package/dist/fusion-order/settlement-post-interaction-data/settlement-post-interaction-data.spec.js +34 -2
- package/dist/fusion-order/settlement-post-interaction-data/settlement-post-interaction-data.spec.js.map +1 -1
- package/dist/fusion-order/settlement-post-interaction-data/types.d.ts +1 -0
- package/dist/fusion-order/source-track.d.ts +1 -0
- package/dist/fusion-order/source-track.js +29 -0
- package/dist/fusion-order/source-track.js.map +1 -0
- package/dist/index.d.ts +1 -1
- package/dist/index.js.map +1 -1
- package/dist/sdk/sdk.js +16 -14
- package/dist/sdk/sdk.js.map +1 -1
- package/dist/sdk/types.d.ts +5 -0
- package/dist/sdk/utils.js +5 -2
- package/dist/sdk/utils.js.map +1 -1
- package/dist/utils/amounts.d.ts +1 -1
- package/dist/utils/amounts.js +3 -3
- package/dist/utils/amounts.js.map +1 -1
- package/dist/ws-api/types.d.ts +1 -0
- package/dist/ws-api/ws-api.d.ts +1 -0
- package/dist/ws-api/ws-api.js +2 -1
- package/dist/ws-api/ws-api.js.map +1 -1
- package/dist/ws-api/ws.spec.js +113 -106
- package/dist/ws-api/ws.spec.js.map +1 -1
- package/package.json +22 -22
- package/dist/auction-calculator/calc.d.ts +0 -9
- package/dist/auction-calculator/calc.js +0 -22
- package/dist/auction-calculator/calc.js.map +0 -1
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.injectTrackCode = void 0;
|
|
4
|
+
const byte_utils_1 = require("@1inch/byte-utils");
|
|
5
|
+
const ethers_1 = require("ethers");
|
|
6
|
+
const utils_1 = require("../utils");
|
|
7
|
+
const validations_1 = require("../validations");
|
|
8
|
+
const TRACK_CODE_MASK = new byte_utils_1.BitMask(224n, 256n);
|
|
9
|
+
function getTrackCodeForSource(source) {
|
|
10
|
+
if (!(0, validations_1.isHexString)(source)) {
|
|
11
|
+
return createId(source);
|
|
12
|
+
}
|
|
13
|
+
if (source.length === 10) {
|
|
14
|
+
return BigInt(source);
|
|
15
|
+
}
|
|
16
|
+
if (source.length === 66) {
|
|
17
|
+
return BigInt(source.substring(0, 10));
|
|
18
|
+
}
|
|
19
|
+
return createId(source);
|
|
20
|
+
}
|
|
21
|
+
function createId(source) {
|
|
22
|
+
return BigInt((0, utils_1.add0x)((0, ethers_1.id)(source).slice(0, 10)));
|
|
23
|
+
}
|
|
24
|
+
function injectTrackCode(salt, source) {
|
|
25
|
+
const track = source ? getTrackCodeForSource(source) : 0n;
|
|
26
|
+
return new byte_utils_1.BN(salt).setMask(TRACK_CODE_MASK, track).value;
|
|
27
|
+
}
|
|
28
|
+
exports.injectTrackCode = injectTrackCode;
|
|
29
|
+
//# sourceMappingURL=source-track.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"source-track.js","sourceRoot":"","sources":["../../src/fusion-order/source-track.ts"],"names":[],"mappings":";;;AAAA,kDAA6C;AAC7C,mCAAyB;AACzB,oCAA8B;AAC9B,gDAA0C;AAE1C,MAAM,eAAe,GAAG,IAAI,oBAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;AAE/C,SAAS,qBAAqB,CAAC,MAAc;IACzC,IAAI,CAAC,IAAA,yBAAW,EAAC,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,IAAA,aAAK,EAAC,IAAA,WAAE,EAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;AACjD,CAAC;AAED,SAAgB,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;AAJD,0CAIC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -9,4 +9,4 @@ export * from './utils/amounts';
|
|
|
9
9
|
export * from './validations';
|
|
10
10
|
export * from './ws-api';
|
|
11
11
|
export * from './errors';
|
|
12
|
-
export { QuoterRequest, RelayerRequest, QuoterCustomPresetRequest, PresetEnum, Preset, Quote } from './api';
|
|
12
|
+
export { QuoterRequest, QuoterResponse, RelayerRequest, QuoterCustomPresetRequest, PresetEnum, Preset, Quote } from './api';
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,0DAY+B;AAX3B,0GAAA,OAAO,OAAA;AAEP,4GAAA,SAAS,OAAA;AACT,6GAAA,UAAU,OAAA;AACV,wHAAA,qBAAqB,OAAA;AACrB,8GAAA,WAAW,OAAA;AACX,8GAAA,WAAW,OAAA;AACX,mHAAA,gBAAgB,OAAA;AAChB,6GAAA,UAAU,OAAA;AACV,wHAAA,qBAAqB,OAAA;AACrB,qHAAA,kBAAkB,OAAA;AAEtB,uDAAoC;AACpC,6DAA0C;AAC1C,oDAAiC;AACjC,8CAA2B;AAC3B,8CAA2B;AAC3B,0CAAuB;AACvB,kDAA+B;AAC/B,gDAA6B;AAC7B,2CAAwB;AACxB,2CAAwB;AACxB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,0DAY+B;AAX3B,0GAAA,OAAO,OAAA;AAEP,4GAAA,SAAS,OAAA;AACT,6GAAA,UAAU,OAAA;AACV,wHAAA,qBAAqB,OAAA;AACrB,8GAAA,WAAW,OAAA;AACX,8GAAA,WAAW,OAAA;AACX,mHAAA,gBAAgB,OAAA;AAChB,6GAAA,UAAU,OAAA;AACV,wHAAA,qBAAqB,OAAA;AACrB,qHAAA,kBAAkB,OAAA;AAEtB,uDAAoC;AACpC,6DAA0C;AAC1C,oDAAiC;AACjC,8CAA2B;AAC3B,8CAA2B;AAC3B,0CAAuB;AACvB,kDAA+B;AAC/B,gDAA6B;AAC7B,2CAAwB;AACxB,2CAAwB;AACxB,6BAQc;AAPV,oGAAA,aAAa,OAAA;AAEb,qGAAA,cAAc,OAAA;AACd,gHAAA,yBAAyB,OAAA;AACzB,iGAAA,UAAU,OAAA;AACV,6FAAA,MAAM,OAAA;AACN,4FAAA,KAAK,OAAA"}
|
package/dist/sdk/sdk.js
CHANGED
|
@@ -32,11 +32,12 @@ class FusionSDK {
|
|
|
32
32
|
fromTokenAddress: params.fromTokenAddress,
|
|
33
33
|
toTokenAddress: params.toTokenAddress,
|
|
34
34
|
amount: params.amount,
|
|
35
|
-
walletAddress: limit_order_sdk_1.Address.ZERO_ADDRESS.toString(),
|
|
35
|
+
walletAddress: params.walletAddress || limit_order_sdk_1.Address.ZERO_ADDRESS.toString(),
|
|
36
36
|
permit: params.permit,
|
|
37
|
-
enableEstimate:
|
|
37
|
+
enableEstimate: !!params.enableEstimate,
|
|
38
38
|
fee: params?.takingFeeBps,
|
|
39
|
-
source: params.source
|
|
39
|
+
source: params.source,
|
|
40
|
+
isPermit2: params.isPermit2
|
|
40
41
|
});
|
|
41
42
|
return this.api.getQuote(request);
|
|
42
43
|
}
|
|
@@ -45,11 +46,12 @@ class FusionSDK {
|
|
|
45
46
|
fromTokenAddress: params.fromTokenAddress,
|
|
46
47
|
toTokenAddress: params.toTokenAddress,
|
|
47
48
|
amount: params.amount,
|
|
48
|
-
walletAddress: limit_order_sdk_1.Address.ZERO_ADDRESS.toString(),
|
|
49
|
+
walletAddress: params.walletAddress || limit_order_sdk_1.Address.ZERO_ADDRESS.toString(),
|
|
49
50
|
permit: params.permit,
|
|
50
|
-
enableEstimate:
|
|
51
|
+
enableEstimate: !!params.enableEstimate,
|
|
51
52
|
fee: params?.takingFeeBps,
|
|
52
|
-
source: params.source
|
|
53
|
+
source: params.source,
|
|
54
|
+
isPermit2: params.isPermit2
|
|
53
55
|
});
|
|
54
56
|
const bodyRequest = api_1.QuoterCustomPresetRequest.new({
|
|
55
57
|
customPreset: body.customPreset
|
|
@@ -67,13 +69,11 @@ class FusionSDK {
|
|
|
67
69
|
: undefined,
|
|
68
70
|
preset: params.preset,
|
|
69
71
|
nonce: params.nonce,
|
|
70
|
-
permit: params.permit,
|
|
71
72
|
takingFeeReceiver: params.fee?.takingFeeReceiver,
|
|
72
73
|
allowPartialFills: params.allowPartialFills,
|
|
73
74
|
allowMultipleFills: params.allowMultipleFills
|
|
74
75
|
});
|
|
75
|
-
const
|
|
76
|
-
const hash = order.getOrderHash(domain);
|
|
76
|
+
const hash = order.getOrderHash(this.config.network);
|
|
77
77
|
return { order, hash, quoteId: quote.quoteId };
|
|
78
78
|
}
|
|
79
79
|
async submitOrder(order, quoteId) {
|
|
@@ -81,19 +81,20 @@ class FusionSDK {
|
|
|
81
81
|
throw new Error('blockchainProvider has not set to config');
|
|
82
82
|
}
|
|
83
83
|
const orderStruct = order.build();
|
|
84
|
-
const
|
|
85
|
-
const signature = await this.config.blockchainProvider.signTypedData(orderStruct.maker, order.getTypedData(domain));
|
|
84
|
+
const signature = await this.config.blockchainProvider.signTypedData(orderStruct.maker, order.getTypedData(this.config.network));
|
|
86
85
|
const relayerRequest = api_1.RelayerRequest.new({
|
|
87
86
|
order: orderStruct,
|
|
88
87
|
signature,
|
|
89
|
-
quoteId
|
|
88
|
+
quoteId,
|
|
89
|
+
extension: order.extension.encode()
|
|
90
90
|
});
|
|
91
91
|
await this.api.submitOrder(relayerRequest);
|
|
92
92
|
return {
|
|
93
93
|
order: orderStruct,
|
|
94
94
|
signature,
|
|
95
95
|
quoteId,
|
|
96
|
-
orderHash: order.getOrderHash(
|
|
96
|
+
orderHash: order.getOrderHash(this.config.network),
|
|
97
|
+
extension: relayerRequest.extension
|
|
97
98
|
};
|
|
98
99
|
}
|
|
99
100
|
async placeOrder(params) {
|
|
@@ -118,7 +119,8 @@ class FusionSDK {
|
|
|
118
119
|
permit: params.permit,
|
|
119
120
|
enableEstimate: true,
|
|
120
121
|
fee: params.fee?.takingFeeBps,
|
|
121
|
-
source: params.source
|
|
122
|
+
source: params.source,
|
|
123
|
+
isPermit2: params.isPermit2
|
|
122
124
|
});
|
|
123
125
|
if (!params.customPreset) {
|
|
124
126
|
return this.api.getQuote(quoterRequest);
|
package/dist/sdk/sdk.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sdk.js","sourceRoot":"","sources":["../../src/sdk/sdk.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"sdk.js","sourceRoot":"","sources":["../../src/sdk/sdk.ts"],"names":[],"mappings":"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"}
|
package/dist/sdk/types.d.ts
CHANGED
|
@@ -14,9 +14,12 @@ export type QuoteParams = {
|
|
|
14
14
|
fromTokenAddress: string;
|
|
15
15
|
toTokenAddress: string;
|
|
16
16
|
amount: string;
|
|
17
|
+
walletAddress?: string;
|
|
18
|
+
enableEstimate?: boolean;
|
|
17
19
|
permit?: string;
|
|
18
20
|
takingFeeBps?: number;
|
|
19
21
|
source?: string;
|
|
22
|
+
isPermit2?: boolean;
|
|
20
23
|
};
|
|
21
24
|
export type QuoteCustomPresetParams = {
|
|
22
25
|
customPreset: CustomPreset;
|
|
@@ -37,6 +40,7 @@ export type OrderParams = {
|
|
|
37
40
|
nonce?: bigint;
|
|
38
41
|
fee?: TakingFeeInfo;
|
|
39
42
|
source?: string;
|
|
43
|
+
isPermit2?: boolean;
|
|
40
44
|
customPreset?: CustomPreset;
|
|
41
45
|
/**
|
|
42
46
|
* true by default
|
|
@@ -56,6 +60,7 @@ export type OrderInfo = {
|
|
|
56
60
|
signature: string;
|
|
57
61
|
quoteId: string;
|
|
58
62
|
orderHash: string;
|
|
63
|
+
extension: string;
|
|
59
64
|
};
|
|
60
65
|
export type PreparedOrder = {
|
|
61
66
|
order: FusionOrder;
|
package/dist/sdk/utils.js
CHANGED
|
@@ -1,15 +1,18 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.addRatioToAmount = exports.bpsToRatioFormat = void 0;
|
|
4
|
+
const FEE_BASE = 100000n;
|
|
5
|
+
const BPS_BASE = 10000n;
|
|
6
|
+
const BPS_TO_RATIO_NUMERATOR = FEE_BASE / BPS_BASE;
|
|
4
7
|
function bpsToRatioFormat(bps) {
|
|
5
8
|
if (!bps) {
|
|
6
9
|
return 0n;
|
|
7
10
|
}
|
|
8
|
-
return BigInt(bps) *
|
|
11
|
+
return BigInt(bps) * BPS_TO_RATIO_NUMERATOR;
|
|
9
12
|
}
|
|
10
13
|
exports.bpsToRatioFormat = bpsToRatioFormat;
|
|
11
14
|
function addRatioToAmount(amount, ratio) {
|
|
12
|
-
return amount + (amount * ratio) /
|
|
15
|
+
return amount + (amount * ratio) / FEE_BASE;
|
|
13
16
|
}
|
|
14
17
|
exports.addRatioToAmount = addRatioToAmount;
|
|
15
18
|
//# sourceMappingURL=utils.js.map
|
package/dist/sdk/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/sdk/utils.ts"],"names":[],"mappings":";;;AAAA,SAAgB,gBAAgB,CAAC,GAAY;IACzC,IAAI,CAAC,GAAG,EAAE;QACN,OAAO,EAAE,CAAA;KACZ;IAED,OAAO,MAAM,CAAC,GAAG,CAAC,GAAG,
|
|
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,SAAgB,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;AAND,4CAMC;AAED,SAAgB,gBAAgB,CAAC,MAAc,EAAE,KAAa;IAC1D,OAAO,MAAM,GAAG,CAAC,MAAM,GAAG,KAAK,CAAC,GAAG,QAAQ,CAAA;AAC/C,CAAC;AAFD,4CAEC"}
|
package/dist/utils/amounts.d.ts
CHANGED
|
@@ -15,4 +15,4 @@ export declare function calcTakingAmount(swapMakerAmount: bigint, orderMakerAmou
|
|
|
15
15
|
* @return Floored maker amount
|
|
16
16
|
* @see https://github.com/1inch/limit-order-protocol/blob/23d655844191dea7960a186652307604a1ed480a/contracts/libraries/AmountCalculatorLib.sol#L6
|
|
17
17
|
*/
|
|
18
|
-
export declare function
|
|
18
|
+
export declare function calcMakingAmount(swapTakerAmount: bigint, orderMakerAmount: bigint, orderTakerAmount: bigint): bigint;
|
package/dist/utils/amounts.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.calcMakingAmount = exports.calcTakingAmount = void 0;
|
|
4
4
|
/**
|
|
5
5
|
* Calculates taker amount by linear proportion
|
|
6
6
|
* Note: use for minReturn only, because other amounts calculated based on auction curve
|
|
@@ -22,8 +22,8 @@ exports.calcTakingAmount = calcTakingAmount;
|
|
|
22
22
|
* @return Floored maker amount
|
|
23
23
|
* @see https://github.com/1inch/limit-order-protocol/blob/23d655844191dea7960a186652307604a1ed480a/contracts/libraries/AmountCalculatorLib.sol#L6
|
|
24
24
|
*/
|
|
25
|
-
function
|
|
25
|
+
function calcMakingAmount(swapTakerAmount, orderMakerAmount, orderTakerAmount) {
|
|
26
26
|
return (swapTakerAmount * orderMakerAmount) / orderTakerAmount;
|
|
27
27
|
}
|
|
28
|
-
exports.
|
|
28
|
+
exports.calcMakingAmount = calcMakingAmount;
|
|
29
29
|
//# sourceMappingURL=amounts.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"amounts.js","sourceRoot":"","sources":["../../src/utils/amounts.ts"],"names":[],"mappings":";;;AAAA;;;;;;;GAOG;AACH,SAAgB,gBAAgB,CAC5B,eAAuB,EACvB,gBAAwB,EACxB,gBAAwB;IAExB,OAAO,CACH,CAAC,eAAe,GAAG,gBAAgB,GAAG,gBAAgB,GAAG,EAAE,CAAC;QAC5D,gBAAgB,CACnB,CAAA;AACL,CAAC;AATD,4CASC;AAED;;;;;;;GAOG;AACH,SAAgB,
|
|
1
|
+
{"version":3,"file":"amounts.js","sourceRoot":"","sources":["../../src/utils/amounts.ts"],"names":[],"mappings":";;;AAAA;;;;;;;GAOG;AACH,SAAgB,gBAAgB,CAC5B,eAAuB,EACvB,gBAAwB,EACxB,gBAAwB;IAExB,OAAO,CACH,CAAC,eAAe,GAAG,gBAAgB,GAAG,gBAAgB,GAAG,EAAE,CAAC;QAC5D,gBAAgB,CACnB,CAAA;AACL,CAAC;AATD,4CASC;AAED;;;;;;;GAOG;AACH,SAAgB,gBAAgB,CAC5B,eAAuB,EACvB,gBAAwB,EACxB,gBAAwB;IAExB,OAAO,CAAC,eAAe,GAAG,gBAAgB,CAAC,GAAG,gBAAgB,CAAA;AAClE,CAAC;AAND,4CAMC"}
|
package/dist/ws-api/types.d.ts
CHANGED
|
@@ -17,6 +17,7 @@ export type OrderCreatedEvent = Event<'order_created', {
|
|
|
17
17
|
auctionStartDate: string;
|
|
18
18
|
auctionEndDate: string;
|
|
19
19
|
remainingMakerAmount: string;
|
|
20
|
+
extension: string;
|
|
20
21
|
}>;
|
|
21
22
|
export type OrderBalanceOrAllowanceChangeEvent = Event<'order_balance_or_allowance_change', {
|
|
22
23
|
orderHash: string;
|
package/dist/ws-api/ws-api.d.ts
CHANGED
|
@@ -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;
|
package/dist/ws-api/ws-api.js
CHANGED
|
@@ -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}
|
|
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;
|
|
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"}
|