@1inch/fusion-sdk 2.3.9-rc.0 → 2.3.9-rc.10

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

@@ -17,6 +17,7 @@ var _preset = require("../preset.js");
 var _index = require("../../../fusion-order/index.js");
 var _constants = require("../../../fusion-order/constants.js");
 var _index1 = require("../../../fusion-order/fees/index.js");
+var _index2 = require("../../../index.js");
 function _class_call_check(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
@@ -66,7 +67,7 @@ var Quote = /*#__PURE__*/ function() {
         /**
      * Native asset extension address
      * @see https://github.com/1inch/limit-order-settlement todo: update link
-     */ _define_property(this, "ethOrdersAddress", void 0);
+     */ _define_property(this, "nativeOrderFactory", void 0);
         _define_property(this, "fromTokenAmount", void 0);
         _define_property(this, "presets", void 0);
         _define_property(this, "recommendedPreset", void 0);
@@ -95,7 +96,7 @@ var Quote = /*#__PURE__*/ function() {
         this.recommendedPreset = response.recommended_preset;
         this.slippage = response.autoK;
         this.settlementAddress = new _limitordersdk.Address(response.settlementAddress);
-        this.ethOrdersAddress = response.ethOrdersAddress ? new _limitordersdk.Address(response.ethOrdersAddress) : undefined;
+        this.nativeOrderFactory = response.nativeOrderFactoryAddress && response.nativeOrderImplAddress ? new _index2.ProxyFactory(new _limitordersdk.Address(response.nativeOrderFactoryAddress), new _limitordersdk.Address(response.nativeOrderImplAddress)) : undefined;
         this.resolverFeePreset = {
             receiver: new _limitordersdk.Address(response.fee.receiver),
             whitelistDiscountPercent: _limitordersdk.Bps.fromPercent(response.fee.whitelistDiscountPercent),
@@ -118,6 +119,7 @@ var Quote = /*#__PURE__*/ function() {
                     permit: this.params.permit,
                     isPermit2: this.params.isPermit2,
                     nonce: paramsData === null || paramsData === void 0 ? void 0 : paramsData.nonce,
+                    delayAuctionStartTimeBy: paramsData === null || paramsData === void 0 ? void 0 : paramsData.delayAuctionStartTimeBy,
                     network: paramsData.network
                 });
                 var preset = this.getPreset(params.preset);
@@ -188,8 +190,8 @@ var Quote = /*#__PURE__*/ function() {
             key: "_createOrder",
             value: function _createOrder(chainId, settlementExtension, orderInfo, details, extra) {
                 if (this.params.fromTokenAddress.isNative()) {
-                    (0, _assert.default)(this.ethOrdersAddress, 'expected ethOrdersAddress to be set for order from native asset');
-                    return _index.FusionOrderFromNative.fromNative(chainId, this.ethOrdersAddress, settlementExtension, orderInfo, details, extra);
+                    (0, _assert.default)(this.nativeOrderFactory, 'expected nativeOrderFactory to be set for order from native asset');
+                    return _index.FusionOrder.fromNative(chainId, this.nativeOrderFactory, settlementExtension, orderInfo, details, extra);
                 }
                 return _index.FusionOrder.new(settlementExtension, orderInfo, details, extra);
             }

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

@@ -67,9 +67,6 @@ var QuoterRequest = /*#__PURE__*/ function() {
         var _params_isPermit2;
         this.isPermit2 = (_params_isPermit2 = params.isPermit2) !== null && _params_isPermit2 !== void 0 ? _params_isPermit2 : false;
         this.slippage = params.slippage;
-        if (this.fromTokenAddress.isNative()) {
-            throw new Error("cannot swap ".concat(_limitordersdk.Address.NATIVE_CURRENCY, ": wrap native currency to it's wrapper fist"));
-        }
         if (this.fromTokenAddress.isZero() || this.toTokenAddress.isZero()) {
             throw new Error("replace ".concat(_limitordersdk.Address.ZERO_ADDRESS, " with ").concat(_limitordersdk.Address.NATIVE_CURRENCY));
         }

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

@@ -5,21 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 var _limitordersdk = require("@1inch/limit-order-sdk");
 var _quoterrequest = require("./quoter.request.js");
 describe(__filename, function() {
-    it('should return error if native currency', function() {
-        expect(function() {
-            return _quoterrequest.QuoterRequest.new({
-                fromTokenAddress: _limitordersdk.Address.NATIVE_CURRENCY.toString(),
-                toTokenAddress: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-                amount: '1000000000000000000000',
-                walletAddress: '0x00000000219ab540356cbb839cbe05303d7705fa',
-                integratorFee: {
-                    share: _limitordersdk.Bps.fromPercent(50),
-                    receiver: _limitordersdk.Address.fromBigInt(10n),
-                    value: new _limitordersdk.Bps(1n)
-                }
-            });
-        }).toThrow(/wrap native currency/);
-    });
     it('returns error fromTokenAddress or toTokenAddress equals ZERO_ADDRESS', function() {
         expect(function() {
             return _quoterrequest.QuoterRequest.new({

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

@@ -14,8 +14,6 @@ Object.defineProperty(exports, "PresetEnum", {
      * Optional slippage value in percent (e.g., 1 for 1%, max 50)
      * Must be between 1 and 50 inclusive
      */ /**
-     * Present if src token is native
-     */ /**
      * In bps
      */ /**
      * Percentage of the integrator fee that will be shared with the integrator.

package/dist/cjs/contracts/index.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+_export_star(require("./native-order-factory.js"), exports);
+_export_star(require("./native-order-impl.js"), exports);
+_export_star(require("./proxy-factory.js"), exports);
+_export_star(require("./types.js"), exports);
+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/contracts/native-order-factory.js

@@ -0,0 +1,115 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "NativeOrdersFactory", {
+    enumerable: true,
+    get: function() {
+        return NativeOrdersFactory;
+    }
+});
+var _ethers = require("ethers");
+var _NativeOrderFactoryabijson = /*#__PURE__*/ _interop_require_default(require("../abi/NativeOrderFactory.abi.json"));
+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 _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: 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;
+}
+var NativeOrdersFactory = /*#__PURE__*/ function() {
+    "use strict";
+    function NativeOrdersFactory(address) {
+        _class_call_check(this, NativeOrdersFactory);
+        _define_property(this, "address", void 0);
+        _define_property(this, "iface", void 0);
+        this.address = address;
+        this.iface = new _ethers.Interface(_NativeOrderFactoryabijson.default);
+    }
+    _create_class(NativeOrdersFactory, [
+        {
+            key: "create",
+            value: function create(maker, order) {
+                return {
+                    to: this.address,
+                    value: order.makingAmount,
+                    data: this.iface.encodeFunctionData('create', [
+                        _object_spread_props(_object_spread({}, order.build()), {
+                            maker: maker.toString()
+                        })
+                    ])
+                };
+            }
+        }
+    ]);
+    return NativeOrdersFactory;
+}();

package/dist/cjs/contracts/native-order-impl.js

@@ -0,0 +1,130 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "NativeOrdersImpl", {
+    enumerable: true,
+    get: function() {
+        return NativeOrdersImpl;
+    }
+});
+var _ethers = require("ethers");
+var _NativeOrderImplabijson = /*#__PURE__*/ _interop_require_default(require("../abi/NativeOrderImpl.abi.json"));
+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 _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: 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;
+}
+var NativeOrdersImpl = /*#__PURE__*/ function() {
+    "use strict";
+    function NativeOrdersImpl(address) {
+        _class_call_check(this, NativeOrdersImpl);
+        _define_property(this, "address", void 0);
+        _define_property(this, "iface", void 0);
+        this.address = address;
+        this.iface = new _ethers.Interface(_NativeOrderImplabijson.default);
+    }
+    _create_class(NativeOrdersImpl, [
+        {
+            key: "cancel",
+            value: function cancel(maker, order) {
+                return {
+                    to: this.address,
+                    value: 0n,
+                    data: this.iface.encodeFunctionData('cancelOrder', [
+                        _object_spread_props(_object_spread({}, order), {
+                            maker: maker.toString()
+                        })
+                    ])
+                };
+            }
+        },
+        {
+            key: "cancelExpiredOrderByResolver",
+            value: function cancelExpiredOrderByResolver(maker, order, rewardLimit) {
+                return {
+                    to: this.address,
+                    value: 0n,
+                    data: this.iface.encodeFunctionData('cancelExpiredOrderByResolver', [
+                        _object_spread_props(_object_spread({}, order), {
+                            maker: maker.toString()
+                        }),
+                        rewardLimit
+                    ])
+                };
+            }
+        }
+    ]);
+    return NativeOrdersImpl;
+}();

package/dist/cjs/contracts/proxy-factory.js

@@ -0,0 +1,87 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "ProxyFactory", {
+    enumerable: true,
+    get: function() {
+        return ProxyFactory;
+    }
+});
+var _byteutils = require("@1inch/byte-utils");
+var _limitordersdk = require("@1inch/limit-order-sdk");
+var _ethers = require("ethers");
+var _assert = /*#__PURE__*/ _interop_require_default(require("assert"));
+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 _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+var ProxyFactory = /*#__PURE__*/ function() {
+    "use strict";
+    function ProxyFactory(factory, implementation) {
+        _class_call_check(this, ProxyFactory);
+        _define_property(this, "factory", void 0);
+        _define_property(this, "implementation", void 0);
+        this.factory = factory;
+        this.implementation = implementation;
+    }
+    _create_class(ProxyFactory, [
+        {
+            key: "getProxyAddress",
+            value: /**
+     * Calculates deterministic address of proxy contract
+     *
+     * @see https://github.com/OpenZeppelin/openzeppelin-contracts/blob/69c8def5f222ff96f2b5beff05dfba996368aa79/contracts/proxy/Clones.sol#L60
+     *
+     * @param salt must be valid hex string
+     * @returns address of proxy contract
+     */ function getProxyAddress(salt) {
+                (0, _assert.default)((0, _byteutils.isHexBytes)(salt), 'invalid salt');
+                return new _limitordersdk.Address((0, _ethers.getCreate2Address)(this.factory.toString(), salt, ProxyFactory.calcProxyBytecodeHash(this.implementation)));
+            }
+        }
+    ], [
+        {
+            key: "calcProxyBytecodeHash",
+            value: /**
+     * See https://github.com/1inch/cross-chain-swap/blob/03d99b9604d8f7a5a396720fbe1059f7d94db762/contracts/libraries/ProxyHashLib.sol#L14
+     */ function calcProxyBytecodeHash(impl) {
+                return (0, _ethers.keccak256)("0x3d602d80600a3d3981f3363d3d373d3d3d363d73".concat((0, _byteutils.trim0x)(impl.toString()), "5af43d82803e903d91602b57fd5bf3"));
+            }
+        }
+    ]);
+    return ProxyFactory;
+}();

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

@@ -13,8 +13,9 @@ 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 _constants = require("./constants.js");
 var _index = require("../amount-calculator/auction-calculator/index.js");
-var _constants = require("../constants.js");
+var _constants1 = require("../constants.js");
 var _amounts = require("../utils/amounts.js");
 var _time = require("../utils/time.js");
 var _amountcalculator = require("../amount-calculator/amount-calculator.js");
@@ -143,10 +144,13 @@ var FusionOrder = /*#__PURE__*/ function() {
         if (orderInfo.makerAsset.isNative()) {
             throw new Error('use FusionOrder.fromNative to create order from native asset');
         }
+        var optimizeReceiverAddress = extra.optimizeReceiverAddress !== undefined ? extra.optimizeReceiverAddress : FusionOrder.defaultExtra.optimizeReceiverAddress;
         this.inner = new _limitordersdk.LimitOrder(_object_spread_props(_object_spread({}, orderInfo), {
             receiver: receiver,
             salt: saltWithInjectedTrackCode
-        }), makerTraits, builtExtension);
+        }), makerTraits, builtExtension, {
+            optimizeReceiverAddress: optimizeReceiverAddress
+        });
         this.fusionExtension = extension;
     }
     _create_class(FusionOrder, [
@@ -444,6 +448,34 @@ var FusionOrder = /*#__PURE__*/ function() {
             value: function getAmountCalculator() {
                 return _amountcalculator.AmountCalculator.fromExtension(this.fusionExtension);
             }
+        },
+        {
+            key: "isNative",
+            value: function isNative(chainId, ethOrderFactory, signature) {
+                return FusionOrder.isNativeOrder(chainId, ethOrderFactory, this.build(), signature);
+            }
+        },
+        {
+            key: "nativeSignature",
+            value: /**
+     * Returns signature for submitting native order on-chain
+     * Only valid if order is native
+     *
+     * @see FusionOrder.isNative
+     * @see FusionOrder.fromNative
+     */ function nativeSignature(maker) {
+                return new _limitordersdk.LimitOrder({
+                    maker: maker,
+                    makerAsset: this.makerAsset,
+                    makingAmount: this.makingAmount,
+                    takingAmount: this.takingAmount,
+                    takerAsset: this.takerAsset,
+                    receiver: this.receiver,
+                    salt: this.salt
+                }, this.inner.makerTraits, undefined, {
+                    optimizeReceiverAddress: false
+                }).toCalldata();
+            }
         }
     ], [
         {
@@ -455,6 +487,48 @@ var FusionOrder = /*#__PURE__*/ function() {
                 return new FusionOrder(settlementExtension, orderInfo, details.auction, details.whitelist, details.surplus, extra);
             }
         },
+        {
+            key: "isNativeOrder",
+            value: function isNativeOrder(chainId, ethOrderFactory, order, signature) {
+                try {
+                    var orderWithRealMaker = _limitordersdk.LimitOrder.fromCalldata(signature);
+                    var expectedAddress = ethOrderFactory.getProxyAddress(orderWithRealMaker.getOrderHash(chainId));
+                    return expectedAddress.equal(new _limitordersdk.Address(order.maker));
+                } catch (e) {
+                    return false;
+                }
+            }
+        },
+        {
+            key: "fromNative",
+            value: /**
+     * Create new order from native asset
+     *
+     *
+     * Note, that such order should be submitted on-chain through `ETHOrders.depositForOrder` AND off-chain through submit to relayer
+     * // todo: update link
+     * @see ETHOrders.depositForOrder https://github.com/1inch/limit-order-protocol/blob/c100474444cd71cf7989cd8a63f375e72656b8b4/contracts/extensions/ETHOrders.sol#L89
+     */ function fromNative(chainId, ethOrdersFactory, /**
+         * Fusion extension address
+         * @see https://github.com/1inch/limit-order-settlement
+         */ settlementExtension, orderInfo, details, extra) {
+                var _orderInfo = _object_spread_props(_object_spread({}, orderInfo), {
+                    makerAsset: _constants.CHAIN_TO_WRAPPER[chainId],
+                    receiver: orderInfo.receiver && !orderInfo.receiver.isZero() ? orderInfo.receiver : orderInfo.maker
+                });
+                // create temp order to calc order hash
+                var _order = FusionOrder.new(settlementExtension, _orderInfo, details, _object_spread_props(_object_spread({}, extra), {
+                    optimizeReceiverAddress: false
+                }));
+                var finalOrderInfo = _object_spread_props(_object_spread({}, _orderInfo), {
+                    maker: ethOrdersFactory.getProxyAddress(_order.getOrderHash(chainId))
+                });
+                return new FusionOrder(settlementExtension, // use same salt to have same order hash. Remove extension hash from it
+                _object_spread_props(_object_spread({}, finalOrderInfo), {
+                    salt: _order.salt >> 160n
+                }), details.auction, details.whitelist, details.surplus, extra);
+            }
+        },
         {
             key: "fromDataAndExtension",
             value: /**
@@ -484,10 +558,11 @@ var FusionOrder = /*#__PURE__*/ function() {
                     allowPartialFills: makerTraits.isPartialFillAllowed(),
                     enablePermit2: makerTraits.isPermit2(),
                     nonce: makerTraits.nonceOrEpoch(),
-                    permit: extension.makerPermit === _constants.ZX ? undefined : _limitordersdk.Interaction.decode(extension.makerPermit).data,
+                    permit: extension.makerPermit === _constants1.ZX ? undefined : _limitordersdk.Interaction.decode(extension.makerPermit).data,
                     unwrapWETH: makerTraits.isNativeUnwrapEnabled(),
                     orderExpirationDelay: orderExpirationDelay,
-                    fees: extra === null || extra === void 0 ? void 0 : extra.fees
+                    fees: extra === null || extra === void 0 ? void 0 : extra.fees,
+                    optimizeReceiverAddress: true
                 });
                 (0, _assert.default)(providedSalt === fusionOrder.salt, 'invalid salt for passed extension');
                 return fusionOrder;
@@ -501,5 +576,6 @@ _define_property(FusionOrder, "defaultExtra", {
     allowMultipleFills: true,
     unwrapWETH: false,
     enablePermit2: false,
-    orderExpirationDelay: 12n
+    orderExpirationDelay: 12n,
+    optimizeReceiverAddress: true
 });