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

package/dist/api/orders/types.d.ts

@@ -18,6 +18,7 @@ export type ActiveOrder = {
     auctionEndDate: string;
     remainingMakerAmount: string;
     order: LimitOrderV4Struct;
+    extension: string;
 };
 export type ActiveOrdersResponse = PaginationOutput<ActiveOrder>;
 export type OrderStatusParams = {
@@ -42,6 +43,7 @@ export type Fill = {
 export type OrderStatusResponse = {
     status: OrderStatus;
     order: LimitOrderV4Struct;
+    extension: string;
     points: AuctionPoint[] | null;
     fills: Fill[];
     auctionStartDate: number;

package/dist/api/orders/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/api/orders/types.ts"],"names":[],"mappings":";;;AA+BA,IAAY,WAUX;AAVD,WAAY,WAAW;IACnB,kCAAmB,CAAA;IACnB,gCAAiB,CAAA;IACjB,iDAAkC,CAAA;IAClC,8EAA+D,CAAA;IAC/D,kCAAmB,CAAA;IACnB,mDAAoC,CAAA;IACpC,2CAA4B,CAAA;IAC5B,sCAAuB,CAAA;IACvB,qDAAsC,CAAA;AAC1C,CAAC,EAVW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAUtB"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/api/orders/types.ts"],"names":[],"mappings":";;;AAgCA,IAAY,WAUX;AAVD,WAAY,WAAW;IACnB,kCAAmB,CAAA;IACnB,gCAAiB,CAAA;IACjB,iDAAkC,CAAA;IAClC,8EAA+D,CAAA;IAC/D,kCAAmB,CAAA;IACnB,mDAAoC,CAAA;IACpC,2CAA4B,CAAA;IAC5B,sCAAuB,CAAA;IACvB,qDAAsC,CAAA;AAC1C,CAAC,EAVW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAUtB"}

package/dist/fusion-order/fusion-extension.d.ts

@@ -1,10 +1,18 @@
-import { Address, Extension, ExtensionBuilder } from '@1inch/limit-order-sdk';
+import { Address, Extension } from '@1inch/limit-order-sdk';
 import { AuctionDetails } from './auction-details';
 import { SettlementPostInteractionData } from './settlement-post-interaction-data';
-export declare class FusionExtension extends ExtensionBuilder {
+export declare class FusionExtension {
     readonly address: Address;
     readonly auctionDetails: AuctionDetails;
     readonly postInteractionData: SettlementPostInteractionData;
+    private readonly builder;
     constructor(address: Address, auctionDetails: AuctionDetails, postInteractionData: SettlementPostInteractionData);
+    /**
+     * Create `FusionExtension` from bytes
+     *
+     * @param bytes 0x prefixed bytes
+     */
+    static decode(bytes: string): FusionExtension;
+    withMakerPermit(tokenFrom: Address, permitData: string): this;
     build(): Extension;
 }

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

@@ -1,20 +1,45 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FusionExtension = void 0;
 const limit_order_sdk_1 = require("@1inch/limit-order-sdk");
-class FusionExtension extends limit_order_sdk_1.ExtensionBuilder {
+const assert_1 = __importDefault(require("assert"));
+const auction_details_1 = require("./auction-details");
+const settlement_post_interaction_data_1 = require("./settlement-post-interaction-data");
+class FusionExtension {
     constructor(address, auctionDetails, postInteractionData) {
-        super();
         this.address = address;
         this.auctionDetails = auctionDetails;
         this.postInteractionData = postInteractionData;
-    }
-    build() {
+        this.builder = new limit_order_sdk_1.ExtensionBuilder();
         const detailsBytes = this.auctionDetails.encode();
-        this.withMakingAmountData(this.address, detailsBytes)
+        this.builder
+            .withMakingAmountData(this.address, detailsBytes)
             .withTakingAmountData(this.address, detailsBytes)
             .withPostInteraction(new limit_order_sdk_1.Interaction(this.address, this.postInteractionData.encode()));
-        return super.build();
+    }
+    /**
+     * Create `FusionExtension` from bytes
+     *
+     * @param bytes 0x prefixed bytes
+     */
+    static decode(bytes) {
+        const extension = limit_order_sdk_1.Extension.decode(bytes);
+        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 auctionDetails = auction_details_1.AuctionDetails.fromExtension(extension);
+        const postInteractionData = settlement_post_interaction_data_1.SettlementPostInteractionData.fromExtension(extension);
+        return new FusionExtension(settlementContract, auctionDetails, postInteractionData);
+    }
+    withMakerPermit(tokenFrom, permitData) {
+        this.builder.withMakerPermit(tokenFrom, permitData);
+        return this;
+    }
+    build() {
+        return this.builder.build();
     }
 }
 exports.FusionExtension = FusionExtension;

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

@@ -1 +1 @@
-{"version":3,"file":"fusion-extension.js","sourceRoot":"","sources":["../../src/fusion-order/fusion-extension.ts"],"names":[],"mappings":";;;AAAA,4DAK+B;AAI/B,MAAa,eAAgB,SAAQ,kCAAgB;IACjD,YACoB,OAAgB,EAChB,cAA8B,EAC9B,mBAAkD;QAElE,KAAK,EAAE,CAAA;QAJS,YAAO,GAAP,OAAO,CAAS;QAChB,mBAAc,GAAd,cAAc,CAAgB;QAC9B,wBAAmB,GAAnB,mBAAmB,CAA+B;IAGtE,CAAC;IAEM,KAAK;QACR,MAAM,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAA;QAEjD,IAAI,CAAC,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,OAAO,KAAK,CAAC,KAAK,EAAE,CAAA;IACxB,CAAC;CACJ;AApBD,0CAoBC"}
+{"version":3,"file":"fusion-extension.js","sourceRoot":"","sources":["../../src/fusion-order/fusion-extension.ts"],"names":[],"mappings":";;;;;;AAAA,4DAK+B;AAC/B,oDAA2B;AAE3B,uDAAgD;AAChD,yFAAgF;AAEhF,MAAa,eAAe;IAGxB,YACoB,OAAgB,EAChB,cAA8B,EAC9B,mBAAkD;QAFlD,YAAO,GAAP,OAAO,CAAS;QAChB,mBAAc,GAAd,cAAc,CAAgB;QAC9B,wBAAmB,GAAnB,mBAAmB,CAA+B;QALrD,YAAO,GAAG,IAAI,kCAAgB,EAAE,CAAA;QAO7C,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;IACT,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,MAAM,CAAC,KAAa;QAC9B,MAAM,SAAS,GAAG,2BAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAEzC,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,OAAO,IAAI,eAAe,CACtB,kBAAkB,EAClB,cAAc,EACd,mBAAmB,CACtB,CAAA;IACL,CAAC;IAED,eAAe,CAAC,SAAkB,EAAE,UAAkB;QAClD,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,SAAS,EAAE,UAAU,CAAC,CAAA;QAEnD,OAAO,IAAI,CAAA;IACf,CAAC;IAEM,KAAK;QACR,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAA;IAC/B,CAAC;CACJ;AA7DD,0CA6DC"}

package/dist/fusion-order/fusion-extension.spec.d.ts

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const limit_order_sdk_1 = require("@1inch/limit-order-sdk");
+const fusion_order_1 = require("./fusion-order");
+const auction_details_1 = require("./auction-details");
+const fusion_extension_1 = require("./fusion-extension");
+describe('FusionExtension', () => {
+    it('should decode', () => {
+        const extensionContract = new limit_order_sdk_1.Address('0x8273f37417da37c4a6c3995e82cf442f87a25d9c');
+        const order = fusion_order_1.FusionOrder.new(extensionContract, {
+            makerAsset: new limit_order_sdk_1.Address('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'),
+            takerAsset: new limit_order_sdk_1.Address('0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48'),
+            makingAmount: 1000000000000000000n,
+            takingAmount: 1420000000n,
+            maker: new limit_order_sdk_1.Address('0x00000000219ab540356cbb839cbe05303d7705fa'),
+            salt: 10n
+        }, {
+            auction: new auction_details_1.AuctionDetails({
+                duration: 180n,
+                startTime: 1673548149n,
+                initialRateBump: 50000,
+                points: [
+                    {
+                        coefficient: 20000,
+                        delay: 12
+                    }
+                ]
+            }),
+            whitelist: [
+                {
+                    address: new limit_order_sdk_1.Address('0x00000000219ab540356cbb839cbe05303d7705fa'),
+                    allowFrom: 0n
+                }
+            ],
+            resolvingStartTime: 1673548139n
+        });
+        const fusionExtension = fusion_extension_1.FusionExtension.decode(order.extension.encode());
+        expect(fusionExtension).toStrictEqual(order.fusionExtension);
+    });
+});
+//# sourceMappingURL=fusion-extension.spec.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"fusion-extension.spec.js","sourceRoot":"","sources":["../../src/fusion-order/fusion-extension.spec.ts"],"names":[],"mappings":";;AAAA,4DAA8C;AAC9C,iDAA0C;AAC1C,uDAAgD;AAChD,yDAAkD;AAElD,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC7B,EAAE,CAAC,eAAe,EAAE,GAAG,EAAE;QACrB,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;QACD,MAAM,eAAe,GAAG,kCAAe,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAA;QACxE,MAAM,CAAC,eAAe,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,eAAe,CAAC,CAAA;IAChE,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1inch/fusion-sdk",
-  "version": "1.0.1-rc.31",
+  "version": "1.0.1-rc.32",
   "description": "1inch Fusion Mode SDK",
   "author": "@1inch",
   "private": false,
@@ -17,8 +17,8 @@
     "url": "ssh://git@github.com:1inch/fusion-sdk.git"
   },
   "dependencies": {
-    "@1inch/byte-utils": "2.2.0",
-    "@1inch/limit-order-sdk": "^4.8.2",
+    "@1inch/byte-utils": "2.2.1",
+    "@1inch/limit-order-sdk": "^4.8.3",
     "@metamask/eth-sig-util": "^5.1.0",
     "bn.js": "^5.2.1",
     "ethers": "6.11.0",