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.

Sign up for GitHub

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

update(landing page + docs + eco page): update docs; remove bad links; eco page hotfixes #975

Merged
merged 3 commits into from
Nov 27, 2024
Merged

update(landing page + docs + eco page): update docs; remove bad links; eco page hotfixes #975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a4313d
fix urls
masterzorgon Nov 25, 2024
e09b39d
update fee docs
masterzorgon Nov 25, 2024
03925e0
remove phishing link
masterzorgon Nov 26, 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
10 changes: 5 additions & 5 deletions apps/marginfi-landing-page/src/components/footer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ const CONTENT: {
href: "https://twitter.com/marginfi",
label: "X",
},
{
icon: <IconBrandDiscordFilled />,
href: "https://discord.gg/mrgn",
label: "Discord",
},
// {
// icon: <IconBrandDiscordFilled />,
// href: "https://discord.gg/mrgn",
// label: "Discord",
// },
{
icon: <IconBrandGithub />,
href: "https://github.com/mrgnlabs/",
Expand Down
10 changes: 5 additions & 5 deletions apps/marginfi-landing-page/src/components/header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,11 @@ const CONTENT = {
href: "https://twitter.com/marginfi",
label: "X",
},
{
icon: <IconBrandDiscordFilled />,
href: "https://discord.gg/mrgn",
label: "Discord",
},
// {
// icon: <IconBrandDiscordFilled />,
// href: "https://discord.gg/mrgn",
// label: "Discord",
// },
{
icon: <IconBrandGithub />,
href: "https://github.com/mrgnlabs/",
Expand Down
7 changes: 7 additions & 0 deletions apps/marginfi-v2-docs/src/app/introduction/page.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,13 @@ This ensures the security and stability of the protocol by mitigating the risk o

## Fees and Yield {{ tag: '', label: '' }}

### Spead Fees

marginfi takes a 12.5% interest rate spread fee on $USDC, $USDT and $SOL, and a 13.5% interest rate spread fee for every other asset.

An interest rate spread fee is the difference between the borrowing and lending rates that the protocol charges. Meaning if you were borrowing $USDC at 10% APY and lenders are receiving 8% APY, marginfi would take 12.5% of that 2% spread as the fee.


### Lending Yield

marginfi allows users to deposit supported tokens into the protocol and earn yield on them. This is made possible by lenders on the platform who borrow these tokens and pay interest on them.
Expand Down
18 changes: 9 additions & 9 deletions apps/marginfi-v2-docs/src/components/Footer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,13 @@ function GitHubIcon(props: React.ComponentPropsWithoutRef<'svg'>) {
)
}

function DiscordIcon(props: React.ComponentPropsWithoutRef<'svg'>) {
return (
<svg viewBox="0 0 20 20" aria-hidden="true" {...props}>
<path d="M16.238 4.515a14.842 14.842 0 0 0-3.664-1.136.055.055 0 0 0-.059.027 10.35 10.35 0 0 0-.456.938 13.702 13.702 0 0 0-4.115 0 9.479 9.479 0 0 0-.464-.938.058.058 0 0 0-.058-.027c-1.266.218-2.497.6-3.664 1.136a.052.052 0 0 0-.024.02C1.4 8.023.76 11.424 1.074 14.782a.062.062 0 0 0 .024.042 14.923 14.923 0 0 0 4.494 2.272.058.058 0 0 0 .064-.02c.346-.473.654-.972.92-1.496a.057.057 0 0 0-.032-.08 9.83 9.83 0 0 1-1.404-.669.058.058 0 0 1-.029-.046.058.058 0 0 1 .023-.05c.094-.07.189-.144.279-.218a.056.056 0 0 1 .058-.008c2.946 1.345 6.135 1.345 9.046 0a.056.056 0 0 1 .059.007c.09.074.184.149.28.22a.058.058 0 0 1 .023.049.059.059 0 0 1-.028.046 9.224 9.224 0 0 1-1.405.669.058.058 0 0 0-.033.033.056.056 0 0 0 .002.047c.27.523.58 1.022.92 1.495a.056.056 0 0 0 .062.021 14.878 14.878 0 0 0 4.502-2.272.055.055 0 0 0 .016-.018.056.056 0 0 0 .008-.023c.375-3.883-.63-7.256-2.662-10.246a.046.046 0 0 0-.023-.021Zm-9.223 8.221c-.887 0-1.618-.814-1.618-1.814s.717-1.814 1.618-1.814c.908 0 1.632.821 1.618 1.814 0 1-.717 1.814-1.618 1.814Zm5.981 0c-.887 0-1.618-.814-1.618-1.814s.717-1.814 1.618-1.814c.908 0 1.632.821 1.618 1.814 0 1-.71 1.814-1.618 1.814Z" />
</svg>
)
}
// function DiscordIcon(props: React.ComponentPropsWithoutRef<'svg'>) {
// return (
// <svg viewBox="0 0 20 20" aria-hidden="true" {...props}>
// <path d="M16.238 4.515a14.842 14.842 0 0 0-3.664-1.136.055.055 0 0 0-.059.027 10.35 10.35 0 0 0-.456.938 13.702 13.702 0 0 0-4.115 0 9.479 9.479 0 0 0-.464-.938.058.058 0 0 0-.058-.027c-1.266.218-2.497.6-3.664 1.136a.052.052 0 0 0-.024.02C1.4 8.023.76 11.424 1.074 14.782a.062.062 0 0 0 .024.042 14.923 14.923 0 0 0 4.494 2.272.058.058 0 0 0 .064-.02c.346-.473.654-.972.92-1.496a.057.057 0 0 0-.032-.08 9.83 9.83 0 0 1-1.404-.669.058.058 0 0 1-.029-.046.058.058 0 0 1 .023-.05c.094-.07.189-.144.279-.218a.056.056 0 0 1 .058-.008c2.946 1.345 6.135 1.345 9.046 0a.056.056 0 0 1 .059.007c.09.074.184.149.28.22a.058.058 0 0 1 .023.049.059.059 0 0 1-.028.046 9.224 9.224 0 0 1-1.405.669.058.058 0 0 0-.033.033.056.056 0 0 0 .002.047c.27.523.58 1.022.92 1.495a.056.056 0 0 0 .062.021 14.878 14.878 0 0 0 4.502-2.272.055.055 0 0 0 .016-.018.056.056 0 0 0 .008-.023c.375-3.883-.63-7.256-2.662-10.246a.046.046 0 0 0-.023-.021Zm-9.223 8.221c-.887 0-1.618-.814-1.618-1.814s.717-1.814 1.618-1.814c.908 0 1.632.821 1.618 1.814 0 1-.717 1.814-1.618 1.814Zm5.981 0c-.887 0-1.618-.814-1.618-1.814s.717-1.814 1.618-1.814c.908 0 1.632.821 1.618 1.814 0 1-.71 1.814-1.618 1.814Z" />
// </svg>
// )
// }

function SocialLink({
href,
Expand Down Expand Up @@ -127,9 +127,9 @@ function SmallPrint() {
<SocialLink href="https://github.com/mrgnlabs" icon={GitHubIcon}>
Follow us on GitHub
</SocialLink>
<SocialLink href="https://discord.com/invite/mrgn" icon={DiscordIcon}>
{/* <SocialLink href="https://discord.com/invite/mrgn" icon={DiscordIcon}>
Join our Discord server
</SocialLink>
</SocialLink> */}
</div>
</div>
)
Expand Down
125 changes: 2 additions & 123 deletions apps/marginfi-v2-ui/src/pages/ecosystem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,13 @@ const projects = shuffle([
{
title: "Exponent",
description: "Trade volatile marginfi pool yields and earn fixed-rates for $USDC, $PYUSD and $USDT.",
url: "https://trustless.engineering",
url: "https://www.exponent.finance",
author: {
name: "Exponent",
avatar: "https://storage.googleapis.com/mrgn-public/ecosystem-images/exponent.jpg",
url: "https://www.exponent.finance/income",
url: "https://www.exponent.finance",
},
},
// {
// title: "WRTHY",
// description: "On-chain credit systems",
// url: "https://trustless.engineering",
// author: {
// name: "WRTHY",
// avatar: "https://storage.googleapis.com/mrgn-public/ecosystem-images/wrthy.png",
// url: "https://trustless.engineering",
// },
// },
{
title: "Carrot",
description: "Carrot is building an auto-adjusting yield bearing token and using marginfi to rebalance user deposits.",
Expand Down Expand Up @@ -69,99 +59,6 @@ const projects = shuffle([
url: "https://marginfi.com",
},
},
// {
// title: "marginfi v2",
// description: "V2 of the marginfi protocol",
// url: "https://app.marginfi.com",
// github: "https://github.com/mrgnlabs/marginfi-v2",
// repo: "mrgnlabs/marginfi-v2",
// author: {
// name: "marginfi",
// avatar: "https://storage.googleapis.com/mrgn-public/ecosystem-images/mrgn_logo_192.png",
// url: "https://marginfi.com",
// },
// },
// {
// title: "marginfi ui",
// description: "The official marginfi UI",
// url: "https://app.marginfi.com",
// github: "https://github.com/mrgnlabs/mrgn-ts/tree/main/apps/marginfi-v2-ui",
// repo: "mrgnlabs/mrgn-ts",
// author: {
// name: "marginfi",
// avatar: "https://storage.googleapis.com/mrgn-public/ecosystem-images/mrgn_logo_192.png",
// url: "https://marginfi.com",
// },
// },
// {
// title: "marginfi xnft",
// description: "The official marginfi xNFT",
// url: "https://www.xnft.gg/app/DoXjr5LKZp9uxiwEUhffBwCQrf2xdkiDYeitGGvfcyXm",
// github: "https://github.com/mrgnlabs/mrgn-ts/tree/main/apps/marginfi-v2-xnft",
// repo: "mrgnlabs/mrgn-ts",
// author: {
// name: "marginfi",
// avatar: "https://storage.googleapis.com/mrgn-public/ecosystem-images/mrgn_logo_192.png",
// url: "https://marginfi.com",
// },
// },
// {
// title: "marginfi liquidator",
// description: "Example liquidator",
// github: "https://github.com/mrgnlabs/mrgn-ts/tree/main/apps/alpha-liquidator",
// repo: "mrgnlabs/mrgn-ts",
// author: {
// name: "marginfi",
// avatar: "https://storage.googleapis.com/mrgn-public/ecosystem-images/mrgn_logo_192.png",
// url: "https://marginfi.com",
// },
// },
// {
// title: "dune analytics",
// description: "MarginFi Dune Analytics dashboard",
// url: "https://dune.com/man0s/marginfi/",
// author: {
// name: "man0s",
// avatar: "https://storage.googleapis.com/mrgn-public/ecosystem-images/manos.jpg",
// url: "https://twitter.com/losman0s",
// },
// },
// {
// title: "account search",
// description: "Search accounts by wallet or .sol domain",
// url: "https://mrgn-account-search.vercel.app/",
// github: "https://github.com/mrgnlabs/mrgn-account-search",
// repo: "mrgnlabs/mrgn-account-search",
// author: {
// name: "chambaz",
// avatar: "https://storage.googleapis.com/mrgn-public/ecosystem-images/chambaz.jpg",
// url: "https://twitter.com/chambaz",
// },
// },
// {
// title: "borrow caps",
// description: "Borrow availability for major assets",
// url: "https://marginfi-borrow-caps.vercel.app/",
// github: "https://github.com/gohyun14/marginfi-borrow-caps",
// repo: "gohyun14/marginfi-borrow-caps",
// author: {
// name: "0xCosmic",
// avatar: "https://storage.googleapis.com/mrgn-public/ecosystem-images/cosmic.jpg",
// url: "https://twitter.com/0xCosmic_",
// },
// },
// {
// title: "health check",
// description: "Account health tracker / simulator",
// url: "https://marginfi-borrow-caps.vercel.app/health",
// github: "https://github.com/gohyun14/marginfi-borrow-caps",
// repo: "gohyun14/marginfi-borrow-caps",
// author: {
// name: "0xCosmic",
// avatar: "https://storage.googleapis.com/mrgn-public/ecosystem-images/cosmic.jpg",
// url: "https://twitter.com/0xCosmic_",
// },
// },
{
title: "Juicer",
description: "Juicer is building on marginfi to give their users exposure to competitive lending rates.",
Expand Down Expand Up @@ -238,24 +135,6 @@ const projects = shuffle([
avatar: "https://storage.googleapis.com/mrgn-public/ecosystem-images/meteora.jpg",
},
},
// {
// title: "Step Finance",
// description: "Portfolio Dashboard & Analytics for Solana",
// url: "https://www.step.finance/",
// author: {
// name: "Step Finance",
// avatar: "https://storage.googleapis.com/mrgn-public/ecosystem-images/step.jpg",
// },
// },
// {
// title: "SonarWatch",
// description: "Empowering your journey on web3 with a powerful tracking tool, multichain and open-source",
// url: "https://sonar.watch/",
// author: {
// name: "SonarWatch",
// avatar: "https://storage.googleapis.com/mrgn-public/ecosystem-images/sonar.jpg",
// },
// },
{
title: "AssetDash",
description: "The best portfolio tracker and rewards program in crypto",
Expand Down