Merge branch 'dev' into fix-automated-package-actions3

OasisDEX · Apr 23, 2024 · 6fa7097 · 6fa7097
2 parents 8f88b5a + 3efbc3f
commit 6fa7097
Show file tree

Hide file tree

Showing 121 changed files with 3,585 additions and 581 deletions.
diff --git a/.github/workflows/deploy-production.yaml b/.github/workflows/deploy-production.yaml
@@ -27,6 +27,9 @@ jobs:
       DEBANK_API_KEY: ${{ secrets.DEBANK_API_KEY }}
       DEBANK_API_URL: ${{ secrets.DEBANK_API_URL }}
       POWERTOOLS_LOG_LEVEL: ${{ vars.POWERTOOLS_LOG_LEVEL }}
+      REDIS_CACHE_URL: ${{ secrets.REDIS_CACHE_URL }}
+      REDIS_CACHE_USER: ${{ secrets.REDIS_CACHE_USER }}
+      REDIS_CACHE_PASSWORD: ${{ secrets.REDIS_CACHE_PASSWORD }}
 
     steps:
       - name: Git clone the repository

diff --git a/.github/workflows/deploy-staging.yaml b/.github/workflows/deploy-staging.yaml
@@ -27,6 +27,9 @@ jobs:
       DEBANK_API_KEY: ${{ secrets.DEBANK_API_KEY }}
       DEBANK_API_URL: ${{ secrets.DEBANK_API_URL }}
       POWERTOOLS_LOG_LEVEL: ${{ vars.POWERTOOLS_LOG_LEVEL }}
+      REDIS_CACHE_URL: ${{ secrets.REDIS_CACHE_URL }}
+      REDIS_CACHE_USER: ${{ secrets.REDIS_CACHE_USER }}
+      REDIS_CACHE_PASSWORD: ${{ secrets.REDIS_CACHE_PASSWORD }}
 
     steps:
       - name: Git clone the repository

diff --git a/.github/workflows/merge-main.yaml b/.github/workflows/merge-main.yaml
@@ -19,7 +19,7 @@ jobs:
         with:
           ref: dev
           fetch-depth: 0
-          github-token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.PAT }}
 
       - uses: actions/setup-node@v4
         with:
@@ -38,4 +38,4 @@ jobs:
           git push origin main
           git status
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.PAT }}
diff --git a/.gitignore b/.gitignore
@@ -49,6 +49,9 @@ artifacts
 # geneated GraphQL types
 /**/types/graphql/*.ts
 
+# other generated files
+/packages/**/src/generated/
+
 # nx files
 .nx
 

diff --git a/.prettierignore b/.prettierignore
@@ -16,4 +16,5 @@ abis
 artifacts
 **/core-contracts/src/
 **/.sst/**
-**/.turbo/**
+**/.turbo/**
+/packages/**/src/generated
diff --git a/package.json b/package.json
@@ -1,6 +1,7 @@
 {
   "private": true,
   "scripts": {
+    "dev": "turbo run dev --concurrency=100",
     "prebuild": "turbo run prebuild --cache-dir=.turbo",
     "build": "turbo run build --cache-dir=.turbo",
     "lint": "turbo run lint --cache-dir=.turbo",
@@ -33,7 +34,7 @@
     "@types/aws-lambda": "^8.10.137",
     "@types/jest": "^29.5.12",
     "@types/node": "^20.12.7",
-    "aws-cdk-lib": "2.137.0",
+    "aws-cdk-lib": "2.132.1",
     "constructs": "10.3.0",
     "dotenv": "^16.4.5",
     "esbuild": "^0.20.2",
@@ -53,7 +54,7 @@
   "name": "summerfi-monorepo",
   "packageManager": "pnpm@8.15.4",
   "engines": {
-    "node": ">=18"
+    "node": ">=20"
   },
   "dependencies": {
     "bignumber.js": "^9.1.2",

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/aave-spark-subgraph/queries/intrest-rates.graphql b/packages/aave-spark-subgraph/queries/intrest-rates.graphql
@@ -0,0 +1,49 @@
+query GetInterestRates(
+    $token: String!,
+    $tokenBytes: ID!,
+    $protocol: String!,
+    $fromTimestamp: BigInt!,
+    $toTimestamp: BigInt!
+    $first: Int!,
+    $skip: Int!) {
+
+    token(id: $tokenBytes) {
+        id
+        symbol
+        address
+        decimals
+    }
+
+    interestRates(
+        where: { token: $token, timestamp_gte: $fromTimestamp, timestamp_lte: $toTimestamp, protocol: $protocol },
+        orderBy: timestamp,
+        orderDirection: asc,
+        first: $first,
+        skip: $skip) {
+        id
+        rate
+        timestamp
+        type
+    }
+    previousBorrowRate: interestRates(
+        where: { token: $token, timestamp_lt: $fromTimestamp, type: "borrow-variable", protocol: $protocol },
+        orderBy: timestamp,
+        orderDirection: desc,
+        first: 1) {
+        id
+        rate
+        timestamp
+        type
+    }
+
+    previousLendRate: interestRates(
+        where: { token: $token, timestamp_lt: $fromTimestamp, type: "lend", protocol: $protocol },
+        orderBy: timestamp,
+        orderDirection: desc,
+        first: 1) {
+        id
+        rate
+        timestamp
+        type
+    }
+}