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

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

@@ -0,0 +1,129 @@
+"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) {
+                return {
+                    to: this.address,
+                    value: 0n,
+                    data: this.iface.encodeFunctionData('cancelExpiredOrderByResolver', [
+                        _object_spread_props(_object_spread({}, order), {
+                            maker: maker.toString()
+                        })
+                    ])
+                };
+            }
+        }
+    ]);
+    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");
@@ -444,6 +445,32 @@ 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).toCalldata();
+            }
         }
     ], [
         {
@@ -455,6 +482,43 @@ 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.maker
+                });
+                // create temp order to calc order hash
+                var _order = FusionOrder.new(settlementExtension, _orderInfo, details, extra);
+                var finalOrderInfo = _object_spread_props(_object_spread({}, _orderInfo), {
+                    maker: ethOrdersFactory.getProxyAddress(_order.getOrderHash(chainId))
+                });
+                return new FusionOrder(settlementExtension, finalOrderInfo, details.auction, details.whitelist, details.surplus, extra);
+            }
+        },
         {
             key: "fromDataAndExtension",
             value: /**
@@ -484,7 +548,7 @@ 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

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

@@ -9,6 +9,8 @@ var _index = require("./auction-details/index.js");
 var _index1 = require("./whitelist/index.js");
 var _surplusparams = require("./surplus-params.js");
 var _index2 = require("./fees/index.js");
+var _proxyfactory = require("../contracts/proxy-factory.js");
+var _constants = require("../constants.js");
 var _index3 = require("../amount-calculator/index.js");
 var _time = require("../utils/time.js");
 describe('Fusion Order', function() {
@@ -296,3 +298,74 @@ describe('Fusion Order', function() {
         expect(surplus).toEqual(25000000n);
     });
 });
+describe('FusionOrder Native', function() {
+    it('should correct detect that order is from native asset', function() {
+        var ethOrderFactory = new _proxyfactory.ProxyFactory(_limitordersdk.Address.fromBigInt(1n), _limitordersdk.Address.fromBigInt(2n));
+        var chainId = _constants.NetworkEnum.ETHEREUM;
+        var settlementExt = _limitordersdk.Address.fromBigInt(3n);
+        var maker = new _limitordersdk.Address('0x00000000219ab540356cbb839cbe05303d7705fa');
+        var nativeOrder = _fusionorder.FusionOrder.fromNative(chainId, ethOrderFactory, settlementExt, {
+            takerAsset: new _limitordersdk.Address('0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48'),
+            makingAmount: 1000000000000000000n,
+            takingAmount: 1420000000n,
+            maker: maker,
+            salt: 10n
+        }, {
+            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
+        });
+        expect(nativeOrder.isNative(chainId, ethOrderFactory, nativeOrder.nativeSignature(maker))).toEqual(true);
+        expect(_fusionorder.FusionOrder.fromDataAndExtension(nativeOrder.build(), nativeOrder.extension).isNative(chainId, ethOrderFactory, nativeOrder.nativeSignature(maker))).toEqual(true);
+    });
+    it('should correct detect that order is NOT from native asset', function() {
+        var ethOrderFactory = new _proxyfactory.ProxyFactory(_limitordersdk.Address.fromBigInt(1n), _limitordersdk.Address.fromBigInt(2n));
+        var chainId = _constants.NetworkEnum.ETHEREUM;
+        var settlementExt = _limitordersdk.Address.fromBigInt(3n);
+        var maker = new _limitordersdk.Address('0x00000000219ab540356cbb839cbe05303d7705fa');
+        var nativeOrder = _fusionorder.FusionOrder.new(settlementExt, {
+            makerAsset: new _limitordersdk.Address('0x1000000000000000000000000000000000000000'),
+            takerAsset: new _limitordersdk.Address('0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48'),
+            makingAmount: 1000000000000000000n,
+            takingAmount: 1420000000n,
+            maker: maker,
+            salt: 10n
+        }, {
+            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
+        });
+        expect(nativeOrder.isNative(chainId, ethOrderFactory, nativeOrder.nativeSignature(maker))).toEqual(false);
+        expect(_fusionorder.FusionOrder.fromDataAndExtension(nativeOrder.build(), nativeOrder.extension).isNative(chainId, ethOrderFactory, nativeOrder.nativeSignature(maker))).toEqual(false);
+    });
+});

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

@@ -9,7 +9,6 @@ Object.defineProperty(exports, "CHAIN_TO_WRAPPER", {
     }
 });
 _export_star(require("./fusion-order.js"), exports);
-_export_star(require("./fusion-order-from-native.js"), exports);
 _export_star(require("./auction-details/index.js"), exports);
 _export_star(require("./whitelist/index.js"), exports);
 _export_star(require("./fusion-extension.js"), exports);

package/dist/cjs/index.js

@@ -76,6 +76,7 @@ _export_star(require("./utils/time.js"), exports);
 _export_star(require("./validations.js"), exports);
 _export_star(require("./ws-api/index.js"), exports);
 _export_star(require("./errors.js"), exports);
+_export_star(require("./contracts/index.js"), exports);
 var _index = require("./api/index.js");
 function _export_star(from, to) {
     Object.keys(from).forEach(function(k) {

package/dist/cjs/sdk/sdk.js

@@ -12,7 +12,6 @@ var _limitordersdk = require("@1inch/limit-order-sdk");
 var _index = require("./encoders/index.js");
 var _index1 = require("../api/index.js");
 var _index2 = require("../api/orders/index.js");
-var _index3 = require("../fusion-order/index.js");
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
     try {
         var info = gen[key](arg);
@@ -74,13 +73,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 _ts_generator(thisArg, body) {
     var f, y, t, g, _ = {
         label: 0,
@@ -352,12 +344,13 @@ var FusionSDK = /*#__PURE__*/ function() {
             value: /**
      * Submit order to relayer
      *
-     * Note, that orders from native assets must be submitted onchain as well
-     * @see EthOrdersExtension.depositForOrder
+     * Note, that orders from native assets must be submitted with `submitNativeOrder`
+     *
+     * @see FusionSDK.submitNativeOrder
      */ function submitOrder(order, quoteId) {
                 var _this = this;
                 return _async_to_generator(function() {
-                    var signature, orderStruct, relayerRequest;
+                    var signature;
                     return _ts_generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -367,34 +360,36 @@ var FusionSDK = /*#__PURE__*/ function() {
                                 ];
                             case 1:
                                 signature = _state.sent();
-                                orderStruct = order.build();
-                                relayerRequest = _index1.RelayerRequest.new({
-                                    order: orderStruct,
-                                    signature: signature,
-                                    quoteId: quoteId,
-                                    extension: order.extension.encode()
-                                });
-                                return [
-                                    4,
-                                    _this.api.submitOrder(relayerRequest)
-                                ];
-                            case 2:
-                                _state.sent();
                                 return [
                                     2,
-                                    {
-                                        order: orderStruct,
-                                        signature: signature,
-                                        quoteId: quoteId,
-                                        orderHash: order.getOrderHash(_this.config.network),
-                                        extension: relayerRequest.extension
-                                    }
+                                    _this._submitOrder(order, quoteId, signature)
                                 ];
                         }
                     });
                 })();
             }
         },
+        {
+            key: "submitNativeOrder",
+            value: /**
+     * Submit order to relayer
+     *
+     * Note, that orders from native assets must be submitted on-chain as well
+     * @see NativeOrdersFactory.create
+     */ function submitNativeOrder(order, maker, quoteId) {
+                var _this = this;
+                return _async_to_generator(function() {
+                    var signature;
+                    return _ts_generator(this, function(_state) {
+                        signature = _this.signNativeOrder(order, maker);
+                        return [
+                            2,
+                            _this._submitOrder(order, quoteId, signature)
+                        ];
+                    });
+                })();
+            }
+        },
         {
             key: "placeOrder",
             value: function placeOrder(params) {
@@ -452,17 +447,17 @@ var FusionSDK = /*#__PURE__*/ function() {
         },
         {
             key: "signOrder",
-            value: function signOrder(order) {
+            value: /**
+     * Sign order using `blockchainProvider` from config
+     *
+     * Use FusionSDK.signNativeOrder for signing orders from native asset
+     *
+     * @see FusionSDK.signNativeOrder
+     */ function signOrder(order) {
                 var _this = this;
                 return _async_to_generator(function() {
                     var orderStruct, data;
                     return _ts_generator(this, function(_state) {
-                        if (_instanceof(order, _index3.FusionOrderFromNative)) {
-                            return [
-                                2,
-                                order.realMaker.toString()
-                            ];
-                        }
                         if (!_this.config.blockchainProvider) {
                             throw new Error('blockchainProvider has not set to config');
                         }
@@ -476,6 +471,49 @@ var FusionSDK = /*#__PURE__*/ function() {
                 })();
             }
         },
+        {
+            key: "signNativeOrder",
+            value: function signNativeOrder(order, maker) {
+                return order.nativeSignature(maker);
+            }
+        },
+        {
+            key: "_submitOrder",
+            value: function _submitOrder(order, quoteId, signature) {
+                var _this = this;
+                return _async_to_generator(function() {
+                    var orderStruct, relayerRequest;
+                    return _ts_generator(this, function(_state) {
+                        switch(_state.label){
+                            case 0:
+                                orderStruct = order.build();
+                                relayerRequest = _index1.RelayerRequest.new({
+                                    order: orderStruct,
+                                    signature: signature,
+                                    quoteId: quoteId,
+                                    extension: order.extension.encode()
+                                });
+                                return [
+                                    4,
+                                    _this.api.submitOrder(relayerRequest)
+                                ];
+                            case 1:
+                                _state.sent();
+                                return [
+                                    2,
+                                    {
+                                        order: orderStruct,
+                                        signature: signature,
+                                        quoteId: quoteId,
+                                        orderHash: order.getOrderHash(_this.config.network),
+                                        extension: relayerRequest.extension
+                                    }
+                                ];
+                        }
+                    });
+                })();
+            }
+        },
         {
             key: "getQuoteResult",
             value: function getQuoteResult(params) {