@1inch/fusion-sdk 2.4.6-rc.0 → 2.4.6-rc.3

package/dist/esm/api/quoter/quoter.api.spec.js

@@ -27,58 +27,6 @@ function _async_to_generator(fn) {
         });
     };
 }
-function _define_property(obj, key, value) {
-    if (key in obj) {
-        Object.defineProperty(obj, key, {
-            value: value,
-            enumerable: true,
-            configurable: true,
-            writable: true
-        });
-    } else {
-        obj[key] = value;
-    }
-    return obj;
-}
-function _object_spread(target) {
-    for(var i = 1; i < arguments.length; i++){
-        var source = arguments[i] != null ? arguments[i] : {};
-        var ownKeys = Object.keys(source);
-        if (typeof Object.getOwnPropertySymbols === "function") {
-            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
-                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
-            }));
-        }
-        ownKeys.forEach(function(key) {
-            _define_property(target, key, source[key]);
-        });
-    }
-    return target;
-}
-function ownKeys(object, enumerableOnly) {
-    var keys = Object.keys(object);
-    if (Object.getOwnPropertySymbols) {
-        var symbols = Object.getOwnPropertySymbols(object);
-        if (enumerableOnly) {
-            symbols = symbols.filter(function(sym) {
-                return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-            });
-        }
-        keys.push.apply(keys, symbols);
-    }
-    return keys;
-}
-function _object_spread_props(target, source) {
-    source = source != null ? source : {};
-    if (Object.getOwnPropertyDescriptors) {
-        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
-    } else {
-        ownKeys(Object(source)).forEach(function(key) {
-            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-        });
-    }
-    return target;
-}
 function _ts_generator(thisArg, body) {
     var f, y, t, g, _ = {
         label: 0,
@@ -314,7 +262,7 @@ describe('Quoter API', function() {
                 case 1:
                     res = _state.sent();
                     expect(res).toStrictEqual(QuoterResponseMock);
-                    expect(httpProvider.get).toHaveBeenCalledWith('https://test.com/quoter/v2.0/1/quote/receive/?fromTokenAddress=0x6b175474e89094c44da98b954eedeac495271d0f&toTokenAddress=0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2&amount=1000000000000000000000&walletAddress=0x00000000219ab540356cbb839cbe05303d7705fa&surplus=true');
+                    expect(httpProvider.get).toHaveBeenCalledWith('https://test.com/quoter/v2.0/1/quote/receive/?fromTokenAddress=0x6b175474e89094c44da98b954eedeac495271d0f&toTokenAddress=0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2&amount=1000000000000000000000&walletAddress=0x00000000219ab540356cbb839cbe05303d7705fa&source=sdk&surplus=true');
                     return [
                         2
                     ];
@@ -336,6 +284,7 @@ describe('Quoter API', function() {
                         amount: '1000000000000000000000',
                         walletAddress: '0x00000000219ab540356cbb839cbe05303d7705fa',
                         integratorFee: {
+                            share: Bps.fromPercent(50),
                             receiver: Address.fromBigInt(10n),
                             value: new Bps(1n)
                         },
@@ -371,6 +320,7 @@ describe('Quoter API', function() {
                         amount: '1000000000000000000000',
                         walletAddress: '0x00000000219ab540356cbb839cbe05303d7705fa',
                         integratorFee: {
+                            share: Bps.fromPercent(50),
                             receiver: Address.fromBigInt(10n),
                             value: new Bps(1n)
                         },
@@ -407,6 +357,7 @@ describe('Quoter API', function() {
                         amount: '1000000000000000000000',
                         walletAddress: '0x00000000219ab540356cbb839cbe05303d7705fa',
                         integratorFee: {
+                            share: Bps.fromPercent(50),
                             receiver: Address.fromBigInt(10n),
                             value: new Bps(1n)
                         },
@@ -459,6 +410,7 @@ describe('Quoter API', function() {
                         amount: '1000000000000000000000',
                         walletAddress: '0x00000000219ab540356cbb839cbe05303d7705fa',
                         integratorFee: {
+                            share: Bps.fromPercent(50),
                             receiver: Address.fromBigInt(10n),
                             value: new Bps(1n)
                         },
@@ -497,52 +449,4 @@ describe('Quoter API', function() {
             }
         });
     }));
-    describe('parseIntegratorFee', function() {
-        it('should use response receiver when provided', function() {
-            var _quote_integratorFeeParams, _quote_integratorFeeParams1, _quote_integratorFeeParams2;
-            var responseWithFee = _object_spread_props(_object_spread({}, ResponseMock), {
-                integratorFee: 100,
-                integratorFeeReceiver: '0x1234567890123456789012345678901234567890',
-                integratorFeeShare: 50
-            });
-            var quote = new Quote(params, responseWithFee);
-            expect(quote.integratorFeeParams).toBeDefined();
-            expect((_quote_integratorFeeParams = quote.integratorFeeParams) === null || _quote_integratorFeeParams === void 0 ? void 0 : _quote_integratorFeeParams.receiver.toString()).toBe('0x1234567890123456789012345678901234567890');
-            expect(Number((_quote_integratorFeeParams1 = quote.integratorFeeParams) === null || _quote_integratorFeeParams1 === void 0 ? void 0 : _quote_integratorFeeParams1.value.value)).toBe(100);
-            expect(Number((_quote_integratorFeeParams2 = quote.integratorFeeParams) === null || _quote_integratorFeeParams2 === void 0 ? void 0 : _quote_integratorFeeParams2.share.value)).toBe(5000);
-        });
-        it('should fallback to request receiver when response receiver is missing', function() {
-            var _quote_integratorFeeParams;
-            var responseWithFeeNoReceiver = _object_spread_props(_object_spread({}, ResponseMock), {
-                integratorFee: 100,
-                integratorFeeShare: 50
-            });
-            var paramsWithFee = QuoterRequest.new({
-                fromTokenAddress: '0x6b175474e89094c44da98b954eedeac495271d0f',
-                toTokenAddress: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-                amount: '1000000000000000000000',
-                walletAddress: '0x00000000219ab540356cbb839cbe05303d7705fa',
-                integratorFee: {
-                    receiver: new Address('0xabcdef0123456789abcdef0123456789abcdef01'),
-                    value: new Bps(100n)
-                },
-                source: 'test-source'
-            });
-            var quote = new Quote(paramsWithFee, responseWithFeeNoReceiver);
-            expect(quote.integratorFeeParams).toBeDefined();
-            expect((_quote_integratorFeeParams = quote.integratorFeeParams) === null || _quote_integratorFeeParams === void 0 ? void 0 : _quote_integratorFeeParams.receiver.toString()).toBe('0xabcdef0123456789abcdef0123456789abcdef01');
-        });
-        it('should return undefined when no receiver available', function() {
-            var responseWithFeeNoReceiver = _object_spread_props(_object_spread({}, ResponseMock), {
-                integratorFee: 100,
-                integratorFeeShare: 50
-            });
-            var quote = new Quote(params, responseWithFeeNoReceiver);
-            expect(quote.integratorFeeParams).toBeUndefined();
-        });
-        it('should return undefined when no integratorFee in response', function() {
-            var quote = new Quote(params, ResponseMock);
-            expect(quote.integratorFeeParams).toBeUndefined();
-        });
-    });
 });

package/dist/esm/api/quoter/quoter.request.js

@@ -53,7 +53,7 @@ export var QuoterRequest = /*#__PURE__*/ function() {
         this.enableEstimate = params.enableEstimate || false;
         this.permit = params.permit;
         this.integratorFee = params.integratorFee;
-        this.source = params.source;
+        this.source = params.source || 'sdk';
         var _params_isPermit2;
         this.isPermit2 = (_params_isPermit2 = params.isPermit2) !== null && _params_isPermit2 !== void 0 ? _params_isPermit2 : false;
         this.slippage = params.slippage;
@@ -66,6 +66,9 @@ export var QuoterRequest = /*#__PURE__*/ function() {
         if (!isValidAmount(this.amount)) {
             throw new Error("".concat(this.amount, " is invalid amount"));
         }
+        if (this.integratorFee && this.source === 'sdk') {
+            throw new Error('cannot use fee without source');
+        }
     }
     _create_class(QuoterRequest, [
         {

package/dist/esm/api/quoter/quoter.request.spec.js

@@ -9,6 +9,7 @@ describe(__filename, function() {
                 amount: '1000000000000000000000',
                 walletAddress: '0x00000000219ab540356cbb839cbe05303d7705fa',
                 integratorFee: {
+                    share: Bps.fromPercent(50),
                     receiver: Address.fromBigInt(10n),
                     value: new Bps(1n)
                 }
@@ -21,6 +22,7 @@ describe(__filename, function() {
                 amount: '1000000000000000000000',
                 walletAddress: '0x00000000219ab540356cbb839cbe05303d7705fa',
                 integratorFee: {
+                    share: Bps.fromPercent(50),
                     receiver: Address.fromBigInt(10n),
                     value: new Bps(1n)
                 }
@@ -35,6 +37,7 @@ describe(__filename, function() {
                 amount: '1000000000000000000000',
                 walletAddress: '0x00000000219ab540356cbb839cbe05303d7705fa',
                 integratorFee: {
+                    share: Bps.fromPercent(50),
                     receiver: Address.fromBigInt(10n),
                     value: new Bps(1n)
                 }
@@ -49,6 +52,7 @@ describe(__filename, function() {
                 amount: '1000000000000000000000',
                 walletAddress: '0x0000000019ab540356cbb839be05303d7705fa1',
                 integratorFee: {
+                    share: Bps.fromPercent(50),
                     receiver: Address.fromBigInt(10n),
                     value: new Bps(1n)
                 }
@@ -63,13 +67,14 @@ describe(__filename, function() {
                 amount: 'dasdad',
                 walletAddress: '0x00000000219ab540356cbb839cbe05303d7705fa',
                 integratorFee: {
+                    share: Bps.fromPercent(50),
                     receiver: Address.fromBigInt(10n),
                     value: new Bps(1n)
                 }
             });
         }).toThrow(/is invalid amount/);
     });
-    it('allows fee without source', function() {
+    it('returns error if  fee is provided and source not', function() {
         expect(function() {
             return QuoterRequest.new({
                 fromTokenAddress: '0x6b175474e89094c44da98b954eedeac495271d0f',
@@ -77,10 +82,11 @@ describe(__filename, function() {
                 amount: '1000000',
                 walletAddress: '0x00000000219ab540356cbb839cbe05303d7705fa',
                 integratorFee: {
+                    share: Bps.fromPercent(50),
                     receiver: Address.fromBigInt(10n),
                     value: new Bps(1n)
                 }
             });
-        }).not.toThrow();
+        }).toThrow(/cannot use fee without source/);
     });
 });

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

@@ -57,12 +57,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 +216,7 @@ export var FusionExtension = /*#__PURE__*/ function() {
                 }
                 //endregion Parse amount data
                 var makerPermit = extension.hasMakerPermit ? Interaction.decode(extension.makerPermit) : undefined;
+                var preInteraction = extension.hasPreInteraction ? 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 +229,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 +237,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.6-rc.0","type":"module"}
+{"name":"@1inch/fusion-sdk","version":"2.4.6-rc.3","type":"module"}

package/dist/types/src/api/quoter/quote/quote.d.ts

@@ -1,5 +1,5 @@
 import { Address, ProxyFactory } from '@1inch/limit-order-sdk';
-import { FusionOrderParamsData, IntegratorFeeResponse, ResolverFeePreset } from './types.js';
+import { FusionOrderParamsData, IntegratorFeeParams, ResolverFeePreset } from './types.js';
 import { Cost, PresetEnum, QuoterResponse } from '../types.js';
 import { Preset } from '../preset.js';
 import { FusionOrder } from '../../../fusion-order/index.js';
@@ -25,11 +25,10 @@ export declare class Quote {
     readonly slippage: number;
     readonly resolverFeePreset: ResolverFeePreset;
     readonly surplusFee?: number;
-    readonly integratorFeeParams?: IntegratorFeeResponse;
+    readonly integratorFeeParams?: IntegratorFeeParams;
     constructor(params: QuoterRequest, response: QuoterResponse);
     createFusionOrder(paramsData: Omit<FusionOrderParamsData, 'permit' | 'isPermit2'>): FusionOrder;
     getPreset(type?: PresetEnum): Preset;
     private getWhitelist;
     private _createOrder;
-    private parseIntegratorFee;
 }

package/dist/types/src/api/quoter/quote/types.d.ts

@@ -13,16 +13,11 @@ export type FusionOrderParamsData = {
     delayAuctionStartTimeBy?: bigint;
     orderExpirationDelay?: bigint;
 };
-export type IntegratorFeeRequest = {
-    receiver: Address;
-    value: Bps;
-};
-export type IntegratorFeeResponse = {
+export type IntegratorFeeParams = {
     receiver: Address;
     value: Bps;
     share: Bps;
 };
-export type IntegratorFeeParams = IntegratorFeeResponse;
 export type ResolverFeePreset = {
     receiver: Address;
     bps: Bps;

package/dist/types/src/api/quoter/quoter.request.d.ts

@@ -1,6 +1,6 @@
 import { Address } from '@1inch/limit-order-sdk';
 import { QuoterRequestParams, QuoterRequestParamsRaw } from './types.js';
-import { IntegratorFeeRequest } from './quote/index.js';
+import { IntegratorFeeParams } from './quote/index.js';
 export declare class QuoterRequest {
     readonly fromTokenAddress: Address;
     readonly toTokenAddress: Address;
@@ -8,8 +8,8 @@ export declare class QuoterRequest {
     readonly walletAddress: Address;
     readonly enableEstimate: boolean;
     readonly permit: string | undefined;
-    readonly integratorFee?: IntegratorFeeRequest;
-    readonly source?: string;
+    readonly integratorFee?: IntegratorFeeParams;
+    readonly source: string;
     readonly isPermit2: boolean;
     readonly slippage?: number;
     constructor(params: QuoterRequestParams);

package/dist/types/src/api/quoter/types.d.ts

@@ -1,4 +1,4 @@
-import { IntegratorFeeRequest } from './quote/index.js';
+import { IntegratorFeeParams } from './quote/index.js';
 import { NetworkEnum } from '../../constants.js';
 export type QuoterRequestParams = {
     fromTokenAddress: string;
@@ -7,7 +7,7 @@ export type QuoterRequestParams = {
     walletAddress: string;
     enableEstimate?: boolean;
     permit?: string;
-    integratorFee?: IntegratorFeeRequest;
+    integratorFee?: IntegratorFeeParams;
     source?: string;
     isPermit2?: boolean;
     slippage?: number;

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;

package/dist/types/src/index.d.ts

@@ -10,4 +10,4 @@ export * from './utils/time.js';
 export * from './validations.js';
 export * from './ws-api/index.js';
 export * from './errors.js';
-export { QuoterRequest, type QuoterResponse, RelayerRequest, QuoterCustomPresetRequest, PresetEnum, Preset, Quote, type OrderStatusResponse, OrderStatus, type IntegratorFeeRequest, type IntegratorFeeResponse } from './api/index.js';
+export { QuoterRequest, type QuoterResponse, RelayerRequest, QuoterCustomPresetRequest, PresetEnum, Preset, Quote, type OrderStatusResponse, OrderStatus } from './api/index.js';

package/dist/types/src/sdk/types.d.ts

@@ -1,7 +1,7 @@
 import { Address, LimitOrderV4Struct } from '@1inch/limit-order-sdk';
 import { BlockchainProviderConnector, HttpProviderConnector } from '../connector/index.js';
 import { NetworkEnum } from '../constants.js';
-import { CustomPreset, IntegratorFeeRequest, PresetEnum } from '../api/index.js';
+import { CustomPreset, IntegratorFeeParams, PresetEnum } from '../api/index.js';
 import { FusionOrder } from '../fusion-order/index.js';
 export type FusionSDKConfigParams = {
     url: string;
@@ -17,7 +17,7 @@ export type QuoteParams = {
     walletAddress?: string;
     enableEstimate?: boolean;
     permit?: string;
-    integratorFee?: IntegratorFeeRequest;
+    integratorFee?: IntegratorFeeParams;
     source?: string;
     isPermit2?: boolean;
     slippage?: number;
@@ -40,7 +40,7 @@ export type OrderParams = {
     orderExpirationDelay?: bigint;
     allowPartialFills?: boolean;
     allowMultipleFills?: boolean;
-    integratorFee?: IntegratorFeeRequest;
+    integratorFee?: IntegratorFeeParams;
     slippage?: number;
 };
 export type OrderInfo = {