@1inch/fusion-sdk 2.3.9-rc.7 → 2.3.9-rc.9
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/abi/NativeOrderImpl.abi.json +5 -0
- package/dist/cjs/contracts/native-order-impl.js +3 -2
- package/dist/cjs/fusion-order/fusion-order.js +14 -5
- package/dist/esm/abi/NativeOrderImpl.abi.json +5 -0
- package/dist/esm/contracts/native-order-impl.js +3 -2
- package/dist/esm/fusion-order/fusion-order.js +14 -5
- package/dist/esm/fusion-order/types.js +4 -0
- package/dist/esm/package.json +1 -1
- package/dist/types/src/contracts/native-order-impl.d.ts +1 -1
- package/dist/types/src/fusion-order/types.d.ts +1 -0
- package/dist/types/tsconfig.types.tsbuildinfo +1 -1
- package/package.json +2 -2
|
@@ -112,14 +112,15 @@ var NativeOrdersImpl = /*#__PURE__*/ function() {
|
|
|
112
112
|
},
|
|
113
113
|
{
|
|
114
114
|
key: "cancelExpiredOrderByResolver",
|
|
115
|
-
value: function cancelExpiredOrderByResolver(maker, order) {
|
|
115
|
+
value: function cancelExpiredOrderByResolver(maker, order, rewardLimit) {
|
|
116
116
|
return {
|
|
117
117
|
to: this.address,
|
|
118
118
|
value: 0n,
|
|
119
119
|
data: this.iface.encodeFunctionData('cancelExpiredOrderByResolver', [
|
|
120
120
|
_object_spread_props(_object_spread({}, order), {
|
|
121
121
|
maker: maker.toString()
|
|
122
|
-
})
|
|
122
|
+
}),
|
|
123
|
+
rewardLimit
|
|
123
124
|
])
|
|
124
125
|
};
|
|
125
126
|
}
|
|
@@ -144,10 +144,13 @@ var FusionOrder = /*#__PURE__*/ function() {
|
|
|
144
144
|
if (orderInfo.makerAsset.isNative()) {
|
|
145
145
|
throw new Error('use FusionOrder.fromNative to create order from native asset');
|
|
146
146
|
}
|
|
147
|
+
var optimizeReceiverAddress = extra.optimizeReceiverAddress !== undefined ? extra.optimizeReceiverAddress : FusionOrder.defaultExtra.optimizeReceiverAddress;
|
|
147
148
|
this.inner = new _limitordersdk.LimitOrder(_object_spread_props(_object_spread({}, orderInfo), {
|
|
148
149
|
receiver: receiver,
|
|
149
150
|
salt: saltWithInjectedTrackCode
|
|
150
|
-
}), makerTraits, builtExtension
|
|
151
|
+
}), makerTraits, builtExtension, {
|
|
152
|
+
optimizeReceiverAddress: optimizeReceiverAddress
|
|
153
|
+
});
|
|
151
154
|
this.fusionExtension = extension;
|
|
152
155
|
}
|
|
153
156
|
_create_class(FusionOrder, [
|
|
@@ -469,7 +472,9 @@ var FusionOrder = /*#__PURE__*/ function() {
|
|
|
469
472
|
takerAsset: this.takerAsset,
|
|
470
473
|
receiver: this.receiver,
|
|
471
474
|
salt: this.salt
|
|
472
|
-
}, this.inner.makerTraits
|
|
475
|
+
}, this.inner.makerTraits, undefined, {
|
|
476
|
+
optimizeReceiverAddress: false
|
|
477
|
+
}).toCalldata();
|
|
473
478
|
}
|
|
474
479
|
}
|
|
475
480
|
], [
|
|
@@ -512,7 +517,9 @@ var FusionOrder = /*#__PURE__*/ function() {
|
|
|
512
517
|
receiver: orderInfo.receiver && !orderInfo.receiver.isZero() ? orderInfo.receiver : orderInfo.maker
|
|
513
518
|
});
|
|
514
519
|
// create temp order to calc order hash
|
|
515
|
-
var _order = FusionOrder.new(settlementExtension, _orderInfo, details, extra)
|
|
520
|
+
var _order = FusionOrder.new(settlementExtension, _orderInfo, details, _object_spread_props(_object_spread({}, extra), {
|
|
521
|
+
optimizeReceiverAddress: false
|
|
522
|
+
}));
|
|
516
523
|
var finalOrderInfo = _object_spread_props(_object_spread({}, _orderInfo), {
|
|
517
524
|
maker: ethOrdersFactory.getProxyAddress(_order.getOrderHash(chainId))
|
|
518
525
|
});
|
|
@@ -554,7 +561,8 @@ var FusionOrder = /*#__PURE__*/ function() {
|
|
|
554
561
|
permit: extension.makerPermit === _constants1.ZX ? undefined : _limitordersdk.Interaction.decode(extension.makerPermit).data,
|
|
555
562
|
unwrapWETH: makerTraits.isNativeUnwrapEnabled(),
|
|
556
563
|
orderExpirationDelay: orderExpirationDelay,
|
|
557
|
-
fees: extra === null || extra === void 0 ? void 0 : extra.fees
|
|
564
|
+
fees: extra === null || extra === void 0 ? void 0 : extra.fees,
|
|
565
|
+
optimizeReceiverAddress: true
|
|
558
566
|
});
|
|
559
567
|
(0, _assert.default)(providedSalt === fusionOrder.salt, 'invalid salt for passed extension');
|
|
560
568
|
return fusionOrder;
|
|
@@ -568,5 +576,6 @@ _define_property(FusionOrder, "defaultExtra", {
|
|
|
568
576
|
allowMultipleFills: true,
|
|
569
577
|
unwrapWETH: false,
|
|
570
578
|
enablePermit2: false,
|
|
571
|
-
orderExpirationDelay: 12n
|
|
579
|
+
orderExpirationDelay: 12n,
|
|
580
|
+
optimizeReceiverAddress: true
|
|
572
581
|
});
|
|
@@ -97,14 +97,15 @@ export var NativeOrdersImpl = /*#__PURE__*/ function() {
|
|
|
97
97
|
},
|
|
98
98
|
{
|
|
99
99
|
key: "cancelExpiredOrderByResolver",
|
|
100
|
-
value: function cancelExpiredOrderByResolver(maker, order) {
|
|
100
|
+
value: function cancelExpiredOrderByResolver(maker, order, rewardLimit) {
|
|
101
101
|
return {
|
|
102
102
|
to: this.address,
|
|
103
103
|
value: 0n,
|
|
104
104
|
data: this.iface.encodeFunctionData('cancelExpiredOrderByResolver', [
|
|
105
105
|
_object_spread_props(_object_spread({}, order), {
|
|
106
106
|
maker: maker.toString()
|
|
107
|
-
})
|
|
107
|
+
}),
|
|
108
|
+
rewardLimit
|
|
108
109
|
])
|
|
109
110
|
};
|
|
110
111
|
}
|
|
@@ -129,10 +129,13 @@ export var FusionOrder = /*#__PURE__*/ function() {
|
|
|
129
129
|
if (orderInfo.makerAsset.isNative()) {
|
|
130
130
|
throw new Error('use FusionOrder.fromNative to create order from native asset');
|
|
131
131
|
}
|
|
132
|
+
var optimizeReceiverAddress = extra.optimizeReceiverAddress !== undefined ? extra.optimizeReceiverAddress : FusionOrder.defaultExtra.optimizeReceiverAddress;
|
|
132
133
|
this.inner = new LimitOrder(_object_spread_props(_object_spread({}, orderInfo), {
|
|
133
134
|
receiver: receiver,
|
|
134
135
|
salt: saltWithInjectedTrackCode
|
|
135
|
-
}), makerTraits, builtExtension
|
|
136
|
+
}), makerTraits, builtExtension, {
|
|
137
|
+
optimizeReceiverAddress: optimizeReceiverAddress
|
|
138
|
+
});
|
|
136
139
|
this.fusionExtension = extension;
|
|
137
140
|
}
|
|
138
141
|
_create_class(FusionOrder, [
|
|
@@ -454,7 +457,9 @@ export var FusionOrder = /*#__PURE__*/ function() {
|
|
|
454
457
|
takerAsset: this.takerAsset,
|
|
455
458
|
receiver: this.receiver,
|
|
456
459
|
salt: this.salt
|
|
457
|
-
}, this.inner.makerTraits
|
|
460
|
+
}, this.inner.makerTraits, undefined, {
|
|
461
|
+
optimizeReceiverAddress: false
|
|
462
|
+
}).toCalldata();
|
|
458
463
|
}
|
|
459
464
|
}
|
|
460
465
|
], [
|
|
@@ -497,7 +502,9 @@ export var FusionOrder = /*#__PURE__*/ function() {
|
|
|
497
502
|
receiver: orderInfo.receiver && !orderInfo.receiver.isZero() ? orderInfo.receiver : orderInfo.maker
|
|
498
503
|
});
|
|
499
504
|
// create temp order to calc order hash
|
|
500
|
-
var _order = FusionOrder.new(settlementExtension, _orderInfo, details, extra)
|
|
505
|
+
var _order = FusionOrder.new(settlementExtension, _orderInfo, details, _object_spread_props(_object_spread({}, extra), {
|
|
506
|
+
optimizeReceiverAddress: false
|
|
507
|
+
}));
|
|
501
508
|
var finalOrderInfo = _object_spread_props(_object_spread({}, _orderInfo), {
|
|
502
509
|
maker: ethOrdersFactory.getProxyAddress(_order.getOrderHash(chainId))
|
|
503
510
|
});
|
|
@@ -539,7 +546,8 @@ export var FusionOrder = /*#__PURE__*/ function() {
|
|
|
539
546
|
permit: extension.makerPermit === ZX ? undefined : Interaction.decode(extension.makerPermit).data,
|
|
540
547
|
unwrapWETH: makerTraits.isNativeUnwrapEnabled(),
|
|
541
548
|
orderExpirationDelay: orderExpirationDelay,
|
|
542
|
-
fees: extra === null || extra === void 0 ? void 0 : extra.fees
|
|
549
|
+
fees: extra === null || extra === void 0 ? void 0 : extra.fees,
|
|
550
|
+
optimizeReceiverAddress: true
|
|
543
551
|
});
|
|
544
552
|
assert(providedSalt === fusionOrder.salt, 'invalid salt for passed extension');
|
|
545
553
|
return fusionOrder;
|
|
@@ -553,5 +561,6 @@ _define_property(FusionOrder, "defaultExtra", {
|
|
|
553
561
|
allowMultipleFills: true,
|
|
554
562
|
unwrapWETH: false,
|
|
555
563
|
enablePermit2: false,
|
|
556
|
-
orderExpirationDelay: 12n
|
|
564
|
+
orderExpirationDelay: 12n,
|
|
565
|
+
optimizeReceiverAddress: true
|
|
557
566
|
});
|
package/dist/esm/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"name":"@1inch/fusion-sdk","version":"2.3.9-rc.
|
|
1
|
+
{"name":"@1inch/fusion-sdk","version":"2.3.9-rc.9","type":"module"}
|
|
@@ -5,5 +5,5 @@ export declare class NativeOrdersImpl {
|
|
|
5
5
|
private readonly iface;
|
|
6
6
|
constructor(address: Address);
|
|
7
7
|
cancel(maker: Address, order: LimitOrderV4Struct): CallInfo;
|
|
8
|
-
cancelExpiredOrderByResolver(maker: Address, order: LimitOrderV4Struct): CallInfo;
|
|
8
|
+
cancelExpiredOrderByResolver(maker: Address, order: LimitOrderV4Struct, rewardLimit: bigint): CallInfo;
|
|
9
9
|
}
|