From 7a4313d031211d4323551010541426586c50ee55 Mon Sep 17 00:00:00 2001 From: Nathan Galindo Date: Mon, 25 Nov 2024 12:20:35 -0600 Subject: [PATCH 1/3] fix urls --- apps/marginfi-v2-ui/src/pages/ecosystem.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/marginfi-v2-ui/src/pages/ecosystem.tsx b/apps/marginfi-v2-ui/src/pages/ecosystem.tsx index c12acddd71..3a0c36f077 100644 --- a/apps/marginfi-v2-ui/src/pages/ecosystem.tsx +++ b/apps/marginfi-v2-ui/src/pages/ecosystem.tsx @@ -20,11 +20,11 @@ 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", }, }, // { From e09b39d02245540ad37af9c0e601c843440e2204 Mon Sep 17 00:00:00 2001 From: Nathan Galindo Date: Mon, 25 Nov 2024 13:16:24 -0600 Subject: [PATCH 2/3] update fee docs --- .../src/app/introduction/page.mdx | 7 + apps/marginfi-v2-ui/src/pages/ecosystem.tsx | 121 ------------------ 2 files changed, 7 insertions(+), 121 deletions(-) diff --git a/apps/marginfi-v2-docs/src/app/introduction/page.mdx b/apps/marginfi-v2-docs/src/app/introduction/page.mdx index 2479aff84c..e398c7df68 100644 --- a/apps/marginfi-v2-docs/src/app/introduction/page.mdx +++ b/apps/marginfi-v2-docs/src/app/introduction/page.mdx @@ -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. diff --git a/apps/marginfi-v2-ui/src/pages/ecosystem.tsx b/apps/marginfi-v2-ui/src/pages/ecosystem.tsx index 3a0c36f077..1ca3c67f09 100644 --- a/apps/marginfi-v2-ui/src/pages/ecosystem.tsx +++ b/apps/marginfi-v2-ui/src/pages/ecosystem.tsx @@ -27,16 +27,6 @@ const projects = shuffle([ 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.", @@ -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.", @@ -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", From 03925e0abac676fce2f3588d820f101e5d9e788b Mon Sep 17 00:00:00 2001 From: Nathan Galindo Date: Tue, 26 Nov 2024 15:44:31 -0600 Subject: [PATCH 3/3] remove phishing link --- .../src/components/footer.tsx | 10 +++++----- .../src/components/header.tsx | 10 +++++----- .../marginfi-v2-docs/src/components/Footer.tsx | 18 +++++++++--------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/apps/marginfi-landing-page/src/components/footer.tsx b/apps/marginfi-landing-page/src/components/footer.tsx index 59d97210c8..5dd80961d3 100644 --- a/apps/marginfi-landing-page/src/components/footer.tsx +++ b/apps/marginfi-landing-page/src/components/footer.tsx @@ -52,11 +52,11 @@ const CONTENT: { href: "https://twitter.com/marginfi", label: "X", }, - { - icon: , - href: "https://discord.gg/mrgn", - label: "Discord", - }, + // { + // icon: , + // href: "https://discord.gg/mrgn", + // label: "Discord", + // }, { icon: , href: "https://github.com/mrgnlabs/", diff --git a/apps/marginfi-landing-page/src/components/header.tsx b/apps/marginfi-landing-page/src/components/header.tsx index 84780983e6..dc442a8615 100644 --- a/apps/marginfi-landing-page/src/components/header.tsx +++ b/apps/marginfi-landing-page/src/components/header.tsx @@ -84,11 +84,11 @@ const CONTENT = { href: "https://twitter.com/marginfi", label: "X", }, - { - icon: , - href: "https://discord.gg/mrgn", - label: "Discord", - }, + // { + // icon: , + // href: "https://discord.gg/mrgn", + // label: "Discord", + // }, { icon: , href: "https://github.com/mrgnlabs/", diff --git a/apps/marginfi-v2-docs/src/components/Footer.tsx b/apps/marginfi-v2-docs/src/components/Footer.tsx index 02f0f7b13d..b9caac0297 100644 --- a/apps/marginfi-v2-docs/src/components/Footer.tsx +++ b/apps/marginfi-v2-docs/src/components/Footer.tsx @@ -89,13 +89,13 @@ function GitHubIcon(props: React.ComponentPropsWithoutRef<'svg'>) { ) } -function DiscordIcon(props: React.ComponentPropsWithoutRef<'svg'>) { - return ( - - ) -} +// function DiscordIcon(props: React.ComponentPropsWithoutRef<'svg'>) { +// return ( +// +// ) +// } function SocialLink({ href, @@ -127,9 +127,9 @@ function SmallPrint() { Follow us on GitHub - + {/* Join our Discord server - + */} )