@1inch/fusion-sdk 2.4.5-rc.0 → 2.4.5

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

@@ -128,6 +128,9 @@ export var FusionOrder = /*#__PURE__*/ function() {
         if (orderInfo.makerAsset.isNative()) {
             throw new Error('use FusionOrder.fromNative to create order from native asset');
         }
+        if (!surplusParams.isZero()) {
+            assert(orderInfo.takingAmount <= surplusParams.estimatedTakerAmount, 'order.takingAmount must be less then surplusParams.estimatedTakerAmount');
+        }
         var optimizeReceiverAddress = extra.optimizeReceiverAddress !== undefined ? extra.optimizeReceiverAddress : FusionOrder.defaultExtra.optimizeReceiverAddress;
         this.inner = new LimitOrder(_object_spread_props(_object_spread({}, orderInfo), {
             receiver: receiver,

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

@@ -292,6 +292,38 @@ describe('Fusion Order', function() {
         expect(userAmount).toEqual(75000000n);
         expect(surplus).toEqual(25000000n);
     });
+    it('should fail to create fusion order with bad surplus params', function() {
+        var extensionContract = new Address('0x8273f37417da37c4a6c3995e82cf442f87a25d9c');
+        expect(function() {
+            return FusionOrder.new(extensionContract, {
+                makerAsset: new Address('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'),
+                takerAsset: new Address('0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48'),
+                makingAmount: 1000000000000000000n,
+                takingAmount: 1420000000n,
+                maker: new Address('0x00000000219ab540356cbb839cbe05303d7705fa'),
+                salt: 10n
+            }, {
+                auction: new AuctionDetails({
+                    duration: 180n,
+                    startTime: 1673548149n,
+                    initialRateBump: 50000,
+                    points: [
+                        {
+                            coefficient: 20000,
+                            delay: 12
+                        }
+                    ]
+                }),
+                whitelist: Whitelist.new(1673548139n, [
+                    {
+                        address: new Address('0x00000000219ab540356cbb839cbe05303d7705fa'),
+                        allowFrom: 0n
+                    }
+                ]),
+                surplus: new SurplusParams(1420000000n - 1n, Bps.fromFraction(0.1))
+            });
+        }).toThrow('order.takingAmount must be less then surplusParams.estimatedTakerAmount');
+    });
 });
 describe('FusionOrder Native', function() {
     it('should correct detect that order is from native asset', function() {
@@ -425,7 +457,7 @@ describe('FusionOrder Native', function() {
                     allowFrom: 0n
                 }
             ]),
-            surplus: new SurplusParams(10n, new Bps(10000n))
+            surplus: new SurplusParams(1420000000n * 2n, new Bps(10000n))
         });
         expect(nativeOrder.build().receiver).toEqual(settlementExt.toString());
     });

package/dist/esm/package.json

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

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

@@ -1,5 +1,5 @@
 import { Address, ProxyFactory } from '@1inch/limit-order-sdk';
-import { FusionOrderParamsData, IntegratorFeeResponse, ResolverFeePreset } from './types.js';
+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';
@@ -25,11 +25,10 @@ export declare class Quote {
     readonly slippage: number;
     readonly resolverFeePreset: ResolverFeePreset;
     readonly surplusFee?: number;
-    readonly integratorFeeParams?: IntegratorFeeResponse;
+    readonly integratorFeeParams?: IntegratorFeeParams;
     constructor(params: QuoterRequest, response: QuoterResponse);
     createFusionOrder(paramsData: Omit<FusionOrderParamsData, 'permit' | 'isPermit2'>): FusionOrder;
     getPreset(type?: PresetEnum): Preset;
     private getWhitelist;
     private _createOrder;
-    private parseIntegratorFee;
 }

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

@@ -13,16 +13,11 @@ export type FusionOrderParamsData = {
     delayAuctionStartTimeBy?: bigint;
     orderExpirationDelay?: bigint;
 };
-export type IntegratorFeeRequest = {
-    receiver: Address;
-    value: Bps;
-};
-export type IntegratorFeeResponse = {
+export type IntegratorFeeParams = {
     receiver: Address;
     value: Bps;
     share: Bps;
 };
-export type IntegratorFeeParams = IntegratorFeeResponse;
 export type ResolverFeePreset = {
     receiver: Address;
     bps: Bps;

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

@@ -1,6 +1,6 @@
 import { Address } from '@1inch/limit-order-sdk';
 import { QuoterRequestParams, QuoterRequestParamsRaw } from './types.js';
-import { IntegratorFeeRequest } from './quote/index.js';
+import { IntegratorFeeParams } from './quote/index.js';
 export declare class QuoterRequest {
     readonly fromTokenAddress: Address;
     readonly toTokenAddress: Address;
@@ -8,8 +8,8 @@ export declare class QuoterRequest {
     readonly walletAddress: Address;
     readonly enableEstimate: boolean;
     readonly permit: string | undefined;
-    readonly integratorFee?: IntegratorFeeRequest;
-    readonly source?: string;
+    readonly integratorFee?: IntegratorFeeParams;
+    readonly source: string;
     readonly isPermit2: boolean;
     readonly slippage?: number;
     constructor(params: QuoterRequestParams);

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

@@ -1,4 +1,4 @@
-import { IntegratorFeeRequest } from './quote/index.js';
+import { IntegratorFeeParams } from './quote/index.js';
 import { NetworkEnum } from '../../constants.js';
 export type QuoterRequestParams = {
     fromTokenAddress: string;
@@ -7,7 +7,7 @@ export type QuoterRequestParams = {
     walletAddress: string;
     enableEstimate?: boolean;
     permit?: string;
-    integratorFee?: IntegratorFeeRequest;
+    integratorFee?: IntegratorFeeParams;
     source?: string;
     isPermit2?: boolean;
     slippage?: number;

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

@@ -1,7 +1,7 @@
 import { Address, LimitOrderV4Struct } from '@1inch/limit-order-sdk';
 import { BlockchainProviderConnector, HttpProviderConnector } from '../connector/index.js';
 import { NetworkEnum } from '../constants.js';
-import { CustomPreset, IntegratorFeeRequest, PresetEnum } from '../api/index.js';
+import { CustomPreset, IntegratorFeeParams, PresetEnum } from '../api/index.js';
 import { FusionOrder } from '../fusion-order/index.js';
 export type FusionSDKConfigParams = {
     url: string;
@@ -17,7 +17,7 @@ export type QuoteParams = {
     walletAddress?: string;
     enableEstimate?: boolean;
     permit?: string;
-    integratorFee?: IntegratorFeeRequest;
+    integratorFee?: IntegratorFeeParams;
     source?: string;
     isPermit2?: boolean;
     slippage?: number;
@@ -40,7 +40,7 @@ export type OrderParams = {
     orderExpirationDelay?: bigint;
     allowPartialFills?: boolean;
     allowMultipleFills?: boolean;
-    integratorFee?: IntegratorFeeRequest;
+    integratorFee?: IntegratorFeeParams;
     slippage?: number;
 };
 export type OrderInfo = {