Refactor codebase to centralize LTV and percentage schemas

The codebase has been refactored to centralize the LTV and percentage schemas, now hosted within the `serverless-shared` package. Code that previously imported these schemas from `triggers-shared` has also been updated to reflect this change. Simultaneously, the `min-net-value-map.ts` file was deleted as it was not being used.
OasisDEX · Apr 16, 2024 · 1710aa7 · 1710aa7
1 parent 0d26c08
commit 1710aa7
Show file tree

Hide file tree

Showing 16 changed files with 55 additions and 83 deletions.
diff --git a/packages/serverless-shared/src/validators.ts b/packages/serverless-shared/src/validators.ts
@@ -81,3 +81,16 @@ export const ltvSchema = bigIntSchema.refine((ltv) => ltv >= 0n && ltv < 10_000n
   },
   message: 'LTV must be between 0 and 10_000',
 })
+
+export const percentageSchema = bigIntSchema.refine(
+  (percentage) => percentage >= 0n && percentage <= 10_000n,
+  {
+    params: {
+      code: 'percentage-out-of-range',
+    },
+    message: 'Percentage must be between 0 and 100_000',
+  },
+)
+
+export type LTV = z.infer<typeof ltvSchema>
+export type Percentage = z.infer<typeof percentageSchema>
diff --git a/packages/triggers-shared/src/types.ts b/packages/triggers-shared/src/types.ts
@@ -1,28 +1,18 @@
 import { z } from 'zod'
 import { PRICE_DECIMALS } from './constants'
-import { addressSchema, bigIntSchema, ChainId, ProtocolId } from '@summerfi/serverless-shared'
+import {
+  addressSchema,
+  bigIntSchema,
+  ChainId,
+  LTV,
+  ltvSchema,
+  ProtocolId,
+} from '@summerfi/serverless-shared'
 
 export const priceSchema = bigIntSchema.describe(`Price with ${PRICE_DECIMALS} decimals`)
 
 export const maxGasFeeSchema = bigIntSchema.describe('Max gas fee in Gwei')
 
-export const ltvSchema = bigIntSchema.refine((ltv) => ltv >= 0n && ltv < 10_000n, {
-  params: {
-    code: 'ltv-out-of-range',
-  },
-  message: 'LTV must be between 0 and 10_000',
-})
-
-export const percentageSchema = bigIntSchema.refine(
-  (percentage) => percentage >= 0n && percentage <= 10_000n,
-  {
-    params: {
-      code: 'percentage-out-of-range',
-    },
-    message: 'Percentage must be between 0 and 100_000',
-  },
-)
-
 export enum SupportedActions {
   Add = 'add',
   Remove = 'remove',
@@ -88,8 +78,6 @@ export type PositionLike = z.infer<typeof positionSchema>
 export type Token = z.infer<typeof tokenSchema>
 export type TokenBalance = z.infer<typeof tokenBalanceSchema>
 export type Price = z.infer<typeof priceSchema>
-export type LTV = z.infer<typeof ltvSchema>
-export type Percentage = z.infer<typeof percentageSchema>
 
 export type CurrentTriggerLike = {
   id: bigint

diff --git a/summerfi-api/get-migrations-function/src/addressService.ts b/summerfi-api/get-migrations-function/src/addressService.ts
@@ -1,4 +1,4 @@
-import { ADDRESSES, AaveLikeProtocol, Common, Core } from '@oasisdex/addresses'
+import { AaveLikeProtocol, ADDRESSES, Common, Core } from '@oasisdex/addresses'
 import {
   Address,
   ChainId,
@@ -41,13 +41,16 @@ export const createAddressService = (chainId: ChainId) => {
       let val
       switch (protocol) {
         case ProtocolId.AAVE3:
+        case ProtocolId.AAVE_V3:
           val = addresses['aave']['v3'][contract] as Address
           break
 
         case ProtocolId.SPARK:
           val = addresses['spark'][contract] as Address
           break
-
+        case ProtocolId.AAVE_V2:
+          val = addresses['aave']['v2'][contract] as Address
+          break
         default:
           throw Error(`Unknown protocol - (${protocol}) on (${network})`)
       }

diff --git a/summerfi-api/get-migrations-function/src/migrations-config.ts b/summerfi-api/get-migrations-function/src/migrations-config.ts
@@ -6,9 +6,9 @@ export type IMigrationConfig = Record<ChainId, ProtocolId[]>
  * MigrationConfig is a map of supported protocols per chain
  */
 export const MigrationConfig: IMigrationConfig = {
-  [ChainId.MAINNET]: [ProtocolId.AAVE3, ProtocolId.SPARK],
-  [ChainId.ARBITRUM]: [ProtocolId.AAVE3],
-  [ChainId.OPTIMISM]: [ProtocolId.AAVE3],
-  [ChainId.BASE]: [ProtocolId.AAVE3],
+  [ChainId.MAINNET]: [ProtocolId.AAVE_V3, ProtocolId.SPARK],
+  [ChainId.ARBITRUM]: [ProtocolId.AAVE_V3],
+  [ChainId.OPTIMISM]: [ProtocolId.AAVE_V3],
+  [ChainId.BASE]: [ProtocolId.AAVE_V3],
   [ChainId.SEPOLIA]: [],
 }
diff --git a/...unction/src/services/against-position-validators/dma-aave-trailing-stop-loss-validator.ts b/...unction/src/services/against-position-validators/dma-aave-trailing-stop-loss-validator.ts
@@ -9,15 +9,14 @@ import {
 import {
   positionSchema,
   priceSchema,
-  supportedActionsSchema,
   SupportedActions,
-  ltvSchema,
+  supportedActionsSchema,
   TWENTY_MILLIONS_DOllARS,
 } from '@summerfi/triggers-shared'
 import { z } from 'zod'
 import { GetTriggersResponse } from '@summerfi/triggers-shared/contracts'
 import { DerivedPrices } from '@summerfi/prices-subgraph'
-import { safeParseBigInt } from '@summerfi/serverless-shared'
+import { ltvSchema, safeParseBigInt } from '@summerfi/serverless-shared'
 
 const paramsSchema = z.object({
   position: positionSchema,

diff --git a/...nction/src/services/against-position-validators/dma-spark-trailing-stop-loss-validator.ts b/...nction/src/services/against-position-validators/dma-spark-trailing-stop-loss-validator.ts
@@ -9,15 +9,14 @@ import {
 import {
   positionSchema,
   priceSchema,
-  supportedActionsSchema,
   SupportedActions,
+  supportedActionsSchema,
   TWENTY_MILLIONS_DOllARS,
-  ltvSchema,
 } from '@summerfi/triggers-shared'
 import { z } from 'zod'
 import { GetTriggersResponse } from '@summerfi/triggers-shared/contracts'
 import { DerivedPrices } from '@summerfi/prices-subgraph'
-import { safeParseBigInt } from '@summerfi/serverless-shared'
+import { ltvSchema, safeParseBigInt } from '@summerfi/serverless-shared'
 
 const paramsSchema = z.object({
   position: positionSchema,

diff --git a/...-api/setup-trigger-function/src/services/against-position-validators/min-net-value-map.ts b/...-api/setup-trigger-function/src/services/against-position-validators/min-net-value-map.ts
diff --git a/summerfi-api/setup-trigger-function/src/services/simulate-position.ts b/summerfi-api/setup-trigger-function/src/services/simulate-position.ts
@@ -1,7 +1,6 @@
 import { adjustToTargetRiskRatio, RiskRatio } from '@oasisdex/dma-library'
 import BigNumber from 'bignumber.js'
 import {
-  LTV,
   MULTIPLY_DECIMALS,
   ONE_PERCENT,
   PERCENT_DECIMALS,
@@ -10,6 +9,7 @@ import {
   PRICE_DECIMALS,
 } from '@summerfi/triggers-shared'
 import { Logger } from '@aws-lambda-powertools/logger'
+import { LTV } from '@summerfi/serverless-shared'
 
 export interface SimulatedPosition {
   targetLTV: LTV

diff --git a/summerfi-api/setup-trigger-function/src/types/validators/aave-auto-buy.ts b/summerfi-api/setup-trigger-function/src/types/validators/aave-auto-buy.ts
@@ -2,14 +2,13 @@ import { z } from 'zod'
 import { TriggerType } from '@oasisdex/automation'
 import { AutoBuyTriggerCustomErrorCodes } from '~types'
 import {
-  ltvSchema,
   maxGasFeeSchema,
   maxUnit256,
   positionAddressesSchema,
   priceSchema,
   supportedActionsSchema,
 } from '@summerfi/triggers-shared'
-import { addressSchema, urlOptionalSchema } from '@summerfi/serverless-shared'
+import { addressSchema, ltvSchema, urlOptionalSchema } from '@summerfi/serverless-shared'
 
 export const aaveBasicBuyTriggerDataSchema = z
   .object({

diff --git a/summerfi-api/setup-trigger-function/src/types/validators/aave-auto-sell.ts b/summerfi-api/setup-trigger-function/src/types/validators/aave-auto-sell.ts
@@ -2,13 +2,12 @@ import { z } from 'zod'
 import { TriggerType } from '@oasisdex/automation'
 import { AutoSellTriggerCustomErrorCodes } from '~types'
 import {
-  ltvSchema,
   maxGasFeeSchema,
   positionAddressesSchema,
   priceSchema,
   supportedActionsSchema,
 } from '@summerfi/triggers-shared'
-import { addressSchema, urlOptionalSchema } from '@summerfi/serverless-shared'
+import { addressSchema, ltvSchema, urlOptionalSchema } from '@summerfi/serverless-shared'
 
 export const aaveBasicSellTriggerDataSchema = z
   .object({

diff --git a/summerfi-api/setup-trigger-function/src/types/validators/aave-partial-take-profit.ts b/summerfi-api/setup-trigger-function/src/types/validators/aave-partial-take-profit.ts
@@ -1,13 +1,16 @@
 import { z } from 'zod'
 import { TriggerType } from '@oasisdex/automation'
 import {
-  ltvSchema,
-  percentageSchema,
   positionAddressesSchema,
   priceSchema,
   supportedActionsSchema,
 } from '@summerfi/triggers-shared'
-import { addressSchema, urlOptionalSchema } from '@summerfi/serverless-shared'
+import {
+  addressSchema,
+  ltvSchema,
+  percentageSchema,
+  urlOptionalSchema,
+} from '@summerfi/serverless-shared'
 import { dmaAaveStopLossTriggerDataSchema } from './aave-stop-loss'
 
 export const aavePartialTakeProfitTriggerDataSchema = z.object({

diff --git a/summerfi-api/setup-trigger-function/src/types/validators/aave-stop-loss.ts b/summerfi-api/setup-trigger-function/src/types/validators/aave-stop-loss.ts
@@ -1,11 +1,7 @@
 import { z } from 'zod'
 import { TriggerType } from '@oasisdex/automation'
-import { addressSchema, urlOptionalSchema } from '@summerfi/serverless-shared'
-import {
-  ltvSchema,
-  positionAddressesSchema,
-  supportedActionsSchema,
-} from '@summerfi/triggers-shared'
+import { addressSchema, ltvSchema, urlOptionalSchema } from '@summerfi/serverless-shared'
+import { positionAddressesSchema, supportedActionsSchema } from '@summerfi/triggers-shared'
 
 export const dmaAaveStopLossToCollateralTriggerDataSchema = z.object({
   type: z

diff --git a/summerfi-api/setup-trigger-function/src/types/validators/spark-auto-buy.ts b/summerfi-api/setup-trigger-function/src/types/validators/spark-auto-buy.ts
@@ -2,14 +2,13 @@ import { z } from 'zod'
 import { TriggerType } from '@oasisdex/automation'
 import { AutoBuyTriggerCustomErrorCodes } from '~types'
 import {
-  ltvSchema,
   maxGasFeeSchema,
   maxUnit256,
   positionAddressesSchema,
   priceSchema,
   supportedActionsSchema,
 } from '@summerfi/triggers-shared'
-import { addressSchema, urlOptionalSchema } from '@summerfi/serverless-shared'
+import { addressSchema, ltvSchema, urlOptionalSchema } from '@summerfi/serverless-shared'
 
 export const sparkBasicBuyTriggerDataSchema = z
   .object({

diff --git a/summerfi-api/setup-trigger-function/src/types/validators/spark-auto-sell.ts b/summerfi-api/setup-trigger-function/src/types/validators/spark-auto-sell.ts
@@ -2,13 +2,12 @@ import { z } from 'zod'
 import { TriggerType } from '@oasisdex/automation'
 import { AutoSellTriggerCustomErrorCodes } from '~types'
 import {
-  ltvSchema,
   maxGasFeeSchema,
   positionAddressesSchema,
   priceSchema,
   supportedActionsSchema,
 } from '@summerfi/triggers-shared'
-import { addressSchema, urlOptionalSchema } from '@summerfi/serverless-shared'
+import { addressSchema, ltvSchema, urlOptionalSchema } from '@summerfi/serverless-shared'
 
 export const sparkBasicSellTriggerDataSchema = z
   .object({

diff --git a/summerfi-api/setup-trigger-function/src/types/validators/spark-partial-take-profit.ts b/summerfi-api/setup-trigger-function/src/types/validators/spark-partial-take-profit.ts
@@ -1,13 +1,16 @@
 import { z } from 'zod'
 import { TriggerType } from '@oasisdex/automation'
 import {
-  ltvSchema,
-  percentageSchema,
   positionAddressesSchema,
   priceSchema,
   supportedActionsSchema,
 } from '@summerfi/triggers-shared'
-import { addressSchema, urlOptionalSchema } from '@summerfi/serverless-shared'
+import {
+  addressSchema,
+  ltvSchema,
+  percentageSchema,
+  urlOptionalSchema,
+} from '@summerfi/serverless-shared'
 import { dmaSparkStopLossTriggerDataSchema } from './spark-stop-loss'
 
 export const sparkPartialTakeProfitTriggerDataSchema = z.object({

diff --git a/summerfi-api/setup-trigger-function/src/types/validators/spark-stop-loss.ts b/summerfi-api/setup-trigger-function/src/types/validators/spark-stop-loss.ts
@@ -1,11 +1,7 @@
 import { z } from 'zod'
 import { TriggerType } from '@oasisdex/automation'
-import { addressSchema, urlOptionalSchema } from '@summerfi/serverless-shared'
-import {
-  ltvSchema,
-  positionAddressesSchema,
-  supportedActionsSchema,
-} from '@summerfi/triggers-shared'
+import { addressSchema, ltvSchema, urlOptionalSchema } from '@summerfi/serverless-shared'
+import { positionAddressesSchema, supportedActionsSchema } from '@summerfi/triggers-shared'
 
 export const dmaSparkStopLossToCollateralTriggerDataSchema = z.object({
   type: z