fix(fusion-extension): correct permit decoding (#88)

1inch · Apr 12, 2024 · 48abf9e · 48abf9e
1 parent 8a9e39d
commit 48abf9e
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 18 deletions.
diff --git a/package.json b/package.json
@@ -28,7 +28,7 @@
     },
     "dependencies": {
         "@1inch/byte-utils": "2.2.1",
-        "@1inch/limit-order-sdk": "^4.8.3",
+        "@1inch/limit-order-sdk": "^4.8.4",
         "@metamask/eth-sig-util": "^5.1.0",
         "bn.js": "^5.2.1",
         "ethers": "6.11.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/fusion-order/fusion-extension.spec.ts b/src/fusion-order/fusion-extension.spec.ts
@@ -51,4 +51,55 @@ describe('FusionExtension', () => {
         const fusionExtension = FusionExtension.decode(order.extension.encode())
         expect(fusionExtension).toStrictEqual(order.fusionExtension)
     })
+
+    it('should decode with permit', () => {
+        const extensionContract = new Address(
+            '0x8273f37417da37c4a6c3995e82cf442f87a25d9c'
+        )
+
+        const order = FusionOrder.new(
+            extensionContract,
+            {
+                makerAsset: new Address(
+                    '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'
+                ),
+                takerAsset: new Address(
+                    '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48'
+                ),
+                makingAmount: 1000000000000000000n,
+                takingAmount: 1420000000n,
+                maker: new Address(
+                    '0x00000000219ab540356cbb839cbe05303d7705fa'
+                ),
+                salt: 10n
+            },
+            {
+                auction: new AuctionDetails({
+                    duration: 180n,
+                    startTime: 1673548149n,
+                    initialRateBump: 50000,
+                    points: [
+                        {
+                            coefficient: 20000,
+                            delay: 12
+                        }
+                    ]
+                }),
+                whitelist: [
+                    {
+                        address: new Address(
+                            '0x00000000219ab540356cbb839cbe05303d7705fa'
+                        ),
+                        allowFrom: 0n
+                    }
+                ],
+                resolvingStartTime: 1673548139n
+            },
+            {
+                permit: '0xdeadbeef'
+            }
+        )
+        const fusionExtension = FusionExtension.decode(order.extension.encode())
+        expect(fusionExtension).toStrictEqual(order.fusionExtension)
+    })
 })
diff --git a/src/fusion-order/fusion-extension.ts b/src/fusion-order/fusion-extension.ts
@@ -15,7 +15,8 @@ export class FusionExtension {
     constructor(
         public readonly address: Address,
         public readonly auctionDetails: AuctionDetails,
-        public readonly postInteractionData: SettlementPostInteractionData
+        public readonly postInteractionData: SettlementPostInteractionData,
+        public readonly makerPermit?: Interaction
     ) {
         const detailsBytes = this.auctionDetails.encode()
 
@@ -25,6 +26,10 @@ export class FusionExtension {
             .withPostInteraction(
                 new Interaction(this.address, this.postInteractionData.encode())
             )
+
+        if (makerPermit) {
+            this.builder.withMakerPermit(makerPermit.target, makerPermit.data)
+        }
     }
 
     /**
@@ -54,19 +59,18 @@ export class FusionExtension {
         const postInteractionData =
             SettlementPostInteractionData.fromExtension(extension)
 
+        const permit = extension.hasMakerPermit
+            ? Interaction.decode(extension.makerPermit)
+            : undefined
+
         return new FusionExtension(
             settlementContract,
             auctionDetails,
-            postInteractionData
+            postInteractionData,
+            permit
         )
     }
 
-    withMakerPermit(tokenFrom: Address, permitData: string): this {
-        this.builder.withMakerPermit(tokenFrom, permitData)
-
-        return this
-    }
-
     public build(): Extension {
         return this.builder.build()
     }

diff --git a/src/fusion-order/fusion-order.ts b/src/fusion-order/fusion-order.ts
@@ -2,6 +2,7 @@ import {
     Address,
     EIP712TypedData,
     Extension,
+    Interaction,
     LimitOrder,
     LimitOrderV4Struct,
     MakerTraits,
@@ -127,13 +128,10 @@ export class FusionOrder {
         const extension = new FusionExtension(
             settlementExtensionContract,
             auctionDetails,
-            postInteractionData
+            postInteractionData,
+            permit ? new Interaction(orderInfo.makerAsset, permit) : undefined
         )
 
-        if (permit) {
-            extension.withMakerPermit(orderInfo.makerAsset, permit)
-        }
-
         const builtExtension = extension.build()
 
         this.inner = new LimitOrder(