@1inch/fusion-sdk 2.1.11-rc.2 → 2.1.11-rc.4
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/cjs/api/quoter/quote/quote.js +33 -15
- package/dist/cjs/api/quoter/quote/quote.js.map +1 -1
- package/dist/cjs/api/quoter/quoter.request.js +0 -3
- package/dist/cjs/api/quoter/quoter.request.js.map +1 -1
- package/dist/cjs/api/quoter/types.js.map +1 -1
- package/dist/cjs/fusion-order/cancellation-auction.js +20 -0
- package/dist/cjs/fusion-order/cancellation-auction.js.map +1 -0
- package/dist/cjs/fusion-order/fusion-order.js +32 -3
- package/dist/cjs/fusion-order/fusion-order.js.map +1 -1
- package/dist/cjs/fusion-order/index.js +2 -0
- package/dist/cjs/fusion-order/index.js.map +1 -1
- package/dist/cjs/fusion-order/types.js +3 -0
- package/dist/cjs/fusion-order/types.js.map +1 -0
- package/dist/cjs/index.js +4 -1
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/sdk/sdk.js +28 -20
- package/dist/cjs/sdk/sdk.js.map +1 -1
- package/dist/cjs/tsconfig.cjs.tsbuildinfo +1 -1
- package/dist/esm/api/quoter/quote/quote.js +33 -16
- package/dist/esm/api/quoter/quote/quote.js.map +1 -1
- package/dist/esm/api/quoter/quoter.request.js +0 -3
- package/dist/esm/api/quoter/quoter.request.js.map +1 -1
- package/dist/esm/api/quoter/types.js.map +1 -1
- package/dist/esm/fusion-order/cancellation-auction.js +15 -0
- package/dist/esm/fusion-order/cancellation-auction.js.map +1 -0
- package/dist/esm/fusion-order/fusion-order.js +32 -3
- package/dist/esm/fusion-order/fusion-order.js.map +1 -1
- package/dist/esm/fusion-order/index.js +2 -0
- package/dist/esm/fusion-order/index.js.map +1 -1
- package/dist/esm/fusion-order/types.js +2 -0
- package/dist/esm/fusion-order/types.js.map +1 -0
- package/dist/esm/index.js +1 -1
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/sdk/sdk.js +28 -20
- package/dist/esm/sdk/sdk.js.map +1 -1
- package/dist/esm/tsconfig.esm.tsbuildinfo +1 -1
- package/dist/types/src/api/quoter/quote/quote.d.ts +3 -1
- package/dist/types/src/api/quoter/types.d.ts +2 -0
- package/dist/types/src/fusion-order/cancellation-auction.d.ts +7 -0
- package/dist/types/src/fusion-order/fusion-order.d.ts +11 -31
- package/dist/types/src/fusion-order/index.d.ts +2 -0
- package/dist/types/src/fusion-order/types.d.ts +22 -0
- package/dist/types/src/index.d.ts +1 -1
- package/dist/types/src/sdk/sdk.d.ts +3 -0
- package/dist/types/src/sdk/types.d.ts +2 -1
- package/dist/types/tsconfig.types.tsbuildinfo +1 -1
- package/package.json +3 -3
|
@@ -1,11 +1,12 @@
|
|
|
1
|
-
import { Address, randBigInt } from '@1inch/limit-order-sdk';
|
|
1
|
+
import { Address, ProxyFactory, randBigInt } from '@1inch/limit-order-sdk';
|
|
2
2
|
import { UINT_40_MAX } from '@1inch/byte-utils';
|
|
3
|
+
import assert from 'assert';
|
|
3
4
|
import { FusionOrderParams } from './order-params';
|
|
4
5
|
import { PresetEnum } from '../types';
|
|
5
6
|
import { Preset } from '../preset';
|
|
6
7
|
import { FusionOrder } from '../../../fusion-order';
|
|
7
|
-
import { bpsToRatioFormat } from '../../../sdk';
|
|
8
8
|
import { CHAIN_TO_WRAPPER } from '../../../fusion-order/constants';
|
|
9
|
+
import { bpsToRatioFormat } from '../../../sdk';
|
|
9
10
|
export class Quote {
|
|
10
11
|
constructor(params, response) {
|
|
11
12
|
this.params = params;
|
|
@@ -27,6 +28,11 @@ export class Quote {
|
|
|
27
28
|
this.recommendedPreset = response.recommended_preset;
|
|
28
29
|
this.silippage = response.autoK;
|
|
29
30
|
this.settlementAddress = new Address(response.settlementAddress);
|
|
31
|
+
this.nativeOrderFactory =
|
|
32
|
+
response.nativeOrderFactoryAddress &&
|
|
33
|
+
response.nativeOrderImplAddress
|
|
34
|
+
? new ProxyFactory(new Address(response.nativeOrderFactoryAddress), new Address(response.nativeOrderImplAddress))
|
|
35
|
+
: undefined;
|
|
30
36
|
}
|
|
31
37
|
createFusionOrder(paramsData) {
|
|
32
38
|
const params = FusionOrderParams.new({
|
|
@@ -35,6 +41,7 @@ export class Quote {
|
|
|
35
41
|
permit: this.params.permit,
|
|
36
42
|
isPermit2: this.params.isPermit2,
|
|
37
43
|
nonce: paramsData?.nonce,
|
|
44
|
+
delayAuctionStartTimeBy: paramsData?.delayAuctionStartTimeBy,
|
|
38
45
|
network: paramsData.network
|
|
39
46
|
});
|
|
40
47
|
const preset = this.getPreset(params.preset);
|
|
@@ -48,26 +55,19 @@ export class Quote {
|
|
|
48
55
|
const takerAsset = this.params.toTokenAddress.isNative()
|
|
49
56
|
? CHAIN_TO_WRAPPER[paramsData.network]
|
|
50
57
|
: this.params.toTokenAddress;
|
|
51
|
-
|
|
58
|
+
const orderInfo = {
|
|
52
59
|
makerAsset: this.params.fromTokenAddress,
|
|
53
60
|
takerAsset: takerAsset,
|
|
54
61
|
makingAmount: this.fromTokenAmount,
|
|
55
62
|
takingAmount: preset.auctionEndAmount,
|
|
56
63
|
maker: this.params.walletAddress,
|
|
57
64
|
receiver: params.receiver
|
|
58
|
-
}
|
|
65
|
+
};
|
|
66
|
+
const details = {
|
|
59
67
|
auction: auctionDetails,
|
|
60
|
-
fees: {
|
|
61
|
-
integratorFee: {
|
|
62
|
-
ratio: bpsToRatioFormat(this.params.fee) || 0n,
|
|
63
|
-
receiver: paramsData?.takingFeeReceiver
|
|
64
|
-
? new Address(paramsData?.takingFeeReceiver)
|
|
65
|
-
: Address.ZERO_ADDRESS
|
|
66
|
-
},
|
|
67
|
-
bankFee: preset.bankFee
|
|
68
|
-
},
|
|
69
68
|
whitelist: this.getWhitelist(auctionDetails.startTime, preset.exclusiveResolver)
|
|
70
|
-
}
|
|
69
|
+
};
|
|
70
|
+
const extra = {
|
|
71
71
|
nonce,
|
|
72
72
|
unwrapWETH: this.params.toTokenAddress.isNative(),
|
|
73
73
|
permit: params.permit,
|
|
@@ -75,12 +75,29 @@ export class Quote {
|
|
|
75
75
|
allowMultipleFills,
|
|
76
76
|
orderExpirationDelay: paramsData?.orderExpirationDelay,
|
|
77
77
|
source: this.params.source,
|
|
78
|
-
enablePermit2: params.isPermit2
|
|
79
|
-
|
|
78
|
+
enablePermit2: params.isPermit2,
|
|
79
|
+
fees: {
|
|
80
|
+
integratorFee: {
|
|
81
|
+
ratio: bpsToRatioFormat(this.params.fee) || 0n,
|
|
82
|
+
receiver: paramsData?.takingFeeReceiver
|
|
83
|
+
? new Address(paramsData?.takingFeeReceiver)
|
|
84
|
+
: Address.ZERO_ADDRESS
|
|
85
|
+
},
|
|
86
|
+
bankFee: preset.bankFee
|
|
87
|
+
}
|
|
88
|
+
};
|
|
89
|
+
return this._createOrder(paramsData.network, this.settlementAddress, orderInfo, details, extra);
|
|
80
90
|
}
|
|
81
91
|
getPreset(type = PresetEnum.fast) {
|
|
82
92
|
return this.presets[type];
|
|
83
93
|
}
|
|
94
|
+
_createOrder(chainId, settlementExtension, orderInfo, details, extra) {
|
|
95
|
+
if (this.params.fromTokenAddress.isNative()) {
|
|
96
|
+
assert(this.nativeOrderFactory, 'expected nativeOrderFactory to be set for order from native asset');
|
|
97
|
+
return FusionOrder.fromNative(chainId, this.nativeOrderFactory, settlementExtension, orderInfo, details, extra);
|
|
98
|
+
}
|
|
99
|
+
return FusionOrder.new(settlementExtension, orderInfo, details, extra);
|
|
100
|
+
}
|
|
84
101
|
getWhitelist(auctionStartTime, exclusiveResolver) {
|
|
85
102
|
if (exclusiveResolver) {
|
|
86
103
|
return this.whitelist.map((resolver) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quote.js","sourceRoot":"","sources":["../../../../../src/api/quoter/quote/quote.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"quote.js","sourceRoot":"","sources":["../../../../../src/api/quoter/quote/quote.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,9 +11,6 @@ export class QuoterRequest {
|
|
|
11
11
|
this.fee = params.fee;
|
|
12
12
|
this.source = params.source || 'sdk';
|
|
13
13
|
this.isPermit2 = params.isPermit2 ?? false;
|
|
14
|
-
if (this.fromTokenAddress.isNative()) {
|
|
15
|
-
throw new Error(`cannot swap ${Address.NATIVE_CURRENCY}: wrap native currency to it's wrapper fist`);
|
|
16
|
-
}
|
|
17
14
|
if (this.fromTokenAddress.isZero() || this.toTokenAddress.isZero()) {
|
|
18
15
|
throw new Error(`replace ${Address.ZERO_ADDRESS} with ${Address.NATIVE_CURRENCY}`);
|
|
19
16
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quoter.request.js","sourceRoot":"","sources":["../../../../src/api/quoter/quoter.request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,wBAAwB,CAAA;AAE9C,OAAO,EAAC,aAAa,EAAC,MAAM,mBAAmB,CAAA;AAE/C,MAAM,OAAO,aAAa;IAmBtB,YAAY,MAA2B;QACnC,IAAI,CAAC,gBAAgB,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAA;QAC5D,IAAI,CAAC,cAAc,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,CAAA;QACxD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAA;QAC3B,IAAI,CAAC,aAAa,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;QACtD,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,IAAI,KAAK,CAAA;QACpD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAA;QAC3B,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAA;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,KAAK,CAAA;QACpC,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,IAAI,KAAK,CAAA;QAE1C,IAAI,IAAI,CAAC,gBAAgB,CAAC,
|
|
1
|
+
{"version":3,"file":"quoter.request.js","sourceRoot":"","sources":["../../../../src/api/quoter/quoter.request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,wBAAwB,CAAA;AAE9C,OAAO,EAAC,aAAa,EAAC,MAAM,mBAAmB,CAAA;AAE/C,MAAM,OAAO,aAAa;IAmBtB,YAAY,MAA2B;QACnC,IAAI,CAAC,gBAAgB,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAA;QAC5D,IAAI,CAAC,cAAc,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,CAAA;QACxD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAA;QAC3B,IAAI,CAAC,aAAa,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;QACtD,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,IAAI,KAAK,CAAA;QACpD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAA;QAC3B,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAA;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,KAAK,CAAA;QACpC,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,IAAI,KAAK,CAAA;QAE1C,IAAI,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,EAAE;YAChE,MAAM,IAAI,KAAK,CACX,WAAW,OAAO,CAAC,YAAY,SAAS,OAAO,CAAC,eAAe,EAAE,CACpE,CAAA;SACJ;QAED,IAAI,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE;YAClD,MAAM,IAAI,KAAK,CACX,yDAAyD,CAC5D,CAAA;SACJ;QAED,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YAC7B,MAAM,IAAI,KAAK,CAAC,GAAG,IAAI,CAAC,MAAM,oBAAoB,CAAC,CAAA;SACtD;QAED,IAAI,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,MAAM,KAAK,KAAK,EAAE;YACnC,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAA;SACnD;IACL,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,MAA2B;QAClC,OAAO,IAAI,aAAa,CAAC,MAAM,CAAC,CAAA;IACpC,CAAC;IAED,KAAK;QACD,OAAO;YACH,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE;YAClD,cAAc,EAAE,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE;YAC9C,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,aAAa,EAAE,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE;YAC5C,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,SAAS,EAAE,IAAI,CAAC,SAAS;SAC5B,CAAA;IACL,CAAC;CACJ"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/api/quoter/types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/api/quoter/types.ts"],"names":[],"mappings":"AA6EA,MAAM,CAAN,IAAY,UAKX;AALD,WAAY,UAAU;IAClB,2BAAa,CAAA;IACb,+BAAiB,CAAA;IACjB,2BAAa,CAAA;IACb,+BAAiB,CAAA;AACrB,CAAC,EALW,UAAU,KAAV,UAAU,QAKrB"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { UINT_32_MAX, UINT_16_MAX } from '@1inch/byte-utils';
|
|
2
|
+
import assert from 'assert';
|
|
3
|
+
export class CancellationAuction {
|
|
4
|
+
constructor(duration, maxRewardBps) {
|
|
5
|
+
this.duration = duration;
|
|
6
|
+
this.maxRewardBps = maxRewardBps;
|
|
7
|
+
assert(duration <= UINT_32_MAX, 'max cancellation auction duration must be <= UINT_32_MAX');
|
|
8
|
+
assert(maxRewardBps <= UINT_16_MAX, 'max cancellation auction maxRewardBps must be <= UINT_16_MAX');
|
|
9
|
+
}
|
|
10
|
+
build() {
|
|
11
|
+
return (this.duration << 16n) | this.maxRewardBps;
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
CancellationAuction.ZERO = new CancellationAuction(0n, 0n);
|
|
15
|
+
//# sourceMappingURL=cancellation-auction.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cancellation-auction.js","sourceRoot":"","sources":["../../../src/fusion-order/cancellation-auction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAE,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC1D,OAAO,MAAM,MAAM,QAAQ,CAAA;AAE3B,MAAM,OAAO,mBAAmB;IAG5B,YACoB,QAAgB,EAYhB,YAAoB;QAZpB,aAAQ,GAAR,QAAQ,CAAQ;QAYhB,iBAAY,GAAZ,YAAY,CAAQ;QAEpC,MAAM,CACF,QAAQ,IAAI,WAAW,EACvB,0DAA0D,CAC7D,CAAA;QAED,MAAM,CACF,YAAY,IAAI,WAAW,EAC3B,8DAA8D,CACjE,CAAA;IACL,CAAC;IAEM,KAAK;QACR,OAAO,CAAC,IAAI,CAAC,QAAQ,IAAI,GAAG,CAAC,GAAG,IAAI,CAAC,YAAY,CAAA;IACrD,CAAC;;AA9BM,wBAAI,GAAG,IAAI,mBAAmB,CAAC,EAAE,EAAE,EAAE,CAAC,CAAA"}
|
|
@@ -49,11 +49,17 @@ export class FusionOrder {
|
|
|
49
49
|
const saltWithInjectedTrackCode = orderInfo.salt
|
|
50
50
|
? salt
|
|
51
51
|
: injectTrackCode(salt, extra.source);
|
|
52
|
+
if (orderInfo.makerAsset.isNative()) {
|
|
53
|
+
throw new Error('use FusionOrder.fromNative to create order from native asset');
|
|
54
|
+
}
|
|
55
|
+
const optimizeReceiverAddress = extra.optimizeReceiverAddress !== undefined
|
|
56
|
+
? extra.optimizeReceiverAddress
|
|
57
|
+
: FusionOrder.defaultExtra.optimizeReceiverAddress;
|
|
52
58
|
this.inner = new LimitOrder({
|
|
53
59
|
...orderInfo,
|
|
54
60
|
receiver,
|
|
55
61
|
salt: saltWithInjectedTrackCode
|
|
56
|
-
}, makerTraits, builtExtension);
|
|
62
|
+
}, makerTraits, builtExtension, { optimizeReceiverAddress });
|
|
57
63
|
this.fusionExtension = extension;
|
|
58
64
|
}
|
|
59
65
|
get extension() {
|
|
@@ -111,6 +117,21 @@ export class FusionOrder {
|
|
|
111
117
|
customReceiver: orderInfo.receiver
|
|
112
118
|
}), extra);
|
|
113
119
|
}
|
|
120
|
+
static isNativeOrder(chainId, ethOrderFactory, order, signature) {
|
|
121
|
+
return LimitOrder.isNativeOrder(chainId, ethOrderFactory, order, signature);
|
|
122
|
+
}
|
|
123
|
+
static fromNative(chainId, ethOrdersFactory, settlementExtension, orderInfo, details, extra) {
|
|
124
|
+
const _orderInfo = {
|
|
125
|
+
...orderInfo,
|
|
126
|
+
makerAsset: LimitOrder.CHAIN_TO_WRAPPER[chainId],
|
|
127
|
+
receiver: orderInfo.receiver && !orderInfo.receiver.isZero()
|
|
128
|
+
? orderInfo.receiver
|
|
129
|
+
: orderInfo.maker
|
|
130
|
+
};
|
|
131
|
+
const _order = FusionOrder.new(settlementExtension, _orderInfo, details, { ...extra, optimizeReceiverAddress: false });
|
|
132
|
+
_order.inner = LimitOrder.fromNative(chainId, ethOrdersFactory, { ..._orderInfo, salt: _order.salt }, _order.inner.makerTraits, _order.inner.extension);
|
|
133
|
+
return _order;
|
|
134
|
+
}
|
|
114
135
|
static fromDataAndExtension(order, extension) {
|
|
115
136
|
const settlementContract = Address.fromFirstBytes(extension.makingAmountData);
|
|
116
137
|
assert(Address.fromFirstBytes(extension.takingAmountData).equal(settlementContract) &&
|
|
@@ -141,9 +162,16 @@ export class FusionOrder {
|
|
|
141
162
|
? undefined
|
|
142
163
|
: Interaction.decode(extension.makerPermit).data,
|
|
143
164
|
unwrapWETH: makerTraits.isNativeUnwrapEnabled(),
|
|
144
|
-
orderExpirationDelay
|
|
165
|
+
orderExpirationDelay,
|
|
166
|
+
optimizeReceiverAddress: true
|
|
145
167
|
});
|
|
146
168
|
}
|
|
169
|
+
isNative(chainId, ethOrderFactory, signature) {
|
|
170
|
+
return this.inner.isNative(chainId, ethOrderFactory, signature);
|
|
171
|
+
}
|
|
172
|
+
nativeSignature(maker) {
|
|
173
|
+
return this.inner.nativeSignature(maker);
|
|
174
|
+
}
|
|
147
175
|
build() {
|
|
148
176
|
return this.inner.build();
|
|
149
177
|
}
|
|
@@ -187,6 +215,7 @@ FusionOrder.defaultExtra = {
|
|
|
187
215
|
allowMultipleFills: true,
|
|
188
216
|
unwrapWETH: false,
|
|
189
217
|
enablePermit2: false,
|
|
190
|
-
orderExpirationDelay: 12n
|
|
218
|
+
orderExpirationDelay: 12n,
|
|
219
|
+
optimizeReceiverAddress: true
|
|
191
220
|
};
|
|
192
221
|
//# sourceMappingURL=fusion-order.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fusion-order.js","sourceRoot":"","sources":["../../../src/fusion-order/fusion-order.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,OAAO,EAGP,WAAW,EACX,UAAU,EAEV,WAAW,
|
|
1
|
+
{"version":3,"file":"fusion-order.js","sourceRoot":"","sources":["../../../src/fusion-order/fusion-order.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,4 +3,6 @@ export * from './auction-details';
|
|
|
3
3
|
export * from './settlement-post-interaction-data';
|
|
4
4
|
export * from './fusion-extension';
|
|
5
5
|
export { CHAIN_TO_WRAPPER } from './constants';
|
|
6
|
+
export * from './cancellation-auction';
|
|
7
|
+
export * from './types';
|
|
6
8
|
//# 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,oCAAoC,CAAA;AAClD,cAAc,oBAAoB,CAAA;AAClC,OAAO,EAAC,gBAAgB,EAAC,MAAM,aAAa,CAAA;AAC5C,cAAc,wBAAwB,CAAA;AACtC,cAAc,SAAS,CAAA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/fusion-order/types.ts"],"names":[],"mappings":""}
|
package/dist/esm/index.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export { Address, Extension, randBigInt, getLimitOrderContract, Interaction, TakerTraits, ExtensionBuilder, AmountMode, getLimitOrderV4Domain, LimitOrderContract, MakerTraits } from '@1inch/limit-order-sdk';
|
|
1
|
+
export { Address, Extension, randBigInt, getLimitOrderContract, Interaction, TakerTraits, ExtensionBuilder, AmountMode, getLimitOrderV4Domain, LimitOrderContract, MakerTraits, ProxyFactory, NativeOrdersFactory, NativeOrdersImpl } from '@1inch/limit-order-sdk';
|
|
2
2
|
export * from './fusion-order/index';
|
|
3
3
|
export * from './auction-calculator/index';
|
|
4
4
|
export * from './connector/index';
|
package/dist/esm/index.js.map
CHANGED
|
@@ -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,
|
|
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,EACX,YAAY,EACZ,mBAAmB,EACnB,gBAAgB,EACnB,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"}
|
package/dist/esm/sdk/sdk.js
CHANGED
|
@@ -73,29 +73,17 @@ export class FusionSDK {
|
|
|
73
73
|
network: this.config.network
|
|
74
74
|
});
|
|
75
75
|
const hash = order.getOrderHash(this.config.network);
|
|
76
|
-
return { order, hash, quoteId: quote.quoteId };
|
|
77
|
-
}
|
|
78
|
-
async submitOrder(order, quoteId) {
|
|
79
|
-
if (!this.config.blockchainProvider) {
|
|
80
|
-
throw new Error('blockchainProvider has not set to config');
|
|
81
|
-
}
|
|
82
|
-
const orderStruct = order.build();
|
|
83
|
-
const signature = await this.config.blockchainProvider.signTypedData(orderStruct.maker, order.getTypedData(this.config.network));
|
|
84
|
-
const relayerRequest = RelayerRequest.new({
|
|
85
|
-
order: orderStruct,
|
|
86
|
-
signature,
|
|
87
|
-
quoteId,
|
|
88
|
-
extension: order.extension.encode()
|
|
89
|
-
});
|
|
90
|
-
await this.api.submitOrder(relayerRequest);
|
|
91
76
|
return {
|
|
92
|
-
order
|
|
93
|
-
|
|
94
|
-
quoteId,
|
|
95
|
-
|
|
96
|
-
extension: relayerRequest.extension
|
|
77
|
+
order,
|
|
78
|
+
hash,
|
|
79
|
+
quoteId: quote.quoteId,
|
|
80
|
+
nativeOrderFactory: quote.nativeOrderFactory?.factory
|
|
97
81
|
};
|
|
98
82
|
}
|
|
83
|
+
async submitOrder(order, quoteId) {
|
|
84
|
+
const signature = await this.signOrder(order);
|
|
85
|
+
return this._submitOrder(order, quoteId, signature);
|
|
86
|
+
}
|
|
99
87
|
async placeOrder(params) {
|
|
100
88
|
const { order, quoteId } = await this.createOrder(params);
|
|
101
89
|
return this.submitOrder(order, quoteId);
|
|
@@ -117,6 +105,26 @@ export class FusionSDK {
|
|
|
117
105
|
const data = order.getTypedData(this.config.network);
|
|
118
106
|
return this.config.blockchainProvider.signTypedData(orderStruct.maker, data);
|
|
119
107
|
}
|
|
108
|
+
signNativeOrder(order, maker) {
|
|
109
|
+
return order.nativeSignature(maker);
|
|
110
|
+
}
|
|
111
|
+
async _submitOrder(order, quoteId, signature) {
|
|
112
|
+
const orderStruct = order.build();
|
|
113
|
+
const relayerRequest = RelayerRequest.new({
|
|
114
|
+
order: orderStruct,
|
|
115
|
+
signature,
|
|
116
|
+
quoteId,
|
|
117
|
+
extension: order.extension.encode()
|
|
118
|
+
});
|
|
119
|
+
await this.api.submitOrder(relayerRequest);
|
|
120
|
+
return {
|
|
121
|
+
order: orderStruct,
|
|
122
|
+
signature,
|
|
123
|
+
quoteId,
|
|
124
|
+
orderHash: order.getOrderHash(this.config.network),
|
|
125
|
+
extension: relayerRequest.extension
|
|
126
|
+
};
|
|
127
|
+
}
|
|
120
128
|
async getQuoteResult(params) {
|
|
121
129
|
const quoterRequest = QuoterRequest.new({
|
|
122
130
|
fromTokenAddress: params.fromTokenAddress,
|
package/dist/esm/sdk/sdk.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sdk.js","sourceRoot":"","sources":["../../../src/sdk/sdk.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"sdk.js","sourceRoot":"","sources":["../../../src/sdk/sdk.ts"],"names":[],"mappings":"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"}
|