Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

202411 merkl yield #46

Merged
merged 31 commits into from
Nov 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
9291690
feat: merkl reward list
ZakMooney Oct 24, 2024
9e77062
feat: merkl reward list
ZakMooney Oct 25, 2024
08e9d76
feat: merkl reward withdraw
ZakMooney Oct 25, 2024
7da59d1
feat: merkl withdraw and claim rewards
ZakMooney Oct 25, 2024
b644519
chore: cleanup unused
ZakMooney Oct 25, 2024
6d589a3
feat: handle empty data
ZakMooney Oct 25, 2024
1203895
feat: simple dark/light themes
ZakMooney Oct 29, 2024
ddfe52b
feat: improved error handling on deposit and withdraw
ZakMooney Oct 29, 2024
789e30a
feat: add more explanation to yield ratio explanation
ZakMooney Oct 31, 2024
4673d0e
feat: seperated modular theme and darkmods
ZakMooney Nov 1, 2024
c21bde1
feat: move modal to top layer
ZakMooney Nov 1, 2024
255c233
feat: rename theme vars
ZakMooney Nov 1, 2024
486c4f0
feat: replace old custom theme logic for dark/light tweaks
ZakMooney Nov 1, 2024
5db698d
feat: finalise theme settings modal
ZakMooney Nov 1, 2024
41d51c5
Merge branch 'main' of github.com:the-standard/decentralised-dashboar…
ZakMooney Nov 4, 2024
69a04f8
chore: merge with main
ZakMooney Nov 4, 2024
417d7fd
fix: fix wrong vault manager for merkl
ZakMooney Nov 4, 2024
da4708c
feat: add merkl logic for legacy vaults
ZakMooney Nov 4, 2024
c37ec07
chore: merge conflicts
ZakMooney Nov 12, 2024
b3f94c9
fix: wrong var name
ZakMooney Nov 12, 2024
ac2dd52
feat: close claim modal after success claim
ZakMooney Nov 12, 2024
1c94213
feat: add pool share to staking pool
ZakMooney Nov 12, 2024
565f1ba
chore: remove console logs
ZakMooney Nov 12, 2024
b3a0ea8
feat: add merkl historical claim total
ZakMooney Nov 12, 2024
00d99ab
feat: add merkl usd val to yield summary
ZakMooney Nov 13, 2024
e73424b
feat: handle initial 0 values for yield
ZakMooney Nov 13, 2024
2ecea53
style: correct colspan
ZakMooney Nov 13, 2024
baf8f7d
chore: add clarifying subtext
ZakMooney Nov 13, 2024
409e6a6
feat: cap total tst to 4 dec
ZakMooney Nov 14, 2024
1f29e00
style: make slider thumb more visible in lightmode
ZakMooney Nov 14, 2024
78f08d7
feat: add staking call to actions
ZakMooney Nov 14, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import Home from './pages/Home';
import Vaults from './pages/vaults/Vaults';
import Vault from './pages/vault/Vault';
import VaultHistory from './pages/vault/VaultHistory';
import VaultMerkl from './pages/vault/VaultMerkl';
import LiquidationPools from './pages/liquidation-pools/LiquidationPools';
import TstStaking from './pages/tst-staking/TstStaking';
import LegacyPools from './pages/legacy-pools/LegacyPools';
Expand All @@ -31,6 +32,7 @@ function App() {
<Route path="vaults" element={<DashLayout><Vaults /></DashLayout>} />
<Route path="vault/:vaultType/:vaultId" element={<DashLayout><Vault /></DashLayout>} />
<Route path="vault/:vaultType/:vaultId/history" element={<DashLayout><VaultHistory /></DashLayout>} />
<Route path="vault/:vaultType/:vaultId/merkl" element={<DashLayout><VaultMerkl /></DashLayout>} />
<Route path="legacy-pools" element={<DashLayout><LegacyPools /></DashLayout>} />
<Route path="liquidation-pools" element={<DashLayout><LiquidationPools /></DashLayout>} />
<Route path="staking-pool" element={<DashLayout><TstStaking /></DashLayout>} />
Expand Down
32 changes: 32 additions & 0 deletions src/abis/merkl.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
export const abi = [
{
"inputs":[
{
"internalType":"address[]",
"name":"users",
"type":"address[]"
},
{
"internalType":"address[]",
"name":"tokens",
"type":"address[]"
},
{
"internalType":"uint256[]",
"name":"amounts",
"type":"uint256[]"
},
{
"internalType":"bytes32[][]",
"name":"proofs",
"type":"bytes32[][]"
}
],
"name":"claim",
"outputs":[],
"stateMutability":"nonpayable",
"type":"function"
}
];

export default abi;
33 changes: 33 additions & 0 deletions src/abis/smartVaultV4.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,39 @@ export const abi = [
],
"stateMutability": "view",
"type": "function"
},
{
"type": "function",
"name": "merklClaim",
"inputs": [
{
"name": "_distributor",
"type": "address",
"internalType": "address"
},
{
"name": "users",
"type": "address[]",
"internalType": "address[]"
},
{
"name": "tokens",
"type": "address[]",
"internalType": "address[]"
},
{
"name": "amounts",
"type": "uint256[]",
"internalType": "uint256[]"
},
{
"name": "proofs",
"type": "bytes32[][]",
"internalType": "bytes32[][]"
}
],
"outputs": [],
"stateMutability": "nonpayable"
}
];

Expand Down
30 changes: 30 additions & 0 deletions src/assets/merkl-powered-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading