@1inch/fusion-sdk 2.4.1 → 2.4.2-rc.0

package/README.md

@@ -163,7 +163,7 @@ async function main() {
     console.log('OrderHash', info.orderHash)
 
     const factory = NativeOrdersFactory.default(NetworkEnum.BINANCE)
-    const call = factory.create(new Address(wallet.address), preparedOrder.order)
+    const call = factory.create(new Address(wallet.address), preparedOrder.order.build())
 
     const txRes = await wallet.sendTransaction({
         to: call.to.toString(),

package/dist/cjs/fusion-order/fusion-extension.js

@@ -72,16 +72,31 @@ var FusionExtension = /*#__PURE__*/ function() {
         {
             key: "build",
             value: function build() {
-                var _this_extra;
+                var _this_extra, _this_extra1, _this_extra2;
                 var amountData = this.buildAmountGetterData(true);
-                var builder = new _limitordersdk.ExtensionBuilder().withMakingAmountData(this.address, amountData).withTakingAmountData(this.address, amountData).withPostInteraction(new _limitordersdk.Interaction(this.address, this.buildInteractionData()));
-                if ((_this_extra = this.extra) === null || _this_extra === void 0 ? void 0 : _this_extra.makerPermit) {
-                    var _this_extra1, _this_extra2;
-                    builder.withMakerPermit((_this_extra1 = this.extra) === null || _this_extra1 === void 0 ? void 0 : _this_extra1.makerPermit.target, (_this_extra2 = this.extra) === null || _this_extra2 === void 0 ? void 0 : _this_extra2.makerPermit.data);
+                var builder = new _limitordersdk.ExtensionBuilder().withMakingAmountData(this.address, amountData).withTakingAmountData(this.address, amountData).withPostInteraction(new _limitordersdk.Interaction(this.address, this.buildInteractionData((_this_extra = this.extra) === null || _this_extra === void 0 ? void 0 : _this_extra.postInteraction)));
+                if ((_this_extra1 = this.extra) === null || _this_extra1 === void 0 ? void 0 : _this_extra1.preInteraction) {
+                    builder.withPreInteraction(this.extra.preInteraction);
+                }
+                if ((_this_extra2 = this.extra) === null || _this_extra2 === void 0 ? void 0 : _this_extra2.makerPermit) {
+                    var _this_extra3, _this_extra4;
+                    builder.withMakerPermit((_this_extra3 = this.extra) === null || _this_extra3 === void 0 ? void 0 : _this_extra3.makerPermit.target, (_this_extra4 = this.extra) === null || _this_extra4 === void 0 ? void 0 : _this_extra4.makerPermit.data);
                 }
                 return builder.build();
             }
         },
+        {
+            key: "getTakingAmountWithFee",
+            value: /**
+     * Returns takingAmount with fee, but without auction bump
+     * @param taker
+     * @param orderTakingAmount
+     * @private
+     */ function getTakingAmountWithFee(taker, orderTakingAmount) {
+                var fees = this.getFeesForTaker(taker);
+                return (0, _limitordersdk.mulDiv)(orderTakingAmount, _index1.Fees.BASE_1E5 + fees.resolverFee + fees.integratorFee, _index1.Fees.BASE_1E5, _limitordersdk.Rounding.Ceil);
+            }
+        },
         {
             key: "buildInteractionData",
             value: /**
@@ -98,7 +113,7 @@ var FusionExtension = /*#__PURE__*/ function() {
      *  `1 byte` - protocol surplus fee (in 1e2)
      * @see buildAmountGetterData
      * @see https://github.com/1inch/limit-order-protocol/blob/22a18f7f20acfec69d4f50ce1880e8e662477710/contracts/extensions/FeeTaker.sol#L114
-     */ function buildInteractionData() {
+     */ function buildInteractionData(customPostInteraction) {
                 var _this_extra, _this_extra_fees, _this_extra1, _this_extra_fees1, _this_extra2;
                 var customReceiver = ((_this_extra = this.extra) === null || _this_extra === void 0 ? void 0 : _this_extra.customReceiver) || _limitordersdk.Address.ZERO_ADDRESS;
                 var flags = new _byteutils.BN(0n).setBit(FusionExtension.CUSTOM_RECEIVER_FLAG_BIT, Boolean(!customReceiver.isZero()));
@@ -112,6 +127,9 @@ var FusionExtension = /*#__PURE__*/ function() {
                 // surplus params
                 builder.addUint256(this.surplus.estimatedTakerAmount);
                 builder.addUint8(BigInt(this.surplus.protocolFee.toPercent()));
+                if (customPostInteraction) {
+                    builder.addBytes(customPostInteraction.encode());
+                }
                 return builder.asHex();
             }
         },
@@ -169,18 +187,6 @@ var FusionExtension = /*#__PURE__*/ function() {
                     integratorFee: integratorFeeBN
                 };
             }
-        },
-        {
-            key: "getTakingAmountWithFee",
-            value: /**
-     * Returns takingAmount with fee, but without auction bump
-     * @param taker
-     * @param orderTakingAmount
-     * @private
-     */ function getTakingAmountWithFee(taker, orderTakingAmount) {
-                var fees = this.getFeesForTaker(taker);
-                return (0, _limitordersdk.mulDiv)(orderTakingAmount, _index1.Fees.BASE_1E5 + fees.resolverFee + fees.integratorFee, _index1.Fees.BASE_1E5, _limitordersdk.Rounding.Ceil);
-            }
         }
     ], [
         {
@@ -237,18 +243,23 @@ var FusionExtension = /*#__PURE__*/ function() {
                     return whitelistAddressesFromAmount[i] === addressHalf;
                 }), 'whitelist addresses must be same in interaction data and in amount data');
                 var hasFees = !integratorFeeRecipient.isZero() || !protocolFeeRecipient.isZero();
+                var preInteraction = extension.preInteraction == _limitordersdk.ZX ? undefined : _limitordersdk.Interaction.decode(extension.preInteraction);
+                var postInteraction = interactionBytes.isEmpty() ? undefined : _limitordersdk.Interaction.decode(interactionBytes.rest());
                 if (!hasFees) {
                     return new FusionExtension(settlementContract, auctionDetails, whitelist, surplusParams, {
                         makerPermit: makerPermit,
                         customReceiver: customReceiver,
-                        fees: undefined
+                        fees: undefined,
+                        preInteraction: preInteraction,
+                        postInteraction: postInteraction
                     });
                 }
                 var fees = new _index1.Fees(new _index1.ResolverFee(protocolFeeRecipient, interactionData.fees.resolverFee, interactionData.fees.whitelistDiscount), interactionData.fees.integratorFee.isZero() ? _index1.IntegratorFee.ZERO : new _index1.IntegratorFee(integratorFeeRecipient, protocolFeeRecipient, interactionData.fees.integratorFee, interactionData.fees.integratorShare));
                 return new FusionExtension(settlementContract, auctionDetails, whitelist, surplusParams, {
                     makerPermit: makerPermit,
                     fees: fees,
-                    customReceiver: customReceiver
+                    customReceiver: customReceiver,
+                    preInteraction: preInteraction
                 });
             }
         }

package/dist/cjs/fusion-order/fusion-extension.spec.js

@@ -75,4 +75,40 @@ describe('FusionExtension', function() {
         var fusionExtension = _fusionextension.FusionExtension.decode(order.extension.encode());
         expect(fusionExtension).toStrictEqual(order.fusionExtension);
     });
+    it('should decode with pre/post interaction hooks', function() {
+        var extensionContract = new _limitordersdk.Address('0x8273f37417da37c4a6c3995e82cf442f87a25d9c');
+        var order = _fusionorder.FusionOrder.new(extensionContract, {
+            makerAsset: new _limitordersdk.Address('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'),
+            takerAsset: new _limitordersdk.Address('0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48'),
+            makingAmount: 1000000000000000000n,
+            takingAmount: 1420000000n,
+            maker: new _limitordersdk.Address('0x00000000219ab540356cbb839cbe05303d7705fa'),
+            salt: 10n
+        }, {
+            auction: new _index.AuctionDetails({
+                duration: 180n,
+                startTime: 1673548149n,
+                initialRateBump: 50000,
+                points: [
+                    {
+                        coefficient: 20000,
+                        delay: 12
+                    }
+                ]
+            }),
+            whitelist: _index1.Whitelist.new(1673548139n, [
+                {
+                    address: new _limitordersdk.Address('0x00000000219ab540356cbb839cbe05303d7705fa'),
+                    allowFrom: 0n
+                }
+            ]),
+            surplus: _surplusparams.SurplusParams.NO_FEE
+        }, {
+            permit: '0xdeadbeef',
+            preInteraction: new _limitordersdk.Interaction(_limitordersdk.Address.fromBigInt(1n), '0xbeef'),
+            postInteraction: new _limitordersdk.Interaction(_limitordersdk.Address.fromBigInt(2n), '0xdead')
+        });
+        var fusionExtension = _fusionextension.FusionExtension.decode(order.extension.encode());
+        expect(fusionExtension).toStrictEqual(order.fusionExtension);
+    });
 });

package/dist/cjs/fusion-order/fusion-order.js

@@ -103,7 +103,9 @@ var FusionOrder = /*#__PURE__*/ function() {
         var surplusParams = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : _surplusparams.SurplusParams.NO_FEE, extra = arguments.length > 5 && arguments[5] !== void 0 ? arguments[5] : FusionOrder.defaultExtra, extension = arguments.length > 6 && arguments[6] !== void 0 ? arguments[6] : new _fusionextension.FusionExtension(settlementExtensionContract, auctionDetails, whitelist, surplusParams, {
             makerPermit: extra.permit ? new _limitordersdk.Interaction(orderInfo.makerAsset, extra.permit) : undefined,
             customReceiver: orderInfo.receiver,
-            fees: extra === null || extra === void 0 ? void 0 : extra.fees
+            fees: extra === null || extra === void 0 ? void 0 : extra.fees,
+            preInteraction: extra.preInteraction,
+            postInteraction: extra.postInteraction
         });
         _class_call_check(this, FusionOrder);
         _define_property(this, "settlementExtensionContract", void 0);

package/dist/esm/fusion-order/fusion-extension.js

@@ -30,7 +30,7 @@ function _define_property(obj, key, value) {
     }
     return obj;
 }
-import { Address, Extension, ExtensionBuilder, Interaction, Bps, mulDiv, Rounding } from '@1inch/limit-order-sdk';
+import { Address, Extension, ExtensionBuilder, Interaction, Bps, mulDiv, Rounding, ZX } from '@1inch/limit-order-sdk';
 import { BN, BytesBuilder, BytesIter } from '@1inch/byte-utils';
 import assert from 'assert';
 import { AuctionDetails } from './auction-details/index.js';
@@ -57,16 +57,31 @@ export var FusionExtension = /*#__PURE__*/ function() {
         {
             key: "build",
             value: function build() {
-                var _this_extra;
+                var _this_extra, _this_extra1, _this_extra2;
                 var amountData = this.buildAmountGetterData(true);
-                var builder = new ExtensionBuilder().withMakingAmountData(this.address, amountData).withTakingAmountData(this.address, amountData).withPostInteraction(new Interaction(this.address, this.buildInteractionData()));
-                if ((_this_extra = this.extra) === null || _this_extra === void 0 ? void 0 : _this_extra.makerPermit) {
-                    var _this_extra1, _this_extra2;
-                    builder.withMakerPermit((_this_extra1 = this.extra) === null || _this_extra1 === void 0 ? void 0 : _this_extra1.makerPermit.target, (_this_extra2 = this.extra) === null || _this_extra2 === void 0 ? void 0 : _this_extra2.makerPermit.data);
+                var builder = new ExtensionBuilder().withMakingAmountData(this.address, amountData).withTakingAmountData(this.address, amountData).withPostInteraction(new Interaction(this.address, this.buildInteractionData((_this_extra = this.extra) === null || _this_extra === void 0 ? void 0 : _this_extra.postInteraction)));
+                if ((_this_extra1 = this.extra) === null || _this_extra1 === void 0 ? void 0 : _this_extra1.preInteraction) {
+                    builder.withPreInteraction(this.extra.preInteraction);
+                }
+                if ((_this_extra2 = this.extra) === null || _this_extra2 === void 0 ? void 0 : _this_extra2.makerPermit) {
+                    var _this_extra3, _this_extra4;
+                    builder.withMakerPermit((_this_extra3 = this.extra) === null || _this_extra3 === void 0 ? void 0 : _this_extra3.makerPermit.target, (_this_extra4 = this.extra) === null || _this_extra4 === void 0 ? void 0 : _this_extra4.makerPermit.data);
                 }
                 return builder.build();
             }
         },
+        {
+            key: "getTakingAmountWithFee",
+            value: /**
+     * Returns takingAmount with fee, but without auction bump
+     * @param taker
+     * @param orderTakingAmount
+     * @private
+     */ function getTakingAmountWithFee(taker, orderTakingAmount) {
+                var fees = this.getFeesForTaker(taker);
+                return mulDiv(orderTakingAmount, Fees.BASE_1E5 + fees.resolverFee + fees.integratorFee, Fees.BASE_1E5, Rounding.Ceil);
+            }
+        },
         {
             key: "buildInteractionData",
             value: /**
@@ -83,7 +98,7 @@ export var FusionExtension = /*#__PURE__*/ function() {
      *  `1 byte` - protocol surplus fee (in 1e2)
      * @see buildAmountGetterData
      * @see https://github.com/1inch/limit-order-protocol/blob/22a18f7f20acfec69d4f50ce1880e8e662477710/contracts/extensions/FeeTaker.sol#L114
-     */ function buildInteractionData() {
+     */ function buildInteractionData(customPostInteraction) {
                 var _this_extra, _this_extra_fees, _this_extra1, _this_extra_fees1, _this_extra2;
                 var customReceiver = ((_this_extra = this.extra) === null || _this_extra === void 0 ? void 0 : _this_extra.customReceiver) || Address.ZERO_ADDRESS;
                 var flags = new BN(0n).setBit(FusionExtension.CUSTOM_RECEIVER_FLAG_BIT, Boolean(!customReceiver.isZero()));
@@ -97,6 +112,9 @@ export var FusionExtension = /*#__PURE__*/ function() {
                 // surplus params
                 builder.addUint256(this.surplus.estimatedTakerAmount);
                 builder.addUint8(BigInt(this.surplus.protocolFee.toPercent()));
+                if (customPostInteraction) {
+                    builder.addBytes(customPostInteraction.encode());
+                }
                 return builder.asHex();
             }
         },
@@ -154,18 +172,6 @@ export var FusionExtension = /*#__PURE__*/ function() {
                     integratorFee: integratorFeeBN
                 };
             }
-        },
-        {
-            key: "getTakingAmountWithFee",
-            value: /**
-     * Returns takingAmount with fee, but without auction bump
-     * @param taker
-     * @param orderTakingAmount
-     * @private
-     */ function getTakingAmountWithFee(taker, orderTakingAmount) {
-                var fees = this.getFeesForTaker(taker);
-                return mulDiv(orderTakingAmount, Fees.BASE_1E5 + fees.resolverFee + fees.integratorFee, Fees.BASE_1E5, Rounding.Ceil);
-            }
         }
     ], [
         {
@@ -222,18 +228,23 @@ export var FusionExtension = /*#__PURE__*/ function() {
                     return whitelistAddressesFromAmount[i] === addressHalf;
                 }), 'whitelist addresses must be same in interaction data and in amount data');
                 var hasFees = !integratorFeeRecipient.isZero() || !protocolFeeRecipient.isZero();
+                var preInteraction = extension.preInteraction == ZX ? undefined : Interaction.decode(extension.preInteraction);
+                var postInteraction = interactionBytes.isEmpty() ? undefined : Interaction.decode(interactionBytes.rest());
                 if (!hasFees) {
                     return new FusionExtension(settlementContract, auctionDetails, whitelist, surplusParams, {
                         makerPermit: makerPermit,
                         customReceiver: customReceiver,
-                        fees: undefined
+                        fees: undefined,
+                        preInteraction: preInteraction,
+                        postInteraction: postInteraction
                     });
                 }
                 var fees = new Fees(new ResolverFee(protocolFeeRecipient, interactionData.fees.resolverFee, interactionData.fees.whitelistDiscount), interactionData.fees.integratorFee.isZero() ? IntegratorFee.ZERO : new IntegratorFee(integratorFeeRecipient, protocolFeeRecipient, interactionData.fees.integratorFee, interactionData.fees.integratorShare));
                 return new FusionExtension(settlementContract, auctionDetails, whitelist, surplusParams, {
                     makerPermit: makerPermit,
                     fees: fees,
-                    customReceiver: customReceiver
+                    customReceiver: customReceiver,
+                    preInteraction: preInteraction
                 });
             }
         }

package/dist/esm/fusion-order/fusion-extension.spec.js

@@ -1,4 +1,4 @@
-import { Address } from '@1inch/limit-order-sdk';
+import { Address, Interaction } from '@1inch/limit-order-sdk';
 import { FusionOrder } from './fusion-order.js';
 import { AuctionDetails } from './auction-details/index.js';
 import { FusionExtension } from './fusion-extension.js';
@@ -71,4 +71,40 @@ describe('FusionExtension', function() {
         var fusionExtension = FusionExtension.decode(order.extension.encode());
         expect(fusionExtension).toStrictEqual(order.fusionExtension);
     });
+    it('should decode with pre/post interaction hooks', function() {
+        var extensionContract = new Address('0x8273f37417da37c4a6c3995e82cf442f87a25d9c');
+        var order = FusionOrder.new(extensionContract, {
+            makerAsset: new Address('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'),
+            takerAsset: new Address('0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48'),
+            makingAmount: 1000000000000000000n,
+            takingAmount: 1420000000n,
+            maker: new Address('0x00000000219ab540356cbb839cbe05303d7705fa'),
+            salt: 10n
+        }, {
+            auction: new AuctionDetails({
+                duration: 180n,
+                startTime: 1673548149n,
+                initialRateBump: 50000,
+                points: [
+                    {
+                        coefficient: 20000,
+                        delay: 12
+                    }
+                ]
+            }),
+            whitelist: Whitelist.new(1673548139n, [
+                {
+                    address: new Address('0x00000000219ab540356cbb839cbe05303d7705fa'),
+                    allowFrom: 0n
+                }
+            ]),
+            surplus: SurplusParams.NO_FEE
+        }, {
+            permit: '0xdeadbeef',
+            preInteraction: new Interaction(Address.fromBigInt(1n), '0xbeef'),
+            postInteraction: new Interaction(Address.fromBigInt(2n), '0xdead')
+        });
+        var fusionExtension = FusionExtension.decode(order.extension.encode());
+        expect(fusionExtension).toStrictEqual(order.fusionExtension);
+    });
 });

package/dist/esm/fusion-order/fusion-order.js

@@ -88,7 +88,9 @@ export var FusionOrder = /*#__PURE__*/ function() {
         var surplusParams = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : SurplusParams.NO_FEE, extra = arguments.length > 5 && arguments[5] !== void 0 ? arguments[5] : FusionOrder.defaultExtra, extension = arguments.length > 6 && arguments[6] !== void 0 ? arguments[6] : new FusionExtension(settlementExtensionContract, auctionDetails, whitelist, surplusParams, {
             makerPermit: extra.permit ? new Interaction(orderInfo.makerAsset, extra.permit) : undefined,
             customReceiver: orderInfo.receiver,
-            fees: extra === null || extra === void 0 ? void 0 : extra.fees
+            fees: extra === null || extra === void 0 ? void 0 : extra.fees,
+            preInteraction: extra.preInteraction,
+            postInteraction: extra.postInteraction
         });
         _class_call_check(this, FusionOrder);
         _define_property(this, "settlementExtensionContract", void 0);

package/dist/esm/fusion-order/types.js

@@ -12,4 +12,10 @@
      * When enabled, orders where maker == receiver will have ZERO_ADDRESS set
      * Used to save calldata costs
      * By default: enabled
+     */ /**
+     * Allows maker to execute custom code before order executed
+     * @see https://github.com/1inch/limit-order-protocol/blob/master/docs/interfaces/IPreInteraction.md
+     */ /**
+     * Allows maker to execute custom code after order executed
+     * @see https://github.com/1inch/limit-order-protocol/blob/master/docs/interfaces/IPostInteraction.md
      */ export { };

package/dist/esm/package.json

@@ -1 +1 @@
-{"name":"@1inch/fusion-sdk","version":"2.4.1","type":"module"}
+{"name":"@1inch/fusion-sdk","version":"2.4.2-rc.0","type":"module"}

package/dist/types/src/fusion-order/fusion-extension.d.ts

@@ -12,18 +12,22 @@ export declare class FusionExtension {
         makerPermit?: Interaction;
         customReceiver?: Address;
         fees?: Fees;
+        preInteraction?: Interaction;
+        postInteraction?: Interaction;
     } | undefined;
     private static CUSTOM_RECEIVER_FLAG_BIT;
     constructor(address: Address, auctionDetails: AuctionDetails, whitelist: Whitelist, surplus: SurplusParams, extra?: {
         makerPermit?: Interaction;
         customReceiver?: Address;
         fees?: Fees;
+        preInteraction?: Interaction;
+        postInteraction?: Interaction;
     } | undefined);
     static decode(bytes: string): FusionExtension;
     static fromExtension(extension: Extension): FusionExtension;
     build(): Extension;
+    getTakingAmountWithFee(taker: Address, orderTakingAmount: bigint): bigint;
     private buildInteractionData;
     private buildAmountGetterData;
     private getFeesForTaker;
-    private getTakingAmountWithFee;
 }

package/dist/types/src/fusion-order/types.d.ts

@@ -1,3 +1,4 @@
+import { Interaction } from '@1inch/limit-order-sdk';
 import { AuctionDetails } from './auction-details/auction-details.js';
 import { Fees } from './fees/index.js';
 import { SurplusParams } from './surplus-params.js';
@@ -13,6 +14,8 @@ export type Extra = {
     source?: string;
     fees?: Fees;
     optimizeReceiverAddress?: boolean;
+    preInteraction?: Interaction;
+    postInteraction?: Interaction;
 };
 export type Details = {
     auction: AuctionDetails;