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

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

@@ -27,6 +27,58 @@ 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,
@@ -128,6 +180,7 @@ import { QuoterRequest } from './quoter.request.js';
 import { Quote } from './quote/index.js';
 import { PresetEnum } from './types.js';
 import { QuoterCustomPresetRequest } from './quoter-custom-preset.request.js';
+import { ONE_INCH_LIMIT_ORDER_V4 } from '../../constants.js';
 describe('Quoter API', function() {
     var httpProvider;
     beforeEach(function() {
@@ -239,7 +292,7 @@ describe('Quoter API', function() {
         ],
         fee: {
             whitelistDiscountPercent: 1,
-            receiver: '0x02f92800F57BCD74066F5709F1Daa1A4302Df875',
+            receiver: ONE_INCH_LIMIT_ORDER_V4,
             bps: 10
         },
         marketAmount: '626772029219852913'
@@ -261,7 +314,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&source=sdk&surplus=true');
+                    expect(httpProvider.get).toHaveBeenCalledWith('https://test.com/quoter/v2.0/1/quote/receive/?fromTokenAddress=0x6b175474e89094c44da98b954eedeac495271d0f&toTokenAddress=0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2&amount=1000000000000000000000&walletAddress=0x00000000219ab540356cbb839cbe05303d7705fa&surplus=true');
                     return [
                         2
                     ];
@@ -283,7 +336,6 @@ describe('Quoter API', function() {
                         amount: '1000000000000000000000',
                         walletAddress: '0x00000000219ab540356cbb839cbe05303d7705fa',
                         integratorFee: {
-                            share: Bps.fromPercent(50),
                             receiver: Address.fromBigInt(10n),
                             value: new Bps(1n)
                         },
@@ -319,7 +371,6 @@ describe('Quoter API', function() {
                         amount: '1000000000000000000000',
                         walletAddress: '0x00000000219ab540356cbb839cbe05303d7705fa',
                         integratorFee: {
-                            share: Bps.fromPercent(50),
                             receiver: Address.fromBigInt(10n),
                             value: new Bps(1n)
                         },
@@ -356,7 +407,6 @@ describe('Quoter API', function() {
                         amount: '1000000000000000000000',
                         walletAddress: '0x00000000219ab540356cbb839cbe05303d7705fa',
                         integratorFee: {
-                            share: Bps.fromPercent(50),
                             receiver: Address.fromBigInt(10n),
                             value: new Bps(1n)
                         },
@@ -409,7 +459,6 @@ describe('Quoter API', function() {
                         amount: '1000000000000000000000',
                         walletAddress: '0x00000000219ab540356cbb839cbe05303d7705fa',
                         integratorFee: {
-                            share: Bps.fromPercent(50),
                             receiver: Address.fromBigInt(10n),
                             value: new Bps(1n)
                         },
@@ -448,4 +497,52 @@ 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 || 'sdk';
+        this.source = params.source;
         var _params_isPermit2;
         this.isPermit2 = (_params_isPermit2 = params.isPermit2) !== null && _params_isPermit2 !== void 0 ? _params_isPermit2 : false;
         this.slippage = params.slippage;
@@ -66,9 +66,6 @@ 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,7 +9,6 @@ describe(__filename, function() {
                 amount: '1000000000000000000000',
                 walletAddress: '0x00000000219ab540356cbb839cbe05303d7705fa',
                 integratorFee: {
-                    share: Bps.fromPercent(50),
                     receiver: Address.fromBigInt(10n),
                     value: new Bps(1n)
                 }
@@ -22,7 +21,6 @@ describe(__filename, function() {
                 amount: '1000000000000000000000',
                 walletAddress: '0x00000000219ab540356cbb839cbe05303d7705fa',
                 integratorFee: {
-                    share: Bps.fromPercent(50),
                     receiver: Address.fromBigInt(10n),
                     value: new Bps(1n)
                 }
@@ -37,7 +35,6 @@ describe(__filename, function() {
                 amount: '1000000000000000000000',
                 walletAddress: '0x00000000219ab540356cbb839cbe05303d7705fa',
                 integratorFee: {
-                    share: Bps.fromPercent(50),
                     receiver: Address.fromBigInt(10n),
                     value: new Bps(1n)
                 }
@@ -52,7 +49,6 @@ describe(__filename, function() {
                 amount: '1000000000000000000000',
                 walletAddress: '0x0000000019ab540356cbb839be05303d7705fa1',
                 integratorFee: {
-                    share: Bps.fromPercent(50),
                     receiver: Address.fromBigInt(10n),
                     value: new Bps(1n)
                 }
@@ -67,14 +63,13 @@ 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('returns error if  fee is provided and source not', function() {
+    it('allows fee without source', function() {
         expect(function() {
             return QuoterRequest.new({
                 fromTokenAddress: '0x6b175474e89094c44da98b954eedeac495271d0f',
@@ -82,11 +77,10 @@ describe(__filename, function() {
                 amount: '1000000',
                 walletAddress: '0x00000000219ab540356cbb839cbe05303d7705fa',
                 integratorFee: {
-                    share: Bps.fromPercent(50),
                     receiver: Address.fromBigInt(10n),
                     value: new Bps(1n)
                 }
             });
-        }).toThrow(/cannot use fee without source/);
+        }).not.toThrow();
     });
 });

package/dist/esm/constants.js

@@ -1,16 +1,3 @@
-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;
-}
 export var ZX = '0x';
 export var NetworkEnum = /*#__PURE__*/ function(NetworkEnum) {
     NetworkEnum[NetworkEnum["ETHEREUM"] = 1] = "ETHEREUM";
@@ -28,9 +15,7 @@ export var NetworkEnum = /*#__PURE__*/ function(NetworkEnum) {
     NetworkEnum[NetworkEnum["UNICHAIN"] = 130] = "UNICHAIN";
     return NetworkEnum;
 }({});
-/** @deprecated Use ONE_INCH_LIMIT_ORDER_V4_ADDRESSES instead */ export var ONE_INCH_LIMIT_ORDER_V4 = '0x111111125421ca6dc452d289314280a0f8842a65';
-var _obj;
-export var ONE_INCH_LIMIT_ORDER_V4_ADDRESSES = (_obj = {}, _define_property(_obj, 324, '0x6fd4383cb451173d5f9304f041c7bcbf27d561ff'), _define_property(_obj, 1, '0x111111125421ca6dc452d289314280a0f8842a65'), _define_property(_obj, 137, '0x111111125421ca6dc452d289314280a0f8842a65'), _define_property(_obj, 56, '0x111111125421ca6dc452d289314280a0f8842a65'), _define_property(_obj, 42161, '0x111111125421ca6dc452d289314280a0f8842a65'), _define_property(_obj, 43114, '0x111111125421ca6dc452d289314280a0f8842a65'), _define_property(_obj, 10, '0x111111125421ca6dc452d289314280a0f8842a65'), _define_property(_obj, 250, '0x111111125421ca6dc452d289314280a0f8842a65'), _define_property(_obj, 100, '0x111111125421ca6dc452d289314280a0f8842a65'), _define_property(_obj, 8453, '0x111111125421ca6dc452d289314280a0f8842a65'), _define_property(_obj, 59144, '0x111111125421ca6dc452d289314280a0f8842a65'), _define_property(_obj, 146, '0x111111125421ca6dc452d289314280a0f8842a65'), _define_property(_obj, 130, '0x111111125421ca6dc452d289314280a0f8842a65'), _obj);
+export var ONE_INCH_LIMIT_ORDER_V4 = '0x111111125421ca6dc452d289314280a0f8842a65';
 export var UINT_160_MAX = (1n << 160n) - 1n;
 export var UINT_16_MAX = (1n << 16n) - 1n;
 export var UINT_80_MAX = (1n << 80n) - 1n;

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

@@ -30,13 +30,6 @@ function _define_property(obj, key, value) {
     }
     return obj;
 }
-function _instanceof(left, right) {
-    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
-        return !!right[Symbol.hasInstance](left);
-    } else {
-        return left instanceof right;
-    }
-}
 function _object_spread(target) {
     for(var i = 1; i < arguments.length; i++){
         var source = arguments[i] != null ? arguments[i] : {};
@@ -76,15 +69,11 @@ function _object_spread_props(target, source) {
     }
     return target;
 }
-import { Address, Extension, Interaction, LimitOrder, MakerTraits, randBigInt } from '@1inch/limit-order-sdk';
-import { UINT_256_MAX } from '@1inch/byte-utils';
+import { Address, Interaction, LimitOrder, MakerTraits } from '@1inch/limit-order-sdk';
 import assert from 'assert';
 import { FusionExtension } from './fusion-extension.js';
 import { injectTrackCode } from './source-track.js';
 import { SurplusParams } from './surplus-params.js';
-import { PermitTransferFrom } from './permit/permit-transfer-from.js';
-import { getPermit2ProxyAddress } from './permit/utils.js';
-import { decodeTransferFromSuffix } from './permit/transfer-from-suffix.js';
 import { AuctionCalculator } from '../amount-calculator/auction-calculator/index.js';
 import { ZX } from '../constants.js';
 import { calcTakingAmount } from '../utils/amounts.js';
@@ -98,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
         });
@@ -127,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);
         }
@@ -173,9 +166,6 @@ export var FusionOrder = /*#__PURE__*/ function() {
         {
             key: "makerAsset",
             get: function get() {
-                if (this.isTransferPermit()) {
-                    return this.decodeTransferPermitSuffix().token;
-                }
                 return this.inner.makerAsset;
             }
         },
@@ -272,48 +262,6 @@ export var FusionOrder = /*#__PURE__*/ function() {
                 return this.inner.salt;
             }
         },
-        {
-            key: "isTransferPermit",
-            value: /**
-     * Returns true if the order uses a Permit2 transfer permit via Permit2Proxy.
-     * Decodes `makerAssetSuffix` and validates the Permit2 ABI structure.
-     *
-     * @see FusionOrder.withTransferPermit
-     * @see FusionOrder.createTransferPermit
-     */ function isTransferPermit() {
-                try {
-                    this.decodeTransferPermitSuffix();
-                    return true;
-                } catch (e) {
-                    return false;
-                }
-            }
-        },
-        {
-            key: "withTransferPermit",
-            value: function withTransferPermit(permit, signature) {
-                var suffix = permit.getTransferFromSuffix(signature);
-                var currentExtension = this.inner.extension;
-                var newExtension = new Extension(_object_spread_props(_object_spread({}, currentExtension), {
-                    makerAssetSuffix: suffix
-                }));
-                this.inner.makerTraits.disablePermit2();
-                var baseSalt = this.inner.salt >> 160n;
-                var newSalt = LimitOrder.buildSalt(newExtension, baseSalt);
-                this.inner = new LimitOrder({
-                    maker: this.inner.maker,
-                    makerAsset: permit.spender,
-                    takerAsset: this.inner.takerAsset,
-                    makingAmount: this.inner.makingAmount,
-                    takingAmount: this.inner.takingAmount,
-                    receiver: this.inner.receiver,
-                    salt: newSalt
-                }, this.inner.makerTraits, newExtension, {
-                    optimizeReceiverAddress: false
-                });
-                return this;
-            }
-        },
         {
             key: "build",
             value: function build() {
@@ -509,67 +457,6 @@ export var FusionOrder = /*#__PURE__*/ function() {
      */ function nativeSignature(maker) {
                 return this.inner.nativeSignature(maker);
             }
-        },
-        {
-            key: "createTransferPermit",
-            value: /**
-     * Creates a Permit2 `PermitTransferFrom` object for the order's maker asset.
-     *
-     * Can only be used for orders where `multipleFillsAllowed` is `false`.
-     *
-     * The returned permit authorizes the `permit2Proxy` address (as spender)
-     * to transfer up to `makingAmount` of the `makerAsset` token,
-     * with a random 256-bit nonce and the order's deadline.
-     *
-     * The resulting permit can be signed and then attached to the order
-     * via {@link FusionOrder.withTransferPermit}.
-     *
-     * @param chainId - The chain ID used to resolve the default Permit2Proxy address
-     * @param permit2Proxy - Optional address of the Permit2Proxy contract that will act as spender.
-     *                       Defaults to the built-in address for the given `chainId`.
-     * @returns A {@link PermitTransferFrom} instance that can be signed and attached to the order
-     *
-     * @throws If `multipleFillsAllowed` is `true`
-     *
-     * @see FusionOrder.withTransferPermit
-     */ function createTransferPermit(chainIdOrPermit2Proxy, permit2Proxy) {
-                assert(!this.multipleFillsAllowed, 'transfer permit can be used only for orders where multipleFillsAllowed=false');
-                var spender = _instanceof(chainIdOrPermit2Proxy, Address) ? chainIdOrPermit2Proxy : permit2Proxy !== null && permit2Proxy !== void 0 ? permit2Proxy : getPermit2ProxyAddress(chainIdOrPermit2Proxy);
-                return new PermitTransferFrom(this.makerAsset, this.makingAmount, spender, randBigInt(UINT_256_MAX), this.deadline);
-            }
-        },
-        {
-            key: "restoreMakerAssetSuffix",
-            value: /**
-     * Restores the original `makerAssetSuffix` that `FusionExtension.build()` does not preserve.
-     * Recomputes the salt to match the patched extension hash.
-     */ function restoreMakerAssetSuffix(makerAssetSuffix) {
-                var patchedExtension = new Extension(_object_spread_props(_object_spread({}, this.inner.extension), {
-                    makerAssetSuffix: makerAssetSuffix
-                }));
-                var baseSalt = this.inner.salt >> 160n;
-                this.inner = new LimitOrder({
-                    maker: this.inner.maker,
-                    makerAsset: this.inner.makerAsset,
-                    takerAsset: this.inner.takerAsset,
-                    makingAmount: this.inner.makingAmount,
-                    takingAmount: this.inner.takingAmount,
-                    receiver: this.inner.receiver,
-                    salt: LimitOrder.buildSalt(patchedExtension, baseSalt)
-                }, this.inner.makerTraits, patchedExtension, {
-                    optimizeReceiverAddress: false
-                });
-            }
-        },
-        {
-            key: "decodeTransferPermitSuffix",
-            value: function decodeTransferPermitSuffix() {
-                var suffix = this.inner.extension.makerAssetSuffix;
-                if (suffix === ZX) {
-                    throw new Error('no makerAssetSuffix');
-                }
-                return decodeTransferFromSuffix(suffix);
-            }
         }
     ], [
         {
@@ -644,14 +531,12 @@ 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,
                     optimizeReceiverAddress: true
                 });
-                if (extension.makerAssetSuffix !== ZX) {
-                    fusionOrder.restoreMakerAssetSuffix(extension.makerAssetSuffix);
-                }
                 assert(providedSalt === fusionOrder.salt, 'invalid salt for passed extension');
                 return fusionOrder;
             }