Merge branch 'DefiLlama:main' into main

DefiLlama · Jan 7, 2025 · 437d475 · 437d475
2 parents abba669 + b83c5e7
commit 437d475
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 12 deletions.
diff --git a/projects/folks-galgo/index.js b/projects/folks-galgo/index.js
@@ -26,4 +26,5 @@ module.exports.hallmarks = [
   [1711900800, "Algo Gov"], //11
   [1719763200, "Algo Gov"], //12
   [1727712000, "Algo Gov"], //13
+  [1735660800, "Algo Gov"], //14
 ]
diff --git a/projects/gate-io/index.js b/projects/gate-io/index.js
@@ -109,7 +109,8 @@ const config = {
       "0xD793281182A0e3E023116004778F45c29fc14F19",
       "0xc882b111a75c0c657fc507c04fbfcd2cc984f071",
       "0x85FAa6C1F2450b9caEA300838981C2e6E120C35c",
-      "0xeb01f8cdae433e7b55023ff0b2da44c4c712dce2"
+      "0xeb01f8cdae433e7b55023ff0b2da44c4c712dce2",
+      "0xffeb0f61871acdb4838dfc6d5082f063e738e421"
     ]
   },
   bitcoin: {
@@ -1650,14 +1651,6 @@ const config = {
       "0xffeb0f61871acdb4838dfc6d5082f063e738e421"
     ]
   },
-  "era": {
-    "owners": [
-      "0x0d0707963952f2fba59dd06f2b425ace40b492fe",
-      "0x6596da8b65995d5feacff8c2936f0b7a2051b0d0",
-      "0x1c4b70a3968436b9a0a9cf5205c787eb81bb558c",
-      "0xffeb0f61871acdb4838dfc6d5082f063e738e421"
-    ]
-  }
 };
 
 const unsupportedChains = ['aeternity', 'beam', 'binance', 'bitchain', 'bitcoincash', 'bittensor', 'bone', 'callisto', 'chainx', 'clv', 'concordium', 'conflux', 'cmp', 'dash', 'cube', 'defichain', 'edg', 'elastos', 'elys', 'equilibrium', 'evmos', 'filecoin', 'findora', 'flow', 'fusion', 'heiko', 'hydra', 'hyperliquid', 'icon', 'icp', 'interlay', 'kadena', 'karura', 'kava', 'kintsugi', 'kusuma', 'manta_atlantic', 'lisk', 'neo', 'neo3',  'near', 'nibiru', 'nuls', 'ontology', 'oasis', 'parallel', 'pokt', 'polkadex', 'proton', 'reef', 'rvn', 'shiden', 'sora', 'stafi', 'starcoin', 'syscoin', 'stellar', 'telos', 'thorchain', 'velas', 'venom', 'vite', 'waves', 'wax', 'zilliqa', ]

diff --git a/projects/helper/chain/aeternity.js b/projects/helper/chain/aeternity.js
@@ -1,4 +1,5 @@
 const axios = require('axios');
+const sdk = require('@defillama/sdk')
 
 const endpoint = 'https://mainnet.aeternity.io/v2/accounts'; // Replace with the appropriate endpoint
 

diff --git a/projects/lineabank/index.js b/projects/lineabank/index.js
@@ -9,7 +9,8 @@ const config = {
   bsquared: '0x72f7a8eb9F83dE366AE166DC50F16074076C3Ea6',
   bob: '0x77cabFd057Bd7C81c011059F1bf74eC1fBeDa971',
   btr: '0xf1E25704e75dA0496B46Bf4E3856c5480A3c247F',
-  mint: '0x0f225d10dd29D4703D42C5E93440F828bf04D150'
+  mint: '0x0f225d10dd29D4703D42C5E93440F828bf04D150',
+  taiko: '0x803a61d82BaD2743bE35Be5dC6DEA0CccE82C056'
 }
 
 const abis = {

diff --git a/projects/margined-protocol/index.js b/projects/margined-protocol/index.js
@@ -12,6 +12,8 @@ const osmosisVaults = {
   OSMORedemption: "osmo15fqmdl8lfl9h0qflljd63ufw9j2m7xmsk3hu5vsn8xpta4hk5chqt7mddc",
   TIARedemption: "osmo1reyz7pwu7y9e7lmzqg6j4h7jcv32du7n7jhnk2lz93a9lxr56ess2qtgzl",
   ATOMRedemption: "osmo1hvl5kj4xzdj4udxjv2dzk2zfqhzkd9afqygwq3t84tn53e0250zqrltj48",
+  DYDXRedemption: "osmo1grs74ux62lukjdlfs9ll4myyulcyjcd4uzwpw3cgnzdygtsspp2se2ense",
+  BTCUSDC: "osmo193kjx80ag4tck2enuxcprxnrcusemmh5mun5k87c96d7swz6y2dqf39rxe",
 }
 
 const neutronVaults = {
@@ -22,6 +24,7 @@ const neutronVaults = {
   NTRNUSDC: "neutron1t0fl9k43g86sv60ghx9vtwed9rpgtf49rxzm05ff477j23h52c6s0urdc7",
   TIAUSDC: "neutron1wv8pl7tsatzx6n9yaqfksvu5y0x7j50g6mhy636udwfn3vyqp0hsu7g8yk",
   ATOMUSDC: "neutron1krqwpk0kmphl93kykavp2fnr88g5rnrpk40c34a55yrl00tmfz0s99ewc6",
+  TIAFund: "neutron14q3umuuvyv6mndd5acuc3n8u5mlvrrq3kkzrputu3rkhz8nd2uzqmfl4v6",
 }
 
 const config = {

diff --git a/projects/rabbitx/index.js b/projects/rabbitx/index.js
@@ -4,11 +4,11 @@ const { staking } = require('../helper/staking')
 
 module.exports = {
   ethereum: {
-    tvl: sumTokensExport({ owners: ['0xFc7f884DE22a59c0009C91733196b012Aecb8F41', '0x3b8F6D6970a24A58b52374C539297ae02A3c4Ae4', '0x7fAb440A0251dA67B316d2c0431E3Ccf4520Cd42',], tokens: [ADDRESSES.ethereum.USDT]}),
+    tvl: sumTokensExport({ owners: ['0xFc7f884DE22a59c0009C91733196b012Aecb8F41', '0x3b8F6D6970a24A58b52374C539297ae02A3c4Ae4', '0x7fAb440A0251dA67B316d2c0431E3Ccf4520Cd42','0x1171651A1917C7DE22cF2047D1D7Cb9d97039811',], tokens: [ADDRESSES.ethereum.USDT]}),
     staking: staking('0x0c378FB17E87B180256a87e3f671cd83Bf3236DB', '0x3Ba925fdeAe6B46d0BB4d424D829982Cb2F7309e'),
   },
   blast: {
-    tvl: sumTokensExport({ owner: '0x3Ba925fdeAe6B46d0BB4d424D829982Cb2F7309e', tokens: [ADDRESSES.blast.USDB, ADDRESSES.blast.WETH]}),
+    tvl: sumTokensExport({ owners: ['0x3Ba925fdeAe6B46d0BB4d424D829982Cb2F7309e', '0x212f3a03b0e67f2d0afc7bca138707cf9fd6a0e6'], tokens: [ADDRESSES.blast.USDB, ADDRESSES.blast.WETH]}),
     staking: staking('0x67dBA61709D78806395acDBa3EF9Df686aF5dc24', '0x236bb48fcF61ce996B2C8C196a9258c176100c7d'),
   },
 }