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

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

@@ -0,0 +1,173 @@
+function _assert_this_initialized(self) {
+    if (self === void 0) {
+        throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+    }
+    return self;
+}
+function _call_super(_this, derived, args) {
+    derived = _get_prototype_of(derived);
+    return _possible_constructor_return(_this, _is_native_reflect_construct() ? Reflect.construct(derived, args || [], _get_prototype_of(_this).constructor) : derived.apply(_this, args));
+}
+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 _get_prototype_of(o) {
+    _get_prototype_of = Object.setPrototypeOf ? Object.getPrototypeOf : function getPrototypeOf(o) {
+        return o.__proto__ || Object.getPrototypeOf(o);
+    };
+    return _get_prototype_of(o);
+}
+function _inherits(subClass, superClass) {
+    if (typeof superClass !== "function" && superClass !== null) {
+        throw new TypeError("Super expression must either be null or a function");
+    }
+    subClass.prototype = Object.create(superClass && superClass.prototype, {
+        constructor: {
+            value: subClass,
+            writable: true,
+            configurable: true
+        }
+    });
+    if (superClass) _set_prototype_of(subClass, superClass);
+}
+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;
+}
+function _possible_constructor_return(self, call) {
+    if (call && (_type_of(call) === "object" || typeof call === "function")) {
+        return call;
+    }
+    return _assert_this_initialized(self);
+}
+function _set_prototype_of(o, p) {
+    _set_prototype_of = Object.setPrototypeOf || function setPrototypeOf(o, p) {
+        o.__proto__ = p;
+        return o;
+    };
+    return _set_prototype_of(o, p);
+}
+function _type_of(obj) {
+    "@swc/helpers - typeof";
+    return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
+}
+function _is_native_reflect_construct() {
+    try {
+        var result = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function() {}));
+    } catch (_) {}
+    return (_is_native_reflect_construct = function() {
+        return !!result;
+    })();
+}
+import { CHAIN_TO_WRAPPER } from './constants.js';
+import { FusionOrder } from './fusion-order.js';
+/**
+ * Fusion order from native currency
+ *
+ * Note, that such order should be submitted onchain through `ETHOrders.depositForOrder` AND offchain through submit to relayer
+ *
+ * @see ETHOrders.depositForOrder https://github.com/1inch/limit-order-protocol/blob/c100474444cd71cf7989cd8a63f375e72656b8b4/contracts/extensions/ETHOrders.sol#L89
+ */ export var FusionOrderFromNative = /*#__PURE__*/ function(FusionOrder) {
+    "use strict";
+    _inherits(FusionOrderFromNative, FusionOrder);
+    function FusionOrderFromNative(realMaker, /**
+         * Fusion extension address
+         * @see https://github.com/1inch/limit-order-settlement
+         */ settlementExtensionContract, orderInfo, auctionDetails, whitelist, surplusParams, extra, extension) {
+        _class_call_check(this, FusionOrderFromNative);
+        var _this;
+        _this = _call_super(this, FusionOrderFromNative, [
+            settlementExtensionContract,
+            orderInfo,
+            auctionDetails,
+            whitelist,
+            surplusParams,
+            extra,
+            extension
+        ]), _define_property(_this, "realMaker", void 0), _this.realMaker = realMaker;
+        return _this;
+    }
+    _create_class(FusionOrderFromNative, null, [
+        {
+            key: "fromNative",
+            value: /**
+     * Create new order from native asset
+     */ function fromNative(chainId, ethOrdersExtension, /**
+         * Fusion extension address
+         * @see https://github.com/1inch/limit-order-settlement
+         */ settlementExtension, orderInfo, details, extra) {
+                var _orderInfo = _object_spread_props(_object_spread({}, orderInfo), {
+                    makerAsset: CHAIN_TO_WRAPPER[chainId],
+                    receiver: orderInfo.receiver || orderInfo.maker,
+                    maker: ethOrdersExtension
+                });
+                return new FusionOrderFromNative(orderInfo.maker, settlementExtension, _orderInfo, details.auction, details.whitelist, details.surplus, extra);
+            }
+        }
+    ]);
+    return FusionOrderFromNative;
+}(FusionOrder);

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

@@ -85,18 +85,7 @@ export var FusionOrder = /*#__PURE__*/ function() {
          * Fusion extension address
          * @see https://github.com/1inch/limit-order-settlement
          */ settlementExtensionContract, orderInfo, auctionDetails, whitelist) {
-        var surplusParams = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : SurplusParams.NO_FEE, extra = arguments.length > 5 && arguments[5] !== void 0 ? arguments[5] : /**
-             * Required if `allowPartialFills` or `allowMultipleFills` is false
-             */ /**
-             * 0x prefixed without the token address
-             */ /**
-             * Default is true
-             */ /**
-             * Default is true
-             */ /**
-             * Order will expire in `orderExpirationDelay` after auction ends
-             * Default 12s
-             */ FusionOrder.defaultExtra, extension = arguments.length > 6 && arguments[6] !== void 0 ? arguments[6] : new FusionExtension(settlementExtensionContract, auctionDetails, whitelist, surplusParams, {
+        var surplusParams = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : SurplusParams.NO_FEE, extra = arguments.length > 5 && arguments[5] !== void 0 ? arguments[5] : FusionOrder.defaultExtra, extension = arguments.length > 6 && arguments[6] !== void 0 ? arguments[6] : new FusionExtension(settlementExtensionContract, auctionDetails, whitelist, surplusParams, {
             makerPermit: extra.permit ? new Interaction(orderInfo.makerAsset, extra.permit) : undefined,
             customReceiver: orderInfo.receiver,
             fees: extra === null || extra === void 0 ? void 0 : extra.fees
@@ -136,6 +125,9 @@ export var FusionOrder = /*#__PURE__*/ function() {
         var builtExtension = extension.build();
         var salt = LimitOrder.buildSalt(builtExtension, orderInfo.salt);
         var saltWithInjectedTrackCode = orderInfo.salt ? salt : injectTrackCode(salt, extra.source);
+        if (orderInfo.makerAsset.isNative()) {
+            throw new Error('use FusionOrder.fromNative to create order from native asset');
+        }
         this.inner = new LimitOrder(_object_spread_props(_object_spread({}, orderInfo), {
             receiver: receiver,
             salt: saltWithInjectedTrackCode
@@ -444,17 +436,7 @@ export var FusionOrder = /*#__PURE__*/ function() {
             value: function _new(/**
          * Fusion extension address
          * @see https://github.com/1inch/limit-order-settlement
-         */ settlementExtension, orderInfo, details, extra) /**
-             * Required if `allowPartialFills` or `allowMultipleFills` is false
-             * Max size is 40bit
-             */ /**
-             * Default is true
-             */ /**
-             * Default is true
-             */ /**
-             * Order will expire in `orderExpirationDelay` after auction ends
-             * Default 12s
-             */ {
+         */ settlementExtension, orderInfo, details, extra) {
                 return new FusionOrder(settlementExtension, orderInfo, details.auction, details.whitelist, details.surplus, extra);
             }
         },

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

@@ -1,7 +1,9 @@
 export * from './fusion-order.js';
+export * from './fusion-order-from-native.js';
 export * from './auction-details/index.js';
 export * from './whitelist/index.js';
 export * from './fusion-extension.js';
 export * from './fees/index.js';
 export { CHAIN_TO_WRAPPER } from './constants.js';
 export * from './surplus-params.js';
+export * from './cancellation-auction.js';

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

@@ -0,0 +1,11 @@
+/**
+     * Required if `allowPartialFills` or `allowMultipleFills` is false
+     * Max size is 40bit
+     */ /**
+     * Default is true
+     */ /**
+     * Default is true
+     */ /**
+     * Order will expire in `orderExpirationDelay` after auction ends
+     * Default 12s
+     */ export { };

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

@@ -125,7 +125,7 @@ export var Whitelist = /*#__PURE__*/ function() {
         {
             key: "isWhitelisted",
             value: function isWhitelisted(address) {
-                var half = address.lastHalf();
+                var half = address.toString().slice(-20);
                 return this.whitelist.some(function(w) {
                     return w.addressHalf === half;
                 });

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

@@ -61,4 +61,22 @@ describe('Whitelist', function() {
         expect(data.canExecuteAt(Address.fromBigInt(3n), start + 9n)).toEqual(false);
         expect(data.canExecuteAt(Address.fromBigInt(2n), start + 50n)).toEqual(false);
     });
+    it('should correctly identify whitelisted addresses with address half reconstruction', function() {
+        var start = 1708117482n;
+        var testAddress = new Address('0x1234567890abcdef1234567890abcdef12345678');
+        var whitelist = Whitelist.new(start, [
+            {
+                address: testAddress,
+                allowFrom: start + 10n
+            }
+        ]);
+        // Get the address half from the whitelist
+        var addressHalf = whitelist.whitelist[0].addressHalf;
+        expect(addressHalf).toBe('1234567890abcdef1234567890abcdef12345678'.slice(-20));
+        // Create a new address by duplicating the address half (like in the user's scenario)
+        var reconstructedAddress = new Address(addressHalf + addressHalf);
+        expect(whitelist.isWhitelisted(reconstructedAddress)).toBe(true);
+        expect(reconstructedAddress.toString().slice(-20)).toBe(addressHalf);
+        expect(reconstructedAddress.lastHalf()).toBe('0x' + addressHalf);
+    });
 });

package/dist/esm/package.json

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

package/dist/esm/sdk/sdk.js

@@ -59,6 +59,13 @@ 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,
@@ -158,6 +165,7 @@ import { Address, MakerTraits } from '@1inch/limit-order-sdk';
 import { encodeCancelOrder } from './encoders/index.js';
 import { FusionApi, QuoterRequest, RelayerRequest, QuoterCustomPresetRequest } from '../api/index.js';
 import { ActiveOrdersRequest, OrdersByMakerRequest, OrderStatusRequest } from '../api/orders/index.js';
+import { FusionOrderFromNative } from '../fusion-order/index.js';
 export var FusionSDK = /*#__PURE__*/ function() {
     "use strict";
     function FusionSDK(config) {
@@ -331,23 +339,25 @@ export var FusionSDK = /*#__PURE__*/ function() {
         },
         {
             key: "submitOrder",
-            value: function submitOrder(order, quoteId) {
+            value: /**
+     * Submit order to relayer
+     *
+     * Note, that orders from native assets must be submitted onchain as well
+     * @see EthOrdersExtension.depositForOrder
+     */ function submitOrder(order, quoteId) {
                 var _this = this;
                 return _async_to_generator(function() {
-                    var orderStruct, signature, relayerRequest;
+                    var signature, orderStruct, relayerRequest;
                     return _ts_generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
-                                if (!_this.config.blockchainProvider) {
-                                    throw new Error('blockchainProvider has not set to config');
-                                }
-                                orderStruct = order.build();
                                 return [
                                     4,
-                                    _this.config.blockchainProvider.signTypedData(orderStruct.maker, order.getTypedData(_this.config.network))
+                                    _this.signOrder(order)
                                 ];
                             case 1:
                                 signature = _state.sent();
+                                orderStruct = order.build();
                                 relayerRequest = RelayerRequest.new({
                                     order: orderStruct,
                                     signature: signature,
@@ -437,6 +447,12 @@ export var FusionSDK = /*#__PURE__*/ function() {
                 return _async_to_generator(function() {
                     var orderStruct, data;
                     return _ts_generator(this, function(_state) {
+                        if (_instanceof(order, FusionOrderFromNative)) {
+                            return [
+                                2,
+                                order.realMaker.toString()
+                            ];
+                        }
                         if (!_this.config.blockchainProvider) {
                             throw new Error('blockchainProvider has not set to config');
                         }
@@ -488,4 +504,5 @@ export var FusionSDK = /*#__PURE__*/ function() {
         }
     ]);
     return FusionSDK;
-}();
+} // eslint-disable-next-line @typescript-eslint/no-unused-vars
+();

package/dist/types/src/api/quoter/quote/quote.d.ts

@@ -2,11 +2,12 @@ import { Address } from '@1inch/limit-order-sdk';
 import { FusionOrderParamsData, IntegratorFeeParams, ResolverFeePreset } from './types.js';
 import { Cost, PresetEnum, QuoterResponse } from '../types.js';
 import { Preset } from '../preset.js';
-import { FusionOrder } from '../../../fusion-order/index.js';
+import { FusionOrder, FusionOrderFromNative } from '../../../fusion-order/index.js';
 import { QuoterRequest } from '../quoter.request.js';
 export declare class Quote {
     private readonly params;
     readonly settlementAddress: Address;
+    readonly ethOrdersAddress?: Address;
     readonly fromTokenAmount: bigint;
     readonly presets: {
         [PresetEnum.fast]: Preset;
@@ -26,7 +27,8 @@ export declare class Quote {
     readonly surplusFee?: number;
     readonly integratorFeeParams?: IntegratorFeeParams;
     constructor(params: QuoterRequest, response: QuoterResponse);
-    createFusionOrder(paramsData: Omit<FusionOrderParamsData, 'permit' | 'isPermit2'>): FusionOrder;
+    createFusionOrder(paramsData: Omit<FusionOrderParamsData, 'permit' | 'isPermit2'>): FusionOrder | FusionOrderFromNative;
     getPreset(type?: PresetEnum): Preset;
     private getWhitelist;
+    private _createOrder;
 }

package/dist/types/src/api/quoter/types.d.ts

@@ -33,6 +33,7 @@ export type QuoterResponse = {
     prices: Cost;
     volume: Cost;
     settlementAddress: string;
+    ethOrdersAddress?: string;
     whitelist: string[];
     quoteId: string | null;
     autoK: number;

package/dist/types/src/contracts/eth-orders.extension.d.ts

@@ -0,0 +1,11 @@
+import { Address, LimitOrderV4Struct } from '@1inch/limit-order-sdk';
+import { CallInfo } from './types.js';
+import { FusionOrder, CancellationAuction } from '../fusion-order/index.js';
+export declare class EthOrdersExtension {
+    address: Address;
+    private readonly iface;
+    constructor(address: Address);
+    deposit(order: FusionOrder, cancellationAuction?: CancellationAuction): CallInfo;
+    cancelOrder(orderHash: string): CallInfo;
+    cancelExpiredOrderByResolver(maker: Address, orderInfo: LimitOrderV4Struct): CallInfo;
+}

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

@@ -0,0 +1,6 @@
+import { Address } from '@1inch/limit-order-sdk';
+export type CallInfo = {
+    data: string;
+    to: Address;
+    value: bigint;
+};

package/dist/types/src/fusion-order/cancellation-auction.d.ts

@@ -0,0 +1,7 @@
+export declare class CancellationAuction {
+    readonly duration: bigint;
+    readonly maxRewardBps: bigint;
+    static ZERO: CancellationAuction;
+    constructor(duration: bigint, maxRewardBps: bigint);
+    build(): bigint;
+}

package/dist/types/src/fusion-order/fusion-order-from-native.d.ts

@@ -0,0 +1,13 @@
+import { Address, OrderInfoData } from '@1inch/limit-order-sdk';
+import { FusionOrder } from './fusion-order.js';
+import { Details, Extra } from './types.js';
+import { FusionExtension } from './fusion-extension.js';
+import { SurplusParams } from './surplus-params.js';
+import { Whitelist } from './whitelist/whitelist.js';
+import { AuctionDetails } from './auction-details/auction-details.js';
+import { NetworkEnum } from '../constants.js';
+export declare class FusionOrderFromNative extends FusionOrder {
+    readonly realMaker: Address;
+    constructor(realMaker: Address, settlementExtensionContract: Address, orderInfo: OrderInfoData, auctionDetails: AuctionDetails, whitelist: Whitelist, surplusParams?: SurplusParams, extra?: Extra, extension?: FusionExtension);
+    static fromNative(chainId: NetworkEnum, ethOrdersExtension: Address, settlementExtension: Address, orderInfo: Omit<OrderInfoData, 'makerAsset'>, details: Details, extra?: Extra): FusionOrderFromNative;
+}

package/dist/types/src/fusion-order/fusion-order.d.ts

@@ -3,7 +3,7 @@ import { FusionExtension } from './fusion-extension.js';
 import { AuctionDetails } from './auction-details/index.js';
 import { Whitelist } from './whitelist/whitelist.js';
 import { SurplusParams } from './surplus-params.js';
-import { Fees } from './fees/index.js';
+import type { Details, Extra } from './types.js';
 import { AuctionCalculator } from '../amount-calculator/auction-calculator/index.js';
 import { AmountCalculator } from '../amount-calculator/amount-calculator.js';
 export declare class FusionOrder {
@@ -11,17 +11,7 @@ export declare class FusionOrder {
     private static defaultExtra;
     readonly fusionExtension: FusionExtension;
     private inner;
-    protected constructor(settlementExtensionContract: Address, orderInfo: OrderInfoData, auctionDetails: AuctionDetails, whitelist: Whitelist, surplusParams?: SurplusParams, extra?: {
-        unwrapWETH?: boolean;
-        nonce?: bigint;
-        permit?: string;
-        allowPartialFills?: boolean;
-        allowMultipleFills?: boolean;
-        orderExpirationDelay?: bigint;
-        enablePermit2?: boolean;
-        source?: string;
-        fees?: Fees;
-    }, extension?: FusionExtension);
+    protected constructor(settlementExtensionContract: Address, orderInfo: OrderInfoData, auctionDetails: AuctionDetails, whitelist: Whitelist, surplusParams?: SurplusParams, extra?: Extra, extension?: FusionExtension);
     get extension(): Extension;
     get maker(): Address;
     get takerAsset(): Address;
@@ -38,21 +28,7 @@ export declare class FusionOrder {
     get multipleFillsAllowed(): boolean;
     get nonce(): bigint;
     get salt(): bigint;
-    static new(settlementExtension: Address, orderInfo: OrderInfoData, details: {
-        auction: AuctionDetails;
-        whitelist: Whitelist;
-        surplus?: SurplusParams;
-    }, extra?: {
-        unwrapWETH?: boolean;
-        nonce?: bigint;
-        permit?: string;
-        allowPartialFills?: boolean;
-        allowMultipleFills?: boolean;
-        orderExpirationDelay?: bigint;
-        enablePermit2?: boolean;
-        source?: string;
-        fees?: Fees;
-    }): FusionOrder;
+    static new(settlementExtension: Address, orderInfo: OrderInfoData, details: Details, extra?: Extra): FusionOrder;
     static fromDataAndExtension(order: LimitOrderV4Struct, extension: Extension): FusionOrder;
     build(): LimitOrderV4Struct;
     getOrderHash(chainId: number): string;

package/dist/types/src/fusion-order/index.d.ts

@@ -1,7 +1,9 @@
 export * from './fusion-order.js';
+export * from './fusion-order-from-native.js';
 export * from './auction-details/index.js';
 export * from './whitelist/index.js';
 export * from './fusion-extension.js';
 export * from './fees/index.js';
 export { CHAIN_TO_WRAPPER } from './constants.js';
 export * from './surplus-params.js';
+export * from './cancellation-auction.js';

package/dist/types/src/fusion-order/types.d.ts

@@ -0,0 +1,20 @@
+import { AuctionDetails } from './auction-details/auction-details.js';
+import { Fees } from './fees/index.js';
+import { SurplusParams } from './surplus-params.js';
+import { Whitelist } from './whitelist/whitelist.js';
+export type Extra = {
+    unwrapWETH?: boolean;
+    nonce?: bigint;
+    permit?: string;
+    allowPartialFills?: boolean;
+    allowMultipleFills?: boolean;
+    orderExpirationDelay?: bigint;
+    enablePermit2?: boolean;
+    source?: string;
+    fees?: Fees;
+};
+export type Details = {
+    auction: AuctionDetails;
+    whitelist: Whitelist;
+    surplus?: SurplusParams;
+};