@1inch/fusion-sdk 2.4.7 → 2.4.8-rc.0

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

@@ -16,6 +16,7 @@ var _whitelist = require("./whitelist/whitelist.js");
 var _surplusparams = require("./surplus-params.js");
 var _index1 = require("./fees/index.js");
 var _utils = require("../utils.js");
+var _constants = require("../constants.js");
 function _class_call_check(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
@@ -72,12 +73,15 @@ var FusionExtension = /*#__PURE__*/ function() {
         {
             key: "build",
             value: function build() {
-                var _this_extra;
+                var _this_extra, _this_extra1;
                 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 _this_extra2, _this_extra3;
+                    builder.withMakerPermit((_this_extra2 = this.extra) === null || _this_extra2 === void 0 ? void 0 : _this_extra2.makerPermit.target, (_this_extra3 = this.extra) === null || _this_extra3 === void 0 ? void 0 : _this_extra3.makerPermit.data);
+                }
+                if ((_this_extra1 = this.extra) === null || _this_extra1 === void 0 ? void 0 : _this_extra1.preInteraction) {
+                    builder.withPreInteraction(this.extra.preInteraction);
                 }
                 return builder.build();
             }
@@ -228,6 +232,7 @@ var FusionExtension = /*#__PURE__*/ function() {
                 }
                 //endregion Parse amount data
                 var makerPermit = extension.hasMakerPermit ? _limitordersdk.Interaction.decode(extension.makerPermit) : undefined;
+                var preInteraction = extension.preInteraction !== _constants.ZX ? _limitordersdk.Interaction.decode(extension.preInteraction) : undefined;
                 (0, _assert.default)(amountData.fees.integratorFee.value === interactionData.fees.integratorFee.value, "invalid extension: integrator fee must be same in interaction data and in amount data");
                 (0, _assert.default)(amountData.fees.resolverFee.value === interactionData.fees.resolverFee.value, "invalid extension: resolver fee must be same in interaction data and in amount data");
                 (0, _assert.default)(amountData.fees.whitelistDiscount.equal(interactionData.fees.whitelistDiscount), "invalid extension: whitelistDiscount must be same in interaction data and in amount data");
@@ -240,6 +245,7 @@ var FusionExtension = /*#__PURE__*/ function() {
                 if (!hasFees) {
                     return new FusionExtension(settlementContract, auctionDetails, whitelist, surplusParams, {
                         makerPermit: makerPermit,
+                        preInteraction: preInteraction,
                         customReceiver: customReceiver,
                         fees: undefined
                     });
@@ -247,6 +253,7 @@ var FusionExtension = /*#__PURE__*/ function() {
                 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,
+                    preInteraction: preInteraction,
                     fees: fees,
                     customReceiver: customReceiver
                 });

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

@@ -102,6 +102,7 @@ var FusionOrder = /*#__PURE__*/ function() {
          */ settlementExtensionContract, orderInfo, auctionDetails, whitelist) {
         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,
+            preInteraction: extra.preInteraction ? _limitordersdk.Interaction.decode(extra.preInteraction) : undefined,
             customReceiver: orderInfo.receiver,
             fees: extra === null || extra === void 0 ? void 0 : extra.fees
         });
@@ -131,6 +132,9 @@ var FusionOrder = /*#__PURE__*/ function() {
         if (enablePermit2) {
             makerTraits.enablePermit2();
         }
+        if (extra.preInteraction) {
+            makerTraits.enablePreInteraction();
+        }
         if (extra.nonce !== undefined) {
             makerTraits.withNonce(extra.nonce);
         }
@@ -542,6 +546,7 @@ var FusionOrder = /*#__PURE__*/ function() {
                     enablePermit2: makerTraits.isPermit2(),
                     nonce: makerTraits.nonceOrEpoch(),
                     permit: extension.makerPermit === _constants.ZX ? undefined : _limitordersdk.Interaction.decode(extension.makerPermit).data,
+                    preInteraction: extension.preInteraction === _constants.ZX ? undefined : extension.preInteraction,
                     unwrapWETH: makerTraits.isNativeUnwrapEnabled(),
                     orderExpirationDelay: orderExpirationDelay,
                     fees: extra === null || extra === void 0 ? void 0 : extra.fees,

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

@@ -466,3 +466,134 @@ describe('FusionOrder Native', function() {
         expect(nativeOrder.build().receiver).toEqual(settlementExt.toString());
     });
 });
+describe('FusionOrder preInteraction', function() {
+    it('should create order with preInteraction and set PRE_INTERACTION_CALL_FLAG in makerTraits', function() {
+        var extensionContract = new _limitordersdk.Address('0x2ad5004c60e16e54d5007c80ce329adde5b51ef5');
+        var preInteraction = new _limitordersdk.Interaction(new _limitordersdk.Address('0x3a617c2fbaf8d7c58c793fbbd2d14eb4927876c1'), '0xdeadbeef01020304');
+        var order = _fusionorder.FusionOrder.new(extensionContract, {
+            makerAsset: new _limitordersdk.Address('0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c'),
+            takerAsset: new _limitordersdk.Address('0xda7ad9dea9397cffddae2f8a052b82f1484252b3'),
+            makingAmount: 1983000000000000n,
+            takingAmount: 79052953622246027n,
+            maker: new _limitordersdk.Address('0x3a617c2fbaf8d7c58c793fbbd2d14eb4927876c1')
+        }, {
+            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
+        }, {
+            preInteraction: preInteraction.encode()
+        });
+        var makerTraits = new _limitordersdk.MakerTraits(BigInt(order.build().makerTraits));
+        expect(makerTraits.hasPreInteraction()).toBe(true);
+    });
+    it('should not set PRE_INTERACTION_CALL_FLAG when no preInteraction', function() {
+        var extensionContract = new _limitordersdk.Address('0x2ad5004c60e16e54d5007c80ce329adde5b51ef5');
+        var order = _fusionorder.FusionOrder.new(extensionContract, {
+            makerAsset: new _limitordersdk.Address('0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c'),
+            takerAsset: new _limitordersdk.Address('0xda7ad9dea9397cffddae2f8a052b82f1484252b3'),
+            makingAmount: 1983000000000000n,
+            takingAmount: 79052953622246027n,
+            maker: new _limitordersdk.Address('0x3a617c2fbaf8d7c58c793fbbd2d14eb4927876c1')
+        }, {
+            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
+        });
+        var makerTraits = new _limitordersdk.MakerTraits(BigInt(order.build().makerTraits));
+        expect(makerTraits.hasPreInteraction()).toBe(false);
+    });
+    it('should round-trip order with preInteraction via fromDataAndExtension', function() {
+        var extensionContract = new _limitordersdk.Address('0x2ad5004c60e16e54d5007c80ce329adde5b51ef5');
+        var preInteractionTarget = new _limitordersdk.Address('0x3a617c2fbaf8d7c58c793fbbd2d14eb4927876c1');
+        var preInteractionCalldata = '0x0599a1fd1975848548e5b765925a935093a96ecc6f2ca216f77dcfd328b8a491';
+        var preInteraction = new _limitordersdk.Interaction(preInteractionTarget, preInteractionCalldata);
+        var order = _fusionorder.FusionOrder.new(extensionContract, {
+            makerAsset: new _limitordersdk.Address('0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c'),
+            takerAsset: new _limitordersdk.Address('0xda7ad9dea9397cffddae2f8a052b82f1484252b3'),
+            makingAmount: 1983000000000000n,
+            takingAmount: 79052953622246027n,
+            maker: new _limitordersdk.Address('0x3a617c2fbaf8d7c58c793fbbd2d14eb4927876c1')
+        }, {
+            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
+        }, {
+            preInteraction: preInteraction.encode()
+        });
+        var built = order.build();
+        var extension = order.extension;
+        var restored = _fusionorder.FusionOrder.fromDataAndExtension({
+            salt: built.salt,
+            maker: built.maker,
+            receiver: built.receiver,
+            makerAsset: built.makerAsset,
+            takerAsset: built.takerAsset,
+            makerTraits: built.makerTraits,
+            makingAmount: built.makingAmount,
+            takingAmount: built.takingAmount
+        }, extension);
+        expect(restored.build().salt).toEqual(built.salt);
+        expect(restored.extension.encode()).toEqual(extension.encode());
+    });
+    it('should validate OKX order with preInteraction (real customer data)', function() {
+        var extensionHex = '0x000002b800000207000000d2000000d2000000d20000006900000000000000002ad5004c60e16e54d5007c80ce329adde5b51ef50000000000000069c930cb0000b403e4e400000000000064062324dfe7924cb4f3257d000000000000000000006ea9a11ae13b29f5c555d18bd45f0b94f54a968faa848f727be12534f24895770895ad27ad6b0d952ad5004c60e16e54d5007c80ce329adde5b51ef50000000000000069c930cb0000b403e4e400000000000064062324dfe7924cb4f3257d000000000000000000006ea9a11ae13b29f5c555d18bd45f0b94f54a968faa848f727be12534f24895770895ad27ad6b0d953a617c2fbaf8d7c58c793fbbd2d14eb4927876c10100000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000070b872a96f0000000000000000000000000000000000000000000000000006715eae5b898683d0000000000000000000000000000000000000000000000000000000069c931e800000000000000000000000000000000000000000000000000000000000000410599a1fd1975848548e5b765925a935093a96ecc6f2ca216f77dcfd328b8a4917028648ec3e33d048184f9877d4892fb829ddc5d75a19c1c2ef064d2a38c012b1b000000000000000000000000000000000000000000000000000000000000002ad5004c60e16e54d5007c80ce329adde5b51ef500000000000000000000000000000000000000000090cbe4bdd538d6e9b379bff5fe72c3d67a521de500000000006469c930cb062324dfe7924cb4f3257d000c0000000000000000000000006ea9a11ae13b29f5c5550000d18bd45f0b94f54a968f0000aa848f727be12534f248000095770895ad27ad6b0d950000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00';
+        var extension = _limitordersdk.Extension.decode(extensionHex);
+        expect(function() {
+            _fusionorder.FusionOrder.fromDataAndExtension({
+                maker: '0x3a617c2fbaf8d7c58c793fbbd2d14eb4927876c1',
+                makerAsset: '0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c',
+                makerTraits: '69656178681823023809491920669288819567982727296017585526061607372909138935808',
+                makingAmount: '1983000000000000',
+                receiver: '0xb698362cc878094c406115efeeb13089b544e6c8',
+                salt: '1084071965642925953405739669729447852001208220133',
+                takerAsset: '0xda7ad9dea9397cffddae2f8a052b82f1484252b3',
+                takingAmount: '79052953622246027'
+            }, extension);
+        }).not.toThrow();
+    });
+});

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

@@ -38,6 +38,7 @@ import { Whitelist } from './whitelist/whitelist.js';
 import { SurplusParams } from './surplus-params.js';
 import { Fees, IntegratorFee, ResolverFee } from './fees/index.js';
 import { add0x } from '../utils.js';
+import { ZX } from '../constants.js';
 export var FusionExtension = /*#__PURE__*/ function() {
     "use strict";
     function FusionExtension(address, auctionDetails, whitelist, surplus, extra) {
@@ -57,12 +58,15 @@ export var FusionExtension = /*#__PURE__*/ function() {
         {
             key: "build",
             value: function build() {
-                var _this_extra;
+                var _this_extra, _this_extra1;
                 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 _this_extra2, _this_extra3;
+                    builder.withMakerPermit((_this_extra2 = this.extra) === null || _this_extra2 === void 0 ? void 0 : _this_extra2.makerPermit.target, (_this_extra3 = this.extra) === null || _this_extra3 === void 0 ? void 0 : _this_extra3.makerPermit.data);
+                }
+                if ((_this_extra1 = this.extra) === null || _this_extra1 === void 0 ? void 0 : _this_extra1.preInteraction) {
+                    builder.withPreInteraction(this.extra.preInteraction);
                 }
                 return builder.build();
             }
@@ -213,6 +217,7 @@ export var FusionExtension = /*#__PURE__*/ function() {
                 }
                 //endregion Parse amount data
                 var makerPermit = extension.hasMakerPermit ? Interaction.decode(extension.makerPermit) : undefined;
+                var preInteraction = extension.preInteraction !== ZX ? Interaction.decode(extension.preInteraction) : undefined;
                 assert(amountData.fees.integratorFee.value === interactionData.fees.integratorFee.value, "invalid extension: integrator fee must be same in interaction data and in amount data");
                 assert(amountData.fees.resolverFee.value === interactionData.fees.resolverFee.value, "invalid extension: resolver fee must be same in interaction data and in amount data");
                 assert(amountData.fees.whitelistDiscount.equal(interactionData.fees.whitelistDiscount), "invalid extension: whitelistDiscount must be same in interaction data and in amount data");
@@ -225,6 +230,7 @@ export var FusionExtension = /*#__PURE__*/ function() {
                 if (!hasFees) {
                     return new FusionExtension(settlementContract, auctionDetails, whitelist, surplusParams, {
                         makerPermit: makerPermit,
+                        preInteraction: preInteraction,
                         customReceiver: customReceiver,
                         fees: undefined
                     });
@@ -232,6 +238,7 @@ export var FusionExtension = /*#__PURE__*/ function() {
                 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,
+                    preInteraction: preInteraction,
                     fees: fees,
                     customReceiver: customReceiver
                 });

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

@@ -87,6 +87,7 @@ export var FusionOrder = /*#__PURE__*/ function() {
          */ settlementExtensionContract, orderInfo, auctionDetails, whitelist) {
         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,
+            preInteraction: extra.preInteraction ? Interaction.decode(extra.preInteraction) : undefined,
             customReceiver: orderInfo.receiver,
             fees: extra === null || extra === void 0 ? void 0 : extra.fees
         });
@@ -116,6 +117,9 @@ export var FusionOrder = /*#__PURE__*/ function() {
         if (enablePermit2) {
             makerTraits.enablePermit2();
         }
+        if (extra.preInteraction) {
+            makerTraits.enablePreInteraction();
+        }
         if (extra.nonce !== undefined) {
             makerTraits.withNonce(extra.nonce);
         }
@@ -527,6 +531,7 @@ export var FusionOrder = /*#__PURE__*/ function() {
                     enablePermit2: makerTraits.isPermit2(),
                     nonce: makerTraits.nonceOrEpoch(),
                     permit: extension.makerPermit === ZX ? undefined : Interaction.decode(extension.makerPermit).data,
+                    preInteraction: extension.preInteraction === ZX ? undefined : extension.preInteraction,
                     unwrapWETH: makerTraits.isNativeUnwrapEnabled(),
                     orderExpirationDelay: orderExpirationDelay,
                     fees: extra === null || extra === void 0 ? void 0 : extra.fees,

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

@@ -1,4 +1,4 @@
-import { Address, Bps, MakerTraits, Extension, ProxyFactory } from '@1inch/limit-order-sdk';
+import { Address, Bps, MakerTraits, Extension, Interaction, ProxyFactory } from '@1inch/limit-order-sdk';
 import { parseEther, parseUnits } from 'ethers';
 import { FusionOrder } from './fusion-order.js';
 import { AuctionDetails } from './auction-details/index.js';
@@ -462,3 +462,134 @@ describe('FusionOrder Native', function() {
         expect(nativeOrder.build().receiver).toEqual(settlementExt.toString());
     });
 });
+describe('FusionOrder preInteraction', function() {
+    it('should create order with preInteraction and set PRE_INTERACTION_CALL_FLAG in makerTraits', function() {
+        var extensionContract = new Address('0x2ad5004c60e16e54d5007c80ce329adde5b51ef5');
+        var preInteraction = new Interaction(new Address('0x3a617c2fbaf8d7c58c793fbbd2d14eb4927876c1'), '0xdeadbeef01020304');
+        var order = FusionOrder.new(extensionContract, {
+            makerAsset: new Address('0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c'),
+            takerAsset: new Address('0xda7ad9dea9397cffddae2f8a052b82f1484252b3'),
+            makingAmount: 1983000000000000n,
+            takingAmount: 79052953622246027n,
+            maker: new Address('0x3a617c2fbaf8d7c58c793fbbd2d14eb4927876c1')
+        }, {
+            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
+        }, {
+            preInteraction: preInteraction.encode()
+        });
+        var makerTraits = new MakerTraits(BigInt(order.build().makerTraits));
+        expect(makerTraits.hasPreInteraction()).toBe(true);
+    });
+    it('should not set PRE_INTERACTION_CALL_FLAG when no preInteraction', function() {
+        var extensionContract = new Address('0x2ad5004c60e16e54d5007c80ce329adde5b51ef5');
+        var order = FusionOrder.new(extensionContract, {
+            makerAsset: new Address('0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c'),
+            takerAsset: new Address('0xda7ad9dea9397cffddae2f8a052b82f1484252b3'),
+            makingAmount: 1983000000000000n,
+            takingAmount: 79052953622246027n,
+            maker: new Address('0x3a617c2fbaf8d7c58c793fbbd2d14eb4927876c1')
+        }, {
+            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
+        });
+        var makerTraits = new MakerTraits(BigInt(order.build().makerTraits));
+        expect(makerTraits.hasPreInteraction()).toBe(false);
+    });
+    it('should round-trip order with preInteraction via fromDataAndExtension', function() {
+        var extensionContract = new Address('0x2ad5004c60e16e54d5007c80ce329adde5b51ef5');
+        var preInteractionTarget = new Address('0x3a617c2fbaf8d7c58c793fbbd2d14eb4927876c1');
+        var preInteractionCalldata = '0x0599a1fd1975848548e5b765925a935093a96ecc6f2ca216f77dcfd328b8a491';
+        var preInteraction = new Interaction(preInteractionTarget, preInteractionCalldata);
+        var order = FusionOrder.new(extensionContract, {
+            makerAsset: new Address('0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c'),
+            takerAsset: new Address('0xda7ad9dea9397cffddae2f8a052b82f1484252b3'),
+            makingAmount: 1983000000000000n,
+            takingAmount: 79052953622246027n,
+            maker: new Address('0x3a617c2fbaf8d7c58c793fbbd2d14eb4927876c1')
+        }, {
+            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
+        }, {
+            preInteraction: preInteraction.encode()
+        });
+        var built = order.build();
+        var extension = order.extension;
+        var restored = FusionOrder.fromDataAndExtension({
+            salt: built.salt,
+            maker: built.maker,
+            receiver: built.receiver,
+            makerAsset: built.makerAsset,
+            takerAsset: built.takerAsset,
+            makerTraits: built.makerTraits,
+            makingAmount: built.makingAmount,
+            takingAmount: built.takingAmount
+        }, extension);
+        expect(restored.build().salt).toEqual(built.salt);
+        expect(restored.extension.encode()).toEqual(extension.encode());
+    });
+    it('should validate OKX order with preInteraction (real customer data)', function() {
+        var extensionHex = '0x000002b800000207000000d2000000d2000000d20000006900000000000000002ad5004c60e16e54d5007c80ce329adde5b51ef50000000000000069c930cb0000b403e4e400000000000064062324dfe7924cb4f3257d000000000000000000006ea9a11ae13b29f5c555d18bd45f0b94f54a968faa848f727be12534f24895770895ad27ad6b0d952ad5004c60e16e54d5007c80ce329adde5b51ef50000000000000069c930cb0000b403e4e400000000000064062324dfe7924cb4f3257d000000000000000000006ea9a11ae13b29f5c555d18bd45f0b94f54a968faa848f727be12534f24895770895ad27ad6b0d953a617c2fbaf8d7c58c793fbbd2d14eb4927876c10100000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000070b872a96f0000000000000000000000000000000000000000000000000006715eae5b898683d0000000000000000000000000000000000000000000000000000000069c931e800000000000000000000000000000000000000000000000000000000000000410599a1fd1975848548e5b765925a935093a96ecc6f2ca216f77dcfd328b8a4917028648ec3e33d048184f9877d4892fb829ddc5d75a19c1c2ef064d2a38c012b1b000000000000000000000000000000000000000000000000000000000000002ad5004c60e16e54d5007c80ce329adde5b51ef500000000000000000000000000000000000000000090cbe4bdd538d6e9b379bff5fe72c3d67a521de500000000006469c930cb062324dfe7924cb4f3257d000c0000000000000000000000006ea9a11ae13b29f5c5550000d18bd45f0b94f54a968f0000aa848f727be12534f248000095770895ad27ad6b0d950000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00';
+        var extension = Extension.decode(extensionHex);
+        expect(function() {
+            FusionOrder.fromDataAndExtension({
+                maker: '0x3a617c2fbaf8d7c58c793fbbd2d14eb4927876c1',
+                makerAsset: '0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c',
+                makerTraits: '69656178681823023809491920669288819567982727296017585526061607372909138935808',
+                makingAmount: '1983000000000000',
+                receiver: '0xb698362cc878094c406115efeeb13089b544e6c8',
+                salt: '1084071965642925953405739669729447852001208220133',
+                takerAsset: '0xda7ad9dea9397cffddae2f8a052b82f1484252b3',
+                takingAmount: '79052953622246027'
+            }, extension);
+        }).not.toThrow();
+    });
+});

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

@@ -2,6 +2,11 @@
      * Required if `allowPartialFills` or `allowMultipleFills` is false
      * Max size is 40bit
      */ /**
+     * Encoded pre-interaction: target address (20 bytes) followed by calldata.
+     * Format matches `Interaction.encode()`: `0x{target}{calldata}`.
+     * When set, the PRE_INTERACTION_CALL_FLAG is enabled in makerTraits
+     * and the LOP contract calls IPreInteraction on the target before the swap.
+     */ /**
      * Default is true
      */ /**
      * Default is true

package/dist/esm/package.json

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

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

@@ -10,12 +10,14 @@ export declare class FusionExtension {
     readonly surplus: SurplusParams;
     readonly extra?: {
         makerPermit?: Interaction;
+        preInteraction?: Interaction;
         customReceiver?: Address;
         fees?: Fees;
     } | undefined;
     private static CUSTOM_RECEIVER_FLAG_BIT;
     constructor(address: Address, auctionDetails: AuctionDetails, whitelist: Whitelist, surplus: SurplusParams, extra?: {
         makerPermit?: Interaction;
+        preInteraction?: Interaction;
         customReceiver?: Address;
         fees?: Fees;
     } | undefined);

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

@@ -6,6 +6,7 @@ export type Extra = {
     unwrapWETH?: boolean;
     nonce?: bigint;
     permit?: string;
+    preInteraction?: string;
     allowPartialFills?: boolean;
     allowMultipleFills?: boolean;
     orderExpirationDelay?: bigint;