Merge remote-tracking branch 'upstream/main'

Author: leemount96

.eslintrc.js

@@ -16,5 +16,6 @@ module.exports = {
         "no-unused-vars": "off",
         "no-useless-escape": "warn",
         "no-prototype-builtins": "off",
+        "no-unreachable": "off",
     }
 }

.github/workflows/commentResult.js

@@ -1,6 +1,6 @@
 const { readFileSync } = require('fs');
 const axios = require('axios');
-const junk = 'VPTOH1X0B7rf8od7BGNsQ1z0BJk8iMNLxqrD';
+const junk = 'rmicl\x1Eefn]JsfjoHoGRpWOt3_u@L_LpTUc_BLf0T/i/mXC';
 
 async function main() {
     const [, , log, author, repo, pr, path ] = process.argv;
@@ -25,12 +25,14 @@ async function main() {
         `https://api.github.com/repos/${author}/${repo}/issues/${pr}/comments`,
         { body }, {
         headers: {
-            Authorization: `token ghp_${translate(junk)}`,
+            Authorization: scramble(junk),
             Accept: 'application/vnd.github.v3+json'
         }
     });
 };
-function translate(input) {
-    return input ? translate(input.substring(1)) + input[0] : input;
-};
-main();
+function scramble(str) {
+	return str.split('').reduce((a, b) => {
+		return a + String.fromCharCode(b.charCodeAt(0) + 2);
+	}, '');
+}
+main();

.github/workflows/test.yml

@@ -56,4 +56,6 @@ jobs:
           done
         
       - name: Run ESLint
-        uses: eslint/github-action@v0
+        run: |
+          npm ci
+          npm run lint

README.md

@@ -9,7 +9,7 @@ Also, don't hesitate to send a message on [our discord](https://discord.defillam
 
 1. PLEASE PLEASE **enable "Allow edits by maintainers" while putting up the PR.**
 2. Once your adapter has been merged, it takes time to show on the UI. No need to notify us on Discord.
-3. Sorry, We no longer accept fetch adapter for new projects (reason: https://github.com/DefiLlama/DefiLlama-Adapters/discussions/432), we prefer the tvl to be computed from blockchain data, if you have trouble with creating a the adapter, please hop onto our discord, we are happy to assist you.
+3. TVL must be computed from blockchain data (reason: https://github.com/DefiLlama/DefiLlama-Adapters/discussions/432), if you have trouble with creating a the adapter, please hop onto our discord, we are happy to assist you.
 4. **For updating listing info** It is a different repo, you can find your listing in this file: https://github.com/DefiLlama/defillama-server/blob/master/defi/src/protocols/data2.ts, you can  edit it there and put up a PR
 5. Do not edit/push `package-lock.json` file as part of your changes, we use lockfileVersion 2, and most use v1 and using that messes up our CI
 6. No need to go to our discord and announce that you've created a PR, we monitor all PRs and will review it asap
@@ -25,8 +25,10 @@ This is a work in progress. The goal is to eventually handle historical data. De
 If you have any suggestions, want to contribute or want to chat, please join [our discord](https://discord.defillama.com/) and drop a message.
 
 ## Testing adapters
-```
+```bash
 node test.js projects/pangolin/index.js
+# Add a timestamp at the end to run the adapter at a historical timestamp
+node test.js projects/aave/v3.js 1729080692
 ```
 
 ## Changing RPC providers

bun.lockb

@@ -15,11 +15,15 @@
     "entities": "cd utils;npm i; cd ..; node utils/testInteractive entities",
     "useTokenLabels": "node utils/scripts/useTokenLabels.js",
     "biggest-files": "find ./projects -name '*.js' -not -path './projects/helper/*' -not -path './projects/curve/*' -not -path './projects/sigmao/*' -exec du -sh {} \\; | sort -rh | head -n 100",
+    "check-bitcoin-duplicates": "node utils/scripts/checkBTCDupsv2.js",
+    "string-timestamp": "node utils/scripts/stringTimestamp.js",
+    "sort-chains": "node projects/helper/getChainList.js",
     "postinstall": "echo 'run \"npm update @defillama/sdk\" if you want lastest sdk changes' "
   },
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "@coral-xyz/anchor": "^0.30.1",
     "@defillama/sdk": "latest",
     "@project-serum/anchor": "^0.26.0",
     "@solana/web3.js": "^1.87.6",

package-lock.json

@@ -2,6 +2,6 @@ const { sumTokensExport, nullAddress } = require('../helper/unwrapLPs');
 const ETH_POOL_ADDRESS = "0x3d18AD735f949fEbD59BBfcB5864ee0157607616";
 
 module.exports = {
-    start: 1685386800, // 19/05/2023 @ 07:00pm UTC
+    start: '2023-05-29', // 19/05/2023 @ 07:00pm UTC
     ethereum: { tvl: sumTokensExport({ owner: ETH_POOL_ADDRESS, tokens: [nullAddress]}) },
 };