Remove open orders accounts from context on close (#31)

This commit is contained in:
Armani Ferrante 2021-06-04 22:00:05 -07:00 committed by GitHub
parent 500ca67f5b
commit caf47a58f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 8 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "@project-serum/swap-ui", "name": "@project-serum/swap-ui",
"version": "0.1.0-alpha.22", "version": "0.1.0-alpha.24",
"main": "dist/index.js", "main": "dist/index.js",
"types": "dist/index.d.ts", "types": "dist/index.d.ts",
"homepage": "https://github.com/project-serum/swap-ui", "homepage": "https://github.com/project-serum/swap-ui",

View File

@ -1,4 +1,4 @@
import { useState, useMemo } from "react"; import { useState, useMemo, useEffect } from "react";
import { PublicKey } from "@solana/web3.js"; import { PublicKey } from "@solana/web3.js";
import { MintInfo } from "@solana/spl-token"; import { MintInfo } from "@solana/spl-token";
import { BN } from "@project-serum/anchor"; import { BN } from "@project-serum/anchor";
@ -41,8 +41,6 @@ export default function OpenOrdersDialog({
open: boolean; open: boolean;
onClose: () => void; onClose: () => void;
}) { }) {
const styles = useStyles();
return ( return (
<Dialog <Dialog
maxWidth="lg" maxWidth="lg"
@ -124,9 +122,11 @@ function OpenOrdersRow({
openOrders: Array<OpenOrders>; openOrders: Array<OpenOrders>;
}) { }) {
const styles = useStyles(); const styles = useStyles();
const [ooAccount, setOoAccount] = useState(openOrders[0]); const [ooAccount, setOoAccount] = useState(openOrders[0]);
const { swapClient } = useDexContext(); useEffect(() => {
setOoAccount(openOrders[0]);
}, [openOrders]);
const { swapClient, closeOpenOrders } = useDexContext();
const marketClient = useMarket(market); const marketClient = useMarket(market);
const tokenMap = useTokenMap(); const tokenMap = useTokenMap();
const base = useMint(marketClient?.baseMintAddress); const base = useMint(marketClient?.baseMintAddress);
@ -170,7 +170,7 @@ function OpenOrdersRow({
await swapClient.program.provider.send(transaction, signers); await swapClient.program.provider.send(transaction, signers);
}; };
const closeOpenOrders = async () => { const _closeOpenOrders = async () => {
await swapClient.program.rpc.closeAccount({ await swapClient.program.rpc.closeAccount({
accounts: { accounts: {
openOrders: ooAccount.address, openOrders: ooAccount.address,
@ -180,6 +180,7 @@ function OpenOrdersRow({
dexProgram: DEX_PID, dexProgram: DEX_PID,
}, },
}); });
closeOpenOrders(ooAccount);
}; };
return ( return (
@ -241,7 +242,7 @@ function OpenOrdersRow({
<TableCell align="center"> <TableCell align="center">
<Button <Button
disabled={closeDisabled} disabled={closeDisabled}
onClick={closeOpenOrders} onClick={_closeOpenOrders}
className={styles.closeAccount} className={styles.closeAccount}
> >
Close Close

View File

@ -29,6 +29,7 @@ export const BASE_TAKER_FEE_BPS = 0.0022;
type DexContext = { type DexContext = {
// Maps market address to open orders accounts. // Maps market address to open orders accounts.
openOrders: Map<string, Array<OpenOrders>>; openOrders: Map<string, Array<OpenOrders>>;
closeOpenOrders: (openOrder: OpenOrders) => void;
swapClient: SwapClient; swapClient: SwapClient;
}; };
const _DexContext = React.createContext<DexContext | null>(null); const _DexContext = React.createContext<DexContext | null>(null);
@ -39,6 +40,20 @@ export function DexContextProvider(props: any) {
); );
const swapClient = props.swapClient; const swapClient = props.swapClient;
// Removes the given open orders from the context.
const closeOpenOrders = async (openOrder: OpenOrders) => {
const newOoAccounts = new Map(ooAccounts);
const openOrders = newOoAccounts
.get(openOrder.market.toString())
?.filter((oo: OpenOrders) => !oo.address.equals(openOrder.address));
if (openOrders && openOrders.length > 0) {
newOoAccounts.set(openOrder.market.toString(), openOrders);
} else {
newOoAccounts.delete(openOrder.market.toString());
}
setOoAccounts(newOoAccounts);
};
// Three operations: // Three operations:
// //
// 1. Fetch all open orders accounts for the connected wallet. // 1. Fetch all open orders accounts for the connected wallet.
@ -129,6 +144,7 @@ export function DexContextProvider(props: any) {
<_DexContext.Provider <_DexContext.Provider
value={{ value={{
openOrders: ooAccounts, openOrders: ooAccounts,
closeOpenOrders,
swapClient, swapClient,
}} }}
> >