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.

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

Export hooks and constants, add balance required #72

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
/coverage
/build
.DS_Store
.idea
.env.local
.env.development.local
.env.test.local
Expand Down
58 changes: 8 additions & 50 deletions src/index.tsx → src/Swap.tsx
Original file line number Diff line number Diff line change
@@ -1,33 +1,18 @@
import { ReactElement } from "react";
import { PublicKey } from "@solana/web3.js";
import { TokenListContainer } from "@solana/spl-token-registry";
import { Provider } from "@project-serum/anchor";
import { Swap as SwapClient } from "@project-serum/swap";
import {
createMuiTheme,
ThemeOptions,
ThemeProvider,
} from "@material-ui/core/styles";
import {
SwapContextProvider,
useSwapContext,
useSwapFair,
} from "./context/Swap";
import {
DexContextProvider,
useBbo,
useFairRoute,
useMarketName,
} from "./context/Dex";
import { TokenListContextProvider, useTokenMap } from "./context/TokenList";
import { TokenContextProvider, useMint } from "./context/Token";
import SwapCard, {
ArrowButton,
SwapButton,
SwapHeader,
SwapTokenForm,
} from "./components/Swap";
import TokenDialog from "./components/TokenDialog";
import { TokenListContextProvider } from "./context/TokenList";
import { TokenContextProvider } from "./context/Token";
import { DexContextProvider } from "./context/Dex";
import { SwapContextProvider } from "./context/Swap";
import SwapCard from "./components/Swap";
import { Provider } from "@project-serum/anchor";
import { TokenListContainer } from "@solana/spl-token-registry";
import { PublicKey } from "@solana/web3.js";

/**
* A`Swap` component that can be embedded into applications. To use,
Expand Down Expand Up @@ -166,30 +151,3 @@ export type SwapProps = {
*/
swapTokenContainerStyle?: any;
};

export {
// Components.
Swap,
SwapCard,
SwapHeader,
SwapTokenForm,
ArrowButton,
SwapButton,
TokenDialog,
// Providers and context.
// Swap.
SwapContextProvider,
useSwapContext,
useSwapFair,
// TokenList.
TokenListContextProvider,
useTokenMap,
// Token.
TokenContextProvider,
useMint,
// Dex.
DexContextProvider,
useFairRoute,
useMarketName,
useBbo,
};
13 changes: 12 additions & 1 deletion src/context/Swap.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {
SPL_REGISTRY_SOLLET_TAG,
SPL_REGISTRY_WORM_TAG,
} from "./TokenList";
import { useOwnedTokenAccount } from "../context/Token";
import { useMint, useOwnedTokenAccount } from "../context/Token";

const DEFAULT_SLIPPAGE_PERCENT = 0.5;

Expand Down Expand Up @@ -184,6 +184,15 @@ export function useCanSwap(): boolean {
const fromWallet = useOwnedTokenAccount(fromMint);
const fair = useSwapFair();
const route = useRouteVerbose(fromMint, toMint);

const fromTokenAccount = useOwnedTokenAccount(fromMint);
const fromMintAccount = useMint(fromMint);
const fromBalance =
fromTokenAccount &&
fromMintAccount &&
fromTokenAccount.account.amount.toNumber() / 10 ** fromMintAccount.decimals;
const hasFromBalance = (fromBalance || 0) >= fromAmount;

if (route === null) {
return false;
}
Expand All @@ -202,6 +211,8 @@ export function useCanSwap(): boolean {
// Trade amounts greater than zero.
fromAmount > 0 &&
toAmount > 0 &&
// From token account has enougth balance
hasFromBalance &&
// Trade route exists.
route !== null &&
// Wormhole <-> native markets must have the wormhole token as the
Expand Down
78 changes: 78 additions & 0 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
import {
SwapContextProvider,
useSwapContext,
useSwapFair,
useCanSwap,
useReferral,
} from "./context/Swap";
import {
DexContextProvider,
useDexContext,
useOpenOrders,
useFairRoute,
useRouteVerbose,
useMarketName,
useMarket,
useBbo,
FEE_MULTIPLIER,
} from "./context/Dex";
import {
TokenListContextProvider,
useSwappableTokens,
useTokenMap,
} from "./context/TokenList";
import {
TokenContextProvider,
useOwnedTokenAccount,
useMint,
} from "./context/Token";
import SwapCard, {
ArrowButton,
SwapButton,
SwapHeader,
SwapTokenForm,
} from "./components/Swap";
import TokenDialog from "./components/TokenDialog";
import Swap from "./Swap";
import { SOL_MINT, WRAPPED_SOL_MINT } from "./utils/pubkeys";

export default Swap;

export {
// Components.
Swap,
SwapCard,
SwapHeader,
SwapTokenForm,
ArrowButton,
SwapButton,
TokenDialog,
// Providers and context.
// Swap.
SwapContextProvider,
useSwapContext,
useSwapFair,
useCanSwap,
useReferral,
// TokenList.
TokenListContextProvider,
useTokenMap,
useSwappableTokens,
// Token.
TokenContextProvider,
useOwnedTokenAccount,
useMint,
// Dex.
DexContextProvider,
useDexContext,
useOpenOrders,
useFairRoute,
useRouteVerbose,
useMarketName,
useMarket,
useBbo,
FEE_MULTIPLIER,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These probably shouldn't be exported unless we have a concrete use cases.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I recreated SwapButton with additional logic on my side, so all these exports are very necessary :)

// Utils
SOL_MINT,
WRAPPED_SOL_MINT,
};