fix(fusion-order): accept chainId in .getTypedData (#71)

1inch · Mar 20, 2024 · d251a26 · d251a26
1 parent e67f509
commit d251a26
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 15 deletions.
diff --git a/src/api/quoter/quote/quote.ts b/src/api/quoter/quote/quote.ts
@@ -61,11 +61,13 @@ export class Quote {
         this.settlementAddress = new Address(response.settlementAddress)
     }
 
-    createFusionOrder(paramsData: FusionOrderParamsData): FusionOrder {
+    createFusionOrder(
+        paramsData: Omit<FusionOrderParamsData, 'permit'>
+    ): FusionOrder {
         const params = FusionOrderParams.new({
             preset: paramsData?.preset || this.recommendedPreset,
             receiver: paramsData?.receiver,
-            permit: paramsData?.permit,
+            permit: this.params.permit,
             nonce: paramsData?.nonce
         })
 

diff --git a/src/fusion-order/fusion-extension.ts b/src/fusion-order/fusion-extension.ts
@@ -10,14 +10,14 @@ import {SettlementPostInteractionData} from './settlement-post-interaction-data'
 export class FusionExtension extends ExtensionBuilder {
     constructor(
         public readonly address: Address,
-        public readonly details: AuctionDetails,
+        public readonly auctionDetails: AuctionDetails,
         public readonly postInteractionData: SettlementPostInteractionData
     ) {
         super()
     }
 
     public build(): Extension {
-        const detailsBytes = this.details.encode()
+        const detailsBytes = this.auctionDetails.encode()
 
         this.withMakingAmountData(this.address, detailsBytes)
             .withTakingAmountData(this.address, detailsBytes)

diff --git a/src/fusion-order/fusion-order.ts b/src/fusion-order/fusion-order.ts
@@ -172,6 +172,22 @@ export class FusionOrder {
         return this.inner.makerTraits.expiration() || 0n
     }
 
+    /**
+     * Timestamp in sec
+     */
+    get auctionStartTime(): bigint {
+        return this.fusionExtension.auctionDetails.startTime
+    }
+
+    /**
+     * Timestamp in sec
+     */
+    get auctionEndTime(): bigint {
+        const {startTime, duration} = this.fusionExtension.auctionDetails
+
+        return startTime + duration
+    }
+
     static new(
         /**
          * Fusion extension address
@@ -302,14 +318,14 @@ export class FusionOrder {
         return this.inner.getOrderHash(chainId)
     }
 
-    public getTypedData(domain = getLimitOrderV4Domain(1)): EIP712TypedData {
-        return this.inner.getTypedData(domain)
+    public getTypedData(chainId: number): EIP712TypedData {
+        return this.inner.getTypedData(getLimitOrderV4Domain(chainId))
     }
 
     public getCalculator(): AuctionCalculator {
         return AuctionCalculator.fromAuctionData(
             this.fusionExtension.postInteractionData,
-            this.fusionExtension.details
+            this.fusionExtension.auctionDetails
         )
     }
 

diff --git a/src/sdk/sdk.ts b/src/sdk/sdk.ts
@@ -1,8 +1,4 @@
-import {
-    Address,
-    getLimitOrderV4Domain,
-    MakerTraits
-} from '@1inch/limit-order-sdk'
+import {Address, MakerTraits} from '@1inch/limit-order-sdk'
 import {
     FusionSDKConfigParams,
     OrderInfo,
@@ -118,7 +114,6 @@ export class FusionSDK {
                 : undefined,
             preset: params.preset,
             nonce: params.nonce,
-            permit: params.permit,
             takingFeeReceiver: params.fee?.takingFeeReceiver,
             allowPartialFills: params.allowPartialFills,
             allowMultipleFills: params.allowMultipleFills
@@ -138,11 +133,10 @@ export class FusionSDK {
         }
 
         const orderStruct = order.build()
-        const domain = getLimitOrderV4Domain(this.config.network)
 
         const signature = await this.config.blockchainProvider.signTypedData(
             orderStruct.maker,
-            order.getTypedData(domain)
+            order.getTypedData(this.config.network)
         )
 
         const relayerRequest = RelayerRequest.new({