@1inch/fusion-sdk 2.1.9 → 2.1.10-rc.2

package/dist/types/src/amount-calculator/amount-calculator.d.ts

@@ -7,10 +7,13 @@ export declare class AmountCalculator {
     private readonly feeCalculator?;
     constructor(auctionCalculator: AuctionCalculator, feeCalculator?: FeeCalculator | undefined);
     static fromExtension(ext: FusionExtension): AmountCalculator;
-    getTakingAmount(taker: Address, takingAmount: bigint, time: bigint, blockBaseFee?: bigint): bigint;
-    getMakingAmount(taker: Address, makingAmount: bigint, time: bigint, blockBaseFee?: bigint): bigint;
-    getResolverFee(taker: Address, takingAmount: bigint): bigint;
-    getIntegratorFee(taker: Address, takingAmount: bigint): bigint;
-    getProtocolShareOfIntegratorFee(taker: Address, takingAmount: bigint): bigint;
-    getProtocolFee(taker: Address, takingAmount: bigint): bigint;
+    getRequiredTakingAmount(taker: Address, takingAmount: bigint, time: bigint, blockBaseFee?: bigint): bigint;
+    getRequiredMakingAmount(taker: Address, makingAmount: bigint, time: bigint, blockBaseFee?: bigint): bigint;
+    getTotalFee(taker: Address, takingAmount: bigint, time: bigint, blockBaseFee?: bigint): bigint;
+    getUserTakingAmountAmount(taker: Address, takingAmount: bigint, time: bigint, blockBaseFee?: bigint): bigint;
+    getResolverFee(taker: Address, takingAmount: bigint, time: bigint, blockBaseFee?: bigint): bigint;
+    getIntegratorFee(taker: Address, takingAmount: bigint, time: bigint, blockBaseFee?: bigint): bigint;
+    getProtocolShareOfIntegratorFee(taker: Address, takingAmount: bigint, time: bigint, blockBaseFee?: bigint): bigint;
+    getProtocolFee(taker: Address, takingAmount: bigint, time: bigint, blockBaseFee?: bigint): bigint;
+    private getAuctionBumpedAmount;
 }

package/dist/types/src/amount-calculator/index.d.ts

@@ -0,0 +1,3 @@
+export * from './auction-calculator';
+export { AmountCalculator } from './amount-calculator';
+export { FeeCalculator } from '@1inch/limit-order-sdk/extensions/fee-taker';

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

@@ -1,5 +1,5 @@
 import { Address } from '@1inch/limit-order-sdk';
-import { FusionOrderParamsData } from './types';
+import { FusionOrderParamsData, ResolverFeePreset } from './types';
 import { Cost, PresetEnum, QuoterResponse } from '../types';
 import { Preset } from '../preset';
 import { FusionOrder } from '../../../fusion-order';
@@ -8,7 +8,6 @@ export declare class Quote {
     private readonly params;
     readonly settlementAddress: Address;
     readonly fromTokenAmount: bigint;
-    readonly feeToken: string;
     readonly presets: {
         [PresetEnum.fast]: Preset;
         [PresetEnum.slow]: Preset;
@@ -22,6 +21,7 @@ export declare class Quote {
     readonly whitelist: Address[];
     readonly quoteId: string | null;
     readonly slippage: number;
+    readonly resolverFeePreset: ResolverFeePreset;
     constructor(params: QuoterRequest, response: QuoterResponse);
     createFusionOrder(paramsData: Omit<FusionOrderParamsData, 'permit' | 'isPermit2'>): FusionOrder;
     getPreset(type?: PresetEnum): Preset;

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

@@ -1,4 +1,4 @@
-import { Address } from '@1inch/limit-order-sdk';
+import { Address, Bps } from '@1inch/limit-order-sdk';
 import { PresetEnum } from '../types';
 import { NetworkEnum } from '../../../constants';
 export type FusionOrderParamsData = {
@@ -14,3 +14,13 @@ export type FusionOrderParamsData = {
     delayAuctionStartTimeBy?: bigint;
     orderExpirationDelay?: bigint;
 };
+export type IntegratorFeeParams = {
+    receiver: Address;
+    value: Bps;
+    share: Bps;
+};
+export type ResolverFeePreset = {
+    receiver: Address;
+    bps: Bps;
+    whitelistDiscountPercent: Bps;
+};

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

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

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

@@ -1,3 +1,4 @@
+import { IntegratorFeeParams } from './quote';
 import { NetworkEnum } from '../../constants';
 export type QuoterRequestParams = {
     fromTokenAddress: string;
@@ -6,10 +7,13 @@ export type QuoterRequestParams = {
     walletAddress: string;
     enableEstimate?: boolean;
     permit?: string;
-    fee?: number;
+    integratorFee?: IntegratorFeeParams;
     source?: string;
     isPermit2?: boolean;
 };
+export type QuoterRequestParamsRaw = Omit<QuoterRequestParams, 'integratorFee'> & {
+    fee?: number;
+};
 export type QuoterCustomPresetRequestParams = {
     customPreset: CustomPreset;
 };
@@ -20,7 +24,6 @@ export type QuoterApiConfig = {
 };
 export type QuoterResponse = {
     fromTokenAmount: string;
-    feeToken: string;
     presets: QuoterPresets;
     recommended_preset: PresetEnum;
     toTokenAmount: string;
@@ -30,6 +33,7 @@ export type QuoterResponse = {
     whitelist: string[];
     quoteId: string | null;
     autoK: number;
+    fee: ResolverFeePresetRaw;
 };
 export type QuoterPresets = {
     fast: PresetData;
@@ -80,3 +84,8 @@ export type CustomPresetPoint = {
     toTokenAmount: string;
     delay: number;
 };
+export type ResolverFeePresetRaw = {
+    receiver: string;
+    bps: number;
+    whitelistDiscountPercent: number;
+};

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

@@ -56,10 +56,11 @@ export declare class FusionOrder {
     getTypedData(chainId: number): EIP712TypedData;
     getCalculator(): AuctionCalculator;
     calcTakingAmount(taker: Address, makingAmount: bigint, time: bigint, blockBaseFee?: bigint): bigint;
-    getResolverFee(taker: Address, makingAmount?: bigint): bigint;
-    getIntegratorFee(taker: Address, makingAmount?: bigint): bigint;
-    getProtocolShareOfIntegratorFee(taker: Address, makingAmount?: bigint): bigint;
-    getProtocolFee(taker: Address, makingAmount?: bigint): bigint;
+    getUserReceiveAmount(taker: Address, makingAmount: bigint, time: bigint, blockBaseFee?: bigint): bigint;
+    getResolverFee(taker: Address, time: bigint, blockBaseFee?: bigint, makingAmount?: bigint): bigint;
+    getIntegratorFee(taker: Address, time: bigint, blockBaseFee?: bigint, makingAmount?: bigint): bigint;
+    getProtocolShareOfIntegratorFee(taker: Address, time: bigint, blockBaseFee?: bigint, makingAmount?: bigint): bigint;
+    getProtocolFee(taker: Address, time: bigint, blockBaseFee?: bigint, makingAmount?: bigint): bigint;
     canExecuteAt(executor: Address, executionTime: bigint): boolean;
     isExpiredAt(time: bigint): boolean;
     isExclusiveResolver(wallet: Address): boolean;

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

@@ -1,6 +1,6 @@
 export { Address, LimitOrderV4Struct, Extension, randBigInt, getLimitOrderContract, Interaction, TakerTraits, ExtensionBuilder, AmountMode, getLimitOrderV4Domain, LimitOrderContract, OrderInfoData, EIP712TypedData, MakerTraits } from '@1inch/limit-order-sdk';
 export * from './fusion-order/index';
-export * from './amount-calculator/auction-calculator/index';
+export * from './amount-calculator/';
 export * from './connector/index';
 export * from './sdk/index';
 export * from './constants';

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

@@ -1,7 +1,7 @@
 import { LimitOrderV4Struct } from '@1inch/limit-order-sdk';
 import { BlockchainProviderConnector, HttpProviderConnector } from '../connector';
 import { NetworkEnum } from '../constants';
-import { CustomPreset, PresetEnum } from '../api';
+import { CustomPreset, IntegratorFeeParams, PresetEnum } from '../api';
 import { FusionOrder } from '../fusion-order';
 export type FusionSDKConfigParams = {
     url: string;
@@ -17,7 +17,7 @@ export type QuoteParams = {
     walletAddress?: string;
     enableEstimate?: boolean;
     permit?: string;
-    takingFeeBps?: number;
+    integratorFee?: IntegratorFeeParams;
     source?: string;
     isPermit2?: boolean;
 };
@@ -33,17 +33,13 @@ export type OrderParams = {
     receiver?: string;
     preset?: PresetEnum;
     nonce?: bigint;
-    fee?: TakingFeeInfo;
     source?: string;
     isPermit2?: boolean;
     customPreset?: CustomPreset;
     orderExpirationDelay?: bigint;
     allowPartialFills?: boolean;
     allowMultipleFills?: boolean;
-};
-export type TakingFeeInfo = {
-    takingFeeBps: number;
-    takingFeeReceiver: string;
+    integratorFee?: IntegratorFeeParams;
 };
 export type OrderInfo = {
     order: LimitOrderV4Struct;