fix(limit-order): correct salt check (#28)

1inch · Apr 15, 2024 · 49b9def · 49b9def
1 parent 6ed5d66
commit 49b9def
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/src/limit-order/extension-builder.ts b/src/limit-order/extension-builder.ts
@@ -97,6 +97,8 @@ export class ExtensionBuilder implements IExtensionBuilder {
     public withCustomData(data: string): this {
         assert(isHexString(data), 'Custom data must be valid hex string')
 
+        this.customData = data
+
         return this
     }
 

diff --git a/src/limit-order/limit-order.spec.ts b/src/limit-order/limit-order.spec.ts
@@ -61,6 +61,8 @@ describe('Limit Order', () => {
             ext
         )
 
-        expect(LimitOrder.fromCalldata(order.toCalldata())).toEqual(order)
+        expect(LimitOrder.fromDataAndExtension(order.build(), ext)).toEqual(
+            order
+        )
     })
 })
diff --git a/src/limit-order/limit-order.ts b/src/limit-order/limit-order.ts
@@ -96,8 +96,9 @@ export class LimitOrder {
         }
 
         const hash = salt & UINT_160_MAX
+        const expectedHash = extension.keccak256() & UINT_160_MAX
         assert(
-            hash === extension.keccak256(),
+            hash === expectedHash,
             'invalid salt: lowest 160 bits should be extension hash'
         )
-Original file line number
+Diff line change
@@ Expand Up / @@ -61,6 +61,8 @@ describe('Limit Order', () => { @@
                 ext
             )
-            expect(LimitOrder.fromCalldata(order.toCalldata())).toEqual(order)
+            expect(LimitOrder.fromDataAndExtension(order.build(), ext)).toEqual(
+                order
+            )
         })
     })