project-serum
/
serum-js
mirror of https://github.com/project-serum/serum-js.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add option to findBaseTokenAccountsForOwner/findQuoteTokenAccountsForOwner to include unwrapped SOL for wrapped-SOL markets

This commit is contained in:
Gary Wang 2020-09-01 07:03:05 -07:00
parent 5dc5e9d171
commit 3f7471c930
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/market.ts
View File

@ -180,7 +180,18 @@ export class Market {
async findBaseTokenAccountsForOwner(
connection: Connection,
ownerAddress: PublicKey,
includeUnwrappedSol = false,
): Promise<Array<{ pubkey: PublicKey; account: AccountInfo<Buffer> }>> {
if (this.baseMintAddress.equals(WRAPPED_SOL_MINT) && includeUnwrappedSol) {
const [wrapped, unwrapped] = await Promise.all([
this.findBaseTokenAccountsForOwner(connection, ownerAddress, false),
connection.getAccountInfo(ownerAddress),
]);
if (unwrapped !== null) {
return [{ pubkey: ownerAddress, account: unwrapped }, ...wrapped];
}
return wrapped;
}
return (
await connection.getTokenAccountsByOwner(ownerAddress, {
mint: this.baseMintAddress,
@ -191,7 +202,18 @@ export class Market {
async findQuoteTokenAccountsForOwner(
connection: Connection,
ownerAddress: PublicKey,
includeUnwrappedSol = false,
): Promise<{ pubkey: PublicKey; account: AccountInfo<Buffer> }[]> {
if (this.quoteMintAddress.equals(WRAPPED_SOL_MINT) && includeUnwrappedSol) {
const [wrapped, unwrapped] = await Promise.all([
this.findQuoteTokenAccountsForOwner(connection, ownerAddress, false),
connection.getAccountInfo(ownerAddress),
]);
if (unwrapped !== null) {
return [{ pubkey: ownerAddress, account: unwrapped }, ...wrapped];
}
return wrapped;
}
return (
await connection.getTokenAccountsByOwner(ownerAddress, {
mint: this.quoteMintAddress,