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

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,107 @@ 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 from native asset (no salt)', function() {
+        var ethOrderFactory = new _proxyfactory.ProxyFactory(new _limitordersdk.Address('0x62c650084e97a0fba2ecf365cc6d8a7722425363'), new _limitordersdk.Address('0xe8773a43fce4eedb18d0edbaf319059e1ae786af'));
+        var chainId = _constants.NetworkEnum.ETHEREUM;
+        var settlementExt = new _limitordersdk.Address('0x2ad5004c60e16e54d5007c80ce329adde5b51ef5');
+        var maker = new _limitordersdk.Address('0x962a836519109e162754161000d65d9dc027fa0f');
+        var nativeOrder = _fusionorder.FusionOrder.fromNative(chainId, ethOrderFactory, settlementExt, {
+            takerAsset: new _limitordersdk.Address('0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48'),
+            makingAmount: 1000000000000000000n,
+            takingAmount: 1420000000n,
+            maker: maker
+        }, {
+            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(), _limitordersdk.Extension.decode(nativeOrder.extension.encode())).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,
@@ -311,7 +303,7 @@ var FusionSDK = /*#__PURE__*/ function() {
             value: function createOrder(params) {
                 var _this = this;
                 return _async_to_generator(function() {
-                    var quote, order, hash;
+                    var _quote_nativeOrderFactory, quote, order, hash;
                     return _ts_generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -339,7 +331,8 @@ var FusionSDK = /*#__PURE__*/ function() {
                                     {
                                         order: order,
                                         hash: hash,
-                                        quoteId: quote.quoteId
+                                        quoteId: quote.quoteId,
+                                        nativeOrderFactory: (_quote_nativeOrderFactory = quote.nativeOrderFactory) === null || _quote_nativeOrderFactory === void 0 ? void 0 : _quote_nativeOrderFactory.factory
                                     }
                                 ];
                         }
@@ -352,12 +345,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 +361,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 +448,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 +472,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) {

package/dist/esm/abi/NativeOrderFactory.abi.json

@@ -0,0 +1,217 @@
+[
+    {
+        "type": "constructor",
+        "inputs": [
+            {
+                "name": "weth",
+                "type": "address",
+                "internalType": "contract IWETH"
+            },
+            {
+                "name": "nativeOrderImplementation",
+                "type": "address",
+                "internalType": "address"
+            },
+            {
+                "name": "limitOrderProtocol",
+                "type": "address",
+                "internalType": "address"
+            },
+            {
+                "name": "accessToken",
+                "type": "address",
+                "internalType": "contract IERC20"
+            }
+        ],
+        "stateMutability": "nonpayable"
+    },
+    {
+        "type": "function",
+        "name": "create",
+        "inputs": [
+            {
+                "name": "makerOrder",
+                "type": "tuple",
+                "internalType": "struct IOrderMixin.Order",
+                "components": [
+                    {
+                        "name": "salt",
+                        "type": "uint256",
+                        "internalType": "uint256"
+                    },
+                    {
+                        "name": "maker",
+                        "type": "uint256",
+                        "internalType": "Address"
+                    },
+                    {
+                        "name": "receiver",
+                        "type": "uint256",
+                        "internalType": "Address"
+                    },
+                    {
+                        "name": "makerAsset",
+                        "type": "uint256",
+                        "internalType": "Address"
+                    },
+                    {
+                        "name": "takerAsset",
+                        "type": "uint256",
+                        "internalType": "Address"
+                    },
+                    {
+                        "name": "makingAmount",
+                        "type": "uint256",
+                        "internalType": "uint256"
+                    },
+                    {
+                        "name": "takingAmount",
+                        "type": "uint256",
+                        "internalType": "uint256"
+                    },
+                    {
+                        "name": "makerTraits",
+                        "type": "uint256",
+                        "internalType": "MakerTraits"
+                    }
+                ]
+            }
+        ],
+        "outputs": [
+            {"name": "clone", "type": "address", "internalType": "address"}
+        ],
+        "stateMutability": "payable"
+    },
+    {
+        "type": "function",
+        "name": "owner",
+        "inputs": [],
+        "outputs": [{"name": "", "type": "address", "internalType": "address"}],
+        "stateMutability": "view"
+    },
+    {
+        "type": "function",
+        "name": "renounceOwnership",
+        "inputs": [],
+        "outputs": [],
+        "stateMutability": "nonpayable"
+    },
+    {
+        "type": "function",
+        "name": "rescueFunds",
+        "inputs": [
+            {"name": "token", "type": "address", "internalType": "address"},
+            {"name": "to", "type": "address", "internalType": "address"},
+            {"name": "amount", "type": "uint256", "internalType": "uint256"}
+        ],
+        "outputs": [],
+        "stateMutability": "nonpayable"
+    },
+    {
+        "type": "function",
+        "name": "transferOwnership",
+        "inputs": [
+            {"name": "newOwner", "type": "address", "internalType": "address"}
+        ],
+        "outputs": [],
+        "stateMutability": "nonpayable"
+    },
+    {
+        "type": "event",
+        "name": "NativeOrderCreated",
+        "inputs": [
+            {
+                "name": "maker",
+                "type": "address",
+                "indexed": false,
+                "internalType": "address"
+            },
+            {
+                "name": "orderHash",
+                "type": "bytes32",
+                "indexed": false,
+                "internalType": "bytes32"
+            },
+            {
+                "name": "clone",
+                "type": "address",
+                "indexed": false,
+                "internalType": "address"
+            },
+            {
+                "name": "value",
+                "type": "uint256",
+                "indexed": false,
+                "internalType": "uint256"
+            }
+        ],
+        "anonymous": false
+    },
+    {
+        "type": "event",
+        "name": "OwnershipTransferred",
+        "inputs": [
+            {
+                "name": "previousOwner",
+                "type": "address",
+                "indexed": true,
+                "internalType": "address"
+            },
+            {
+                "name": "newOwner",
+                "type": "address",
+                "indexed": true,
+                "internalType": "address"
+            }
+        ],
+        "anonymous": false
+    },
+    {"type": "error", "name": "FailedDeployment", "inputs": []},
+    {
+        "type": "error",
+        "name": "InsufficientBalance",
+        "inputs": [
+            {"name": "balance", "type": "uint256", "internalType": "uint256"},
+            {"name": "needed", "type": "uint256", "internalType": "uint256"}
+        ]
+    },
+    {
+        "type": "error",
+        "name": "OrderMakerShouldBeMsgSender",
+        "inputs": [
+            {"name": "expected", "type": "address", "internalType": "address"},
+            {"name": "actual", "type": "address", "internalType": "address"}
+        ]
+    },
+    {
+        "type": "error",
+        "name": "OrderMakingAmountShouldBeEqualToMsgValue",
+        "inputs": [
+            {"name": "expected", "type": "uint256", "internalType": "uint256"},
+            {"name": "actual", "type": "uint256", "internalType": "uint256"}
+        ]
+    },
+    {
+        "type": "error",
+        "name": "OrderReceiverShouldNotBeThis",
+        "inputs": [
+            {"name": "receiver", "type": "address", "internalType": "address"},
+            {"name": "self", "type": "address", "internalType": "address"}
+        ]
+    },
+    {
+        "type": "error",
+        "name": "OwnableInvalidOwner",
+        "inputs": [
+            {"name": "owner", "type": "address", "internalType": "address"}
+        ]
+    },
+    {
+        "type": "error",
+        "name": "OwnableUnauthorizedAccount",
+        "inputs": [
+            {"name": "account", "type": "address", "internalType": "address"}
+        ]
+    },
+    {"type": "error", "name": "SafeTransferFailed", "inputs": []}
+]