chore: [SC-13761] common way to handle internal packages

.gitignore

@@ -43,4 +43,10 @@ dist
 artifacts
 
 # tsbuildinfo
-*.tsbuildinfo
+*.tsbuildinfo
+
+# geneated GraphQL types
+/**/types/graphql/*.ts
+
+# nx files
+.nx

apps/summerfi-api/lib/automation-subgraph/graphql.config.yml

@@ -1,5 +1,8 @@
 schema: schema.graphql
 documents: './queries/**/*.graphql'
+config:
+  namingConvention:
+    enumValues: keep
 generates:
   src/types/graphql/generated.ts:
     plugins:
@@ -27,10 +30,3 @@ generates:
             MetaTagAttributes: Record<string, string>
             UploadId: string
       - typed-document-node
-extensions:
-  endpoints:
-    Default GraphQL Endpoint:
-      url: https://5twcsg71b5.execute-api.us-east-1.amazonaws.com/staging/summer-automation
-      headers:
-        user-agent: JS GraphQL
-      introspect: false

apps/summerfi-api/lib/automation-subgraph/package.json

@@ -1,21 +1,19 @@
 {
   "name": "automation-subgraph",
   "version": "1.0.0",
+  "type": "module",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "scripts": {
     "tsc": "tsc",
     "watch": "tsc -w",
     "test": "jest",
     "build": "tsc -b -v",
     "generate-ts-types": "graphql-codegen --config graphql.config.yml"
   },
-  "files": [
-    "dist"
-  ],
-  "author": "Jacob",
-  "license": "UNLICENSED",
   "dependencies": {
     "@aws-lambda-powertools/logger": "^1.17.0",
     "graphql-request": "^6.1.0",
-    "shared": "*"
+    "shared": "workspace:*"
   }
 }

apps/summerfi-api/lib/automation-subgraph/tsconfig.json

@@ -2,16 +2,8 @@
   "extends": "../../tsconfig-base.json",
   "compilerOptions": {
     "rootDir": "src",
-    "outDir": "dist",
-    "composite": true,
-    "declaration": true,
-    "declarationMap": true
+    "outDir": "dist"
   },
   "include": ["src/**/*.ts"],
   "exclude": ["node_modules", "**/*.spec.ts"],
-  "references": [
-    {
-      "path": "../shared"
-    }
-  ]
 }

apps/summerfi-api/lib/contracts/package.json

@@ -7,9 +7,14 @@
     "test": "jest",
     "build": "tsc -b -v"
   },
-  "files": [
-    "dist"
-  ],
-  "author": "Jacob",
-  "license": "UNLICENSED"
+  "exports": {
+    ".": {
+      "import": "./dist/index.js",
+      "types": "./dist/index.d.ts"
+    },
+    "./*": {
+        "import": "./dist/*.js",
+        "types": "./dist/*.d.ts"
+    }
+  }
 }

apps/summerfi-api/lib/contracts/src/get-triggers-response.ts

@@ -76,8 +76,8 @@ export type AaveBasicBuy = {
     maxCoverage: string
     debtToken: string
     collateralToken: string
-    opHash: string
-    execLtv: string
+    operationName: string
+    executionLtv: string
     targetLtv: string
     maxBuyPrice: string
     deviation: string
@@ -96,8 +96,8 @@ export type AaveBasicSell = {
     maxCoverage: string
     debtToken: string
     collateralToken: string
-    opHash: string
-    execLtv: string
+    operationName: string
+    executionLtv: string
     targetLtv: string
     minSellPrice: string
     deviation: string

apps/summerfi-api/lib/contracts/tsconfig.json

@@ -2,10 +2,7 @@
   "extends": "../../tsconfig-base.json",
   "compilerOptions": {
     "rootDir": "src",
-    "outDir": "dist",
-    "composite": true,
-    "declaration": true,
-    "declarationMap": true
+    "outDir": "dist"
   },
   "include": ["src/**/*.ts"],
   "exclude": ["node_modules", "**/*.spec.ts"]

apps/summerfi-api/lib/get-triggers/package.json

@@ -7,16 +7,17 @@
     "test": "jest",
     "build": "esbuild --bundle src/index.ts --platform=node --target=node20 --outfile=dist/index.js"
   },
-  "author": "Jacob",
-  "license": "UNLICENSED",
   "dependencies": {
     "@aws-lambda-powertools/logger": "^1.17.0",
     "@aws-lambda-powertools/metrics": "^1.17.0",
     "@aws-lambda-powertools/tracer": "^1.17.0",
     "graphql-request": "^6.1.0",
-    "shared": "*",
-    "automation-subgraph": "*",
-    "contracts": "*",
+    "shared": "workspace:*",
+    "automation-subgraph": "workspace:*",
+    "contracts": "workspace:*",
     "zod": "^3.22.4"
+  },
+  "devDependencies": {
+    "esbuild": "^0.19.11"
   }
 }

apps/summerfi-api/lib/get-triggers/src/index.ts

@@ -70,6 +70,11 @@ export const handler = async (event: APIGatewayProxyEventV2): Promise<APIGateway
 
   const triggers = await automationSubgraphClient.getTriggers(params)
 
+  logger.info(`Got ${triggers.triggers.length} triggers`, {
+    triggers: triggers.triggers,
+    account: params.dpm,
+  })
+
   const aaveStopLossToCollateral: AaveStopLossToCollateral | undefined = triggers.triggers
     .filter((trigger) => trigger.triggerType == AaveStopLossToCollateralV2ID)
     .map((trigger) => {
@@ -160,8 +165,14 @@ export const handler = async (event: APIGatewayProxyEventV2): Promise<APIGateway
           maxCoverage: trigger.decodedData[trigger.decodedDataNames.indexOf('maxCoverage')],
           debtToken: trigger.decodedData[trigger.decodedDataNames.indexOf('debtToken')],
           collateralToken: trigger.decodedData[trigger.decodedDataNames.indexOf('collateralToken')],
-          opHash: trigger.decodedData[trigger.decodedDataNames.indexOf('opHash')],
-          execLtv: trigger.decodedData[trigger.decodedDataNames.indexOf('execLtv')],
+          operationName: trigger.decodedData[trigger.decodedDataNames.indexOf('operationName')],
+          executionLtv:
+            trigger.decodedData[
+              Math.max(
+                trigger.decodedDataNames.indexOf('execLtv'),
+                trigger.decodedData.indexOf('executionLtv'),
+              )
+            ],
           targetLtv: trigger.decodedData[trigger.decodedDataNames.indexOf('targetLtv')],
           maxBuyPrice: trigger.decodedData[trigger.decodedDataNames.indexOf('maxBuyPrice')],
           deviation: trigger.decodedData[trigger.decodedDataNames.indexOf('deviation')],
@@ -185,8 +196,14 @@ export const handler = async (event: APIGatewayProxyEventV2): Promise<APIGateway
           maxCoverage: trigger.decodedData[trigger.decodedDataNames.indexOf('maxCoverage')],
           debtToken: trigger.decodedData[trigger.decodedDataNames.indexOf('debtToken')],
           collateralToken: trigger.decodedData[trigger.decodedDataNames.indexOf('collateralToken')],
-          opHash: trigger.decodedData[trigger.decodedDataNames.indexOf('opHash')],
-          execLtv: trigger.decodedData[trigger.decodedDataNames.indexOf('execLtv')],
+          operationName: trigger.decodedData[trigger.decodedDataNames.indexOf('operationName')],
+          executionLtv:
+            trigger.decodedData[
+              Math.max(
+                trigger.decodedDataNames.indexOf('execLtv'),
+                trigger.decodedData.indexOf('executionLtv'),
+              )
+            ],
           targetLtv: trigger.decodedData[trigger.decodedDataNames.indexOf('targetLtv')],
           minSellPrice: trigger.decodedData[trigger.decodedDataNames.indexOf('minSellPrice')],
           deviation: trigger.decodedData[trigger.decodedDataNames.indexOf('deviation')],

apps/summerfi-api/lib/get-triggers/tsconfig.json

@@ -4,17 +4,6 @@
     "rootDir": "src",
     "outDir": "dist"
   },
-  "references": [
-    {
-      "path": "../shared"
-    },
-    {
-      "path": "../automation-subgraph"
-    },
-    {
-      "path": "../contracts"
-    }
-  ],
   "include": ["src/**/*.ts"],
   "exclude": ["node_modules", "**/*.spec.ts"]
 }

apps/summerfi-api/lib/portfolio-assets/package.json

@@ -17,7 +17,8 @@
   "devDependencies": {
   },
   "dependencies": {
-    "shared": "*",
+    "node-fetch": "^3.3.2",
+    "shared": "workspace:*",
     "zod": "^3.22.4"
   }
 }

apps/summerfi-api/lib/portfolio-assets/src/index.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-relative-import-paths/no-relative-import-paths */
 import { z } from 'zod'
 import type { APIGatewayProxyEventV2, APIGatewayProxyResultV2 } from 'aws-lambda'
 
@@ -8,6 +7,7 @@ import { DebankToken } from 'shared/debank-types'
 import { NetworkNames, PortfolioWalletAsset, PortfolioAssetsResponse } from 'shared/domain-types'
 import { DebankNetworkNameToOurs, DebankNetworkNames } from 'shared/debank-helpers'
 import { addressSchema } from 'shared/validators'
+import fetch from 'node-fetch';
 
 const paramsSchema = z.object({
   address: addressSchema,

apps/summerfi-api/lib/portfolio-assets/tsconfig.json

@@ -4,11 +4,6 @@
     "rootDir": "src",
     "outDir": "dist"
   },
-  "references": [
-    {
-      "path": "../shared"
-    }
-  ],
   "include": ["src/**/*.ts"],
   "exclude": ["node_modules", "**/*.spec.ts"]
 }

apps/summerfi-api/lib/portfolio-migrations/package.json

@@ -16,7 +16,7 @@
   "license": "UNLICENSED",
   "dependencies": {
     "@oasisdex/addresses": "^0.1.14",
-    "shared": "*",
+    "shared": "workspace:*",
     "viem": "^1.19.3",
     "zod": "^3.22.4"
   }

apps/summerfi-api/lib/portfolio-migrations/tsconfig.json

@@ -4,15 +4,7 @@
     "rootDir": "src",
     "outDir": "dist",
     "baseUrl": "src",
-    "paths": {
-      "shared/*": ["../../shared/src/*"]
-    }
   },
-  "references": [
-    {
-      "path": "../shared"
-    }
-  ],
   "include": ["src/**/*.ts"],
   "exclude": ["node_modules", "**/*.spec.ts"]
 }

apps/summerfi-api/lib/portfolio-overview/package.json

@@ -19,7 +19,7 @@
   "dependencies": {
     "graphql": "^16.8.1",
     "graphql-request": "^6.1.0",
-    "shared": "*",
+    "shared": "workspace:*",
     "zod": "^3.22.4",
     "node-fetch": "^3.3.2"
   }

apps/summerfi-api/lib/portfolio-overview/src/index.ts

@@ -1,18 +1,17 @@
-/* eslint-disable no-relative-import-paths/no-relative-import-paths */
 import { z } from 'zod'
 import type { APIGatewayProxyEventV2, APIGatewayProxyResultV2 } from 'aws-lambda'
 
-import { getDefaultErrorMessage } from 'shared/src/helpers'
-import { ResponseBadRequest, ResponseInternalServerError, ResponseOk } from 'shared/src/responses'
+import { getDefaultErrorMessage } from 'shared/helpers'
+import { ResponseBadRequest, ResponseInternalServerError, ResponseOk } from 'shared/responses'
 import {
   DebankComplexProtocol,
   DebankPortfolioItemObject,
   DebankSimpleProtocol,
-} from 'shared/src/debank-types'
-import { PortfolioOverviewResponse } from 'shared/src/domain-types'
-import { DEBANK_SUPPORTED_CHAIN_IDS } from 'shared/src/debank-helpers'
+} from 'shared/debank-types'
+import { PortfolioOverviewResponse } from 'shared/domain-types'
+import { DEBANK_SUPPORTED_CHAIN_IDS } from 'shared/debank-helpers'
 import { getSupportedPositions } from './utils'
-import { addressSchema } from 'shared/src/validators'
+import { addressSchema } from 'shared/validators'
 import fetch from 'node-fetch'
 
 const paramsSchema = z.object({

apps/summerfi-api/lib/portfolio-overview/tsconfig.json

@@ -4,11 +4,6 @@
     "rootDir": "src",
     "outDir": "dist"
   },
-  "references": [
-    {
-      "path": "../shared"
-    }
-  ],
   "include": ["src/**/*.ts"],
   "exclude": ["node_modules", "**/*.spec.ts"]
 }

apps/summerfi-api/lib/setup-trigger/package.json

@@ -7,18 +7,19 @@
     "test": "jest",
     "build": "esbuild src/index.ts --bundle --minify --platform=node --target=node20 --outfile=dist/index.js --sourcemap"
   },
-  "author": "Jacob",
-  "license": "UNLICENSED",
   "dependencies": {
-    "@oasisdex/addresses": "^0.1.18",
-    "@oasisdex/dma-library": "0.5.26-beta.2",
+    "@oasisdex/addresses": "0.1.16-dma-v2-workers.1",
+    "@oasisdex/dma-library": "0.5.21-dma-v2-workers.2",
     "@aws-lambda-powertools/logger": "^1.17.0",
     "@aws-lambda-powertools/metrics": "^1.17.0",
     "@aws-lambda-powertools/tracer": "^1.17.0",
     "node-fetch": "^3.3.2",
-    "shared": "*",
-    "contracts": "*",
+    "shared": "workspace:*",
+    "contracts": "workspace:*",
     "viem": "^1.19.11",
     "zod": "^3.22.4"
+  },
+  "devDependencies": {
+    "esbuild": "^0.19.11"
   }
 }