From c64ff007b0b3553cb633b98d24522b3ff0a5550a Mon Sep 17 00:00:00 2001 From: saml33 Date: Fri, 29 Dec 2023 21:18:39 +1100 Subject: [PATCH 1/5] add corn logo --- public/icons/corn.svg | 14 ++++++++++++++ utils/constants.ts | 1 + 2 files changed, 15 insertions(+) create mode 100644 public/icons/corn.svg diff --git a/public/icons/corn.svg b/public/icons/corn.svg new file mode 100644 index 000000000..72f999f5f --- /dev/null +++ b/public/icons/corn.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/utils/constants.ts b/utils/constants.ts index cb2fce30d..be1ec4cb9 100644 --- a/utils/constants.ts +++ b/utils/constants.ts @@ -140,6 +140,7 @@ export const CUSTOM_TOKEN_ICONS: { [key: string]: boolean } = { bonk: true, btc: true, chai: true, + corn: true, crown: true, dai: true, dual: true, From db997aef767e667fbecddd69f589dd4ca3ab59fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Brzezin=CC=81ski?= Date: Fri, 29 Dec 2023 14:33:50 +0100 Subject: [PATCH 2/5] upgrade client to 0.21.8 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 47e8ec393..fa0efb4ca 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "dependencies": { "@blockworks-foundation/mango-feeds": "0.1.7", "@blockworks-foundation/mango-mints-redemption": "^0.0.10", - "@blockworks-foundation/mango-v4": "0.21.5", + "@blockworks-foundation/mango-v4": "0.21.8", "@blockworks-foundation/mango-v4-settings": "0.4.3", "@blockworks-foundation/mangolana": "0.0.1-beta.15", "@headlessui/react": "1.6.6", diff --git a/yarn.lock b/yarn.lock index b7744eaf9..a6946382e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -58,10 +58,10 @@ bn.js "^5.2.1" eslint-config-prettier "^9.0.0" -"@blockworks-foundation/mango-v4@0.21.5": - version "0.21.5" - resolved "https://registry.yarnpkg.com/@blockworks-foundation/mango-v4/-/mango-v4-0.21.5.tgz#5e3b3257de0a0efc98c1f9057982e434c1665120" - integrity sha512-tCBFb+eBltsJbFkcBPBgfk5Wzmwa+9MfNU7FTWX8vMycl+ck4svE8K05HEO25dWRSJmZbwx8osGxaqCsricAbQ== +"@blockworks-foundation/mango-v4@0.21.8": + version "0.21.8" + resolved "https://registry.yarnpkg.com/@blockworks-foundation/mango-v4/-/mango-v4-0.21.8.tgz#d3179560375b80b5f9b61af91595968d617b978d" + integrity sha512-Tgg0zTFDEprkxwXJAdGcDfXfS8dK6V5gBXD79o2h9/7+Nj6eh3y6J7iKaSmjPFQ9FViesB2muc1Q2lVBUnwIMg== dependencies: "@blockworks-foundation/mango-v4-settings" "^0.2.16" "@coral-xyz/anchor" "^0.28.1-beta.2" From 532ed61400d8b3681e679b863f9412984e6bddcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Brzezin=CC=81ski?= Date: Fri, 29 Dec 2023 21:16:42 +0100 Subject: [PATCH 3/5] dashboard fixes --- .../modals/DashboardSuggestedValuesModal.tsx | 33 +++++++++++-------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/components/modals/DashboardSuggestedValuesModal.tsx b/components/modals/DashboardSuggestedValuesModal.tsx index e3b066b0b..6a93de665 100644 --- a/components/modals/DashboardSuggestedValuesModal.tsx +++ b/components/modals/DashboardSuggestedValuesModal.tsx @@ -13,6 +13,7 @@ import { Group, OracleProvider, PriceImpact, + toUiDecimals, } from '@blockworks-foundation/mango-v4' import { AccountMeta, Transaction } from '@solana/web3.js' import { BN } from '@project-serum/anchor' @@ -347,22 +348,20 @@ const DashboardSuggestedValues = ({ >

- {bank.name} - Suggested tier: {suggestedTier} + {bank.name} - Suggested tier: {PRESETS[suggestedTier].preset_name}

@@ -595,10 +594,16 @@ const DashboardSuggestedValues = ({ /> Date: Fri, 29 Dec 2023 21:21:09 +0100 Subject: [PATCH 4/5] fix suggested values create proposal --- components/modals/DashboardSuggestedValuesModal.tsx | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/components/modals/DashboardSuggestedValuesModal.tsx b/components/modals/DashboardSuggestedValuesModal.tsx index 6a93de665..a080d9390 100644 --- a/components/modals/DashboardSuggestedValuesModal.tsx +++ b/components/modals/DashboardSuggestedValuesModal.tsx @@ -114,7 +114,14 @@ const DashboardSuggestedValues = ({ ) => { const proposalTx = [] const mintInfo = group!.mintInfosMapByTokenIndex.get(bank.tokenIndex)! - const preset = PRESETS[tokenTier] + const preset = getPresetWithAdjustedDepositLimit( + getPresetWithAdjustedNetBorrows( + PRESETS[tokenTier], + bank.nativeDeposits().mul(bank.price).toNumber(), + ), + bank.uiPrice, + bank.mintDecimals, + ) const fieldsToChange = invalidFieldsKeys.reduce( (obj, key) => ({ ...obj, [key]: preset[key as keyof typeof preset] }), @@ -144,7 +151,7 @@ const DashboardSuggestedValues = ({ const isThereNeedOfSendingRateConfigs = Object.values(rateConfigs).filter( (x) => x !== null, ).length - + console.log(fieldsToChange) const ix = await client!.program.methods .tokenEdit( null, From d1fbf855a8548ecba182afeb6daf8c1d50f69906 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Brzezin=CC=81ski?= Date: Fri, 29 Dec 2023 22:26:20 +0100 Subject: [PATCH 5/5] adjust slippage page --- .../modals/DashboardSuggestedValuesModal.tsx | 14 ++++--- pages/dashboard/slippage.tsx | 41 ++++++++++++++++++- 2 files changed, 49 insertions(+), 6 deletions(-) diff --git a/components/modals/DashboardSuggestedValuesModal.tsx b/components/modals/DashboardSuggestedValuesModal.tsx index a080d9390..160e4cb05 100644 --- a/components/modals/DashboardSuggestedValuesModal.tsx +++ b/components/modals/DashboardSuggestedValuesModal.tsx @@ -65,6 +65,8 @@ const DashboardSuggestedValues = ({ ? getPythPresets(LISTING_PRESETS) : getSwitchBoardPresets(LISTING_PRESETS) + const [proposedTier, setProposedTier] = + useState('liab_1') const [suggestedTier, setSuggestedTier] = useState('liab_1') const [proposing, setProposing] = useState(false) @@ -103,6 +105,7 @@ const DashboardSuggestedValues = ({ bank.oracleProvider === OracleProvider.Pyth, ) + setProposedTier(suggestedTier) setSuggestedTier(suggestedTier) }, [bank.name, bank.oracleProvider, priceImpactsFiltered]) @@ -314,7 +317,7 @@ const DashboardSuggestedValues = ({ const suggestedValues = getPresetWithAdjustedDepositLimit( getPresetWithAdjustedNetBorrows( - PRESETS[suggestedTier as LISTING_PRESETS_KEY] as LISTING_PRESET, + PRESETS[proposedTier as LISTING_PRESETS_KEY] as LISTING_PRESET, bank.nativeDeposits().mul(bank.price).toNumber(), ), bank.uiPrice, @@ -358,14 +361,15 @@ const DashboardSuggestedValues = ({ {bank.name} - Suggested tier: {PRESETS[suggestedTier].preset_name}