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

package/dist/esm/index.js

@@ -10,4 +10,5 @@ export * from './utils/time.js';
 export * from './validations.js';
 export * from './ws-api/index.js';
 export * from './errors.js';
+export * from './contracts/index.js';
 export { QuoterRequest, RelayerRequest, QuoterCustomPresetRequest, PresetEnum, Preset, Quote, OrderStatus } from './api/index.js';

package/dist/esm/package.json

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

package/dist/esm/sdk/sdk.js

@@ -331,50 +331,55 @@ 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 with `submitNativeOrder`
+     *
+     * @see FusionSDK.submitNativeOrder
+     */ function submitOrder(order, quoteId) {
                 var _this = this;
                 return _async_to_generator(function() {
-                    var orderStruct, signature, relayerRequest;
+                    var signature;
                     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();
-                                relayerRequest = RelayerRequest.new({
-                                    order: orderStruct,
-                                    signature: signature,
-                                    quoteId: quoteId,
-                                    extension: order.extension.encode()
-                                });
-                                return [
-                                    4,
-                                    _this.api.submitOrder(relayerRequest)
-                                ];
-                            case 2:
-                                _state.sent();
                                 return [
                                     2,
-                                    {
-                                        order: orderStruct,
-                                        signature: signature,
-                                        quoteId: quoteId,
-                                        orderHash: order.getOrderHash(_this.config.network),
-                                        extension: relayerRequest.extension
-                                    }
+                                    _this._submitOrder(order, quoteId, signature)
                                 ];
                         }
                     });
                 })();
             }
         },
+        {
+            key: "submitNativeOrder",
+            value: /**
+     * Submit order to relayer
+     *
+     * Note, that orders from native assets must be submitted on-chain as well
+     * @see NativeOrdersFactory.create
+     */ function submitNativeOrder(order, maker, quoteId) {
+                var _this = this;
+                return _async_to_generator(function() {
+                    var signature;
+                    return _ts_generator(this, function(_state) {
+                        signature = _this.signNativeOrder(order, maker);
+                        return [
+                            2,
+                            _this._submitOrder(order, quoteId, signature)
+                        ];
+                    });
+                })();
+            }
+        },
         {
             key: "placeOrder",
             value: function placeOrder(params) {
@@ -432,7 +437,13 @@ export var FusionSDK = /*#__PURE__*/ function() {
         },
         {
             key: "signOrder",
-            value: function signOrder(order) {
+            value: /**
+     * Sign order using `blockchainProvider` from config
+     *
+     * Use FusionSDK.signNativeOrder for signing orders from native asset
+     *
+     * @see FusionSDK.signNativeOrder
+     */ function signOrder(order) {
                 var _this = this;
                 return _async_to_generator(function() {
                     var orderStruct, data;
@@ -450,6 +461,49 @@ export var FusionSDK = /*#__PURE__*/ function() {
                 })();
             }
         },
+        {
+            key: "signNativeOrder",
+            value: function signNativeOrder(order, maker) {
+                return order.nativeSignature(maker);
+            }
+        },
+        {
+            key: "_submitOrder",
+            value: function _submitOrder(order, quoteId, signature) {
+                var _this = this;
+                return _async_to_generator(function() {
+                    var orderStruct, relayerRequest;
+                    return _ts_generator(this, function(_state) {
+                        switch(_state.label){
+                            case 0:
+                                orderStruct = order.build();
+                                relayerRequest = RelayerRequest.new({
+                                    order: orderStruct,
+                                    signature: signature,
+                                    quoteId: quoteId,
+                                    extension: order.extension.encode()
+                                });
+                                return [
+                                    4,
+                                    _this.api.submitOrder(relayerRequest)
+                                ];
+                            case 1:
+                                _state.sent();
+                                return [
+                                    2,
+                                    {
+                                        order: orderStruct,
+                                        signature: signature,
+                                        quoteId: quoteId,
+                                        orderHash: order.getOrderHash(_this.config.network),
+                                        extension: relayerRequest.extension
+                                    }
+                                ];
+                        }
+                    });
+                })();
+            }
+        },
         {
             key: "getQuoteResult",
             value: function getQuoteResult(params) {
@@ -488,4 +542,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

@@ -4,9 +4,11 @@ import { Cost, PresetEnum, QuoterResponse } from '../types.js';
 import { Preset } from '../preset.js';
 import { FusionOrder } from '../../../fusion-order/index.js';
 import { QuoterRequest } from '../quoter.request.js';
+import { ProxyFactory } from '../../../index.js';
 export declare class Quote {
     private readonly params;
     readonly settlementAddress: Address;
+    readonly nativeOrderFactory?: ProxyFactory;
     readonly fromTokenAmount: bigint;
     readonly presets: {
         [PresetEnum.fast]: Preset;
@@ -29,4 +31,5 @@ export declare class Quote {
     createFusionOrder(paramsData: Omit<FusionOrderParamsData, 'permit' | 'isPermit2'>): FusionOrder;
     getPreset(type?: PresetEnum): Preset;
     private getWhitelist;
+    private _createOrder;
 }

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

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

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

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

package/dist/types/src/contracts/native-order-factory.d.ts

@@ -0,0 +1,9 @@
+import { Address } from '@1inch/limit-order-sdk';
+import { CallInfo } from './types.js';
+import { FusionOrder } from '../fusion-order/index.js';
+export declare class NativeOrdersFactory {
+    address: Address;
+    private readonly iface;
+    constructor(address: Address);
+    create(maker: Address, order: FusionOrder): CallInfo;
+}

package/dist/types/src/contracts/native-order-impl.d.ts

@@ -0,0 +1,10 @@
+import { Address } from '@1inch/limit-order-sdk';
+import { CallInfo } from './types.js';
+import { FusionOrder } from '../fusion-order/index.js';
+export declare class NativeOrdersImpl {
+    address: Address;
+    private readonly iface;
+    constructor(address: Address);
+    cancel(maker: Address, order: FusionOrder): CallInfo;
+    cancelExpiredOrderByResolver(maker: Address, order: FusionOrder): CallInfo;
+}

package/dist/types/src/contracts/proxy-factory.d.ts

@@ -0,0 +1,8 @@
+import { Address } from '@1inch/limit-order-sdk';
+export declare class ProxyFactory {
+    readonly factory: Address;
+    readonly implementation: Address;
+    constructor(factory: Address, implementation: Address);
+    static calcProxyBytecodeHash(impl: Address): string;
+    getProxyAddress(salt: string): Address;
+}

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.d.ts

@@ -1,27 +1,19 @@
 import { Address, EIP712TypedData, Extension, LimitOrderV4Struct, OrderInfoData } from '@1inch/limit-order-sdk';
+import { ProxyFactory } from 'contracts/proxy-factory.js';
 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 { NetworkEnum } from '../constants.js';
 import { AmountCalculator } from '../amount-calculator/amount-calculator.js';
 export declare class FusionOrder {
     readonly settlementExtensionContract: Address;
     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 +30,9 @@ 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 isNativeOrder(chainId: number, ethOrderFactory: ProxyFactory, order: LimitOrderV4Struct, signature: string): boolean;
+    static fromNative(chainId: NetworkEnum, ethOrdersFactory: ProxyFactory, settlementExtension: Address, orderInfo: Omit<OrderInfoData, 'makerAsset'>, details: Details, extra?: Extra): FusionOrder;
     static fromDataAndExtension(order: LimitOrderV4Struct, extension: Extension): FusionOrder;
     build(): LimitOrderV4Struct;
     getOrderHash(chainId: number): string;
@@ -70,4 +50,6 @@ export declare class FusionOrder {
     isExclusiveResolver(wallet: Address): boolean;
     isExclusivityPeriod(time?: bigint): boolean;
     getAmountCalculator(): AmountCalculator;
+    isNative(chainId: number, ethOrderFactory: ProxyFactory, signature: string): boolean;
+    nativeSignature(maker: Address): string;
 }

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

@@ -5,3 +5,4 @@ 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;
+};

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

@@ -10,4 +10,5 @@ export * from './utils/time.js';
 export * from './validations.js';
 export * from './ws-api/index.js';
 export * from './errors.js';
+export * from './contracts/index.js';
 export { QuoterRequest, type QuoterResponse, RelayerRequest, QuoterCustomPresetRequest, PresetEnum, Preset, Quote, type OrderStatusResponse, OrderStatus } from './api/index.js';

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

@@ -1,3 +1,4 @@
+import { Address } from '@1inch/limit-order-sdk';
 import { FusionSDKConfigParams, OrderInfo, OrderParams, PreparedOrder, QuoteParams, QuoteCustomPresetParams } from './types.js';
 import { FusionApi, Quote } from '../api/index.js';
 import { ActiveOrdersRequestParams, ActiveOrdersResponse, OrdersByMakerParams, OrdersByMakerResponse, OrderStatusResponse } from '../api/orders/index.js';
@@ -13,8 +14,11 @@ export declare class FusionSDK {
     getQuoteWithCustomPreset(params: QuoteParams, body: QuoteCustomPresetParams): Promise<Quote>;
     createOrder(params: OrderParams): Promise<PreparedOrder>;
     submitOrder(order: FusionOrder, quoteId: string): Promise<OrderInfo>;
+    submitNativeOrder(order: FusionOrder, maker: Address, quoteId: string): Promise<OrderInfo>;
     placeOrder(params: OrderParams): Promise<OrderInfo>;
     buildCancelOrderCallData(orderHash: string): Promise<string>;
     signOrder(order: FusionOrder): Promise<string>;
+    signNativeOrder(order: FusionOrder, maker: Address): string;
+    private _submitOrder;
     private getQuoteResult;
 }