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

package/dist/cjs/abi/ETHOrders.abi.json

@@ -0,0 +1,431 @@
+[
+    {
+        "type": "constructor",
+        "inputs": [
+            {
+                "name": "weth",
+                "type": "address",
+                "internalType": "contract IWETH"
+            },
+            {
+                "name": "limitOrderProtocol",
+                "type": "address",
+                "internalType": "address"
+            },
+            {
+                "name": "accessToken",
+                "type": "address",
+                "internalType": "contract IERC20"
+            }
+        ],
+        "stateMutability": "nonpayable"
+    },
+    {
+        "type": "receive",
+        "stateMutability": "payable"
+    },
+    {
+        "type": "function",
+        "name": "cancelOrder",
+        "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",
+                "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"
+                    }
+                ]
+            },
+            {
+                "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"
+            }
+        ],
+        "stateMutability": "view"
+    },
+    {
+        "type": "function",
+        "name": "postInteraction",
+        "inputs": [
+            {
+                "name": "",
+                "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"
+                    }
+                ]
+            },
+            {
+                "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",
+        "inputs": [
+            {
+                "name": "orderHash",
+                "type": "bytes32",
+                "indexed": false,
+                "internalType": "bytes32"
+            },
+            {
+                "name": "amount",
+                "type": "uint256",
+                "indexed": false,
+                "internalType": "uint256"
+            }
+        ],
+        "anonymous": false
+    },
+    {
+        "type": "event",
+        "name": "ETHOrderCancelled",
+        "inputs": [
+            {
+                "name": "orderHash",
+                "type": "bytes32",
+                "indexed": false,
+                "internalType": "bytes32"
+            },
+            {
+                "name": "amount",
+                "type": "uint256",
+                "indexed": false,
+                "internalType": "uint256"
+            }
+        ],
+        "anonymous": false
+    },
+    {
+        "type": "event",
+        "name": "ETHOrderCancelledByThirdParty",
+        "inputs": [
+            {
+                "name": "orderHash",
+                "type": "bytes32",
+                "indexed": false,
+                "internalType": "bytes32"
+            },
+            {
+                "name": "amount",
+                "type": "uint256",
+                "indexed": false,
+                "internalType": "uint256"
+            },
+            {
+                "name": "reward",
+                "type": "uint256",
+                "indexed": false,
+                "internalType": "uint256"
+            }
+        ],
+        "anonymous": false
+    },
+    {
+        "type": "error",
+        "name": "AccessDenied",
+        "inputs": []
+    },
+    {
+        "type": "error",
+        "name": "CancelOrderByResolverIsForbidden",
+        "inputs": []
+    },
+    {
+        "type": "error",
+        "name": "EthDepositRejected",
+        "inputs": []
+    },
+    {
+        "type": "error",
+        "name": "ExistingOrder",
+        "inputs": []
+    },
+    {
+        "type": "error",
+        "name": "InvalidOrder",
+        "inputs": []
+    },
+    {
+        "type": "error",
+        "name": "NotEnoughBalance",
+        "inputs": []
+    },
+    {
+        "type": "error",
+        "name": "OrderNotExpired",
+        "inputs": []
+    },
+    {
+        "type": "error",
+        "name": "RewardIsTooBig",
+        "inputs": []
+    }
+]

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

@@ -10,6 +10,7 @@ Object.defineProperty(exports, "Quote", {
 });
 var _limitordersdk = require("@1inch/limit-order-sdk");
 var _byteutils = require("@1inch/byte-utils");
+var _assert = /*#__PURE__*/ _interop_require_default(require("assert"));
 var _orderparams = require("./order-params.js");
 var _types = require("../types.js");
 var _preset = require("../preset.js");
@@ -48,6 +49,11 @@ function _define_property(obj, key, value) {
     }
     return obj;
 }
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
 var Quote = /*#__PURE__*/ function() {
     "use strict";
     function Quote(params, response) {
@@ -57,6 +63,10 @@ var Quote = /*#__PURE__*/ function() {
      * Fusion extension address
      * @see https://github.com/1inch/limit-order-settlement
      */ _define_property(this, "settlementAddress", void 0);
+        /**
+     * Native asset extension address
+     * @see https://github.com/1inch/limit-order-settlement todo: update link
+     */ _define_property(this, "ethOrdersAddress", void 0);
         _define_property(this, "fromTokenAmount", void 0);
         _define_property(this, "presets", void 0);
         _define_property(this, "recommendedPreset", void 0);
@@ -85,6 +95,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.resolverFeePreset = {
             receiver: new _limitordersdk.Address(response.fee.receiver),
             whitelistDiscountPercent: _limitordersdk.Bps.fromPercent(response.fee.whitelistDiscountPercent),
@@ -119,18 +130,20 @@ var Quote = /*#__PURE__*/ function() {
                 var _params_nonce;
                 var nonce = isNonceRequired ? (_params_nonce = params.nonce) !== null && _params_nonce !== void 0 ? _params_nonce : (0, _limitordersdk.randBigInt)(_byteutils.UINT_40_MAX) : params.nonce;
                 var takerAsset = this.params.toTokenAddress.isNative() ? _constants.CHAIN_TO_WRAPPER[paramsData.network] : this.params.toTokenAddress;
-                return _index.FusionOrder.new(this.settlementAddress, {
+                var orderInfo = {
                     makerAsset: this.params.fromTokenAddress,
                     takerAsset: takerAsset,
                     makingAmount: this.fromTokenAmount,
                     takingAmount: preset.auctionEndAmount,
                     maker: this.params.walletAddress,
                     receiver: params.receiver
-                }, {
+                };
+                var details = {
                     auction: auctionDetails,
                     whitelist: this.getWhitelist(auctionDetails.startTime, preset.exclusiveResolver),
                     surplus: new _index.SurplusParams(this.marketReturn, _limitordersdk.Bps.fromPercent(this.surplusFee || 0))
-                }, {
+                };
+                var extra = {
                     nonce: nonce,
                     unwrapWETH: this.params.toTokenAddress.isNative(),
                     permit: params.permit,
@@ -140,7 +153,8 @@ var Quote = /*#__PURE__*/ function() {
                     source: this.params.source,
                     enablePermit2: params.isPermit2,
                     fees: buildFees(this.resolverFeePreset, this.params.integratorFee || this.integratorFeeParams, this.surplusFee)
-                });
+                };
+                return this._createOrder(paramsData.network, this.settlementAddress, orderInfo, details, extra);
             }
         },
         {
@@ -169,6 +183,16 @@ 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);
+                }
+                return _index.FusionOrder.new(settlementExtension, orderInfo, details, extra);
+            }
         }
     ]);
     return Quote;

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

@@ -14,6 +14,8 @@ 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/eth-orders.extension.js

@@ -0,0 +1,105 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "EthOrdersExtension", {
+    enumerable: true,
+    get: function() {
+        return EthOrdersExtension;
+    }
+});
+var _ethers = require("ethers");
+var _assert = /*#__PURE__*/ _interop_require_default(require("assert"));
+var _index = require("../fusion-order/index.js");
+var _ETHOrdersabijson = /*#__PURE__*/ _interop_require_default(require("../abi/ETHOrders.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
+    };
+}
+var EthOrdersExtension = /*#__PURE__*/ function() {
+    "use strict";
+    function EthOrdersExtension(address) {
+        _class_call_check(this, EthOrdersExtension);
+        _define_property(this, "address", void 0);
+        _define_property(this, "iface", void 0);
+        this.address = address;
+        this.iface = new _ethers.Interface(_ETHOrdersabijson.default);
+    }
+    _create_class(EthOrdersExtension, [
+        {
+            key: "deposit",
+            value: function deposit(order) {
+                var cancellationAuction = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : _index.CancellationAuction.ZERO;
+                (0, _assert.default)(order.maker.equal(this.address), 'maker must be extension address, use FusionOrder.fromNative to create correct order');
+                return {
+                    to: this.address,
+                    value: order.makingAmount,
+                    data: this.iface.encodeFunctionData('deposit', [
+                        order.build(),
+                        order.extension.encode(),
+                        cancellationAuction.build()
+                    ])
+                };
+            }
+        },
+        {
+            key: "cancelOrder",
+            value: function cancelOrder(orderHash) {
+                return {
+                    to: this.address,
+                    value: 0n,
+                    data: this.iface.encodeFunctionData('cancelOrder', [
+                        orderHash
+                    ])
+                };
+            }
+        },
+        {
+            key: "cancelExpiredOrderByResolver",
+            value: function cancelExpiredOrderByResolver(maker, orderInfo) {
+                return {
+                    value: 0n,
+                    data: this.iface.encodeFunctionData('cancelExpiredOrderByResolver', [
+                        maker.toString(),
+                        orderInfo
+                    ]),
+                    to: this.address
+                };
+            }
+        }
+    ]);
+    return EthOrdersExtension;
+}();

package/dist/cjs/contracts/types.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});