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

package/dist/cjs/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": []}
+]

package/dist/cjs/abi/NativeOrderImpl.abi.json

@@ -0,0 +1,281 @@
+[
+    {
+        "type": "constructor",
+        "inputs": [
+            {
+                "name": "weth",
+                "type": "address",
+                "internalType": "contract IWETH"
+            },
+            {
+                "name": "nativeOrderFactory",
+                "type": "address",
+                "internalType": "address"
+            },
+            {
+                "name": "limitOrderProtocol",
+                "type": "address",
+                "internalType": "address"
+            },
+            {
+                "name": "accessToken",
+                "type": "address",
+                "internalType": "contract IERC20"
+            }
+        ],
+        "stateMutability": "nonpayable"
+    },
+    {"type": "receive", "stateMutability": "payable"},
+    {
+        "type": "function",
+        "name": "cancelExpiredOrderByResolver",
+        "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": [],
+        "stateMutability": "nonpayable"
+    },
+    {
+        "type": "function",
+        "name": "cancelOrder",
+        "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": [],
+        "stateMutability": "nonpayable"
+    },
+    {
+        "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": "hash", "type": "bytes32", "internalType": "bytes32"},
+            {"name": "signature", "type": "bytes", "internalType": "bytes"}
+        ],
+        "outputs": [{"name": "", "type": "bytes4", "internalType": "bytes4"}],
+        "stateMutability": "view"
+    },
+    {
+        "type": "function",
+        "name": "name",
+        "inputs": [],
+        "outputs": [{"name": "", "type": "string", "internalType": "string"}],
+        "stateMutability": "pure"
+    },
+    {
+        "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": "symbol",
+        "inputs": [],
+        "outputs": [{"name": "", "type": "string", "internalType": "string"}],
+        "stateMutability": "pure"
+    },
+    {
+        "type": "event",
+        "name": "NativeOrderCancelled",
+        "inputs": [
+            {
+                "name": "makerOrderHash",
+                "type": "bytes32",
+                "indexed": false,
+                "internalType": "bytes32"
+            },
+            {
+                "name": "balance",
+                "type": "uint256",
+                "indexed": false,
+                "internalType": "uint256"
+            },
+            {
+                "name": "resolverReward",
+                "type": "uint256",
+                "indexed": false,
+                "internalType": "uint256"
+            }
+        ],
+        "anonymous": false
+    },
+    {"type": "error", "name": "CanNotCancelForZeroBalance", "inputs": []},
+    {"type": "error", "name": "EthDepositRejected", "inputs": []},
+    {"type": "error", "name": "ForceApproveFailed", "inputs": []},
+    {
+        "type": "error",
+        "name": "OnlyFactoryViolation",
+        "inputs": [
+            {"name": "sender", "type": "address", "internalType": "address"},
+            {"name": "factory", "type": "address", "internalType": "address"}
+        ]
+    },
+    {
+        "type": "error",
+        "name": "OnlyLimitOrderProtocolViolation",
+        "inputs": [
+            {"name": "sender", "type": "address", "internalType": "address"},
+            {
+                "name": "limitOrderProtocol",
+                "type": "address",
+                "internalType": "address"
+            }
+        ]
+    },
+    {
+        "type": "error",
+        "name": "OrderIsIncorrect",
+        "inputs": [
+            {"name": "expected", "type": "address", "internalType": "address"},
+            {"name": "actual", "type": "address", "internalType": "address"}
+        ]
+    },
+    {
+        "type": "error",
+        "name": "OrderShouldBeExpired",
+        "inputs": [
+            {
+                "name": "currentTime",
+                "type": "uint256",
+                "internalType": "uint256"
+            },
+            {
+                "name": "expirationTime",
+                "type": "uint256",
+                "internalType": "uint256"
+            }
+        ]
+    },
+    {
+        "type": "error",
+        "name": "RescueFundsTooMuch",
+        "inputs": [
+            {"name": "requested", "type": "uint256", "internalType": "uint256"},
+            {"name": "available", "type": "uint256", "internalType": "uint256"}
+        ]
+    },
+    {
+        "type": "error",
+        "name": "ResolverAccessTokenMissing",
+        "inputs": [
+            {"name": "resolver", "type": "address", "internalType": "address"},
+            {
+                "name": "accessToken",
+                "type": "address",
+                "internalType": "address"
+            }
+        ]
+    },
+    {"type": "error", "name": "SafeTransferFailed", "inputs": []}
+]

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

@@ -10,12 +10,14 @@ 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");
 var _index = require("../../../fusion-order/index.js");
 var _constants = require("../../../fusion-order/constants.js");
 var _index1 = require("../../../fusion-order/fees/index.js");
+var _index2 = require("../../../index.js");
 function _class_call_check(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
@@ -48,6 +50,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 +64,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, "nativeOrderFactory", void 0);
         _define_property(this, "fromTokenAmount", void 0);
         _define_property(this, "presets", void 0);
         _define_property(this, "recommendedPreset", void 0);
@@ -85,6 +96,7 @@ var Quote = /*#__PURE__*/ function() {
         this.recommendedPreset = response.recommended_preset;
         this.slippage = response.autoK;
         this.settlementAddress = new _limitordersdk.Address(response.settlementAddress);
+        this.nativeOrderFactory = response.nativeOrderFactoryAddress && response.nativeOrderImplAddress ? new _index2.ProxyFactory(new _limitordersdk.Address(response.nativeOrderFactoryAddress), new _limitordersdk.Address(response.nativeOrderImplAddress)) : undefined;
         this.resolverFeePreset = {
             receiver: new _limitordersdk.Address(response.fee.receiver),
             whitelistDiscountPercent: _limitordersdk.Bps.fromPercent(response.fee.whitelistDiscountPercent),
@@ -119,18 +131,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 +154,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 +184,16 @@ var Quote = /*#__PURE__*/ function() {
                     };
                 }));
             }
+        },
+        {
+            key: "_createOrder",
+            value: function _createOrder(chainId, settlementExtension, orderInfo, details, extra) {
+                if (this.params.fromTokenAddress.isNative()) {
+                    (0, _assert.default)(this.nativeOrderFactory, 'expected nativeOrderFactory to be set for order from native asset');
+                    return _index.FusionOrder.fromNative(chainId, this.nativeOrderFactory, settlementExtension, orderInfo, details, extra);
+                }
+                return _index.FusionOrder.new(settlementExtension, orderInfo, details, extra);
+            }
         }
     ]);
     return Quote;

package/dist/cjs/contracts/index.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+_export_star(require("./native-order-factory.js"), exports);
+_export_star(require("./native-order-impl.js"), exports);
+_export_star(require("./proxy-factory.js"), exports);
+function _export_star(from, to) {
+    Object.keys(from).forEach(function(k) {
+        if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
+            Object.defineProperty(to, k, {
+                enumerable: true,
+                get: function() {
+                    return from[k];
+                }
+            });
+        }
+    });
+    return from;
+}