Merge branch 'DefiLlama:main' into main

Author: kanvgupta

.eslintrc.js

@@ -0,0 +1,41 @@
+name: Build tvlModules and upload artifact
+
+on:
+  push:
+    branches: [ "main" ]
+
+jobs:
+  build-and-upload:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: pnpm/action-setup@v4
+        name: Install pnpm
+        with:
+          version: 10
+          run_install: false
+
+      - name: Install Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: 'pnpm'
+
+      - name: Install dependencies
+        run: pnpm install
+
+
+      - name: Run buildImports script
+        run: node scripts/buildImports.js
+
+      - name: Publish tvlModules.json as "latest" release
+        uses: ncipollo/release-action@v1
+        with:
+          tag: latest
+          name: Latest tvlModules
+          artifacts: scripts/tvlModules.json
+          allowUpdates: true

.github/workflows/build-modules.yml

@@ -10,8 +10,27 @@ jobs:
         with:
           output: 'json'
           fileOutput: 'json'
-      - name: Check out repository code
-        uses: actions/checkout@v2
+      
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: pnpm/action-setup@v4
+        name: Install pnpm
+        with:
+          version: 10
+          run_install: false
+
+      - name: Install Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: 'pnpm'
+
+      - name: Install dependencies
+        run: pnpm install
+
       - name: Run changes files through test script
         env:
           LLAMA_DEBUG_MODE: "true"
@@ -27,10 +46,7 @@ jobs:
             exit 0
           fi
 
-          npm remove typescript @types/async-retry @types/bn.js ts-node @solendprotocol/solend-sdk @hover-labs/kolibri-js
-          # npm ci --omit=dev
-          npm ci
-          # npm update @defillama/sdk
+          # pnpm remove typescript @types/async-retry @types/bn.js ts-node @solendprotocol/solend-sdk @hover-labs/kolibri-js
 
           # fail if package.json or package-lock.json is changed
           FILES_MODIFIED=${{ steps.file_changes.outputs.files_modified }}
@@ -56,5 +72,4 @@ jobs:
         
       - name: Run ESLint
         run: |
-          npm ci
           npm run lint

.github/workflows/test.yml

@@ -10,4 +10,6 @@ yarn.lock
 .vscode
 projects/binance/data.csv
 
-*.log
+*.log
+
+scripts/tvlModules.json

.gitignore

@@ -0,0 +1,16 @@
+module.exports = [
+    {
+        files: ["**/*.js"],
+        ignores: ["projects/test/*"],
+        languageOptions: {
+            ecmaVersion: "latest",
+        },
+        rules: {
+            "no-case-declarations": "off",
+            "no-unused-vars": "off",
+            "no-useless-escape": "warn",
+            "no-prototype-builtins": "off",
+            "no-unreachable": "off",
+        }
+    }
+];

eslint.config.js

@@ -57,7 +57,7 @@ const positions = async () => {
   const prices = {}
   for (const c of collAddresses) {
     const info = await getTokenInfo(`ethereum:${c}`)
-    prices[c] = BigNumber(info.price).times(10e18).toFixed()
+    prices[c] = BigNumber(info.price).times(10e17).toFixed()
   }
 
   const vesselCounts = (

liquidations/gravita-protocol/index.ts

@@ -7,8 +7,9 @@
     "test": "echo \"Error: no test specified\" && exit 1",
     "weeklyChanges": "git pull && git diff $(git log -1 --before=@{7.days.ago} --format=%H) --stat | grep -E \"projects/\" | cut -d / -f 2 | cut -d \" \" -f 1 | uniq | wc -l",
     "dev": "babel-watch curve.js",
-    "lint": "eslint -c .eslintrc.js .",
-    "eslint:github-action": "eslint -c .eslintrc.js .",
+    "build": "node scripts/buildImports.js",
+    "lint": "eslint -c eslint.config.js .",
+    "eslint:github-action": "eslint -c eslint.config.js .",
     "test-interactive": "node utils/testInteractive",
     "tvl": "cd utils;npm i; cd ..; node utils/testInteractive",
     "treasury": "cd utils;npm i; cd ..; node utils/testInteractive treasury",
@@ -28,14 +29,15 @@
     "@defillama/sdk": "latest",
     "@project-serum/anchor": "^0.26.0",
     "@solana/web3.js": "^1.87.6",
-    "@solendprotocol/solend-sdk": "^0.4.3",
     "@supercharge/promise-pool": "^2.1.0",
-    "async-retry": "^1.3.3",
     "axios": "^1.6.5",
+    "base-x": "^5.0.1",
     "bignumber.js": "^9.0.1",
     "blakejs": "^1.2.1",
     "bn.js": "^5.2.1",
     "borsh": "^0.7.0",
+    "bs58": "^6.0.0",
+    "buffer-layout": "^1.2.2",
     "curve25519-js": "^0.0.4",
     "dotenv": "^8.6.0",
     "ethers": "^6.0.0",
@@ -47,8 +49,7 @@
     "miscreant": "^0.3.2",
     "p-limit": "^3.1.0",
     "starknet": "^5.24.3",
-    "tron-format-address": "^0.1.8",
-    "typescript": "^5.0.0"
+    "ws": "^8.18.3"
   },
   "overrides": {
     "ansi-regex": "5.0.1",
@@ -61,9 +62,6 @@
   },
   "description": "",
   "devDependencies": {
-    "@types/async-retry": "^1.4.5",
-    "@types/bn.js": "^5.1.0",
-    "eslint": "^8.32.0",
-    "ts-node": "^10.8.1"
+    "eslint": "^9.38.0"
   }
 }