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

package/dist/esm/auction-calculator/utils.js

@@ -0,0 +1,13 @@
+export function mulDiv(a, b, x, rounding = Rounding.Floor) {
+    const res = (a * b) / x;
+    if (rounding === Rounding.Ceil && (a * b) % x > 0) {
+        return res + 1n;
+    }
+    return res;
+}
+export var Rounding;
+(function (Rounding) {
+    Rounding[Rounding["Ceil"] = 0] = "Ceil";
+    Rounding[Rounding["Floor"] = 1] = "Floor";
+})(Rounding || (Rounding = {}));
+//# sourceMappingURL=utils.js.map

package/dist/esm/auction-calculator/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/auction-calculator/utils.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,MAAM,CAClB,CAAS,EACT,CAAS,EACT,CAAS,EACT,WAAqB,QAAQ,CAAC,KAAK;IAEnC,MAAM,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAA;IAEvB,IAAI,QAAQ,KAAK,QAAQ,CAAC,IAAI,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QAC/C,OAAO,GAAG,GAAG,EAAE,CAAA;KAClB;IAED,OAAO,GAAG,CAAA;AACd,CAAC;AAED,MAAM,CAAN,IAAY,QAGX;AAHD,WAAY,QAAQ;IAChB,uCAAI,CAAA;IACJ,yCAAK,CAAA;AACT,CAAC,EAHW,QAAQ,KAAR,QAAQ,QAGnB"}

package/dist/esm/connector/http/axios-provider.connector.js.map

@@ -1 +1 @@
-{"version":3,"file":"axios-provider.connector.js","sourceRoot":"","sources":["../../../../src/connector/http/axios-provider.connector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAC,YAAY,EAAC,MAAM,OAAO,CAAA;AAEzC,OAAO,EAAC,SAAS,EAAC,MAAM,cAAc,CAAA;AAEtC,MAAM,OAAO,sBAAsB;IAC/B,YAA6B,OAAgB;QAAhB,YAAO,GAAP,OAAO,CAAS;IAAG,CAAC;IAEjD,KAAK,CAAC,GAAG,CAAI,GAAW;QACpB,IAAI,CAAC;YACD,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,CACvB,GAAG,EACH,IAAI,CAAC,OAAO;gBACR,CAAC,CAAC;oBACI,OAAO,EAAE;wBACL,aAAa,EAAE,UAAU,IAAI,CAAC,OAAO,EAAE;qBAC1C;iBACJ;gBACH,CAAC,CAAC,SAAS,CAClB,CAAA;YAED,OAAO,GAAG,CAAC,IAAI,CAAA;QACnB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,IAAI,YAAY,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,QAAQ,EAAE,MAAM,KAAK,GAAG,EAAE,CAAC;gBACxD,MAAM,IAAI,SAAS,EAAE,CAAA;YACzB,CAAC;YAED,MAAM,KAAK,CAAA;QACf,CAAC;IACL,CAAC;IAED,KAAK,CAAC,IAAI,CAAI,GAAW,EAAE,IAAa;QACpC,IAAI,CAAC;YACD,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,IAAI,CACxB,GAAG,EACH,IAAI,EACJ,IAAI,CAAC,OAAO;gBACR,CAAC,CAAC;oBACI,OAAO,EAAE;wBACL,aAAa,EAAE,UAAU,IAAI,CAAC,OAAO,EAAE;qBAC1C;iBACJ;gBACH,CAAC,CAAC,SAAS,CAClB,CAAA;YAED,OAAO,GAAG,CAAC,IAAI,CAAA;QACnB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,IAAI,YAAY,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,QAAQ,EAAE,MAAM,KAAK,GAAG,EAAE,CAAC;gBACxD,MAAM,IAAI,SAAS,EAAE,CAAA;YACzB,CAAC;YAED,MAAM,KAAK,CAAA;QACf,CAAC;IACL,CAAC;CACJ"}
+{"version":3,"file":"axios-provider.connector.js","sourceRoot":"","sources":["../../../../src/connector/http/axios-provider.connector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAC,YAAY,EAAC,MAAM,OAAO,CAAA;AAEzC,OAAO,EAAC,SAAS,EAAC,MAAM,cAAc,CAAA;AAEtC,MAAM,OAAO,sBAAsB;IAC/B,YAA6B,OAAgB;QAAhB,YAAO,GAAP,OAAO,CAAS;IAAG,CAAC;IAEjD,KAAK,CAAC,GAAG,CAAI,GAAW;QACpB,IAAI;YACA,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,CACvB,GAAG,EACH,IAAI,CAAC,OAAO;gBACR,CAAC,CAAC;oBACI,OAAO,EAAE;wBACL,aAAa,EAAE,UAAU,IAAI,CAAC,OAAO,EAAE;qBAC1C;iBACJ;gBACH,CAAC,CAAC,SAAS,CAClB,CAAA;YAED,OAAO,GAAG,CAAC,IAAI,CAAA;SAClB;QAAC,OAAO,KAAK,EAAE;YACZ,IAAI,YAAY,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,QAAQ,EAAE,MAAM,KAAK,GAAG,EAAE;gBACvD,MAAM,IAAI,SAAS,EAAE,CAAA;aACxB;YAED,MAAM,KAAK,CAAA;SACd;IACL,CAAC;IAED,KAAK,CAAC,IAAI,CAAI,GAAW,EAAE,IAAa;QACpC,IAAI;YACA,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,IAAI,CACxB,GAAG,EACH,IAAI,EACJ,IAAI,CAAC,OAAO;gBACR,CAAC,CAAC;oBACI,OAAO,EAAE;wBACL,aAAa,EAAE,UAAU,IAAI,CAAC,OAAO,EAAE;qBAC1C;iBACJ;gBACH,CAAC,CAAC,SAAS,CAClB,CAAA;YAED,OAAO,GAAG,CAAC,IAAI,CAAA;SAClB;QAAC,OAAO,KAAK,EAAE;YACZ,IAAI,YAAY,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,QAAQ,EAAE,MAAM,KAAK,GAAG,EAAE;gBACvD,MAAM,IAAI,SAAS,EAAE,CAAA;aACxB;YAED,MAAM,KAAK,CAAA;SACd;IACL,CAAC;CACJ"}

package/dist/esm/connector/ws/websocket-client.connector.js.map

@@ -1 +1 @@
-{"version":3,"file":"websocket-client.connector.js","sourceRoot":"","sources":["../../../../src/connector/ws/websocket-client.connector.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"websocket-client.connector.js","sourceRoot":"","sources":["../../../../src/connector/ws/websocket-client.connector.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,IAAI,CAAA;AAS1B,MAAM,OAAO,eAAe;IASxB,YAAY,MAAmB;QAC3B,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAA;QACrB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAA;QAE7B,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,KAAK,CAAA;QAEzC,IAAI,CAAC,QAAQ,EAAE;YACX,IAAI,CAAC,WAAW,GAAG,IAAI,CAAA;YACvB,IAAI,CAAC,EAAE,GAAG,IAAI,SAAS,CACnB,IAAI,CAAC,GAAG,EACR,IAAI,CAAC,OAAO;gBACR,CAAC,CAAC;oBACI,OAAO,EAAE;wBACL,aAAa,EAAE,UAAU,IAAI,CAAC,OAAO,EAAE;qBAC1C;iBACJ;gBACH,CAAC,CAAC,SAAS,CAClB,CAAA;YAED,OAAM;SACT;QAED,IAAI,CAAC,WAAW,GAAG,KAAK,CAAA;IAC5B,CAAC;IAED,IAAI;QACA,IAAI,IAAI,CAAC,WAAW,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAA;SACtD;QAGD,IAAI,CAAC,WAAW,GAAG,IAAI,CAAA;QAEvB,IAAI,CAAC,EAAE,GAAG,IAAI,SAAS,CACnB,IAAI,CAAC,GAAG,EACR,IAAI,CAAC,OAAO;YACR,CAAC,CAAC;gBACI,OAAO,EAAE;oBACL,aAAa,EAAE,UAAU,IAAI,CAAC,OAAO,EAAE;iBAC1C;aACJ;YACH,CAAC,CAAC,SAAS,CAClB,CAAA;IACL,CAAC;IAED,EAAE,CAAC,KAAa,EAAE,EAAuB;QACrC,IAAI,CAAC,gBAAgB,EAAE,CAAA;QACvB,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;IACzB,CAAC;IAED,GAAG,CAAC,KAAa,EAAE,EAAuB;QACtC,IAAI,CAAC,gBAAgB,EAAE,CAAA;QACvB,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;IAC1B,CAAC;IAED,MAAM,CAAC,EAAuB;QAC1B,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IACvB,CAAC;IAED,IAAI,CAAI,OAAU;QACd,IAAI,CAAC,gBAAgB,EAAE,CAAA;QACvB,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;QAC1C,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IAC5B,CAAC;IAED,SAAS,CAAC,EAAe;QACrB,IAAI,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,IAAS,EAAE,EAAE;YAC7B,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;YAEnC,EAAE,CAAC,UAAU,CAAC,CAAA;QAClB,CAAC,CAAC,CAAA;IACN,CAAC;IAED,OAAO,CAAC,EAAe;QACnB,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAA;IACxB,CAAC;IAED,OAAO,CAAC,EAAe;QACnB,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAA;IACxB,CAAC;IAED,KAAK;QACD,IAAI,CAAC,gBAAgB,EAAE,CAAA;QACvB,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,CAAA;IACnB,CAAC;IAEO,gBAAgB;QACpB,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;YACnB,cAAc,EAAE,CAAA;SACnB;IACL,CAAC;CACJ;AAED,SAAS,cAAc;IACnB,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAA;AACvE,CAAC"}

package/dist/esm/constants.js

@@ -12,6 +12,8 @@ export var NetworkEnum;
     NetworkEnum[NetworkEnum["GNOSIS"] = 100] = "GNOSIS";
     NetworkEnum[NetworkEnum["COINBASE"] = 8453] = "COINBASE";
     NetworkEnum[NetworkEnum["LINEA"] = 59144] = "LINEA";
+    NetworkEnum[NetworkEnum["SONIC"] = 146] = "SONIC";
+    NetworkEnum[NetworkEnum["UNICHAIN"] = 130] = "UNICHAIN";
 })(NetworkEnum || (NetworkEnum = {}));
 export const ONE_INCH_LIMIT_ORDER_V4 = '0x111111125421ca6dc452d289314280a0f8842a65';
 export const UINT_160_MAX = (1n << 160n) - 1n;

package/dist/esm/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,EAAE,GAAG,IAAI,CAAA;AAEtB,MAAM,CAAN,IAAY,WAYX;AAZD,WAAY,WAAW;IACnB,qDAAY,CAAA;IACZ,qDAAa,CAAA;IACb,mDAAY,CAAA;IACZ,oDAAY,CAAA;IACZ,yDAAgB,CAAA;IAChB,2DAAiB,CAAA;IACjB,sDAAa,CAAA;IACb,mDAAY,CAAA;IACZ,mDAAY,CAAA;IACZ,wDAAe,CAAA;IACf,mDAAa,CAAA;AACjB,CAAC,EAZW,WAAW,KAAX,WAAW,QAYtB;AAED,MAAM,CAAC,MAAM,uBAAuB,GAChC,4CAA4C,CAAA;AAEhD,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,EAAE,IAAI,IAAI,CAAC,GAAG,EAAE,CAAA;AAC7C,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,CAAA;AAC3C,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,CAAA;AAC3C,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,CAAA;AAC3C,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,CAAA;AAC3C,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,CAAA;AAC3C,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,EAAE,IAAI,IAAI,CAAC,GAAG,EAAE,CAAA"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,EAAE,GAAG,IAAI,CAAA;AAEtB,MAAM,CAAN,IAAY,WAcX;AAdD,WAAY,WAAW;IACnB,qDAAY,CAAA;IACZ,qDAAa,CAAA;IACb,mDAAY,CAAA;IACZ,oDAAY,CAAA;IACZ,yDAAgB,CAAA;IAChB,2DAAiB,CAAA;IACjB,sDAAa,CAAA;IACb,mDAAY,CAAA;IACZ,mDAAY,CAAA;IACZ,wDAAe,CAAA;IACf,mDAAa,CAAA;IACb,iDAAW,CAAA;IACX,uDAAc,CAAA;AAClB,CAAC,EAdW,WAAW,KAAX,WAAW,QActB;AAED,MAAM,CAAC,MAAM,uBAAuB,GAChC,4CAA4C,CAAA;AAEhD,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,EAAE,IAAI,IAAI,CAAC,GAAG,EAAE,CAAA;AAC7C,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,CAAA;AAC3C,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,CAAA;AAC3C,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,CAAA;AAC3C,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,CAAA;AAC3C,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,CAAA;AAC3C,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,EAAE,IAAI,IAAI,CAAC,GAAG,EAAE,CAAA"}

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

@@ -1,5 +1,5 @@
 import { ethers } from 'ethers';
-import { BytesBuilder, BytesIter } from '@1inch/byte-utils';
+import { BytesIter } from '@1inch/byte-utils';
 import assert from 'assert';
 import { isHexBytes } from '../../validations';
 import { add0x, trim0x } from '../../utils';
@@ -20,55 +20,47 @@ export class AuctionDetails {
         assert(this.duration <= UINT_24_MAX);
         assert(this.initialRateBump <= UINT_24_MAX);
     }
-    static decodeFrom(iter) {
+    static decode(data) {
+        assert(isHexBytes(data), 'Invalid auction details data');
+        const iter = 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) {
-        assert(isHexBytes(data), 'Invalid auction details data');
-        const iter = BytesIter.BigInt(data);
-        return AuctionDetails.decodeFrom(iter);
-    }
     static fromExtension(extension) {
         return AuctionDetails.decode(add0x(extension.makingAmountData.slice(42)));
     }
     encode() {
-        let details = ethers.solidityPacked(['uint24', 'uint32', 'uint32', 'uint24', 'uint24', 'uint8'], [
+        let details = 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 += trim0x(ethers.solidityPacked(['uint24', 'uint16'], [this.points[i].coefficient, this.points[i].delay]));
         }
         return details;
     }
-    encodeInto(builder = new BytesBuilder()) {
-        return builder.addBytes(this.encode());
-    }
 }
 //# sourceMappingURL=auction-details.js.map

package/dist/esm/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/esm/fusion-order/cancellation-auction.js

@@ -0,0 +1,15 @@
+import { UINT_32_MAX, UINT_16_MAX } from '@1inch/byte-utils';
+import assert from 'assert';
+export class CancellationAuction {
+    constructor(duration, maxRewardBps) {
+        this.duration = duration;
+        this.maxRewardBps = maxRewardBps;
+        assert(duration <= UINT_32_MAX, 'max cancellation auction duration must be <= UINT_32_MAX');
+        assert(maxRewardBps <= UINT_16_MAX, 'max cancellation auction maxRewardBps must be <= UINT_16_MAX');
+    }
+    build() {
+        return (this.duration << 16n) | this.maxRewardBps;
+    }
+}
+CancellationAuction.ZERO = new CancellationAuction(0n, 0n);
+//# sourceMappingURL=cancellation-auction.js.map

package/dist/esm/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,OAAO,EAAC,WAAW,EAAE,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC1D,OAAO,MAAM,MAAM,QAAQ,CAAA;AAE3B,MAAM,OAAO,mBAAmB;IAG5B,YACoB,QAAgB,EAYhB,YAAoB;QAZpB,aAAQ,GAAR,QAAQ,CAAQ;QAYhB,iBAAY,GAAZ,YAAY,CAAQ;QAEpC,MAAM,CACF,QAAQ,IAAI,WAAW,EACvB,0DAA0D,CAC7D,CAAA;QAED,MAAM,CACF,YAAY,IAAI,WAAW,EAC3B,8DAA8D,CACjE,CAAA;IACL,CAAC;IAEM,KAAK;QACR,OAAO,CAAC,IAAI,CAAC,QAAQ,IAAI,GAAG,CAAC,GAAG,IAAI,CAAC,YAAY,CAAA;IACrD,CAAC;;AA9BM,wBAAI,GAAG,IAAI,mBAAmB,CAAC,EAAE,EAAE,EAAE,CAAC,CAAA"}

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

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

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

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

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

@@ -1,15 +1,22 @@
-import { Address, Extension, ExtensionBuilder, Interaction, Bps, mulDiv, Rounding, FeeTakerExt } from '@1inch/limit-order-sdk';
-import { BN, BytesBuilder, BytesIter } from '@1inch/byte-utils';
+import { Address, Extension, ExtensionBuilder, Interaction } from '@1inch/limit-order-sdk';
 import assert from 'assert';
 import { AuctionDetails } from './auction-details';
-import { Whitelist } from './whitelist/whitelist';
-import { add0x } from '../utils';
+import { SettlementPostInteractionData } from './settlement-post-interaction-data';
 export 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 ExtensionBuilder();
+        const detailsBytes = this.auctionDetails.encode();
+        this.builder
+            .withMakingAmountData(this.address, detailsBytes)
+            .withTakingAmountData(this.address, detailsBytes)
+            .withPostInteraction(new Interaction(this.address, this.postInteractionData.encode()));
+        if (makerPermit) {
+            this.builder.withMakerPermit(makerPermit.target, makerPermit.data);
+        }
     }
     static decode(bytes) {
         const extension = Extension.decode(bytes);
@@ -19,141 +26,15 @@ export class FusionExtension {
         const settlementContract = Address.fromFirstBytes(extension.makingAmountData);
         assert(Address.fromFirstBytes(extension.takingAmountData).equal(settlementContract) &&
             Address.fromFirstBytes(extension.postInteraction).equal(settlementContract), 'Invalid extension, all calls should be to the same address');
-        assert(extension.takingAmountData == extension.makingAmountData, 'Invalid extension, taking amount data must be equal to making amount data');
-        const interactionBytes = BytesIter.HexString(extension.postInteraction);
-        interactionBytes.nextUint160();
-        const flags = BN.fromHex(interactionBytes.nextUint8());
-        const integratorFeeRecipient = new Address(interactionBytes.nextUint160());
-        const protocolFeeRecipient = new Address(interactionBytes.nextUint160());
-        const customReceiver = flags.getBit(FusionExtension.CUSTOM_RECEIVER_FLAG_BIT)
-            ? new Address(interactionBytes.nextUint160())
-            : undefined;
-        const interactionData = parseAmountData(interactionBytes);
-        const whitelist = Whitelist.decodeFrom(interactionBytes);
-        const amountBytes = BytesIter.HexString(extension.makingAmountData);
-        amountBytes.nextUint160();
-        const auctionDetails = AuctionDetails.decodeFrom(amountBytes);
-        const amountData = parseAmountData(amountBytes);
-        const whitelistAddressLength = Number(amountBytes.nextUint8());
-        assert(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 = AuctionDetails.fromExtension(extension);
+        const postInteractionData = SettlementPostInteractionData.fromExtension(extension);
+        const permit = extension.hasMakerPermit
             ? Interaction.decode(extension.makerPermit)
             : undefined;
-        assert(amountData.fees.integratorFee.value ===
-            interactionData.fees.integratorFee.value, `invalid extension: integrator fee must be same in interaction data and in amount data`);
-        assert(amountData.fees.resolverFee.value ===
-            interactionData.fees.resolverFee.value, `invalid extension: resolver fee must be same in interaction data and in amount data`);
-        assert(amountData.fees.whitelistDiscount.equal(interactionData.fees.whitelistDiscount), `invalid extension: whitelistDiscount must be same in interaction data and in amount data`);
-        assert(amountData.fees.integratorShare.value ===
-            interactionData.fees.integratorShare.value, `invalid extension: integrator share must be same in interaction data and in amount data`);
-        assert(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 FeeTakerExt.Fees(interactionData.fees.resolverFee.isZero()
-            ? FeeTakerExt.ResolverFee.ZERO
-            : new FeeTakerExt.ResolverFee(protocolFeeRecipient, interactionData.fees.resolverFee, interactionData.fees.whitelistDiscount), interactionData.fees.integratorFee.isZero()
-            ? FeeTakerExt.IntegratorFee.ZERO
-            : new 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 ExtensionBuilder()
-            .withMakingAmountData(this.address, amountData)
-            .withTakingAmountData(this.address, amountData)
-            .withPostInteraction(new 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 || Address.ZERO_ADDRESS;
-        const flags = new BN(0n).setBit(FusionExtension.CUSTOM_RECEIVER_FLAG_BIT, Boolean(!customReceiver.isZero()));
-        const integratorReceiver = this.extra?.fees?.integrator.integrator || Address.ZERO_ADDRESS;
-        const protocolReceiver = this.extra?.fees?.protocol || Address.ZERO_ADDRESS;
-        const builder = new BytesBuilder()
-            .addUint8(flags)
-            .addAddress(integratorReceiver.toString())
-            .addAddress(protocolReceiver.toString());
-        if (!customReceiver.isZero()) {
-            builder.addAddress(customReceiver.toString());
-        }
-        builder.addBytes(this.buildAmountGetterData(false));
-        return builder.asHex();
+        return this.builder.build();
     }
-    buildAmountGetterData(forAmountGetters) {
-        const builder = new BytesBuilder();
-        if (forAmountGetters) {
-            this.auctionDetails.encodeInto(builder);
-        }
-        const integrator = {
-            fee: this.extra?.fees?.integrator.fee.toFraction(FeeTakerExt.Fees.BASE_1E5) || 0,
-            share: this.extra?.fees?.integrator.share.toFraction(FeeTakerExt.Fees.BASE_1E2) || 0
-        };
-        const resolverFee = this.extra?.fees?.resolver.fee.toFraction(FeeTakerExt.Fees.BASE_1E5) || 0;
-        const whitelistDiscount = this.extra?.fees?.resolver.whitelistDiscount || Bps.ZERO;
-        builder
-            .addUint16(BigInt(integrator.fee))
-            .addUint8(BigInt(integrator.share))
-            .addUint16(BigInt(resolverFee))
-            .addUint8(BigInt(Number(FeeTakerExt.Fees.BASE_1E2) -
-            whitelistDiscount.toFraction(FeeTakerExt.Fees.BASE_1E2)));
-        if (forAmountGetters) {
-            builder.addUint8(BigInt(this.whitelist.whitelist.length));
-            this.whitelist.whitelist.forEach((i) => {
-                builder.addBytes(add0x(i.addressHalf));
-            });
-        }
-        else {
-            this.whitelist.encodeInto(builder);
-        }
-        return builder.asHex();
-    }
-    getFeesForTaker(taker) {
-        const whitelistDiscount = this.extra?.fees?.resolver.whitelistDiscount.toFraction(FeeTakerExt.Fees.BASE_1E2) || 0;
-        const discountNumerator = this.whitelist.isWhitelisted(taker)
-            ? (Number(FeeTakerExt.Fees.BASE_1E2) - whitelistDiscount) /
-                Number(FeeTakerExt.Fees.BASE_1E2)
-            : 1;
-        const resolverFee = discountNumerator *
-            (this.extra?.fees?.resolver.fee.toFraction(FeeTakerExt.Fees.BASE_1E5) || 0);
-        const resolverFeeBN = BigInt(resolverFee);
-        const integratorFeeBN = BigInt(this.extra?.fees?.integrator.fee.toFraction(FeeTakerExt.Fees.BASE_1E5) || 0);
-        return {
-            resolverFee: resolverFeeBN,
-            integratorFee: integratorFeeBN
-        };
-    }
-    getTakingAmountWithFee(taker, orderTakingAmount) {
-        const fees = this.getFeesForTaker(taker);
-        return mulDiv(orderTakingAmount, FeeTakerExt.Fees.BASE_1E5 + fees.resolverFee + fees.integratorFee, FeeTakerExt.Fees.BASE_1E5, Rounding.Ceil);
-    }
-}
-FusionExtension.CUSTOM_RECEIVER_FLAG_BIT = 0n;
-function parseAmountData(iter) {
-    const fees = {
-        integratorFee: Bps.fromFraction(Number(iter.nextUint16()), FeeTakerExt.Fees.BASE_1E5),
-        integratorShare: Bps.fromFraction(Number(iter.nextUint8()), FeeTakerExt.Fees.BASE_1E2),
-        resolverFee: Bps.fromFraction(Number(iter.nextUint16()), FeeTakerExt.Fees.BASE_1E5),
-        whitelistDiscount: Bps.fromFraction(Number(FeeTakerExt.Fees.BASE_1E2) - Number(iter.nextUint8()), FeeTakerExt.Fees.BASE_1E2)
-    };
-    return {
-        fees
-    };
 }
 //# sourceMappingURL=fusion-extension.js.map

package/dist/esm/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,OAAO,EACH,OAAO,EACP,SAAS,EACT,gBAAgB,EAChB,WAAW,EACd,MAAM,wBAAwB,CAAA;AAC/B,OAAO,MAAM,MAAM,QAAQ,CAAA;AAE3B,OAAO,EAAC,cAAc,EAAC,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAC,6BAA6B,EAAC,MAAM,oCAAoC,CAAA;AAEhF,MAAM,OAAO,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,gBAAgB,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,WAAW,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,SAAS,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,OAAO,CAAC,cAAc,CAC7C,SAAS,CAAC,gBAAgB,CAC7B,CAAA;QAED,MAAM,CACF,OAAO,CAAC,cAAc,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC,KAAK,CACpD,kBAAkB,CACrB;YACG,OAAO,CAAC,cAAc,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC,KAAK,CACnD,kBAAkB,CACrB,EACL,4DAA4D,CAC/D,CAAA;QAED,MAAM,cAAc,GAAG,cAAc,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;QAE9D,MAAM,mBAAmB,GACrB,6BAA6B,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;QAE1D,MAAM,MAAM,GAAG,SAAS,CAAC,cAAc;YACnC,CAAC,CAAC,WAAW,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"}

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

@@ -1,20 +1,17 @@
 import { Address, Interaction, LimitOrder, MakerTraits } from '@1inch/limit-order-sdk';
 import assert from 'assert';
 import { FusionExtension } from './fusion-extension';
+import { AuctionDetails } from './auction-details';
+import { SettlementPostInteractionData } from './settlement-post-interaction-data';
 import { injectTrackCode } from './source-track';
-import { AuctionCalculator } from '../amount-calculator/auction-calculator';
+import { AuctionCalculator } from '../auction-calculator';
 import { ZX } from '../constants';
 import { calcTakingAmount } from '../utils/amounts';
 import { now } from '../utils/time';
-import { AmountCalculator } from '../amount-calculator/amount-calculator';
 export class FusionOrder {
-    constructor(settlementExtensionContract, orderInfo, auctionDetails, whitelist, extra = FusionOrder.defaultExtra, extension = new FusionExtension(settlementExtensionContract, auctionDetails, whitelist, {
-        makerPermit: extra.permit
-            ? new Interaction(orderInfo.makerAsset, extra.permit)
-            : undefined,
-        customReceiver: orderInfo.receiver,
-        fees: extra?.fees
-    })) {
+    constructor(settlementExtensionContract, orderInfo, auctionDetails, postInteractionData, extra = FusionOrder.defaultExtra, extension = new FusionExtension(settlementExtensionContract, auctionDetails, postInteractionData, extra.permit
+        ? new Interaction(orderInfo.makerAsset, extra.permit)
+        : undefined)) {
         this.settlementExtensionContract = settlementExtensionContract;
         const allowPartialFills = extra.allowPartialFills ??
             FusionOrder.defaultExtra.allowPartialFills;
@@ -44,7 +41,7 @@ export 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();
@@ -52,11 +49,17 @@ export class FusionOrder {
         const saltWithInjectedTrackCode = orderInfo.salt
             ? salt
             : 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 LimitOrder({
             ...orderInfo,
             receiver,
             salt: saltWithInjectedTrackCode
-        }, makerTraits, builtExtension);
+        }, makerTraits, builtExtension, { optimizeReceiverAddress });
         this.fusionExtension = extension;
     }
     get extension() {
@@ -77,13 +80,6 @@ export 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;
     }
@@ -113,7 +109,28 @@ export 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, SettlementPostInteractionData.new({
+            bankFee: details.fees?.bankFee || 0n,
+            integratorFee: details.fees?.integratorFee,
+            whitelist: details.whitelist,
+            resolvingStartTime: details.resolvingStartTime ?? now(),
+            customReceiver: orderInfo.receiver
+        }), extra);
+    }
+    static isNativeOrder(chainId, ethOrderFactory, order, signature) {
+        return LimitOrder.isNativeOrder(chainId, ethOrderFactory, order, signature);
+    }
+    static fromNative(chainId, ethOrdersFactory, settlementExtension, orderInfo, details, extra) {
+        const _orderInfo = {
+            ...orderInfo,
+            makerAsset: 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 = LimitOrder.fromNative(chainId, ethOrdersFactory, { ..._orderInfo, salt: _order.salt }, _order.inner.makerTraits, _order.inner.extension);
+        return _order;
     }
     static fromDataAndExtension(order, extension) {
         const settlementContract = Address.fromFirstBytes(extension.makingAmountData);
@@ -122,7 +139,8 @@ export class FusionOrder {
         const makerTraits = new MakerTraits(BigInt(order.makerTraits));
         assert(!makerTraits.isPrivate(), 'fusion order can not be private');
         assert(makerTraits.hasPostInteraction(), 'post-interaction must be enabled');
-        const { auctionDetails, whitelist, extra } = FusionExtension.fromExtension(extension);
+        const auctionDetails = AuctionDetails.fromExtension(extension);
+        const postInteractionData = SettlementPostInteractionData.fromExtension(extension);
         const deadline = makerTraits.expiration();
         const orderExpirationDelay = deadline === null
             ? undefined
@@ -130,12 +148,12 @@ export class FusionOrder {
         return new FusionOrder(settlementContract, {
             salt: BigInt(order.salt) >> 160n,
             maker: new Address(order.maker),
-            receiver: extra?.customReceiver,
+            receiver: new Address(order.receiver),
             makerAsset: new Address(order.makerAsset),
             takerAsset: new Address(order.takerAsset),
             makingAmount: BigInt(order.makingAmount),
             takingAmount: BigInt(order.takingAmount)
-        }, auctionDetails, whitelist, {
+        }, auctionDetails, postInteractionData, {
             allowMultipleFills: makerTraits.isMultipleFillsAllowed(),
             allowPartialFills: makerTraits.isPartialFillAllowed(),
             enablePermit2: makerTraits.isPermit2(),
@@ -145,9 +163,15 @@ export class FusionOrder {
                 : 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();
     }
@@ -158,53 +182,40 @@ export class FusionOrder {
         return this.inner.getTypedData(chainId);
     }
     getCalculator() {
-        return AuctionCalculator.fromAuctionData(this.fusionExtension.auctionDetails);
-    }
-    calcTakingAmount(taker, makingAmount, time, blockBaseFee = 0n) {
-        const takingAmount = calcTakingAmount(makingAmount, this.makingAmount, this.takingAmount);
-        return this.getAmountCalculator().getRequiredTakingAmount(taker, takingAmount, time, blockBaseFee);
-    }
-    getUserReceiveAmount(taker, makingAmount, time, blockBaseFee = 0n) {
-        const takingAmount = calcTakingAmount(makingAmount, this.makingAmount, this.takingAmount);
-        return this.getAmountCalculator().getUserTakingAmountAmount(taker, takingAmount, time, blockBaseFee);
+        return AuctionCalculator.fromAuctionData(this.fusionExtension.postInteractionData, this.fusionExtension.auctionDetails);
     }
-    getResolverFee(taker, time, blockBaseFee = 0n, makingAmount = this.makingAmount) {
+    calcTakingAmount(makingAmount, time, blockBaseFee = 0n) {
         const takingAmount = 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 = 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 = 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 = 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 = now()) {
-        return this.fusionExtension.whitelist.isExclusivityPeriod(time);
-    }
-    getAmountCalculator() {
-        return AmountCalculator.fromExtension(this.fusionExtension);
+        return this.fusionExtension.postInteractionData.isExclusivityPeriod(time);
     }
 }
+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