@1inch/fusion-sdk 1.0.1-rc.3 → 1.0.1-rc.31

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

@@ -10,21 +10,34 @@ 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 auction_calculator_1 = require("../auction-calculator");
-const utils_1 = require("../utils");
 const constants_1 = require("../constants");
+const amounts_1 = require("../utils/amounts");
+const time_1 = require("../utils/time");
 class FusionOrder {
-    constructor(extensionContract, orderInfo, auctionDetails, postInteractionData, extra = FusionOrder.defaultExtra) {
-        const { allowPartialFills, allowMultipleFills, unwrapWETH, enablePermit2, orderExpirationDelay, nonce, permit } = {
-            ...FusionOrder.defaultExtra,
-            ...extra
-        };
+    constructor(
+    /**
+     * Fusion extension address
+     * @see https://github.com/1inch/limit-order-settlement
+     */
+    settlementExtensionContract, orderInfo, auctionDetails, postInteractionData, extra = FusionOrder.defaultExtra) {
+        this.settlementExtensionContract = settlementExtensionContract;
+        const allowPartialFills = extra.allowPartialFills ??
+            FusionOrder.defaultExtra.allowPartialFills;
+        const allowMultipleFills = extra.allowMultipleFills ??
+            FusionOrder.defaultExtra.allowMultipleFills;
+        const unwrapWETH = extra.unwrapWETH ?? FusionOrder.defaultExtra.unwrapWETH;
+        const enablePermit2 = extra.enablePermit2 ?? FusionOrder.defaultExtra.enablePermit2;
+        const orderExpirationDelay = extra.orderExpirationDelay ??
+            FusionOrder.defaultExtra.orderExpirationDelay;
+        const { nonce, permit } = extra;
         const deadline = auctionDetails.startTime +
             auctionDetails.duration +
             orderExpirationDelay;
         const makerTraits = limit_order_sdk_1.MakerTraits.default()
             .withExpiration(deadline)
             .setPartialFills(allowPartialFills)
-            .setMultipleFills(allowMultipleFills);
+            .setMultipleFills(allowMultipleFills)
+            .enablePostInteraction();
         if (makerTraits.isBitInvalidatorMode()) {
             (0, assert_1.default)(nonce !== undefined, 'Nonce required, when partial fill or multiple fill disallowed');
         }
@@ -37,13 +50,20 @@ class FusionOrder {
         if (nonce !== undefined) {
             makerTraits.withNonce(nonce);
         }
-        const extension = new fusion_extension_1.FusionExtension(extensionContract, auctionDetails, postInteractionData);
+        /**
+         * @see https://github.com/1inch/limit-order-settlement/blob/0afb4785cb825fe959c534ff4f1a771d4d33cdf4/contracts/extensions/IntegratorFeeExtension.sol#L65
+         */
+        const receiver = postInteractionData.integratorFee?.ratio
+            ? settlementExtensionContract
+            : orderInfo.receiver;
+        const extension = new fusion_extension_1.FusionExtension(settlementExtensionContract, auctionDetails, postInteractionData);
         if (permit) {
             extension.withMakerPermit(orderInfo.makerAsset, permit);
         }
         const builtExtension = extension.build();
         this.inner = new limit_order_sdk_1.LimitOrder({
             ...orderInfo,
+            receiver,
             salt: limit_order_sdk_1.LimitOrder.buildSalt(builtExtension, orderInfo.salt)
         }, makerTraits, builtExtension);
         this.fusionExtension = extension;
@@ -51,26 +71,82 @@ class FusionOrder {
     get extension() {
         return this.inner.extension;
     }
-    static new(settlementExtension, orderInfo, details, extra = FusionOrder.defaultExtra) {
+    get maker() {
+        return this.inner.maker;
+    }
+    get takerAsset() {
+        return this.inner.takerAsset;
+    }
+    get makerAsset() {
+        return this.inner.makerAsset;
+    }
+    get takingAmount() {
+        return this.inner.takingAmount;
+    }
+    get makingAmount() {
+        return this.inner.makingAmount;
+    }
+    get receiver() {
+        return this.inner.receiver;
+    }
+    /**
+     * Timestamp in sec
+     */
+    get deadline() {
+        return this.inner.makerTraits.expiration() || 0n;
+    }
+    /**
+     * Timestamp in sec
+     */
+    get auctionStartTime() {
+        return this.fusionExtension.auctionDetails.startTime;
+    }
+    /**
+     * Timestamp in sec
+     */
+    get auctionEndTime() {
+        const { startTime, duration } = this.fusionExtension.auctionDetails;
+        return startTime + duration;
+    }
+    get partialFillAllowed() {
+        return this.inner.makerTraits.isPartialFillAllowed();
+    }
+    get multipleFillsAllowed() {
+        return this.inner.makerTraits.isMultipleFillsAllowed();
+    }
+    static new(
+    /**
+     * Fusion extension address
+     * @see https://github.com/1inch/limit-order-settlement
+     */
+    settlementExtension, orderInfo, details, 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,
-            auctionStartTime: details.auction.startTime
+            resolvingStartTime: details.resolvingStartTime ?? (0, time_1.now)(),
+            customReceiver: orderInfo.receiver
         }), extra);
     }
+    /**
+     * Create FusionOrder from order data and extension
+     *
+     */
     static fromDataAndExtension(order, extension) {
         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');
         const makerTraits = new limit_order_sdk_1.MakerTraits(BigInt(order.makerTraits));
-        const auctionDetails = auction_details_1.AuctionDetails.decode((0, utils_1.add0x)(extension.makingAmountData.slice(42)));
-        const postInteractionData = settlement_post_interaction_data_1.SettlementPostInteractionData.decode((0, utils_1.add0x)(extension.postInteraction.slice(42)));
+        (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 = 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
             : deadline - auctionDetails.startTime - auctionDetails.duration;
         return new FusionOrder(settlementContract, {
+            // shift because of how LimitOrder.buildSalt works
             salt: BigInt(order.salt) >> 160n,
             maker: new limit_order_sdk_1.Address(order.maker),
             receiver: new limit_order_sdk_1.Address(order.receiver),
@@ -93,17 +169,68 @@ class FusionOrder {
     build() {
         return this.inner.build();
     }
-    getOrderHash(domain = (0, limit_order_sdk_1.getLimitOrderV4Domain)(1)) {
-        return this.inner.getOrderHash(domain);
+    getOrderHash(chainId) {
+        return this.inner.getOrderHash(chainId);
     }
-    getTypedData(domain = (0, limit_order_sdk_1.getLimitOrderV4Domain)(1)) {
-        return this.inner.getTypedData(domain);
+    getTypedData(chainId) {
+        return this.inner.getTypedData(chainId);
     }
     getCalculator() {
-        return auction_calculator_1.AuctionCalculator.fromAuctionData(this.fusionExtension.postInteractionData, this.fusionExtension.details);
+        return auction_calculator_1.AuctionCalculator.fromAuctionData(this.fusionExtension.postInteractionData, this.fusionExtension.auctionDetails);
+    }
+    /**
+     * Calculates required taking amount for passed `makingAmount` at block time `time`
+     *
+     * @param makingAmount maker swap amount
+     * @param time execution time in sec
+     * @param blockBaseFee block fee in wei.
+     * */
+    calcTakingAmount(makingAmount, time, blockBaseFee = 0n) {
+        const takingAmount = (0, amounts_1.calcTakingAmount)(makingAmount, this.makingAmount, this.takingAmount);
+        const calculator = this.getCalculator();
+        const bump = calculator.calcRateBump(time, blockBaseFee);
+        return calculator.calcAuctionTakingAmount(takingAmount, bump);
+    }
+    /**
+     * Check whether address allowed to execute order at the given time
+     *
+     * @param executor address of executor
+     * @param executionTime timestamp in sec at which order planning to execute
+     */
+    canExecuteAt(executor, executionTime) {
+        return this.fusionExtension.postInteractionData.canExecuteAt(executor, executionTime);
+    }
+    /**
+     * Check is order expired at a given time
+     *
+     * @param time timestamp in seconds
+     */
+    isExpiredAt(time) {
+        return time > this.deadline;
+    }
+    /**
+     * Returns how much fee will be credited from a resolver deposit account
+     * Token of fee set in Settlement extension constructor
+     * Actual deployments can be found at https://github.com/1inch/limit-order-settlement/tree/master/deployments
+     *
+     * @param filledMakingAmount which resolver fills
+     * @see https://github.com/1inch/limit-order-settlement/blob/0e3cae3653092ebb4ea5d2a338c87a54351ad883/contracts/extensions/ResolverFeeExtension.sol#L29
+     */
+    getResolverFee(filledMakingAmount) {
+        return ((this.fusionExtension.postInteractionData.bankFee *
+            FusionOrder._ORDER_FEE_BASE_POINTS *
+            filledMakingAmount) /
+            this.makingAmount);
+    }
+    /**
+     * Check if `wallet` can fill order before other
+     */
+    isExclusiveResolver(wallet) {
+        return this.fusionExtension.postInteractionData.isExclusiveResolver(wallet);
     }
 }
 exports.FusionOrder = FusionOrder;
+FusionOrder._ORDER_FEE_BASE_POINTS = 10n ** 15n;
 FusionOrder.defaultExtra = {
     allowPartialFills: true,
     allowMultipleFills: true,

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

@@ -1 +1 @@
-{"version":3,"file":"fusion-order.js","sourceRoot":"","sources":["../../src/fusion-order/fusion-order.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fusion-order.js","sourceRoot":"","sources":["../../src/fusion-order/fusion-order.ts"],"names":[],"mappings":";;;;;;AAAA,4DAQ+B;AAC/B,oDAA2B;AAC3B,yDAAkD;AAClD,uDAAgD;AAChD,yFAI2C;AAC3C,8DAAuD;AACvD,4CAA+B;AAC/B,8CAAiD;AACjD,wCAAiC;AAEjC,MAAa,WAAW;IAepB;IACI;;;OAGG;IACa,2BAAoC,EACpD,SAAwB,EACxB,cAA8B,EAC9B,mBAAkD,EAClD,QAyBI,WAAW,CAAC,YAAY;QA7BZ,gCAA2B,GAA3B,2BAA2B,CAAS;QA+BpD,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,EAAC,KAAK,EAAE,MAAM,EAAC,GAAG,KAAK,CAAA;QAE7B,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;YACpC,IAAA,gBAAM,EACF,KAAK,KAAK,SAAS,EACnB,+DAA+D,CAClE,CAAA;SACJ;QAED,IAAI,UAAU,EAAE;YACZ,WAAW,CAAC,kBAAkB,EAAE,CAAA;SACnC;QAED,IAAI,aAAa,EAAE;YACf,WAAW,CAAC,aAAa,EAAE,CAAA;SAC9B;QAED,IAAI,KAAK,KAAK,SAAS,EAAE;YACrB,WAAW,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;SAC/B;QAED;;WAEG;QACH,MAAM,QAAQ,GAAG,mBAAmB,CAAC,aAAa,EAAE,KAAK;YACrD,CAAC,CAAC,2BAA2B;YAC7B,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAA;QAExB,MAAM,SAAS,GAAG,IAAI,kCAAe,CACjC,2BAA2B,EAC3B,cAAc,EACd,mBAAmB,CACtB,CAAA;QAED,IAAI,MAAM,EAAE;YACR,SAAS,CAAC,eAAe,CAAC,SAAS,CAAC,UAAU,EAAE,MAAM,CAAC,CAAA;SAC1D;QAED,MAAM,cAAc,GAAG,SAAS,CAAC,KAAK,EAAE,CAAA;QAExC,IAAI,CAAC,KAAK,GAAG,IAAI,4BAAU,CACvB;YACI,GAAG,SAAS;YACZ,QAAQ;YACR,IAAI,EAAE,4BAAU,CAAC,SAAS,CAAC,cAAc,EAAE,SAAS,CAAC,IAAI,CAAC;SAC7D,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;IAED,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAA;IAC9B,CAAC;IAED;;OAEG;IACH,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,UAAU,EAAE,IAAI,EAAE,CAAA;IACpD,CAAC;IAED;;OAEG;IACH,IAAI,gBAAgB;QAChB,OAAO,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,SAAS,CAAA;IACxD,CAAC;IAED;;OAEG;IACH,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,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,MAAM,CAAC,GAAG;IACN;;;OAGG;IACH,mBAA4B,EAC5B,SAAwB,EACxB,OAWC,EACD,KAuBC;QAED,OAAO,IAAI,WAAW,CAClB,mBAAmB,EACnB,SAAS,EACT,OAAO,CAAC,OAAO,EACf,gEAA6B,CAAC,GAAG,CAAC;YAC9B,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,IAAI,EAAE;YACpC,aAAa,EAAE,OAAO,CAAC,IAAI,EAAE,aAAa;YAC1C,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,kBAAkB,EAAE,OAAO,CAAC,kBAAkB,IAAI,IAAA,UAAG,GAAE;YACvD,cAAc,EAAE,SAAS,CAAC,QAAQ;SACrC,CAAC,EACF,KAAK,CACR,CAAA;IACL,CAAC;IAED;;;OAGG;IACH,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,cAAc,GAAG,gCAAc,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;QAE9D,MAAM,mBAAmB,GACrB,gEAA6B,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;QAE1D,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;YACI,kDAAkD;YAClD,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,IAAI;YAChC,KAAK,EAAE,IAAI,yBAAO,CAAC,KAAK,CAAC,KAAK,CAAC;YAC/B,QAAQ,EAAE,IAAI,yBAAO,CAAC,KAAK,CAAC,QAAQ,CAAC;YACrC,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,mBAAmB,EACnB;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,SAAS,CAAC,WAAW;YAC/B,UAAU,EAAE,WAAW,CAAC,qBAAqB,EAAE;YAC/C,oBAAoB;SACvB,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,mBAAmB,EACxC,IAAI,CAAC,eAAe,CAAC,cAAc,CACtC,CAAA;IACL,CAAC;IAED;;;;;;SAMK;IACE,gBAAgB,CACnB,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,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,EAAE,CAAA;QAEvC,MAAM,IAAI,GAAG,UAAU,CAAC,YAAY,CAAC,IAAI,EAAE,YAAY,CAAC,CAAA;QAExD,OAAO,UAAU,CAAC,uBAAuB,CAAC,YAAY,EAAE,IAAI,CAAC,CAAA;IACjE,CAAC;IAED;;;;;OAKG;IACI,YAAY,CAAC,QAAiB,EAAE,aAAqB;QACxD,OAAO,IAAI,CAAC,eAAe,CAAC,mBAAmB,CAAC,YAAY,CACxD,QAAQ,EACR,aAAa,CAChB,CAAA;IACL,CAAC;IAED;;;;OAIG;IACI,WAAW,CAAC,IAAY;QAC3B,OAAO,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAA;IAC/B,CAAC;IAED;;;;;;;OAOG;IACI,cAAc,CAAC,kBAA0B;QAC5C,OAAO,CACH,CAAC,IAAI,CAAC,eAAe,CAAC,mBAAmB,CAAC,OAAO;YAC7C,WAAW,CAAC,sBAAsB;YAClC,kBAAkB,CAAC;YACvB,IAAI,CAAC,YAAY,CACpB,CAAA;IACL,CAAC;IAED;;OAEG;IACI,mBAAmB,CAAC,MAAe;QACtC,OAAO,IAAI,CAAC,eAAe,CAAC,mBAAmB,CAAC,mBAAmB,CAC/D,MAAM,CACT,CAAA;IACL,CAAC;;AAxZL,kCAyZC;AAxZkB,kCAAsB,GAAG,GAAG,IAAI,GAAG,CAAA;AAEnC,wBAAY,GAAG;IAC1B,iBAAiB,EAAE,IAAI;IACvB,kBAAkB,EAAE,IAAI;IACxB,UAAU,EAAE,KAAK;IACjB,aAAa,EAAE,KAAK;IACpB,oBAAoB,EAAE,GAAG;CAC5B,CAAA"}

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const limit_order_sdk_1 = require("@1inch/limit-order-sdk");
+const ethers_1 = require("ethers");
 const fusion_order_1 = require("./fusion-order");
 const auction_details_1 = require("./auction-details");
 describe('Fusion Order', () => {
@@ -28,9 +29,10 @@ describe('Fusion Order', () => {
             whitelist: [
                 {
                     address: new limit_order_sdk_1.Address('0x00000000219ab540356cbb839cbe05303d7705fa'),
-                    delay: 0n
+                    allowFrom: 0n
                 }
-            ]
+            ],
+            resolvingStartTime: 1673548139n
         });
         const builtOrder = order.build();
         expect(builtOrder).toStrictEqual({
@@ -40,8 +42,8 @@ describe('Fusion Order', () => {
             receiver: '0x0000000000000000000000000000000000000000',
             takerAsset: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
             takingAmount: '1420000000',
-            makerTraits: '29852648006495581632639394572552351243421169944806257724550573036760110989312',
-            salt: '14832508939800728556409473652845244531014097925085'
+            makerTraits: '33471150795161712739625987854073848363835856965607525350783622537007396290560',
+            salt: '14969955465678758833706505435513058355190519874774'
         });
         const makerTraits = new limit_order_sdk_1.MakerTraits(BigInt(builtOrder.makerTraits));
         expect(makerTraits.isNativeUnwrapEnabled()).toEqual(false);
@@ -72,11 +74,39 @@ describe('Fusion Order', () => {
             whitelist: [
                 {
                     address: new limit_order_sdk_1.Address('0x00000000219ab540356cbb839cbe05303d7705fa'),
-                    delay: 0n
+                    allowFrom: 0n
                 }
             ]
         });
         expect(fusion_order_1.FusionOrder.fromDataAndExtension(order.build(), order.extension)).toStrictEqual(order);
     });
+    it('Should calculate taking amount', () => {
+        const now = 10000n;
+        const order = fusion_order_1.FusionOrder.new(new limit_order_sdk_1.Address('0x8273f37417da37c4a6c3995e82cf442f87a25d9c'), {
+            makerAsset: new limit_order_sdk_1.Address('0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48' // USDC
+            ),
+            takerAsset: new limit_order_sdk_1.Address('0x111111111117dc0aa78b770fa6a738034120c302' // 1INCH
+            ),
+            maker: limit_order_sdk_1.Address.fromBigInt(1n),
+            makingAmount: (0, ethers_1.parseUnits)('150', 6),
+            takingAmount: (0, ethers_1.parseUnits)('200')
+        }, {
+            auction: new auction_details_1.AuctionDetails({
+                startTime: now,
+                duration: 120n,
+                initialRateBump: 10000000,
+                points: []
+            }),
+            whitelist: [
+                {
+                    address: new limit_order_sdk_1.Address('0x00000000219ab540356cbb839cbe05303d7705fa'),
+                    allowFrom: 0n
+                }
+            ],
+            resolvingStartTime: 0n
+        });
+        expect(order.calcTakingAmount(order.makingAmount, now)).toEqual(2n * order.takingAmount // because init rate bump is 100%
+        );
+    });
 });
 //# sourceMappingURL=fusion-order.spec.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"fusion-order.spec.js","sourceRoot":"","sources":["../../src/fusion-order/fusion-order.spec.ts"],"names":[],"mappings":";;AAAA,4DAA2D;AAC3D,iDAA0C;AAC1C,uDAAgD;AAEhD,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC1B,EAAE,CAAC,4BAA4B,EAAE,GAAG,EAAE;QAClC,MAAM,iBAAiB,GAAG,IAAI,yBAAO,CACjC,4CAA4C,CAC/C,CAAA;QAED,MAAM,KAAK,GAAG,0BAAW,CAAC,GAAG,CACzB,iBAAiB,EACjB;YACI,UAAU,EAAE,IAAI,yBAAO,CACnB,4CAA4C,CAC/C;YACD,UAAU,EAAE,IAAI,yBAAO,CACnB,4CAA4C,CAC/C;YACD,YAAY,EAAE,oBAAoB;YAClC,YAAY,EAAE,WAAW;YACzB,KAAK,EAAE,IAAI,yBAAO,CACd,4CAA4C,CAC/C;YACD,IAAI,EAAE,GAAG;SACZ,EACD;YACI,OAAO,EAAE,IAAI,gCAAc,CAAC;gBACxB,QAAQ,EAAE,IAAI;gBACd,SAAS,EAAE,WAAW;gBACtB,eAAe,EAAE,KAAK;gBACtB,MAAM,EAAE;oBACJ;wBACI,WAAW,EAAE,KAAK;wBAClB,KAAK,EAAE,EAAE;qBACZ;iBACJ;aACJ,CAAC;YACF,SAAS,EAAE;gBACP;oBACI,OAAO,EAAE,IAAI,yBAAO,CAChB,4CAA4C,CAC/C;oBACD,KAAK,EAAE,EAAE;iBACZ;aACJ;SACJ,CACJ,CAAA;QAED,MAAM,UAAU,GAAG,KAAK,CAAC,KAAK,EAAE,CAAA;QAChC,MAAM,CAAC,UAAU,CAAC,CAAC,aAAa,CAAC;YAC7B,KAAK,EAAE,4CAA4C;YACnD,UAAU,EAAE,4CAA4C;YACxD,YAAY,EAAE,qBAAqB;YACnC,QAAQ,EAAE,4CAA4C;YACtD,UAAU,EAAE,4CAA4C;YACxD,YAAY,EAAE,YAAY;YAC1B,WAAW,EACP,+EAA+E;YACnF,IAAI,EAAE,oDAAoD;SAC7D,CAAC,CAAA;QAEF,MAAM,WAAW,GAAG,IAAI,6BAAW,CAAC,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAA;QACnE,MAAM,CAAC,WAAW,CAAC,qBAAqB,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QAC1D,MAAM,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QAC9C,MAAM,CAAC,WAAW,CAAC,oBAAoB,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;IAC5D,CAAC,CAAC,CAAA;IACF,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;QACzD,MAAM,iBAAiB,GAAG,IAAI,yBAAO,CACjC,4CAA4C,CAC/C,CAAA;QAED,MAAM,KAAK,GAAG,0BAAW,CAAC,GAAG,CACzB,iBAAiB,EACjB;YACI,UAAU,EAAE,IAAI,yBAAO,CACnB,4CAA4C,CAC/C;YACD,UAAU,EAAE,IAAI,yBAAO,CACnB,4CAA4C,CAC/C;YACD,YAAY,EAAE,oBAAoB;YAClC,YAAY,EAAE,WAAW;YACzB,KAAK,EAAE,IAAI,yBAAO,CACd,4CAA4C,CAC/C;YACD,IAAI,EAAE,GAAG;SACZ,EACD;YACI,OAAO,EAAE,IAAI,gCAAc,CAAC;gBACxB,QAAQ,EAAE,IAAI;gBACd,SAAS,EAAE,WAAW;gBACtB,eAAe,EAAE,KAAK;gBACtB,MAAM,EAAE;oBACJ;wBACI,WAAW,EAAE,KAAK;wBAClB,KAAK,EAAE,EAAE;qBACZ;iBACJ;aACJ,CAAC;YACF,SAAS,EAAE;gBACP;oBACI,OAAO,EAAE,IAAI,yBAAO,CAChB,4CAA4C,CAC/C;oBACD,KAAK,EAAE,EAAE;iBACZ;aACJ;SACJ,CACJ,CAAA;QAED,MAAM,CACF,0BAAW,CAAC,oBAAoB,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,KAAK,CAAC,SAAS,CAAC,CACnE,CAAC,aAAa,CAAC,KAAK,CAAC,CAAA;IAC1B,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAA"}
+{"version":3,"file":"fusion-order.spec.js","sourceRoot":"","sources":["../../src/fusion-order/fusion-order.spec.ts"],"names":[],"mappings":";;AAAA,4DAA2D;AAC3D,mCAAiC;AACjC,iDAA0C;AAC1C,uDAAgD;AAEhD,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC1B,EAAE,CAAC,4BAA4B,EAAE,GAAG,EAAE;QAClC,MAAM,iBAAiB,GAAG,IAAI,yBAAO,CACjC,4CAA4C,CAC/C,CAAA;QAED,MAAM,KAAK,GAAG,0BAAW,CAAC,GAAG,CACzB,iBAAiB,EACjB;YACI,UAAU,EAAE,IAAI,yBAAO,CACnB,4CAA4C,CAC/C;YACD,UAAU,EAAE,IAAI,yBAAO,CACnB,4CAA4C,CAC/C;YACD,YAAY,EAAE,oBAAoB;YAClC,YAAY,EAAE,WAAW;YACzB,KAAK,EAAE,IAAI,yBAAO,CACd,4CAA4C,CAC/C;YACD,IAAI,EAAE,GAAG;SACZ,EACD;YACI,OAAO,EAAE,IAAI,gCAAc,CAAC;gBACxB,QAAQ,EAAE,IAAI;gBACd,SAAS,EAAE,WAAW;gBACtB,eAAe,EAAE,KAAK;gBACtB,MAAM,EAAE;oBACJ;wBACI,WAAW,EAAE,KAAK;wBAClB,KAAK,EAAE,EAAE;qBACZ;iBACJ;aACJ,CAAC;YACF,SAAS,EAAE;gBACP;oBACI,OAAO,EAAE,IAAI,yBAAO,CAChB,4CAA4C,CAC/C;oBACD,SAAS,EAAE,EAAE;iBAChB;aACJ;YACD,kBAAkB,EAAE,WAAW;SAClC,CACJ,CAAA;QAED,MAAM,UAAU,GAAG,KAAK,CAAC,KAAK,EAAE,CAAA;QAChC,MAAM,CAAC,UAAU,CAAC,CAAC,aAAa,CAAC;YAC7B,KAAK,EAAE,4CAA4C;YACnD,UAAU,EAAE,4CAA4C;YACxD,YAAY,EAAE,qBAAqB;YACnC,QAAQ,EAAE,4CAA4C;YACtD,UAAU,EAAE,4CAA4C;YACxD,YAAY,EAAE,YAAY;YAC1B,WAAW,EACP,+EAA+E;YACnF,IAAI,EAAE,oDAAoD;SAC7D,CAAC,CAAA;QAEF,MAAM,WAAW,GAAG,IAAI,6BAAW,CAAC,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAA;QACnE,MAAM,CAAC,WAAW,CAAC,qBAAqB,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QAC1D,MAAM,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QAC9C,MAAM,CAAC,WAAW,CAAC,oBAAoB,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;IAC5D,CAAC,CAAC,CAAA;IACF,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;QACzD,MAAM,iBAAiB,GAAG,IAAI,yBAAO,CACjC,4CAA4C,CAC/C,CAAA;QAED,MAAM,KAAK,GAAG,0BAAW,CAAC,GAAG,CACzB,iBAAiB,EACjB;YACI,UAAU,EAAE,IAAI,yBAAO,CACnB,4CAA4C,CAC/C;YACD,UAAU,EAAE,IAAI,yBAAO,CACnB,4CAA4C,CAC/C;YACD,YAAY,EAAE,oBAAoB;YAClC,YAAY,EAAE,WAAW;YACzB,KAAK,EAAE,IAAI,yBAAO,CACd,4CAA4C,CAC/C;YACD,IAAI,EAAE,GAAG;SACZ,EACD;YACI,OAAO,EAAE,IAAI,gCAAc,CAAC;gBACxB,QAAQ,EAAE,IAAI;gBACd,SAAS,EAAE,WAAW;gBACtB,eAAe,EAAE,KAAK;gBACtB,MAAM,EAAE;oBACJ;wBACI,WAAW,EAAE,KAAK;wBAClB,KAAK,EAAE,EAAE;qBACZ;iBACJ;aACJ,CAAC;YACF,SAAS,EAAE;gBACP;oBACI,OAAO,EAAE,IAAI,yBAAO,CAChB,4CAA4C,CAC/C;oBACD,SAAS,EAAE,EAAE;iBAChB;aACJ;SACJ,CACJ,CAAA;QAED,MAAM,CACF,0BAAW,CAAC,oBAAoB,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,KAAK,CAAC,SAAS,CAAC,CACnE,CAAC,aAAa,CAAC,KAAK,CAAC,CAAA;IAC1B,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACtC,MAAM,GAAG,GAAG,MAAM,CAAA;QAClB,MAAM,KAAK,GAAG,0BAAW,CAAC,GAAG,CACzB,IAAI,yBAAO,CAAC,4CAA4C,CAAC,EACzD;YACI,UAAU,EAAE,IAAI,yBAAO,CACnB,4CAA4C,CAAC,OAAO;aACvD;YACD,UAAU,EAAE,IAAI,yBAAO,CACnB,4CAA4C,CAAC,QAAQ;aACxD;YACD,KAAK,EAAE,yBAAO,CAAC,UAAU,CAAC,EAAE,CAAC;YAC7B,YAAY,EAAE,IAAA,mBAAU,EAAC,KAAK,EAAE,CAAC,CAAC;YAClC,YAAY,EAAE,IAAA,mBAAU,EAAC,KAAK,CAAC;SAClC,EACD;YACI,OAAO,EAAE,IAAI,gCAAc,CAAC;gBACxB,SAAS,EAAE,GAAG;gBACd,QAAQ,EAAE,IAAI;gBACd,eAAe,EAAE,QAAU;gBAC3B,MAAM,EAAE,EAAE;aACb,CAAC;YACF,SAAS,EAAE;gBACP;oBACI,OAAO,EAAE,IAAI,yBAAO,CAChB,4CAA4C,CAC/C;oBACD,SAAS,EAAE,EAAE;iBAChB;aACJ;YACD,kBAAkB,EAAE,EAAE;SACzB,CACJ,CAAA;QAED,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,KAAK,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC,CAAC,OAAO,CAC3D,EAAE,GAAG,KAAK,CAAC,YAAY,CAAC,iCAAiC;SAC5D,CAAA;IACL,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAA"}

package/dist/fusion-order/settlement-post-interaction-data/settlement-post-interaction-data.d.ts

@@ -1,16 +1,53 @@
+import { Address, Extension } from '@1inch/limit-order-sdk';
 import { IntegratorFee, SettlementSuffixData } from './types';
 export declare class SettlementPostInteractionData {
     readonly whitelist: WhitelistItem[];
     readonly integratorFee?: IntegratorFee;
     readonly bankFee: bigint;
-    readonly auctionStartTime: bigint;
+    readonly resolvingStartTime: bigint;
+    readonly customReceiver?: Address;
     private constructor();
     static new(data: SettlementSuffixData): SettlementPostInteractionData;
+    /**
+     * Construct `SettlementPostInteractionData` from bytes
+     * @param data bytes with 0x prefix in next format:
+     * - [uint32 feeBank] only when first bit of `bitMask` enabled
+     * - [uint16 integratorFeeRation, uint160 integratorFeeReceiver, [uint160 customReceiver]] only when second bit of `bitMask` enabled
+     * - uint32 auctionStartTime
+     * - (bytes10 last10bytesOfAddress, uint16 auctionDelay) * N whitelist info
+     * - uint8 bitMask:
+     *                  0b0000_0001 - fee bank mask
+     *                  0b0000_0010 - integrator fee mask
+     *                  0b0000_0100 - is custom receiver present (only used when integrator fee enabled)
+     *                  0b1111_1000 - resolvers count mask
+     *
+     * All data is tight packed
+     * @see SettlementPostInteractionData.encode
+     */
     static decode(data: string): SettlementPostInteractionData;
+    static fromExtension(extension: Extension): SettlementPostInteractionData;
+    /**
+     * Serialize post-interaction data to bytes
+     */
     encode(): string;
+    /**
+     * Check whether address allowed to execute order at the given time
+     *
+     * @param executor address of executor
+     * @param executionTime timestamp in sec at which order planning to execute
+     */
+    canExecuteAt(executor: Address, executionTime: bigint): boolean;
+    isExclusiveResolver(wallet: Address): boolean;
 }
 type WhitelistItem = {
+    /**
+     * last 10 bytes of address, no 0x prefix
+     */
     addressHalf: string;
+    /**
+     * Delay from previous resolver in seconds
+     * For first resolver delay from `resolvingStartTime`
+     */
     delay: bigint;
 };
 export {};

package/dist/fusion-order/settlement-post-interaction-data/settlement-post-interaction-data.js

@@ -4,102 +4,181 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SettlementPostInteractionData = void 0;
-const ethers_1 = require("ethers");
 const limit_order_sdk_1 = require("@1inch/limit-order-sdk");
 const byte_utils_1 = require("@1inch/byte-utils");
 const assert_1 = __importDefault(require("assert"));
 const validations_1 = require("../../validations");
 const utils_1 = require("../../utils");
+const constants_1 = require("../../constants");
 class SettlementPostInteractionData {
     constructor(data) {
         this.whitelist = data.whitelist;
         this.integratorFee = data?.integratorFee;
-        this.bankFee = data.bankFee;
-        this.auctionStartTime = data.auctionStartTime;
+        this.bankFee = data.bankFee || 0n;
+        this.resolvingStartTime = data.resolvingStartTime;
+        this.customReceiver = data.customReceiver;
+        if (this.integratorFee?.ratio) {
+            (0, assert_1.default)(!this.integratorFee.receiver.isZero(), 'Fee receiver can not be zero when fee set');
+        }
     }
     static new(data) {
+        (0, assert_1.default)(data.whitelist.length, 'Whitelist can not be empty');
+        // transform timestamps to cumulative delays
+        let sumDelay = 0n;
+        const whitelist = data.whitelist
+            .map((d) => ({
+            addressHalf: d.address.toString().slice(-20),
+            allowFrom: d.allowFrom < data.resolvingStartTime
+                ? data.resolvingStartTime
+                : d.allowFrom
+        }))
+            .sort((a, b) => Number(a.allowFrom - b.allowFrom)) // ASC
+            .map((val) => {
+            const delay = val.allowFrom - data.resolvingStartTime - sumDelay;
+            sumDelay += delay;
+            (0, assert_1.default)(delay < constants_1.UINT_16_MAX, 'Too big diff between timestamps');
+            return {
+                delay,
+                addressHalf: val.addressHalf
+            };
+        });
         return new SettlementPostInteractionData({
             ...data,
-            whitelist: data.whitelist.map((d) => ({
-                addressHalf: d.address.toString().slice(-20),
-                delay: d.delay
-            }))
+            whitelist
         });
     }
+    /**
+     * Construct `SettlementPostInteractionData` from bytes
+     * @param data bytes with 0x prefix in next format:
+     * - [uint32 feeBank] only when first bit of `bitMask` enabled
+     * - [uint16 integratorFeeRation, uint160 integratorFeeReceiver, [uint160 customReceiver]] only when second bit of `bitMask` enabled
+     * - uint32 auctionStartTime
+     * - (bytes10 last10bytesOfAddress, uint16 auctionDelay) * N whitelist info
+     * - uint8 bitMask:
+     *                  0b0000_0001 - fee bank mask
+     *                  0b0000_0010 - integrator fee mask
+     *                  0b0000_0100 - is custom receiver present (only used when integrator fee enabled)
+     *                  0b1111_1000 - resolvers count mask
+     *
+     * All data is tight packed
+     * @see SettlementPostInteractionData.encode
+     */
     static decode(data) {
         (0, assert_1.default)((0, validations_1.isHexBytes)(data), 'Post interaction data must be valid bytes string');
         const iter = byte_utils_1.BytesIter.BigInt(data);
-        const feeType = iter.nextByte();
+        const flags = new byte_utils_1.BN(iter.nextByte(byte_utils_1.BytesIter.SIDE.Back));
         let bankFee = 0n;
         let integratorFee;
-        if ((feeType & 1n) === 1n) {
+        let customReceiver;
+        // fee bank presented
+        if (flags.getBit(0n)) {
             bankFee = iter.nextUint32();
         }
-        if ((feeType & 2n) === 2n) {
+        // integrator fee presented
+        if (flags.getBit(1n)) {
+            const integratorFeeRatio = iter.nextUint16();
             const integratorAddress = iter.nextUint160();
-            const integratorFeeRatio = iter.nextUint32();
             integratorFee = {
                 ratio: integratorFeeRatio,
                 receiver: limit_order_sdk_1.Address.fromBigInt(integratorAddress)
             };
+            // custom receiver presented
+            if (flags.getBit(2n)) {
+                customReceiver = limit_order_sdk_1.Address.fromBigInt(iter.nextUint160());
+            }
         }
-        const auctionStartTime = iter.nextUint32();
+        const resolvingStartTime = iter.nextUint32();
         const whitelist = [];
         while (!iter.isEmpty()) {
             const addressHalf = iter
                 .nextBytes(10)
                 .toString(16)
                 .padStart(20, '0');
-            const allowance = iter.nextUint16();
+            const delay = iter.nextUint16();
             whitelist.push({
                 addressHalf,
-                delay: allowance
+                delay
             });
         }
         return new SettlementPostInteractionData({
             integratorFee,
             bankFee,
-            auctionStartTime,
-            whitelist
+            resolvingStartTime,
+            whitelist,
+            customReceiver
         });
     }
+    static fromExtension(extension) {
+        return SettlementPostInteractionData.decode((0, utils_1.add0x)(extension.postInteraction.slice(42)));
+    }
+    /**
+     * Serialize post-interaction data to bytes
+     */
     encode() {
-        const fee = {
-            type: 'uint8',
-            value: 0n
-        };
-        const data = [fee];
+        /**
+         * 0b0000_0001 - fee bank mask
+         * 0b0000_0010 - integrator fee mask
+         * 0b0000_0100 - is custom receiver present
+         * 0b1111_1000 - resolvers count mask
+         */
+        let bitMask = new byte_utils_1.BN(0n);
+        const bytes = new byte_utils_1.BytesBuilder();
+        // Add bank fee if exists
         if (this.bankFee) {
-            fee.value |= 1n;
-            data.push({
-                type: 'uint32',
-                value: ethers_1.ethers.solidityPacked(['uint32'], [this.bankFee])
-            });
+            bitMask = bitMask.setBit(0n, 1);
+            bytes.addUint32(this.bankFee);
         }
+        // add integrator fee if exists
         if (this.integratorFee?.ratio) {
-            fee.value |= 2n;
-            data.push({
-                type: 'uint160',
-                value: ethers_1.ethers.solidityPacked(['uint160'], [this.integratorFee.receiver.toString()])
-            }, {
-                type: 'uint32',
-                value: ethers_1.ethers.solidityPacked(['uint32'], [this.integratorFee.ratio])
-            });
+            bitMask = bitMask.setBit(1n, 1);
+            bytes
+                .addUint16(this.integratorFee.ratio)
+                .addAddress(this.integratorFee.receiver.toString());
+            if (this.customReceiver && !this.customReceiver.isZero()) {
+                bitMask = bitMask.setBit(2n, 1);
+                bytes.addAddress(this.customReceiver.toString());
+            }
         }
-        data.push({
-            type: 'uint32',
-            value: this.auctionStartTime
-        });
+        bytes.addUint32(this.resolvingStartTime);
+        // whitelist data
         for (const wl of this.whitelist) {
-            data.push({
-                type: 'bytes10',
-                value: (0, utils_1.add0x)(wl.addressHalf)
-            }, {
-                type: 'uint16',
-                value: BigInt(wl.delay)
-            });
+            bytes.addBytes((0, utils_1.add0x)(wl.addressHalf)).addUint16(wl.delay);
+        }
+        bitMask = bitMask.setMask(new byte_utils_1.BitMask(3n, 8n), BigInt(this.whitelist.length));
+        bytes.addUint8(bitMask.value);
+        return bytes.asHex();
+    }
+    /**
+     * Check whether address allowed to execute order at the given time
+     *
+     * @param executor address of executor
+     * @param executionTime timestamp in sec at which order planning to execute
+     */
+    canExecuteAt(executor, executionTime) {
+        const addressHalf = executor.toString().slice(-20);
+        let allowedFrom = this.resolvingStartTime;
+        for (const whitelist of this.whitelist) {
+            allowedFrom += whitelist.delay;
+            if (addressHalf === whitelist.addressHalf) {
+                return executionTime >= allowedFrom;
+            }
+            else if (executionTime < allowedFrom) {
+                return false;
+            }
+        }
+        return false;
+    }
+    isExclusiveResolver(wallet) {
+        const addressHalf = wallet.toString().slice(-20);
+        // only one resolver, so check if it is the passed address
+        if (this.whitelist.length === 1) {
+            return addressHalf === this.whitelist[0].addressHalf;
+        }
+        // more than 1 address can fill at the same time, no exclusivity
+        if (this.whitelist[0].delay === this.whitelist[1].delay) {
+            return false;
         }
-        return ethers_1.ethers.solidityPacked(data.map((d) => d.type), data.map((d) => d.value));
+        return addressHalf === this.whitelist[0].addressHalf;
     }
 }
 exports.SettlementPostInteractionData = SettlementPostInteractionData;