From d928ec70cac4ff2688939d3376a459a6de5f20ef Mon Sep 17 00:00:00 2001 From: dd Date: Fri, 26 Feb 2021 16:31:09 -0500 Subject: [PATCH] moved functions to utils --- src/client.ts | 30 ------------------------------ src/utils.ts | 27 ++++++++++++++++++++++++++- 2 files changed, 26 insertions(+), 31 deletions(-) diff --git a/src/client.ts b/src/client.ts index bc23f53..8382fc7 100644 --- a/src/client.ts +++ b/src/client.ts @@ -1,6 +1,5 @@ import { Account, - AccountInfo, Connection, PublicKey, sendAndConfirmRawTransaction, @@ -77,9 +76,6 @@ export class MangoGroup { return aggs.map((agg) => (agg.answer.median.toNumber() / Math.pow(10, agg.config.decimals))).concat(1.0) - - // const oracleAccs = await getMultipleAccounts(connection, this.oracles); - // return oracleAccs.map((oa) => decodeAggregatorInfo(oa.accountInfo).submissionValue).concat(1.0) } getMarketIndex(spotMarket: Market): number { @@ -1069,29 +1065,3 @@ export class MangoClient { } } -async function getMultipleAccounts( - connection: Connection, - publicKeys: PublicKey[] - -): Promise<{ publicKey: PublicKey; accountInfo: AccountInfo }[]> { - const publickKeyStrs = publicKeys.map((pk) => (pk.toBase58())); - - // @ts-ignore - const resp = await connection._rpcRequest('getMultipleAccounts', [publickKeyStrs]); - if (resp.error) { - throw new Error(resp.error.message); - } - return resp.result.value.map( - ({ data, executable, lamports, owner } , i) => ({ - publicKey: publicKeys[i], - accountInfo: { - data: Buffer.from(data[0], 'base64'), - executable, - owner: new PublicKey(owner), - lamports, - }, - }), - ); -} - - diff --git a/src/utils.ts b/src/utils.ts index dad6d46..db4d843 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -190,4 +190,29 @@ export function parseTokenAccountData( owner: new PublicKey(owner), amount, }; -} \ No newline at end of file +} + +export async function getMultipleAccounts( + connection: Connection, + publicKeys: PublicKey[] + +): Promise<{ publicKey: PublicKey; accountInfo: AccountInfo }[]> { + const publickKeyStrs = publicKeys.map((pk) => (pk.toBase58())); + + // @ts-ignore + const resp = await connection._rpcRequest('getMultipleAccounts', [publickKeyStrs]); + if (resp.error) { + throw new Error(resp.error.message); + } + return resp.result.value.map( + ({ data, executable, lamports, owner } , i) => ({ + publicKey: publicKeys[i], + accountInfo: { + data: Buffer.from(data[0], 'base64'), + executable, + owner: new PublicKey(owner), + lamports, + }, + }), + ); +}