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

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

@@ -9,10 +9,14 @@ 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");
@@ -50,6 +54,13 @@ 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
@@ -177,6 +188,9 @@ var FusionOrder = /*#__PURE__*/ function() {
         {
             key: "makerAsset",
             get: function get() {
+                if (this.isTransferPermit()) {
+                    return this.decodeTransferPermitSuffix().token;
+                }
                 return this.inner.makerAsset;
             }
         },
@@ -273,6 +287,48 @@ 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() {
@@ -468,6 +524,67 @@ 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);
+            }
         }
     ], [
         {
@@ -547,6 +664,9 @@ var FusionOrder = /*#__PURE__*/ function() {
                     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,4 +465,104 @@ 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, [
+                    {
+                        address: new _limitordersdk.Address('0x00000000219ab540356cbb839cbe05303d7705fa'),
+                        allowFrom: 0n
+                    }
+                ]),
+                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, [
+                    {
+                        address: new _limitordersdk.Address('0x00000000219ab540356cbb839cbe05303d7705fa'),
+                        allowFrom: 0n
+                    }
+                ]),
+                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);
+        });
+        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');
+        });
+    });
 });

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

@@ -16,6 +16,7 @@ _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/fusion-order/permit/constants.js

@@ -0,0 +1,98 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    PERMIT2_ADDRESSES: function() {
+        return PERMIT2_ADDRESSES;
+    },
+    PERMIT2_DOMAIN_NAME: function() {
+        return PERMIT2_DOMAIN_NAME;
+    },
+    PERMIT2_PROXY_ADDRESSES: function() {
+        return PERMIT2_PROXY_ADDRESSES;
+    },
+    PERMIT_TRANSFER_FROM_TYPES: function() {
+        return PERMIT_TRANSFER_FROM_TYPES;
+    },
+    TOKEN_PERMISSIONS: function() {
+        return TOKEN_PERMISSIONS;
+    }
+});
+var _constants = require("../../constants.js");
+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;
+}
+var PERMIT2_ADDRESS = '0x000000000022D473030F116dDEE9F6B43aC78BA3';
+var PERMIT2_ADDRESS_ZK = '0x0000000000225e31d15943971f47ad3022f714fa';
+var _obj;
+var PERMIT2_ADDRESSES = (_obj = {}, _define_property(_obj, _constants.NetworkEnum.ZKSYNC, PERMIT2_ADDRESS_ZK), _define_property(_obj, _constants.NetworkEnum.ARBITRUM, PERMIT2_ADDRESS), _define_property(_obj, _constants.NetworkEnum.ETHEREUM, PERMIT2_ADDRESS), _define_property(_obj, _constants.NetworkEnum.POLYGON, PERMIT2_ADDRESS), _define_property(_obj, _constants.NetworkEnum.BINANCE, PERMIT2_ADDRESS), _define_property(_obj, _constants.NetworkEnum.AVALANCHE, PERMIT2_ADDRESS), _define_property(_obj, _constants.NetworkEnum.OPTIMISM, PERMIT2_ADDRESS), _define_property(_obj, _constants.NetworkEnum.FANTOM, PERMIT2_ADDRESS), _define_property(_obj, _constants.NetworkEnum.GNOSIS, PERMIT2_ADDRESS), _define_property(_obj, _constants.NetworkEnum.COINBASE, PERMIT2_ADDRESS), _define_property(_obj, _constants.NetworkEnum.LINEA, PERMIT2_ADDRESS), _define_property(_obj, _constants.NetworkEnum.SONIC, PERMIT2_ADDRESS), _define_property(_obj, _constants.NetworkEnum.UNICHAIN, PERMIT2_ADDRESS), _obj);
+// todo: update
+var PERMIT2_PROXY_ADDRESS = '0xcf56da25062c954b252515244dfefb739c254c23';
+var PERMIT2_PROXY_ADDRESS_ZK = '0x0000000000000000000000000000000000000000';
+var _obj1;
+var PERMIT2_PROXY_ADDRESSES = (_obj1 = {}, _define_property(_obj1, _constants.NetworkEnum.ZKSYNC, PERMIT2_PROXY_ADDRESS_ZK), _define_property(_obj1, _constants.NetworkEnum.ARBITRUM, PERMIT2_PROXY_ADDRESS), _define_property(_obj1, _constants.NetworkEnum.ETHEREUM, PERMIT2_PROXY_ADDRESS), _define_property(_obj1, _constants.NetworkEnum.POLYGON, PERMIT2_PROXY_ADDRESS), _define_property(_obj1, _constants.NetworkEnum.BINANCE, PERMIT2_PROXY_ADDRESS), _define_property(_obj1, _constants.NetworkEnum.AVALANCHE, PERMIT2_PROXY_ADDRESS), _define_property(_obj1, _constants.NetworkEnum.OPTIMISM, PERMIT2_PROXY_ADDRESS), _define_property(_obj1, _constants.NetworkEnum.FANTOM, PERMIT2_PROXY_ADDRESS), _define_property(_obj1, _constants.NetworkEnum.GNOSIS, PERMIT2_PROXY_ADDRESS), _define_property(_obj1, _constants.NetworkEnum.COINBASE, PERMIT2_PROXY_ADDRESS), _define_property(_obj1, _constants.NetworkEnum.LINEA, PERMIT2_PROXY_ADDRESS), _define_property(_obj1, _constants.NetworkEnum.SONIC, PERMIT2_PROXY_ADDRESS), _define_property(_obj1, _constants.NetworkEnum.UNICHAIN, PERMIT2_PROXY_ADDRESS), _obj1);
+var PERMIT2_DOMAIN_NAME = 'Permit2';
+var TOKEN_PERMISSIONS = {
+    TokenPermissions: [
+        {
+            name: 'token',
+            type: 'address'
+        },
+        {
+            name: 'amount',
+            type: 'uint256'
+        }
+    ]
+};
+var PERMIT_TRANSFER_FROM_TYPES = _object_spread({
+    PermitTransferFrom: [
+        {
+            name: 'permitted',
+            type: 'TokenPermissions'
+        },
+        {
+            name: 'spender',
+            type: 'address'
+        },
+        {
+            name: 'nonce',
+            type: 'uint256'
+        },
+        {
+            name: 'deadline',
+            type: 'uint256'
+        }
+    ]
+}, TOKEN_PERMISSIONS);

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

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    getPermit2Address: function() {
+        return _utils.getPermit2Address;
+    },
+    getPermit2ProxyAddress: function() {
+        return _utils.getPermit2ProxyAddress;
+    }
+});
+_export_star(require("./permit-transfer-from.js"), exports);
+_export_star(require("./transfer-from-suffix.js"), exports);
+var _utils = require("./utils.js");
+function _export_star(from, to) {
+    Object.keys(from).forEach(function(k) {
+        if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
+            Object.defineProperty(to, k, {
+                enumerable: true,
+                get: function() {
+                    return from[k];
+                }
+            });
+        }
+    });
+    return from;
+}

package/dist/cjs/fusion-order/permit/permit-transfer-from.js

@@ -0,0 +1,115 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "PermitTransferFrom", {
+    enumerable: true,
+    get: function() {
+        return PermitTransferFrom;
+    }
+});
+var _constants = require("./constants.js");
+var _utils = require("./utils.js");
+var _transferfromsuffix = require("./transfer-from-suffix.js");
+function _class_call_check(instance, Constructor) {
+    if (!(instance instanceof Constructor)) {
+        throw new TypeError("Cannot call a class as a function");
+    }
+}
+function _defineProperties(target, props) {
+    for(var i = 0; i < props.length; i++){
+        var descriptor = props[i];
+        descriptor.enumerable = descriptor.enumerable || false;
+        descriptor.configurable = true;
+        if ("value" in descriptor) descriptor.writable = true;
+        Object.defineProperty(target, descriptor.key, descriptor);
+    }
+}
+function _create_class(Constructor, protoProps, staticProps) {
+    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
+    if (staticProps) _defineProperties(Constructor, staticProps);
+    return Constructor;
+}
+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;
+}
+var PermitTransferFrom = /*#__PURE__*/ function() {
+    "use strict";
+    function PermitTransferFrom(token, maxSpendAmount, spender, nonce, deadline) {
+        _class_call_check(this, PermitTransferFrom);
+        _define_property(this, "token", void 0);
+        _define_property(this, "maxSpendAmount", void 0);
+        _define_property(this, "spender", void 0);
+        _define_property(this, "nonce", void 0);
+        _define_property(this, "deadline", void 0);
+        this.token = token;
+        this.maxSpendAmount = maxSpendAmount;
+        this.spender = spender;
+        this.nonce = nonce;
+        this.deadline = deadline;
+    }
+    _create_class(PermitTransferFrom, [
+        {
+            key: "getTypedData",
+            value: function getTypedData(chainId) {
+                var permit2Address = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : (0, _utils.getPermit2Address)(chainId);
+                return {
+                    primaryType: 'PermitTransferFrom',
+                    types: _object_spread({}, _constants.PERMIT_TRANSFER_FROM_TYPES),
+                    domain: {
+                        name: _constants.PERMIT2_DOMAIN_NAME,
+                        chainId: chainId,
+                        verifyingContract: permit2Address
+                    },
+                    message: {
+                        permitted: {
+                            token: this.token.toString(),
+                            amount: this.maxSpendAmount
+                        },
+                        spender: this.spender.toString(),
+                        nonce: this.nonce,
+                        deadline: this.deadline
+                    }
+                };
+            }
+        },
+        {
+            key: "getTransferFromSuffix",
+            value: /**
+     * ABI-encodes the Permit2 suffix appended to `transferFrom(from,to,amount)` calldata.
+     *
+     * The limit order protocol calls `_callTransferFromWithSuffix` on the Permit2Proxy,
+     * which has `func_nZHTch(address,address,uint256,((address,uint256),uint256,uint256),bytes)`
+     * with selector 0x23b872dd (same as transferFrom). The suffix is everything after (from,to,amount).
+     */ function getTransferFromSuffix(signature) {
+                return (0, _transferfromsuffix.encodeTransferFromSuffix)(this.token, this.maxSpendAmount, this.nonce, this.deadline, signature);
+            }
+        }
+    ]);
+    return PermitTransferFrom;
+}();