refactor: re-export ChainId from @uniswap/sdk-core

Drop the local enum in lib/util/chain.ts; consumers keep importing from
the same path. Loosen PRIORITY_/HYBRID_ORDER_TARGET_BLOCK_BUFFER from
Record<ChainId, number> to Partial<Record<...>> since sdk-core's enum
has many more chains than x-service supports, and the sentinel-0 entries
for V3-only chains are now unreachable (the validator rejects them
upstream); callers throw if a buffer is missing.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: codyborn

lib/handlers/check-order-status/service.ts

@@ -174,7 +174,7 @@ export class CheckOrderStatusService {
               fillTimeBlocks = fillBlock - order.cosignerData.decayStartBlock;
               break;
             case OrderType.Priority: { // Approximation
-              const orderCreationBlock = order.cosignerData.auctionTargetBlock - PRIORITY_ORDER_TARGET_BLOCK_BUFFER[chainId as ChainId];
+              const orderCreationBlock = order.cosignerData.auctionTargetBlock - (PRIORITY_ORDER_TARGET_BLOCK_BUFFER[chainId as ChainId] ?? 0);
               fillTimeBlocks = fillBlock - orderCreationBlock;
               break;
             }

lib/handlers/constants.ts

@@ -15,13 +15,10 @@ export const DEFAULT_MAX_OPEN_ORDERS = 5
 export const DEFAULT_MAX_OPEN_LIMIT_ORDERS = 100
 export const HIGH_MAX_OPEN_ORDERS = 200
 
-// Chains that register Dutch_V3 only (no priority/hybrid reactor in
-// @uniswap/uniswapx-sdk's REACTOR_ADDRESS_MAPPING) get sentinel-0 entries
-// here to satisfy Record<ChainId, number> typing.
 // OffChainUniswapXOrderValidator.validateReactorAddress rejects
-// priority/hybrid orders for those chainIds before these buffers are
-// consulted, so the values are unreachable in practice.
-export const PRIORITY_ORDER_TARGET_BLOCK_BUFFER: Record<ChainId, number> = {
+// priority/hybrid orders for chains not listed here before these buffers
+// are consulted, so callers can safely treat a missing entry as unreachable.
+export const PRIORITY_ORDER_TARGET_BLOCK_BUFFER: Partial<Record<ChainId, number>> = {
   [ChainId.MAINNET]: 3,
   [ChainId.UNICHAIN]: 4,
   [ChainId.BASE]: 3,
@@ -30,23 +27,9 @@ export const PRIORITY_ORDER_TARGET_BLOCK_BUFFER: Record<ChainId, number> = {
   [ChainId.POLYGON]: 3,
   [ChainId.SEPOLIA]: 3,
   [ChainId.UNICHAIN_SEPOLIA]: 4,
-  // V3-rollout chains: priority orders unreachable (see comment above).
-  [ChainId.TEMPO]: 0,
-  [ChainId.BNB]: 0,
-  [ChainId.MONAD]: 0,
-  [ChainId.XLAYER]: 0,
-  [ChainId.WORLDCHAIN]: 0,
-  [ChainId.SONEIUM]: 0,
-  [ChainId.CELO]: 0,
-  [ChainId.AVALANCHE]: 0,
-  [ChainId.BLAST]: 0,
-  [ChainId.ZORA]: 0,
 }
 
-// Hybrid orders use target block to determine when the price curve starts.
-// Same reasoning as PRIORITY_ORDER_TARGET_BLOCK_BUFFER above: V3-rollout chains
-// have no hybrid reactor, so the entries below are unreachable sentinel-0s.
-export const HYBRID_ORDER_TARGET_BLOCK_BUFFER: Record<ChainId, number> = {
+export const HYBRID_ORDER_TARGET_BLOCK_BUFFER: Partial<Record<ChainId, number>> = {
   [ChainId.MAINNET]: 3,
   [ChainId.UNICHAIN]: 4,
   [ChainId.BASE]: 3,
@@ -55,17 +38,6 @@ export const HYBRID_ORDER_TARGET_BLOCK_BUFFER: Record<ChainId, number> = {
   [ChainId.POLYGON]: 3,
   [ChainId.SEPOLIA]: 3,
   [ChainId.UNICHAIN_SEPOLIA]: 4,
-  // V3-rollout chains: hybrid orders unreachable (see comment above).
-  [ChainId.TEMPO]: 0,
-  [ChainId.BNB]: 0,
-  [ChainId.MONAD]: 0,
-  [ChainId.XLAYER]: 0,
-  [ChainId.WORLDCHAIN]: 0,
-  [ChainId.SONEIUM]: 0,
-  [ChainId.CELO]: 0,
-  [ChainId.AVALANCHE]: 0,
-  [ChainId.BLAST]: 0,
-  [ChainId.ZORA]: 0,
 }
 
 export const DUTCHV2_ORDER_LATENCY_THRESHOLD_SEC = 20

lib/models/HybridOrder.ts

@@ -158,9 +158,11 @@ export class HybridOrder extends Order {
     // If the difference is more than 75% of the block time, add an extra block
     const extraBlock = timeDifference > blockTimeSeconds * 0.75 ? 1 : 0
 
-    const targetBlock = BigNumber.from(block.number)
-      .add(HYBRID_ORDER_TARGET_BLOCK_BUFFER[this.chainId as ChainId])
-      .add(extraBlock)
+    const buffer = HYBRID_ORDER_TARGET_BLOCK_BUFFER[this.chainId as ChainId]
+    if (buffer === undefined) {
+      throw new Error(`HYBRID_ORDER_TARGET_BLOCK_BUFFER missing for chainId ${this.chainId}`)
+    }
+    const targetBlock = BigNumber.from(block.number).add(buffer).add(extraBlock)
 
     const scaleWorse = process.env['SCALE_WORSE'] === 'true'
 

lib/models/PriorityOrder.ts

@@ -121,10 +121,12 @@ export class PriorityOrder extends Order {
     // If the difference is more than 75% of the block time, add an extra block
     const extraBlock = timeDifference > blockTimeSeconds * 0.75 ? 1 : 0
 
+    const buffer = PRIORITY_ORDER_TARGET_BLOCK_BUFFER[this.chainId as ChainId]
+    if (buffer === undefined) {
+      throw new Error(`PRIORITY_ORDER_TARGET_BLOCK_BUFFER missing for chainId ${this.chainId}`)
+    }
     this.inner.info.cosignerData = {
-      auctionTargetBlock: BigNumber.from(block.number)
-      .add(PRIORITY_ORDER_TARGET_BLOCK_BUFFER[this.chainId as ChainId])
-      .add(extraBlock),
+      auctionTargetBlock: BigNumber.from(block.number).add(buffer).add(extraBlock),
     }
 
     this.inner.info.cosignature = await cosigner.signDigest(this.inner.cosignatureHash(this.inner.info.cosignerData))

lib/util/chain.ts

@@ -1,23 +1,6 @@
-export enum ChainId {
-  MAINNET = 1,
-  UNICHAIN = 130,
-  BASE = 8453,
-  OPTIMISM = 10,
-  ARBITRUM_ONE = 42161,
-  POLYGON = 137,
-  SEPOLIA = 11155111,
-  UNICHAIN_SEPOLIA = 1301,
-  TEMPO = 4217,
-  BNB = 56,
-  MONAD = 143,
-  XLAYER = 196,
-  WORLDCHAIN = 480,
-  SONEIUM = 1868,
-  CELO = 42220,
-  AVALANCHE = 43114,
-  BLAST = 81457,
-  ZORA = 7777777,
-}
+import { ChainId } from '@uniswap/sdk-core'
+
+export { ChainId }
 
 // Each chain in SUPPORTED_CHAINS needs an RPC URL resolvable by
 // getRpcUrl(chainId) (Config.ts), which appends the chainId to

test/unit/handlers/post-order/post-order.test.ts

@@ -336,7 +336,7 @@ describe('Testing post order handler.', () => {
       // cosignature and cosignerData gets overwritten within the handler
       order.inner.info.cosignature = COSIGNATURE
       order.inner.info.cosignerData = {
-        auctionTargetBlock: BigNumber.from(MOCK_LATEST_BLOCK + PRIORITY_ORDER_TARGET_BLOCK_BUFFER[order.chainId as ChainId]), // No extra block since timestamp difference should be 0
+        auctionTargetBlock: BigNumber.from(MOCK_LATEST_BLOCK + PRIORITY_ORDER_TARGET_BLOCK_BUFFER[order.chainId as ChainId]!), // No extra block since timestamp difference should be 0
       }
       const expectedOrderEntity = order.toEntity(ORDER_STATUS.OPEN)
       expect(postOrderResponse.statusCode).toEqual(HttpStatusCode.Created)
@@ -349,7 +349,7 @@ describe('Testing post order handler.', () => {
           cosignature: COSIGNATURE,
           cosignerData: {
             // MOCK_LATEST_BLOCK + 3
-            auctionTargetBlock: MOCK_LATEST_BLOCK + PRIORITY_ORDER_TARGET_BLOCK_BUFFER[order.chainId as ChainId],
+            auctionTargetBlock: MOCK_LATEST_BLOCK + PRIORITY_ORDER_TARGET_BLOCK_BUFFER[order.chainId as ChainId]!,
           },
         })
       )
@@ -467,7 +467,7 @@ describe('Testing post order handler.', () => {
 
       expect(postOrderResponse.statusCode).toEqual(HttpStatusCode.Created)
 
-      const expectedBuffer = PRIORITY_ORDER_TARGET_BLOCK_BUFFER[ChainId.MAINNET]
+      const expectedBuffer = PRIORITY_ORDER_TARGET_BLOCK_BUFFER[ChainId.MAINNET]!
       const expectedTargetBlock = MOCK_LATEST_BLOCK + expectedBuffer + 1 // +1 for extra block
 
       expect(putOrderAndUpdateNonceTransactionMock).toBeCalledWith(

test/unit/models/HybridOrder.test.ts

@@ -143,7 +143,7 @@ describe('HybridOrder Model', () => {
 
         await order.reparameterizeAndCosign(mockProvider, mockCosigner)
 
-        const expectedTargetBlock = MOCK_LATEST_BLOCK + HYBRID_ORDER_TARGET_BLOCK_BUFFER[ChainId.MAINNET]
+        const expectedTargetBlock = MOCK_LATEST_BLOCK + HYBRID_ORDER_TARGET_BLOCK_BUFFER[ChainId.MAINNET]!
         expect(order.inner.info.cosignerData.auctionTargetBlock.toNumber()).toEqual(expectedTargetBlock)
       })
 
@@ -165,7 +165,7 @@ describe('HybridOrder Model', () => {
         await order.reparameterizeAndCosign(mockProvider, mockCosigner)
 
         // Should add extra block due to stale timestamp
-        const expectedTargetBlock = MOCK_LATEST_BLOCK + HYBRID_ORDER_TARGET_BLOCK_BUFFER[ChainId.MAINNET] + 1
+        const expectedTargetBlock = MOCK_LATEST_BLOCK + HYBRID_ORDER_TARGET_BLOCK_BUFFER[ChainId.MAINNET]! + 1
         expect(order.inner.info.cosignerData.auctionTargetBlock.toNumber()).toEqual(expectedTargetBlock)
       })
     })
@@ -309,7 +309,7 @@ describe('HybridOrder Model', () => {
 
         await order.reparameterizeAndCosign(mockProvider, mockCosigner)
 
-        const expectedTargetBlock = MOCK_LATEST_BLOCK + HYBRID_ORDER_TARGET_BLOCK_BUFFER[ChainId.MAINNET]
+        const expectedTargetBlock = MOCK_LATEST_BLOCK + HYBRID_ORDER_TARGET_BLOCK_BUFFER[ChainId.MAINNET]!
         expect(order.inner.info.cosignerData.auctionTargetBlock.toNumber()).toEqual(expectedTargetBlock)
         expect(order.inner.info.cosignerData.supplementalPriceCurve).toEqual([])
       })