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

package/dist/cjs/api/quoter/quote/quote.js

@@ -102,7 +102,11 @@ var Quote = /*#__PURE__*/ function() {
             bps: new _limitordersdk.Bps(BigInt(response.fee.bps))
         };
         this.surplusFee = response.surplusFee;
-        this.integratorFeeParams = this.parseIntegratorFee(response);
+        this.integratorFeeParams = response.integratorFee && response.integratorFeeReceiver ? {
+            receiver: new _limitordersdk.Address(response.integratorFeeReceiver),
+            value: new _limitordersdk.Bps(BigInt(response.integratorFee)),
+            share: _limitordersdk.Bps.fromPercent(response.integratorFeeShare || 0)
+        } : undefined;
     }
     _create_class(Quote, [
         {
@@ -149,7 +153,7 @@ var Quote = /*#__PURE__*/ function() {
                     orderExpirationDelay: paramsData === null || paramsData === void 0 ? void 0 : paramsData.orderExpirationDelay,
                     source: this.params.source,
                     enablePermit2: params.isPermit2,
-                    fees: buildFees(this.resolverFeePreset, this.integratorFeeParams, this.surplusFee)
+                    fees: buildFees(this.resolverFeePreset, this.params.integratorFee || this.integratorFeeParams, this.surplusFee)
                 };
                 return this._createOrder(paramsData.network, this.settlementAddress, orderInfo, details, extra);
             }
@@ -190,24 +194,6 @@ var Quote = /*#__PURE__*/ function() {
                 }
                 return _index.FusionOrder.new(settlementExtension, orderInfo, details, extra);
             }
-        },
-        {
-            key: "parseIntegratorFee",
-            value: function parseIntegratorFee(response) {
-                var _this_params_integratorFee_receiver, _this_params_integratorFee;
-                if (!response.integratorFee) {
-                    return undefined;
-                }
-                var receiver = response.integratorFeeReceiver || ((_this_params_integratorFee = this.params.integratorFee) === null || _this_params_integratorFee === void 0 ? void 0 : (_this_params_integratorFee_receiver = _this_params_integratorFee.receiver) === null || _this_params_integratorFee_receiver === void 0 ? void 0 : _this_params_integratorFee_receiver.toString());
-                if (!receiver) {
-                    return undefined;
-                }
-                return {
-                    receiver: new _limitordersdk.Address(receiver),
-                    value: new _limitordersdk.Bps(BigInt(response.integratorFee)),
-                    share: _limitordersdk.Bps.fromPercent(response.integratorFeeShare || 0)
-                };
-            }
         }
     ]);
     return Quote;

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

@@ -38,58 +38,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,
@@ -318,7 +266,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
                     ];
@@ -340,6 +288,7 @@ describe('Quoter API', function() {
                         amount: '1000000000000000000000',
                         walletAddress: '0x00000000219ab540356cbb839cbe05303d7705fa',
                         integratorFee: {
+                            share: _limitordersdk.Bps.fromPercent(50),
                             receiver: _limitordersdk.Address.fromBigInt(10n),
                             value: new _limitordersdk.Bps(1n)
                         },
@@ -375,6 +324,7 @@ describe('Quoter API', function() {
                         amount: '1000000000000000000000',
                         walletAddress: '0x00000000219ab540356cbb839cbe05303d7705fa',
                         integratorFee: {
+                            share: _limitordersdk.Bps.fromPercent(50),
                             receiver: _limitordersdk.Address.fromBigInt(10n),
                             value: new _limitordersdk.Bps(1n)
                         },
@@ -411,6 +361,7 @@ describe('Quoter API', function() {
                         amount: '1000000000000000000000',
                         walletAddress: '0x00000000219ab540356cbb839cbe05303d7705fa',
                         integratorFee: {
+                            share: _limitordersdk.Bps.fromPercent(50),
                             receiver: _limitordersdk.Address.fromBigInt(10n),
                             value: new _limitordersdk.Bps(1n)
                         },
@@ -463,6 +414,7 @@ describe('Quoter API', function() {
                         amount: '1000000000000000000000',
                         walletAddress: '0x00000000219ab540356cbb839cbe05303d7705fa',
                         integratorFee: {
+                            share: _limitordersdk.Bps.fromPercent(50),
                             receiver: _limitordersdk.Address.fromBigInt(10n),
                             value: new _limitordersdk.Bps(1n)
                         },
@@ -501,52 +453,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 _index.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.QuoterRequest.new({
-                fromTokenAddress: '0x6b175474e89094c44da98b954eedeac495271d0f',
-                toTokenAddress: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-                amount: '1000000000000000000000',
-                walletAddress: '0x00000000219ab540356cbb839cbe05303d7705fa',
-                integratorFee: {
-                    receiver: new _limitordersdk.Address('0xabcdef0123456789abcdef0123456789abcdef01'),
-                    value: new _limitordersdk.Bps(100n)
-                },
-                source: 'test-source'
-            });
-            var quote = new _index.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 _index.Quote(params, responseWithFeeNoReceiver);
-            expect(quote.integratorFeeParams).toBeUndefined();
-        });
-        it('should return undefined when no integratorFee in response', function() {
-            var quote = new _index.Quote(params, ResponseMock);
-            expect(quote.integratorFeeParams).toBeUndefined();
-        });
-    });
 });

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

@@ -63,7 +63,7 @@ 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;
@@ -76,6 +76,9 @@ var QuoterRequest = /*#__PURE__*/ function() {
         if (!(0, _validations.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/cjs/api/quoter/quoter.request.spec.js

@@ -13,6 +13,7 @@ describe(__filename, function() {
                 amount: '1000000000000000000000',
                 walletAddress: '0x00000000219ab540356cbb839cbe05303d7705fa',
                 integratorFee: {
+                    share: _limitordersdk.Bps.fromPercent(50),
                     receiver: _limitordersdk.Address.fromBigInt(10n),
                     value: new _limitordersdk.Bps(1n)
                 }
@@ -25,6 +26,7 @@ describe(__filename, function() {
                 amount: '1000000000000000000000',
                 walletAddress: '0x00000000219ab540356cbb839cbe05303d7705fa',
                 integratorFee: {
+                    share: _limitordersdk.Bps.fromPercent(50),
                     receiver: _limitordersdk.Address.fromBigInt(10n),
                     value: new _limitordersdk.Bps(1n)
                 }
@@ -39,6 +41,7 @@ describe(__filename, function() {
                 amount: '1000000000000000000000',
                 walletAddress: '0x00000000219ab540356cbb839cbe05303d7705fa',
                 integratorFee: {
+                    share: _limitordersdk.Bps.fromPercent(50),
                     receiver: _limitordersdk.Address.fromBigInt(10n),
                     value: new _limitordersdk.Bps(1n)
                 }
@@ -53,6 +56,7 @@ describe(__filename, function() {
                 amount: '1000000000000000000000',
                 walletAddress: '0x0000000019ab540356cbb839be05303d7705fa1',
                 integratorFee: {
+                    share: _limitordersdk.Bps.fromPercent(50),
                     receiver: _limitordersdk.Address.fromBigInt(10n),
                     value: new _limitordersdk.Bps(1n)
                 }
@@ -67,13 +71,14 @@ describe(__filename, function() {
                 amount: 'dasdad',
                 walletAddress: '0x00000000219ab540356cbb839cbe05303d7705fa',
                 integratorFee: {
+                    share: _limitordersdk.Bps.fromPercent(50),
                     receiver: _limitordersdk.Address.fromBigInt(10n),
                     value: new _limitordersdk.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.QuoterRequest.new({
                 fromTokenAddress: '0x6b175474e89094c44da98b954eedeac495271d0f',
@@ -81,10 +86,11 @@ describe(__filename, function() {
                 amount: '1000000',
                 walletAddress: '0x00000000219ab540356cbb839cbe05303d7705fa',
                 integratorFee: {
+                    share: _limitordersdk.Bps.fromPercent(50),
                     receiver: _limitordersdk.Address.fromBigInt(10n),
                     value: new _limitordersdk.Bps(1n)
                 }
             });
-        }).not.toThrow();
+        }).toThrow(/cannot use fee without source/);
     });
 });

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

@@ -72,12 +72,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 +231,7 @@ var FusionExtension = /*#__PURE__*/ function() {
                 }
                 //endregion Parse amount data
                 var makerPermit = extension.hasMakerPermit ? _limitordersdk.Interaction.decode(extension.makerPermit) : undefined;
+                var preInteraction = extension.hasPreInteraction ? _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 +244,7 @@ var FusionExtension = /*#__PURE__*/ function() {
                 if (!hasFees) {
                     return new FusionExtension(settlementContract, auctionDetails, whitelist, surplusParams, {
                         makerPermit: makerPermit,
+                        preInteraction: preInteraction,
                         customReceiver: customReceiver,
                         fees: undefined
                     });
@@ -247,6 +252,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/api/quoter/quote/quote.js

@@ -87,7 +87,11 @@ export var Quote = /*#__PURE__*/ function() {
             bps: new Bps(BigInt(response.fee.bps))
         };
         this.surplusFee = response.surplusFee;
-        this.integratorFeeParams = this.parseIntegratorFee(response);
+        this.integratorFeeParams = response.integratorFee && response.integratorFeeReceiver ? {
+            receiver: new Address(response.integratorFeeReceiver),
+            value: new Bps(BigInt(response.integratorFee)),
+            share: Bps.fromPercent(response.integratorFeeShare || 0)
+        } : undefined;
     }
     _create_class(Quote, [
         {
@@ -134,7 +138,7 @@ export var Quote = /*#__PURE__*/ function() {
                     orderExpirationDelay: paramsData === null || paramsData === void 0 ? void 0 : paramsData.orderExpirationDelay,
                     source: this.params.source,
                     enablePermit2: params.isPermit2,
-                    fees: buildFees(this.resolverFeePreset, this.integratorFeeParams, this.surplusFee)
+                    fees: buildFees(this.resolverFeePreset, this.params.integratorFee || this.integratorFeeParams, this.surplusFee)
                 };
                 return this._createOrder(paramsData.network, this.settlementAddress, orderInfo, details, extra);
             }
@@ -175,24 +179,6 @@ export var Quote = /*#__PURE__*/ function() {
                 }
                 return FusionOrder.new(settlementExtension, orderInfo, details, extra);
             }
-        },
-        {
-            key: "parseIntegratorFee",
-            value: function parseIntegratorFee(response) {
-                var _this_params_integratorFee_receiver, _this_params_integratorFee;
-                if (!response.integratorFee) {
-                    return undefined;
-                }
-                var receiver = response.integratorFeeReceiver || ((_this_params_integratorFee = this.params.integratorFee) === null || _this_params_integratorFee === void 0 ? void 0 : (_this_params_integratorFee_receiver = _this_params_integratorFee.receiver) === null || _this_params_integratorFee_receiver === void 0 ? void 0 : _this_params_integratorFee_receiver.toString());
-                if (!receiver) {
-                    return undefined;
-                }
-                return {
-                    receiver: new Address(receiver),
-                    value: new Bps(BigInt(response.integratorFee)),
-                    share: Bps.fromPercent(response.integratorFeeShare || 0)
-                };
-            }
         }
     ]);
     return Quote;

package/dist/esm/api/quoter/quote/types.js

@@ -2,23 +2,11 @@
      * Order will expire in `orderExpirationDelay` after auction ends
      * Default 12s
      */ /**
- * Integrator fee parameters for SDK requests.
- * Used when calling getQuote() or createOrder().
- */ /**
-     * Address which will receive integrator's portion of the fee.
-     */ /**
-     * How much to charge in basis points (1% = 100 bps)
-     */ /**
- * Integrator fee parameters from API response.
- * Contains authoritative values calculated by backend.
- */ /**
      * Address which will receive `share` of `value` fee, other part will be sent to protocol
      */ /**
-     * How much to charge in basis points
-     */ /**
-     * Integrator will receive only `share` part from charged fee (rest goes to protocol)
+     * How much to charge
      */ /**
- * @deprecated Use IntegratorFeeRequest for requests or IntegratorFeeResponse for responses
- */ export { }; /**
+     * Integrator will receive only `share` part from charged fee
+     */ export { }; /**
      * protocol address
      */