@1inch/fusion-sdk 2.3.9-rc.5 → 2.3.9-rc.7

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/fusion-order/fusion-order.js

@@ -509,14 +509,17 @@ var FusionOrder = /*#__PURE__*/ function() {
          */ settlementExtension, orderInfo, details, extra) {
                 var _orderInfo = _object_spread_props(_object_spread({}, orderInfo), {
                     makerAsset: _constants.CHAIN_TO_WRAPPER[chainId],
-                    receiver: orderInfo.receiver || orderInfo.maker
+                    receiver: orderInfo.receiver && !orderInfo.receiver.isZero() ? 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);
+                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);
             }
         },
         {

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

@@ -333,6 +333,39 @@ describe('FusionOrder Native', function() {
         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;

package/dist/cjs/sdk/sdk.js

@@ -303,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:
@@ -331,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
                                     }
                                 ];
                         }

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

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

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

@@ -494,14 +494,17 @@ export var FusionOrder = /*#__PURE__*/ function() {
          */ settlementExtension, orderInfo, details, extra) {
                 var _orderInfo = _object_spread_props(_object_spread({}, orderInfo), {
                     makerAsset: CHAIN_TO_WRAPPER[chainId],
-                    receiver: orderInfo.receiver || orderInfo.maker
+                    receiver: orderInfo.receiver && !orderInfo.receiver.isZero() ? 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);
+                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);
             }
         },
         {

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

@@ -329,6 +329,39 @@ describe('FusionOrder Native', function() {
         expect(nativeOrder.isNative(chainId, ethOrderFactory, nativeOrder.nativeSignature(maker))).toEqual(true);
         expect(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(new Address('0x62c650084e97a0fba2ecf365cc6d8a7722425363'), new Address('0xe8773a43fce4eedb18d0edbaf319059e1ae786af'));
+        var chainId = NetworkEnum.ETHEREUM;
+        var settlementExt = new Address('0x2ad5004c60e16e54d5007c80ce329adde5b51ef5');
+        var maker = new Address('0x962a836519109e162754161000d65d9dc027fa0f');
+        var nativeOrder = FusionOrder.fromNative(chainId, ethOrderFactory, settlementExt, {
+            takerAsset: new Address('0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48'),
+            makingAmount: 1000000000000000000n,
+            takingAmount: 1420000000n,
+            maker: maker
+        }, {
+            auction: new AuctionDetails({
+                duration: 180n,
+                startTime: 1673548149n,
+                initialRateBump: 50000,
+                points: [
+                    {
+                        coefficient: 20000,
+                        delay: 12
+                    }
+                ]
+            }),
+            whitelist: Whitelist.new(1673548139n, [
+                {
+                    address: new Address('0x00000000219ab540356cbb839cbe05303d7705fa'),
+                    allowFrom: 0n
+                }
+            ]),
+            surplus: SurplusParams.NO_FEE
+        });
+        expect(nativeOrder.isNative(chainId, ethOrderFactory, nativeOrder.nativeSignature(maker))).toEqual(true);
+        expect(FusionOrder.fromDataAndExtension(nativeOrder.build(), 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(Address.fromBigInt(1n), Address.fromBigInt(2n));
         var chainId = NetworkEnum.ETHEREUM;

package/dist/esm/package.json

@@ -1 +1 @@
-{"name":"@1inch/fusion-sdk","version":"2.3.9-rc.5","type":"module"}
+{"name":"@1inch/fusion-sdk","version":"2.3.9-rc.7","type":"module"}

package/dist/esm/sdk/sdk.js

@@ -293,7 +293,7 @@ export 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:
@@ -321,7 +321,8 @@ export 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
                                     }
                                 ];
                         }

package/dist/types/src/sdk/types.d.ts

@@ -1,4 +1,4 @@
-import { LimitOrderV4Struct } from '@1inch/limit-order-sdk';
+import { Address, LimitOrderV4Struct } from '@1inch/limit-order-sdk';
 import { BlockchainProviderConnector, HttpProviderConnector } from '../connector/index.js';
 import { NetworkEnum } from '../constants.js';
 import { CustomPreset, IntegratorFeeParams, PresetEnum } from '../api/index.js';
@@ -54,4 +54,5 @@ export type PreparedOrder = {
     order: FusionOrder;
     hash: string;
     quoteId: string;
+    nativeOrderFactory?: Address;
 };