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

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

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

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

@@ -9,14 +9,10 @@ Object.defineProperty(exports, "FusionOrder", {
     }
 });
 var _limitordersdk = require("@1inch/limit-order-sdk");
-var _byteutils = require("@1inch/byte-utils");
 var _assert = /*#__PURE__*/ _interop_require_default(require("assert"));
 var _fusionextension = require("./fusion-extension.js");
 var _sourcetrack = require("./source-track.js");
 var _surplusparams = require("./surplus-params.js");
-var _permittransferfrom = require("./permit/permit-transfer-from.js");
-var _utils = require("./permit/utils.js");
-var _transferfromsuffix = require("./permit/transfer-from-suffix.js");
 var _index = require("../amount-calculator/auction-calculator/index.js");
 var _constants = require("../constants.js");
 var _amounts = require("../utils/amounts.js");
@@ -54,13 +50,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 _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -113,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
         });
@@ -142,6 +132,9 @@ var FusionOrder = /*#__PURE__*/ function() {
         if (enablePermit2) {
             makerTraits.enablePermit2();
         }
+        if (extra.preInteraction) {
+            makerTraits.enablePreInteraction();
+        }
         if (extra.nonce !== undefined) {
             makerTraits.withNonce(extra.nonce);
         }
@@ -188,9 +181,6 @@ var FusionOrder = /*#__PURE__*/ function() {
         {
             key: "makerAsset",
             get: function get() {
-                if (this.isTransferPermit()) {
-                    return this.decodeTransferPermitSuffix().token;
-                }
                 return this.inner.makerAsset;
             }
         },
@@ -287,48 +277,6 @@ 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 _limitordersdk.Extension(_object_spread_props(_object_spread({}, currentExtension), {
-                    makerAssetSuffix: suffix
-                }));
-                this.inner.makerTraits.disablePermit2();
-                var baseSalt = this.inner.salt >> 160n;
-                var newSalt = _limitordersdk.LimitOrder.buildSalt(newExtension, baseSalt);
-                this.inner = new _limitordersdk.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() {
@@ -524,67 +472,6 @@ 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) {
-                (0, _assert.default)(!this.multipleFillsAllowed, 'transfer permit can be used only for orders where multipleFillsAllowed=false');
-                var spender = _instanceof(chainIdOrPermit2Proxy, _limitordersdk.Address) ? chainIdOrPermit2Proxy : permit2Proxy !== null && permit2Proxy !== void 0 ? permit2Proxy : (0, _utils.getPermit2ProxyAddress)(chainIdOrPermit2Proxy);
-                return new _permittransferfrom.PermitTransferFrom(this.makerAsset, this.makingAmount, spender, (0, _limitordersdk.randBigInt)(_byteutils.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 _limitordersdk.Extension(_object_spread_props(_object_spread({}, this.inner.extension), {
-                    makerAssetSuffix: makerAssetSuffix
-                }));
-                var baseSalt = this.inner.salt >> 160n;
-                this.inner = new _limitordersdk.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: _limitordersdk.LimitOrder.buildSalt(patchedExtension, baseSalt)
-                }, this.inner.makerTraits, patchedExtension, {
-                    optimizeReceiverAddress: false
-                });
-            }
-        },
-        {
-            key: "decodeTransferPermitSuffix",
-            value: function decodeTransferPermitSuffix() {
-                var suffix = this.inner.extension.makerAssetSuffix;
-                if (suffix === _constants.ZX) {
-                    throw new Error('no makerAssetSuffix');
-                }
-                return (0, _transferfromsuffix.decodeTransferFromSuffix)(suffix);
-            }
         }
     ], [
         {
@@ -659,14 +546,12 @@ 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,
                     optimizeReceiverAddress: true
                 });
-                if (extension.makerAssetSuffix !== _constants.ZX) {
-                    fusionOrder.restoreMakerAssetSuffix(extension.makerAssetSuffix);
-                }
                 (0, _assert.default)(providedSalt === fusionOrder.salt, 'invalid salt for passed extension');
                 return fusionOrder;
             }

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

@@ -465,104 +465,135 @@ describe('FusionOrder Native', function() {
         });
         expect(nativeOrder.build().receiver).toEqual(settlementExt.toString());
     });
-    describe('isTransferPermit', function() {
-        var extensionContract = new _limitordersdk.Address('0x8273f37417da37c4a6c3995e82cf442f87a25d9c');
-        var permit2Proxy = new _limitordersdk.Address('0x1234567890abcdef1234567890abcdef12345678');
-        var baseOrder = function() {
-            return _fusionorder.FusionOrder.new(extensionContract, {
-                makerAsset: new _limitordersdk.Address('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'),
-                takerAsset: new _limitordersdk.Address('0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48'),
-                makingAmount: (0, _ethers.parseEther)('1'),
-                takingAmount: (0, _ethers.parseUnits)('1000', 6),
-                maker: new _limitordersdk.Address('0x00000000219ab540356cbb839cbe05303d7705fa')
-            }, {
-                auction: new _index.AuctionDetails({
-                    duration: 180n,
-                    startTime: 1673548149n,
-                    initialRateBump: 0,
-                    points: []
-                }),
-                whitelist: _index1.Whitelist.new(1673548139n, [
+});
+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: [
                     {
-                        address: new _limitordersdk.Address('0x00000000219ab540356cbb839cbe05303d7705fa'),
-                        allowFrom: 0n
+                        coefficient: 20000,
+                        delay: 12
                     }
-                ]),
-                surplus: _surplusparams.SurplusParams.NO_FEE
-            }, {
-                allowPartialFills: false,
-                allowMultipleFills: false,
-                nonce: 1n
-            });
-        };
-        it('should return false for regular order', function() {
-            var order = _fusionorder.FusionOrder.new(extensionContract, {
-                makerAsset: new _limitordersdk.Address('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'),
-                takerAsset: new _limitordersdk.Address('0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48'),
-                makingAmount: (0, _ethers.parseEther)('1'),
-                takingAmount: (0, _ethers.parseUnits)('1000', 6),
-                maker: new _limitordersdk.Address('0x00000000219ab540356cbb839cbe05303d7705fa')
-            }, {
-                auction: new _index.AuctionDetails({
-                    duration: 180n,
-                    startTime: 1673548149n,
-                    initialRateBump: 0,
-                    points: []
-                }),
-                whitelist: _index1.Whitelist.new(1673548139n, [
+                ]
+            }),
+            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: [
                     {
-                        address: new _limitordersdk.Address('0x00000000219ab540356cbb839cbe05303d7705fa'),
-                        allowFrom: 0n
+                        coefficient: 20000,
+                        delay: 12
                     }
-                ]),
-                surplus: _surplusparams.SurplusParams.NO_FEE
-            });
-            expect(order.isTransferPermit()).toBe(false);
-        });
-        it('should return true after withTransferPermit', function() {
-            var order = baseOrder();
-            var permit = order.createTransferPermit(permit2Proxy);
-            var fakeSignature = '0x' + 'ab'.repeat(65);
-            var orderWithPermit = order.withTransferPermit(permit, fakeSignature);
-            expect(orderWithPermit.isTransferPermit()).toBe(true);
-        });
-        it('should return real token as makerAsset after withTransferPermit', function() {
-            var weth = new _limitordersdk.Address('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2');
-            var order = baseOrder();
-            var permit = order.createTransferPermit(permit2Proxy);
-            var fakeSignature = '0x' + 'ab'.repeat(65);
-            var orderWithPermit = order.withTransferPermit(permit, fakeSignature);
-            expect(orderWithPermit.makerAsset).toEqual(weth);
-        });
-        it('should round-trip Permit2 order through fromDataAndExtension', function() {
-            var order = baseOrder();
-            var permit = order.createTransferPermit(permit2Proxy);
-            var fakeSignature = '0x' + 'ab'.repeat(65);
-            var orderWithPermit = order.withTransferPermit(permit, fakeSignature);
-            var built = orderWithPermit.build();
-            var rebuilt = _fusionorder.FusionOrder.fromDataAndExtension(built, orderWithPermit.extension);
-            expect(rebuilt.isTransferPermit()).toBe(true);
-            expect(rebuilt.makerAsset).toEqual(orderWithPermit.makerAsset);
-            expect(rebuilt.salt).toEqual(orderWithPermit.salt);
-            expect(rebuilt.build()).toEqual(built);
+                ]
+            }),
+            whitelist: _index1.Whitelist.new(1673548139n, [
+                {
+                    address: new _limitordersdk.Address('0x00000000219ab540356cbb839cbe05303d7705fa'),
+                    allowFrom: 0n
+                }
+            ]),
+            surplus: _surplusparams.SurplusParams.NO_FEE
         });
-        it('should reject tampered makerAssetSuffix via salt check', function() {
-            var order = baseOrder();
-            var ext = order.extension;
-            var tampered = new _limitordersdk.Extension({
-                makerAssetSuffix: '0xdeadbeef',
-                takerAssetSuffix: ext.takerAssetSuffix,
-                makingAmountData: ext.makingAmountData,
-                takingAmountData: ext.takingAmountData,
-                predicate: ext.predicate,
-                makerPermit: ext.makerPermit,
-                preInteraction: ext.preInteraction,
-                postInteraction: ext.postInteraction,
-                customData: ext.customData
-            });
-            expect(function() {
-                return _fusionorder.FusionOrder.fromDataAndExtension(order.build(), tampered);
-            }).toThrow('invalid salt for passed extension');
+        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/cjs/fusion-order/index.js

@@ -16,7 +16,6 @@ _export_star(require("./fees/index.js"), exports);
 var _constants = require("./constants.js");
 _export_star(require("./surplus-params.js"), exports);
 _export_star(require("./cancellation-auction.js"), exports);
-_export_star(require("./permit/index.js"), exports);
 function _export_star(from, to) {
     Object.keys(from).forEach(function(k) {
         if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {

package/dist/cjs/index.js

@@ -15,6 +15,9 @@ _export(exports, {
     AmountMode: function() {
         return _limitordersdk.AmountMode;
     },
+    Bps: function() {
+        return _limitordersdk.Bps;
+    },
     Extension: function() {
         return _limitordersdk.Extension;
     },

package/dist/cjs/sdk/README.md

@@ -204,12 +204,11 @@ sdk.placeOrder({
     toTokenAddress: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48', // USDC
     amount: '50000000000000000', // 0.05 ETH
     walletAddress: makerAddress,
-    // fee is an optional field
-    fee: {
-        takingFeeBps: 100, // 1% as we use bps format, 1% is equal to 100bps
-        takingFeeReceiver: '0x0000000000000000000000000000000000000000' //  fee receiver address
-    },
-    source: 'platform-name'
+    // integratorFee is an optional field
+    integratorFee: {
+        receiver: new Address('0x0000000000000000000000000000000000000000'), //  fee receiver address
+        value: new Bps(100n) // 1% as we use bps format, 1% is equal to 100bps
+    }
 }).then(console.log)
 ```
 
@@ -224,6 +223,15 @@ type PaginationParams = {
 }
 ```
 
+### IntegratorFeeRequest
+
+```typescript
+type IntegratorFeeRequest = {
+    receiver: Address // fee receiver address
+    value: Bps // 100 == 1%
+}
+```
+
 ### QuoteParams
 
 ```typescript
@@ -231,8 +239,9 @@ type QuoteParams = {
     fromTokenAddress: string
     toTokenAddress: string
     amount: string
+    walletAddress?: string
     permit?: string // a permit (EIP-2612) call data, user approval sign
-    takingFeeBps?: number // 100 == 1%
+    integratorFee?: IntegratorFeeRequest
 }
 ```
 
@@ -253,12 +262,7 @@ type OrderParams = {
     permit?: string // a permit (EIP-2612) call data, user approval sign
     receiver?: string // address
     preset?: PresetEnum
-    nonce?: OrderNonce | string | number // allows to batch cancel orders. by default: not used
-    fee?: TakingFeeInfo
-}
-
-export type TakingFeeInfo = {
-    takingFeeBps: number // 100 == 1%
-    takingFeeReceiver: string
+    nonce?: bigint // allows to batch cancel orders
+    integratorFee?: IntegratorFeeRequest
 }
 ```

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

@@ -87,11 +87,7 @@ export var Quote = /*#__PURE__*/ function() {
             bps: new Bps(BigInt(response.fee.bps))
         };
         this.surplusFee = response.surplusFee;
-        this.integratorFeeParams = response.integratorFee && response.integratorFeeReceiver ? {
-            receiver: new Address(response.integratorFeeReceiver),
-            value: new Bps(BigInt(response.integratorFee)),
-            share: Bps.fromPercent(response.integratorFeeShare || 0)
-        } : undefined;
+        this.integratorFeeParams = this.parseIntegratorFee(response);
     }
     _create_class(Quote, [
         {
@@ -138,7 +134,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.params.integratorFee || this.integratorFeeParams, this.surplusFee)
+                    fees: buildFees(this.resolverFeePreset, this.integratorFeeParams, this.surplusFee)
                 };
                 return this._createOrder(paramsData.network, this.settlementAddress, orderInfo, details, extra);
             }
@@ -179,6 +175,24 @@ 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,11 +2,23 @@
      * 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
+     * How much to charge in basis points
+     */ /**
+     * Integrator will receive only `share` part from charged fee (rest goes to protocol)
      */ /**
-     * Integrator will receive only `share` part from charged fee
-     */ export { }; /**
+ * @deprecated Use IntegratorFeeRequest for requests or IntegratorFeeResponse for responses
+ */ export { }; /**
      * protocol address
      */