@1inch/fusion-sdk 2.1.11 → 2.1.12-rc.0

package/dist/cjs/fusion-order/auction-details/auction-details.js

@@ -24,56 +24,48 @@ class AuctionDetails {
         (0, assert_1.default)(this.duration <= constants_1.UINT_24_MAX);
         (0, assert_1.default)(this.initialRateBump <= constants_1.UINT_24_MAX);
     }
-    static decodeFrom(iter) {
+    static decode(data) {
+        (0, assert_1.default)((0, validations_1.isHexBytes)(data), 'Invalid auction details data');
+        const iter = byte_utils_1.BytesIter.BigInt(data);
         const gasBumpEstimate = iter.nextUint24();
         const gasPriceEstimate = iter.nextUint32();
         const start = iter.nextUint32();
         const duration = iter.nextUint24();
         const rateBump = Number(iter.nextUint24());
         const points = [];
-        let pointsLen = BigInt(iter.nextUint8());
-        while (pointsLen--) {
+        while (!iter.isEmpty()) {
             points.push({
                 coefficient: Number(iter.nextUint24()),
                 delay: Number(iter.nextUint16())
             });
         }
         return new AuctionDetails({
-            startTime: BigInt(start),
-            duration: BigInt(duration),
+            startTime: start,
+            duration: duration,
             initialRateBump: rateBump,
             points,
             gasCost: {
-                gasBumpEstimate: BigInt(gasBumpEstimate),
-                gasPriceEstimate: BigInt(gasPriceEstimate)
+                gasBumpEstimate,
+                gasPriceEstimate
             }
         });
     }
-    static decode(data) {
-        (0, assert_1.default)((0, validations_1.isHexBytes)(data), 'Invalid auction details data');
-        const iter = byte_utils_1.BytesIter.BigInt(data);
-        return AuctionDetails.decodeFrom(iter);
-    }
     static fromExtension(extension) {
         return AuctionDetails.decode((0, utils_1.add0x)(extension.makingAmountData.slice(42)));
     }
     encode() {
-        let details = ethers_1.ethers.solidityPacked(['uint24', 'uint32', 'uint32', 'uint24', 'uint24', 'uint8'], [
+        let details = ethers_1.ethers.solidityPacked(['uint24', 'uint32', 'uint32', 'uint24', 'uint24'], [
             this.gasCost.gasBumpEstimate,
             this.gasCost.gasPriceEstimate,
             this.startTime,
             this.duration,
-            this.initialRateBump,
-            this.points.length
+            this.initialRateBump
         ]);
         for (let i = 0; i < this.points.length; i++) {
             details += (0, utils_1.trim0x)(ethers_1.ethers.solidityPacked(['uint24', 'uint16'], [this.points[i].coefficient, this.points[i].delay]));
         }
         return details;
     }
-    encodeInto(builder = new byte_utils_1.BytesBuilder()) {
-        return builder.addBytes(this.encode());
-    }
 }
 exports.AuctionDetails = AuctionDetails;
 //# sourceMappingURL=auction-details.js.map

package/dist/cjs/fusion-order/auction-details/auction-details.js.map

@@ -1 +1 @@
-{"version":3,"file":"auction-details.js","sourceRoot":"","sources":["../../../../src/fusion-order/auction-details/auction-details.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"auction-details.js","sourceRoot":"","sources":["../../../../src/fusion-order/auction-details/auction-details.ts"],"names":[],"mappings":"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"}

package/dist/cjs/fusion-order/cancellation-auction.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CancellationAuction = void 0;
+const tslib_1 = require("tslib");
+const byte_utils_1 = require("@1inch/byte-utils");
+const assert_1 = tslib_1.__importDefault(require("assert"));
+class CancellationAuction {
+    constructor(duration, maxRewardBps) {
+        this.duration = duration;
+        this.maxRewardBps = maxRewardBps;
+        (0, assert_1.default)(duration <= byte_utils_1.UINT_32_MAX, 'max cancellation auction duration must be <= UINT_32_MAX');
+        (0, assert_1.default)(maxRewardBps <= byte_utils_1.UINT_16_MAX, 'max cancellation auction maxRewardBps must be <= UINT_16_MAX');
+    }
+    build() {
+        return (this.duration << 16n) | this.maxRewardBps;
+    }
+}
+exports.CancellationAuction = CancellationAuction;
+CancellationAuction.ZERO = new CancellationAuction(0n, 0n);
+//# sourceMappingURL=cancellation-auction.js.map

package/dist/cjs/fusion-order/cancellation-auction.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cancellation-auction.js","sourceRoot":"","sources":["../../../src/fusion-order/cancellation-auction.ts"],"names":[],"mappings":";;;;AAAA,kDAA0D;AAC1D,4DAA2B;AAE3B,MAAa,mBAAmB;IAG5B,YACoB,QAAgB,EAYhB,YAAoB;QAZpB,aAAQ,GAAR,QAAQ,CAAQ;QAYhB,iBAAY,GAAZ,YAAY,CAAQ;QAEpC,IAAA,gBAAM,EACF,QAAQ,IAAI,wBAAW,EACvB,0DAA0D,CAC7D,CAAA;QAED,IAAA,gBAAM,EACF,YAAY,IAAI,wBAAW,EAC3B,8DAA8D,CACjE,CAAA;IACL,CAAC;IAEM,KAAK;QACR,OAAO,CAAC,IAAI,CAAC,QAAQ,IAAI,GAAG,CAAC,GAAG,IAAI,CAAC,YAAY,CAAA;IACrD,CAAC;;AA/BL,kDAgCC;AA/BU,wBAAI,GAAG,IAAI,mBAAmB,CAAC,EAAE,EAAE,EAAE,CAAC,CAAA"}

package/dist/cjs/fusion-order/constants.js

@@ -14,6 +14,8 @@ exports.CHAIN_TO_WRAPPER = {
     [constants_1.NetworkEnum.OPTIMISM]: new limit_order_sdk_1.Address('0x4200000000000000000000000000000000000006'),
     [constants_1.NetworkEnum.FANTOM]: new limit_order_sdk_1.Address('0x21be370d5312f44cb42ce377bc9b8a0cef1a4c83'),
     [constants_1.NetworkEnum.ZKSYNC]: new limit_order_sdk_1.Address('0x5aea5775959fbc2557cc8789bc1bf90a239d9a91'),
-    [constants_1.NetworkEnum.LINEA]: new limit_order_sdk_1.Address('0xe5d7c2a44ffddf6b295a15c148167daaaf5cf34f')
+    [constants_1.NetworkEnum.LINEA]: new limit_order_sdk_1.Address('0xe5d7c2a44ffddf6b295a15c148167daaaf5cf34f'),
+    [constants_1.NetworkEnum.SONIC]: new limit_order_sdk_1.Address('0x039e2fb66102314ce7b64ce5ce3e5183bc94ad38'),
+    [constants_1.NetworkEnum.UNICHAIN]: new limit_order_sdk_1.Address('0x4200000000000000000000000000000000000006')
 };
 //# sourceMappingURL=constants.js.map

package/dist/cjs/fusion-order/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/fusion-order/constants.ts"],"names":[],"mappings":";;;AAAA,4DAA8C;AAC9C,4CAAwC;AAE3B,QAAA,gBAAgB,GAAG;IAC5B,CAAC,uBAAW,CAAC,QAAQ,CAAC,EAAE,IAAI,yBAAO,CAC/B,4CAA4C,CAC/C;IACD,CAAC,uBAAW,CAAC,OAAO,CAAC,EAAE,IAAI,yBAAO,CAC9B,4CAA4C,CAC/C;IACD,CAAC,uBAAW,CAAC,OAAO,CAAC,EAAE,IAAI,yBAAO,CAC9B,4CAA4C,CAC/C;IACD,CAAC,uBAAW,CAAC,QAAQ,CAAC,EAAE,IAAI,yBAAO,CAC/B,4CAA4C,CAC/C;IACD,CAAC,uBAAW,CAAC,SAAS,CAAC,EAAE,IAAI,yBAAO,CAChC,4CAA4C,CAC/C;IACD,CAAC,uBAAW,CAAC,MAAM,CAAC,EAAE,IAAI,yBAAO,CAC7B,4CAA4C,CAC/C;IACD,CAAC,uBAAW,CAAC,QAAQ,CAAC,EAAE,IAAI,yBAAO,CAC/B,4CAA4C,CAC/C;IACD,CAAC,uBAAW,CAAC,QAAQ,CAAC,EAAE,IAAI,yBAAO,CAC/B,4CAA4C,CAC/C;IACD,CAAC,uBAAW,CAAC,MAAM,CAAC,EAAE,IAAI,yBAAO,CAC7B,4CAA4C,CAC/C;IACD,CAAC,uBAAW,CAAC,MAAM,CAAC,EAAE,IAAI,yBAAO,CAC7B,4CAA4C,CAC/C;IACD,CAAC,uBAAW,CAAC,KAAK,CAAC,EAAE,IAAI,yBAAO,CAC5B,4CAA4C,CAC/C;CACJ,CAAA"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/fusion-order/constants.ts"],"names":[],"mappings":";;;AAAA,4DAA8C;AAC9C,4CAAwC;AAE3B,QAAA,gBAAgB,GAAG;IAC5B,CAAC,uBAAW,CAAC,QAAQ,CAAC,EAAE,IAAI,yBAAO,CAC/B,4CAA4C,CAC/C;IACD,CAAC,uBAAW,CAAC,OAAO,CAAC,EAAE,IAAI,yBAAO,CAC9B,4CAA4C,CAC/C;IACD,CAAC,uBAAW,CAAC,OAAO,CAAC,EAAE,IAAI,yBAAO,CAC9B,4CAA4C,CAC/C;IACD,CAAC,uBAAW,CAAC,QAAQ,CAAC,EAAE,IAAI,yBAAO,CAC/B,4CAA4C,CAC/C;IACD,CAAC,uBAAW,CAAC,SAAS,CAAC,EAAE,IAAI,yBAAO,CAChC,4CAA4C,CAC/C;IACD,CAAC,uBAAW,CAAC,MAAM,CAAC,EAAE,IAAI,yBAAO,CAC7B,4CAA4C,CAC/C;IACD,CAAC,uBAAW,CAAC,QAAQ,CAAC,EAAE,IAAI,yBAAO,CAC/B,4CAA4C,CAC/C;IACD,CAAC,uBAAW,CAAC,QAAQ,CAAC,EAAE,IAAI,yBAAO,CAC/B,4CAA4C,CAC/C;IACD,CAAC,uBAAW,CAAC,MAAM,CAAC,EAAE,IAAI,yBAAO,CAC7B,4CAA4C,CAC/C;IACD,CAAC,uBAAW,CAAC,MAAM,CAAC,EAAE,IAAI,yBAAO,CAC7B,4CAA4C,CAC/C;IACD,CAAC,uBAAW,CAAC,KAAK,CAAC,EAAE,IAAI,yBAAO,CAC5B,4CAA4C,CAC/C;IACD,CAAC,uBAAW,CAAC,KAAK,CAAC,EAAE,IAAI,yBAAO,CAC5B,4CAA4C,CAC/C;IACD,CAAC,uBAAW,CAAC,QAAQ,CAAC,EAAE,IAAI,yBAAO,CAC/B,4CAA4C,CAC/C;CACJ,CAAA"}

package/dist/cjs/fusion-order/fusion-extension.js

@@ -3,17 +3,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FusionExtension = void 0;
 const tslib_1 = require("tslib");
 const limit_order_sdk_1 = require("@1inch/limit-order-sdk");
-const byte_utils_1 = require("@1inch/byte-utils");
 const assert_1 = tslib_1.__importDefault(require("assert"));
 const auction_details_1 = require("./auction-details");
-const whitelist_1 = require("./whitelist/whitelist");
-const utils_1 = require("../utils");
+const settlement_post_interaction_data_1 = require("./settlement-post-interaction-data");
 class FusionExtension {
-    constructor(address, auctionDetails, whitelist, extra) {
+    constructor(address, auctionDetails, postInteractionData, makerPermit) {
         this.address = address;
         this.auctionDetails = auctionDetails;
-        this.whitelist = whitelist;
-        this.extra = extra;
+        this.postInteractionData = postInteractionData;
+        this.makerPermit = makerPermit;
+        this.builder = new limit_order_sdk_1.ExtensionBuilder();
+        const detailsBytes = this.auctionDetails.encode();
+        this.builder
+            .withMakingAmountData(this.address, detailsBytes)
+            .withTakingAmountData(this.address, detailsBytes)
+            .withPostInteraction(new limit_order_sdk_1.Interaction(this.address, this.postInteractionData.encode()));
+        if (makerPermit) {
+            this.builder.withMakerPermit(makerPermit.target, makerPermit.data);
+        }
     }
     static decode(bytes) {
         const extension = limit_order_sdk_1.Extension.decode(bytes);
@@ -23,142 +30,16 @@ class FusionExtension {
         const settlementContract = limit_order_sdk_1.Address.fromFirstBytes(extension.makingAmountData);
         (0, assert_1.default)(limit_order_sdk_1.Address.fromFirstBytes(extension.takingAmountData).equal(settlementContract) &&
             limit_order_sdk_1.Address.fromFirstBytes(extension.postInteraction).equal(settlementContract), 'Invalid extension, all calls should be to the same address');
-        (0, assert_1.default)(extension.takingAmountData == extension.makingAmountData, 'Invalid extension, taking amount data must be equal to making amount data');
-        const interactionBytes = byte_utils_1.BytesIter.HexString(extension.postInteraction);
-        interactionBytes.nextUint160();
-        const flags = byte_utils_1.BN.fromHex(interactionBytes.nextUint8());
-        const integratorFeeRecipient = new limit_order_sdk_1.Address(interactionBytes.nextUint160());
-        const protocolFeeRecipient = new limit_order_sdk_1.Address(interactionBytes.nextUint160());
-        const customReceiver = flags.getBit(FusionExtension.CUSTOM_RECEIVER_FLAG_BIT)
-            ? new limit_order_sdk_1.Address(interactionBytes.nextUint160())
-            : undefined;
-        const interactionData = parseAmountData(interactionBytes);
-        const whitelist = whitelist_1.Whitelist.decodeFrom(interactionBytes);
-        const amountBytes = byte_utils_1.BytesIter.HexString(extension.makingAmountData);
-        amountBytes.nextUint160();
-        const auctionDetails = auction_details_1.AuctionDetails.decodeFrom(amountBytes);
-        const amountData = parseAmountData(amountBytes);
-        const whitelistAddressLength = Number(amountBytes.nextUint8());
-        (0, assert_1.default)(whitelist.length === whitelistAddressLength, 'whitelist addresses must be same in interaction data and in amount data');
-        const whitelistAddressesFromAmount = [];
-        for (let i = 0; i < whitelistAddressLength; i++) {
-            whitelistAddressesFromAmount.push(BigInt(amountBytes.nextBytes(10)).toString(16).padStart(20, '0'));
-        }
-        const makerPermit = extension.hasMakerPermit
+        const auctionDetails = auction_details_1.AuctionDetails.fromExtension(extension);
+        const postInteractionData = settlement_post_interaction_data_1.SettlementPostInteractionData.fromExtension(extension);
+        const permit = extension.hasMakerPermit
             ? limit_order_sdk_1.Interaction.decode(extension.makerPermit)
             : undefined;
-        (0, assert_1.default)(amountData.fees.integratorFee.value ===
-            interactionData.fees.integratorFee.value, `invalid extension: integrator fee must be same in interaction data and in amount data`);
-        (0, assert_1.default)(amountData.fees.resolverFee.value ===
-            interactionData.fees.resolverFee.value, `invalid extension: resolver fee must be same in interaction data and in amount data`);
-        (0, assert_1.default)(amountData.fees.whitelistDiscount.equal(interactionData.fees.whitelistDiscount), `invalid extension: whitelistDiscount must be same in interaction data and in amount data`);
-        (0, assert_1.default)(amountData.fees.integratorShare.value ===
-            interactionData.fees.integratorShare.value, `invalid extension: integrator share must be same in interaction data and in amount data`);
-        (0, assert_1.default)(whitelist.whitelist.every(({ addressHalf }, i) => whitelistAddressesFromAmount[i] === addressHalf), 'whitelist addresses must be same in interaction data and in amount data');
-        const hasFees = !integratorFeeRecipient.isZero() || !protocolFeeRecipient.isZero();
-        if (!hasFees) {
-            return new FusionExtension(settlementContract, auctionDetails, whitelist, {
-                makerPermit,
-                customReceiver,
-                fees: undefined
-            });
-        }
-        const fees = new limit_order_sdk_1.FeeTakerExt.Fees(interactionData.fees.resolverFee.isZero()
-            ? limit_order_sdk_1.FeeTakerExt.ResolverFee.ZERO
-            : new limit_order_sdk_1.FeeTakerExt.ResolverFee(protocolFeeRecipient, interactionData.fees.resolverFee, interactionData.fees.whitelistDiscount), interactionData.fees.integratorFee.isZero()
-            ? limit_order_sdk_1.FeeTakerExt.IntegratorFee.ZERO
-            : new limit_order_sdk_1.FeeTakerExt.IntegratorFee(integratorFeeRecipient, protocolFeeRecipient, interactionData.fees.integratorFee, interactionData.fees.integratorShare));
-        return new FusionExtension(settlementContract, auctionDetails, whitelist, {
-            makerPermit,
-            fees,
-            customReceiver
-        });
+        return new FusionExtension(settlementContract, auctionDetails, postInteractionData, permit);
     }
     build() {
-        const amountData = this.buildAmountGetterData(true);
-        const builder = new limit_order_sdk_1.ExtensionBuilder()
-            .withMakingAmountData(this.address, amountData)
-            .withTakingAmountData(this.address, amountData)
-            .withPostInteraction(new limit_order_sdk_1.Interaction(this.address, this.buildInteractionData()));
-        if (this.extra?.makerPermit) {
-            builder.withMakerPermit(this.extra?.makerPermit.target, this.extra?.makerPermit.data);
-        }
-        return builder.build();
-    }
-    buildInteractionData() {
-        const customReceiver = this.extra?.customReceiver || limit_order_sdk_1.Address.ZERO_ADDRESS;
-        const flags = new byte_utils_1.BN(0n).setBit(FusionExtension.CUSTOM_RECEIVER_FLAG_BIT, Boolean(!customReceiver.isZero()));
-        const integratorReceiver = this.extra?.fees?.integrator.integrator || limit_order_sdk_1.Address.ZERO_ADDRESS;
-        const protocolReceiver = this.extra?.fees?.protocol || limit_order_sdk_1.Address.ZERO_ADDRESS;
-        const builder = new byte_utils_1.BytesBuilder()
-            .addUint8(flags)
-            .addAddress(integratorReceiver.toString())
-            .addAddress(protocolReceiver.toString());
-        if (!customReceiver.isZero()) {
-            builder.addAddress(customReceiver.toString());
-        }
-        builder.addBytes(this.buildAmountGetterData(false));
-        return builder.asHex();
-    }
-    buildAmountGetterData(forAmountGetters) {
-        const builder = new byte_utils_1.BytesBuilder();
-        if (forAmountGetters) {
-            this.auctionDetails.encodeInto(builder);
-        }
-        const integrator = {
-            fee: this.extra?.fees?.integrator.fee.toFraction(limit_order_sdk_1.FeeTakerExt.Fees.BASE_1E5) || 0,
-            share: this.extra?.fees?.integrator.share.toFraction(limit_order_sdk_1.FeeTakerExt.Fees.BASE_1E2) || 0
-        };
-        const resolverFee = this.extra?.fees?.resolver.fee.toFraction(limit_order_sdk_1.FeeTakerExt.Fees.BASE_1E5) || 0;
-        const whitelistDiscount = this.extra?.fees?.resolver.whitelistDiscount || limit_order_sdk_1.Bps.ZERO;
-        builder
-            .addUint16(BigInt(integrator.fee))
-            .addUint8(BigInt(integrator.share))
-            .addUint16(BigInt(resolverFee))
-            .addUint8(BigInt(Number(limit_order_sdk_1.FeeTakerExt.Fees.BASE_1E2) -
-            whitelistDiscount.toFraction(limit_order_sdk_1.FeeTakerExt.Fees.BASE_1E2)));
-        if (forAmountGetters) {
-            builder.addUint8(BigInt(this.whitelist.whitelist.length));
-            this.whitelist.whitelist.forEach((i) => {
-                builder.addBytes((0, utils_1.add0x)(i.addressHalf));
-            });
-        }
-        else {
-            this.whitelist.encodeInto(builder);
-        }
-        return builder.asHex();
-    }
-    getFeesForTaker(taker) {
-        const whitelistDiscount = this.extra?.fees?.resolver.whitelistDiscount.toFraction(limit_order_sdk_1.FeeTakerExt.Fees.BASE_1E2) || 0;
-        const discountNumerator = this.whitelist.isWhitelisted(taker)
-            ? (Number(limit_order_sdk_1.FeeTakerExt.Fees.BASE_1E2) - whitelistDiscount) /
-                Number(limit_order_sdk_1.FeeTakerExt.Fees.BASE_1E2)
-            : 1;
-        const resolverFee = discountNumerator *
-            (this.extra?.fees?.resolver.fee.toFraction(limit_order_sdk_1.FeeTakerExt.Fees.BASE_1E5) || 0);
-        const resolverFeeBN = BigInt(resolverFee);
-        const integratorFeeBN = BigInt(this.extra?.fees?.integrator.fee.toFraction(limit_order_sdk_1.FeeTakerExt.Fees.BASE_1E5) || 0);
-        return {
-            resolverFee: resolverFeeBN,
-            integratorFee: integratorFeeBN
-        };
-    }
-    getTakingAmountWithFee(taker, orderTakingAmount) {
-        const fees = this.getFeesForTaker(taker);
-        return (0, limit_order_sdk_1.mulDiv)(orderTakingAmount, limit_order_sdk_1.FeeTakerExt.Fees.BASE_1E5 + fees.resolverFee + fees.integratorFee, limit_order_sdk_1.FeeTakerExt.Fees.BASE_1E5, limit_order_sdk_1.Rounding.Ceil);
+        return this.builder.build();
     }
 }
 exports.FusionExtension = FusionExtension;
-FusionExtension.CUSTOM_RECEIVER_FLAG_BIT = 0n;
-function parseAmountData(iter) {
-    const fees = {
-        integratorFee: limit_order_sdk_1.Bps.fromFraction(Number(iter.nextUint16()), limit_order_sdk_1.FeeTakerExt.Fees.BASE_1E5),
-        integratorShare: limit_order_sdk_1.Bps.fromFraction(Number(iter.nextUint8()), limit_order_sdk_1.FeeTakerExt.Fees.BASE_1E2),
-        resolverFee: limit_order_sdk_1.Bps.fromFraction(Number(iter.nextUint16()), limit_order_sdk_1.FeeTakerExt.Fees.BASE_1E5),
-        whitelistDiscount: limit_order_sdk_1.Bps.fromFraction(Number(limit_order_sdk_1.FeeTakerExt.Fees.BASE_1E2) - Number(iter.nextUint8()), limit_order_sdk_1.FeeTakerExt.Fees.BASE_1E2)
-    };
-    return {
-        fees
-    };
-}
 //# sourceMappingURL=fusion-extension.js.map

package/dist/cjs/fusion-order/fusion-extension.js.map

@@ -1 +1 @@
-{"version":3,"file":"fusion-extension.js","sourceRoot":"","sources":["../../../src/fusion-order/fusion-extension.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fusion-extension.js","sourceRoot":"","sources":["../../../src/fusion-order/fusion-extension.ts"],"names":[],"mappings":";;;;AAAA,4DAK+B;AAC/B,4DAA2B;AAE3B,uDAAgD;AAChD,yFAAgF;AAEhF,MAAa,eAAe;IAGxB,YACoB,OAAgB,EAChB,cAA8B,EAC9B,mBAAkD,EAClD,WAAyB;QAHzB,YAAO,GAAP,OAAO,CAAS;QAChB,mBAAc,GAAd,cAAc,CAAgB;QAC9B,wBAAmB,GAAnB,mBAAmB,CAA+B;QAClD,gBAAW,GAAX,WAAW,CAAc;QAN5B,YAAO,GAAG,IAAI,kCAAgB,EAAE,CAAA;QAQ7C,MAAM,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAA;QAEjD,IAAI,CAAC,OAAO;aACP,oBAAoB,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC;aAChD,oBAAoB,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC;aAChD,mBAAmB,CAChB,IAAI,6BAAW,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,CAAC,CACnE,CAAA;QAEL,IAAI,WAAW,EAAE;YACb,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC,CAAA;SACrE;IACL,CAAC;IAOM,MAAM,CAAC,MAAM,CAAC,KAAa;QAC9B,MAAM,SAAS,GAAG,2BAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAEzC,OAAO,eAAe,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;IACnD,CAAC;IAKM,MAAM,CAAC,aAAa,CAAC,SAAoB;QAC5C,MAAM,kBAAkB,GAAG,yBAAO,CAAC,cAAc,CAC7C,SAAS,CAAC,gBAAgB,CAC7B,CAAA;QAED,IAAA,gBAAM,EACF,yBAAO,CAAC,cAAc,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC,KAAK,CACpD,kBAAkB,CACrB;YACG,yBAAO,CAAC,cAAc,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC,KAAK,CACnD,kBAAkB,CACrB,EACL,4DAA4D,CAC/D,CAAA;QAED,MAAM,cAAc,GAAG,gCAAc,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;QAE9D,MAAM,mBAAmB,GACrB,gEAA6B,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;QAE1D,MAAM,MAAM,GAAG,SAAS,CAAC,cAAc;YACnC,CAAC,CAAC,6BAAW,CAAC,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC;YAC3C,CAAC,CAAC,SAAS,CAAA;QAEf,OAAO,IAAI,eAAe,CACtB,kBAAkB,EAClB,cAAc,EACd,mBAAmB,EACnB,MAAM,CACT,CAAA;IACL,CAAC;IAEM,KAAK;QACR,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAA;IAC/B,CAAC;CACJ;AAxED,0CAwEC"}

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

@@ -5,20 +5,17 @@ const tslib_1 = require("tslib");
 const limit_order_sdk_1 = require("@1inch/limit-order-sdk");
 const assert_1 = tslib_1.__importDefault(require("assert"));
 const fusion_extension_1 = require("./fusion-extension");
+const auction_details_1 = require("./auction-details");
+const settlement_post_interaction_data_1 = require("./settlement-post-interaction-data");
 const source_track_1 = require("./source-track");
-const auction_calculator_1 = require("../amount-calculator/auction-calculator");
+const auction_calculator_1 = require("../auction-calculator");
 const constants_1 = require("../constants");
 const amounts_1 = require("../utils/amounts");
 const time_1 = require("../utils/time");
-const amount_calculator_1 = require("../amount-calculator/amount-calculator");
 class FusionOrder {
-    constructor(settlementExtensionContract, orderInfo, auctionDetails, whitelist, extra = FusionOrder.defaultExtra, extension = new fusion_extension_1.FusionExtension(settlementExtensionContract, auctionDetails, whitelist, {
-        makerPermit: extra.permit
-            ? new limit_order_sdk_1.Interaction(orderInfo.makerAsset, extra.permit)
-            : undefined,
-        customReceiver: orderInfo.receiver,
-        fees: extra?.fees
-    })) {
+    constructor(settlementExtensionContract, orderInfo, auctionDetails, postInteractionData, extra = FusionOrder.defaultExtra, extension = new fusion_extension_1.FusionExtension(settlementExtensionContract, auctionDetails, postInteractionData, extra.permit
+        ? new limit_order_sdk_1.Interaction(orderInfo.makerAsset, extra.permit)
+        : undefined)) {
         this.settlementExtensionContract = settlementExtensionContract;
         const allowPartialFills = extra.allowPartialFills ??
             FusionOrder.defaultExtra.allowPartialFills;
@@ -48,7 +45,7 @@ class FusionOrder {
         if (extra.nonce !== undefined) {
             makerTraits.withNonce(extra.nonce);
         }
-        const receiver = extra.fees
+        const receiver = postInteractionData.integratorFee?.ratio
             ? settlementExtensionContract
             : orderInfo.receiver;
         const builtExtension = extension.build();
@@ -56,11 +53,17 @@ class FusionOrder {
         const saltWithInjectedTrackCode = orderInfo.salt
             ? salt
             : (0, source_track_1.injectTrackCode)(salt, extra.source);
+        if (orderInfo.makerAsset.isNative()) {
+            throw new Error('use FusionOrder.fromNative to create order from native asset');
+        }
+        const optimizeReceiverAddress = extra.optimizeReceiverAddress !== undefined
+            ? extra.optimizeReceiverAddress
+            : FusionOrder.defaultExtra.optimizeReceiverAddress;
         this.inner = new limit_order_sdk_1.LimitOrder({
             ...orderInfo,
             receiver,
             salt: saltWithInjectedTrackCode
-        }, makerTraits, builtExtension);
+        }, makerTraits, builtExtension, { optimizeReceiverAddress });
         this.fusionExtension = extension;
     }
     get extension() {
@@ -81,13 +84,6 @@ class FusionOrder {
     get makingAmount() {
         return this.inner.makingAmount;
     }
-    get realReceiver() {
-        const hasFee = Boolean(this.fusionExtension.extra?.fees);
-        const receiver = hasFee
-            ? this.fusionExtension.extra?.customReceiver
-            : this.inner.receiver;
-        return receiver && !receiver.isZero() ? receiver : this.maker;
-    }
     get receiver() {
         return this.inner.receiver;
     }
@@ -117,7 +113,28 @@ class FusionOrder {
         return this.inner.salt;
     }
     static new(settlementExtension, orderInfo, details, extra) {
-        return new FusionOrder(settlementExtension, orderInfo, details.auction, details.whitelist, extra);
+        return new FusionOrder(settlementExtension, orderInfo, details.auction, settlement_post_interaction_data_1.SettlementPostInteractionData.new({
+            bankFee: details.fees?.bankFee || 0n,
+            integratorFee: details.fees?.integratorFee,
+            whitelist: details.whitelist,
+            resolvingStartTime: details.resolvingStartTime ?? (0, time_1.now)(),
+            customReceiver: orderInfo.receiver
+        }), extra);
+    }
+    static isNativeOrder(chainId, ethOrderFactory, order, signature) {
+        return limit_order_sdk_1.LimitOrder.isNativeOrder(chainId, ethOrderFactory, order, signature);
+    }
+    static fromNative(chainId, ethOrdersFactory, settlementExtension, orderInfo, details, extra) {
+        const _orderInfo = {
+            ...orderInfo,
+            makerAsset: limit_order_sdk_1.LimitOrder.CHAIN_TO_WRAPPER[chainId],
+            receiver: orderInfo.receiver && !orderInfo.receiver.isZero()
+                ? orderInfo.receiver
+                : orderInfo.maker
+        };
+        const _order = FusionOrder.new(settlementExtension, _orderInfo, details, { ...extra, optimizeReceiverAddress: false });
+        _order.inner = limit_order_sdk_1.LimitOrder.fromNative(chainId, ethOrdersFactory, { ..._orderInfo, salt: _order.salt }, _order.inner.makerTraits, _order.inner.extension);
+        return _order;
     }
     static fromDataAndExtension(order, extension) {
         const settlementContract = limit_order_sdk_1.Address.fromFirstBytes(extension.makingAmountData);
@@ -126,7 +143,8 @@ class FusionOrder {
         const makerTraits = new limit_order_sdk_1.MakerTraits(BigInt(order.makerTraits));
         (0, assert_1.default)(!makerTraits.isPrivate(), 'fusion order can not be private');
         (0, assert_1.default)(makerTraits.hasPostInteraction(), 'post-interaction must be enabled');
-        const { auctionDetails, whitelist, extra } = fusion_extension_1.FusionExtension.fromExtension(extension);
+        const auctionDetails = auction_details_1.AuctionDetails.fromExtension(extension);
+        const postInteractionData = settlement_post_interaction_data_1.SettlementPostInteractionData.fromExtension(extension);
         const deadline = makerTraits.expiration();
         const orderExpirationDelay = deadline === null
             ? undefined
@@ -134,12 +152,12 @@ class FusionOrder {
         return new FusionOrder(settlementContract, {
             salt: BigInt(order.salt) >> 160n,
             maker: new limit_order_sdk_1.Address(order.maker),
-            receiver: extra?.customReceiver,
+            receiver: new limit_order_sdk_1.Address(order.receiver),
             makerAsset: new limit_order_sdk_1.Address(order.makerAsset),
             takerAsset: new limit_order_sdk_1.Address(order.takerAsset),
             makingAmount: BigInt(order.makingAmount),
             takingAmount: BigInt(order.takingAmount)
-        }, auctionDetails, whitelist, {
+        }, auctionDetails, postInteractionData, {
             allowMultipleFills: makerTraits.isMultipleFillsAllowed(),
             allowPartialFills: makerTraits.isPartialFillAllowed(),
             enablePermit2: makerTraits.isPermit2(),
@@ -149,9 +167,15 @@ class FusionOrder {
                 : limit_order_sdk_1.Interaction.decode(extension.makerPermit).data,
             unwrapWETH: makerTraits.isNativeUnwrapEnabled(),
             orderExpirationDelay,
-            fees: extra?.fees
+            optimizeReceiverAddress: true
         });
     }
+    isNative(chainId, ethOrderFactory, signature) {
+        return this.inner.isNative(chainId, ethOrderFactory, signature);
+    }
+    nativeSignature(maker) {
+        return this.inner.nativeSignature(maker);
+    }
     build() {
         return this.inner.build();
     }
@@ -162,54 +186,41 @@ class FusionOrder {
         return this.inner.getTypedData(chainId);
     }
     getCalculator() {
-        return auction_calculator_1.AuctionCalculator.fromAuctionData(this.fusionExtension.auctionDetails);
-    }
-    calcTakingAmount(taker, makingAmount, time, blockBaseFee = 0n) {
-        const takingAmount = (0, amounts_1.calcTakingAmount)(makingAmount, this.makingAmount, this.takingAmount);
-        return this.getAmountCalculator().getRequiredTakingAmount(taker, takingAmount, time, blockBaseFee);
-    }
-    getUserReceiveAmount(taker, makingAmount, time, blockBaseFee = 0n) {
-        const takingAmount = (0, amounts_1.calcTakingAmount)(makingAmount, this.makingAmount, this.takingAmount);
-        return this.getAmountCalculator().getUserTakingAmountAmount(taker, takingAmount, time, blockBaseFee);
+        return auction_calculator_1.AuctionCalculator.fromAuctionData(this.fusionExtension.postInteractionData, this.fusionExtension.auctionDetails);
     }
-    getResolverFee(taker, time, blockBaseFee = 0n, makingAmount = this.makingAmount) {
+    calcTakingAmount(makingAmount, time, blockBaseFee = 0n) {
         const takingAmount = (0, amounts_1.calcTakingAmount)(makingAmount, this.makingAmount, this.takingAmount);
-        return (this.getAmountCalculator().getResolverFee(taker, takingAmount, time, blockBaseFee) ?? 0n);
-    }
-    getIntegratorFee(taker, time, blockBaseFee = 0n, makingAmount = this.makingAmount) {
-        const takingAmount = (0, amounts_1.calcTakingAmount)(makingAmount, this.makingAmount, this.takingAmount);
-        return (this.getAmountCalculator().getIntegratorFee(taker, takingAmount, time, blockBaseFee) ?? 0n);
-    }
-    getProtocolShareOfIntegratorFee(taker, time, blockBaseFee = 0n, makingAmount = this.makingAmount) {
-        const takingAmount = (0, amounts_1.calcTakingAmount)(makingAmount, this.makingAmount, this.takingAmount);
-        return (this.getAmountCalculator().getProtocolShareOfIntegratorFee(taker, takingAmount, time, blockBaseFee) ?? 0n);
-    }
-    getProtocolFee(taker, time, blockBaseFee = 0n, makingAmount = this.makingAmount) {
-        const takingAmount = (0, amounts_1.calcTakingAmount)(makingAmount, this.makingAmount, this.takingAmount);
-        return (this.getAmountCalculator().getProtocolFee(taker, takingAmount, time, blockBaseFee) ?? 0n);
+        const calculator = this.getCalculator();
+        const bump = calculator.calcRateBump(time, blockBaseFee);
+        return calculator.calcAuctionTakingAmount(takingAmount, bump);
     }
     canExecuteAt(executor, executionTime) {
-        return this.fusionExtension.whitelist.canExecuteAt(executor, executionTime);
+        return this.fusionExtension.postInteractionData.canExecuteAt(executor, executionTime);
     }
     isExpiredAt(time) {
         return time > this.deadline;
     }
+    getResolverFee(filledMakingAmount) {
+        return ((this.fusionExtension.postInteractionData.bankFee *
+            FusionOrder._ORDER_FEE_BASE_POINTS *
+            filledMakingAmount) /
+            this.makingAmount);
+    }
     isExclusiveResolver(wallet) {
-        return this.fusionExtension.whitelist.isExclusiveResolver(wallet);
+        return this.fusionExtension.postInteractionData.isExclusiveResolver(wallet);
     }
     isExclusivityPeriod(time = (0, time_1.now)()) {
-        return this.fusionExtension.whitelist.isExclusivityPeriod(time);
-    }
-    getAmountCalculator() {
-        return amount_calculator_1.AmountCalculator.fromExtension(this.fusionExtension);
+        return this.fusionExtension.postInteractionData.isExclusivityPeriod(time);
     }
 }
 exports.FusionOrder = FusionOrder;
+FusionOrder._ORDER_FEE_BASE_POINTS = 10n ** 15n;
 FusionOrder.defaultExtra = {
     allowPartialFills: true,
     allowMultipleFills: true,
     unwrapWETH: false,
     enablePermit2: false,
-    orderExpirationDelay: 12n
+    orderExpirationDelay: 12n,
+    optimizeReceiverAddress: true
 };
 //# sourceMappingURL=fusion-order.js.map

package/dist/cjs/fusion-order/fusion-order.js.map

@@ -1 +1 @@
-{"version":3,"file":"fusion-order.js","sourceRoot":"","sources":["../../../src/fusion-order/fusion-order.ts"],"names":[],"mappings":";;;;AAAA,4DAS+B;AAE/B,4DAA2B;AAC3B,yDAAkD;AAGlD,iDAA8C;AAE9C,gFAAyE;AACzE,4CAA+B;AAC/B,8CAAiD;AACjD,wCAAiC;AACjC,8EAAuE;AAEvE,MAAa,WAAW;IAapB,YAKoB,2BAAoC,EACpD,SAAwB,EACxB,cAA8B,EAC9B,SAAoB,EACpB,QA2BI,WAAW,CAAC,YAAY,EAC5B,SAAS,GAAG,IAAI,kCAAe,CAC3B,2BAA2B,EAC3B,cAAc,EACd,SAAS,EACT;QACI,WAAW,EAAE,KAAK,CAAC,MAAM;YACrB,CAAC,CAAC,IAAI,6BAAW,CAAC,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC;YACrD,CAAC,CAAC,SAAS;QACf,cAAc,EAAE,SAAS,CAAC,QAAQ;QAClC,IAAI,EAAE,KAAK,EAAE,IAAI;KACpB,CACJ;QA3Ce,gCAA2B,GAA3B,2BAA2B,CAAS;QA6CpD,MAAM,iBAAiB,GACnB,KAAK,CAAC,iBAAiB;YACvB,WAAW,CAAC,YAAY,CAAC,iBAAiB,CAAA;QAC9C,MAAM,kBAAkB,GACpB,KAAK,CAAC,kBAAkB;YACxB,WAAW,CAAC,YAAY,CAAC,kBAAkB,CAAA;QAC/C,MAAM,UAAU,GACZ,KAAK,CAAC,UAAU,IAAI,WAAW,CAAC,YAAY,CAAC,UAAU,CAAA;QAC3D,MAAM,aAAa,GACf,KAAK,CAAC,aAAa,IAAI,WAAW,CAAC,YAAY,CAAC,aAAa,CAAA;QACjE,MAAM,oBAAoB,GACtB,KAAK,CAAC,oBAAoB;YAC1B,WAAW,CAAC,YAAY,CAAC,oBAAoB,CAAA;QAEjD,MAAM,QAAQ,GACV,cAAc,CAAC,SAAS;YACxB,cAAc,CAAC,QAAQ;YACvB,oBAAoB,CAAA;QAExB,MAAM,WAAW,GAAG,6BAAW,CAAC,OAAO,EAAE;aACpC,cAAc,CAAC,QAAQ,CAAC;aACxB,eAAe,CAAC,iBAAiB,CAAC;aAClC,gBAAgB,CAAC,kBAAkB,CAAC;aACpC,qBAAqB,EAAE,CAAA;QAE5B,IAAI,WAAW,CAAC,oBAAoB,EAAE,EAAE,CAAC;YACrC,IAAA,gBAAM,EACF,KAAK,CAAC,KAAK,KAAK,SAAS,EACzB,+DAA+D,CAClE,CAAA;QACL,CAAC;QAED,IAAI,UAAU,EAAE,CAAC;YACb,WAAW,CAAC,kBAAkB,EAAE,CAAA;QACpC,CAAC;QAED,IAAI,aAAa,EAAE,CAAC;YAChB,WAAW,CAAC,aAAa,EAAE,CAAA;QAC/B,CAAC;QAED,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YAC5B,WAAW,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QACtC,CAAC;QAKD,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI;YACvB,CAAC,CAAC,2BAA2B;YAC7B,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAA;QAExB,MAAM,cAAc,GAAG,SAAS,CAAC,KAAK,EAAE,CAAA;QACxC,MAAM,IAAI,GAAG,4BAAU,CAAC,SAAS,CAAC,cAAc,EAAE,SAAS,CAAC,IAAI,CAAC,CAAA;QACjE,MAAM,yBAAyB,GAAG,SAAS,CAAC,IAAI;YAC5C,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,IAAA,8BAAe,EAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;QAEzC,IAAI,CAAC,KAAK,GAAG,IAAI,4BAAU,CACvB;YACI,GAAG,SAAS;YACZ,QAAQ;YACR,IAAI,EAAE,yBAAyB;SAClC,EACD,WAAW,EACX,cAAc,CACjB,CAAA;QAED,IAAI,CAAC,eAAe,GAAG,SAAS,CAAA;IACpC,CAAC;IAED,IAAI,SAAS;QACT,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAA;IAC/B,CAAC;IAED,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAA;IAC3B,CAAC;IAED,IAAI,UAAU;QACV,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAA;IAChC,CAAC;IAED,IAAI,UAAU;QACV,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAA;IAChC,CAAC;IAED,IAAI,YAAY;QACZ,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAA;IAClC,CAAC;IAED,IAAI,YAAY;QACZ,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAA;IAClC,CAAC;IAUD,IAAI,YAAY;QACZ,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;QAExD,MAAM,QAAQ,GAAG,MAAM;YACnB,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,cAAc;YAC5C,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAA;QAEzB,OAAO,QAAQ,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAA;IACjE,CAAC;IAOD,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAA;IAC9B,CAAC;IAKD,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,UAAU,EAAE,IAAI,EAAE,CAAA;IACpD,CAAC;IAKD,IAAI,gBAAgB;QAChB,OAAO,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,SAAS,CAAA;IACxD,CAAC;IAKD,IAAI,cAAc;QACd,MAAM,EAAC,SAAS,EAAE,QAAQ,EAAC,GAAG,IAAI,CAAC,eAAe,CAAC,cAAc,CAAA;QAEjE,OAAO,SAAS,GAAG,QAAQ,CAAA;IAC/B,CAAC;IAED,IAAI,oBAAoB;QACpB,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,oBAAoB,EAAE,CAAA;IACxD,CAAC;IAED,IAAI,kBAAkB;QAClB,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,oBAAoB,EAAE,CAAA;IACxD,CAAC;IAED,IAAI,oBAAoB;QACpB,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,sBAAsB,EAAE,CAAA;IAC1D,CAAC;IAED,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,YAAY,EAAE,CAAA;IAChD,CAAC;IAED,IAAI,IAAI;QACJ,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAA;IAC1B,CAAC;IAED,MAAM,CAAC,GAAG,CAKN,mBAA4B,EAC5B,SAAwB,EACxB,OAGC,EACD,KAyBC;QAED,OAAO,IAAI,WAAW,CAClB,mBAAmB,EACnB,SAAS,EACT,OAAO,CAAC,OAAO,EACf,OAAO,CAAC,SAAS,EACjB,KAAK,CACR,CAAA;IACL,CAAC;IAMD,MAAM,CAAC,oBAAoB,CACvB,KAAyB,EACzB,SAAoB;QAEpB,MAAM,kBAAkB,GAAG,yBAAO,CAAC,cAAc,CAC7C,SAAS,CAAC,gBAAgB,CAC7B,CAAA;QAED,IAAA,gBAAM,EACF,yBAAO,CAAC,cAAc,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC,KAAK,CACpD,kBAAkB,CACrB;YACG,yBAAO,CAAC,cAAc,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC,KAAK,CACnD,kBAAkB,CACrB,EACL,4DAA4D,CAC/D,CAAA;QAED,MAAM,WAAW,GAAG,IAAI,6BAAW,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAA;QAE9D,IAAA,gBAAM,EAAC,CAAC,WAAW,CAAC,SAAS,EAAE,EAAE,iCAAiC,CAAC,CAAA;QACnE,IAAA,gBAAM,EACF,WAAW,CAAC,kBAAkB,EAAE,EAChC,kCAAkC,CACrC,CAAA;QAED,MAAM,EAAC,cAAc,EAAE,SAAS,EAAE,KAAK,EAAC,GACpC,kCAAe,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;QAE5C,MAAM,QAAQ,GAAG,WAAW,CAAC,UAAU,EAAE,CAAA;QAEzC,MAAM,oBAAoB,GACtB,QAAQ,KAAK,IAAI;YACb,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,QAAQ,GAAG,cAAc,CAAC,SAAS,GAAG,cAAc,CAAC,QAAQ,CAAA;QAEvE,OAAO,IAAI,WAAW,CAClB,kBAAkB,EAClB;YAEI,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,IAAI;YAChC,KAAK,EAAE,IAAI,yBAAO,CAAC,KAAK,CAAC,KAAK,CAAC;YAC/B,QAAQ,EAAE,KAAK,EAAE,cAAc;YAC/B,UAAU,EAAE,IAAI,yBAAO,CAAC,KAAK,CAAC,UAAU,CAAC;YACzC,UAAU,EAAE,IAAI,yBAAO,CAAC,KAAK,CAAC,UAAU,CAAC;YACzC,YAAY,EAAE,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC;YACxC,YAAY,EAAE,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC;SAC3C,EACD,cAAc,EACd,SAAS,EACT;YACI,kBAAkB,EAAE,WAAW,CAAC,sBAAsB,EAAE;YACxD,iBAAiB,EAAE,WAAW,CAAC,oBAAoB,EAAE;YACrD,aAAa,EAAE,WAAW,CAAC,SAAS,EAAE;YACtC,KAAK,EAAE,WAAW,CAAC,YAAY,EAAE;YACjC,MAAM,EACF,SAAS,CAAC,WAAW,KAAK,cAAE;gBACxB,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,6BAAW,CAAC,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,IAAI;YACxD,UAAU,EAAE,WAAW,CAAC,qBAAqB,EAAE;YAC/C,oBAAoB;YACpB,IAAI,EAAE,KAAK,EAAE,IAAI;SACpB,CACJ,CAAA;IACL,CAAC;IAEM,KAAK;QACR,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAA;IAC7B,CAAC;IAEM,YAAY,CAAC,OAAe;QAC/B,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA;IAC3C,CAAC;IAEM,YAAY,CAAC,OAAe;QAC/B,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA;IAC3C,CAAC;IAEM,aAAa;QAChB,OAAO,sCAAiB,CAAC,eAAe,CACpC,IAAI,CAAC,eAAe,CAAC,cAAc,CACtC,CAAA;IACL,CAAC;IAUM,gBAAgB,CACnB,KAAc,EACd,YAAoB,EACpB,IAAY,EACZ,YAAY,GAAG,EAAE;QAEjB,MAAM,YAAY,GAAG,IAAA,0BAAgB,EACjC,YAAY,EACZ,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,YAAY,CACpB,CAAA;QAED,OAAO,IAAI,CAAC,mBAAmB,EAAE,CAAC,uBAAuB,CACrD,KAAK,EACL,YAAY,EACZ,IAAI,EACJ,YAAY,CACf,CAAA;IACL,CAAC;IAUM,oBAAoB,CACvB,KAAc,EACd,YAAoB,EACpB,IAAY,EACZ,YAAY,GAAG,EAAE;QAEjB,MAAM,YAAY,GAAG,IAAA,0BAAgB,EACjC,YAAY,EACZ,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,YAAY,CACpB,CAAA;QAED,OAAO,IAAI,CAAC,mBAAmB,EAAE,CAAC,yBAAyB,CACvD,KAAK,EACL,YAAY,EACZ,IAAI,EACJ,YAAY,CACf,CAAA;IACL,CAAC;IAUM,cAAc,CACjB,KAAc,EACd,IAAY,EACZ,YAAY,GAAG,EAAE,EACjB,YAAY,GAAG,IAAI,CAAC,YAAY;QAEhC,MAAM,YAAY,GAAG,IAAA,0BAAgB,EACjC,YAAY,EACZ,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,YAAY,CACpB,CAAA;QAED,OAAO,CACH,IAAI,CAAC,mBAAmB,EAAE,CAAC,cAAc,CACrC,KAAK,EACL,YAAY,EACZ,IAAI,EACJ,YAAY,CACf,IAAI,EAAE,CACV,CAAA;IACL,CAAC;IAUM,gBAAgB,CACnB,KAAc,EACd,IAAY,EACZ,YAAY,GAAG,EAAE,EACjB,YAAY,GAAG,IAAI,CAAC,YAAY;QAEhC,MAAM,YAAY,GAAG,IAAA,0BAAgB,EACjC,YAAY,EACZ,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,YAAY,CACpB,CAAA;QAED,OAAO,CACH,IAAI,CAAC,mBAAmB,EAAE,CAAC,gBAAgB,CACvC,KAAK,EACL,YAAY,EACZ,IAAI,EACJ,YAAY,CACf,IAAI,EAAE,CACV,CAAA;IACL,CAAC;IAUM,+BAA+B,CAClC,KAAc,EACd,IAAY,EACZ,YAAY,GAAG,EAAE,EACjB,YAAY,GAAG,IAAI,CAAC,YAAY;QAEhC,MAAM,YAAY,GAAG,IAAA,0BAAgB,EACjC,YAAY,EACZ,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,YAAY,CACpB,CAAA;QAED,OAAO,CACH,IAAI,CAAC,mBAAmB,EAAE,CAAC,+BAA+B,CACtD,KAAK,EACL,YAAY,EACZ,IAAI,EACJ,YAAY,CACf,IAAI,EAAE,CACV,CAAA;IACL,CAAC;IAWM,cAAc,CACjB,KAAc,EACd,IAAY,EACZ,YAAY,GAAG,EAAE,EACjB,YAAY,GAAG,IAAI,CAAC,YAAY;QAEhC,MAAM,YAAY,GAAG,IAAA,0BAAgB,EACjC,YAAY,EACZ,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,YAAY,CACpB,CAAA;QAED,OAAO,CACH,IAAI,CAAC,mBAAmB,EAAE,CAAC,cAAc,CACrC,KAAK,EACL,YAAY,EACZ,IAAI,EACJ,YAAY,CACf,IAAI,EAAE,CACV,CAAA;IACL,CAAC;IAQM,YAAY,CAAC,QAAiB,EAAE,aAAqB;QACxD,OAAO,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,YAAY,CAC9C,QAAQ,EACR,aAAa,CAChB,CAAA;IACL,CAAC;IAOM,WAAW,CAAC,IAAY;QAC3B,OAAO,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAA;IAC/B,CAAC;IAKM,mBAAmB,CAAC,MAAe;QACtC,OAAO,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAA;IACrE,CAAC;IAKM,mBAAmB,CAAC,IAAI,GAAG,IAAA,UAAG,GAAE;QACnC,OAAO,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAA;IACnE,CAAC;IAEM,mBAAmB;QACtB,OAAO,oCAAgB,CAAC,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;IAC/D,CAAC;;AAjkBL,kCAkkBC;AAjkBkB,wBAAY,GAAG;IAC1B,iBAAiB,EAAE,IAAI;IACvB,kBAAkB,EAAE,IAAI;IACxB,UAAU,EAAE,KAAK;IACjB,aAAa,EAAE,KAAK;IACpB,oBAAoB,EAAE,GAAG;CAC5B,CAAA"}
+{"version":3,"file":"fusion-order.js","sourceRoot":"","sources":["../../../src/fusion-order/fusion-order.ts"],"names":[],"mappings":"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"}

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

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FeeTakerExt = exports.CHAIN_TO_WRAPPER = void 0;
+exports.CHAIN_TO_WRAPPER = void 0;
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./fusion-order"), exports);
 tslib_1.__exportStar(require("./auction-details"), exports);
-tslib_1.__exportStar(require("./whitelist"), exports);
+tslib_1.__exportStar(require("./settlement-post-interaction-data"), exports);
 tslib_1.__exportStar(require("./fusion-extension"), exports);
 var constants_1 = require("./constants");
 Object.defineProperty(exports, "CHAIN_TO_WRAPPER", { enumerable: true, get: function () { return constants_1.CHAIN_TO_WRAPPER; } });
-var limit_order_sdk_1 = require("@1inch/limit-order-sdk");
-Object.defineProperty(exports, "FeeTakerExt", { enumerable: true, get: function () { return limit_order_sdk_1.FeeTakerExt; } });
+tslib_1.__exportStar(require("./cancellation-auction"), exports);
+tslib_1.__exportStar(require("./types"), exports);
 //# sourceMappingURL=index.js.map

package/dist/cjs/fusion-order/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/fusion-order/index.ts"],"names":[],"mappings":";;;;AAAA,yDAA8B;AAC9B,4DAAiC;AACjC,sDAA2B;AAC3B,6DAAkC;AAClC,yCAA4C;AAApC,6GAAA,gBAAgB,OAAA;AACxB,0DAAkD;AAA1C,8GAAA,WAAW,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/fusion-order/index.ts"],"names":[],"mappings":";;;;AAAA,yDAA8B;AAC9B,4DAAiC;AACjC,6EAAkD;AAClD,6DAAkC;AAClC,yCAA4C;AAApC,6GAAA,gBAAgB,OAAA;AACxB,iEAAsC;AACtC,kDAAuB"}