Update package scripts and enhance queries for interest rates calcula…

…tion Removed the "tsc" and "watch" scripts from the scripts section of various package.json files and added new "dev" scripts for development mode. Improved the GraphQL query in MorphoBlueSubgraph for fetching the interest rates by introducing pagination logic. Enhanced the 'get-apy-function' to calculate APY for various time periods and include a detailed breakdown.
OasisDEX · Apr 17, 2024 · f7113d2 · f7113d2
1 parent 26b19f7
commit f7113d2
Show file tree

Hide file tree

Showing 34 changed files with 350 additions and 107 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,7 @@
 {
   "private": true,
   "scripts": {
+    "dev": "turbo run dev --concurrency=50",
     "prebuild": "turbo run prebuild --cache-dir=.turbo",
     "build": "turbo run build --cache-dir=.turbo",
     "lint": "turbo run lint --cache-dir=.turbo",

diff --git a/packages/aave-spark-subgraph/package.json b/packages/aave-spark-subgraph/package.json
@@ -5,10 +5,9 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
-    "tsc": "tsc",
-    "watch": "tsc -w",
     "test": "jest --passWithNoTests",
     "build": "tsc -b -v",
+    "dev": "tsc -b -w",
     "prebuild": "pnpm run generate-ts-types",
     "generate-ts-types": "graphql-codegen --config graphql.config.yml",
     "lint": "eslint .",

diff --git a/packages/abis/package.json b/packages/abis/package.json
@@ -2,10 +2,9 @@
   "name": "@summerfi/abis",
   "version": "1.0.0",
   "scripts": {
-    "tsc": "tsc",
-    "watch": "tsc -w",
     "test": "jest --passWithNoTests",
     "build": "tsc -b -v",
+    "dev": "tsc -b -w",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix"
   },

diff --git a/packages/ajna-subgraph/package.json b/packages/ajna-subgraph/package.json
@@ -5,10 +5,9 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
-    "tsc": "tsc",
-    "watch": "tsc -w",
     "test": "jest --passWithNoTests",
     "build": "tsc -b -v",
+    "dev": "tsc -b -w",
     "prebuild": "pnpm run generate-ts-types",
     "generate-ts-types": "graphql-codegen --config graphql.config.yml",
     "lint": "eslint .",

diff --git a/packages/automation-subgraph/package.json b/packages/automation-subgraph/package.json
@@ -5,10 +5,9 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
-    "tsc": "tsc",
-    "watch": "tsc -w",
     "test": "jest --passWithNoTests",
     "build": "tsc -b -v",
+    "dev": "tsc -b -w",
     "prebuild": "pnpm run generate-ts-types",
     "generate-ts-types": "graphql-codegen --config graphql.config.yml",
     "lint": "eslint .",

diff --git a/packages/common/package.json b/packages/common/package.json
@@ -10,11 +10,10 @@
     }
   },
   "scripts": {
-    "tsc": "tsc",
-    "watch": "tsc -w",
     "test": "jest --passWithNoTests",
     "testw": "jest --watch",
     "build": "tsc -b -v ",
+    "dev": "tsc -b -w",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix"
   },

diff --git a/packages/contracts-utils/package.json b/packages/contracts-utils/package.json
@@ -6,6 +6,7 @@
   "scripts": {
     "tsc": "tsc",
     "build": "tsc -b -v",
+    "dev": "tsc -b -w",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix"
   },

diff --git a/packages/core-contracts/package.json b/packages/core-contracts/package.json
@@ -18,6 +18,7 @@
     "watch": "tsc -w",
     "test": "jest --passWithNoTests",
     "build": "tsc -b tsconfig.build.json",
+    "dev": "tsc -b tsconfig.build.json -w",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
     "gen-versions": "hardhat run scripts/generate-versions.ts",

diff --git a/packages/deployment-configs/package.json b/packages/deployment-configs/package.json
@@ -10,9 +10,8 @@
     }
   },
   "scripts": {
-    "tsc": "tsc",
-    "watch": "tsc -w",
     "build": "tsc -b tsconfig.build.json",
+    "dev": "tsc -b tsconfig.build.json -w",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix"
   },

diff --git a/packages/deployment-types/package.json b/packages/deployment-types/package.json
@@ -10,9 +10,8 @@
     }
   },
   "scripts": {
-    "tsc": "tsc",
-    "watch": "tsc -w",
     "build": "tsc -b tsconfig.json",
+    "dev": "tsc -b tsconfig.json -w",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix"
   },

diff --git a/packages/deployment-utils/package.json b/packages/deployment-utils/package.json
@@ -10,9 +10,8 @@
     }
   },
   "scripts": {
-    "tsc": "tsc",
-    "watch": "tsc -w",
     "build": "tsc -b tsconfig.json",
+    "dev": "tsc -b tsconfig.json -w",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix"
   },

diff --git a/packages/morpho-blue-external-api-client/package.json b/packages/morpho-blue-external-api-client/package.json
@@ -4,10 +4,9 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
-    "tsc": "tsc",
-    "watch": "tsc -w",
     "test": "jest --passWithNoTests",
     "build": "tsc -b -v",
+    "dev": "tsc -b -w",
     "prebuild": "pnpm run generate-ts-types",
     "generate-ts-types": "graphql-codegen --config graphql.config.yml",
     "lint": "eslint .",

diff --git a/packages/morpho-blue-subgraph/.eslintrc.cjs b/packages/morpho-blue-subgraph/.eslintrc.cjs
@@ -1,10 +1,7 @@
 /** @type {import("eslint").Linter.Config} */
 module.exports = {
   root: true,
-  ignorePatterns: ['src/types/graphql/**'],
+  ignorePatterns: ['src/types/graphql/**', 'jest.config.js'],
   extends: ['@summerfi/eslint-config/library.cjs'],
   parser: '@typescript-eslint/parser',
-  parserOptions: {
-    project: true,
-  },
 }
diff --git a/packages/morpho-blue-subgraph/jest.config.js b/packages/morpho-blue-subgraph/jest.config.js
@@ -0,0 +1,27 @@
+const { pathsToModuleNameMapper } = require('ts-jest')
+
+/** @type {import('ts-jest').JestConfigWithTsJest} */
+module.exports = {
+  preset: 'ts-jest',
+  roots: ['<rootDir>/src'],
+  testMatch: ['**/__tests__/**/*.+(ts|tsx|js)', '**/?(*.)+(spec|test).+(ts|tsx|js)'],
+  silent: true,
+  maxWorkers: 1,
+  testTimeout: 10000,
+  testEnvironment: 'node',
+  setupFilesAfterEnv: ['jest-expect-message'],
+  testPathIgnorePatterns: ['dist', 'node_modules'],
+  moduleNameMapper: pathsToModuleNameMapper({
+    '@summerfi/serverless-shared': ['<rootDir>/../../packages/serverless-shared/src/index.ts'],
+    '@summerfi/serverless-shared/*': ['<rootDir>/../../packages/serverless-shared/src/*'],
+    '@summerfi/triggers-shared': ['<rootDir>/../../packages/triggers-shared/src/index.ts'],
+  }),
+  transform: {
+    '^.+\\.(ts|tsx)$': [
+      'ts-jest',
+      {
+        tsconfig: '<rootDir>/tsconfig.test.json',
+      },
+    ],
+  },
+}
diff --git a/packages/morpho-blue-subgraph/package.json b/packages/morpho-blue-subgraph/package.json
@@ -8,6 +8,7 @@
     "watch": "tsc -w",
     "test": "jest --passWithNoTests",
     "build": "tsc -b -v",
+    "dev": "tsc -b -w",
     "prebuild": "pnpm run generate-ts-types",
     "generate-ts-types": "graphql-codegen --config graphql.config.yml",
     "lint": "eslint .",
@@ -22,6 +23,7 @@
     "@summerfi/eslint-config": "workspace:*",
     "@summerfi/typescript-config": "workspace:*",
     "@types/node": "^20.12.7",
-    "eslint": "^8.57.0"
+    "eslint": "^8.57.0",
+    "jest": "^29.7.0"
   }
 }
diff --git a/packages/morpho-blue-subgraph/queries/intrest-rates.graphql b/packages/morpho-blue-subgraph/queries/intrest-rates.graphql
@@ -1,4 +1,10 @@
-query GetInterestRates($marketId: String!, $marketIdBytes: ID!, $fromTimestamp: BigInt!, $toTimestamp: BigInt!) {
+query GetInterestRates(
+    $marketId: String!,
+    $marketIdBytes: ID!,
+    $fromTimestamp: BigInt!,
+    $toTimestamp: BigInt!
+    $first: Int!,
+    $skip: Int!) {
     market(id: $marketIdBytes) {
         id
         collateralToken {
@@ -10,7 +16,64 @@ query GetInterestRates($marketId: String!, $marketIdBytes: ID!, $fromTimestamp:
             symbol
         }
     }
-    interestRates(where: { market: $marketId, timestamp_gte: $fromTimestamp, timestamp_lte: $toTimestamp }, orderBy: timestamp, orderDirection: asc) {
+    interestRates(
+        where: { market: $marketId, timestamp_gte: $fromTimestamp, timestamp_lte: $toTimestamp },
+        orderBy: timestamp,
+        orderDirection: asc,
+        first: $first,
+        skip: $skip) {
+        id
+        rate
+        timestamp
+        type
+    }
+    previousBorrowRate: interestRates(
+        where: { market: $marketId, timestamp_lt: $fromTimestamp, type: "borrow" },
+        orderBy: timestamp,
+        orderDirection: desc,
+        first: 1) {
+        id
+        rate
+        timestamp
+        type
+    }
+
+    previousLendRate: interestRates(
+        where: { market: $marketId, timestamp_lt: $fromTimestamp, type: "lend" },    interestRates(
+        where: { market: $marketId, timestamp_gte: $fromTimestamp, timestamp_lte: $toTimestamp },
+        orderBy: timestamp,
+        orderDirection: asc,
+        first: $first,
+        skip: $skip) {
+        id
+        rate
+        timestamp
+        type
+    }
+    previousBorrowRate: interestRates(
+        where: { market: $marketId, timestamp_lt: $fromTimestamp, type: "borrow" },
+        orderBy: timestamp,
+        orderDirection: desc,
+        first: 1) {
+        id
+        rate
+        timestamp
+        type
+    }
+
+    previousLendRate: interestRates(
+        where: { market: $marketId, timestamp_lt: $fromTimestamp, type: "lend" },
+        orderBy: timestamp,
+        orderDirection: desc,
+        first: 1) {
+        id
+        rate
+        timestamp
+        type
+    }
+    orderBy: timestamp,
+    orderDirection: desc,
+    first: 1) {
         id
         rate
         timestamp

diff --git a/packages/morpho-blue-subgraph/src/index.spec.ts b/packages/morpho-blue-subgraph/src/index.spec.ts
@@ -0,0 +1,47 @@
+import { getMorphoBlueSubgraphClient, MorphoBlueSubgraphClient } from '.'
+import { Logger } from '@aws-lambda-powertools/logger'
+import { ChainId } from '@summerfi/serverless-shared'
+
+const logger = new Logger({
+  serviceName: 'moorpho-blue-subgraph-tests',
+  environment: 'dev',
+  logLevel: 'debug',
+})
+
+function getTimestampInSeconds(unixTimestamp: number): number {
+  return Math.floor(unixTimestamp / 1000)
+}
+
+describe.skip('Exploration test MorphoBlue InterestRates', () => {
+  let client: MorphoBlueSubgraphClient
+  const wstETH_ETH_marketId: `0x${string}` =
+    '0xd0e50cdac92fe2172043f5e0c36532c6369d24947e40968f34a5e8819ca9ec5d'
+  const fromTimestamp_2024_04_01 = getTimestampInSeconds(new Date().setFullYear(2024, 3, 1))
+  const toTimestamp_2024_04_15 = getTimestampInSeconds(new Date().setFullYear(2024, 3, 15))
+
+  beforeAll(() => {
+    client = getMorphoBlueSubgraphClient({
+      chainId: ChainId.MAINNET,
+      urlBase: '', // set your urlBase here
+      logger,
+    })
+  })
+  it('should return arrays of interest rates', async () => {
+    logger.debug('Fetching interest rates', {
+      marketId: wstETH_ETH_marketId,
+      fromTimestamp: fromTimestamp_2024_04_01,
+      toTimestamp: toTimestamp_2024_04_15,
+    })
+
+    const result = await client.getInterestRate({
+      marketId: wstETH_ETH_marketId,
+      fromTimestamp: fromTimestamp_2024_04_01,
+      toTimestamp: toTimestamp_2024_04_15,
+    })
+
+    expect(result.debtToken.symbol).toBe('WETH')
+    expect(result.collateralToken.symbol).toBe('wstETH')
+
+    expect(result.interestRates.borrow[0].fromTimestamp).toBe(fromTimestamp_2024_04_01)
+  })
+})