Skip to content

Commit ccb88a7

Browse files
authored
Merge branch 'DefiLlama:main' into main
2 parents 839aae6 + 08239f8 commit ccb88a7

File tree

878 files changed

+8971
-4096
lines changed

Some content is hidden

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

878 files changed

+8971
-4096
lines changed

.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

package-lock.json

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

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
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/checkBTCDups.js",
18+
"check-bitcoin-duplicates": "node utils/scripts/checkBTCDupsv2.js",
19+
"string-timestamp": "node utils/scripts/stringTimestamp.js",
1920
"postinstall": "echo 'run \"npm update @defillama/sdk\" if you want lastest sdk changes' "
2021
},
2122
"author": "",

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")

projects/1155Tech/index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ const MARKET_1155TECH_CONTRACT = '0x33b77fAf955Ed3eDAf939ae66C4D7a2D78bc30C6';
44

55
module.exports = {
66
methodology: 'Value of all Keys across all art markets is TVL in the protocol',
7-
start: 7280880,
87
canto: {
98
tvl: sumTokensExport({ owner: MARKET_1155TECH_CONTRACT, tokens: [ADDRESSES.canto.NOTE] })
109
}

projects/21-co/index.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
const { cexExports } = require('../helper/cex')
2+
const bitcoinAddressBook = require('../helper/bitcoin-book/index.js')
3+
24

35
const config = {
46
bitcoin: {
5-
owners: [
6-
'1HTGi4tfXSEtcXD4pk6S3vBs3s64hWY1pW',
7-
'12WZhMFFLHQ4rCMSkeBfbJXRk7aGWyBh1M',
8-
],
7+
owners: bitcoinAddressBook.twentyOneCo
98
},
109
solana: {
1110
owners: [

projects/3xcalibur/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const { uniTvlExport } = require("../helper/calculateUniTvl.js");
22

33
module.exports = {
44
misrepresentedTokens: true,
5-
start: 1667689200,
5+
start: '2022-11-06',
66
arbitrum: {
77
tvl: uniTvlExport("0xD158bd9E8b6efd3ca76830B66715Aa2b7Bad2218", "arbitrum", undefined, undefined, { hasStablePools: true, useDefaultCoreAssets: true, }),
88
},

projects/88mph/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,6 @@ tvlExports.ethereum.staking = staking("0x1702F18c1173b791900F81EbaE59B908Da8F689
135135

136136
module.exports = {
137137
methodology: `Using the addresses for the fixed interest rate bonds we are able to find the underlying tokens held in each address. Once we have the underlying token we then get the balances of each of the tokens. For the CRV tokens used "CRV:STETH" for example, the address is replaced with the address of one of the tokens. In the example at hand the address is replaced with the "WETH" address so that the price can be calculated.`,
138-
start: 1606109629, // Monday, November 23, 2020 5:33:49 AM GMT
138+
start: '2020-11-23', // Monday, November 23, 2020 5:33:49 AM GMT
139139
...tvlExports
140140
}

0 commit comments

Comments
 (0)