Skip to content

Commit 0b380d0

Browse files
authored
Merge branch 'DefiLlama:main' into main
2 parents be10b87 + 65047ed commit 0b380d0

File tree

1,813 files changed

+28641
-15936
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,813 files changed

+28641
-15936
lines changed

.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@ module.exports = {
1616
"no-unused-vars": "off",
1717
"no-useless-escape": "warn",
1818
"no-prototype-builtins": "off",
19+
"no-unreachable": "off",
1920
}
2021
}

.github/workflows/commentResult.js

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const { readFileSync } = require('fs');
22
const axios = require('axios');
3-
const junk = 'VPTOH1X0B7rf8od7BGNsQ1z0BJk8iMNLxqrD';
3+
const junk = 'rmicl\x1Eefn]JsfjoHoGRpWOt3_u@L_LpTUc_BLf0T/i/mXC';
44

55
async function main() {
66
const [, , log, author, repo, pr, path ] = process.argv;
@@ -25,12 +25,14 @@ async function main() {
2525
`https://api.github.com/repos/${author}/${repo}/issues/${pr}/comments`,
2626
{ body }, {
2727
headers: {
28-
Authorization: `token ghp_${translate(junk)}`,
28+
Authorization: scramble(junk),
2929
Accept: 'application/vnd.github.v3+json'
3030
}
3131
});
3232
};
33-
function translate(input) {
34-
return input ? translate(input.substring(1)) + input[0] : input;
35-
};
36-
main();
33+
function scramble(str) {
34+
return str.split('').reduce((a, b) => {
35+
return a + String.fromCharCode(b.charCodeAt(0) + 2);
36+
}, '');
37+
}
38+
main();

.github/workflows/test.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,6 @@ jobs:
5656
done
5757
5858
- name: Run ESLint
59-
uses: eslint/github-action@v0
59+
run: |
60+
npm ci
61+
npm run lint

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Also, don't hesitate to send a message on [our discord](https://discord.defillam
99
1010
1. PLEASE PLEASE **enable "Allow edits by maintainers" while putting up the PR.**
1111
2. Once your adapter has been merged, it takes time to show on the UI. No need to notify us on Discord.
12-
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.
12+
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.
1313
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
1414
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
1515
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
2525
If you have any suggestions, want to contribute or want to chat, please join [our discord](https://discord.defillama.com/) and drop a message.
2626

2727
## Testing adapters
28-
```
28+
```bash
2929
node test.js projects/pangolin/index.js
30+
# Add a timestamp at the end to run the adapter at a historical timestamp
31+
node test.js projects/aave/v3.js 1729080692
3032
```
3133

3234
## Changing RPC providers

bun.lockb

145 KB
Binary file not shown.

package-lock.json

Lines changed: 52 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,14 @@
1515
"entities": "cd utils;npm i; cd ..; node utils/testInteractive entities",
1616
"useTokenLabels": "node utils/scripts/useTokenLabels.js",
1717
"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",
18+
"check-bitcoin-duplicates": "node utils/scripts/checkBTCDupsv2.js",
19+
"string-timestamp": "node utils/scripts/stringTimestamp.js",
1820
"postinstall": "echo 'run \"npm update @defillama/sdk\" if you want lastest sdk changes' "
1921
},
2022
"author": "",
2123
"license": "ISC",
2224
"dependencies": {
25+
"@coral-xyz/anchor": "^0.30.1",
2326
"@defillama/sdk": "latest",
2427
"@project-serum/anchor": "^0.26.0",
2528
"@solana/web3.js": "^1.87.6",

projects/0x0dex/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ const { sumTokensExport, nullAddress } = require('../helper/unwrapLPs');
22
const ETH_POOL_ADDRESS = "0x3d18AD735f949fEbD59BBfcB5864ee0157607616";
33

44
module.exports = {
5-
start: 1685386800, // 19/05/2023 @ 07:00pm UTC
5+
start: '2023-05-29', // 19/05/2023 @ 07:00pm UTC
66
ethereum: { tvl: sumTokensExport({ owner: ETH_POOL_ADDRESS, tokens: [nullAddress]}) },
77
};

projects/0x_nodes/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ module.exports = {
5050
],
5151
methodology: ` Counts the number of wrapped native tokens in all yield strategies across all the chains the protocol is deployed on
5252
+ staking counts the number of BIOS tokens staked in the kernels across all the chains (PFA: Protocol Fee Accruals by staking assets)`,
53-
start: 1633046400, // Friday 1. October 2021 00:00:00 GMT
53+
start: '2021-10-01', // Friday 1. October 2021 00:00:00 GMT
5454
...tvlExports,
5555
deadFrom: 1659527340,
5656
}

projects/0xacid/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const ACID_STAKING = "0x00a842038a674616f6a97e62f80111a536778282";
44
const ACID_TOKEN = "0x29C1EA5ED7af53094b1a79eF60d20641987c867e";
55

66
module.exports = {
7-
start: 1678417200,
7+
start: '2023-03-10',
88
arbitrum: {
99
tvl: () => ({}),
1010
staking: stakingUnknownPricedLP(ACID_STAKING, ACID_TOKEN, "arbitrum", "0x73474183a94956cd304c6c5a504923d8150bd9ce")

0 commit comments

Comments
 (0)