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

package/dist/esm/abi/{ETHOrders.abi.json → NativeOrderImpl.abi.json}

@@ -7,6 +7,11 @@
                 "type": "address",
                 "internalType": "contract IWETH"
             },
+            {
+                "name": "nativeOrderFactory",
+                "type": "address",
+                "internalType": "address"
+            },
             {
                 "name": "limitOrderProtocol",
                 "type": "address",
@@ -20,52 +25,13 @@
         ],
         "stateMutability": "nonpayable"
     },
-    {
-        "type": "receive",
-        "stateMutability": "payable"
-    },
+    {"type": "receive", "stateMutability": "payable"},
     {
         "type": "function",
-        "name": "cancelOrder",
+        "name": "cancelExpiredOrderByResolver",
         "inputs": [
             {
-                "name": "makerTraits",
-                "type": "uint256",
-                "internalType": "MakerTraits"
-            },
-            {
-                "name": "orderHash",
-                "type": "bytes32",
-                "internalType": "bytes32"
-            }
-        ],
-        "outputs": [],
-        "stateMutability": "nonpayable"
-    },
-    {
-        "type": "function",
-        "name": "cancelOrderByResolver",
-        "inputs": [
-            {
-                "name": "makerTraits",
-                "type": "uint256",
-                "internalType": "MakerTraits"
-            },
-            {
-                "name": "orderHash",
-                "type": "bytes32",
-                "internalType": "bytes32"
-            }
-        ],
-        "outputs": [],
-        "stateMutability": "nonpayable"
-    },
-    {
-        "type": "function",
-        "name": "ethOrderDeposit",
-        "inputs": [
-            {
-                "name": "order",
+                "name": "makerOrder",
                 "type": "tuple",
                 "internalType": "struct IOrderMixin.Order",
                 "components": [
@@ -112,135 +78,20 @@
                 ]
             },
             {
-                "name": "extension",
-                "type": "bytes",
-                "internalType": "bytes"
-            },
-            {
-                "name": "maximumPremium",
-                "type": "uint16",
-                "internalType": "uint16"
-            },
-            {
-                "name": "auctionDuration",
-                "type": "uint32",
-                "internalType": "uint32"
-            }
-        ],
-        "outputs": [
-            {
-                "name": "orderHash",
-                "type": "bytes32",
-                "internalType": "bytes32"
-            }
-        ],
-        "stateMutability": "payable"
-    },
-    {
-        "type": "function",
-        "name": "ethOrdersBatch",
-        "inputs": [
-            {
-                "name": "orderHashes",
-                "type": "bytes32[]",
-                "internalType": "bytes32[]"
-            }
-        ],
-        "outputs": [
-            {
-                "name": "ethOrders",
-                "type": "tuple[]",
-                "internalType": "struct ETHOrders.ETHOrder[]",
-                "components": [
-                    {
-                        "name": "maker",
-                        "type": "address",
-                        "internalType": "address"
-                    },
-                    {
-                        "name": "balance",
-                        "type": "uint96",
-                        "internalType": "uint96"
-                    },
-                    {
-                        "name": "maximumPremium",
-                        "type": "uint16",
-                        "internalType": "uint16"
-                    },
-                    {
-                        "name": "auctionDuration",
-                        "type": "uint32",
-                        "internalType": "uint32"
-                    }
-                ]
-            }
-        ],
-        "stateMutability": "view"
-    },
-    {
-        "type": "function",
-        "name": "isValidSignature",
-        "inputs": [
-            {
-                "name": "orderHash",
-                "type": "bytes32",
-                "internalType": "bytes32"
-            },
-            {
-                "name": "signature",
-                "type": "bytes",
-                "internalType": "bytes"
-            }
-        ],
-        "outputs": [
-            {
-                "name": "",
-                "type": "bytes4",
-                "internalType": "bytes4"
-            }
-        ],
-        "stateMutability": "view"
-    },
-    {
-        "type": "function",
-        "name": "ordersMakersBalances",
-        "inputs": [
-            {
-                "name": "orderHash",
-                "type": "bytes32",
-                "internalType": "bytes32"
-            }
-        ],
-        "outputs": [
-            {
-                "name": "maker",
-                "type": "address",
-                "internalType": "address"
-            },
-            {
-                "name": "balance",
-                "type": "uint96",
-                "internalType": "uint96"
-            },
-            {
-                "name": "maximumPremium",
-                "type": "uint16",
-                "internalType": "uint16"
-            },
-            {
-                "name": "auctionDuration",
-                "type": "uint32",
-                "internalType": "uint32"
+                "name": "rewardLimit",
+                "type": "uint256",
+                "internalType": "uint256"
             }
         ],
-        "stateMutability": "view"
+        "outputs": [],
+        "stateMutability": "nonpayable"
     },
     {
         "type": "function",
-        "name": "postInteraction",
+        "name": "cancelOrder",
         "inputs": [
             {
-                "name": "",
+                "name": "makerOrder",
                 "type": "tuple",
                 "internalType": "struct IOrderMixin.Order",
                 "components": [
@@ -285,102 +136,78 @@
                         "internalType": "MakerTraits"
                     }
                 ]
-            },
-            {
-                "name": "",
-                "type": "bytes",
-                "internalType": "bytes"
-            },
-            {
-                "name": "orderHash",
-                "type": "bytes32",
-                "internalType": "bytes32"
-            },
-            {
-                "name": "",
-                "type": "address",
-                "internalType": "address"
-            },
-            {
-                "name": "makingAmount",
-                "type": "uint256",
-                "internalType": "uint256"
-            },
-            {
-                "name": "",
-                "type": "uint256",
-                "internalType": "uint256"
-            },
-            {
-                "name": "",
-                "type": "uint256",
-                "internalType": "uint256"
-            },
-            {
-                "name": "",
-                "type": "bytes",
-                "internalType": "bytes"
             }
         ],
         "outputs": [],
         "stateMutability": "nonpayable"
     },
     {
-        "type": "event",
-        "name": "ETHDeposited",
+        "type": "function",
+        "name": "decimals",
+        "inputs": [],
+        "outputs": [{"name": "", "type": "uint8", "internalType": "uint8"}],
+        "stateMutability": "pure"
+    },
+    {
+        "type": "function",
+        "name": "depositAndApprove",
+        "inputs": [],
+        "outputs": [],
+        "stateMutability": "payable"
+    },
+    {
+        "type": "function",
+        "name": "isValidSignature",
         "inputs": [
-            {
-                "name": "orderHash",
-                "type": "bytes32",
-                "indexed": false,
-                "internalType": "bytes32"
-            },
-            {
-                "name": "amount",
-                "type": "uint256",
-                "indexed": false,
-                "internalType": "uint256"
-            }
+            {"name": "hash", "type": "bytes32", "internalType": "bytes32"},
+            {"name": "signature", "type": "bytes", "internalType": "bytes"}
         ],
-        "anonymous": false
+        "outputs": [{"name": "", "type": "bytes4", "internalType": "bytes4"}],
+        "stateMutability": "view"
     },
     {
-        "type": "event",
-        "name": "ETHOrderCancelled",
+        "type": "function",
+        "name": "name",
+        "inputs": [],
+        "outputs": [{"name": "", "type": "string", "internalType": "string"}],
+        "stateMutability": "pure"
+    },
+    {
+        "type": "function",
+        "name": "rescueFunds",
         "inputs": [
-            {
-                "name": "orderHash",
-                "type": "bytes32",
-                "indexed": false,
-                "internalType": "bytes32"
-            },
-            {
-                "name": "amount",
-                "type": "uint256",
-                "indexed": false,
-                "internalType": "uint256"
-            }
+            {"name": "token", "type": "address", "internalType": "address"},
+            {"name": "to", "type": "address", "internalType": "address"},
+            {"name": "amount", "type": "uint256", "internalType": "uint256"}
         ],
-        "anonymous": false
+        "outputs": [],
+        "stateMutability": "nonpayable"
+    },
+    {
+        "type": "function",
+        "name": "symbol",
+        "inputs": [],
+        "outputs": [{"name": "", "type": "string", "internalType": "string"}],
+        "stateMutability": "pure"
     },
     {
         "type": "event",
-        "name": "ETHOrderCancelledByThirdParty",
+        "name": "NativeOrderCancelled",
         "inputs": [
             {
-                "name": "orderHash",
+                "name": "makerOrderHash",
                 "type": "bytes32",
                 "indexed": false,
                 "internalType": "bytes32"
             },
             {
-                "name": "amount",
+                "name": "balance",
                 "type": "uint256",
                 "indexed": false,
                 "internalType": "uint256"
             },
             {
-                "name": "reward",
+                "name": "resolverReward",
                 "type": "uint256",
                 "indexed": false,
                 "internalType": "uint256"
@@ -388,44 +215,72 @@
         ],
         "anonymous": false
     },
+    {"type": "error", "name": "CanNotCancelForZeroBalance", "inputs": []},
+    {"type": "error", "name": "EthDepositRejected", "inputs": []},
+    {"type": "error", "name": "ForceApproveFailed", "inputs": []},
     {
         "type": "error",
-        "name": "AccessDenied",
-        "inputs": []
-    },
-    {
-        "type": "error",
-        "name": "CancelOrderByResolverIsForbidden",
-        "inputs": []
+        "name": "OnlyFactoryViolation",
+        "inputs": [
+            {"name": "sender", "type": "address", "internalType": "address"},
+            {"name": "factory", "type": "address", "internalType": "address"}
+        ]
     },
     {
         "type": "error",
-        "name": "EthDepositRejected",
-        "inputs": []
+        "name": "OnlyLimitOrderProtocolViolation",
+        "inputs": [
+            {"name": "sender", "type": "address", "internalType": "address"},
+            {
+                "name": "limitOrderProtocol",
+                "type": "address",
+                "internalType": "address"
+            }
+        ]
     },
     {
         "type": "error",
-        "name": "ExistingOrder",
-        "inputs": []
+        "name": "OrderIsIncorrect",
+        "inputs": [
+            {"name": "expected", "type": "address", "internalType": "address"},
+            {"name": "actual", "type": "address", "internalType": "address"}
+        ]
     },
     {
         "type": "error",
-        "name": "InvalidOrder",
-        "inputs": []
+        "name": "OrderShouldBeExpired",
+        "inputs": [
+            {
+                "name": "currentTime",
+                "type": "uint256",
+                "internalType": "uint256"
+            },
+            {
+                "name": "expirationTime",
+                "type": "uint256",
+                "internalType": "uint256"
+            }
+        ]
     },
     {
         "type": "error",
-        "name": "NotEnoughBalance",
-        "inputs": []
+        "name": "RescueFundsTooMuch",
+        "inputs": [
+            {"name": "requested", "type": "uint256", "internalType": "uint256"},
+            {"name": "available", "type": "uint256", "internalType": "uint256"}
+        ]
     },
     {
         "type": "error",
-        "name": "OrderNotExpired",
-        "inputs": []
+        "name": "ResolverAccessTokenMissing",
+        "inputs": [
+            {"name": "resolver", "type": "address", "internalType": "address"},
+            {
+                "name": "accessToken",
+                "type": "address",
+                "internalType": "address"
+            }
+        ]
     },
-    {
-        "type": "error",
-        "name": "RewardIsTooBig",
-        "inputs": []
-    }
+    {"type": "error", "name": "SafeTransferFailed", "inputs": []}
 ]

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

@@ -36,9 +36,10 @@ import assert from 'assert';
 import { FusionOrderParams } from './order-params.js';
 import { PresetEnum } from '../types.js';
 import { Preset } from '../preset.js';
-import { FusionOrder, FusionOrderFromNative, SurplusParams, Whitelist } from '../../../fusion-order/index.js';
+import { FusionOrder, SurplusParams, Whitelist } from '../../../fusion-order/index.js';
 import { CHAIN_TO_WRAPPER } from '../../../fusion-order/constants.js';
 import { Fees, ResolverFee, IntegratorFee } from '../../../fusion-order/fees/index.js';
+import { ProxyFactory } from '../../../index.js';
 export var Quote = /*#__PURE__*/ function() {
     "use strict";
     function Quote(params, response) {
@@ -51,7 +52,7 @@ export 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);
@@ -80,7 +81,7 @@ export var Quote = /*#__PURE__*/ function() {
         this.recommendedPreset = response.recommended_preset;
         this.slippage = response.autoK;
         this.settlementAddress = new Address(response.settlementAddress);
-        this.ethOrdersAddress = response.ethOrdersAddress ? new Address(response.ethOrdersAddress) : undefined;
+        this.nativeOrderFactory = response.nativeOrderFactoryAddress && response.nativeOrderImplAddress ? new ProxyFactory(new Address(response.nativeOrderFactoryAddress), new Address(response.nativeOrderImplAddress)) : undefined;
         this.resolverFeePreset = {
             receiver: new Address(response.fee.receiver),
             whitelistDiscountPercent: Bps.fromPercent(response.fee.whitelistDiscountPercent),
@@ -103,6 +104,7 @@ export 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);
@@ -173,8 +175,8 @@ export var Quote = /*#__PURE__*/ function() {
             key: "_createOrder",
             value: function _createOrder(chainId, settlementExtension, orderInfo, details, extra) {
                 if (this.params.fromTokenAddress.isNative()) {
-                    assert(this.ethOrdersAddress, 'expected ethOrdersAddress to be set for order from native asset');
-                    return FusionOrderFromNative.fromNative(chainId, this.ethOrdersAddress, settlementExtension, orderInfo, details, extra);
+                    assert(this.nativeOrderFactory, 'expected nativeOrderFactory to be set for order from native asset');
+                    return FusionOrder.fromNative(chainId, this.nativeOrderFactory, settlementExtension, orderInfo, details, extra);
                 }
                 return FusionOrder.new(settlementExtension, orderInfo, details, extra);
             }

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

@@ -57,9 +57,6 @@ export 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(Address.NATIVE_CURRENCY, ": wrap native currency to it's wrapper fist"));
-        }
         if (this.fromTokenAddress.isZero() || this.toTokenAddress.isZero()) {
             throw new Error("replace ".concat(Address.ZERO_ADDRESS, " with ").concat(Address.NATIVE_CURRENCY));
         }

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/api/quoter/types.js

@@ -4,8 +4,6 @@
      * 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/esm/contracts/index.js

@@ -0,0 +1,4 @@
+export * from './native-order-factory.js';
+export * from './native-order-impl.js';
+export * from './proxy-factory.js';
+export * from './types.js';

package/dist/esm/contracts/native-order-factory.js

@@ -0,0 +1,100 @@
+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;
+}
+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;
+}
+import { Interface } from 'ethers';
+import ABI from '../abi/NativeOrderFactory.abi.json';
+export 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 Interface(ABI);
+    }
+    _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;
+}();