fix(order-tracking): sfn max attemmpts increase; sfn execution arn na…

…ming tweak (#501)

* maxAttempts 4 -> 10

* retry to 100

* bump sfn stack version

bin/definitions/order-tracking-sfn.json

@@ -12,7 +12,7 @@
             "Lambda.SdkClientException"
           ],
           "IntervalSeconds": 2,
-          "MaxAttempts": 4,
+          "MaxAttempts": 100,
           "BackoffRate": 2
         }
       ],

bin/stacks/step-function-stack.ts

@@ -48,7 +48,7 @@ export class StepFunctionStack extends cdk.NestedStack {
       },
       timeout: Duration.seconds(60),
       environment: {
-        VERSION: '2',
+        VERSION: '3',
         NODE_OPTIONS: '--enable-source-maps',
         ...props.envVars,
         stage: stage,

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

@@ -25,7 +25,8 @@ export class CheckOrderStatusHandler extends SfnLambdaHandler<ContainerInjected,
     requestInjected: RequestInjected
   }): Promise<SfnStateInputOutput> {
     //make sure to change "Variable": "$.retryCount", in order-tracking-sfn.json to be 1+retryCount
-    if (input.requestInjected?.retryCount > 300) {
+    const retryCount = input.requestInjected?.retryCount ?? 0
+    if (retryCount > 300) {
       const stateMachineArn = input.requestInjected.stateMachineArn
       await kickoffOrderTrackingSfn(
         {
@@ -36,7 +37,8 @@ export class CheckOrderStatusHandler extends SfnLambdaHandler<ContainerInjected,
           orderType: input.requestInjected.orderType,
           stateMachineArn: input.requestInjected.stateMachineArn,
         },
-        stateMachineArn
+        stateMachineArn,
+        retryCount
       )
       powertoolsMetric
         .singleMetric()

lib/handlers/shared/sfn.ts

@@ -13,19 +13,18 @@ export type OrderTrackingSfnInput = {
   stateMachineArn: string
 }
 
-//TODO: remove random for sfn name
-//this is to stop collisions in the running step function name
-const BIG_NUMBER = 1000000000000
-
-export async function kickoffOrderTrackingSfn(sfnInput: OrderTrackingSfnInput, stateMachineArn: string) {
+export async function kickoffOrderTrackingSfn(
+  sfnInput: OrderTrackingSfnInput,
+  stateMachineArn: string,
+  retryCount = 0
+) {
   log.info('starting state machine')
   const region = checkDefined(process.env['REGION'], 'REGION is undefined')
   const sfnClient = new SFNClient({ region: region })
-  const rand = Math.floor(Math.random() * BIG_NUMBER)
   const startExecutionCommand = new StartExecutionCommand({
     stateMachineArn: stateMachineArn,
     input: JSON.stringify(sfnInput),
-    name: sfnInput.orderHash + '_' + rand,
+    name: sfnInput.orderHash + '_' + retryCount,
   })
   log.info('Starting state machine execution', { startExecutionCommand })
   await sfnClient.send(startExecutionCommand)

lib/services/UniswapXOrderService.ts

@@ -4,11 +4,11 @@ import { KmsSigner } from '@uniswap/signer'
 import {
   CosignedPriorityOrder,
   CosignedV2DutchOrder,
+  CosignedV3DutchOrder,
   DutchOrder,
   OrderType,
   OrderValidation,
   OrderValidator as OnChainOrderValidator,
-  CosignedV3DutchOrder,
 } from '@uniswap/uniswapx-sdk'
 import { ethers } from 'ethers'
 import { ORDER_STATUS, UniswapXOrderEntity } from '../entities'
@@ -17,6 +17,7 @@ import { OrderValidationFailedError } from '../errors/OrderValidationFailedError
 import { TooManyOpenOrdersError } from '../errors/TooManyOpenOrdersError'
 import { GetOrdersQueryParams } from '../handlers/get-orders/schema'
 import { GetDutchV2OrderResponse } from '../handlers/get-orders/schema/GetDutchV2OrderResponse'
+import { GetDutchV3OrderResponse } from '../handlers/get-orders/schema/GetDutchV3OrderResponse'
 import { GetOrdersResponse } from '../handlers/get-orders/schema/GetOrdersResponse'
 import { GetPriorityOrderResponse } from '../handlers/get-orders/schema/GetPriorityOrderResponse'
 import { OnChainValidatorMap } from '../handlers/OnChainValidatorMap'
@@ -32,7 +33,6 @@ import { BaseOrdersRepository } from '../repositories/base'
 import { OffChainUniswapXOrderValidator } from '../util/OffChainUniswapXOrderValidator'
 import { DUTCH_LIMIT, formatOrderEntity } from '../util/order'
 import { AnalyticsServiceInterface } from './analytics-service'
-import { GetDutchV3OrderResponse } from '../handlers/get-orders/schema/GetDutchV3OrderResponse'
 const MAX_QUERY_RETRY = 10
 
 export class UniswapXOrderService {
@@ -174,7 +174,8 @@ export class UniswapXOrderService {
         orderType,
         stateMachineArn,
       },
-      stateMachineArn
+      stateMachineArn,
+      0
     )
   }
 

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

@@ -162,7 +162,8 @@ describe('Testing post limit order handler.', () => {
       expect(validatorMock).toBeCalledWith(order)
       expect(kickoffOrderTrackingSfn).toHaveBeenCalledWith(
         expect.objectContaining({ orderType: 'Limit' }),
-        expect.anything()
+        expect.anything(),
+        0
       )
       expect(postOrderResponse).toEqual({
         body: JSON.stringify({ hash: expectedOrderEntity.orderHash }),

test/unit/services/UniswapXOrderService.test.ts

@@ -6,21 +6,21 @@ import { ORDER_STATUS, UniswapXOrderEntity } from '../../../lib/entities'
 import { OnChainValidatorMap } from '../../../lib/handlers/OnChainValidatorMap'
 import { kickoffOrderTrackingSfn } from '../../../lib/handlers/shared/sfn'
 import { DutchV1Order, DutchV2Order } from '../../../lib/models'
+import { DutchV3Order } from '../../../lib/models/DutchV3Order'
 import { LimitOrder } from '../../../lib/models/LimitOrder'
 import { PriorityOrder } from '../../../lib/models/PriorityOrder'
 import { BaseOrdersRepository } from '../../../lib/repositories/base'
 import { AnalyticsService } from '../../../lib/services/analytics-service'
 import { UniswapXOrderService } from '../../../lib/services/UniswapXOrderService'
+import { ChainId } from '../../../lib/util/chain'
 import { OffChainUniswapXOrderValidator } from '../../../lib/util/OffChainUniswapXOrderValidator'
 import { DUTCH_LIMIT } from '../../../lib/util/order'
 import { SDKDutchOrderFactory } from '../../factories/SDKDutchOrderV1Factory'
 import { SDKDutchOrderV2Factory } from '../../factories/SDKDutchOrderV2Factory'
+import { SDKDutchOrderV3Factory } from '../../factories/SDKDutchOrderV3Factory'
 import { SDKPriorityOrderFactory } from '../../factories/SDKPriorityOrderFactory'
 import { QueryParamsBuilder } from '../builders/QueryParamsBuilder'
 import { COSIGNATURE, MOCK_PROVIDER_MAP } from '../fixtures'
-import { DutchV3Order } from '../../../lib/models/DutchV3Order'
-import { ChainId } from '../../../lib/util/chain'
-import { SDKDutchOrderV3Factory } from '../../factories/SDKDutchOrderV3Factory'
 
 jest.mock('../../../lib/handlers/shared/sfn', () => {
   return { kickoffOrderTrackingSfn: jest.fn() }
@@ -81,7 +81,8 @@ describe('UniswapXOrderService', () => {
         quoteId: '',
         stateMachineArn: undefined,
       },
-      undefined
+      undefined,
+      0
     )
   })
 
@@ -131,7 +132,8 @@ describe('UniswapXOrderService', () => {
         quoteId: '',
         stateMachineArn: undefined,
       },
-      undefined
+      undefined,
+      0
     )
   })
 
@@ -615,9 +617,10 @@ describe('UniswapXOrderService', () => {
     )
   })
 
-
   test('getDutchV3Orders calls db with Dutch_V3', async () => {
-    const dutchV3Orders = [1, 2, 3].map(() => new DutchV3Order(SDKDutchOrderV3Factory.buildDutchV3Order(ChainId.ARBITRUM_ONE), '', ChainId.ARBITRUM_ONE))
+    const dutchV3Orders = [1, 2, 3].map(
+      () => new DutchV3Order(SDKDutchOrderV3Factory.buildDutchV3Order(ChainId.ARBITRUM_ONE), '', ChainId.ARBITRUM_ONE)
+    )
     const mockOrder = dutchV3Orders.map((o) => o.toEntity(ORDER_STATUS.OPEN))
     const repository = mock<BaseOrdersRepository<UniswapXOrderEntity>>()
     repository.getOrdersFilteredByType.mockResolvedValue({ orders: mockOrder })
@@ -636,7 +639,12 @@ describe('UniswapXOrderService', () => {
     )
 
     const limit = 50
-    const params = new QueryParamsBuilder().withDesc().withSort().withSortKey().withChainId(ChainId.ARBITRUM_ONE).build()
+    const params = new QueryParamsBuilder()
+      .withDesc()
+      .withSort()
+      .withSortKey()
+      .withChainId(ChainId.ARBITRUM_ONE)
+      .build()
     const response = await service.getDutchV3Orders(limit, params, undefined)
     const expectedResponse = {
       orders: mockOrder.map((o) => DutchV3Order.fromEntity(o).toGetResponse()),
@@ -655,7 +663,9 @@ describe('UniswapXOrderService', () => {
   })
 
   test('getDutchV3Orders loops with empty response', async () => {
-    const dutchV3Orders = [1, 2, 3].map(() => new DutchV3Order(SDKDutchOrderV3Factory.buildDutchV3Order(ChainId.ARBITRUM_ONE), '', ChainId.ARBITRUM_ONE))
+    const dutchV3Orders = [1, 2, 3].map(
+      () => new DutchV3Order(SDKDutchOrderV3Factory.buildDutchV3Order(ChainId.ARBITRUM_ONE), '', ChainId.ARBITRUM_ONE)
+    )
     const mockOrder = dutchV3Orders.map((o) => o.toEntity(ORDER_STATUS.OPEN))
     const repository = mock<BaseOrdersRepository<UniswapXOrderEntity>>()
     repository.getOrdersFilteredByType.mockResolvedValueOnce({ orders: [], cursor: 'cursor' })
@@ -675,7 +685,12 @@ describe('UniswapXOrderService', () => {
     )
 
     const limit = 50
-    const params = new QueryParamsBuilder().withDesc().withSort().withSortKey().withChainId(ChainId.ARBITRUM_ONE).build()
+    const params = new QueryParamsBuilder()
+      .withDesc()
+      .withSort()
+      .withSortKey()
+      .withChainId(ChainId.ARBITRUM_ONE)
+      .build()
     const response = await service.getDutchV3Orders(limit, params, undefined)
     const expectedResponse = {
       orders: mockOrder.map((o) => DutchV3Order.fromEntity(o).toGetResponse()),
@@ -717,7 +732,12 @@ describe('UniswapXOrderService', () => {
     )
 
     const limit = 50
-    const params = new QueryParamsBuilder().withDesc().withSort().withSortKey().withChainId(ChainId.ARBITRUM_ONE).build()
+    const params = new QueryParamsBuilder()
+      .withDesc()
+      .withSort()
+      .withSortKey()
+      .withChainId(ChainId.ARBITRUM_ONE)
+      .build()
     const response = await service.getDutchV3Orders(limit, params, undefined)
 
     expect(response).toEqual({ orders: [], cursor: 'cursor' })

test/unit/util/order-validator.test.ts

@@ -348,18 +348,18 @@ describe('Testing off chain validation', () => {
   describe('Testing v3 order validation', () => {
     it('Should return valid', () => {
       const order = SDKDutchOrderV3Factory.buildDutchV3Order(ChainId.ARBITRUM_ONE, {
-        cosigner: process.env.LABS_COSIGNER
+        cosigner: process.env.LABS_COSIGNER,
       })
       order.info.deadline = CURRENT_TIME + ONE_DAY
       const validationResp = validationProvider.validate(order)
       expect(validationResp).toEqual({
-        valid: true
+        valid: true,
       })
     })
 
     it('Should throw invalid deadline', () => {
       const order = SDKDutchOrderV3Factory.buildDutchV3Order(ChainId.ARBITRUM_ONE, {
-        cosigner: process.env.LABS_COSIGNER
+        cosigner: process.env.LABS_COSIGNER,
       })
       const validationResp = validationProvider.validate(order)
       expect(validationResp).toEqual({
@@ -376,7 +376,7 @@ describe('Testing off chain validation', () => {
       const validationResp = validationProvider.validate(order)
       expect(validationResp).toEqual({
         valid: false,
-        errorString: 'Invalid cosigner: ValidationError: "value" must be [0x0000000000000000000000000000000000000000]',
+        errorString: expect.stringContaining('Invalid cosigner: ValidationError: "value" must be'),
       })
     })
 
@@ -449,7 +449,7 @@ describe('Testing off chain validation', () => {
             relativeAmounts: [BigInt(1000000000000000000)],
           },
         },
-      ]
+      ],
     })
     order.info.deadline = CURRENT_TIME + ONE_DAY
     // Set to be empty
@@ -529,9 +529,9 @@ describe('Testing off chain validation', () => {
       outputs: [
         {
           startAmount: BigNumber.from(100),
-            minAmount: BigNumber.from(100),
+          minAmount: BigNumber.from(100),
         },
-      ]
+      ],
     })
     // Override with less than the startAmount
     order.info.cosignerData.outputOverrides = [BigNumber.from('99')]