Merge pull request #418 from mrgnlabs/j/cache-fix

mrgnlabs · Dec 10, 2023 · 3021af5 · 3021af5 · vercel · Dec 10, 2023
2 parents 30fe7e1 + 89cedf8
commit 3021af5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/apps/marginfi-v2-ui/src/middleware.ts b/apps/marginfi-v2-ui/src/middleware.ts
@@ -8,6 +8,9 @@ export function middleware(req: NextRequest) {
   const basicAuth = req.headers.get("authorization");
   const url = req.nextUrl;
   const response = NextResponse.next();
+  // response.headers.set('Vercel-CDN-Cache-Control', 'private, max-age=10');
+  // response.headers.set('CDN-Cache-Control', 'private, max-age=10');
+  // response.headers.set('Cache-Control', 'private, max-age=10');
 
   if (process.env.AUTHENTICATION_DISABLED === "true") {
     return response;

diff --git a/apps/marginfi-v2-ui/src/utils/mrgnActions.ts b/apps/marginfi-v2-ui/src/utils/mrgnActions.ts
@@ -1,5 +1,5 @@
 import { MarginfiAccountWrapper, MarginfiClient, ProcessTransactionError } from "@mrgnlabs/marginfi-client-v2";
-import { ExtendedBankInfo, FEE_MARGIN, ActionType } from "@mrgnlabs/marginfi-v2-ui-state";
+import { ExtendedBankInfo, FEE_MARGIN, ActionType, clearAccountCache } from "@mrgnlabs/marginfi-v2-ui-state";
 import { isWholePosition } from "./mrgnUtils";
 import { Connection, PublicKey, Transaction } from "@solana/web3.js";
 import { Wallet, processTransaction } from "@mrgnlabs/mrgn-common";
@@ -89,6 +89,9 @@ async function createAccountAndDeposit({
   try {
     const squadsOptions = await getMaybeSquadsOptions(walletContextState);
     marginfiAccount = await mfiClient.createMarginfiAccount(undefined, squadsOptions);
+
+    clearAccountCache(mfiClient.provider.publicKey);
+
     multiStepToast.setSuccessAndNext();
   } catch (error: any) {
     const msg = extractErrorString(error);

diff --git a/packages/marginfi-v2-ui-state/src/store/mrgnlendStore.ts b/packages/marginfi-v2-ui-state/src/store/mrgnlendStore.ts
@@ -78,6 +78,10 @@ function createPersistentMrgnlendStore() {
   );
 }
 
+function createLocalStorageKey(authority: PublicKey): string {
+  return `marginfi_accounts-${authority.toString()}`;
+}
+
 async function getCachedMarginfiAccountsForAuthority(
   authority: PublicKey,
   client: MarginfiClient
@@ -87,7 +91,7 @@ async function getCachedMarginfiAccountsForAuthority(
     return client.getMarginfiAccountsForAuthority(authority);
   }
 
-  const cacheKey = `marginfiAccounts-${authority.toString()}`;
+  const cacheKey = createLocalStorageKey(authority);
   const cachedAccounts = window.localStorage.getItem(cacheKey);
   debug("cachedAccounts", cachedAccounts);
   if (cachedAccounts) {
@@ -102,6 +106,11 @@ async function getCachedMarginfiAccountsForAuthority(
   }
 }
 
+export function clearAccountCache(authority: PublicKey) {
+  const cacheKey = createLocalStorageKey(authority);
+  window.localStorage.removeItem(cacheKey);
+}
+
 const stateCreator: StateCreator<MrgnlendState, [], []> = (set, get) => ({
   // State
   initialized: false,