@1inch/fusion-sdk 2.4.7-rc.0 → 2.4.7-rc.2

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

@@ -553,6 +553,29 @@ var FusionOrder = /*#__PURE__*/ function() {
                 return new _permittransferfrom.PermitTransferFrom(this.makerAsset, this.makingAmount, spender, (0, _limitordersdk.randBigInt)(_byteutils.UINT_256_MAX), this.deadline);
             }
         },
+        {
+            key: "restoreMakerAssetSuffix",
+            value: /**
+     * Restores the original `makerAssetSuffix` that `FusionExtension.build()` does not preserve.
+     * Recomputes the salt to match the patched extension hash.
+     */ function restoreMakerAssetSuffix(makerAssetSuffix) {
+                var patchedExtension = new _limitordersdk.Extension(_object_spread_props(_object_spread({}, this.inner.extension), {
+                    makerAssetSuffix: makerAssetSuffix
+                }));
+                var baseSalt = this.inner.salt >> 160n;
+                this.inner = new _limitordersdk.LimitOrder({
+                    maker: this.inner.maker,
+                    makerAsset: this.inner.makerAsset,
+                    takerAsset: this.inner.takerAsset,
+                    makingAmount: this.inner.makingAmount,
+                    takingAmount: this.inner.takingAmount,
+                    receiver: this.inner.receiver,
+                    salt: _limitordersdk.LimitOrder.buildSalt(patchedExtension, baseSalt)
+                }, this.inner.makerTraits, patchedExtension, {
+                    optimizeReceiverAddress: false
+                });
+            }
+        },
         {
             key: "decodeTransferPermitSuffix",
             value: function decodeTransferPermitSuffix() {
@@ -641,6 +664,9 @@ var FusionOrder = /*#__PURE__*/ function() {
                     fees: extra === null || extra === void 0 ? void 0 : extra.fees,
                     optimizeReceiverAddress: true
                 });
+                if (extension.makerAssetSuffix !== _constants.ZX) {
+                    fusionOrder.restoreMakerAssetSuffix(extension.makerAssetSuffix);
+                }
                 (0, _assert.default)(providedSalt === fusionOrder.salt, 'invalid salt for passed extension');
                 return fusionOrder;
             }

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

@@ -534,7 +534,19 @@ describe('FusionOrder Native', function() {
             var orderWithPermit = order.withTransferPermit(permit, fakeSignature);
             expect(orderWithPermit.makerAsset).toEqual(weth);
         });
-        it('should return false for non-permit2 suffix data', function() {
+        it('should round-trip Permit2 order through fromDataAndExtension', function() {
+            var order = baseOrder();
+            var permit = order.createTransferPermit(permit2Proxy);
+            var fakeSignature = '0x' + 'ab'.repeat(65);
+            var orderWithPermit = order.withTransferPermit(permit, fakeSignature);
+            var built = orderWithPermit.build();
+            var rebuilt = _fusionorder.FusionOrder.fromDataAndExtension(built, orderWithPermit.extension);
+            expect(rebuilt.isTransferPermit()).toBe(true);
+            expect(rebuilt.makerAsset).toEqual(orderWithPermit.makerAsset);
+            expect(rebuilt.salt).toEqual(orderWithPermit.salt);
+            expect(rebuilt.build()).toEqual(built);
+        });
+        it('should reject tampered makerAssetSuffix via salt check', function() {
             var order = baseOrder();
             var ext = order.extension;
             var tampered = new _limitordersdk.Extension({
@@ -548,8 +560,9 @@ describe('FusionOrder Native', function() {
                 postInteraction: ext.postInteraction,
                 customData: ext.customData
             });
-            var rebuilt = _fusionorder.FusionOrder.fromDataAndExtension(order.build(), tampered);
-            expect(rebuilt.isTransferPermit()).toBe(false);
+            expect(function() {
+                return _fusionorder.FusionOrder.fromDataAndExtension(order.build(), tampered);
+            }).toThrow('invalid salt for passed extension');
         });
     });
 });

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

@@ -538,6 +538,29 @@ export var FusionOrder = /*#__PURE__*/ function() {
                 return new PermitTransferFrom(this.makerAsset, this.makingAmount, spender, randBigInt(UINT_256_MAX), this.deadline);
             }
         },
+        {
+            key: "restoreMakerAssetSuffix",
+            value: /**
+     * Restores the original `makerAssetSuffix` that `FusionExtension.build()` does not preserve.
+     * Recomputes the salt to match the patched extension hash.
+     */ function restoreMakerAssetSuffix(makerAssetSuffix) {
+                var patchedExtension = new Extension(_object_spread_props(_object_spread({}, this.inner.extension), {
+                    makerAssetSuffix: makerAssetSuffix
+                }));
+                var baseSalt = this.inner.salt >> 160n;
+                this.inner = new LimitOrder({
+                    maker: this.inner.maker,
+                    makerAsset: this.inner.makerAsset,
+                    takerAsset: this.inner.takerAsset,
+                    makingAmount: this.inner.makingAmount,
+                    takingAmount: this.inner.takingAmount,
+                    receiver: this.inner.receiver,
+                    salt: LimitOrder.buildSalt(patchedExtension, baseSalt)
+                }, this.inner.makerTraits, patchedExtension, {
+                    optimizeReceiverAddress: false
+                });
+            }
+        },
         {
             key: "decodeTransferPermitSuffix",
             value: function decodeTransferPermitSuffix() {
@@ -626,6 +649,9 @@ export var FusionOrder = /*#__PURE__*/ function() {
                     fees: extra === null || extra === void 0 ? void 0 : extra.fees,
                     optimizeReceiverAddress: true
                 });
+                if (extension.makerAssetSuffix !== ZX) {
+                    fusionOrder.restoreMakerAssetSuffix(extension.makerAssetSuffix);
+                }
                 assert(providedSalt === fusionOrder.salt, 'invalid salt for passed extension');
                 return fusionOrder;
             }

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

@@ -530,7 +530,19 @@ describe('FusionOrder Native', function() {
             var orderWithPermit = order.withTransferPermit(permit, fakeSignature);
             expect(orderWithPermit.makerAsset).toEqual(weth);
         });
-        it('should return false for non-permit2 suffix data', function() {
+        it('should round-trip Permit2 order through fromDataAndExtension', function() {
+            var order = baseOrder();
+            var permit = order.createTransferPermit(permit2Proxy);
+            var fakeSignature = '0x' + 'ab'.repeat(65);
+            var orderWithPermit = order.withTransferPermit(permit, fakeSignature);
+            var built = orderWithPermit.build();
+            var rebuilt = FusionOrder.fromDataAndExtension(built, orderWithPermit.extension);
+            expect(rebuilt.isTransferPermit()).toBe(true);
+            expect(rebuilt.makerAsset).toEqual(orderWithPermit.makerAsset);
+            expect(rebuilt.salt).toEqual(orderWithPermit.salt);
+            expect(rebuilt.build()).toEqual(built);
+        });
+        it('should reject tampered makerAssetSuffix via salt check', function() {
             var order = baseOrder();
             var ext = order.extension;
             var tampered = new Extension({
@@ -544,8 +556,9 @@ describe('FusionOrder Native', function() {
                 postInteraction: ext.postInteraction,
                 customData: ext.customData
             });
-            var rebuilt = FusionOrder.fromDataAndExtension(order.build(), tampered);
-            expect(rebuilt.isTransferPermit()).toBe(false);
+            expect(function() {
+                return FusionOrder.fromDataAndExtension(order.build(), tampered);
+            }).toThrow('invalid salt for passed extension');
         });
     });
 });

package/dist/esm/package.json

@@ -1 +1 @@
-{"name":"@1inch/fusion-sdk","version":"2.4.7-rc.0","type":"module"}
+{"name":"@1inch/fusion-sdk","version":"2.4.7-rc.2","type":"module"}

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

@@ -55,5 +55,6 @@ export declare class FusionOrder {
     isNative(chainId: number, ethOrderFactory: ProxyFactory, signature: string): boolean;
     nativeSignature(maker: Address): string;
     createTransferPermit(chainIdOrPermit2Proxy: number | Address, permit2Proxy?: Address): PermitTransferFrom;
+    private restoreMakerAssetSuffix;
     private decodeTransferPermitSuffix;
 }