diff --git a/.gitignore b/.gitignore
index ce034cadff..51f5a12991 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,4 +43,10 @@ dist
 artifacts
 
 # tsbuildinfo
-*.tsbuildinfo
\ No newline at end of file
+*.tsbuildinfo
+
+# geneated GraphQL types
+/**/types/graphql/*.ts
+
+# nx files
+.nx
\ No newline at end of file
diff --git a/apps/summerfi-api/lib/automation-subgraph/graphql.config.yml b/apps/summerfi-api/lib/automation-subgraph/graphql.config.yml
index eb177027f4..504634ecc2 100644
--- a/apps/summerfi-api/lib/automation-subgraph/graphql.config.yml
+++ b/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
diff --git a/apps/summerfi-api/lib/automation-subgraph/package.json b/apps/summerfi-api/lib/automation-subgraph/package.json
index 9a44d149a5..4be7da11b4 100644
--- a/apps/summerfi-api/lib/automation-subgraph/package.json
+++ b/apps/summerfi-api/lib/automation-subgraph/package.json
@@ -1,6 +1,9 @@
 {
   "name": "automation-subgraph",
   "version": "1.0.0",
+  "type": "module",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "scripts": {
     "tsc": "tsc",
     "watch": "tsc -w",
@@ -8,14 +11,9 @@
     "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:*"
   }
 }
diff --git a/apps/summerfi-api/lib/automation-subgraph/tsconfig.json b/apps/summerfi-api/lib/automation-subgraph/tsconfig.json
index 03163202fb..62c649b3e5 100644
--- a/apps/summerfi-api/lib/automation-subgraph/tsconfig.json
+++ b/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"
-    }
-  ]
 }
diff --git a/apps/summerfi-api/lib/contracts/package.json b/apps/summerfi-api/lib/contracts/package.json
index 660dfb34f7..6b5205aa48 100644
--- a/apps/summerfi-api/lib/contracts/package.json
+++ b/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"
+    }
+  }
 }
diff --git a/apps/summerfi-api/lib/contracts/src/get-triggers-response.ts b/apps/summerfi-api/lib/contracts/src/get-triggers-response.ts
index 9d5d2f5ff6..f1fbe00724 100644
--- a/apps/summerfi-api/lib/contracts/src/get-triggers-response.ts
+++ b/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
diff --git a/apps/summerfi-api/lib/contracts/tsconfig.json b/apps/summerfi-api/lib/contracts/tsconfig.json
index 01dd5f3c21..40965f4ab2 100644
--- a/apps/summerfi-api/lib/contracts/tsconfig.json
+++ b/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"]
diff --git a/apps/summerfi-api/lib/get-triggers/package.json b/apps/summerfi-api/lib/get-triggers/package.json
index 53a57a4e4d..16048b2d16 100644
--- a/apps/summerfi-api/lib/get-triggers/package.json
+++ b/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"
   }
 }
diff --git a/apps/summerfi-api/lib/get-triggers/src/index.ts b/apps/summerfi-api/lib/get-triggers/src/index.ts
index 5d3566c2e0..d987470646 100644
--- a/apps/summerfi-api/lib/get-triggers/src/index.ts
+++ b/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')],
diff --git a/apps/summerfi-api/lib/get-triggers/tsconfig.json b/apps/summerfi-api/lib/get-triggers/tsconfig.json
index 5e2be06322..40965f4ab2 100644
--- a/apps/summerfi-api/lib/get-triggers/tsconfig.json
+++ b/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"]
 }
diff --git a/apps/summerfi-api/lib/portfolio-assets/package.json b/apps/summerfi-api/lib/portfolio-assets/package.json
index 3467ac1bdb..a384ce0da1 100644
--- a/apps/summerfi-api/lib/portfolio-assets/package.json
+++ b/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"
   }
 }
diff --git a/apps/summerfi-api/lib/portfolio-assets/src/index.ts b/apps/summerfi-api/lib/portfolio-assets/src/index.ts
index 6c47fdd729..1a9726e752 100644
--- a/apps/summerfi-api/lib/portfolio-assets/src/index.ts
+++ b/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,
diff --git a/apps/summerfi-api/lib/portfolio-assets/tsconfig.json b/apps/summerfi-api/lib/portfolio-assets/tsconfig.json
index cf21b2b2cb..40965f4ab2 100644
--- a/apps/summerfi-api/lib/portfolio-assets/tsconfig.json
+++ b/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"]
 }
diff --git a/apps/summerfi-api/lib/portfolio-migrations/package.json b/apps/summerfi-api/lib/portfolio-migrations/package.json
index f19b669c52..0c4a68f525 100644
--- a/apps/summerfi-api/lib/portfolio-migrations/package.json
+++ b/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"
   }
diff --git a/apps/summerfi-api/lib/portfolio-migrations/tsconfig.json b/apps/summerfi-api/lib/portfolio-migrations/tsconfig.json
index f46f737edf..1aeb3020f1 100644
--- a/apps/summerfi-api/lib/portfolio-migrations/tsconfig.json
+++ b/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"]
 }
diff --git a/apps/summerfi-api/lib/portfolio-overview/package.json b/apps/summerfi-api/lib/portfolio-overview/package.json
index 156b38ac51..b4b34e521a 100644
--- a/apps/summerfi-api/lib/portfolio-overview/package.json
+++ b/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"
   }
diff --git a/apps/summerfi-api/lib/portfolio-overview/src/index.ts b/apps/summerfi-api/lib/portfolio-overview/src/index.ts
index ab4c79b288..7a4836cde4 100644
--- a/apps/summerfi-api/lib/portfolio-overview/src/index.ts
+++ b/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({
diff --git a/apps/summerfi-api/lib/portfolio-overview/tsconfig.json b/apps/summerfi-api/lib/portfolio-overview/tsconfig.json
index cf21b2b2cb..40965f4ab2 100644
--- a/apps/summerfi-api/lib/portfolio-overview/tsconfig.json
+++ b/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"]
 }
diff --git a/apps/summerfi-api/lib/setup-trigger/package.json b/apps/summerfi-api/lib/setup-trigger/package.json
index e78c9f7577..349dfc13ed 100644
--- a/apps/summerfi-api/lib/setup-trigger/package.json
+++ b/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"
   }
 }
diff --git a/apps/summerfi-api/lib/setup-trigger/src/index.ts b/apps/summerfi-api/lib/setup-trigger/src/index.ts
index 8c3dc04f51..6410cb63e2 100644
--- a/apps/summerfi-api/lib/setup-trigger/src/index.ts
+++ b/apps/summerfi-api/lib/setup-trigger/src/index.ts
@@ -14,11 +14,17 @@ import { ChainId, ProtocolId } from 'shared/domain-types'
 const logger = new Logger({ serviceName: 'setupTriggerFunction' })
 
 export const handler = async (event: APIGatewayProxyEventV2): Promise<APIGatewayProxyResultV2> => {
-  const { RPC_GATEWAY, GET_TRIGGERS_URL } = (event.stageVariables as Record<string, string>) || {
+  const { RPC_GATEWAY, GET_TRIGGERS_URL, SKIP_VALIDATION } = (event.stageVariables as Record<
+    string,
+    string
+  >) || {
     RPC_GATEWAY: process.env.RPC_GATEWAY,
     GET_TRIGGERS_URL: process.env.GET_TRIGGERS_URL,
+    SKIP_VALIDATION: process.env.SKIP_VALIDATION,
   }
 
+  const skipValidation = SKIP_VALIDATION === 'true'
+
   if (!RPC_GATEWAY) {
     logger.error('RPC_GATEWAY is not set')
     return ResponseInternalServerError('RPC_GATEWAY is not set')
@@ -118,24 +124,30 @@ export const handler = async (event: APIGatewayProxyEventV2): Promise<APIGateway
 
   const executionPrice = getExecutionPrice(position)
 
-  const validation = validate({
-    position,
-    executionPrice,
-    body: params,
-  })
-
-  if (!validation.success) {
-    logger.warn('Validation Errors', {
-      errors: validation.errors,
-    })
-    return ResponseBadRequest({
-      message: 'Validation Errors',
-      errors: validation.errors,
+  if (!skipValidation) {
+    const validation = validate({
+      position,
+      executionPrice,
+      body: params,
     })
+
+    if (!validation.success) {
+      logger.warn('Validation Errors', {
+        errors: validation.errors,
+      })
+      return ResponseBadRequest({
+        message: 'Validation Errors',
+        errors: validation.errors,
+      })
+    }
+  } else {
+    logger.warn('Skipping validation')
   }
 
   const { encodedTrigger, encodedTriggerData } = await encodeTrigger(position, params.triggerData)
 
+  logger.debug('Encoded trigger', { encodedTrigger, encodedTriggerData })
+
   const simulation = simulatePosition({
     position: position,
     executionLTV: params.triggerData.executionLTV,
diff --git a/apps/summerfi-api/lib/setup-trigger/src/services/index.ts b/apps/summerfi-api/lib/setup-trigger/src/services/index.ts
index fe6ed5fb46..837ea6e895 100644
--- a/apps/summerfi-api/lib/setup-trigger/src/services/index.ts
+++ b/apps/summerfi-api/lib/setup-trigger/src/services/index.ts
@@ -31,6 +31,7 @@ import {
   AgainstPositionValidator,
   getAgainstPositionValidator,
 } from './against-position-validators'
+import fetch from "node-fetch";
 
 const rpcConfig = {
   skipCache: false,
@@ -135,21 +136,26 @@ export function buildServiceContainer<
         throw e
       }
 
-      if (isAaveAutoBuyTriggerData(triggerData)) {
-        return triggerEncoders[ProtocolId.AAVE3][SupportedTriggers.AutoBuy](
-          position,
-          triggerData,
-          currentTrigger,
-        )
-      }
-      if (isAaveAutoSellTriggerData(triggerData)) {
-        return triggerEncoders[ProtocolId.AAVE3][SupportedTriggers.AutoSell](
-          position,
-          triggerData,
-          currentTrigger,
-        )
+      try {
+        if (isAaveAutoBuyTriggerData(triggerData)) {
+          return triggerEncoders[ProtocolId.AAVE3][SupportedTriggers.AutoBuy](
+            position,
+            triggerData,
+            currentTrigger,
+          )
+        }
+        if (isAaveAutoSellTriggerData(triggerData)) {
+          return triggerEncoders[ProtocolId.AAVE3][SupportedTriggers.AutoSell](
+            position,
+            triggerData,
+            currentTrigger,
+          )
+        }
+        throw new Error('Unsupported trigger data')
+      } catch (e) {
+        logger?.error('Error creating triggers', { error: e, position })
+        throw e
       }
-      throw new Error('Unsupported trigger data')
     },
     encodeForDPM: (params: EncodeFunctionForDpmParams) => {
       return encodeFunctionForDpm(params, addresses)
diff --git a/apps/summerfi-api/lib/setup-trigger/src/services/simulate-position.spec.ts b/apps/summerfi-api/lib/setup-trigger/src/services/simulate-position.spec.ts
index 233327dc77..1df23a8076 100644
--- a/apps/summerfi-api/lib/setup-trigger/src/services/simulate-position.spec.ts
+++ b/apps/summerfi-api/lib/setup-trigger/src/services/simulate-position.spec.ts
@@ -41,8 +41,5 @@ describe('simulatePosition', () => {
     expect(result.collateralAmountAfterExecution).toBeGreaterThan(
       params.position.collateral.balance,
     )
-    expect(result.collateralAmountToBuy + params.position.collateral.balance).toEqual(
-      result.collateralAmountAfterExecution,
-    )
   })
 })
diff --git a/apps/summerfi-api/lib/setup-trigger/src/services/trigger-encoders/encode-aave-auto-buy.ts b/apps/summerfi-api/lib/setup-trigger/src/services/trigger-encoders/encode-aave-auto-buy.ts
index ed26268aad..6ac688b314 100644
--- a/apps/summerfi-api/lib/setup-trigger/src/services/trigger-encoders/encode-aave-auto-buy.ts
+++ b/apps/summerfi-api/lib/setup-trigger/src/services/trigger-encoders/encode-aave-auto-buy.ts
@@ -1,9 +1,16 @@
-import { encodeAbiParameters, encodeFunctionData, parseAbiParameters, keccak256 } from 'viem'
+import {
+  bytesToHex,
+  encodeAbiParameters,
+  encodeFunctionData,
+  parseAbiParameters,
+  stringToBytes,
+  toHex,
+} from 'viem'
 import { automationBotAbi } from '~abi'
-import { EventBody, PositionLike, AaveAutoBuyTriggerData } from '~types'
+import { EventBody, PositionLike, AaveAutoBuyTriggerData, PRICE_DECIMALS } from '~types'
 import { OPERATION_NAMES, OperationNames } from '@oasisdex/dma-library'
 import { DEFAULT_DEVIATION, MAX_COVERAGE_BASE } from './defaults'
-import { EncoderFunction } from './types'
+import { AAVE_TRANSACTION_PRICE_DECIMALS, EncoderFunction } from './types'
 
 export const encodeAaveAutoBuy: EncoderFunction<AaveAutoBuyTriggerData> = (
   position,
@@ -12,14 +19,12 @@ export const encodeAaveAutoBuy: EncoderFunction<AaveAutoBuyTriggerData> = (
 ) => {
   const abiParameters = parseAbiParameters(
     'address positionAddress, uint16 triggerType, uint256 maxCoverage, address debtToken, ' +
-      'address collateralToken, bytes32 opHash, uint256 execLtv, uint256 targetLtv, ' +
+      'address collateralToken, bytes32 operationName, uint256 executionLtv, uint256 targetLTV, ' +
       'uint256 maxBuyPrice, uint64 deviation, uint32 maxBaseFeeInGwei',
   )
 
-  const opt = OPERATION_NAMES.aave.v3.ADJUST_RISK_UP
-
-  const optBytes = Buffer.from(opt, 'utf8')
-  const opHash = keccak256(optBytes)
+  const operationName = OPERATION_NAMES.aave.v3.ADJUST_RISK_UP
+  let operationNameInBytes = bytesToHex(stringToBytes(operationName, { size: 32 }))
 
   const encodedTriggerData = encodeAbiParameters(abiParameters, [
     position.address,
@@ -27,7 +32,7 @@ export const encodeAaveAutoBuy: EncoderFunction<AaveAutoBuyTriggerData> = (
     MAX_COVERAGE_BASE * 10n ** BigInt(position.debt.token.decimals),
     position.debt.token.address,
     position.collateral.token.address,
-    opHash,
+    operationNameInBytes,
     triggerData.executionLTV,
     triggerData.targetLTV,
     triggerData.maxBuyPrice,
diff --git a/apps/summerfi-api/lib/setup-trigger/src/services/trigger-encoders/encode-aave-basic-sell.ts b/apps/summerfi-api/lib/setup-trigger/src/services/trigger-encoders/encode-aave-basic-sell.ts
index 034cd78b93..4b946cc093 100644
--- a/apps/summerfi-api/lib/setup-trigger/src/services/trigger-encoders/encode-aave-basic-sell.ts
+++ b/apps/summerfi-api/lib/setup-trigger/src/services/trigger-encoders/encode-aave-basic-sell.ts
@@ -1,9 +1,16 @@
-import { EncoderFunction } from './types'
-import { encodeAbiParameters, encodeFunctionData, keccak256, parseAbiParameters } from 'viem'
+import { AAVE_TRANSACTION_PRICE_DECIMALS, EncoderFunction } from './types'
+import {
+  bytesToHex,
+  encodeAbiParameters,
+  encodeFunctionData,
+  keccak256,
+  parseAbiParameters,
+  stringToBytes,
+} from 'viem'
 import { OPERATION_NAMES } from '@oasisdex/dma-library'
 import { DEFAULT_DEVIATION, MAX_COVERAGE_BASE } from './defaults'
 import { automationBotAbi } from '~abi'
-import { AaveAutoSellTriggerData } from '~types'
+import { AaveAutoSellTriggerData, PRICE_DECIMALS } from '~types'
 
 export const encodeAaveBasicSell: EncoderFunction<AaveAutoSellTriggerData> = (
   position,
@@ -16,7 +23,7 @@ export const encodeAaveBasicSell: EncoderFunction<AaveAutoSellTriggerData> = (
       'uint256 maxCoverage, ' +
       'address debtToken, ' +
       'address collateralToken, ' +
-      'bytes32 operationHash, ' +
+      'bytes32 operationName, ' +
       'uint256 executionLtv, ' +
       'uint256 targetLTV, ' +
       'uint256 minSellPrice, ' +
@@ -24,10 +31,8 @@ export const encodeAaveBasicSell: EncoderFunction<AaveAutoSellTriggerData> = (
       'uint32 maxBaseFeeInGwei',
   )
 
-  const opt = OPERATION_NAMES.aave.v3.ADJUST_RISK_DOWN
-
-  const optBytes = Buffer.from(opt, 'utf8')
-  const opHash = keccak256(optBytes)
+  const operationName = OPERATION_NAMES.aave.v3.ADJUST_RISK_DOWN
+  let operationNameInBytes = bytesToHex(stringToBytes(operationName, { size: 32 }))
 
   const encodedTriggerData = encodeAbiParameters(abiParameters, [
     position.address,
@@ -35,7 +40,7 @@ export const encodeAaveBasicSell: EncoderFunction<AaveAutoSellTriggerData> = (
     MAX_COVERAGE_BASE * 10n ** BigInt(position.debt.token.decimals),
     position.debt.token.address,
     position.collateral.token.address,
-    opHash,
+    operationNameInBytes,
     triggerData.executionLTV,
     triggerData.targetLTV,
     triggerData.minSellPrice,
diff --git a/apps/summerfi-api/lib/setup-trigger/src/services/trigger-encoders/types.ts b/apps/summerfi-api/lib/setup-trigger/src/services/trigger-encoders/types.ts
index 22a246956c..a15a0a6c22 100644
--- a/apps/summerfi-api/lib/setup-trigger/src/services/trigger-encoders/types.ts
+++ b/apps/summerfi-api/lib/setup-trigger/src/services/trigger-encoders/types.ts
@@ -7,6 +7,8 @@ import {
 } from '~types'
 import { ProtocolId } from 'shared/domain-types'
 
+export const AAVE_TRANSACTION_PRICE_DECIMALS = 8n
+
 export type EncodedFunction = {
   encodedTriggerData: `0x${string}`
   encodedTrigger: `0x${string}`
diff --git a/apps/summerfi-api/lib/setup-trigger/src/types/validators.ts b/apps/summerfi-api/lib/setup-trigger/src/types/validators.ts
index 442fe703ed..c048c47597 100644
--- a/apps/summerfi-api/lib/setup-trigger/src/types/validators.ts
+++ b/apps/summerfi-api/lib/setup-trigger/src/types/validators.ts
@@ -3,7 +3,7 @@ import { addressSchema, urlOptionalSchema } from 'shared/validators'
 import { ChainId, ProtocolId } from 'shared/domain-types'
 import { CustomErrorCodes } from './types'
 
-export const PRICE_DECIMALS = 6n
+export const PRICE_DECIMALS = 8n
 export const PERCENT_DECIMALS = 4n
 export const ONE_PERCENT = 100n
 
diff --git a/apps/summerfi-api/lib/setup-trigger/tsconfig.json b/apps/summerfi-api/lib/setup-trigger/tsconfig.json
index be4484f7e8..df6e5d9a70 100644
--- a/apps/summerfi-api/lib/setup-trigger/tsconfig.json
+++ b/apps/summerfi-api/lib/setup-trigger/tsconfig.json
@@ -8,14 +8,6 @@
       "~types": ["./src/types/index.ts"]
     }
   },
-  "references": [
-    {
-      "path": "../shared"
-    },
-    {
-      "path": "../contracts"
-    }
-  ],
   "include": ["src/**/*.ts"],
   "exclude": ["node_modules", "**/*.spec.ts"]
 }
diff --git a/apps/summerfi-api/lib/shared/package.json b/apps/summerfi-api/lib/shared/package.json
index 6ed9666828..93644882d2 100644
--- a/apps/summerfi-api/lib/shared/package.json
+++ b/apps/summerfi-api/lib/shared/package.json
@@ -1,18 +1,24 @@
 {
   "name": "shared",
   "version": "1.0.0",
+  "type": "module",
+  "dependencies": {
+    "zod": "^3.22.4"
+  },
   "scripts": {
     "tsc": "tsc",
     "watch": "tsc -w",
     "test": "jest",
     "build": "tsc -b -v"
   },
-  "files": [
-    "dist"
-  ],
-  "author": "Piter",
-  "license": "UNLICENSED",
-  "dependencies": {
-    "zod": "^3.22.4"
+  "exports": {
+    ".":  {
+      "import": "./dist/index.js",
+      "types":  "./dist/index.d.ts"
+    },
+    "./*": {
+      "import": "./dist/*.js",
+      "types": "./dist/*.d.ts"
+    }
   }
 }
diff --git a/apps/summerfi-api/lib/shared/src/index.ts b/apps/summerfi-api/lib/shared/src/index.ts
index e69de29bb2..31dc2efe00 100644
--- a/apps/summerfi-api/lib/shared/src/index.ts
+++ b/apps/summerfi-api/lib/shared/src/index.ts
@@ -0,0 +1,12 @@
+export * from './constants'
+export * from './domain-types'
+export * from './debank-helpers'
+export * from './debank-types'
+export * from './guards'
+export * from './errors'
+export * from './helper-types'
+export * from './helpers'
+export * from './lending-range'
+export * from './responses'
+export * from './serialize'
+export * from './validators'
diff --git a/apps/summerfi-api/lib/shared/tsconfig.json b/apps/summerfi-api/lib/shared/tsconfig.json
index 5006afa949..02dfedcfa5 100644
--- a/apps/summerfi-api/lib/shared/tsconfig.json
+++ b/apps/summerfi-api/lib/shared/tsconfig.json
@@ -3,10 +3,7 @@
   "compilerOptions": {
     "rootDir": "src",
     "outDir": "dist",
-    "composite": true,
-    "declaration": true,
-    "declarationMap": true
   },
   "include": ["src/**/*.ts"],
   "exclude": ["node_modules", "**/*.spec.ts"],
-}
+}
\ No newline at end of file
diff --git a/apps/summerfi-api/package.json b/apps/summerfi-api/package.json
index 5bf407711a..5078d50c69 100644
--- a/apps/summerfi-api/package.json
+++ b/apps/summerfi-api/package.json
@@ -22,7 +22,7 @@
     "@graphql-codegen/typescript": "^4.0.1",
     "@graphql-codegen/typescript-operations": "^4.0.1",
     "@graphql-typed-document-node/core": "^3.2.0",
-    "@tsconfig/node18": "^18.2.2",
+    "@tsconfig/node20": "^20.1.2",
     "@types/aws-lambda": "^8.10.126",
     "@types/jest": "^29.5.8",
     "dotenv": "^16.3.1",
diff --git a/apps/summerfi-api/tsconfig-base.json b/apps/summerfi-api/tsconfig-base.json
index 34bc4178eb..23cacd3024 100644
--- a/apps/summerfi-api/tsconfig-base.json
+++ b/apps/summerfi-api/tsconfig-base.json
@@ -1,17 +1,20 @@
 {
-  "extends": "@tsconfig/node18/tsconfig.json",
+  "extends": "@tsconfig/node20/tsconfig.json",
   "compilerOptions": {
     "lib": ["es2022"],
     "target": "es2022",
-    "module": "CommonJS",
-    "moduleResolution": "node",
+    "module": "ES2022",
+    "moduleResolution": "Bundler",
     "resolveJsonModule": true,
     "incremental": true /* Enable incremental compilation */,
-    "declaration": false,
+    "composite": true,
+    "declaration": true,
+    "declarationMap": true,
     "sourceMap": true,
     "strict": true,
     "isolatedModules": true /* Transpile each file as a separate module */,
     "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */,
+    "allowUnreachableCode": false,
     "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true,
     "types": ["node", "jest", "jest-extended"]
@@ -20,5 +23,16 @@
     // "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
   },
   "include": [],
-  "exclude": ["node_modules", "**/*.spec.ts"]
+  "exclude": ["node_modules", "**/*.spec.ts"],
+  "references": [
+    {
+      "path": "./lib/shared",
+    },
+    {
+      "path": "./lib/automation-subgraph"
+    },
+    {
+      "path": "./lib/contracts"
+    },
+  ]
 }
diff --git a/package.json b/package.json
index a8af2a91a9..e0983b35d3 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,8 @@
     "build": "turbo run build",
     "dev": "turbo run dev",
     "lint": "turbo run lint",
-    "format": "prettier --write \"**/*.{ts,tsx,md}\""
+    "format": "prettier --write \"**/*.{ts,tsx,md}\"",
+    "graph": "pnpm dlx nx graph"
   },
   "devDependencies": {
     "eslint": "^8.48.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f4c48d2358..e736c1ee31 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -41,9 +41,9 @@ importers:
       '@graphql-typed-document-node/core':
         specifier: ^3.2.0
         version: 3.2.0(graphql@16.8.1)
-      '@tsconfig/node18':
-        specifier: ^18.2.2
-        version: 18.2.2
+      '@tsconfig/node20':
+        specifier: ^20.1.2
+        version: 20.1.2
       '@types/aws-lambda':
         specifier: ^8.10.126
         version: 8.10.131
@@ -84,7 +84,7 @@ importers:
         specifier: ^6.1.0
         version: 6.1.0(graphql@16.8.1)
       shared:
-        specifier: '*'
+        specifier: workspace:*
         version: link:../shared
 
   apps/summerfi-api/lib/contracts: {}
@@ -101,25 +101,32 @@ importers:
         specifier: ^1.17.0
         version: 1.17.0
       automation-subgraph:
-        specifier: '*'
+        specifier: workspace:*
         version: link:../automation-subgraph
       contracts:
-        specifier: '*'
+        specifier: workspace:*
         version: link:../contracts
       graphql-request:
         specifier: ^6.1.0
         version: 6.1.0(graphql@16.8.1)
       shared:
-        specifier: '*'
+        specifier: workspace:*
         version: link:../shared
       zod:
         specifier: ^3.22.4
         version: 3.22.4
+    devDependencies:
+      esbuild:
+        specifier: ^0.19.11
+        version: 0.19.11
 
   apps/summerfi-api/lib/portfolio-assets:
     dependencies:
+      node-fetch:
+        specifier: ^3.3.2
+        version: 3.3.2
       shared:
-        specifier: '*'
+        specifier: workspace:*
         version: link:../shared
       zod:
         specifier: ^3.22.4
@@ -131,7 +138,7 @@ importers:
         specifier: ^0.1.14
         version: 0.1.30
       shared:
-        specifier: '*'
+        specifier: workspace:*
         version: link:../shared
       viem:
         specifier: ^1.19.3
@@ -152,7 +159,7 @@ importers:
         specifier: ^3.3.2
         version: 3.3.2
       shared:
-        specifier: '*'
+        specifier: workspace:*
         version: link:../shared
       zod:
         specifier: ^3.22.4
@@ -170,19 +177,19 @@ importers:
         specifier: ^1.17.0
         version: 1.17.0
       '@oasisdex/addresses':
-        specifier: ^0.1.18
-        version: 0.1.30
+        specifier: 0.1.16-dma-v2-workers.1
+        version: 0.1.16-dma-v2-workers.1
       '@oasisdex/dma-library':
-        specifier: 0.5.26-beta.2
-        version: 0.5.26-beta.2
+        specifier: 0.5.21-dma-v2-workers.2
+        version: 0.5.21-dma-v2-workers.2
       contracts:
-        specifier: '*'
+        specifier: workspace:*
         version: link:../contracts
       node-fetch:
         specifier: ^3.3.2
         version: 3.3.2
       shared:
-        specifier: '*'
+        specifier: workspace:*
         version: link:../shared
       viem:
         specifier: ^1.19.11
@@ -190,6 +197,10 @@ importers:
       zod:
         specifier: ^3.22.4
         version: 3.22.4
+    devDependencies:
+      esbuild:
+        specifier: ^0.19.11
+        version: 0.19.11
 
   apps/summerfi-api/lib/shared:
     dependencies:
@@ -2430,12 +2441,16 @@ packages:
       fastq: 1.16.0
     dev: true
 
+  /@oasisdex/addresses@0.1.16-dma-v2-workers.1:
+    resolution: {integrity: sha512-jQvtEOWCmA/O6kTpg3ATWJq90ipuEzgNDCfv5R+43gUc9mHXHIFKjwAHuhmKyCkXO92nQFkP7sk8MJbw9A0hRw==}
+    dev: false
+
   /@oasisdex/addresses@0.1.30:
     resolution: {integrity: sha512-Gl1ez3g9DL7NwzW+UZdOz6Wi+MWJ7XOp1cxIBs5H+UDULkCp20jsoSrrwaGD1/zxJLU5VGFhA3/68YvbKHdP0w==}
     dev: false
 
-  /@oasisdex/dma-library@0.5.26-beta.2:
-    resolution: {integrity: sha512-agzPk6W8LLbgGx3xXBFZtVsZfxRdeS5f9Y74Uvv3ZoaDqAeU2jpU01+bmss+Xrf2aie0zA2Ix2ltfY5ZAn0TsA==}
+  /@oasisdex/dma-library@0.5.21-dma-v2-workers.2:
+    resolution: {integrity: sha512-3ndvitCIs9JH5QjhgUV848cOkDJ613/wvQ1fVNy0bDV/FgPLXGdrEV0aLuupPxG3ajBWHUu+VDDH/xyLHtZtyw==}
     dependencies:
       bignumber.js: 9.0.1
       ethers: 5.6.2
@@ -2532,8 +2547,8 @@ packages:
       tslib: 2.6.2
     dev: false
 
-  /@tsconfig/node18@18.2.2:
-    resolution: {integrity: sha512-d6McJeGsuoRlwWZmVIeE8CUA27lu6jLjvv1JzqmpsytOYYbVi1tHZEnwCNVOXnj4pyLvneZlFlpXUK+X9wBWyw==}
+  /@tsconfig/node20@20.1.2:
+    resolution: {integrity: sha512-madaWq2k+LYMEhmcp0fs+OGaLFk0OenpHa4gmI4VEmCKX4PJntQ6fnnGADVFrVkBj0wIdAlQnK/MrlYTHsa1gQ==}
     dev: true
 
   /@types/aws-lambda@8.10.131:
diff --git a/tsconfig.json b/tsconfig.json
index 6b7962de03..5e4187ebe9 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,3 +1,3 @@
 {
-  "extends": "tsconfig/base.json"
+  "extends": "./packages/tsconfig/base.json"
 }